budget + wiev worker current position

SE/superedit-BUDGET_ANALYTICS.php

@@ -491,90 +491,90 @@ jQuery(document).ready(function () {
 				
 			union				
 				select `p`.`ID_PROJECT` AS `ID_PROJECT`
-					, concat(`p`.YEAR,'-04') AS `MONTH`
-					, p.MONTH_4_VALUE AS `COST`
+					, concat(`k`.YEAR,'-04') AS `MONTH`
+					, k.MONTH_4_VALUE AS `COST`
 					, 0 AS `INCOME`
 					, 'CHILD' AS `TYPE`
 				from `projects_budget_year_month` p
 					join `projects_budget_year_month` k
-						on k.`path` like concat('%-',`p`.`ID_PROJECT`,'-%')		
+						on k.`path` like concat('%-',`p`.`ID_PROJECT`,'-%')	and `p`.`YEAR`=`k`.`YEAR` and k.MONTH_4_VALUE > 0	
 				where `p`.`YEAR` > 0
 				
 			union				
 				select `p`.`ID_PROJECT` AS `ID_PROJECT`
-					, concat(`p`.YEAR,'-05') AS `MONTH`
-					, p.MONTH_5_VALUE AS `COST`
+					, concat(`k`.YEAR,'-05') AS `MONTH`
+					, k.MONTH_5_VALUE AS `COST`
 					, 0 AS `INCOME`
 					, 'CHILD' AS `TYPE`
 				from `projects_budget_year_month` p
 					join `projects_budget_year_month` k
-						on k.`path` like concat('%-',`p`.`ID_PROJECT`,'-%')		
+						on k.`path` like concat('%-',`p`.`ID_PROJECT`,'-%')	and `p`.`YEAR`=`k`.`YEAR` and k.MONTH_5_VALUE > 0		
 				where `p`.`YEAR` > 0
 				
 			union				
 				select `p`.`ID_PROJECT` AS `ID_PROJECT`
-					, concat(`p`.YEAR,'-06') AS `MONTH`
-					, p.MONTH_6_VALUE AS `COST`
+					, concat(`k`.YEAR,'-06') AS `MONTH`
+					, k.MONTH_6_VALUE AS `COST`
 					, 0 AS `INCOME`
 					, 'CHILD' AS `TYPE`
 				from `projects_budget_year_month` p
 					join `projects_budget_year_month` k
-						on k.`path` like concat('%-',`p`.`ID_PROJECT`,'-%')		
+						on k.`path` like concat('%-',`p`.`ID_PROJECT`,'-%')	and `p`.`YEAR`=`k`.`YEAR` and k.MONTH_6_VALUE > 0	
 				where `p`.`YEAR` > 0
 				
 			union				
 				select `p`.`ID_PROJECT` AS `ID_PROJECT`
-					, concat(`p`.YEAR,'-07') AS `MONTH`
-					, p.MONTH_7_VALUE AS `COST`
+					, concat(`k`.YEAR,'-07') AS `MONTH`
+					, k.MONTH_7_VALUE AS `COST`
 					, 0 AS `INCOME`
 					, 'CHILD' AS `TYPE`
 				from `projects_budget_year_month` p
 					join `projects_budget_year_month` k
-						on k.`path` like concat('%-',`p`.`ID_PROJECT`,'-%')		
+						on k.`path` like concat('%-',`p`.`ID_PROJECT`,'-%')	and `p`.`YEAR`=`k`.`YEAR` and k.MONTH_7_VALUE > 0		
 				where `p`.`YEAR` > 0
 				
 			union				
 				select `p`.`ID_PROJECT` AS `ID_PROJECT`
-					, concat(`p`.YEAR,'-08') AS `MONTH`
-					, p.MONTH_8_VALUE AS `COST`
+					, concat(`k`.YEAR,'-08') AS `MONTH`
+					, k.MONTH_8_VALUE AS `COST`
 					, 0 AS `INCOME`
 					, 'CHILD' AS `TYPE`
 				from `projects_budget_year_month` p
 					join `projects_budget_year_month` k
-						on k.`path` like concat('%-',`p`.`ID_PROJECT`,'-%')		
+						on k.`path` like concat('%-',`p`.`ID_PROJECT`,'-%')		and `p`.`YEAR`=`k`.`YEAR` and k.MONTH_8_VALUE > 0	
 				where `p`.`YEAR` > 0
 				
 			union				
 				select `p`.`ID_PROJECT` AS `ID_PROJECT`
-					, concat(`p`.YEAR,'-09') AS `MONTH`
-					, p.MONTH_9_VALUE AS `COST`
+					, concat(`k`.YEAR,'-09') AS `MONTH`
+					, k.MONTH_9_VALUE AS `COST`
 					, 0 AS `INCOME`
 					, 'CHILD' AS `TYPE`
 				from `projects_budget_year_month` p
 					join `projects_budget_year_month` k
-						on k.`path` like concat('%-',`p`.`ID_PROJECT`,'-%')		
+						on k.`path` like concat('%-',`p`.`ID_PROJECT`,'-%')	and `p`.`YEAR`=`k`.`YEAR` and k.MONTH_9_VALUE > 0
 				where `p`.`YEAR` > 0
 				
 			union				
 				select `p`.`ID_PROJECT` AS `ID_PROJECT`
-					, concat(`p`.YEAR,'-10') AS `MONTH`
-					, p.MONTH_10_VALUE AS `COST`
+					, concat(`k`.YEAR,'-10') AS `MONTH`
+					, k.MONTH_10_VALUE AS `COST`
 					, 0 AS `INCOME`
 					, 'CHILD' AS `TYPE`
 				from `projects_budget_year_month` p
 					join `projects_budget_year_month` k
-						on k.`path` like concat('%-',`p`.`ID_PROJECT`,'-%')		
+						on k.`path` like concat('%-',`p`.`ID_PROJECT`,'-%')		and `p`.`YEAR`=`k`.`YEAR` and k.MONTH_10_VALUE > 0	
 				where `p`.`YEAR` > 0
 				
 			union				
 				select `p`.`ID_PROJECT` AS `ID_PROJECT`
-					, concat(`p`.YEAR,'-11') AS `MONTH`
-					, p.MONTH_11_VALUE AS `COST`
+					, concat(`k`.YEAR,'-11') AS `MONTH`
+					, k.MONTH_11_VALUE AS `COST`
 					, 0 AS `INCOME`
 					, 'CHILD' AS `TYPE`
 				from `projects_budget_year_month` p
 					join `projects_budget_year_month` k
-						on k.`path` like concat('%-',`p`.`ID_PROJECT`,'-%')		
+						on k.`path` like concat('%-',`p`.`ID_PROJECT`,'-%')		and `p`.`YEAR`=`k`.`YEAR` and k.MONTH_11_VALUE > 0		
 				where `p`.`YEAR` > 0
 				
 			union				
@@ -585,7 +585,7 @@ jQuery(document).ready(function () {
 					, 'CHILD' AS `TYPE`
 				from `projects_budget_year_month` p
 					join `projects_budget_year_month` k
-						on k.`path` like concat('%-',`p`.`ID_PROJECT`,'-%')		
+						on k.`path` like concat('%-',`p`.`ID_PROJECT`,'-%')			and `p`.`YEAR`=`k`.`YEAR` and k.MONTH_12_VALUE > 0	
 				where `p`.`YEAR` > 0
 				
 			

SE/superedit-DB_PROCEDURES_CREATE.php

@@ -1381,6 +1381,12 @@ END
 
 
 
+//$sql['WORKER_GPS_LOG_current_view_drop']="DROP view if exists WORKER_GPS_LOG_current_view";
+
+//$sql['WORKER_GPS_LOG_current_view']="create view WORKER_GPS_LOG_current_view as  select * from  `WORKER_GPS_LOG` group by `A_RECORD_CREATE_AUTHOR` order by `ID` desc";
+
+
+
 foreach($sql as $ind=>$sql_) {
 	
 	if( is_array($sql_)) {