scripts updated

hdijkema · Sep 3, 2024 · d0db28e · d0db28e
1 parent 58ce16d
commit d0db28e
Show file tree

Hide file tree

Showing 20 changed files with 58 additions and 34 deletions.
diff --git a/application/Espo/Modules/Scripts/Resources/i18n/nl_NL/Script.json b/application/Espo/Modules/Scripts/Resources/i18n/nl_NL/Script.json
@@ -20,7 +20,8 @@
             "controle": "Controles",
             "rapport": "Rapport",
             "email": "Email",
-            "email_aan_leden": "Email aan leden"
+            "email_aan_leden": "Email aan leden",
+            "import": "Importeren van bestanden"
         },
         "voorEntiteit": {
             "Leden": "Leden",
@@ -30,4 +31,4 @@
     "links": {
         "leden": "Leden"
     }
-}
+}
diff --git a/application/Espo/Modules/Scripts/Resources/layouts/Script/detail.json b/application/Espo/Modules/Scripts/Resources/layouts/Script/detail.json
@@ -27,7 +27,7 @@
                     "name": "voorEntiteit"
                 },
                 {
-                    "name": "leden"
+                    "name": "contacts"
                 }
             ],
             [
@@ -48,7 +48,7 @@
         "style": "success",
         "dynamicLogicVisible": null,
         "hidden": false,
-        "customLabel": "Uitvoerbare taak"
+        "customLabel": "Executable Task"
     },
     {
         "rows": [
@@ -61,6 +61,6 @@
         "style": "info",
         "dynamicLogicVisible": null,
         "hidden": false,
-        "customLabel": "Verwerking"
+        "customLabel": "Executionlog"
     }
 ]
diff --git a/application/Espo/Modules/Scripts/Resources/layouts/Script/detailSmall.json b/application/Espo/Modules/Scripts/Resources/layouts/Script/detailSmall.json
@@ -27,7 +27,12 @@
                     "name": "voorEntiteit"
                 },
                 {
-                    "name": "leden"
+                    "name": "contacts"
+                }
+            ],
+            [
+                {
+                    "name": "emailTemplate"
                 }
             ],
             [
@@ -40,8 +45,10 @@
                 }
             ]
         ],
-        "style": "default",
-        "label": ""
+        "style": "success",
+        "dynamicLogicVisible": null,
+        "hidden": false,
+        "customLabel": "Executable task"
     },
     {
         "rows": [
@@ -54,6 +61,6 @@
         "style": "info",
         "dynamicLogicVisible": null,
         "hidden": true,
-        "customLabel": "Verslag"
+        "customLabel": "Executionlog"
     }
 ]
diff --git a/application/Espo/Modules/Scripts/Resources/metadata/app/client.json b/application/Espo/Modules/Scripts/Resources/metadata/app/client.json
@@ -1,6 +1,5 @@
 {
     "cssList": [ 
-	"__APPEND__",
         "client/modules/scripts/css/scripts.css", 
         "client/modules/scripts/css/datatables.min.css" 
     ]

diff --git a/application/Espo/Modules/Scripts/Resources/metadata/app/jsLibs.json b/application/Espo/Modules/Scripts/Resources/metadata/app/jsLibs.json
@@ -3,11 +3,10 @@
         "path": "client/modules/scripts/lib/datatables.min.js",
         "exportsTo": "$",
         "exportsAs": "Datatables"
-    }, 
+    },
     "Xlsx": {
         "path": "client/modules/scripts/lib/exceljs.min.js",
         "exportsTo": "$",
         "exportsAs": "Xlsx"
     }
-
 }
diff --git a/application/Espo/Modules/Scripts/Resources/metadata/clientDefs/Script.json b/application/Espo/Modules/Scripts/Resources/metadata/clientDefs/Script.json
@@ -5,20 +5,21 @@
         { "name": "Standaard", "label":  "Standaard taken" },
         { "name": "Rapporten", "label": "Rapportages en controles" },
         { "name": "Emails", "label":  "Emails" },
