[13620] TA RTA2010 รายงานสรุปสิทธิลาพักร้อน - ใช้ไป, คงเหลือ

XML/DBXML/TA/TAR_VACATION_BKK.xml

@@ -14,7 +14,7 @@
 	<TABLE name="meventgrp" status="" central="false" out="inquiry">
 		<FIELD>eventgrpid</FIELD>
 		<FIELD>tdesc</FIELD>
-		<FIELD>edsec</FIELD>
+		<FIELD>edesc</FIELD>
 		<FIELD>daytype</FIELD>
 		<FIELD>companyid</FIELD>
 		<ORDER>
@@ -62,7 +62,7 @@
 	<TABLE name="mtime0" status="" central="memployee" out="inquiry">
 		<FIELD>time0id</FIELD>
 		<FIELD>tdesc</FIELD>
-		<FIELD>edsec</FIELD>
+		<FIELD>edesc</FIELD>
 		<FIELD>hour_d</FIELD>
 		<FIELD>companyid</FIELD>
 		<ORDER>

XML/REPORTXML/TA/TAR_BKKVAC.xml

@@ -14,7 +14,7 @@
 	</VFIELD>
 
 	<FIXFILTER>
-		<FIELD tablename="tleave_summary" value="lv_type in (select eventgrpid from meventgrp where daytype = '7')" ></FIELD>
+		<FIELD tablename="tleave_summary" value="" ></FIELD>
 	</FIXFILTER>
 
 	<GROUP>

hrAppWeb.war/TA/TAR_BKKVAC.jsp

@@ -50,7 +50,7 @@ function MM_swapImage() { //v3.0
   var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
    if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
 }
-function back(){
+/*function back(){
 	var z=0;
 	with(document.cscform){
 	 for(z=0;z<elements.length;z++){
@@ -59,8 +59,23 @@ function back(){
 	}
 	setFilter();
 	window.close();
-}
+}*/
 
+function back(){
+	var sql = "lv_type in (select eventgrpid from meventgrp where daytype = '7')";
+	with(document.cscform){
+		var startDate = __STARTDATE.value;
+		var endDate = __ENDDATE.value;
+		var arrStartDate = startDate.split("-");
+		var arrEndDate = endDate.split("-");
+		if(startDate.length>0 && endDate.length>0){
+			sql += " and dateid between '"+arrStartDate[2]+"-"+arrStartDate[1]+"-"+arrStartDate[0]+"' and '"+arrEndDate[2]+"-"+arrEndDate[1]+"-"+arrEndDate[0]+"'";
+			console.log(sql);
+		}
+	}
+	window.opener.document.cscform.__fixfiltertleave_summary.value = sql;
+	window.close();
+}
 
 function setParent(inputName,inputValue){
 	with(window.opener.document.cscform){