update all report generate and excel

2017-12-19 16:27:00 +06:30
parent aec3b17127
commit bba3aa7631
8 changed files with 31 additions and 13 deletions
--- a/app/views/reports/shiftsale/index.html.erb
+++ b/app/views/reports/shiftsale/index.html.erb
@@ -191,7 +191,10 @@
 		
 		function show_shift_name(period,period_type,from,to,shift_item){
 			var shift = $('#shift_name');
-			
+			if (from == '' && to == '') {
+				from = $("#from").val();
+	  		    to   = $("#to").val();
+			}
 			shift.empty();
 			
 			var str = '';