-        { "name": "Exports", "label": "Exportlijsten" }
+        { "name": "Exports", "label": "Exportlijsten" },
+        { "name": "Imports", "label": "Importeren van bestanden" }
     ],
     "selectDefaultFilters": {"filter": "Standaard"},
     "color": "#e7e731",
     "iconClass": "fas fa-calculator",
     "dynamicLogic": {
         "fields": {
-            "leden": {
+            "contacts": {
                 "visible": {
                     "conditionGroup": [
                         {
                             "type": "equals",
                             "attribute": "voorEntiteit",
-                            "value": "Leden"
+                            "value": "Contacts"
                         }
                     ]
                 }
@@ -27,9 +28,19 @@
                 "visible": {
                     "conditionGroup": [
                         {
-                            "type": "equals",
-                            "attribute": "type",
-                            "value": "email"
+                            "type": "or",
+                            "value": [
+                                {
+                                    "type": "equals",
+                                    "attribute": "type",
+                                    "value": "email"
+                                },
+                                {
+                                    "type": "equals",
+                                    "attribute": "type",
+                                    "value": "job"
+                                }
+                            ]
                         }
                     ]
                 }

diff --git a/application/Espo/Modules/Scripts/Resources/metadata/entityDefs/Script.json b/application/Espo/Modules/Scripts/Resources/metadata/entityDefs/Script.json
@@ -71,20 +71,22 @@
                 "controle",
                 "rapport",
                 "email",
-                "job"
+                "job",
+                "import"
             ],
             "style": {
                 "export": null,
                 "import-na": null,
                 "controle": null,
                 "rapport": null,
                 "email": null,
-                "job": null
+                "job": null,
+                "import": null
             },
             "default": "rapport",
             "isCustom": true
         },
-        "leden": {
+        "contacts": {
             "type": "linkMultiple",
             "layoutDetailDisabled": false,
             "layoutMassUpdateDisabled": false,
@@ -96,11 +98,11 @@
             "type": "enum",
             "required": true,
             "options": [
-                "Leden",
+                "Contacts",
                 "-"
             ],
             "style": {
-                "Leden": null,
+                "Contacts": null,
                 "-": null
             },
             "default": "-",
@@ -135,7 +137,7 @@
             "relationName": "EntityTeam",
             "layoutRelationshipsDisabled": true
         },
-        "leden": {
+        "contacts": {
             "type": "hasMany",
             "relationName": "scriptContact",
             "foreign": "scripts",

diff --git a/application/Espo/Modules/Scripts/SelectManagers/Script.php b/application/Espo/Modules/Scripts/SelectManagers/Script.php
@@ -48,6 +48,11 @@ protected function filterExports(&$result)
       $result['whereClause'][] = [ 'type' => 'export' ];
     }
 
+    protected function filterImports(&$result)
+    {
+      $result['whereClause'][] = [ 'type' => 'import' ];
+    }
+
     protected function filterStandaard(&$result)
     {
       $result['whereClause'][] = [ 'type!=' => 'import-na' ];

diff --git a/build-ext.dist.sh b/build-ext.dist.sh
@@ -84,7 +84,7 @@ done
 
 if [ "$CMD" == "install" ]; then
     mkdir -p $INSTALL_FILES
-    tar cf - $TARDIRS | (cd $INSTALL_PREFIX; tar xvf - ) >$INSTALL_FILES/$MODULE
+    tar cf - $TARDIRS | (cd $INSTALL_PREFIX; tar hxvf - ) >$INSTALL_FILES/$MODULE
     FILES=`cat $INSTALL_FILES/$MODULE`
     for F in $FILES
     do

diff --git a/build-scripts.sh b/build-scripts.sh
@@ -31,20 +31,20 @@ echo " - FixedHeader"
 echo " - SearchPanes"  
 echo ""
 (cd libs; unzip DataTables.zip datatables.min.css datatables.min.js DataTables-1.10.21/images/*)
-(cd libs; tar cf - DataTables-1.10.21) | (cd client/modules/scripts/css;tar xf - )
+(cd libs; tar cf - DataTables-1.10.21) | (cd client/custom/modules/scripts/css;tar xf - )
 cd libs
-cp datatables.min.css ../client/modules/scripts/css/
-cp datatables.min.js ../client/modules/scripts/lib/datatables.min.js
-cp exceljs.min.js ../client/modules/scripts/lib/exceljs.min.js
+cp datatables.min.css ../client/custom/modules/scripts/css/
+cp datatables.min.js ../client/custom/modules/scripts/lib/datatables.min.js
+cp exceljs.min.js ../client/custom/modules/scripts/lib/exceljs.min.js
 cd ..
 
 $BE "$CMD" "$VERSION" "$EXT" "$NAME" "$DESCRIPTION" "$MODULE"
 
-rm -f client/modules/scripts/css/datatables.min.css 
-rm -rf client/modules/scripts/css/DataTables-1.10.21
-mkdir -p client/modules/scripts/lib
-rm -f client/modules/scripts/lib/datatables.min.js
-rm -f client/modules/scripts/lib/exceljs.min.js
+rm -f client/custom/modules/scripts/css/datatables.min.css 
+rm -rf client/custom/modules/scripts/css/DataTables-1.10.21
+mkdir -p client/custom/modules/scripts/lib
+rm -f client/custom/modules/scripts/lib/datatables.min.js
+rm -f client/custom/modules/scripts/lib/exceljs.min.js
 
 cd libs
 rm -f datatables.min.js datatables.min.css

diff --git a/client/modules/scripts/css/scripts.css → ...nt/custom/modules/scripts/css/scripts.css b/client/modules/scripts/css/scripts.css → ...nt/custom/modules/scripts/css/scripts.css
diff --git a/...s/res/templates/fields/htmlOut/detail.tpl → ...s/res/templates/fields/htmlOut/detail.tpl b/...s/res/templates/fields/htmlOut/detail.tpl → ...s/res/templates/fields/htmlOut/detail.tpl
diff --git a/...pts/res/templates/fields/htmlOut/edit.tpl → ...pts/res/templates/fields/htmlOut/edit.tpl b/...pts/res/templates/fields/htmlOut/edit.tpl → ...pts/res/templates/fields/htmlOut/edit.tpl
diff --git a/...s/res/templates/fields/htmllog/detail.tpl → ...s/res/templates/fields/htmllog/detail.tpl b/...s/res/templates/fields/htmllog/detail.tpl → ...s/res/templates/fields/htmllog/detail.tpl
diff --git a/...pts/res/templates/fields/htmllog/edit.tpl → ...pts/res/templates/fields/htmllog/edit.tpl b/...pts/res/templates/fields/htmllog/edit.tpl → ...pts/res/templates/fields/htmllog/edit.tpl
diff --git a/...ts/res/templates/fields/script/detail.tpl → ...ts/res/templates/fields/script/detail.tpl b/...ts/res/templates/fields/script/detail.tpl → ...ts/res/templates/fields/script/detail.tpl
diff --git a/...ipts/res/templates/fields/script/edit.tpl → ...ipts/res/templates/fields/script/edit.tpl b/...ipts/res/templates/fields/script/edit.tpl → ...ipts/res/templates/fields/script/edit.tpl
diff --git a/...ules/scripts/src/views/fields/html-log.js → ...ules/scripts/src/views/fields/html-log.js b/...ules/scripts/src/views/fields/html-log.js → ...ules/scripts/src/views/fields/html-log.js
diff --git a/...ules/scripts/src/views/fields/html-out.js → ...ules/scripts/src/views/fields/html-out.js b/...ules/scripts/src/views/fields/html-out.js → ...ules/scripts/src/views/fields/html-out.js
diff --git a/...odules/scripts/src/views/fields/script.js → ...odules/scripts/src/views/fields/script.js b/...odules/scripts/src/views/fields/script.js → ...odules/scripts/src/views/fields/script.js