Evidence "changes" known now

Spoje-NET · Mar 6, 2024 · dfcec5f · dfcec5f
1 parent 81aaac5
commit dfcec5f
Show file tree

Hide file tree

Showing 12 changed files with 96 additions and 42 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -1,4 +1,4 @@
-php-spojenet-abraflexi (2.25.2.137~bookworm.138~jammy.139~jammy.140~jammy) UNRELEASED; urgency=medium
+php-spojenet-abraflexi (2.25.3) UNRELEASED; urgency=medium
 
   [ Vítězslav Dvořák ]
   * ease-core based
@@ -60,8 +60,9 @@ php-spojenet-abraflexi (2.25.2.137~bookworm.138~jammy.139~jammy.140~jammy) UNREL
   * jenkins-Spoje.Net-php-spojenet-abraflexi-138
   * jenkins-Spoje.Net-php-spojenet-abraflexi-139
   * jenkins-Spoje.Net-php-spojenet-abraflexi-140
+  * Changes availble now as evidence
 
- -- vitex <jenkins@vyvojar.spoje.net>  Thu, 22 Feb 2024 08:56:30 +0000
+ -- vitex <info@vitexsoftware.cz>  Wed, 06 Mar 2024 11:59:41 +0100
 
 flexipeehp (1.12) experimental; urgency=medium
 

