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

SE/budynki-DODAJ_REKORDY_MIESZKAN.php

@@ -4,6 +4,7 @@ if (!$_GET['DODAJ_REKORDY_MIESZKAN']) {
 	die('404');
 }
 
+die('wylaczone na rzecz funkcji superedit-DODAJ....php');
 
 echo '<br /><br />';
 echo '<h3>' . "DODAWANIE ZASOBOW MIESZKANIOWYCH DO BAZY MARKETINGOWEJ USERS2_MARKETING " . '</h3>';

SE/procesy5.php

@@ -1988,7 +1988,13 @@ function tree_callback__show_item_from_CRM_PROCES( &$r, &$tree ) {
 		echo' ';
 
 		if ($tree->get_param('ProcesTblId') > 0) {
-			echo App::link("E", "index.php?MENU_INIT=VIEWTABLE_AJAX&ZASOB_ID=".$tree->get_param('ProcesTblId')."#EDIT/".$r->ID, array('title'=>'Edytuj', 'class'=>'btn-p5'));
+			// rem@2016-08 sqix link do nowy edytor: 
+			if($r->TYPE == 'PROCES_INIT') {
+				echo App::link("E", "index.php?_route=UrlAction_ProcesEditor&id=".$r->ID, array('title'=>'Edytuj', 'class'=>'btn-p5'));
+			} else { 
+				echo App::link("E", "index.php?MENU_INIT=VIEWTABLE_AJAX&ZASOB_ID=".$tree->get_param('ProcesTblId')."#EDIT/".$r->ID, array('title'=>'Edytuj', 'class'=>'btn-p5'));
+			}
+
 		}
 		else {
 			echo App::link("E", array('task'=>"CRM_PROCES", 'EDIT'=>$r->ID), array('title'=>'Edytuj', 'class'=>'btn-p5'));

SE/static/procesEditor.js

@@ -14,7 +14,7 @@ $(document).ready(function() {
         [2, "Tylko do odczytu", "R"],
         [3, "Odczyt, zapis, wykonanie", "R,W,X"],
         [4, "Odczyt, zapis, wykonanie, tworzenie", "R,W,X,C"],
-        [5, "Odczyt i wyknanie", "R,X"],
+        [5, "Odczyt i wykonanie", "R,X"],
         [6, "Tylko do odczytu", "R"],
         [7, "MAPA PROCESU  - opis mapy procesu", ""],
         [9, "Tylko do tworzenia rekordu", "C"],

SE/superedit-ANALIZA_HISTORII_ALL.php

@@ -217,7 +217,7 @@ $zasob_tabeli_hist=ProcesHelper::getZasobTableID('_ANALIZA_HISTORII_ALL');
 ANALIZA_HISTORII_ALL <form action='' METHOD='GET'>
 <input type="hidden" name="ADD" value="ADD">
 <input type="hidden" name="MENU_INIT" value="ANALIZA_HISTORII_ALL">
-Czy odbudować na nowo tabelę _ANALIZA_HISTORII_ALL ?<input type="checkbox" name="REBUILD_ANALIZA_HISTORII_ALL_TABLE"> 
+Czy odbudować na nowo tabelę _ANALIZA_HISTORII_ALL ?<input type="checkbox" name="REBUILD_ANALIZA_HISTORII_ALL_TABLE" selected="true"> 
 
 <a href=index.php?MENU_INIT=VIEWTABLE_AJAX&ZASOB_ID=<?php echo $zasob_tabeli_hist; ?> >Przeglądanie</a>
 
@@ -482,7 +482,7 @@ if(V::get('DBG', '', $_GET)){echo'<pre style="max-height:200px;overflow:auto;bor
 								if(($value!='N/S;')and($field!='_action_time')and($field!='_action_type')and($field!='the_geom' and $value!='')) {
 								if(strlen($value>10000)) $value='DATA OVER 10000bytes';
 								$sql="insert ignore into _ANALIZA_HISTORII_ALL( TABLE_NAME, TABLE_ID,FIELD,VALUE,A_RECORD_CREATE_DATE,A_RECORD_CREATE_AUTHOR,A_RECORD_UPDATE_DATE,A_RECORD_UPDATE_AUTHOR ) values (
-								  '{$RTH_A['TABLE_HIST']}','{$h->ID}','{$field}','".DB::_($value)."','{$h->A_RECORD_CREATE_DATE}','{$h->A_RECORD_CREATE_AUTHOR}','{$h->A_RECORD_UPDATE_DATE}','{$h->A_RECORD_UPDATE_AUTHOR}' )";
+								  '{$RTH_A['TABLE_HIST']}','{$h->ID_USERS2}','{$field}','".DB::_($value)."','{$h->A_RECORD_CREATE_DATE}','{$h->A_RECORD_CREATE_AUTHOR}','{$h->A_RECORD_UPDATE_DATE}','{$h->A_RECORD_UPDATE_AUTHOR}' )";
 								  //echo "<br>".$sql;
 								  DB::query($sql) or die($sql);
 								  }

SE/superedit-ANALIZA_WIDOKOW_RAPORT_DAILY.php

@@ -0,0 +1,287 @@
+<?php
+
+function ANALIZA_WIDOKOW_RAPORT_DAILY() {
+	global $result;
+
+	SE_Layout::menu();
+
+	$_GET['F_LIMIT'] = V::get('F_LIMIT', 50, $_GET, 'int');
+	$_GET['TABLES_LIKE'] = V::get('TABLES_LIKE', '', $_GET);
+		
+	
+	$__install = V::get('__install', '', $_GET); 
+	$db = DB::getDB();
+
+
+
+
+	Lib::LoadClass('InstallerHelper') ;
+
+
+
+	if(!empty($__install)) { 
+	//TODO example
+	 $installer=new InstallerHelper(); //('new_parent_option','NEW_TABLE');
+	 $new_MYSQL_SCHEMA = $installer->new_child('MYSQL_SCHEMA');
+		 $new_table = $new_MYSQL_SCHEMA->new_child('TABLES');
+		 	$new_table->set_option('Table_type','BASE TABLE');
+		 	$new_table->set_option('NAME','_ANALIZA_WIDOKOW_RAPORT_DAILY');
+
+		 		$new_table_field = $new_table->new_child('FIELDS');
+		 		$new_table_field->set_option('Field','ID');
+		 		$new_table_field->set_option('Null','NO');
+		 		$new_table_field->set_option('Key','PRI');
+		 		$new_table_field->set_option('Default','');
+		 		$new_table_field->set_option('Extra','auto_increment');
+		 		$new_table_field_id = $new_table_field->new_child('Type');
+		 			$new_table_field_id_int = $new_table_field_id->new_child('int');
+		 			$new_table_field_id_int->set_option('M','11');
+
+
+	 	DEBUG_S(-3,'new_table_field',$new_table_field);
+
+		// 		unset($new_table_field);unset($new_table_field_id);unset($new_table_field_id_int);
+
+		 		$new_table_field = $new_table->new_child('FIELDS');
+		 		$new_table_field->set_option('Field','TABLE_NAME');
+		 		$new_table_field->set_option('Null','NO');
+		 		$new_table_field->set_option('Key','');
+		 		$new_table_field->set_option('Default','');
+		 		$new_table_field->set_option('Extra','auto_increment');
+		 		$new_table_field_id = $new_table_field->new_child('Type');
+		 			$new_table_field_id_int = $new_table_field_id->new_child('varchar');
+		 			$new_table_field_id_int->set_option('M','255');		 	
+
+		 DEBUG_S(-3,'new_table_field',$new_table_field);
+
+		 
+		 		$new_table_field = $new_table->new_child('FIELDS');
+		 		$new_table_field->set_option('Field','COUNT');
+		 		$new_table_field->set_option('Null','NO');
+		 		$new_table_field->set_option('Key','');
+		 		$new_table_field->set_option('Default','');
+		 		$new_table_field->set_option('Extra','auto_increment');
+		 		$new_table_field_id = $new_table_field->new_child('Type');
+		 			$new_table_field_id_int = $new_table_field_id->new_child('int');
+		 			$new_table_field_id_int->set_option('M','11');		 	
+   		 
+ 		 		$new_table_field = $new_table->new_child('FIELDS');
+		 		$new_table_field->set_option('Field','FIELD');
+		 		$new_table_field->set_option('Null','NO');
+		 		$new_table_field->set_option('Key','');
+		 		$new_table_field->set_option('Default','');
+		 		$new_table_field->set_option('Extra','auto_increment');
+		 		$new_table_field_id = $new_table_field->new_child('Type');
+		 			$new_table_field_id_int = $new_table_field_id->new_child('varchar');
+		 			$new_table_field_id_int->set_option('M','255');		 	
+
+   				
+ 		 		   							  							
+		 		$new_table_field = $new_table->new_child('FIELDS');
+		 		$new_table_field->set_option('Field','VALUE');
+		 		$new_table_field->set_option('Null','NO');
+		 		$new_table_field->set_option('Key','');
+		 		$new_table_field->set_option('Default','');
+		 		$new_table_field->set_option('Extra','auto_increment');
+		 		$new_table_field_id = $new_table_field->new_child('Type');
+		 			$new_table_field_id_int = $new_table_field_id->new_child('text');
+   			
+	
+
+ 
+		 		$new_table_field = $new_table->new_child('FIELDS');
+		 		$new_table_field->set_option('Field','A_RECORD_CREATE_DATE');
+		 		$new_table_field->set_option('Null','NO');
+		 		$new_table_field->set_option('Key','');
+		 		$new_table_field->set_option('Default','');
+		 		$new_table_field->set_option('Extra','auto_increment');
+		 		$new_table_field_id = $new_table_field->new_child('Type');
+		 			$new_table_field_id_int = $new_table_field_id->new_child('varchar');
+		 			$new_table_field_id_int->set_option('M','30');		 	
+
+  		
+  		
+		 		$new_table_index = $new_table->new_child('INDEX');
+		 		$new_table_index->set_option('Key_name','TABLE_NAME');
+		 		
+		 		$new_table_index_col = $new_table_index->new_child('Column_name');
+		 			$new_table_index_col->set_option('column','TABLE_NAME');
+		 		$new_table_index_col = $new_table_index->new_child('Column_name');
+		 			$new_table_index_col->set_option('column','VALUE');
+		 		$new_table_index_col = $new_table_index->new_child('Column_name');
+		 			$new_table_index_col->set_option('column','FIELD');
+		 		$new_table_index_col = $new_table_index->new_child('Column_name');
+		 			$new_table_index_col->set_option('column','A_RECORD_CREATE_DATE');
+
+
+		
+
+
+
+//	 $new_table_index = $new_table->new_child('INDEX');
+
+//	 $new_table_field = $new_table_field->set_option('TABLE_FIELD_TYPE','INT');
+//
+//	 $new_table_field = $new_table->new_child('TABLE_FIELD');
+//	 $new_table_field = $new_table_field->set_option('TABLE_FIELD_NAME','A_RECORD_UPDATE_DATE');
+//	 $new_table_field = $new_table_field->set_option('TABLE_FIELD_TYPE','VARCHAR');
+//	 $new_table_field = $new_table_field->set_option('TABLE_FIELD_LENGHT','100');
+
+	
+	// $new_table->NEW_TABLE('dupa');
+
+
+
+
+
+	 
+	 	DEBUG_S(-3,'installer',$installer);
+	 	DEBUG_S(-3,'new_MYSQL_SCHEMA',$new_MYSQL_SCHEMA);
+	 	DEBUG_S(-3,'new_table',$new_table);
+	 	DEBUG_S(-3,'new_table_field',$new_table_field);
+	 	
+	// 	DEBUG_S(-3,'new_table',$new_table);
+
+	//$install->__add_req_option('table');
+	$installer->__install(); //@2016-08-05 TODO bindera - dla czego to sie nie wykonalo???
+	
+	//$table->get_options_status();
+	
+	//var_dump($install);
+	
+   	 //InstallerHelper::__install();
+   	 
+//   	 die('umarlem');
+	
+	}
+
+
+
+Lib::loadClass('ProcesHelper');
+$zasob_tabeli_hist=ProcesHelper::getZasobTableID('ANALIZA_WIDOKOW_RAPORT_DAILY');
+
+?>
+ANALIZA_WIDOKOW_RAPORT_DAILY <form action='' METHOD='GET'>
+<input type="hidden" name="ADD" value="ADD">
+<input type="hidden" name="MENU_INIT" value="ANALIZA_WIDOKOW_RAPORT_DAILY">
+
+<a href=index.php?MENU_INIT=VIEWTABLE_AJAX&ZASOB_ID=<?php echo $zasob_tabeli_hist; ?> >Przeglądanie</a>
+
+
+<br>Czy zainstalować moduł ANALIZA_WIDOKOW_RAPORT_DAILY ?<input type="checkbox" name="__install"> 
+
+<table border=1>
+	<tr>
+		<td>Uruchomienie analizy statusow</td>
+		
+	</tr>
+	<tr>
+		<td colspan=1><input type="submit" name="ANALIZA_WIDOKOW_RAPORT_DAILY" value="ANALIZA_WIDOKOW_RAPORT_DAILY"></td>
+	</tr>
+	
+	</table>
+	
+
+<?php
+
+	$RAPORT['IGNORE_TABLES'][] = "AUTOSHAPE";
+	$RAPORT['IGNORE_TABLES'][] = "crm_proces_idx_group_to_init_view";
+	$RAPORT['IGNORE_TABLES'][] = "crm_proces_idx_table_to_proces_grouped_view";
+	$RAPORT['IGNORE_TABLES'][] = "crm_proces_idx_table_to_proces_perms_view";
+	$RAPORT['IGNORE_TABLES'][] = "crm_proces_idx_table_to_proces_view";
+	$RAPORT['IGNORE_TABLES'][] = "crm_proces_idx_table_to_user_view";
+	$RAPORT['IGNORE_TABLES'][] = "crm_proces_idx_tables_info_view";
+	$RAPORT['IGNORE_TABLES'][] = "crm_proces_idx_url_to_proces_view";
+	$RAPORT['IGNORE_TABLES'][] = "crm_proces_idx_user_to_init_view";
+	$RAPORT['IGNORE_TABLES'][] = "_TASKS_INFO_trigger";
+	$RAPORT['IGNORE_TABLES'][] = "budget_project_to_realization_view";
+	$RAPORT['IGNORE_TABLES'][] = "crm_proces_idx_user_to_proces_view";
+	$RAPORT['IGNORE_TABLES'][] = "CRM_PROCES_idx_GROUP_to_PROCES";
+	$RAPORT['IGNORE_TABLES'][] = "CRM_AUTH_PROFILE";
+	$RAPORT['IGNORE_TABLES'][] = "CRM_CONFIG";
+	$RAPORT['IGNORE_TABLES'][] = "CRM_CZYNNOSCI";
+	$RAPORT['IGNORE_TABLES'][] = "CRM_IMPORT_TRANSLATE";
+	$RAPORT['IGNORE_TABLES'][] = "CRM_PROCES_idx_GROUP_to_PROCES";
+	$RAPORT['IGNORE_TABLES'][] = "CRM_PROCES_idx_GROUP_to_PROCES_PERM";
+	$RAPORT['IGNORE_TABLES'][] = "CRM_PROCES_idx_TEMP";
+	$RAPORT['IGNORE_TABLES'][] = "CRM_PRZYPADEK";
+	$RAPORT['IGNORE_TABLES'][] = "CRM_UI_MSGS__EXEC_LOG";
+	$RAPORT['IGNORE_TABLES'][] = "CRM_UI_MSGS";
+	$RAPORT['IGNORE_TABLES'][] = "DEVICES_GROUP";
+	$RAPORT['IGNORE_TABLES'][] = "GRAFIK_PRACY_view";
+	$RAPORT['IGNORE_TABLES'][] = "ITEM_LINKS";
+	$RAPORT['IGNORE_TABLES'][] = "KONTAKTY_view";
+	$RAPORT['IGNORE_TABLES'][] = "ITEM_LINK_TYPES";
+	$RAPORT['IGNORE_TABLES'][] = "LDAP_GROUPS";
+	$RAPORT['IGNORE_TABLES'][] = "NETWORKS_SERVERS";
+	$RAPORT['IGNORE_TABLES'][] = "_CRM_PROCES_GOTO_CACHE";
+	$RAPORT['IGNORE_TABLES'][] = "_CRM_PROCES_STATS_proc_wiev";
+	$RAPORT['IGNORE_TABLES'][] = "_SYNC_FILE_PERMS";
+	$RAPORT['IGNORE_TABLES'][] = "_project_path_idx";
+	$RAPORT['IGNORE_TABLES'][] = "BILLING_USERS_ADD_OLD";
+	$RAPORT['IGNORE_TABLES'][] = "CRM_LISTA_ZASOBOW_ACL";
+	$RAPORT['IGNORE_TABLES'][] = "CRM_LISTA_ZASOBOW_test";
+	$RAPORT['IGNORE_TABLES'][] = "CRM_PROCES_idx_USER_to_PROCES_VIEW";
+	$RAPORT['IGNORE_TABLES'][] = "CRM_PROCES_idx_USER_to_INIT_VIEW";
+	$RAPORT['IGNORE_TABLES'][] = "DEALS_TABLE_2015_03_17_zest_dla_zubryka";
+	$RAPORT['IGNORE_TABLES'][] = "_PLUGIN_MANAGER";
+	$RAPORT['IGNORE_TABLES'][] = "_PRZYPOMNIJ_CACHE";
+//	$RAPORT['IGNORE_TABLES'][] = "";
+
+
+
+
+	//echo statystyka pracy historyczna w systemie 
+	$dbTbls = array();
+	$ZAP_SQL = " SHOW FULL TABLES "; //-- WHERE TABLE_TYPE LIKE  'VIEW' 
+	if (!empty($_GET['TABLES_LIKE'])) {
+		$ZAP_SQL .= " like '{$_GET['TABLES_LIKE']}' ";
+	}
+	
+	echo "<br>Jade zapytanie ".$ZAP_SQL;
+	
+	$res = $db->query($ZAP_SQL);
+	while($R = $db->fetch_array($res)) {
+		$dbTbls[] = $R;
+	}
+	
+	echo "<br> Widoki : ".print_r($dbTbls);
+	
+	DEBUG_S(-1,'widoki ',$dbTbls,__FILE__,__FUNCTION__,__LINE__);
+	foreach ($dbTbls as $R) {
+		if (!in_array($R[0], $RAPORT['IGNORE_TABLES'])) {
+			if(!strstr($R[0], '_HIST'))
+
+			$RAPORT['TABLES_ALL'][] = $R[0];
+		}
+	}
+	
+	
+		echo "<br> TABLES_ALL : ".print_r($RAPORT['TABLES_ALL']);
+
+		unset($dbTbls);
+
+	$ZAP_SQL = array();
+	
+	
+	
+	foreach ($RAPORT['TABLES_ALL'] as $RTH_I=>$RTH_A) {
+			$sql="select A_STATUS as VALUE, count(ID) as COUNT from ".$RTH_A." group by A_STATUS ";
+			$res = $db->query($sql);
+			//$r2 = $db->fetch_array($res);
+			
+			echo "<br> jade raport dla tabeli ".$RTH_A." sql:".$sql." print_r r2".print_r($r2)  ;			
+			while($h=$db->fetch($res)) {
+					if (isset($h->VALUE)) {
+							//dobudowanie tabeli 	_ANALIZA_HISTORII_ALL					
+							$sql="insert ignore into _ANALIZA_WIDOKOW_RAPORT_DAILY( TABLE_NAME, COUNT,FIELD,VALUE,A_RECORD_CREATE_DATE ) values (
+							'{$RTH_A}','{$h->COUNT}','A_STATUS','{$h->VALUE}',now())";
+							echo "<br>".$sql;
+							DB::query($sql) or die($sql);
+					}
+			}
+		}
+
+
+			
+}

SE/superedit-DODAJ_REKORDY_MIESZKAN_FUNC.php

@@ -21,10 +21,11 @@ if (!empty($_GET['ULICA'])) {
 	global $result;
 	// sprawdz czy budynek istnieje
 	$budynek_exists = false;
-	$query = " select `ID`, `S_ADDRESS_STREET` from `BUILDINGS` where `S_ADDRESS_STREET`='" . $_GET['ULICA'] . "' ";
+	$query = " select `ID`, `S_ADDRESS_STREET`,`T_BUILDING_MIESZKANIA`,`T_BUILDING_KLATKI` from `BUILDINGS` where `S_ADDRESS_STREET`='" . $_GET['ULICA'] . "' ";
 	ZAP_SQL( $query );
 	while ($row = mysql_fetch_object($result)) {
 		$budynek_exists = true;
+		$budynek=$row;
 	}
 	if (!$budynek_exists) {
 		echo '<p style="color:red">' . "Budynek nie istnieje! wpisz poprawna wartosc w polu SKROT ULICY." . '</p>';
@@ -42,7 +43,7 @@ if (!empty($_GET['ULICA'])) {
 			$mieszkania []= $row;
 		}
 		if (!empty($mieszkania)) {
-			echo '<p style="color:green">' . "Budynek istnieje." . '</p>';// Mozna dodac mieszkania.
+			echo '<p style="color:green">' . "Budynek istnieje." . ' Dane z bazy ilosc mieszkan: ('.$budynek->T_BUILDING_MIESZKANIA.'); ilość klatek: ('.$budynek->T_BUILDING_KLATKI.'); </p>';// Mozna dodac mieszkania.
 			function sort_mieszkania_callback($a, $b) {
 				return ($a->nr_mieszkania > $b->nr_mieszkania)? 1 : (($a->nr_mieszkania < $b->nr_mieszkania)? -1 : 0);
 			}
@@ -57,7 +58,11 @@ if (!empty($_GET['ULICA'])) {
 				echo " "  . '<a href="#" onclick="' . $js . '">' . "szczegóły" . '</a><span style="display:none">' . ": " . implode(', ', $mieszkania_out) . '</span>';
 			echo '</p>';
 		}
-
+		
+		if(!isset($_GET['MIESZK_END'])) {
+			 $_GET['MIESZK_BEGIN']=1;
+			 $_GET['MIESZK_END']=$budynek->T_BUILDING_MIESZKANIA; //przypisanie do formularza ilosci mieszkan z bazy budynkow aby zoptymalizowac
+		}
 		echo "<b>2.</b> Pierwszy Numer Mieszkania (np 1) ";
 		echo '<input type="text" name="MIESZK_BEGIN" size="1" value="' . $_GET['MIESZK_BEGIN'] . '" />';
 		echo " Ostatni Numer Mieszkania (np 99) ";

SE/superedit-INSTALL_SES_PROCESY_A.php

@@ -1607,6 +1607,10 @@ $cmd[]['rsh']=' test -f /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--d
   $cmd[]['rsh']=' touch /Library/Server/Web/Data/Sites/Default/PLIKI/'.$REMOTE_FOLDER_ROOT.'/WIZJE_LOKALNE/index.html';
 
   
+   $cmd[]['rsh']=' mkdir -p /Library/Server/Web/Data/Sites/Default/PLIKI/'.$REMOTE_FOLDER_ROOT.'/MK_Rewiry';
+  $cmd[]['rsh']=' touch /Library/Server/Web/Data/Sites/Default/PLIKI/'.$REMOTE_FOLDER_ROOT.'/MK_Rewiry/index.html';
+
+  
   
  $cmd[]['rsh']=' chmod 0755 /Library/Server/Web/Data/Sites/Default/PLIKI/';
  $cmd[]['rsh']=' chmod -R +a "_www allow writeattr,readextattr,writeextattr,readsecurity,writesecurity,chown,add_file,add_subdirectory,delete_child,list,search,file_inherit,directory_inherit" /Library/Server/Web/Data/Sites/Default/PLIKI';
@@ -1842,6 +1846,20 @@ LOOKAT_FOLDER_VARNAME=\"ID\"
 DEST_FOLDER_FORMAT=\"<VARNAME1>\"
 DEST_FOLDER_VARNAME1=\"ID\"
 
+
+
+[MK_Rewiry_COLUMN]
+mount_point=\"MK_Rewiry\"
+share_point=\"MK_Rewiry\"
+www_share_point=\"MK_Rewiry\"
+LOOKAT_FOLDER_LOOK_GLOB=\"<VARNAME>.*\"
+LOOKAT_FOLDER_VARNAME=\"ID\"
+DEST_FOLDER_FORMAT=\"<VARNAME1>.MK_Rewiry_<VARNAME2>\"
+DEST_FOLDER_VARNAME1=\"ID\"
+DEST_FOLDER_VARNAME2=\"NAZWA_REWI\"
+
+
+
 " > /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--folders-'.$SERVER_ADDRESS.'.ini.php';
 $cmd[]['rsh']=' test -f /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--folders-127.0.0.1.ini.php ||  ln /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--folders-'.$SERVER_ADDRESS.'.ini.php /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--folders-127.0.0.1.ini.php'; //aliasowanie do localhosta konfigow do testow systemu
 //! .config_domena_.php

SE/superedit-STATYSTYKA_TABELE.php

@@ -14,7 +14,7 @@
  * 
  */
 function STATYSTYKA_TABELE() {
-	global $$A_STATUS_L2_SQL;
+	global $A_STATUS_L2_SQL;
 	$db = DB::getDB();
 	if (!$db) {
 		echo '<div class="alert alert-danger">' . "Database Error" . '</div>';
@@ -81,14 +81,59 @@ function STATYSTYKA_TABELE() {
 		 		 $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
+		 			 , null as USERS2_MARKETING_ID, null as USERS2_DEALS_ID
+
 		 			 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')";
+		 			 where rks.ID is NULL  and b.A_STATUS in ('NORMAL','WAITING')
+		 			 
+		 			 
+		 			 union 
+		 			  -- bledy braku wprowadzonych umow z wlasciwymi statusami do budynkow jak jest umowa na usluge, to budynek musi byc WAITING lub NORMAL
+		 			  select b.ID, b.A_STATUS ,  b.S_ADDRESS_STREET, b.M_REWIR , 
+		 			  null as ID_KABEL, NULL as A_STATUS_KABEL, 'Zakupiona usluga na budynku, gdzie nie ma umowy lub brak aktualizacji statusu' as ERROR 		 			 
+		 			  , um.ID as USERS2_MARKETING_ID, ud.ID as USERS2_DEALS_ID
+		 			  from USERS2_DEALS as ud  
+		 			  left join USERS2_MARKETING as um on um.S_ADDRESS_STREET=ud.S_ADDRESS_STREET
+		 			  left join BUILDINGS as b on b.S_ADDRESS_STREET=um.T_TELBOX_BUILDING_IN
+		 			 where ud.A_STATUS!='DELETED' and b.A_STATUS not in ('NORMAL','WAITING')
+		 			  group by ud.S_ADDRESS_STREET
+		 			 
+		 			 -- bledy nie aktualizowanego statusu budynku dla dzialajacej uslugi 
+		 			  union
+		 			  select b.ID, b.A_STATUS ,  b.S_ADDRESS_STREET, b.M_REWIR , 
+		 			  null as ID_KABEL, NULL as A_STATUS_KABEL, 'Usługa działająca na budynku, który nie ma statusu NORMAL' as ERROR 		 			 
+		 			  , um.ID as USERS2_MARKETING_ID, ud.ID as USERS2_DEALS_ID
+		 			  from USERS2_DEALS as ud  
+		 			  left join USERS2_MARKETING as um on um.S_ADDRESS_STREET=ud.S_ADDRESS_STREET
+		 			  left join BUILDINGS as b on b.S_ADDRESS_STREET=um.T_TELBOX_BUILDING_IN
+		 			  left join SES_USERS2_A as internet on internet.ID_SERVICES=ud.ID_SERVICES_NEW
+		 			 where ud.A_STATUS!='DELETED' and b.A_STATUS!='NORMAL' 
+		 			  and internet.A_STATUS='NORMAL'
+		 			  group by ud.S_ADDRESS_STREET
+		 			  
+		 			  -- brak mieszkan powiazanych do budynku
+		 			  UNION 
+		 			  
+		 			  select b.ID, b.A_STATUS ,  b.S_ADDRESS_STREET, b.M_REWIR , 
+		 			  NULL as ID_KABEL, NULL as A_STATUS_KABEL, 'Brak mieszkan dowiazanych do budynku' as ERROR
+		 			 , um.ID as USERS2_MARKETING_ID, null as USERS2_DEALS_ID
+
+		 			 from BUILDINGS as b
+		 			 left join USERS2_MARKETING as um on um.T_TELBOX_BUILDING_IN=b.S_ADDRESS_STREET
+		 			 where um.ID is NULL  and b.A_STATUS!='DELETED'
+		 			 
+
+						
+		 			 
+		 			 ";
 		 			 
 		 			 
 		 $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 ; ";
-		 	
+		 $sqlList[]="update BUILDINGS t1, MK_Rewiry t2 set t1.`__MK_Rewiry__STATUS`=t2.A_STATUS where t1.M_REWIR=t2.NAZWA_REWI ; ";
+
+		 		
 		
 
  			}
@@ -110,7 +155,11 @@ function STATYSTYKA_TABELE() {
 						SELECT t1.ID, t1.M_REWIR, t1.S_ADDRESS_STREET, t1.T_TELBOX_BUILDING_IN
 						, t1.A_ADM_COMPANY, t1.A_CLASSIFIED, t1.A_RECORD_UPDATE_DATE, t1.A_RECORD_CREATE_DATE, t1.A_RECORD_CREATE_AUTHOR, t1.A_RECORD_UPDATE_AUTHOR,  'ERROR Brak powiazania budynku' AS ERROR
 						FROM USERS2_MARKETING AS t1
-						WHERE t1.T_TELBOX_BUILDING_IN LIKE  '' and t1.A_STATUS!='DELETED' ;";
+						WHERE t1.T_TELBOX_BUILDING_IN LIKE  '' and t1.A_STATUS!='DELETED' 
+						
+						
+						
+						;";
 				
 				$sqlList[]="drop  view if exists `BUILDINGS__MARKETING_ERROR` ;";
 				$sqlList[]="create ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER view BUILDINGS__MARKETING_ERROR as
@@ -426,6 +475,7 @@ function STATYSTYKA_TABELE() {
 			$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[] = " insert into `USERS2_MARKETING_OVERWIEV` \n {$sql}";
+		
 		}
 
 		{// REWIRY STATSY - USERS2_MARKETING_OVERWIEV_REWIR
@@ -454,7 +504,13 @@ function STATYSTYKA_TABELE() {
 					) / count(USERS2_MARKETING.S_ADDRESS_STREET) * 100), 2) as ANKIET_I
 				, BUILDINGS.A_ADM_COMPANY
 				, MK_Rewiry.the_geom , MK_Rewiry.A_STATUS
-				, count(BUILDINGS.ID) as BUDYNKOW
+				, 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
+				, 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_OPERS as $FFFS) {
@@ -503,9 +559,18 @@ function STATYSTYKA_TABELE() {
 			$sqlList[] = " truncate table `USERS2_MARKETING_OVERWIEV_REWIR` ";
 			$sqlList[] = " ALTER TABLE `USERS2_MARKETING_OVERWIEV_REWIR` ENGINE=MYISAM ";
 			$sqlList[] = " ALTER TABLE `USERS2_MARKETING_OVERWIEV_REWIR` CHANGE `ID`  `ID` INT(11) NOT NULL DEFAULT '0' ";
+			$sqlList[] = " ALTER TABLE `USERS2_MARKETING_OVERWIEV_REWIR` CHANGE `M_REWIR`  `M_REWIR` CHAR(255) NOT NULL DEFAULT '' ";
 			$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[] = " 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

SE/superedit-SYNC_GIS_TABLES.php

@@ -3,6 +3,8 @@
 // synchronizacja do serwera postgres GIS
 //
 
+
+die('@2016-08-08 bindera: wylaczam mozliwosc synchronizacji - tabele do przepisania, przyda sie historycznie ten kod aby spojrzec na relacje przestrzenne w praktyce');
 include_once('se-lib/DB_Dump.php');
 include_once('se-lib/UsersHelper.php');
 

SE/superedit-SYNC_MYDATABASE_SQIX.php

@@ -1,5 +1,7 @@
 <?php
 
+die('@2016-08-08 bindera: nie wiem co to robi- pewnie jakas stara funkcja - wylaczam');
+
 function SYNC_MYDATABASE_SQIX($CNF_ZASOB_SRC,$src_tables_array,$CNF_ZASOB_DST) {
 global $CNF_ZASOB;