Merge branch 'master' of ssh://linux5.csie.ntu.edu.tw/home/student/01/b01902062/projects/inccalender

2 files changed, 62 insertions, 22 deletions

diff --git a/jinhtml/list.html b/jinhtml/list.html
index a6f5859..6f8397d 100644
--- a/jinhtml/list.html
+++ b/jinhtml/list.html
@@ -1,6 +1,11 @@
 {% extends "jinhtml/skel.html" %}
 {% block headcss %}
 	<link rel = "stylesheet" type = "text/css" href = "/css/list.css">
+	<style>
+		.event {
+			cursor:pointer;
+		}
+	</style>
 {% endblock %}
 
 {% block onload %}
@@ -15,22 +20,40 @@
 	<script src = "/js/list.js" type = "text/javascript"></script>
 	<script>
 		function pushtestdata () {//push test data
-			var classname = ["date", "week", "time", "content"];
+			var classname = ["date", "week", "time", "title", "content"];
 			var testevents = new Array ();
-			testevents.push ("2012.11.28", "星期三", "20:30 - 22:00", "期末Project Online");
-			testevents.push ("2012.12.1", "星期六", "8:30 - 11:30", "校園馬拉松");
-			testevents.push ("2012.12.21", "星期五", "?:?? - ?:??", "世界末日");
-			testevents.push ("2013.1.7", "星期一", "0:00 - ", "期末考Online");
-			testevents.push ("2013.6.20", "星期四", "0:00 - 24:00", "生日大會");
+			var eventid;
+			testevents.push ("2012.11.28", "星期三", "20:30 - 22:00", "期末Project Online", "Come On!!");
+			testevents.push ("2012.12.1", "星期六", "8:30 - 11:30", "校園馬拉松", "I'm so tired.");
+			testevents.push ("2012.12.21", "星期五", "?:?? - ?:??", "世界末日", "NO!!!!!!");
+			testevents.push ("2013.1.7", "星期一", "0:00 - ", "期末考Online", "GOD!!!");
+			testevents.push ("2013.6.20", "星期四", "0:00 - 24:00", "生日大會", "Happy Birthday!!");
 			for (var i = 0 ; i < testevents.length ; i++) {
-				$ ("#event" + Math.floor (i / 4 + 1) + classname[i % 4]).text (testevents[i]);
+				eventid = "event" + Math.floor (i / 5 + 1) + classname[i % 5];
+				$ ("#" + eventid).text (testevents[i]);
 			}
 		}
 		function pushdata () {
+			var postdata = new Array ();
+			var datastring;
+			postdata.push ("title", "123");
+			postdata.push ("content", "eventcontent");
+			postdata.push ("icon", "5");
+			postdata.push ("year", "2012");
+			postdata.push ("month", "12");
+			postdata.push ("date", "16");
+			postdata.push ("hour", "10");
+			postdata.push ("minute", "10");
+			postdata.push ("datafrom", "google");
+			postdata.push ("remind", "77");
+			datastring = postdata[0] + "=" + postdata[1];
+			for (var i = 2 ; i < postdata.length ; i += 2) {
+				datastring += "&" + postdata[i] + "=" + postdata[i + 1];
+			}
 			$.ajax ({
 				type: "POST",
 				url: "/access/insert",
-				data: "title=123&content=eventcontent&icon=5&year=2012&month=12&date=16&hour=10&minute=10&datafrom=google&remind=77",
+				data: datastring,
 				success: function () {
 					alert ("POST SUCCESS!!");
 				}
diff --git a/js/list.js b/js/list.js
index b35d4f6..4e55a4b 100644
--- a/js/list.js
+++ b/js/list.js
@@ -1,19 +1,25 @@
 function pushevent () {//將活動放入行事曆中
-	var eventbody = document.getElementById ("eventbody");
-	var dataclass = ["date", "week", "time", "content"];
-	var Event, data;
-	for (var i = 0 ; i < 10 ; i++) {
-		Event = document.createElement ("tr");
-		Event.id = "event" + (i + 1);//建立每一個活動的id
-		Event.className = "event";
-		for (var j = 0 ; j < 4 ; j++) {
-			data = document.createElement ("td");
-			data.id = Event.id + dataclass[j];//建立每一個欄位的id	format = event<i><className>
-			data.className = dataclass[j];
-			Event.appendChild (data);
+	var calevent;
+	var dataclass = ["date", "week", "time", "title"];
+	var eventid, dataid;
+	// for (var month = 1 ; month <= 12 ; month++) {
+		// calevent = inccal_fetch (year, month);
+		for (var i = 0 ; i < 10 ; i++) {
+			eventid = "event" + (i + 1);
+			$ ("#eventbody").append ("<tr id = \"" + eventid + "\"></tr>");
+			$ ("#" + eventid).addClass ("event");
+			for (var j = 0 ; j < 4 ; j++) {
+				dataid = eventid + dataclass[j];
+				$ ("#" + eventid).append ("<td id = \"" + dataid + "\"></td>");
+				$ ("#" + dataid).addClass (dataclass[j]);
+				$ ("#" + dataid).attr ({"onclick":"togglecontent (this.id);"});
+			}
+			$ ("#eventbody").append ("<tr class = \"event\"><td id = \"" + eventid + "content\"></td></tr>");
+			$ ("#" + eventid + "content").addClass ("content");
+			$ ("#" + eventid + "content").attr ({"colspan":"4"});
+			$ ("#" + eventid + "content").css ("display", "none");
 		}
-		eventbody.appendChild (Event);
-	}
+	// }
 }
 
 function searchevent () {//搜尋符合的活動
@@ -67,4 +73,15 @@ function changesearchingbar (obj) {
 		$ ("#searchingdate").css ("display", "none");
 		$ ("#searchingcontent").css ("display", "inline");
 	}
+}
+
+function togglecontent (eventid) {
+	var contentid, i;
+	for (i = 5 ; i < eventid.length ; i++) {
+		if (!(eventid[i] >= '0' && eventid[i] <= '9')) {
+			break;
+		}
+	}
+	contentid = eventid.substring (0, i) + "content";
+	$ ("#" + contentid).toggle (250);
 }
\ No newline at end of file