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

SE/bash_sync_perms.php

@@ -545,7 +545,7 @@ class SyncPerms {
 		echo "DBG: UrlAction_WmsGenerate->doGenerate() END\n";
 
 		echo "DBG: UrlAction_BiAuditGenerate->doGenerate() START...\n";
-		//Router::getRoute('UrlAction_BiAuditGenerate')->doGenerate(); //musze przetestowac raport!
+		Router::getRoute('UrlAction_BiAuditGenerate')->doGenerate(); //musze przetestowac raport!
 		echo "DBG: UrlAction_BiAuditGenerate->doGenerate() END\n";
 	}
 

SE/schema/default_db_xml_cache.public/default_db/BI_audit_BENFORD/default_db__x3A__BI_audit_BENFORD.BI_audit_BENFORD.overwiev_table.xsl

@@ -160,9 +160,9 @@
             <stentry><xsl:value-of select="@leadingNumber"/></stentry>
             <!--<stentry><xsl:value-of select="system_cache__dita:localname.translate(name())"/></stentry>-->
             <stentry><xsl:value-of select="count"/></stentry>
-            <stentry><xsl:value-of select="format-number(number(value)*100,'0.##')"/></stentry>
-            <stentry><xsl:value-of select="format-number(number(norm)*100,'0.##')"/></stentry>
-            <stentry><xsl:value-of select="deviation"/></stentry>
+            <stentry><xsl:value-of select="format-number(number(value)*100,'0,###')"/></stentry>
+            <stentry><xsl:value-of select="format-number(number(norm)*100,'0,###')"/></stentry>
+            <stentry><xsl:value-of select="format-number(number(deviation)*100,'0,###')"/></stentry>
             <stentry><xsl:value-of select="system_cache__dita:localname.translate('correct',correct)"/></stentry>
             <!--<stentry></stentry>-->
             <!--<stentry/>-->
@@ -179,9 +179,9 @@
             <stentry><xsl:value-of select="@leadingNumber"/></stentry>
             <!--<stentry><xsl:value-of select="system_cache__dita:localname.translate(name())"/></stentry>-->
             <stentry><xsl:value-of select="count"/></stentry>
-            <stentry><xsl:value-of select="format-number(number(value)*100,'0.##')"/></stentry>
-            <stentry><xsl:value-of select="format-number(number(norm)*100,'0.##')"/></stentry>
-            <stentry><xsl:value-of select="deviation"/></stentry>
+            <stentry><xsl:value-of select="format-number(number(value)*100,'0,###')"/></stentry>
+            <stentry><xsl:value-of select="format-number(number(norm)*100,'0,###')"/></stentry>
+            <stentry><xsl:value-of select="format-number(number(deviation)*100,'0,###')"/></stentry>
             <stentry><xsl:value-of select="system_cache__dita:localname.translate('correct',correct)"/></stentry>
             <!--<stentry></stentry>-->
             <!--<stentry/>-->

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

@@ -3126,6 +3126,7 @@ SQL;
 				$queries[] = "delete from `aref` using `BI_audit_ALL_ref` as `aref` join `BI_audit_ALL` as `all1` on `aref`.`ID1` = `all1`.`ID` and `all1`.`REMOTE_TABLE` = '{$refTableFrom}' join `BI_audit_ALL` as `all2` on `aref`.`ID2` = `all2`.`ID` and `all2`.`REMOTE_TABLE` = '{$refTableTo}' join `{$refTable}` as `ref` on `all1`.`REMOTE_ID` = `ref`.`PRIMARY_KEY` and `all2`.`REMOTE_ID` = `ref`.`REMOTE_PRIMARY_KEY` and `ref`.`A_STATUS` = 'WAITING' join `BI_audit_ALL_ref_RELATIONS` `rel` on `all1`.`REMOTE_TABLE` = `rel`.`RELATION` and `aref`.`RELATION_ID` = `rel`.`ID`";
 				$queries[] = "insert into `BI_audit_ALL_ref` (`ID1`, `ID2`, `PARAMS`, `RELATION_ID`, `BASE`) select `all1`.`ID`, `all2`.`ID`, `ref`.`REMOTE_TYPENAME`, `rel`.`ID`, {$refTableConf['base']} from `BI_audit_ALL` as `all1` join `{$refTable}` as `ref` on `all1`.`REMOTE_TABLE` = '{$refTableFrom}' and `all1`.`REMOTE_ID` = `ref`.`PRIMARY_KEY` and `ref`.`A_STATUS` = 'WAITING' join `BI_audit_ALL` as `all2` on `all2`.`REMOTE_TABLE` = '{$refTableTo}' and `ref`.`REMOTE_PRIMARY_KEY` = `all2`.`REMOTE_ID` join `BI_audit_ALL_ref_RELATIONS` `rel` on `all1`.`REMOTE_TABLE` = `rel`.`RELATION`";
 				if (!in_array($refTableFrom, $sourceTables)) {
+					$queries[] = "delete from `aref` using `BI_audit_ALL_ref` as `aref` join `BI_audit_ALL` as `all1` on `aref`.`ID2` = `all1`.`ID` and `all1`.`REMOTE_TABLE` = '{$refTableFrom}' join `BI_audit_ALL` as `all2` on `aref`.`ID1` = `all2`.`ID` and `all2`.`REMOTE_TABLE` = '{$refTableTo}' join `{$refTable}` as `ref` on `all1`.`REMOTE_ID` = `ref`.`PRIMARY_KEY` and `all2`.`REMOTE_ID` = `ref`.`REMOTE_PRIMARY_KEY` and `ref`.`A_STATUS` = 'WAITING' join `BI_audit_ALL_ref_RELATIONS` `rel` on `all2`.`REMOTE_TABLE` = `rel`.`RELATION` and `aref`.`RELATION_ID` = `rel`.`ID`";
 					$queries[] = "insert into `BI_audit_ALL_ref` (`ID1`, `ID2`, `PARAMS`, `RELATION_ID`, `BASE`) select `all2`.`ID`, `all1`.`ID`, `ref`.`REMOTE_TYPENAME`, `rel`.`ID`, {$refTableConf['base']} from `BI_audit_ALL` as `all1` join `{$refTable}` as `ref` on `all1`.`REMOTE_TABLE` = '{$refTableFrom}' and `all1`.`REMOTE_ID` = `ref`.`PRIMARY_KEY` and `ref`.`A_STATUS` = 'WAITING' join `BI_audit_ALL` as `all2` on `all2`.`REMOTE_TABLE` = '{$refTableTo}' and `ref`.`REMOTE_PRIMARY_KEY` = `all2`.`REMOTE_ID` join `BI_audit_ALL_ref_RELATIONS` `rel` on `all2`.`REMOTE_TABLE` = `rel`.`RELATION`";
 				}
 				if ($backRefTable = BiAuditRefTables::getRefTable($refTableTo, $refTableFrom, false)) {

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

@@ -447,7 +447,8 @@ class Route_UrlAction_BiAuditGraph extends RouteBase {
 				left join `{$allTables['Point']}` as t_Point on ( t_Point.ID = r_Path_to_Point.REMOTE_PRIMARY_KEY )
 				{$sqlFromJoin}
 			where t_Raport.ID = {$raportId}
-		";
+			
+		"; //TODO DEBUG LIMIT OPTIMALIZATION - HANGS limit 300
 		return DB::getPDO()->fetchAll($sql);
 	}