fixed save settings of alarm retention and add 3/5 year DAQ storage r…

…etention
frangoteam · Oct 10, 2023 · be9ee1d · be9ee1d
1 parent 7664e46
commit be9ee1d
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 4 deletions.
diff --git a/client/dist/index.html b/client/dist/index.html
@@ -45,6 +45,6 @@
             </div>
         </div>
     </app-root>
-<script src="runtime.8ef63094e52a66ba.js" type="module"></script><script src="polyfills.2696a6f9dc75535e.js" type="module"></script><script src="scripts.1c3385254ff4c93c.js" defer></script><script src="main.c0eb5718476a8395.js" type="module"></script>
+<script src="runtime.8ef63094e52a66ba.js" type="module"></script><script src="polyfills.2696a6f9dc75535e.js" type="module"></script><script src="scripts.1c3385254ff4c93c.js" defer></script><script src="main.6434c6fda6a886f3.js" type="module"></script>
 
 </body></html>
diff --git a/client/dist/main.6434c6fda6a886f3.js b/client/dist/main.6434c6fda6a886f3.js
diff --git a/client/dist/main.c0eb5718476a8395.js b/client/dist/main.c0eb5718476a8395.js
diff --git a/client/package.json b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fuxa",
-  "version": "1.1.15-1323",
+  "version": "1.1.15-1324",
   "keywords": [],
   "author": "frangoteam <[email protected]>",
   "description": "Web-based Process Visualization (SCADA/HMI/Dashboard) software",

diff --git a/client/src/app/_models/settings.ts b/client/src/app/_models/settings.ts
@@ -111,6 +111,8 @@ export enum DaqStoreRetentionType {
     days30 = 'days30',
     days90 = 'days90',
     year1 = 'year1',
+    year3 = 'year3',
+    year5 = 'year5',
 }
 
 export enum AlarmsRetentionType {

diff --git a/client/src/app/_services/settings.service.ts b/client/src/app/_services/settings.service.ts
@@ -80,6 +80,10 @@ export class SettingsService {
             this.appSettings.logFull = settings.logFull;
             dirty = true;
         }
+        if (settings.alarms?.retention !== this.appSettings.alarms?.retention) {
+            this.appSettings.alarms.retention = settings.alarms.retention;
+            dirty = true;
+        }
         return dirty;
     }
 

diff --git a/server/package.json b/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fuxa-server",
-  "version": "1.1.15-1323",
+  "version": "1.1.15-1324",
   "description": "Web-based Process Visualization (SCADA/HMI/Dashboard) software",
   "main": "main.js",
   "scripts": {