Merge branch 'master' of bn.git:plabudda/se

SE/bash_Route_Users_Task_AddUser.php

@@ -0,0 +1,57 @@
+<?php
+/**
+ * 2017-08-16 by a.binder - sync group get name to use in default group A_CLASSIFIED/A_ADM_COMPANY in instalation task
+ * index.php?_route=Users&_task=syncGroup&idGroup=$argv[2]
+ *
+ */
+
+ini_set('max_execution_time', 300);
+ini_set('memory_limit', '512M');
+
+define('DS', DIRECTORY_SEPARATOR);
+define('APP_PATH_ROOT', dirname(__FILE__));
+define('APP_PATH_WWW', dirname(__FILE__));
+define('APP_PATH_CONFIG', APP_PATH_ROOT . DS . 'config');
+
+// set ini to log errors into error log file
+ini_set('display_startup_errors', '0');
+ini_set('log_errors', '1');
+ini_set('error_log', '/var/log/apache2/error_log');// TODO: php.ini ?
+
+require_once APP_PATH_ROOT . DS . 'se-lib' . DS . 'Lib.php';
+Lib::loadClass('V');
+Lib::loadClass('Config');
+Lib::loadClass('DB');
+Lib::loadClass('User');
+// _ Lib::loadClass('UserStorageFactory');
+
+
+if (isset($_SERVER["argv"][2])) {
+	$_SERVER['SERVER_NAME']		 = $_SERVER["argv"][1];
+	$usrLogin 					= $_SERVER["argv"][2];  //'ADM_ACCOUNT' => $usrLogin,
+	$idGroup 					= $_SERVER["argv"][3];
+	$idTelboxes					= $_SERVER["argv"][4];
+	$ADM_ADMIN_LEVEL 			= $_SERVER["argv"][5]; //'ADM_ADMIN_LEVEL' => $ADM_ADMIN_LEVEL,
+	$ADM_NAME 					= $_SERVER["argv"][6]; //					'ADM_NAME' => $ADM_NAME,
+	$ADM_ADMIN_DESC				= $_SERVER["argv"][7]; //						'ADM_ADMIN_DESC' => $ADM_ADMIN_DESC,
+	$EMPLOYEE_TYPE				= $_SERVER["argv"][8]; //						'EMPLOYEE_TYPE' => $EMPLOYEE_TYPE,
+	$ADM_PASSWD 				= $_SERVER["argv"][9]; //						'ADM_PASSWD' => $ADM_PASSWD,
+	$idGroup_A_ADM_COMPANY		= $_SERVER["argv"][10]; //					'A_ADM_COMPANY' => $A_ADM_COMPANY,
+	$idGroup_A_CLASSIFIED		= $_SERVER["argv"][11]; //						'A_CLASSIFIED' => $A_CLASSIFIED	
+	$idGroup_DEFAULT_ACL_GROUP	= $_SERVER["argv"][12]; //						'DEFAULT_ACL_GROUP' => $DEFAULT_ACL_GROUP	
+}
+
+else {
+	die("\n The second argument should be server domain - e.g. biuro.biall-net.pl and third idGroup e.g. 3 \n");
+}
+
+
+$cronTaskName = 'AddUser';
+$keyToken = 'bash_AddUser';
+$token = Router::getRoute('Cron')->generateCliAuthToken($keyToken, $cronTaskName, 300 * 10);
+$output = Router::getRoute('Cron')->executeCurlTastByToken($cronTaskName, $keyToken, $token, [ 'idGroup' => $groupID, 'usrLogin' => $usrLogin , 'idTelboxes' => $idTelboxes,  'ADM_ADMIN_LEVEL' => $ADM_ADMIN_LEVEL, 'ADM_NAME' => $ADM_NAME, 'ADM_ADMIN_DESC' => $ADM_ADMIN_DESC, 'EMPLOYEE_TYPE' => $EMPLOYEE_TYPE, 'ADM_PASSWD' => $ADM_PASSWD, 'idGroup_A_ADM_COMPANY' => $idGroup_A_ADM_COMPANY, 'idGroup_A_CLASSIFIED' => $idGroup_A_CLASSIFIED, 'idGroup_DEFAULT_ACL_GROUP' => $idGroup_DEFAULT_ACL_GROUP ]);
+echo "DBG: output -----------------------\n{$output}\nEOF output---------------------------------\n";
+
+die(".EOF - OK\n");
+
+?>

SE/bash_Route_Users_Task_syncGroup.php

@@ -23,7 +23,7 @@ Lib::loadClass('V');
 Lib::loadClass('Config');
 Lib::loadClass('DB');
 Lib::loadClass('User');
