Merge branch 'master' of ssh://biuro.biall-net.pl:2222/plabudda/se

SE/se-lib/Route/UrlAction/WmsGenerate.php

@@ -3,6 +3,7 @@
 Lib::loadClass('RouteBase');
 Lib::loadClass('FoldersConfig');
 Lib::loadClass('FileUploader');
+Lib::loadClass('ProcesHelper');
 
 class Route_UrlAction_WmsGenerate extends RouteBase {
 
@@ -29,7 +30,7 @@ class Route_UrlAction_WmsGenerate extends RouteBase {
 		return $folderConf['mount_point'];
 	}
 
-	private function defaultAction_WMS_LAYERS($ID_WMS_LAYERS) {
+	private function defaultAction_WMS_LAYERS($ID_WMS_LAYERS,$REFERER) {
 		try {
 			$layer=DB::getPDO()->fetchall("select LAYER_TYPE,FILE_STATUS from WMS_LAYERS where ID='".$ID_WMS_LAYERS."'");
 			if (!$layer) throw new Exception('Błąd - nie ma takiej warstwy!');
@@ -65,7 +66,6 @@ class Route_UrlAction_WmsGenerate extends RouteBase {
 
 				$DataSources=$validateXml->xpath('/qgis/projectlayers/maplayer/datasource');
 				if (!$DataSources) throw new Exception('Plik projektu QGIS nie zawiera żadnej warstwy!');
-
 				$suffixes=array('.shp','.dbf','.shx');
 				$filesToCopy=array($files[0]);
 				$missingFiles=array();
@@ -97,9 +97,14 @@ class Route_UrlAction_WmsGenerate extends RouteBase {
 		} catch (Exception $e) {
 			SE_Layout::alert('danger',$e->getMessage());
 		}
+?>
+<div class="container" style="text-align:center">
+  <a href="<?php echo $REFERER?>" class="btn btn-primary">Powrót</a>
+</div>
+<?php
 	}
 
-	private function defaultAction_WMS_MAPS($ID_WMS_MAPS) {
+	private function defaultAction_WMS_MAPS($ID_WMS_MAPS,$REFERER) {
 		try {
 			$affected = DB::getDB()->UPDATE_OBJ('WMS_MAPS',(object) array('ID'=>$ID_WMS_MAPS,'MAP_STATUS'=>'TO_GENERATE','MAP_STATUS_INFO'=>'Mapa oczekuje na przetworzenie'));
 			if ($affected) SE_Layout::alert('success','Oznaczono mapę do ponownego wygenerowania.');
@@ -107,22 +112,89 @@ class Route_UrlAction_WmsGenerate extends RouteBase {
 		} catch (Exception $e) {
 			SE_Layout::alert('danger',$e->getMessage());
 		}
+?>
+<div class="container" style="text-align:center">
+  <a href="<?php echo $REFERER?>" class="btn btn-primary">Powrót</a>
+</div>
+<?php
+	}
+
+	private function defaultAction_WIZJE_LOKALNE($ID_WIZJE_LOKALNE,$REFERER) {
+		try {
+			SE_Layout::alert('warning','Funkcja w trakcie implementacji');
+			if (V::get('ID_WMS_LAYERS',0,$_POST,'int')!=0) {
+				//$ID=DB::getDB()->ADD_NEW_OBJ('WMS_LAYERS',(object) array('FILE_STATUS'=>'ERROR','FILE_STATUS_INFO'=>'Wystąpił błąd pliku qgs'));
+				$WmsLayerTableZasobId=ProcesHelper::getZasobTableID('WMS_LAYERS');
+?>
+<div class="container" style="text-align:center">
+  <a href="<?php echo $REFERER?>" class="btn btn-primary">Powrót</a>
+</div>
+<?php
+			} else {
+				$wizje=DB::getPDO()->fetchall("select WMS_LAYER_ID,LAYER_NAME from WIZJE_LOKALNE where ID='".$ID_WIZJE_LOKALNE."'");
+				if ($wizje[0]['WMS_LAYER_ID']) {
+					$layers=DB::getPDO()->fetchall("select LAYER_NAME,LAYER_TYPE from WMS_LAYERS where ID='".$wizje[0]['WMS_LAYER_ID']."'");
+					if ($layers[0]['LAYER_TYPE']!="GeoTIFF") throw new Exception("Niespójny typ wartstwy - należy zmienić typ warstwy ID ".$wizje[0]['WMS_LAYER_ID']." na GeoTIFF");
+					$LAYER_NAME=$layers[0]['LAYER_NAME'];
+				}
+				if (!$wizje) throw new Exception("Błędne ID z tabeli WIZJE_LOKALNE");
+?>
+<div class="container" style="margin-top:20px">
+<form class="form-horizontal" method="post">
+  <legend>Dodawanie pliku GeoTIFF do wartstwy WMS</legend>
+  <div class="form-group">
+    <label class="col-sm-1 control-label">Warstwa</label>
+    <div class="col-sm-11">
+      <select id="warstwa" class="form-control" name="ID_WMS_LAYERS"<?php if ($wizje[0]['WMS_LAYER_ID']) echo " disabled"?>>
+        <option value=<?php echo '"'.($wizje[0]['WMS_LAYER_ID']?$wizje[0]['WMS_LAYER_ID'].'">'.$LAYER_NAME:'-1">(Utwórz nową warstwę) '.$wizje[0]['LAYER_NAME'])?></option>
+<?php
+				if (!$wizje[0]['WMS_LAYER_ID']) {
+					$layers=DB::getPDO()->fetchall("select ID,LAYER_NAME from WMS_LAYERS where LAYER_TYPE='GeoTIFF' and A_STATUS='WAITING'");
+					foreach ($layers as $layer) echo '<option value="'.$layer['ID'].'">(Oczekująca warstwa) '.$layer['ID'].': '.$layer['LAYER_NAME'].'</option>\n';
+				}
+?>
+      </select>
+    </div>
+  </div>
+  <div class="form-group">
+    <label class="col-sm-1 control-label">Plik</label>
+    <div class="col-sm-11">
+	Tutaj będą pliki
+    </div>
+  </div>
+  <div class="form-group">
+    <div class="col-sm-offset-1 col-sm-11">
+      <button type="submit" class="btn btn-primary">Zapisz</button>
+      <a href="<?php echo $REFERER?>" class="btn btn-default">Anuluj</a>
+    </div>
+  </div>
+  <input type="hidden" name="WMS_REFERER" value="<?php echo $_SERVER['HTTP_REFERER']?>"/>
+</form>
+</div>
+
+<script>
+$('#warstwa').selectize({
+create: false,
+openOnFocus: false
+});
+</script>
+
+<?php
+			}
+		} catch (Exception $e) {
+			SE_Layout::alert('danger',$e->getMessage());
+		}
 	}
 
 	public function defaultAction() {
 		SE_Layout::gora();
-//		SE_Layout::menu();
-
-		if (V::get('ID_WMS_LAYERS',0,$_GET,'int')>0) $this->defaultAction_WMS_LAYERS(V::get('ID_WMS_LAYERS',0,$_GET,'int'));
-		elseif (V::get('ID_WMS_MAPS',0,$_GET,'int')>0) $this->defaultAction_WMS_MAPS(V::get('ID_WMS_MAPS',0,$_GET,'int'));
+		SE_Layout::menu();
+		if (V::get('WMS_REFERER','',$_POST)!='') $REFERER=V::get('WMS_REFERER','',$_POST);
+		else $REFERER=$_SERVER['HTTP_REFERER'];
+		if (V::get('ID_WMS_LAYERS',0,$_GET,'int')>0) $this->defaultAction_WMS_LAYERS(V::get('ID_WMS_LAYERS',0,$_GET,'int'),$REFERER);
+		elseif (V::get('ID_WMS_MAPS',0,$_GET,'int')>0) $this->defaultAction_WMS_MAPS(V::get('ID_WMS_MAPS',0,$_GET,'int'),$REFERER);
+		elseif (V::get('ID_WIZJE_LOKALNE',0,$_GET,'int')>0) $this->defaultAction_WIZJE_LOKALNE(V::get('ID_WIZJE_LOKALNE',0,$_GET,'int'),$REFERER);
 		else SE_Layout::alert('danger','Błąd parametru');
-
-		?>
-<div class="container" style="text-align:center">
-<!--	<a href="<?php echo $_SERVER['HTTP_REFERER']?>" class="btn btn-primary">Powrót</a>	-->
-	<button class="btn btn-primary" onClick="javascript:window.close()">Zamknij</button>
-</div>
-		<?php
 		SE_Layout::dol();
 	}
 
@@ -532,18 +604,24 @@ echo $layer['ID']."\n";
 	public function reinstall() {
 		$sqlList = array();
 		//$sqlList['RemoveTable'] = "DROP TABLE IF EXISTS `CRM_CONFIG`";
-/*		$sqlList['InstallTable'] = <<<SQL
+		$sqlList['InstallLayerTable'] = <<<SQL
 CREATE TABLE IF NOT EXISTS `WMS_LAYERS` (
   `ID` int(11) NOT NULL AUTO_INCREMENT,
   `the_geom` polygon NOT NULL,
   `ID_PROJECT` int(11) NOT NULL,
   `LAYER_NAME` varchar(100) NOT NULL,
+  `LAYER_TYPE` enum('GeoTIFF','QGIS') NOT NULL DEFAULT 'GeoTIFF',
+  `OLD_LAYER_TYPE` enum('GeoTIFF','QGIS') NOT NULL,
   `LAYER_DESC` text NOT NULL,
   `ID_WMS_MAPS` int(11) NOT NULL,
+  `OLD_ID_WMS_MAPS` int(11) NOT NULL,
   `FILE_NAME` varchar(255) NOT NULL,
   `FILE_STATUS` enum('NONE','TO_GENERATE','IN_PROGRESS','GENERATED','ERROR') NOT NULL DEFAULT 'NONE',
   `FILE_STATUS_INFO` varchar(255) NOT NULL,
   `EPSG` int(11) NOT NULL,
+  `EXTENT` varchar(100) NOT NULL,
+  `MAP_STATUS` enum('ACTIVE','INACTIVE') NOT NULL DEFAULT 'INACTIVE',
+  `FILE_MD5` varchar(32) NOT NULL,
   `A_RECORD_CREATE_DATE` datetime NOT NULL,
   `A_RECORD_CREATE_AUTHOR` varchar(40) NOT NULL,
   `A_RECORD_UPDATE_DATE` varchar(18) NOT NULL,
@@ -566,18 +644,25 @@ CREATE TABLE IF NOT EXISTS `WMS_LAYERS` (
 ) ENGINE=MyISAM  DEFAULT CHARSET=latin2;
 SQL;
 
-                $sqlList['InstallHistTable'] = <<<SQL
+                $sqlList['InstallLayerHistTable'] = <<<SQL
 CREATE TABLE IF NOT EXISTS `WMS_LAYERS_HIST` (
   `ID` int(11) NOT NULL AUTO_INCREMENT,
   `ID_USERS2` int(11) NOT NULL,
+  `the_geom` text,
   `ID_PROJECT` varchar(20) DEFAULT 'N/S;',
   `LAYER_NAME` varchar(100) DEFAULT 'N/S;',
-  `LAYER_DESC` varchar(10000) NOT NULL DEFAULT 'N/S;',
-  `ID_WMS_MAPS` varchar(255) DEFAULT 'N/S;',
+  `LAYER_TYPE` varchar(10) DEFAULT 'N/S;',
+  `OLD_LAYER_TYPE` varchar(10) DEFAULT 'N/S;',
+  `LAYER_DESC` varchar(10000) DEFAULT 'N/S;',
+  `ID_WMS_MAPS` varchar(20) DEFAULT 'N/S;',
+  `OLD_ID_WMS_MAPS` varchar(20) DEFAULT 'N/S;',
   `FILE_NAME` varchar(255) DEFAULT 'N/S;',
   `FILE_STATUS` varchar(20) DEFAULT 'N/S;',
   `FILE_STATUS_INFO` varchar(255) DEFAULT 'N/S;',
-  `EPSG` varchar(10) NOT NULL DEFAULT 'N/S;',
+  `EPSG` varchar(10) DEFAULT 'N/S;',
+  `EXTENT` varchar(100) DEFAULT 'N/S;',
+  `MAP_STATUS` varchar(20) DEFAULT 'N/S;',
+  `FILE_MD5` varchar(32) DEFAULT 'N/S;',
   `A_RECORD_CREATE_DATE` varchar(30) DEFAULT 'N/S;',
   `A_RECORD_CREATE_AUTHOR` varchar(40) DEFAULT 'N/S;',
   `A_RECORD_UPDATE_DATE` varchar(18) DEFAULT 'N/S;',
@@ -596,11 +681,73 @@ CREATE TABLE IF NOT EXISTS `WMS_LAYERS_HIST` (
   `A_ADM_COMPANY` varchar(100) DEFAULT 'N/S;',
   `A_CLASSIFIED` varchar(100) DEFAULT 'N/S;',
   `SYNC_SQIX_STATUS` varchar(100) DEFAULT 'N/S;',
-  `the_geom` varchar(255) NOT NULL DEFAULT 'N/S;',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=latin2;
 SQL;
-*/
+
+		$sqlList['InstallMapTable'] = <<<SQL
+CREATE TABLE IF NOT EXISTS `WMS_MAPS` (
+  `ID` int(11) NOT NULL AUTO_INCREMENT,
+  `MAP_NAME` varchar(100) NOT NULL,
+  `MAP_DESC` text NOT NULL,
+  `MAP_STATUS` enum('NONE','TO_GENERATE','IN_PROGRESS','GENERATED','ERROR') NOT NULL DEFAULT 'NONE',
+  `MAP_STATUS_INFO` varchar(255) NOT NULL,
+  `MAP_URL` varchar(100) NOT NULL,
+  `MAP_FILE` varchar(100) NOT NULL,
+  `A_RECORD_CREATE_DATE` datetime NOT NULL,
+  `A_RECORD_CREATE_AUTHOR` varchar(40) NOT NULL,
+  `A_RECORD_UPDATE_DATE` varchar(18) NOT NULL,
+  `A_RECORD_UPDATE_AUTHOR` varchar(40) NOT NULL,
+  `L_APPOITMENT_DATE` datetime NOT NULL,
+  `L_APPOITMENT_USER` varchar(40) NOT NULL,
+  `L_APPOITMENT_PERIOD` varchar(30) NOT NULL,
+  `L_APPOITMENT_INFO` varchar(200) NOT NULL,
+  `L_APPOITMENT_TYPE` enum('','ARRANGED','TO_ARRANGE','CANCELLED','TO_CANCEL','RELATE','WAIT') NOT NULL,
+  `A_PROBLEM` enum('','WARNING','PROBLEM','SERIOUS','UNVERIFIED') NOT NULL,
+  `A_PROBLEM_DESC` varchar(200) NOT NULL,
+  `A_PROBLEM_DATE` datetime NOT NULL,
+  `A_STATUS` enum('DELETED','MONITOR','NORMAL','OFF_HARD','OFF_SOFT','WAITING','WARNING') NOT NULL DEFAULT 'WAITING',
+  `A_STATUS_INFO` varchar(100) NOT NULL,
+  `A_STATUS_LASTCHANGE_DATE` datetime NOT NULL,
+  `A_ADM_COMPANY` varchar(100) NOT NULL,
+  `A_CLASSIFIED` varchar(100) NOT NULL,
+  `SYNC_SQIX_STATUS` varchar(100) NOT NULL,
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin2;
+SQL;
+
+		$sqlList['InstallMapHistTable'] = <<<SQL
+CREATE TABLE IF NOT EXISTS `WMS_MAPS_HIST` (
+  `ID` int(11) NOT NULL AUTO_INCREMENT,
+  `ID_USERS2` int(11) NOT NULL,
+  `MAP_NAME` varchar(100) DEFAULT 'N/S;',
+  `MAP_DESC` varchar(10000) NOT NULL DEFAULT 'N/S;',
+  `MAP_STATUS` varchar(20) NOT NULL DEFAULT 'N/S;',
+  `MAP_STATUS_INFO` varchar(255) NOT NULL DEFAULT 'N/S;',
+  `MAP_URL` varchar(100) NOT NULL DEFAULT 'N/S;',
+  `MAP_FILE` varchar(100) NOT NULL DEFAULT 'N/S;',
+  `A_RECORD_CREATE_DATE` varchar(30) DEFAULT 'N/S;',
+  `A_RECORD_CREATE_AUTHOR` varchar(40) DEFAULT 'N/S;',
+  `A_RECORD_UPDATE_DATE` varchar(18) DEFAULT 'N/S;',
+  `A_RECORD_UPDATE_AUTHOR` varchar(40) DEFAULT 'N/S;',
+  `L_APPOITMENT_DATE` varchar(30) DEFAULT 'N/S;',
+  `L_APPOITMENT_USER` varchar(40) DEFAULT 'N/S;',
+  `L_APPOITMENT_PERIOD` varchar(30) DEFAULT 'N/S;',
+  `L_APPOITMENT_INFO` varchar(200) DEFAULT 'N/S;',
+  `L_APPOITMENT_TYPE` varchar(255) DEFAULT 'N/S;',
+  `A_PROBLEM` varchar(255) DEFAULT 'N/S;',
+  `A_PROBLEM_DESC` varchar(200) DEFAULT 'N/S;',
+  `A_PROBLEM_DATE` varchar(255) DEFAULT 'N/S;',
+  `A_STATUS` varchar(255) DEFAULT 'N/S;',
+  `A_STATUS_INFO` varchar(100) DEFAULT 'N/S;',
+  `A_STATUS_LASTCHANGE_DATE` varchar(255) DEFAULT 'N/S;',
+  `A_ADM_COMPANY` varchar(100) DEFAULT 'N/S;',
+  `A_CLASSIFIED` varchar(100) DEFAULT 'N/S;',
+  `SYNC_SQIX_STATUS` varchar(100) DEFAULT 'N/S;',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin2;
+SQL;
+
 		$sqlList['ActivateWms'] = <<<SQL
 REPLACE INTO `CRM_CONFIG` (`CONF_KEY`,`CONF_VAL`) VALUES ('module_WMS','on');
 SQL;

SE/superedit-STATYSTYKA_TABELE.php

@@ -75,6 +75,24 @@ function STATYSTYKA_TABELE() {
  "; 
  }
 
+ 			{
+	 			//@2016-07 bindera: dodanie prostych raportow bledow brakujacych projektow do budynkow:
+		 $sqlList[]="drop view `BUILDINGS_Rozdzielcza_Kabel_Swiatlowodowy_wsg84_ERROR`;";
+		 		 $sqlList[]=" create view `BUILDINGS_Rozdzielcza_Kabel_Swiatlowodowy_wsg84_ERROR` as
+		 			 select b.ID, b.A_STATUS ,  b.S_ADDRESS_STREET, b.M_REWIR , 
+		 			 rks.ID as ID_KABEL, rks.A_STATUS as A_STATUS_KABEL, 'Brak zaplanowanego przylacza' as ERROR
+		 			 from BUILDINGS as b
+		 			 left join Rozdzielcza_Kabel_Swiatlowodowy_wsg84 as rks on b.ID=rks.ID_BUILDINGS
+		 			 where rks.ID is NULL  and b.A_STATUS in ('NORMAL','WAITING')";
+		 			 
+		 			 
+		 $sqlList[]="update BUILDINGS set `__Rozdzielcza_Kabel_Swiatlowodowy_wsg84`=null ; ";		 			 
+		 $sqlList[]="update BUILDINGS t1, Rozdzielcza_Kabel_Swiatlowodowy_wsg84 t2 set t1.__Rozdzielcza_Kabel_Swiatlowodowy_wsg84=t2.ID where t1.ID=t2.ID_BUILDINGS ; ";
+		 	
+		
+
+ 			}
+
 
 
  			{ //stworzenie widoku bledow w USERS2_MARKETING dot budynkow