projects
/
lichviet
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Theme now is simple and very fast
[lichviet]
/
qml
/
LichViet
/
main.js
diff --git
a/qml/LichViet/main.js
b/qml/LichViet/main.js
index
7813d53
..
49a2a24
100644
(file)
--- a/
qml/LichViet/main.js
+++ b/
qml/LichViet/main.js
@@
-80,6
+80,16
@@
function lunarTietKhi(){
return TIETKHI[getSunLongitude(jd+1,7.0)];
}
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();
function changeDay(newday, txtTHU, txtInfo, txtDAYAmLich){
curDay = newday;
recalculate();
@@
-118,7
+128,7
@@
function recalculate(){
lunarDayCanChi = getCanChi(getLunarDate(curDay,curMonth,curYear))[0];
lunarMonthCanChi = getCanChi(getLunarDate(curDay,curMonth,curYear))[1];
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);
}
isholiday = is_holiday(curDay,curMonth, curYear, lunarDay, lunarMonth);
}