-Lib::loadClass('UserStorageFactory');
+// _ Lib::loadClass('UserStorageFactory');
 
 
 if (isset($_SERVER["argv"][2])) {
@@ -35,11 +35,19 @@ else {
 	die("\n The second argument should be server domain - e.g. biuro.biall-net.pl and third idGroup e.g. 3 \n");
 }
 
-Lib::loadClass('Router');
-			$usrStorageDB = UserStorageFactory::getStorage('DB');
-			$usrStorageLdap = UserStorageFactory::getStorage('MacOSX');
-			$forceSync = 1;
-Router::getRoute('Users')->syncGroup($idGroup,$usrStorageDB,$usrStorageLdap,$forceSync);
+
+$cronTaskName = 'forceSyncGroup';
+$keyToken = 'bash_forceSyncGroup';
+$token = Router::getRoute('Cron')->generateCliAuthToken($keyToken, $cronTaskName, 300 * 10);
+$output = Router::getRoute('Cron')->executeCurlTastByToken($cronTaskName, $keyToken, $token, [ 'idGroup' => $groupID ]);
+echo "DBG: output -----------------------\n{$output}\nEOF output---------------------------------\n";
+
+
+// __ Lib::loadClass('Router');
+// __			$usrStorageDB = UserStorageFactory::getStorage('DB');
+// __			$usrStorageLdap = UserStorageFactory::getStorage('MacOSX');
+// __			$forceSync = 1;
+// __ Router::getRoute('Users')->syncGroup($idGroup,$usrStorageDB,$usrStorageLdap,$forceSync);
 
 die(".EOF - OK\n");
 

SE/bash_Route_Users_Task_syncUser.php

@@ -23,7 +23,7 @@ Lib::loadClass('V');
 Lib::loadClass('Config');
 Lib::loadClass('DB');
 Lib::loadClass('User');
-Lib::loadClass('UserStorageFactory');
+// _ Lib::loadClass('UserStorageFactory');
 
 
 if (isset($_SERVER["argv"][2])) {
@@ -35,11 +35,20 @@ else {
 	die("\n The second argument should be server domain - e.g. biuro.biall-net.pl and third usrLogin e.g. jan.kowalski \n");
 }
 
-Lib::loadClass('Router');
-			$usrStorageDB = UserStorageFactory::getStorage('DB');
-			$usrStorageLdap = UserStorageFactory::getStorage('MacOSX');
-			$forceSync = 1;
-Router::getRoute('Users')->syncUser($usrLogin,$usrStorageDB,$usrStorageLdap,$forceSync);
+
+$cronTaskName = 'forceSyncUser';
+$keyToken = 'bash_forceSyncUser';
+$token = Router::getRoute('Cron')->generateCliAuthToken($keyToken, $cronTaskName, 300 * 10);
+$output = Router::getRoute('Cron')->executeCurlTastByToken($cronTaskName, $keyToken, $token, [ 'usrLogin' => $usrLogin ]);
+echo "DBG: output -----------------------\n{$output}\nEOF output---------------------------------\n";
+
+
+
+//_ Lib::loadClass('Router');
+//_			$usrStorageDB = UserStorageFactory::getStorage('DB');
+//_			$usrStorageLdap = UserStorageFactory::getStorage('MacOSX');
+//)			$forceSync = 1;
+//_Router::getRoute('Users')->syncUser($usrLogin,$usrStorageDB,$usrStorageLdap,$forceSync);
 
 die(".EOF - OK\n");
 

SE/bash_force_classified_table_by_GroupID.php

@@ -23,8 +23,8 @@ Lib::loadClass('V');
 Lib::loadClass('Config');
 Lib::loadClass('DB');
 Lib::loadClass('User');
-Lib::loadClass('UserStorageFactory');
-Lib::loadClass('UsersLdapHelper');
+// _ Lib::loadClass('UserStorageFactory');
+// _ Lib::loadClass('UsersLdapHelper');
 
 
 if (isset($_SERVER["argv"][3])) {

SE/se-lib/Route/Cron.php

@@ -225,5 +225,80 @@ class Route_Cron extends RouteBase {
 		}
 		echo "DONE";
 	}
+	
+	
+	public function forceSyncUserAction() {
+		$usrLogin = V::get('usrLogin', 0, $_GET, 'word');
+		if (!$usrLogin) throw new Exception("Missing usrLogin");
+		
+		
+		Lib::loadClass('Router');
+		Lib::loadClass('UsersLdapHelper');
+		$usrStorageDB = UserStorageFactory::getStorage('DB');
+		$usrStorageLdap = UserStorageFactory::getStorage('MacOSX');
+		$forceSync = 1;
+		Router::getRoute('Users')->syncUser($usrLogin,$usrStorageDB,$usrStorageLdap,$forceSync);
+		
+		echo "DONE";
+	}
+	
+	public function forceSyncGroupAction() {
+		$idGroup = V::get('idGroup', 0, $_GET, 'int');
+		if (!$idGroup) throw new Exception("Missing idGroup");
+		
+		
+		Lib::loadClass('Router');
+		Lib::loadClass('UsersLdapHelper');
+		$usrStorageDB = UserStorageFactory::getStorage('DB');
+		$usrStorageLdap = UserStorageFactory::getStorage('MacOSX');
+		$forceSync = 1;
+		Router::getRoute('Users')->syncGroup($idGroup,$usrStorageDB,$usrStorageLdap,$forceSync);
+		
+		echo "DONE";
+	}
+	
+	
+	public function AddUserAction() {
+		//$output = Router::getRoute('Cron')->executeCurlTastByToken($cronTaskName, $keyToken, $token, [ 'idGroup' => $groupID, 'usrLogin' => $usrLogin , 'ADM_ADMIN_LEVEL' => $ADM_ADMIN_LEVEL, 'ADM_NAME' => $ADM_NAME, 'ADM_ADMIN_DESC' => $ADM_ADMIN_DESC, 'EMPLOYEE_TYPE' => $EMPLOYEE_TYPE, 'ADM_PASSWD' => $ADM_PASSWD, 'A_ADM_COMPANY' => $A_ADM_COMPANY, 'A_CLASSIFIED' => $A_CLASSIFIED ]);
+
+		$idGroup 					= V::get('idGroup', 0, $_GET, 'int');
+		$usrLogin 					= V::get('usrLogin', 0, $_GET, 'word');
+		$idTelboxes					= V::get('idTelboxes', 0, $_GET, 'int');
+		$ADM_ADMIN_LEVEL 			= V::get('ADM_ADMIN_LEVEL', 0, $_GET, 'int');
+		$ADM_NAME 					= V::get('ADM_NAME', 0, $_GET, 'word');
+		$ADM_ADMIN_DESC 			= V::get('ADM_ADMIN_DESC', 0, $_GET, 'word');
+		$EMPLOYEE_TYPE 				= V::get('EMPLOYEE_TYPE', 0, $_GET, 'word');
+		$ADM_PASSWD 				= V::get('ADM_PASSWD', 0, $_GET, 'word');
+		$idGroup_A_ADM_COMPANY 		= V::get('idGroup_A_ADM_COMPANY', 0, $_GET, 'int');
+		$idGroup_A_CLASSIFIED 		= V::get('idGroup_A_CLASSIFIED', 0, $_GET, 'int');
+		$idGroup_DEFAULT_ACL_GROUP	= V::get('idGroup_DEFAULT_ACL_GROUP', 0, $_GET, 'int');
+		if (!$usrLogin) throw new Exception("Missing usrLogin");
+		
+		
+		Lib::loadClass('Router');
+		Lib::loadClass('UsersLdapHelper');
+		
+			Lib::loadClass('UsersLdapHelper');
+			$groupsNetwork = UsersLdapHelper::getGroupsByID($idGroup_A_ADM_COMPANY);
+			if (empty($groupsNetwork)) throw new Exception("Group {$idGroup_A_ADM_COMPANY} not found");
+				foreach ($groupsNetwork as $vGroup) {
+					$A_ADM_COMPANY = $vGroup->cn;
+				}
+			$groupsNetwork = UsersLdapHelper::getGroupsByID($idGroup_A_CLASSIFIED);
+			if (empty($groupsNetwork)) throw new Exception("Group {$idGroup_A_CLASSIFIED} not found");
+				foreach ($groupsNetwork as $vGroup) {
+					$A_CLASSIFIED = $vGroup->cn;
+				}
+				
+			$groupsNetwork = UsersLdapHelper::getGroupsByID($idGroup_DEFAULT_ACL_GROUP);
+			if (empty($groupsNetwork)) throw new Exception("Group {$idGroup_A_CLASSIFIED} not found");
+				foreach ($groupsNetwork as $vGroup) {
+					$DEFAULT_ACL_GROUP = $vGroup->cn;
+				}
+		Router::getRoute('Users')->addUser($usrLogin, $idGroup, $idTelboxes,  $ADM_ADMIN_LEVEL, $ADM_NAME, $ADM_ADMIN_DESC, $EMPLOYEE_TYPE, $ADM_PASSWD, $A_ADM_COMPANY, $A_CLASSIFIED, $DEFAULT_ACL_GROUP );
+		
+		echo "DONE";
+	}
+
 
 }

SE/se-lib/Route/Users.php

@@ -691,6 +691,36 @@ class Route_Users extends RouteBase {
 			$added = $usrStorageDB->addUserGroup($usrLogin, $groupToAdd, $idTelboxes);
 		}
 	}
