Merge branch 'develop'

[lichviet] / qml / LichViet / FullMonth.qml

diff --git a/qml/LichViet/FullMonth.qml b/qml/LichViet/FullMonth.qml
index 4c31568..a091915 100644 (file)
--- a/qml/LichViet/FullMonth.qml
+++ b/qml/LichViet/FullMonth.qml
@@ -362,15 +362,16 @@ Item{
     }
 
     function get_prevmonth(startfrom){
-        var cMonth=m_month;
+        var cMonth=m_month-1;
         var cYear=m_year;
         var pmonth = [];
-        if (cMonth == 1){
-            cMonth = 12
+
+        if (cMonth === 0){
+            cMonth = 12;
             cYear--;
-        }else
-            cMonth--;
-         var daysofthemonthyear = Script.calDays(cMonth,cYear);
+        }
+
+         var daysofthemonthyear = Script.calDaysX(cMonth,cYear);
         for (var i=daysofthemonthyear;i>daysofthemonthyear-startfrom;i--){
             var lunarcl = Script.getLunarDate(i,cMonth,cYear)
             pmonth.push({duong:i, am:lunarcl.day, month:cMonth, year:cYear})
@@ -379,14 +380,14 @@ Item{
     }
 
     function get_nextmonth(startfrom){
-        var cMonth=m_month;
+        var cMonth=m_month+1;
         var cYear=m_year;
          var pmonth = [];
-        if (cMonth==12){
-            cMonth = 1;
+
+        if (cMonth === 13){
+            cMonth=1;
             cYear++;
-        }else
-            cMonth++;
+        }
 
         for (var i=1;i<=startfrom;i++){
           var lunarcl = Script.getLunarDate(i,cMonth,cYear)