Improvement - SinergiaDA - Varios cambios (#247)

SinergiaTIC · Jun 4, 2024 · e2d1cfb · e2d1cfb
1 parent 9052d35
commit e2d1cfb
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 14 deletions.
diff --git a/.gitignore b/.gitignore
@@ -128,4 +128,7 @@ codeception.yml
 .env.dev
 
 # Ignore application concatenated files
-/custom/application/Ext/*
+/custom/application/Ext/*
+
+# Ignore SDA check rebuild errors
+sdaRebuildError.txt
diff --git a/SticInclude/SinergiaDA.php b/SticInclude/SinergiaDA.php
@@ -377,13 +377,6 @@ public function createViews($callUpdateModel = true, $rebuildFilter = 'all')
 
                             if (isset($fieldV['link']) && !empty($fieldV['link']) && $fieldV['name'] != 'assigned_user_name') {
 
-                                //*********************** */
-                                // Es una relación 1:n normal,
-                                if ($fieldV['module'] == $moduleName) {
-                                    // The standar relationships between the same module are directly excluded, because they cannot be represented in EDA
-                                    continue 2;
-                                }
-
                                 // Build and obtain the translated value from the other side of the relationship so it can be properly displayed in SinergiaDA
                                 $joinModuleRelLabel = 'LBL_' . strtoupper($fieldV['link']) . '_FROM_' . strtoupper($moduleName) . '_TITLE';
                                 $joinLabel = translate($joinModuleRelLabel, $fieldV['module']);
@@ -622,12 +615,6 @@ public function createViews($callUpdateModel = true, $rebuildFilter = 'all')
                         $edaPrecision = $fieldV['type'] == 'currency' ? 2 : 0;
                         $edaPrecision = $fieldV['precision'] ? $fieldV['precision'] : $edaPrecision;
                         break;
-                    case 'id':
-                        // set id as numeric to allow counts and distinct counts
-                        $edaType = 'numeric';
-                        $edaPrecision = 0;
-                        $edaAggregations = 'count,count_distinct,none';
-                        break;
                     case 'date':
                     case 'datetime':
                     case 'datetimecombo':

diff --git a/SticInclude/SinergiaDARebuild.php b/SticInclude/SinergiaDARebuild.php
@@ -63,10 +63,13 @@ public static function rebuild($callUpdateModel = false, $rebuildFilter = 'all')
                 $msg .= $match . "<br>";
             }
 
+            unlink('sdaRebuildError');
+
             // Return 'ok' or the error message
             if (empty($msg)) {
                 return 'ok';
             } else {
+                sugar_file_put_contents('sdaRebuildError.txt', $msg);
                 return $msg;
             }
             die();