do analiz rewirow koszty planowane i wykonane

SE/superedit-BUDGET_ANALYTICS.php

@@ -329,7 +329,268 @@ jQuery(document).ready(function () {
 					and (k.`path` like concat('%-',`p`.`ID`,'-%'))))
 				)
 			group by `p`.`ID`, date_format(k.`K_DATA_OTRZYMANEJ_KORESP`, '%Y-%m')
+					
+			
+			
 		";
+		
+		$sql['test_budget_project_synthetics_plans_view_33'] = "
+				CREATE or REPLACE VIEW `test_budget_project_synthetics_plans_view` AS
+
+				select `p`.`ID_PROJECT` AS `ID_PROJECT`
+					, concat(`p`.YEAR,'-01') AS `MONTH`
+					, p.MONTH_1_VALUE AS `COST`
+					, 0 AS `INCOME`
+					, 'SELF' AS `TYPE`
+				from `projects_budget_year_month` `p` where `p`.`YEAR` > 0
+			union	
+				select `p`.`ID_PROJECT` AS `ID_PROJECT`
+					, concat(`p`.YEAR,'-02') AS `MONTH`
+					, p.MONTH_2_VALUE AS `COST`
+					, 0 AS `INCOME`
+					, 'SELF' AS `TYPE`
+				from `projects_budget_year_month` `p` where `p`.`YEAR` > 0
+			union	
+				select `p`.`ID_PROJECT` AS `ID_PROJECT`
+					, concat(`p`.YEAR,'-03') AS `MONTH`
+					, p.MONTH_3_VALUE AS `COST`
+					, 0 AS `INCOME`
+					, 'SELF' AS `TYPE`
+				from `projects_budget_year_month` `p` where `p`.`YEAR` > 0
+			
+			union	
+				select `p`.`ID_PROJECT` AS `ID_PROJECT`
+					, concat(`p`.YEAR,'-04') AS `MONTH`
+					, p.MONTH_4_VALUE AS `COST`
+					, 0 AS `INCOME`
+					, 'SELF' AS `TYPE`
+				from `projects_budget_year_month` `p` where `p`.`YEAR` > 0
+				
+				
+			union	
+				select `p`.`ID_PROJECT` AS `ID_PROJECT`
+					, concat(`p`.YEAR,'-05') AS `MONTH`
+					, p.MONTH_5_VALUE AS `COST`
+					, 0 AS `INCOME`
+					, 'SELF' AS `TYPE`
+				from `projects_budget_year_month` `p` where `p`.`YEAR` > 0
+			union	
+				select `p`.`ID_PROJECT` AS `ID_PROJECT`
+					, concat(`p`.YEAR,'-06') AS `MONTH`
+					, p.MONTH_6_VALUE AS `COST`
+					, 0 AS `INCOME`
+					, 'SELF' AS `TYPE`
+				from `projects_budget_year_month` `p` where `p`.`YEAR` > 0
+			
+			union	
+				select `p`.`ID_PROJECT` AS `ID_PROJECT`
+					, concat(`p`.YEAR,'-07') AS `MONTH`
+					, p.MONTH_7_VALUE AS `COST`
+					, 0 AS `INCOME`
+					, 'SELF' AS `TYPE`
+				from `projects_budget_year_month` `p` where `p`.`YEAR` > 0
+
+
+	
+			union	
+				select `p`.`ID_PROJECT` AS `ID_PROJECT`
+					, concat(`p`.YEAR,'-08') AS `MONTH`
+					, p.MONTH_8_VALUE AS `COST`
+					, 0 AS `INCOME`
+					, 'SELF' AS `TYPE`
+				from `projects_budget_year_month` `p` where `p`.`YEAR` > 0
+			union	
+				select `p`.`ID_PROJECT` AS `ID_PROJECT`
+					, concat(`p`.YEAR,'-09') AS `MONTH`
+					, p.MONTH_9_VALUE AS `COST`
+					, 0 AS `INCOME`
+					, 'SELF' AS `TYPE`
+				from `projects_budget_year_month` `p` where `p`.`YEAR` > 0
+			
+			union	
+				select `p`.`ID_PROJECT` AS `ID_PROJECT`
+					, concat(`p`.YEAR,'-10') AS `MONTH`
+					, p.MONTH_10_VALUE AS `COST`
+					, 0 AS `INCOME`
+					, 'SELF' AS `TYPE`
+				from `projects_budget_year_month` `p` where `p`.`YEAR` > 0
+	
+			union	
+				select `p`.`ID_PROJECT` AS `ID_PROJECT`
+					, concat(`p`.YEAR,'-11') AS `MONTH`
+					, p.MONTH_11_VALUE AS `COST`
+					, 0 AS `INCOME`
+					, 'SELF' AS `TYPE`
+				from `projects_budget_year_month` `p` where `p`.`YEAR` > 0
+			union	
+				select `p`.`ID_PROJECT` AS `ID_PROJECT`
+					, concat(`p`.YEAR,'-12') AS `MONTH`
+					, p.MONTH_12_VALUE AS `COST`
+					, 0 AS `INCOME`
+					, 'SELF' AS `TYPE`
+				from `projects_budget_year_month` `p` where `p`.`YEAR` > 0
+			
+
+			union				
+				select `p`.`ID_PROJECT` AS `ID_PROJECT`
+					, concat(`p`.YEAR,'-01') AS `MONTH`
+					, p.MONTH_1_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`,'-%')		
+				where `p`.`YEAR` > 0
+				
+				
+			union				
+				select `p`.`ID_PROJECT` AS `ID_PROJECT`
+					, concat(`p`.YEAR,'-01') AS `MONTH`
+					, p.MONTH_1_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`,'-%')		
+				where `p`.`YEAR` > 0
+
+			-- childs	
+
+			union				
+				select `p`.`ID_PROJECT` AS `ID_PROJECT`
+					, concat(`k`.YEAR,'-01') AS `MONTH`
+					, k.MONTH_1_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`,'-%')	and `p`.`YEAR`=`k`.`YEAR`  and k.MONTH_1_VALUE > 0
+				where `p`.`YEAR` > 0
+				
+			union				
+				select `p`.`ID_PROJECT` AS `ID_PROJECT`
+					, concat(`k`.YEAR,'-02') AS `MONTH`
+					, k.MONTH_2_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`,'-%')	and `p`.`YEAR`=`k`.`YEAR` and k.MONTH_2_VALUE > 0
+				where `p`.`YEAR` > 0
+				
+			union				
+				select `p`.`ID_PROJECT` AS `ID_PROJECT`
+					, concat(`k`.YEAR,'-03') AS `MONTH`
+					, k.MONTH_3_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`,'-%')	and `p`.`YEAR`=`k`.`YEAR` and k.MONTH_3_VALUE > 0
+				where `p`.`YEAR` > 0
+				
+			union				
+				select `p`.`ID_PROJECT` AS `ID_PROJECT`
+					, concat(`p`.YEAR,'-04') AS `MONTH`
+					, p.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`,'-%')		
+				where `p`.`YEAR` > 0
+				
+			union				
+				select `p`.`ID_PROJECT` AS `ID_PROJECT`
+					, concat(`p`.YEAR,'-05') AS `MONTH`
+					, p.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`,'-%')		
+				where `p`.`YEAR` > 0
+				
+			union				
+				select `p`.`ID_PROJECT` AS `ID_PROJECT`
+					, concat(`p`.YEAR,'-06') AS `MONTH`
+					, p.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`,'-%')		
+				where `p`.`YEAR` > 0
+				
+			union				
+				select `p`.`ID_PROJECT` AS `ID_PROJECT`
+					, concat(`p`.YEAR,'-07') AS `MONTH`
+					, p.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`,'-%')		
+				where `p`.`YEAR` > 0
+				
+			union				
+				select `p`.`ID_PROJECT` AS `ID_PROJECT`
+					, concat(`p`.YEAR,'-08') AS `MONTH`
+					, p.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`,'-%')		
+				where `p`.`YEAR` > 0
+				
+			union				
+				select `p`.`ID_PROJECT` AS `ID_PROJECT`
+					, concat(`p`.YEAR,'-09') AS `MONTH`
+					, p.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`,'-%')		
+				where `p`.`YEAR` > 0
+				
+			union				
+				select `p`.`ID_PROJECT` AS `ID_PROJECT`
+					, concat(`p`.YEAR,'-10') AS `MONTH`
+					, p.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`,'-%')		
+				where `p`.`YEAR` > 0
+				
+			union				
+				select `p`.`ID_PROJECT` AS `ID_PROJECT`
+					, concat(`p`.YEAR,'-11') AS `MONTH`
+					, p.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`,'-%')		
+				where `p`.`YEAR` > 0
+				
+			union				
+				select `p`.`ID_PROJECT` AS `ID_PROJECT`
+					, concat(`k`.YEAR,'-12') AS `MONTH`
+					, k.MONTH_12_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`,'-%')		
+				where `p`.`YEAR` > 0
+				
+			
+			";
+		
 		$sql['test_budget_project_analytics_view_2'] = "
 			CREATE VIEW `test_budget_project_synthetics_view` AS
 			select `t1`.`ID_PROJECT` AS `ID_PROJECT`