+	
+	public function addUser($usrLogin, $idGroup, $idTelboxes,  $ADM_ADMIN_LEVEL, $ADM_NAME, $ADM_ADMIN_DESC, $EMPLOYEE_TYPE, $ADM_PASSWD, $A_ADM_COMPANY, $A_CLASSIFIED, $DEFAULT_ACL_GROUP ) {
+		DBG::_('DBG_NG', '>0', 'post', $_POST, __CLASS__, __FUNCTION__, __LINE__);
+		if (!$usrLogin) throw new Exception("Wrong param user login!");
+		$usrStorageDB = UserStorageFactory::getStorage('DB');
+		if (!$usrStorageDB) throw new Exception("Error storage not exists!");
+		
+		$usr = $usrStorageDB->getUser($usrLogin);
+		if ($usr) throw new Exception("Użytkownik {$usrLogin} już istnieje.");
+		if (!$usr) {
+					$acl = ACL::getStorageByNamespace("default_db/ADMIN_USERS/ADMIN_USERS");
+						$usr = $acl->addItem([
+							'ADM_ACCOUNT' => $usrLogin,
+							'ADM_ADMIN_LEVEL' => $ADM_ADMIN_LEVEL,
+							'ADM_NAME' => $ADM_NAME,
+							'ADM_ADMIN_DESC' => $ADM_ADMIN_DESC,
+							'EMPLOYEE_TYPE' => $EMPLOYEE_TYPE,
+							'ADM_PASSWD' => $ADM_PASSWD,
+							'A_ADM_COMPANY' => $A_ADM_COMPANY,
+							'A_CLASSIFIED' => $A_CLASSIFIED
+						]);
+						if (!$usr) throw new Exception("Nie udało się utworzyć wpisu użytkownika");
+					
+				if ($idGroup > 0) {
+					$groupToAdd = $usrStorageDB->getGroupWithoutNested($idGroup);
+					if (!$groupToAdd) throw new Exception("Grupa [{$idGroup}] nie istnieje");
+					$added = $usrStorageDB->addUserGroup($usrLogin, $groupToAdd, $idTelboxes);
+				}
+		}
+	}
 
 	public function typeSpecialIdGroupAction() {
 		header("Content-type: application/json");

SE/superedit-BUDGET_ANALYTICS.php

@@ -1,5 +1,5 @@
 <?php
-
+//bindera@2017-09-14 - uzyte w superedit-STATYSTYKA_TABELE.php widok test_budget_project_analytics_view - uwzglednic przy zmianie nazwy tabeli z test_*
 function BUDGET_ANALYTICS() {
 
 	$TURN_OFF = true;// OFF 2015-06-24
@@ -307,7 +307,7 @@ jQuery(document).ready(function () {
 	}
 
 	public function installView() {
-		$sql = "
+		$sql['test_budget_project_analytics_view_1'] = "
 			CREATE VIEW `test_budget_project_analytics_view` AS
 			select `IN7_DZIENNIK_KORESP`.`ID_PROJECT` AS `ID_PROJECT`
 				, date_format(`IN7_DZIENNIK_KORESP`.`K_DATA_OTRZYMANEJ_KORESP`,'%Y-%m') AS `MONTH`
@@ -329,8 +329,269 @@ 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 = "
+		
+		$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`
 				,	`p`.`M_DIST_DESC` AS `M_DIST_DESC`
@@ -348,6 +609,18 @@ jQuery(document).ready(function () {
 			)
 			group by `t1`.`ID_PROJECT`, `t1`.`MONTH`
 		";
+		$db = DB::getDB();
+		foreach($sql as $ind=>$sql_) {
+				
+				
+					DEBUG_S(-3,'wykonuje zapytanie sql dla '.$ind,$sql_,__FILE__,__FUNCTION__,__LINE__);
+					if(!empty($DB)) {
+						$db->query($sql_) or die('Problem z zapytaniem '.mysql_error());
+					} else {
+						DB::query($sql_) or die('Problem z zapytaniem '.mysql_error());
+					}
+				
+			}
 	}
 
 	public function test_fetchDataFromTables() {
@@ -450,8 +723,8 @@ jQuery(document).ready(function () {
 	 *       Read from TABLE `IN7_DZIENNIK_KORESP`
 	 */
 	function test_reinstallViewsAndEvents() {
-		$sqls['RemoveView_korespMain'] = " drop view if exists `in7_dziennik_koresp_budget_main_view` ";
-		$sqls['CreateView_korespMain'] = "
+		$sqlList['RemoveView_korespMain1'] = " drop view if exists `in7_dziennik_koresp_budget_main_view` ";
+		$sqlList['CreateView_korespMain2'] = "
 			CREATE VIEW `in7_dziennik_koresp_budget_main_view` AS
 				select cast(substring_index(substring_index(k.`path`,'-',2),'-',-(1)) as signed) AS `ID`
 				, substring_index(k.`path`,'-',2) AS `path`
@@ -504,9 +777,9 @@ jQuery(document).ready(function () {
 			where (k.`COST_VALUE` <> '')
 			group by substring_index(k.`path`,'-',2)
 		";
-		$sqls['RemoveView_korespMain'] = " drop view if exists `in7_dziennik_koresp_budget_view` ";
-		$sqls['CreateView_korespMain'] = "
-			CREATE VIEW `in7_dziennik_koresp_budget_view` AS
+		$sqlList['RemoveView_korespMain3'] = " drop view if exists `in7_dziennik_koresp_budget_view` ";
+		$sqlList['CreateView_korespMain4'] = "
+			CREATE or replace  VIEW `in7_dziennik_koresp_budget_view` AS
 				select k.`ID` AS `ID`
 					, k.`path` AS `path`
 					, k.`ID_PROJECT` AS `ID_PROJECT`
@@ -560,8 +833,8 @@ jQuery(document).ready(function () {
 				where (k.`COST_VALUE`!='')
 				group by k.`ID_PROJECT`
 		";
-		$sqlList['RemoveEvent_everyDay'] = "DROP EVENT IF EXISTS `view__budget_project_to_realization_main_event`";
-		$sqlList['CreateEvent_everyDay'] = "
+		$sqlList['RemoveEvent_everyDay5'] = "DROP EVENT IF EXISTS `view__budget_project_to_realization_main_event`";
+		$sqlList['CreateEvent_everyDay6'] = "
 			CREATE EVENT `view__budget_project_to_realization_main_event`
 				ON SCHEDULE EVERY 1 DAY STARTS '2015-05-12 00:04:30'
 				ON COMPLETION NOT PRESERVE ENABLE
@@ -576,6 +849,20 @@ jQuery(document).ready(function () {
 						LEFT JOIN IN7_MK_BAZA_DYSTRYBUCJI AS t2 ON(t1.ID=t2.ID);
 			END
 		";
+		$db = DB::getDB();
+		foreach($sqlList as $ind=>$sql_) {
+				
+				
+					DEBUG_S(-3,'wykonuje zapytanie sql dla '.$ind,$sql_,__FILE__,__FUNCTION__,__LINE__);
+					if(!empty($DB)) {
+						$db->query($sql_) or die('Problem z zapytaniem '.mysql_error());
+					} else {
+						DB::query($sql_) or die('Problem z zapytaniem '.mysql_error());
+					}
+				
+			}
+
+		
 	}
 
 }

SE/superedit-INSTALL_SES_PROCESY_A.php

@@ -1571,6 +1571,8 @@ function INSTALL_GETCOMMANDS_SE($ADMIN_USERNAME,$SERVER_ADDRESS_IP,$ADMIN_USERNA
   $cmd[]['scp_root']=array($INSTALL_ROOT.'/bash_Route_Users_Task_syncGroup.php','/Library/Server/Web/Data/Sites/Default/SE/');
   $cmd[]['rsh']='rm /Library/Server/Web/Data/Sites/Default/SE/bash_force_classified_table_by_GroupID.php || echo PASSED';
   $cmd[]['scp_root']=array($INSTALL_ROOT.'/bash_force_classified_table_by_GroupID.php','/Library/Server/Web/Data/Sites/Default/SE/');
+  $cmd[]['scp_root']=array($INSTALL_ROOT.'/bash_Route_Users_Task_AddUser.php','/Library/Server/Web/Data/Sites/Default/SE/');
+
 
 
 
@@ -1656,6 +1658,8 @@ function INSTALL_GETCOMMANDS_SE_LAST_UPDATE($ADMIN_USERNAME,$SERVER_ADDRESS_IP,$
 
  }
 $cmd[]['rsh']='php /Library/Server/Web/Data/Sites/Default/SE/bash_install_check.php '.$SERVER_ADDRESS;
+$cmd[]['rsh']='php /Library/Server/Web/Data/Sites/Default/SE/bash_install_check.php '.$SERVER_ADDRESS; //dla pewnosci - TODO 
+
 //@2016-06 bindera: po aktualizacji sql czesto nie dziala event sheduler np zoompak
 $cmd[]['rsh']=' echo " SET GLOBAL event_scheduler =  \"ON\" " |mysql -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D'.$REMOTE_FOLDER_ROOT.' '; //zalozenie 1 usera TODO synchronizacja z ldap
  $cmd[]['rsh']=' { '.tell_user_gui_error("System zostal zainstalowany - wejdz przegladarka na adres www https://".$SERVER_ADDRESS." (alternatywnie https://".$SERVER_ADDRESS.".procesy5.pl - jezeli domena ".$SERVER_ADDRESS." nie zostala jeszcze skonfigurowana), zaloguj sie na uzytkownika:".$ADMIN_USERNAME." (administrator uzytkownikow) lub ".$ADMIN_USERNAME_DIRECTORY." (administrator domeny LDAP/systemu) . Powinienes teraz zalozyc uzytkownikow systemu i nadac hasla - jezeli jest to pierwsza instalacja ").'; exit 0; } '; //komunikat dla uzytkownika
@@ -2073,14 +2077,18 @@ database=\"SES_USERS2\"
 // TODO $cmd[]['rsh']='php /Library/Server/Web/Data/Sites/Default/SE/bash_Route_Users_Task_syncGroup.php '.$SERVER_ADDRESS.' 3';
 
 
+// $cmd[]['rsh']=' echo " delete from ADMIN_USERS  where ADM_ACCOUNT=\''.$ADMIN_USERNAME_L1.'\'" |mysql -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D'.$REMOTE_FOLDER_ROOT.' '; //zalozenie 1 usera TODO synchronizacja z ldap
+// $cmd[]['rsh']=' echo " insert into ADMIN_USERS (ADM_ACCOUNT,ADM_ADMIN_LEVEL,ADM_PASSWD,A_STATUS) values (\''.$ADMIN_USERNAME_L1.'\',\'0\',\''.$ADMIN_USERNAME_L1_PASS.'\',\'NORMAL\')" |mysql -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D'.$REMOTE_FOLDER_ROOT.' '; //zalozenie 1 usera TODO synchronizacja z ldap
+																												//addUser($usrLogin, $idGroup, $idTelboxes,  $ADM_ADMIN_LEVEL, $ADM_NAME,             $ADM_ADMIN_DESC,											 $EMPLOYEE_TYPE, $ADM_PASSWD, $A_ADM_COMPANY, $A_CLASSIFIED, $DEFAULT_ACL_GROUP )
 
- $cmd[]['rsh']=' echo " delete from ADMIN_USERS  where ADM_ACCOUNT=\''.$ADMIN_USERNAME_L1.'\'" |mysql -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D'.$REMOTE_FOLDER_ROOT.' '; //zalozenie 1 usera TODO synchronizacja z ldap
+ $cmd[]['rsh']='php /Library/Server/Web/Data/Sites/Default/SE/bash_Route_Users_Task_AddUser.php '.$SERVER_ADDRESS.' '.$ADMIN_USERNAME_L1.' 3  0              0               '.$ADMIN_USERNAME_L1.' Podstawowe_konto_uzytkownika_z_licencji_instalatora_systemu  Pracownik  '.$ADMIN_USERNAME_L1_PASS.' 3  3 ' ;
+ 
  $cmd[]['rsh']=' echo " delete from ADMIN_USERS  where ADM_ACCOUNT=\''.$ADMIN_USERNAME_DIRECTORY.'\'" |mysql -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D'.$REMOTE_FOLDER_ROOT.' '; //zalozenie 1 usera TODO synchronizacja z ldap
-
- $cmd[]['rsh']=' echo " insert into ADMIN_USERS (ADM_ACCOUNT,ADM_ADMIN_LEVEL,ADM_PASSWD,A_STATUS) values (\''.$ADMIN_USERNAME_L1.'\',\'0\',\''.$ADMIN_USERNAME_L1_PASS.'\',\'NORMAL\')" |mysql -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D'.$REMOTE_FOLDER_ROOT.' '; //zalozenie 1 usera TODO synchronizacja z ldap
  $cmd[]['rsh']=' echo " insert into ADMIN_USERS (ADM_ACCOUNT,ADM_ADMIN_LEVEL,ADM_PASSWD,A_STATUS) values (\''.$ADMIN_USERNAME_DIRECTORY.'\',\'0\',\''.$ADMIN_USERNAME_PASSWD.'\',\'NORMAL\')" |mysql -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D'.$REMOTE_FOLDER_ROOT.' '; //zalozenie 1 usera TODO synchronizacja z ldap
+
+
 //dodanie domyslnego uprawnienia admina dla glownego usera na bazie tabeli KONTAKTY_view
- $cmd[]['rsh']=' echo " insert into CRM_AUTH_PROFILE (ID_ZASOB, REMOTE_TABLE,REMOTE_ID) select czp1.ID , \'ADMIN_USERS\', au.ID
+ $cmd[]['rsh']=' echo " insert ignore into CRM_AUTH_PROFILE (ID_ZASOB, REMOTE_TABLE,REMOTE_ID) select czp1.ID , \'ADMIN_USERS\', au.ID
                           from CRM_LISTA_ZASOBOW cz
                           left join CRM_LISTA_ZASOBOW czp on czp.PARENT_ID=cz.ID
                           left join CRM_WSKAZNIK cw on cw.ID_ZASOB=czp.ID
@@ -2090,7 +2098,7 @@ database=\"SES_USERS2\"
                           left join ADMIN_USERS au on au.ADM_ACCOUNT=\''.$ADMIN_USERNAME_DIRECTORY.'\'
                           where cz.\\`DESC\\` like \'KONTAKTY_view\' and cz.\\`TYPE\\`=\'TABELA\' limit 1 " |mysql -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D'.$REMOTE_FOLDER_ROOT.' '; //zalozenie 1 usera TODO synchronizacja z ldap
 
- $cmd[]['rsh']=' echo " insert into CRM_AUTH_PROFILE (ID_ZASOB, REMOTE_TABLE,REMOTE_ID) select czp1.ID , \'ADMIN_USERS\', au.ID
+ $cmd[]['rsh']=' echo " insert ignore into CRM_AUTH_PROFILE (ID_ZASOB, REMOTE_TABLE,REMOTE_ID) select czp1.ID , \'ADMIN_USERS\', au.ID
                           from CRM_LISTA_ZASOBOW cz
                           left join CRM_LISTA_ZASOBOW czp on czp.PARENT_ID=cz.ID
                           left join CRM_WSKAZNIK cw on cw.ID_ZASOB=czp.ID
@@ -2100,19 +2108,19 @@ database=\"SES_USERS2\"
                           left join ADMIN_USERS au on au.ADM_ACCOUNT=\''.$ADMIN_USERNAME_L1.'\'
                           where cz.\\`DESC\\` like \'KONTAKTY_view\' and cz.\\`TYPE\\`=\'TABELA\' limit 1 " |mysql -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D'.$REMOTE_FOLDER_ROOT.' '; //zalozenie 1 usera TODO synchronizacja z ldap
 
-$cmd[]['rsh']=' echo " insert into CRM_AUTH_PROFILE (ID_ZASOB, REMOTE_TABLE,REMOTE_ID) select cz.ID , \'ADMIN_USERS\', au.ID
+$cmd[]['rsh']=' echo " insert ignore into CRM_AUTH_PROFILE (ID_ZASOB, REMOTE_TABLE,REMOTE_ID) select cz.ID , \'ADMIN_USERS\', au.ID
                           from CRM_LISTA_ZASOBOW cz
                           left join ADMIN_USERS au on au.ADM_ACCOUNT=\''.$ADMIN_USERNAME_L1.'\'
                           where cz.\\`TYPE\\`=\'PODMIOT\' and cz.\\`DESC\\`=\''.$REMOTE_FOLDER_ROOT.'\' limit 1 " |mysql -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D'.$REMOTE_FOLDER_ROOT.' '; //zalozenie 1 usera TODO synchronizacja z ldap domyslna grupa
 
-$cmd[]['rsh']=' echo " insert into CRM_AUTH_PROFILE (ID_ZASOB, REMOTE_TABLE,REMOTE_ID) select cz.ID , \'ADMIN_USERS\', au.ID
+$cmd[]['rsh']=' echo " insert ignore into CRM_AUTH_PROFILE (ID_ZASOB, REMOTE_TABLE,REMOTE_ID) select cz.ID , \'ADMIN_USERS\', au.ID
                           from CRM_LISTA_ZASOBOW cz
                           left join ADMIN_USERS au on au.ADM_ACCOUNT=\''.$ADMIN_USERNAME_DIRECTORY.'\'
                           where cz.\\`TYPE\\`=\'PODMIOT\' and cz.\\`DESC\\`=\''.$REMOTE_FOLDER_ROOT.'\' limit 1 " |mysql -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D'.$REMOTE_FOLDER_ROOT.' '; //zalozenie 1 usera TODO synchronizacja z ldap domyslna grupa
 
  //TODO zamienic wyzej na akcje skryptem
-// $cmd[]['rsh']='php /Library/Server/Web/Data/Sites/Default/SE/bash_Route_Users_Task_syncUser.php '.$SERVER_ADDRESS.' '.$ADMIN_USERNAME_L1;
-// $cmd[]['rsh']='php /Library/Server/Web/Data/Sites/Default/SE/bash_Route_Users_Task_syncUser.php '.$SERVER_ADDRESS.' '.$ADMIN_USERNAME_DIRECTORY;
+ $cmd[]['rsh']='php /Library/Server/Web/Data/Sites/Default/SE/bash_Route_Users_Task_syncUser.php '.$SERVER_ADDRESS.' '.$ADMIN_USERNAME_L1;
+ $cmd[]['rsh']='php /Library/Server/Web/Data/Sites/Default/SE/bash_Route_Users_Task_syncUser.php '.$SERVER_ADDRESS.' '.$ADMIN_USERNAME_DIRECTORY;
 
  /* @2014-03-10 these has been moved to create config_base_structure_dump.sql option - WYKONAJ_REFERENCYJNA_BAZE_DANYCH
  $cmd[]['rsh']='php -r"include(\'/Library/Server/Web/Data/Sites/Default/SE/superedit-SQIX_STRUCTURE_DB_SYNC.php\') ; SQIX_STRUCTURE_DB_SYNC(\'import_db\',\'default_db\',0,\'WYSLIJ_DO_BAZY\',\'SYNC_ZASOBY_STRUCTURES_FROM_CONFIG\'); " '.$SERVER_ADDRESS.' FILTR'; //todo pare razy trzaba powtarzac bo sa bledy
@@ -2164,10 +2172,10 @@ $cmd[]['rsh']='[ -e /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--defau
 //@2016-04-27 jednak to tutaj nie dziala....
 //@2016-04-28 piotr dodal aktualizacje congig_check do dodawania tabeli config - i sprawdzamy czy pomoglo w tym etapie
 
-//TODO $cmd[]['rsh']='php /Library/Server/Web/Data/Sites/Default/SE/bash_force_classified_table_by_GroupID.php '.$SERVER_ADDRESS.' 3 CRM_PROCES'; //3 to grupa $REMOTE_FOLDER_ROOT
-//TODO $cmd[]['rsh']='php /Library/Server/Web/Data/Sites/Default/SE/bash_force_classified_table_by_GroupID.php '.$SERVER_ADDRESS.' 3 CRM_LISTA_ZASOBOW'; //3 to grupa $REMOTE_FOLDER_ROOT
-//TODO $cmd[]['rsh']='php /Library/Server/Web/Data/Sites/Default/SE/bash_force_classified_table_by_GroupID.php '.$SERVER_ADDRESS.' 3 CRM_WSKAZNIK'; //3 to grupa $REMOTE_FOLDER_ROOT
-// $cmd[]['rsh']='php /Library/Server/Web/Data/Sites/Default/SE/bash_force_classified_table_by_GroupID.php '.$SERVER_ADDRESS.' 3 CRM_AUTH_PROFILE'; //3 to grupa $REMOTE_FOLDER_ROOT
+ $cmd[]['rsh']='php /Library/Server/Web/Data/Sites/Default/SE/bash_force_classified_table_by_GroupID.php '.$SERVER_ADDRESS.' 3 CRM_PROCES'; //3 to grupa $REMOTE_FOLDER_ROOT
+ $cmd[]['rsh']='php /Library/Server/Web/Data/Sites/Default/SE/bash_force_classified_table_by_GroupID.php '.$SERVER_ADDRESS.' 3 CRM_LISTA_ZASOBOW'; //3 to grupa $REMOTE_FOLDER_ROOT
+ $cmd[]['rsh']='php /Library/Server/Web/Data/Sites/Default/SE/bash_force_classified_table_by_GroupID.php '.$SERVER_ADDRESS.' 3 CRM_WSKAZNIK'; //3 to grupa $REMOTE_FOLDER_ROOT
+ $cmd[]['rsh']='php /Library/Server/Web/Data/Sites/Default/SE/bash_force_classified_table_by_GroupID.php '.$SERVER_ADDRESS.' 3 CRM_AUTH_PROFILE'; //3 to grupa $REMOTE_FOLDER_ROOT
 
 return $cmd;
 
@@ -2457,7 +2465,7 @@ function MAKE_PKG_COMPONENT($h,$installer_dir_tar,$installer_url,$installer_tmp,
 				$skipPhpFiles[] = 'bash_Route_Users_Task_syncUser.php';
 				$skipPhpFiles[] = 'bash_Route_Users_Task_syncGroup.php';
 				$skipPhpFiles[] = 'bash_force_classified_table_by_GroupID.php';
-				$skipPhpFiles[] = 'UserStorageFactory.php';
+				$skipPhpFiles[] = 'bash_Route_Users_Task_AddUser.php';
 
 
 

SE/superedit-STATYSTYKA_TABELE.php

@@ -570,7 +570,7 @@ function STATYSTYKA_TABELE() {
 				, sum(  if( USERS2_MARKETING.I_PAY + USERS2_MARKETING.T_PAY + USERS2_MARKETING.TV_PAY > 0 and USERS2_MARKETING.I_PAY + USERS2_MARKETING.T_PAY + USERS2_MARKETING.TV_PAY  > 70 and USERS2_MARKETING.I_PAY + USERS2_MARKETING.T_PAY + USERS2_MARKETING.TV_PAY > 0 and USERS2_MARKETING.I_PAY + USERS2_MARKETING.T_PAY + USERS2_MARKETING.TV_PAY  < 100, 1 ,0 ) )  as PAY_70_100
 				, sum(  if( USERS2_MARKETING.I_PAY + USERS2_MARKETING.T_PAY + USERS2_MARKETING.TV_PAY > 0 and USERS2_MARKETING.I_PAY + USERS2_MARKETING.T_PAY + USERS2_MARKETING.TV_PAY  > 100 , 1 ,0 ) )  as PAY_100_more
 				, BUILDINGS.A_ADM_COMPANY
-				, MK_Rewiry.the_geom , MK_Rewiry.A_STATUS , MK_Rewiry.ID_PROJECT , MK_Rewiry.ID_KORESP_PROJEKT , MK_Rewiry.ID_KORESP_PROJ_WYK , MK_Rewiry.ID_KORESP_ZLECENIE , MK_Rewiry.ID_KORESP_PROTOK_ODB , MK_Rewiry.ID_KORESP_OFFER , MK_Rewiry.ID_KORESP_UMOWA_DEVELOPPER , MK_Rewiry.ID_KORESP_ZLECENIE_PROJEKT
+				, MK_Rewiry.the_geom  , MK_Rewiry.A_STATUS , MK_Rewiry.ID_PROJECT , MK_Rewiry.ID_KORESP_PROJEKT , MK_Rewiry.ID_KORESP_PROJ_WYK , MK_Rewiry.ID_KORESP_ZLECENIE , MK_Rewiry.ID_KORESP_PROTOK_ODB , MK_Rewiry.ID_KORESP_OFFER , MK_Rewiry.ID_KORESP_UMOWA_DEVELOPPER , MK_Rewiry.ID_KORESP_ZLECENIE_PROJEKT
 				, 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
@@ -578,8 +578,7 @@ 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
-
-			";
+							";
 			foreach ($COLSFORSTATS as $FFS) {
 				foreach ($COLSFORSTATS_OPERS as $FFFS) {
 					$sql .= ", round(( sum(
@@ -619,6 +618,7 @@ 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
+					
 				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
@@ -650,7 +650,26 @@ function STATYSTYKA_TABELE() {
 			$sqlList[]="UPDATE USERS2_OFFERS_GROUPS set A_CLASSIFIED='22913_PODMIOT_NETDAY_zoo_podmiot' , A_ADM_COMPANY='22913_PODMIOT_NETDAY_zoo_podmiot' where P_SERVICE_COMPANY='NETDAY' ";
 			$sqlList[]="UPDATE USERS2_OFFERS t1, USERS2_OFFERS_GROUPS t2 set t1.A_ADM_COMPANY=t2.A_ADM_COMPANY, t1.A_CLASSIFIED=t2.A_CLASSIFIED , t1.P_SERVICE_COMPANY=t2.P_SERVICE_COMPANY where t2.ID_NET=t1.ID or t2.ID_TEL=t1.ID or t2.ID_TV=t1.ID";
 			$sqlList[]="UPDATE USERS2_OFFERS_COSTS_GROUPS t1, USERS2_OFFERS t2 set t1.A_ADM_COMPANY=t2.A_ADM_COMPANY, t1.A_CLASSIFIED=t2.A_CLASSIFIED  where t2.ID_COSTS_GROUPS=t1.ID";
+			
+			$sqlList[] = " ALTER TABLE `USERS2_MARKETING_OVERWIEV_REWIR` ADD `budget_costs_COST`   DOUBLE(11,2)  ";
+			$sqlList[] = " ALTER TABLE `USERS2_MARKETING_OVERWIEV_REWIR` ADD `budget_plans_COST`   DOUBLE(11,2)  ";
+			$sqlList[] = " ALTER TABLE `USERS2_MARKETING_OVERWIEV_REWIR` ADD `budget_COST_rest`   DOUBLE(11,2)  ";
+			$sqlList[] = " ALTER TABLE `USERS2_MARKETING_OVERWIEV_REWIR` ADD `budget_plans_div_HP`   DOUBLE(11,2)  ";
+			$sqlList[]="UPDATE USERS2_MARKETING_OVERWIEV_REWIR t1 set t1.budget_costs_COST=( select sum(t2.COST_TOTAL) from test_budget_project_synthetics_view t2 where t1.ID_PROJECT=t2.ID_PROJECT)";
+			$sqlList[]="UPDATE USERS2_MARKETING_OVERWIEV_REWIR t1 set t1.budget_plans_COST=( select sum(t2.COST) from test_budget_project_synthetics_plans_view t2 where t1.ID_PROJECT=t2.ID_PROJECT)";
+			$sqlList[]="UPDATE USERS2_MARKETING_OVERWIEV_REWIR t1 set t1.budget_COST_rest=( select sum(t2.COST) from test_budget_project_synthetics_plans_view t2 where t1.ID_PROJECT=t2.ID_PROJECT)- ( select sum(t3.COST_TOTAL) from test_budget_project_synthetics_view t3 where t1.ID_PROJECT=t3.ID_PROJECT)";
+			$sqlList[]="UPDATE USERS2_MARKETING_OVERWIEV_REWIR t1 set t1.budget_plans_div_HP=GREATEST(( select sum(t2.COST) from test_budget_project_synthetics_plans_view t2 where t1.ID_PROJECT=t2.ID_PROJECT),( select sum(t3.COST_TOTAL) from test_budget_project_synthetics_view t3 where t1.ID_PROJECT=t3.ID_PROJECT))/t1.MIESZKAN";
+
+
+			//, sum(budget_costs.COST_TOTAL) as budget_costs_COST
+			//	, sum(budget_plans.COST) as budget_plans_COST
+			//	, sum(budget_plans.COST) - sum(budget_costs.COST_TOTAL) as budget_COST_rest
+			//	, GREATEST(sum(budget_plans.COST), sum(budget_costs.COST_TOTAL))/count(USERS2_MARKETING.S_ADDRESS_STREET) as budget_plans_div_HP
+
+			//left join test_budget_project_synthetics_view as budget_costs on budget_costs.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 
 
+					
 
 		}
 

SE/superedit-ZLECENIE.php

@@ -33,6 +33,8 @@ function ZLECENIE_KONFIGURACJA($SES_A) {
 
 	$STATUSY=array("YES"=>"Tak","NO"=>"Nie","UNKNOWN"=>"Nie wiadomo");
 	$DZIERZAWA_ROUTERA=$STATUSY[$SES_A['S_SOHO_WIFI_ROUTER_1292']];
+	$ROUTER_SSID=($SES_A['ROUTER_SSID'] ?: "nie zdefiniowano");
+	$ROUTER_PRESHARED_KEY=($SES_A['ROUTER_PRESHARED_KEY'] ?: "nie zdefiniowano");
 	$PODZIAL_LACZA=$STATUSY[$SES_A['CONN_DIV']];
 	$PUBLICZNY_ADRES_IP=$STATUSY[$SES_A['S_PUBLIC_IP']];
 	$PRZEKIEROWANIE_PORTOW=$STATUSY[$SES_A['S_E_PORT_1293']];
@@ -89,8 +91,12 @@ function ZLECENIE_KONFIGURACJA($SES_A) {
 		<tr><td>Prędkość wysyłania:</td><td>".$UPLOAD."</td></tr>";
 //		<tr><td>Podział łącza:</td><td>".$PODZIAL_LACZA."</td></tr>
 	echo "
-		<tr><td>Dzierżawa routera:</td><td>".$DZIERZAWA_ROUTERA."</td></tr>
-		<tr><td>Publiczny adres IP:</td><td>".$PUBLICZNY_ADRES_IP."</td></tr>
+		<tr><td>Dzierżawa routera:</td><td>".$DZIERZAWA_ROUTERA."</td></tr>";
+		if ($DZIERZAWA_ROUTERA == 'Tak') echo "
+		<tr><td>Nazwa sieci bezprzewodowej (SSID):</td><td>".$ROUTER_SSID."</td></tr>
+		<tr><td>Klucz do sieci bezprzewodowej:</td><td>".$ROUTER_PRESHARED_KEY."</td></tr>";
+	echo
+		"<tr><td>Publiczny adres IP:</td><td>".$PUBLICZNY_ADRES_IP."</td></tr>
 		<tr><td>Przekierowanie portów:</td><td>".$PRZEKIEROWANIE_PORTOW."</td></tr>
 		<tr><td colspan=2><br>Konfiguracja protokołu TCP/IP:</td></tr>
 		<tr><td>Adres IP:</td><td>".$SES_A['S_IP']."</td></tr>