Merge pull request #120 from Randers-Kommune-Digitalisering/development

Development
Randers-Kommune-Digitalisering · Sep 30, 2024 · 7e00a49 · 7e00a49
2 parents 44d7a43 + b4ca8a3
commit 7e00a49
Show file tree

Hide file tree

Showing 59 changed files with 673 additions and 431 deletions.
diff --git a/node-red/flows_js/_order.json b/node-red/flows_js/_order.json
@@ -1,6 +1,7 @@
 [
   "tab.f99fd88fa65c74b9.flows.js",
   "tab.5bb3204aef17c104.flows.js",
+  "tab.f7fc79e6fabd93f3.flows.js",
   "subflow.db94b4c117de2f6a.flows.js",
   "subflow.43652557380ac3f3.flows.js",
   "subflow.d4c4c4565d1e740c.flows.js",
@@ -566,7 +567,6 @@
   "comment.83d99d9e718c5607.flows.js",
   "change.2ebcc085e79fa0fe.flows.js",
   "subflow_db94b4c117de2f6a.5a6cfbda04154265.flows.js",
-  "change.627f132450ce1018.flows.js",
   "change.4eda72f817b1dc1a.flows.js",
   "link_out.6ae225320e16457a.flows.js",
   "change.d4b68c86fb92ba75.flows.js",
@@ -581,7 +581,6 @@
   "link_in.51e9db89f1815867.flows.js",
   "comment.e5c30dac1f45e705.flows.js",
   "change.49852e946d994d2a.flows.js",
-  "change.389c653eb4ce31dd.flows.js",
   "link_out.f618a0489e06e9d4.flows.js",
   "debug.a97a2988aa08143d.flows.js",
   "debug.641aee9fcf7ff38f.flows.js",
@@ -608,6 +607,9 @@
   "switch.3cfd1268ca55f699.flows.js",
   "link_out.84e070aa83b58250.flows.js",
   "catch.178203f1c72ee2d5.flows.js",
+  "debug.2ea385314aa16e58.flows.js",
+  "change.4a37dfb3564d6536.flows.js",
+  "change.389c653eb4ce31dd.flows.js",
   "http_in.bd160d8138383057.flows.js",
   "http_in.876326dbcaa2f944.flows.js",
   "http_in.9b3b872df2581645.flows.js",
@@ -704,10 +706,6 @@
   "change.fdfdb069869539d1.flows.js",
   "change.8a0ba41ca954157d.flows.js",
   "change.e7aeff08aafc7992.flows.js",
-  "switch.df72e991ebbca4c9.flows.js",
-  "split.b1e2c853da3d3436.flows.js",
-  "change.358c9155bb453982.flows.js",
-  "change.1da3a20c14704a68.flows.js",
   "switch.a30e9bc55d2b4fc2.flows.js",
   "join.b64c23b2e555b5fe.flows.js",
   "change.495acf8df82f3fdb.flows.js",
@@ -729,5 +727,15 @@
   "switch.4cf26d79c3fe255f.flows.js",
   "change.2438dedcb2b1f351.flows.js",
   "switch.8c14fe8d034b2a4d.flows.js",
-  "change.145d56c29d08a264.flows.js"
+  "change.145d56c29d08a264.flows.js",
+  "debug.e80c54427cfb14e0.flows.js",
+  "inject.892d99fdd1f59b5c.flows.js",
+  "template.93881a921edc038b.flows.js",
+  "subflow_7459f772194dcf44.8a191b2f512582aa.flows.js",
+  "debug.cfdb887b55d716ba.flows.js",
+  "change.db8b81d25f6cf70a.flows.js",
+  "template.ebe966c15182c939.flows.js",
+  "inject.62420d7cd1a7b00f.flows.js",
+  "change.33c915c25a5cdc42.flows.js",
+  "inject.ac58fb5fcc1f78b7.flows.js"
 ]
