list成功取得活動資料 不過速度非常慢

2 files changed, 31 insertions, 13 deletions

diff --git a/jinhtml/list.html b/jinhtml/list.html
index 873fde5..c85cbe1 100644
--- a/jinhtml/list.html
+++ b/jinhtml/list.html
@@ -12,9 +12,9 @@
 {% endblock %}
 
 {% block onload %}
-	pushevent (); 
-	pushtestdata ();
 	setyear ();
+	pushevent (); 
+	<!-- pushtestdata (); -->
 	var switchlistobj = document.getElementById("switchlist")
 	switchlistobj.className += "selected";
 	switchlistobj.onclick = "";
@@ -69,10 +69,10 @@
 
 {% block body %}
 	<div id = "timebar" align = "center">
-		<input type = "button" value = "<" onclick = "changeyear (-1);"></input>
+		<input type = "button" value = "<" onclick = "changeyear (-1); pushevent ();"></input>
 		<span id = "year"> XXXX </span>
 		年
-		<input type = "button" value = ">" onclick = "changeyear (1);"></input>
+		<input type = "button" value = ">" onclick = "changeyear (1); pushevent ();"></input>
 	</div>
 	<div id = "searchbar" align = "center">
 		搜尋選項：
diff --git a/js/list.js b/js/list.js
index d1b6e4d..045db85 100644
--- a/js/list.js
+++ b/js/list.js
@@ -1,11 +1,18 @@
 function pushevent () {//將活動放入行事曆中
-	var calevent;
-	var dataclass = ["date", "week", "time", "title"];
-	var eventid, dataid;
-	// for (var month = 1 ; month <= 12 ; month++) {
-		// calevent = inccal_fetch (2012, month);
-		for (var i = 0 ; i < 10 ; i++) {
-			eventid = "event" + (i + 1);
+	var year = parseInt ($ ("#year").text ());
+	var dataclass = ["date", "week", "time", "title", "content"];
+	var Day = ["日", "一", "二", "三", "四", "五", "六"];
+	var eventid, dataid, datetime;
+	var calevent = new Array ();
+	for (var month = 1 ; month <= 12 ; month++) {
+		inccal_fetch (year, month);
+		for (var i = 0 ; i < caleventlist.length ; i++) {
+			calevent.push (caleventlist[i]);
+		}
+	}
+	for (var i = 0 ; i < calevent.length ; i++) {
+		eventid = "event" + (i + 1);
+		if ($ ("#" + eventid + "head").length == 0) {//這一行還沒有
 			$ ("#eventbody").append ("<tr id = \"" + eventid + "head\"></tr>");
 			$ ("#" + eventid + "head").addClass ("event");
 			for (var j = 0 ; j < 4 ; j++) {
@@ -17,9 +24,20 @@
 			$ ("#eventbody").append ("<tr id = \"" + eventid + "body\" class = \"event\"><td id = \"" + eventid + "content\"></td></tr>");
 			$ ("#" + eventid + "content").addClass ("content");
 			$ ("#" + eventid + "content").attr ({"colspan":"4"});
-			$ ("#" + eventid + "content").css ("display", "none");
 		}
-	// }
+		datetime = calevent[i]["datetime"];
+		$ ("#" + eventid + "date").text (datetime.getFullYear () + "." + (datetime.getMonth () + 1) + "." + datetime.getDate ());
+		$ ("#" + eventid + "week").text ("星期" + Day[datetime.getDay ()]);
+		$ ("#" + eventid + "time").text (datetime.getHours () + ":" + datetime.getMinutes ());
+		for (var j = 3 ; j < 5 ; j++) {
+			$ ("#" + eventid + dataclass[j]).text (calevent[i][dataclass[j]]);
+		}
+		$ ("#" + eventid + "content").css ("display", "none");
+	}
+	for (var i = calevent.length ; $ ("#event" + (i + 1) + "head").length > 0 ; i++) {//刪除多餘的空行
+		$ ("#event" + (i + 1) + "head").remove ();
+		$ ("#event" + (i + 1) + "body").remove ();
+	}
 }
 
 function searchevent () {//搜尋符合的活動