Added more information to the lunar calendar

[lichviet] / qml / LichViet / FullMonth.qml

diff --git a/qml/LichViet/FullMonth.qml b/qml/LichViet/FullMonth.qml
index 117aaee..992ddf8 100644 (file)
--- a/qml/LichViet/FullMonth.qml
+++ b/qml/LichViet/FullMonth.qml
@@ -17,7 +17,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>
 
 import QtQuick 1.0
 import "../DatePicker/component" as Comp
+
 import "amlich-hnd.js" as AmLich
+import "amlich-aa98.js" as AmLich98
+
+import "CacNgayLeTrongNam.js" as CNLTN
 
 Item{
     id: item1
@@ -41,8 +45,13 @@ Item{
                         Text { color: {
                                 if (header)
                                   return  "#000000";
-                                else
-                                    return "#007070"
+                                else{
+                                    var stemp = AmLich98.convertSolar2Lunar(txtDATEpv.currentIndex+1,curMonth,curYear,7);
+                                    if (CNLTN.is_holiday(day, month, stemp[0], stemp[1]))
+                                        return theme_manager.theme.markdate.holidays;
+                                    else
+                                        return "#007070"
+                                }
                             }
 
                             text: name; anchors.horizontalCenter: parent.horizontalCenter
@@ -116,14 +125,8 @@ onCanceled:{
                 id: grid
                 x: -335
                 y: 41
-                width: {
-                    800
-                }
-
-                height: {
-                    480
-                }
-
+                width:800
+                height: 480
                 anchors.horizontalCenterOffset: 15
                 anchors.bottomMargin: -52
                 anchors.topMargin: 42
@@ -264,40 +267,41 @@ onCanceled:{
         var prevmonth = get_prevmonth(startfrom)
 
         var dayclick, monthclick, yearclick;
-        console.log(lmodel.count)
 
         while(lmodel.count>7){
             lmodel.remove(lmodel.count-1);
         }
 
+        var datas1,datas,lunarclmonth,inmonths;
+
         for (var i=7;i<49;i++){
             var realnumber = i - 7;
             if (realnumber >= startfrom && j<= daysofthemonthyear){
             var lunarcl = AmLich.getLunarDate(j,screen.curMonth,screen.curYear)
             if (lunarcl.day==1){
-                var lunarclmonth = "/"+lunarcl.month
+                lunarclmonth = "/"+lunarcl.month
             }else{
-                var lunarclmonth = ""
+                lunarclmonth = ""
             }
 
-            var datas = j+"<br><span style='font-size:18px;float:right;color:#700070;'>&nbsp;&nbsp;"+lunarcl.day+lunarclmonth+"</span>";
+            datas = j+"<br><span style='font-size:18px;float:right;color:#700070;'>&nbsp;&nbsp;"+lunarcl.day+lunarclmonth+"</span>";
             dayclick = j;
             monthclick = screen.curMonth;
             yearclick = screen.curYear;
-            var inmonths = true;
+            inmonths = true;
                 j++;
             }else{
                 if (realnumber<startfrom){
-                    var datas1= prevmonth[realnumber];
+                    datas1= prevmonth[realnumber];
                 }else
                 {
-                    var datas1=nextmonth[(totalslot-realnumber)-1];
+                    datas1=nextmonth[(totalslot-realnumber)-1];
                 }
                 dayclick = datas1.duong;
                 monthclick = datas1.month;
                 yearclick = datas1.year;
-                var datas = "<span style='color:grey;font-weight:normal;'>"+datas1.duong+"</span><br><span style='font-size:18px;float:right;color:#CCFFFF;'>&nbsp;&nbsp;"+datas1.am+"</span>";
-                var inmonths=false;
+                datas = "<span style='color:grey;font-weight:normal;'>"+datas1.duong+"</span><br><span style='font-size:18px;float:right;color:#CCFFFF;'>&nbsp;&nbsp;"+datas1.am+"</span>";
+                inmonths=false;
             }
 
             lmodel.append({header:false,name:datas,inmonth:inmonths,day:dayclick,month:monthclick,year:yearclick})