diff --git a/node-red/flows_js/change.186f2cce53b0948f.flows.js b/node-red/flows_js/change.186f2cce53b0948f.flows.js
@@ -32,7 +32,7 @@ const Node = {
   "from": "",
   "to": "",
   "reg": false,
-  "x": 1010,
+  "x": 930,
   "y": 1560,
   "wires": [
     [

diff --git a/node-red/flows_js/change.1da3a20c14704a68.flows.js b/node-red/flows_js/change.1da3a20c14704a68.flows.js
diff --git a/node-red/flows_js/change.20fe6c8ef45ad2ff.flows.js b/node-red/flows_js/change.20fe6c8ef45ad2ff.flows.js
@@ -26,6 +26,13 @@ const Node = {
       "to": "sql",
       "tot": "msg"
     },
+    {
+      "t": "set",
+      "p": "stdout.affectedRows",
+      "pt": "msg",
+      "to": "payload.affectedRows",
+      "tot": "msg"
+    },
     {
       "t": "set",
       "p": "stdout.succes",

diff --git a/node-red/flows_js/change.33c915c25a5cdc42.flows.js b/node-red/flows_js/change.33c915c25a5cdc42.flows.js
diff --git a/node-red/flows_js/change.358c9155bb453982.flows.js b/node-red/flows_js/change.358c9155bb453982.flows.js
diff --git a/node-red/flows_js/change.389c653eb4ce31dd.flows.js b/node-red/flows_js/change.389c653eb4ce31dd.flows.js
@@ -2,7 +2,7 @@ const Node = {
   "id": "389c653eb4ce31dd",
   "type": "change",
   "z": "f99fd88fa65c74b9",
-  "g": "b0d1827e59500c85",
+  "g": "947838261d7c3e0b",
   "name": "Reload web",
   "rules": [
     {
@@ -19,11 +19,11 @@ const Node = {
   "to": "",
   "reg": false,
   "x": 2430,
-  "y": 560,
+  "y": 760,
   "wires": [
     [
-      "8159068ecb5fcae7",
-      "cd1a7bea042b854d"
+      "662b30053a04321a",
+      "d1c8ff0e0d308656"
     ]
   ]
 }

diff --git a/node-red/flows_js/change.3bd0ac4edb7c8181.flows.js b/node-red/flows_js/change.3bd0ac4edb7c8181.flows.js
@@ -26,6 +26,13 @@ const Node = {
       "to": "webSettings.state.activePage",
       "tot": "global"
     },
+    {
+      "t": "set",
+      "p": "payload.redirect",
+      "pt": "msg",
+      "to": "redirect",
+      "tot": "msg"
+    },
     {
       "t": "set",
       "p": "payload.statusCode",
@@ -39,8 +46,8 @@ const Node = {
   "from": "",
   "to": "",
   "reg": false,
-  "x": 1330,
-  "y": 1500,
+  "x": 1250,
+  "y": 1560,
   "wires": [
     [
       "4f203b986380d00b"

diff --git a/node-red/flows_js/change.4a2b1e892f7e12ad.flows.js b/node-red/flows_js/change.4a2b1e892f7e12ad.flows.js
@@ -18,6 +18,13 @@ const Node = {
       "pt": "msg",
       "to": "payload.data.id",
       "tot": "msg"
+    },
+    {
+      "t": "set",
+      "p": "redirect",
+      "pt": "msg",
+      "to": "payload.data.redirect",
+      "tot": "msg"
     }
   ],
   "action": "",
@@ -29,7 +36,8 @@ const Node = {
   "y": 1480,
   "wires": [
     [
-      "df72e991ebbca4c9"
+      "e80c54427cfb14e0",
+      "e5bc1f6e7cbe963d"
     ]
   ]
 }

diff --git a/...flows_js/change.627f132450ce1018.flows.js → ...flows_js/change.4a37dfb3564d6536.flows.js b/...flows_js/change.627f132450ce1018.flows.js → ...flows_js/change.4a37dfb3564d6536.flows.js
@@ -1,15 +1,22 @@
 const Node = {
-  "id": "627f132450ce1018",
+  "id": "4a37dfb3564d6536",
   "type": "change",
   "z": "f99fd88fa65c74b9",
-  "g": "947838261d7c3e0b",
-  "name": "Reload web",
+  "g": "b0d1827e59500c85",
+  "name": "Redirect",
   "rules": [
     {
       "t": "set",
       "p": "type",
       "pt": "msg",
-      "to": "reload",
+      "to": "redirect",
+      "tot": "str"
+    },
+    {
+      "t": "set",
+      "p": "value",
+      "pt": "msg",
+      "to": "start",
       "tot": "str"
     }
   ],
@@ -18,12 +25,12 @@ const Node = {
   "from": "",
   "to": "",
   "reg": false,
-  "x": 2430,
-  "y": 760,
+  "x": 2420,
+  "y": 560,
   "wires": [
     [
-      "662b30053a04321a",
-      "d1c8ff0e0d308656"
+      "8159068ecb5fcae7",
+      "cd1a7bea042b854d"
     ]
   ]
 }

diff --git a/node-red/flows_js/change.5bae06aa5db3623e.flows.js b/node-red/flows_js/change.5bae06aa5db3623e.flows.js
@@ -22,8 +22,8 @@ const Node = {
       "t": "set",
       "p": "value",
       "pt": "msg",
-      "to": "0",
-      "tot": "num"
+      "to": "(1 / ((receipts ~> $count)+1) * 100) ~> $ceil()",
+      "tot": "jsonata"
     }
   ],
   "action": "",
@@ -35,7 +35,8 @@ const Node = {
   "y": 1240,
   "wires": [
     [
-      "bf4eadb0010bea89"
+      "bf4eadb0010bea89",
+      "2ea385314aa16e58"
     ]
   ]
 }

diff --git a/node-red/flows_js/change.87eddff3082dd79d.flows.js b/node-red/flows_js/change.87eddff3082dd79d.flows.js
@@ -16,7 +16,7 @@ const Node = {
       "t": "set",
       "p": "queryValues",
       "pt": "msg",
-      "to": "( [] ~>$append ( receipts.actions ) ~>$append ( receipts.noactions ) ) ~> $map( function($value, $key)\t{\t    \"('\"\t    & $value.faktura.id\t    & \"', \"\t    & $flowContext(\"currentRun\").uid\t    & \")\"\t})\t~> $join(\",\")",
+      "to": "( [] ~>$append ( receipts.actions ) ~>$append ( receipts.noactions ) ) ~> $map( function($value, $key)\t{\t    \"('\"\t    & ($value.faktura.id ~> $join(\" \"))\t    & \"', \"\t    & $flowContext(\"currentRun\").uid\t    & \")\"\t})\t~> $join(\",\")",
       "tot": "jsonata"
     }
   ],

diff --git a/node-red/flows_js/change.8ed3ae75929488b9.flows.js b/node-red/flows_js/change.8ed3ae75929488b9.flows.js
@@ -9,7 +9,7 @@ const Node = {
       "t": "set",
       "p": "presetStartDate",
       "pt": "msg",
-      "to": "2024-09-06",
+      "to": "2024-09-12",
       "tot": "str"
     },
     {

diff --git a/node-red/flows_js/change.a3aff6eae7d264fe.flows.js b/node-red/flows_js/change.a3aff6eae7d264fe.flows.js
@@ -22,7 +22,7 @@ const Node = {
   "y": 760,
   "wires": [
     [
-      "627f132450ce1018"
+      "389c653eb4ce31dd"
     ]
   ],
   "l": false

diff --git a/node-red/flows_js/change.ab18ac7e86e6954a.flows.js b/node-red/flows_js/change.ab18ac7e86e6954a.flows.js
@@ -64,7 +64,7 @@ const Node = {
       "t": "set",
       "p": "webElements.receipt.archiveButton",
       "pt": "msg",
-      "to": "{\t    \"id\": payload.faktura.id,\t    \"redirect\": payload.faktura.id in receipts.actions.faktura.id ?\t                    \"receipts?cat=actions\"\t                    :\t                    \"receipts?cat=noactions\",\t    \"disabled\": payload.archived ? \"disabled\",\t    \"text\": payload.archived ? \"Behandling bekræftet\" : \"Bekræft manuel behandling\"\t}",
+      "to": "{\t    \"id\": $id := payload.faktura.id ~> $join(\" \"),\t    \"redirect\": (payload.faktura.id)[0] in $globalContext(\"receipts\").actions.faktura.id ?\t                    \"receipts?cat=actions\"\t                    :\t                    \"receipts?cat=noactions\",\t    \"disabled\": payload.archived ? \"disabled\",\t    \"text\": payload.archived ? \"Behandling bekræftet\" : \"Bekræft manuel behandling\"\t}",
       "tot": "jsonata"
     },
     {

diff --git a/node-red/flows_js/change.af29175f1ac47618.flows.js b/node-red/flows_js/change.af29175f1ac47618.flows.js
@@ -9,7 +9,7 @@ const Node = {
       "t": "set",
       "p": "url",
       "pt": "msg",
-      "to": "api/kp/get/person",
+      "to": "api/kp/person",
       "tot": "str"
     }
   ],

diff --git a/node-red/flows_js/change.db8b81d25f6cf70a.flows.js b/node-red/flows_js/change.db8b81d25f6cf70a.flows.js
@@ -0,0 +1,36 @@
+const Node = {
+  "id": "db8b81d25f6cf70a",
+  "type": "change",
+  "z": "f7fc79e6fabd93f3",
+  "name": "",
+  "rules": [
+    {
+      "t": "set",
+      "p": "uid",
+      "pt": "msg",
+      "to": "08dcd3ce-dea1-48dd-8e7f-75dbbea2aea8",
+      "tot": "str"
+    },
+    {
+      "t": "set",
+      "p": "uid",
+      "pt": "msg",
+      "to": "08dcd3be-f281-46f7-8958-334a383b619a",
+      "tot": "str"
+    }
+  ],
+  "action": "",
+  "property": "",
+  "from": "",
+  "to": "",
+  "reg": false,
+  "x": 380,
+  "y": 100,
+  "wires": [
+    [
+      "93881a921edc038b"
+    ]
+  ]
+}
+
+module.exports = Node;
diff --git a/node-red/flows_js/change.eab07ee72eac51ac.flows.js b/node-red/flows_js/change.eab07ee72eac51ac.flows.js
@@ -9,7 +9,7 @@ const Node = {
       "t": "set",
       "p": "percentage",
       "pt": "msg",
-      "to": "((parts.index+1) / parts.count * 100) ~> $ceil()",
+      "to": "((parts.index+2) / (parts.count+1) * 100) ~> $ceil()",
       "tot": "jsonata"
     }
   ],