* know bugs fixed !

[lichviet] / qml / LichViet / main.js

diff --git a/qml/LichViet/main.js b/qml/LichViet/main.js
index 7813d53..ba39517 100644 (file)
--- a/qml/LichViet/main.js
+++ b/qml/LichViet/main.js
@@ -45,6 +45,7 @@ function day_reset(){
 }
 
 function calDays(){
+    console.log(curMonth)
     if (curMonth == 4 || curMonth == 6 || curMonth == 9 || curMonth == 11)
         return 30;
     else
@@ -69,6 +70,7 @@ function calDaysX(month, year){
             else
                 return 28;
         }
+    else
     return 31;
 }
 
@@ -80,6 +82,16 @@ function lunarTietKhi(){
     return TIETKHI[getSunLongitude(jd+1,7.0)];
 }
 
+function reset_to_default_day(txtTHU, txtInfo, txtDAYAmLich){
+    localdate = new Date();
+
+    curDay=localdate.getDate();
+    curMonth=localdate.getMonth()+1;
+    curYear=localdate.getFullYear();
+
+    changeDay(curDay, txtTHU, txtInfo, txtDAYAmLich);
+}
+
 function changeDay(newday, txtTHU, txtInfo, txtDAYAmLich){
     curDay = newday;
     recalculate();
@@ -104,7 +116,7 @@ function __txtInfo_format(){
 }
 
 function __txtDAYAmLich_format(){
-    return "Ngày <span style='color:#C0C0C0;'>"+lunarDay+" ("+lunarDayCanChi+")</span><br>Tháng <span style='color:#C0C0C0;'>"+lunarMonth+" ("+lunarMonthCanChi+")</span><br>Năm <span style='color:#C0C0C0;'>"+lunarYearInt+" ("+lunarYear+")</span>";
+    return "Ngày <b>"+lunarDay+" ("+lunarDayCanChi+")</b><br>Tháng <b>"+lunarMonth+" ("+lunarMonthCanChi+")</b><br>Năm <b>"+lunarYearInt+" ("+lunarYear+")</b>";
 }
 
 function recalculate(){
@@ -118,7 +130,7 @@ function recalculate(){
     lunarDayCanChi = getCanChi(getLunarDate(curDay,curMonth,curYear))[0];
     lunarMonthCanChi = getCanChi(getLunarDate(curDay,curMonth,curYear))[1];
 
-    day_info = get(curDay,curMonth, curYear, lunarDay, lunarMonth);
+    day_info = get(curDay,curMonth, lunarDay, lunarMonth);
     isholiday = is_holiday(curDay,curMonth, curYear, lunarDay, lunarMonth);
 }