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

SE/superedit-STATYSTYKA_TABELE.php

@@ -146,14 +146,15 @@ 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 Nieprawidlowe powiazanie budynku' AS ERROR
+	 					'ERROR Nieprawidlowe powiazanie budynku' AS ERROR, '' as A_STATUS
 						FROM USERS2_MARKETING AS t1
 						LEFT JOIN BUILDINGS AS t2 ON t1.T_TELBOX_BUILDING_IN = t2.S_ADDRESS_STREET
 						WHERE t2.ID IS NULL  and ( t2.A_STATUS!='DELETED' or t2.A_STATUS is NULL )
 						AND t1.T_TELBOX_BUILDING_IN LIKE  '_%' and t1.A_STATUS!='DELETED'
 						UNION 
 						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
+						, 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, '' as A_STATUS
 						FROM USERS2_MARKETING AS t1
 						WHERE t1.T_TELBOX_BUILDING_IN LIKE  '' and t1.A_STATUS!='DELETED' 
 						

SE/superedit-view_L_APPOITMENT_OVERWIEV.php

@@ -65,21 +65,24 @@ foreach($tbls as $tbl) {
 			$transform_=", '' as `ADRES` ";
 			foreach($transform as $src=>$dst) {
 				if(isset($struct[$src])) {
-					$transform_=", `".$src."` as `".$dst."`";
+					$transform_=", t1.`".$src."` as `".$dst."`";
 					echo "<br> Jest transform!";
 				} else echo "<br> Nie ma ".$src." w tabeli".$tbl;
 			}
 			
+			$errors_=" , if(t1.A_STATUS in ('NORMAL','WAITING') and (t2.A_STATUS!='NORMAL' or t2.ADM_ADMIN_LEVEL>5),'Ustalony pracownik nie pracuje','') as ERROR  "; //do weryfikacji bledow w spotkaniach
+			
+			
 			$sql_=array();
 			if(isset($sql)) $sql[]=" union ";
 			foreach($trans as $fld=>$as) {
-			 $sql_[]="`".$fld."` as `".$as."`";
+			 $sql_[]="t1.`".$fld."` as `".$as."`";
 			}
-			$sql[]=" ( select  `ID`, '".$tbl."' as `TABLE`,".implode(',', $sql_).$transform_." from `".$tbl."` where ( L_APPOITMENT_DATE!='' )   order by A_RECORD_UPDATE_DATE DESC  ) ";
+			$sql[]=" ( select  t1.`ID`, '".$tbl."' as `TABLE`,".implode(',', $sql_).$transform_.$errors_." from `".$tbl."` as t1  left join ADMIN_USERS as t2 on t1.L_APPOITMENT_USER=t2.ADM_ACCOUNT where ( t1.L_APPOITMENT_DATE!='' )   order by t1.A_RECORD_UPDATE_DATE DESC  ) ";
 			
 			
 			$msc=microtime(true);
-			$conn->query("select  `ID`, '".$tbl."' as `TABLE`,".implode(',', $sql_).$transform_." from `".$tbl."` where L_APPOITMENT_DATE!=''   order by A_RECORD_UPDATE_DATE DESC   ");
+			$conn->query("select  t1.`ID`, '".$tbl."' as `TABLE`,".implode(',', $sql_).$transform_.$errors_." from `".$tbl."` as t1 left join ADMIN_USERS as t2 on t1.L_APPOITMENT_USER=t2.ADM_ACCOUNT where t1.L_APPOITMENT_DATE!=''   order by t1.A_RECORD_UPDATE_DATE DESC   ");
 			$msc=microtime(true)-$msc;
 			$czas[]="Czas ".$msc." dla tabeli ".$tbl;