diff --git a/src/AbraFlexi/EvidenceList.php b/src/AbraFlexi/EvidenceList.php
@@ -3,7 +3,7 @@
 /**
  * AbraFlexi - List of Evidencies.
  *
- * Generated: Wed, 06 Mar 2024 10:50:03 +0000
+ * Generated: Wed, 06 Mar 2024 11:18:55 +0000
  * From:      https://flexibee-dev.spoje.net:5434
  *
  * @author     Vítězslav Dvořák <vitex@arachne.cz>
@@ -166,7 +166,6 @@ class EvidenceList extends RO
     'faktura-vydana-polozka' => 'Položky vydaných faktur a prodejek',
     'banka-polozka' => 'Položky vzájemných zápočtů',
     'poplatek' => 'Poplatky',
-    'changes' => 'Poslední změny',
     'psc' => 'Poštovní směrovací čísla',
     'pracovni-pomer' => 'Pracovní poměr',
     'pracovni-pomer-hlavicka' => 'Pracovní poměr',
@@ -287,6 +286,7 @@ class EvidenceList extends RO
     'zakazka' => 'Zakázky',
     'zamek' => 'Zamykání období',
     'forma-uhrady-zauctovani' => 'Zaúčtování formy úhrady',
+    'changes' => 'Změny',
     'intrastat-zvlastni-pohyb' => 'Zvláštní pohyby',
     'zapujcka' => 'Zápůjčky',
     'rada' => 'dokladové řady',
@@ -336,14 +336,6 @@ class EvidenceList extends RO
     'className' => 'cz.winstrom.vo.w.Uzivatel',
     'formCode' => 'cisOsoby',
     ],
-    'changes' => [
-    'evidenceType' => 'ZMENY',
-    'evidenceName' => 'Poslední změny',
-    'evidencePath' => 'changes',
-    'importStatus' => 'UNSUPPORTRED',
-    'className' => '',
-    'formCode' => '',
-    ],
     'analyza-nakupu' => [
     'evidenceType' => 'ANALYZA_NAKUPU',
     'evidenceName' => 'Analýza nákupu',
@@ -596,6 +588,15 @@ class EvidenceList extends RO
     'formCode' => 'vykazVysledovkaPoUctech',
     'extIdSupported' => 'false',
     ],
+    'changes' => [
+    'evidenceType' => 'ZMENY',
+    'evidenceName' => 'Změny',
+    'evidencePath' => 'changes',
+    'importStatus' => 'UNSUPPORTRED',
+    'extIdSupported' => true,
+    'className' => '',
+    'formCode' => '',
+    ],
     'adresar-bankovni-ucet' => [
     'evidenceType' => 'ADR_BANKOVNI_UCET',
     'evidenceName' => 'Bankovní spojení',

diff --git a/src/AbraFlexi/Formats.php b/src/AbraFlexi/Formats.php
@@ -1418,17 +1418,6 @@ public static function contentTypeToSuffix($contentType)
     'JSON' => 'json',
     'CSV' => 'csv',
     ];
-    /**
-     * Evidence changes (Poslední změny) Formats.
-     *
-     * @var array
-     */
-    public static $changes = [
-    'HTML' => 'html',
-    'XML' => 'xml',
-    'JSON' => 'json',
-    'CSV' => 'csv',
-    ];
     /**
      * Evidence psc (Poštovní směrovací čísla) Formats.
      *
@@ -2749,6 +2738,17 @@ public static function contentTypeToSuffix($contentType)
     'JSON' => 'json',
     'CSV' => 'csv',
     ];
+    /**
+     * Evidence changes (Změny) Formats.
+     *
+     * @var array
+     */
+    public static $changes = [
+    'HTML' => 'html',
+    'XML' => 'xml',
+    'JSON' => 'json',
+    'CSV' => 'csv',
+    ];
     /**
      * Evidence intrastat-zvlastni-pohyb (Zvláštní pohyby) Formats.
      *

diff --git a/static/EvidenceFullList.json b/static/EvidenceFullList.json
diff --git a/static/EvidenceList.json b/static/EvidenceList.json
diff --git a/static/Formats.json b/static/Formats.json
diff --git a/static/Properties.changes.json b/static/Properties.changes.json
@@ -0,0 +1 @@
+{"id":{"showToUser":"false","propertyName":"id","name":"ID","title":"ID","type":"integer","isVisible":"true","isSortable":"true","isHighlight":"false","inId":"true","inSummary":"true","inDetail":"true","mandatory":"false","isWritable":"false","isOverWritable":"false","hasBusinessLogic":"false","isUpperCase":"false","isLowerCase":"false","links":null},"external-ids":{"showToUser":"false","propertyName":"external-ids","fkEvidencePath":"external-ids","dbName":"extid","name":"external-ids","title":"extIDs","type":"relation","isVisible":"true","isSortable":"false","isHighlight":"false","inId":"true","inSummary":"true","inDetail":"true","inExpensive":"false","mandatory":"false","isWritable":"true","isOverWritable":"true","hasBusinessLogic":"false","isUpperCase":"false","isLowerCase":"false","links":null}}
diff --git a/tools/changes-properties.json b/tools/changes-properties.json
@@ -0,0 +1,27 @@
+{
+    "properties": {
+        "@version": "1.0",
+        "evidenceName": "Změny",
+        "tagName": "changes",
+        "property": [{
+                "showToUser": "false",
+                "propertyName": "id",
+                "name": "ID",
+                "title": "ID",
+                "type": "integer",
+                "isVisible": "true",
+                "isSortable": "true",
+                "isHighlight": "false",
+                "inId": "true",
+                "inSummary": "true",
+                "inDetail": "true",
+                "mandatory": "false",
+                "isWritable": "false",
+                "isOverWritable": "false",
+                "hasBusinessLogic": "false",
+                "isUpperCase": "false",
+                "isLowerCase": "false",
+                "links": null
+            }]
+    }
+}
diff --git a/tools/update_actions_class.php b/tools/update_actions_class.php
@@ -124,6 +124,9 @@ class Actions
 $pos = 0;
 foreach (EvidenceList::$name as $evidencePath => $evidenceName) {
     $pos++;
+    if ($evidencePath == 'changes') {
+        continue;
+    }
     $structure = getEvidenceActions($evidencePath, $syncer);
     $structures[$evidencePath] = $structure;
     if (count($structure)) {

diff --git a/tools/update_evidencelist_class.php b/tools/update_evidencelist_class.php
@@ -6,7 +6,7 @@
 define('EASE_LOGGER', 'console|syslog');
 
 require_once '../test/bootstrap.php';
-require_once  __DIR__ . '/common.php';
+require_once __DIR__ . '/common.php';
 
 $outFile = 'EvidenceList.php';
 $outJson = 'EvidenceList.json';
@@ -19,7 +19,8 @@
  * @param RO $syncer Class to read from FlexiBee
  * @return array     Evidence structure
  */