SE/superedit-STATYSTYKA_TABELE.php

@@ -578,6 +578,10 @@ function STATYSTYKA_TABELE() {
 				, count(BUILDINGS.ID)/MK_Rewiry.gis_square_ha_area as REWIR_BUILDINGS_DENSITY -- to jest bledne - poprawka potem - nie da sie tu policzyc
 				, count(USERS2_MARKETING.S_ADDRESS_STREET)/MK_Rewiry.gis_square_ha_area as REWIR_HOMES_DENSITY
 				, BUILDINGS.A_CLASSIFIED
+				, sum(budget_syn.COST) as budget_syn_COST
+				, sum(budget_plans.COST) as budget_plans_COST
+				, sum(budget_plans.COST) - sum(budget_syn.COST) as budget_syn_COST_rest
+				, GREATEST(sum(budget_plans.COST), sum(budget_syn.COST))/count(USERS2_MARKETING.S_ADDRESS_STREET) as budget_plans_div_HP
 
 			";
 			foreach ($COLSFORSTATS as $FFS) {
@@ -619,6 +623,10 @@ function STATYSTYKA_TABELE() {
 				from USERS2_MARKETING as USERS2_MARKETING
 					left join BUILDINGS on BUILDINGS.S_ADDRESS_STREET=USERS2_MARKETING.T_TELBOX_BUILDING_IN
 					left join MK_Rewiry on MK_Rewiry.NAZWA_REWI=BUILDINGS.M_REWIR
+					left join test_budget_project_synthetics_view as budget_costs on budget_syn.ID_PROJECT=MK_Rewiry.ID_PROJECT 
+					left join test_budget_project_synthetics_plans_view as budget_plans on budget_plans.ID_PROJECT=MK_Rewiry.ID_PROJECT 
+
+					
 				where USERS2_MARKETING.A_STATUS!='DELETED' and BUILDINGS.A_STATUS!='DELETED'
 				group by USERS2_MARKETING.M_REWIR
 				order by USERS2_MARKETING.M_REWIR DESC ,USERS2_MARKETING.T_TELBOX_BUILDING_IN