Browse Source

FixCrmProcesInitIdx add database id for zasoby views

Piotr Labudda 10 years ago
parent
commit
622fa6f3c1
1 changed files with 23 additions and 4 deletions
  1. 23 4
      SE/se-lib/Route/FixCrmProcesInitIdx.php

+ 23 - 4
SE/se-lib/Route/FixCrmProcesInitIdx.php

@@ -483,9 +483,16 @@ SQL;
 					, z.`DESC` as `CELL_NAME`
 					, zp.`ID` as `ID_TABLE`
 					, zp.`DESC` as `TABLE_NAME`
+					, zp.`DESC_PL` as `TABLE_LABEL`
+					, zp.`OPIS` as `TABLE_DESCRIPTION`
+					, zpp.`ID` as `ID_DATABASE`
 					, wsk.`ID_PROCES` as `ID_PROCES`
 				from `CRM_LISTA_ZASOBOW` z
 					join `CRM_LISTA_ZASOBOW` zp on(zp.`ID`=z.`PARENT_ID` and zp.`TYPE`='TABELA' and zp.`A_STATUS` in('WAITING','NORMAL'))
+					join `CRM_LISTA_ZASOBOW` zpp on(zpp.`ID`=zp.`PARENT_ID`
+						-- TODO: and zpp.`TYPE`='BAZA_DANYCH...'
+						and zpp.`A_STATUS` in('WAITING','NORMAL')
+					)
 					join `CRM_WSKAZNIK` wsk on(wsk.`ID_ZASOB`=z.`ID` and wsk.`A_STATUS` in('WAITING','NORMAL'))
 					join `CRM_PROCES` p on(p.`ID`=wsk.`ID_PROCES` and p.`A_STATUS` in('WAITING','NORMAL'))
 				where z.`TYPE`='KOMORKA'
@@ -512,6 +519,9 @@ SQL;
 					, z.`DESC` as `CELL_NAME`
 					, zp.`ID` as `ID_TABLE`
 					, zp.`DESC` as `TABLE_NAME`
+					, zp.`DESC_PL` as `TABLE_LABEL`
+					, zp.`OPIS` as `TABLE_DESCRIPTION`
+					, zpp.`ID` as `ID_DATABASE`
 					, wsk.`ID_PROCES` as `ID_PROCES`
 					, replace(przyp.`FORM_TREAT`, ',', '') as FORM_TREAT
 					, IF(przyp.`FORM_TREAT` & 2,   1, 0) as PERM_R
@@ -524,6 +534,10 @@ SQL;
 					, IF(przyp.`FORM_TREAT` & 256, 1, 0) as PERM_E
 				from `CRM_LISTA_ZASOBOW` z
 					join `CRM_LISTA_ZASOBOW` zp on(zp.`ID`=z.`PARENT_ID` and zp.`TYPE`='TABELA' and zp.`A_STATUS` in('WAITING','NORMAL'))
+					join `CRM_LISTA_ZASOBOW` zpp on(zpp.`ID`=zp.`PARENT_ID`
+						-- TODO: and zpp.`TYPE`='BAZA_DANYCH...'
+						and zpp.`A_STATUS` in('WAITING','NORMAL')
+					)
 					join `CRM_WSKAZNIK` wsk on(wsk.`ID_ZASOB`=z.`ID` and wsk.`A_STATUS` in('WAITING','NORMAL'))
 					join `CRM_PROCES` p on(p.`ID`=wsk.`ID_PROCES` and p.`A_STATUS` in('WAITING','NORMAL'))
 					join `CRM_PRZYPADEK` as przyp on (przyp.`ID`=wsk.`ID_PRZYPADEK`)
@@ -557,7 +571,7 @@ SQL;
 					and zp.`ID`='{$idTable}'
 					and wsk.`ID_PROCES` in({$sqlIdProcesList})
 				group by z.`ID`, wsk.`ID_PROCES`
-				order by `SORT_PRIO`
+				order by z.`SORT_PRIO`
 SQL;
 		$sqlExample_UrlToUserProces = <<<SQL
 			select zpv.*
@@ -585,9 +599,14 @@ SQL;
 		$sqlList['RemoveViewTableToProcesGrouped'] = "DROP VIEW IF EXISTS `CRM_PROCES_idx_TABLE_TO_PROCES_GROUPED_VIEW`";
 		$sqlList['InstallViewTableToProcesGrouped'] = <<<SQL
 			CREATE VIEW `CRM_PROCES_idx_TABLE_TO_PROCES_GROUPED_VIEW` AS
-			select tpv.`ID_TABLE`, tpv.`TABLE_NAME`, tpv.`ID_PROCES`
-				from `CRM_PROCES_idx_TABLE_TO_PROCES_VIEW` tpv
-				group by tpv.`ID_TABLE`, tpv.`ID_PROCES`
+			select tpv.`ID_TABLE`
+				, tpv.`TABLE_NAME`
+				, tpv.`TABLE_LABEL`
+				, tpv.`TABLE_DESCRIPTION`
+				, tpv.`ID_DATABASE`
+				, tpv.`ID_PROCES`
+			from `CRM_PROCES_idx_TABLE_TO_PROCES_VIEW` tpv
+			group by tpv.`ID_TABLE`, tpv.`ID_PROCES`
 SQL;
 		$sqlList['RemoveViewTableToUser'] = "DROP VIEW IF EXISTS `CRM_PROCES_idx_TABLE_TO_USER_VIEW`";
 		$sqlList['InstallViewTableToUser'] = <<<SQL