a.binder 9 роки тому
батько
коміт
7c02e981d6
1 змінених файлів з 14 додано та 5 видалено
  1. 14 5
      SE/superedit-STATYSTYKA_TABELE.php

+ 14 - 5
SE/superedit-STATYSTYKA_TABELE.php

@@ -459,6 +459,7 @@ function STATYSTYKA_TABELE() {
 			$sqlList[] = " ALTER TABLE `USERS2_MARKETING_OVERWIEV` ADD PRIMARY KEY(`ID`) ";
 			$sqlList[] = " ALTER TABLE `USERS2_MARKETING_OVERWIEV` ADD PRIMARY KEY(`ID`) ";
 			$sqlList[] = " ALTER TABLE `USERS2_MARKETING_OVERWIEV` CHANGE `ID`  `ID` INT(11) NOT NULL AUTO_INCREMENT ";
 			$sqlList[] = " ALTER TABLE `USERS2_MARKETING_OVERWIEV` CHANGE `ID`  `ID` INT(11) NOT NULL AUTO_INCREMENT ";
 			$sqlList[] = " insert into `USERS2_MARKETING_OVERWIEV` \n {$sql}";
 			$sqlList[] = " insert into `USERS2_MARKETING_OVERWIEV` \n {$sql}";
+		
 		}
 		}
 
 
 		{// REWIRY STATSY - USERS2_MARKETING_OVERWIEV_REWIR
 		{// REWIRY STATSY - USERS2_MARKETING_OVERWIEV_REWIR
@@ -487,12 +488,12 @@ function STATYSTYKA_TABELE() {
 					) / count(USERS2_MARKETING.S_ADDRESS_STREET) * 100), 2) as ANKIET_I
 					) / count(USERS2_MARKETING.S_ADDRESS_STREET) * 100), 2) as ANKIET_I
 				, BUILDINGS.A_ADM_COMPANY
 				, BUILDINGS.A_ADM_COMPANY
 				, MK_Rewiry.the_geom , MK_Rewiry.A_STATUS
 				, MK_Rewiry.the_geom , MK_Rewiry.A_STATUS
-				, count(BUILDINGS.ID) as BUDYNKOW
-				, sum(if(BUILDINGS.A_STATUS='NORMAL',1,0)) as BUDYNKOW_NORMAL
-				, sum(if(BUILDINGS.A_STATUS='WAITING',1,0)) as BUDYNKOW_WAITING
+				, count(BUILDINGS.ID) as BUDYNKOW -- To jest bledne - poprawka potem - nie da sie tu policzyc
+				, sum(if(BUILDINGS.A_STATUS='NORMAL',1,0)) as BUDYNKOW_NORMAL -- to jest bledne - poprawka potem - nie da sie tu policzyc
+				, sum(if(BUILDINGS.A_STATUS='WAITING',1,0)) as BUDYNKOW_WAITING -- to jest bledne - poprawka potem - nie da sie tu policzyc
 				, MK_Rewiry.gis_square_ha_area
 				, MK_Rewiry.gis_square_ha_area
-				, MK_Rewiry.gis_square_ha_area/count(BUILDINGS.ID) as REWIR_BUILDINGS_DENSITY
-				, MK_Rewiry.gis_square_ha_area/count(USERS2_MARKETING.S_ADDRESS_STREET) as REWIR_HOMES_DENSITY
+				, 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
 				
 				
 			";
 			";
 			foreach ($COLSFORSTATS as $FFS) {
 			foreach ($COLSFORSTATS as $FFS) {
@@ -546,6 +547,14 @@ function STATYSTYKA_TABELE() {
 			$sqlList[] = " ALTER TABLE `USERS2_MARKETING_OVERWIEV_REWIR` ADD PRIMARY KEY(`ID`) ";
 			$sqlList[] = " ALTER TABLE `USERS2_MARKETING_OVERWIEV_REWIR` ADD PRIMARY KEY(`ID`) ";
 			$sqlList[] = " ALTER TABLE `USERS2_MARKETING_OVERWIEV_REWIR` CHANGE `ID`  `ID` INT(11) NOT NULL AUTO_INCREMENT ";
 			$sqlList[] = " ALTER TABLE `USERS2_MARKETING_OVERWIEV_REWIR` CHANGE `ID`  `ID` INT(11) NOT NULL AUTO_INCREMENT ";
 			$sqlList[] = " insert into `USERS2_MARKETING_OVERWIEV_REWIR` \n {$sql}";
 			$sqlList[] = " insert into `USERS2_MARKETING_OVERWIEV_REWIR` \n {$sql}";
+			
+			
+			$sqlList[]="UPDATE  `USERS2_MARKETING_OVERWIEV_REWIR` AS t1 SET t1.BUDYNKOW = ( SELECT COUNT( t2.ID )  FROM BUILDINGS AS t2 WHERE t1.M_REWIR = t2.M_REWIR ) ";
+			$sqlList[]="UPDATE  `USERS2_MARKETING_OVERWIEV_REWIR` AS t1 SET t1.BUDYNKOW_NORMAL = ( SELECT COUNT( t2.ID )  FROM BUILDINGS AS t2 WHERE t1.M_REWIR = t2.M_REWIR and t2.A_STATUS='NORMAL') ";
+			$sqlList[]="UPDATE  `USERS2_MARKETING_OVERWIEV_REWIR` AS t1 SET t1.BUDYNKOW_WAITING = ( SELECT COUNT( t2.ID )  FROM BUILDINGS AS t2 WHERE t1.M_REWIR = t2.M_REWIR and t2.A_STATUS='WAITING') ";
+			$sqlList[]="UPDATE  `USERS2_MARKETING_OVERWIEV_REWIR` AS t1 SET t1.REWIR_BUILDINGS_DENSITY = t1.BUDYNKOW/t1.gis_square_ha_area  ";
+
+			
 		}
 		}
 
 
 		{// add fields to USERS2_MARKETING_OVERWIEV
 		{// add fields to USERS2_MARKETING_OVERWIEV