-function getColumnsInfo($evidence, RO $syncer) {
+function getColumnsInfo($evidence, RO $syncer)
+{
     $useKeywords = [];
     $flexinfo = $syncer->performRequest($evidence . '/properties.json');
     if (count($flexinfo) && array_key_exists('properties', $flexinfo)) {
@@ -43,7 +44,7 @@ function getColumnsInfo($evidence, RO $syncer) {
  * From:      ' . $statuser->url . '
  *    
  * @author     Vítězslav Dvořák <vitex@arachne.cz>
- * @copyright  (C) 2016-'.date('Y').' Spoje.Net
+ * @copyright  (C) 2016-' . date('Y') . ' Spoje.Net
  */
 
 namespace AbraFlexi;
@@ -91,7 +92,7 @@ class EvidenceList extends RO
 ';
 
 $syncer = new EvidenceList();
-$syncer->addStatusMessage('Updating Evidences List');
+$syncer->addStatusMessage('♻️ Updating Evidences List');
 
 $evidencies = $syncer->getColumnsFromAbraFlexi(['evidencePath', 'evidenceName']);
 
@@ -114,13 +115,23 @@ class EvidenceList extends RO
     "formCode" => "cisOsoby"
 ];
 
+$evidencies[] = [
+    "evidenceType" => "ZMENY",
+    "evidenceName" => "Změny",
+    "evidencePath" => "changes",
+    "importStatus" => "UNSUPPORTRED",
+    'extIdSupported' => true,
+    "className" => "",
+    "formCode" => ""
+];
+
 $evlist = [];
 foreach ($evidencies as $evidenceID => $evidence) {
     if (array_key_exists('evidencePath', $evidence)) {
         $evlist[$evidence['evidencePath']] = $evidence['evidenceName'];
         $fullList[$evidence['evidencePath']] = $evidence;
     }
-    
+
     if (array_key_exists('extIdSupported', $evidence)) {
         $evidencies[$evidenceID]['extIdSupported'] = ($evidencies[$evidenceID]['extIdSupported'] == 'true');
     } else {

diff --git a/tools/update_properties_class.php b/tools/update_properties_class.php
@@ -45,14 +45,21 @@ class Properties
 foreach (EvidenceList::$name as $evidencePath => $evidenceName) {
     $pos++;
     $evidenceInfo = EvidenceList::$evidences[$evidencePath];
-    if ($evidencePath == 'nastaveni') {
-        $info = json_decode(file_get_contents('nastaveni-properties.json'),
-                true);
-        $structure = \Ease\Functions::reindexArrayBy($info['properties']['property'], 'propertyName');
-    } else {
-        $structure = $syncer->getOnlineColumnsInfo($evidencePath);
+
+    switch ($evidencePath) {
+        case 'nastaveni':
+            $info = json_decode(file_get_contents('nastaveni-properties.json'), true);
+            $structure = \Ease\Functions::reindexArrayBy($info['properties']['property'], 'propertyName');
+            break;
+        case 'changes':
+            $info = json_decode(file_get_contents('changes-properties.json'), true);
+            $structure = \Ease\Functions::reindexArrayBy($info['properties']['property'], 'propertyName');
+            break;
+        default:
+            $structure = $syncer->getOnlineColumnsInfo($evidencePath);
+            break;
     }
-
+    
     if (array_key_exists('extIdSupported', $evidenceInfo) && ($evidenceInfo['extIdSupported'] == true)) {
         $structure['external-ids'] = [
             "showToUser" => "false",
@@ -141,8 +148,7 @@ class Properties
         $syncer->addStatusMessage($pos . ' of ' . count(EvidenceList::$name) . ' ' . $evidencePath . ': structure problem',
                 'error');
     }
-    file_put_contents('Properties.' . $evidencePath . '.json',
-            json_encode($structure));
+    file_put_contents('Properties.' . $evidencePath . '.json', json_encode($structure));
 
     $evidenceClass = evidenceToClass($evidencePath);
     $evidenceClassFile = '../src/AbraFlexi/' . $evidenceClass . '.php';

diff --git a/tools/update_relations_class.php b/tools/update_relations_class.php
@@ -6,7 +6,7 @@
 define('EASE_LOGGER', 'console|syslog');
 
 require_once '../test/bootstrap.php';
-require_once  __DIR__ . '/common.php';
+require_once __DIR__ . '/common.php';
 
 $outFile = 'Relations.php';
 $outJson = 'Relations.json';
@@ -20,7 +20,8 @@
  * 
  * @return array     Relations structure
  */
-function getEvidenceRelations($evidence, RO $syncer) {
+function getEvidenceRelations($evidence, RO $syncer)
+{
     $relations = [];
 
     if ($evidence == 'atribut') {
@@ -83,6 +84,9 @@ class Relations
 $pos = 0;
 foreach (EvidenceList::$name as $evidencePath => $evidenceName) {
     $pos++;
+    if ($evidencePath == 'changes') {
+        continue;
+    }
     $structure = getEvidenceRelations($evidencePath, $syncer);
 
     $relations[$evidencePath] = $structure;