inccal_send() 加入第三個參數

2 files changed, 11 insertions, 10 deletions

diff --git a/js/data.js b/js/data.js
index c2c8675..3cf4c53 100644
--- a/js/data.js
+++ b/js/data.js
@@ -127,7 +127,7 @@ function inccal_fetch(year, month){
 	status_bar_restore();
 }
 
-function inccal_send(calevt, do_func){
+function inccal_send(calevt, do_func, funcseconddata){
 	var rq = create_xmlhttp_object();
 	var str = "";
 	str = 'icon=' + encodeURIComponent(calevt.icon.toString()) + '&' +
@@ -153,7 +153,7 @@ function inccal_send(calevt, do_func){
 		if(rq.readyState == 4){
 			if(rq.status == 200){
 				if(do_func != null){
-					do_func(rq.responseText);
+					do_func(rq.responseText, funcseconddata);
 				}
 			}else{
 				status_bar_warning("伺服器回傳 " + rq.status.toString() + " 錯誤");
diff --git a/js/imnc.js b/js/imnc.js
index dc98022..d8ec68e 100644
--- a/js/imnc.js
+++ b/js/imnc.js
@@ -341,9 +341,6 @@ function imnc_review(){
 
 function imnc_singlesend(){
 	var i;
-	var resultobj = document.getElementById("ncimportresult");
-	var newbr;
-	var newtext;
 	document.getElementById("imntuceibacheck").style.display = "none";
 	document.getElementById("imntuceibacomplete").style.display = "block";
 	for(i=0; i<imnc_sendobjlist.length; i++){
@@ -351,11 +348,15 @@ function imnc_singlesend(){
 			if(document.getElementById("imncradio" + i.toString() + "create").checked){
 				imnc_sendobjlist.key = null;
 			}
-			newtext = document.createTextNode("送出第 " + (i+1).toString() + " 項資料");
-			newbr = document.createElement("br");
-			resultobj.appendChild(newtext);
-			resultobj.appendChild(newbr);
-			inccal_send(imnc_sendobjlist[i], null);
+			inccal_send(imnc_sendobjlist[i], function(keytrash, secdata){
+				var resultobj = document.getElementById("ncimportresult");
+				var newbr;
+				var newtext;
+				newtext = document.createTextNode("已儲存第 " + secdata.toString() + " 項資料");
+				newbr = document.createElement("br");
+				resultobj.appendChild(newtext);
+				resultobj.appendChild(newbr);
+			}, i+1);
 		}
 	}
 	status_bar_set("匯入工作已完成");