@things-factory/ccp 5.0.0-alpha.2 → 5.0.0-alpha.22

package/client/bootstrap.js

@@ -1 +1,3 @@
+import '@operato/ccp' /* to register CCP DataItemSpecProvider */
+
 export default function bootstrap() {}

package/client/pages/main.js

@@ -3,8 +3,6 @@ import { connect } from 'pwa-helpers/connect-mixin.js'
 
 import { PageView, store } from '@things-factory/shell'
 
-import logo from '../../assets/images/hatiolab-logo.png'
-
 class CCPMain extends connect(store)(PageView) {
   static get properties() {
     return {
@@ -15,7 +13,6 @@ class CCPMain extends connect(store)(PageView) {
     return html`
       <section>
         <h2>CCP</h2>
-        <img src=${logo} />
       </section>
     `
   }

package/dist-server/controllers/data-use-case-ccp.js

@@ -0,0 +1,71 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DataUseCaseCCP = void 0;
+class DataUseCaseCCP {
+    getSpecification() {
+        return {
+            name: 'CCP',
+            description: 'Critical Control Point Data Spec',
+            help: '',
+            specs: [
+                {
+                    type: 'ccp-limits' /* A value which seperates acceptability from unacceptability */,
+                    label: 'critical limits',
+                    name: 'criticalLimits'
+                },
+                {
+                    type: 'ccp-limits',
+                    label: 'target limits',
+                    name: 'targetLimits'
+                }
+            ]
+        };
+    }
+    evaluate(spec, values) {
+        if (!spec || typeof values === 'undefined') {
+            return;
+        }
+        if (!(values instanceof Array)) {
+            values = [values];
+        }
+        const { minimum: criticalMinimum, maximum: criticalMaximum, acceptables: criticalAcceptables } = spec['criticalLimits'] || {};
+        const { minimum: targetMinimum, maximum: targetMaximum, acceptables: targetAcceptables } = spec['targetLimits'] || {};
+        var oos = false;
+        var ooc = false;
+        for (let i = 0; i < values.length; i++) {
+            const value = values[i];
+            if (typeof criticalMinimum !== 'undefined' && criticalMinimum !== null && value < criticalMinimum) {
+                oos = true;
+                break;
+            }
+            if (typeof criticalMaximum !== 'undefined' && criticalMaximum !== null && value > criticalMaximum) {
+                oos = true;
+                break;
+            }
+            if (typeof criticalAcceptables !== 'undefined' &&
+                criticalAcceptables !== null &&
+                criticalAcceptables.includes(value)) {
+                oos = true;
+                break;
+            }
+        }
+        for (let i = 0; i < values.length; i++) {
+            const value = values[i];
+            if (typeof targetMinimum !== 'undefined' && targetMinimum !== null && value < targetMinimum) {
+                ooc = true;
+                break;
+            }
+            if (typeof targetMaximum !== 'undefined' && targetMaximum !== null && value > targetMaximum) {
+                ooc = true;
+                break;
+            }
+            if (typeof targetAcceptables !== 'undefined' && targetAcceptables !== null && targetAcceptables.includes(value)) {
+                ooc = true;
+                break;
+            }
+        }
+        return { oos, ooc };
+    }
+}
+exports.DataUseCaseCCP = DataUseCaseCCP;
+//# sourceMappingURL=data-use-case-ccp.js.map

package/dist-server/controllers/data-use-case-ccp.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"data-use-case-ccp.js","sourceRoot":"","sources":["../../server/controllers/data-use-case-ccp.ts"],"names":[],"mappings":";;;AAEA,MAAa,cAAc;IACzB,gBAAgB;QACd,OAAO;YACL,IAAI,EAAE,KAAK;YACX,WAAW,EAAE,kCAAkC;YAC/C,IAAI,EAAE,EAAE;YACR,KAAK,EAAE;gBACL;oBACE,IAAI,EAAE,YAAY,CAAC,gEAAgE;oBACnF,KAAK,EAAE,iBAAiB;oBACxB,IAAI,EAAE,gBAAgB;iBACvB;gBACD;oBACE,IAAI,EAAE,YAAY;oBAClB,KAAK,EAAE,eAAe;oBACtB,IAAI,EAAE,cAAc;iBACrB;aACF;SACF,CAAA;IACH,CAAC;IAED,QAAQ,CAAC,IAAS,EAAE,MAAmB;QACrC,IAAI,CAAC,IAAI,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE;YAC1C,OAAM;SACP;QAED,IAAI,CAAC,CAAC,MAAM,YAAY,KAAK,CAAC,EAAE;YAC9B,MAAM,GAAG,CAAC,MAAM,CAAC,CAAA;SAClB;QAED,MAAM,EACJ,OAAO,EAAE,eAAe,EACxB,OAAO,EAAE,eAAe,EACxB,WAAW,EAAE,mBAAmB,EACjC,GAAG,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,CAAA;QAEhC,MAAM,EACJ,OAAO,EAAE,aAAa,EACtB,OAAO,EAAE,aAAa,EACtB,WAAW,EAAE,iBAAiB,EAC/B,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,CAAA;QAE9B,IAAI,GAAG,GAAG,KAAK,CAAA;QACf,IAAI,GAAG,GAAG,KAAK,CAAA;QAEf,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACtC,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAA;YAEvB,IAAI,OAAO,eAAe,KAAK,WAAW,IAAI,eAAe,KAAK,IAAI,IAAI,KAAK,GAAG,eAAe,EAAE;gBACjG,GAAG,GAAG,IAAI,CAAA;gBACV,MAAK;aACN;YAED,IAAI,OAAO,eAAe,KAAK,WAAW,IAAI,eAAe,KAAK,IAAI,IAAI,KAAK,GAAG,eAAe,EAAE;gBACjG,GAAG,GAAG,IAAI,CAAA;gBACV,MAAK;aACN;YAED,IACE,OAAO,mBAAmB,KAAK,WAAW;gBAC1C,mBAAmB,KAAK,IAAI;gBAC5B,mBAAmB,CAAC,QAAQ,CAAC,KAAK,CAAC,EACnC;gBACA,GAAG,GAAG,IAAI,CAAA;gBACV,MAAK;aACN;SACF;QAED,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACtC,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAA;YAEvB,IAAI,OAAO,aAAa,KAAK,WAAW,IAAI,aAAa,KAAK,IAAI,IAAI,KAAK,GAAG,aAAa,EAAE;gBAC3F,GAAG,GAAG,IAAI,CAAA;gBACV,MAAK;aACN;YAED,IAAI,OAAO,aAAa,KAAK,WAAW,IAAI,aAAa,KAAK,IAAI,IAAI,KAAK,GAAG,aAAa,EAAE;gBAC3F,GAAG,GAAG,IAAI,CAAA;gBACV,MAAK;aACN;YAED,IAAI,OAAO,iBAAiB,KAAK,WAAW,IAAI,iBAAiB,KAAK,IAAI,IAAI,iBAAiB,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;gBAC/G,GAAG,GAAG,IAAI,CAAA;gBACV,MAAK;aACN;SACF;QAED,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,CAAA;IACrB,CAAC;CACF;AAzFD,wCAyFC"}

package/dist-server/controllers/index.js

@@ -1 +1,18 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./data-use-case-ccp"), exports);
 //# sourceMappingURL=index.js.map

package/dist-server/controllers/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../server/controllers/index.ts"],"names":[],"mappings":""}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../server/controllers/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,sDAAmC"}

package/dist-server/index.js

@@ -17,4 +17,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./migrations"), exports);
 __exportStar(require("./middlewares"), exports);
 require("./routes");
+const dataset_1 = require("@things-factory/dataset");
+const controllers_1 = require("./controllers");
+process.on('bootstrap-module-start', async ({ app, config, schema }) => {
+    dataset_1.DataUseCase.registerUseCase('CCP', new controllers_1.DataUseCaseCCP());
+});
 //# sourceMappingURL=index.js.map

package/dist-server/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../server/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+CAA4B;AAC5B,gDAA6B;AAE7B,oBAAiB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../server/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+CAA4B;AAC5B,gDAA6B;AAE7B,oBAAiB;AAEjB,qDAAqD;AACrD,+CAA8C;AAE9C,OAAO,CAAC,EAAE,CAAC,wBAA+B,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAO,EAAE,EAAE;IACjF,qBAAW,CAAC,eAAe,CAAC,KAAK,EAAE,IAAI,4BAAc,EAAE,CAAC,CAAA;AAC1D,CAAC,CAAC,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/ccp",
-  "version": "5.0.0-alpha.2",
+  "version": "5.0.0-alpha.22",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -24,8 +24,10 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@things-factory/dataset": "^5.0.0-alpha.2",
-    "@things-factory/shell": "^5.0.0-alpha.2"
+    "@operato/ccp": "^1.0.0-alpha.45",
+    "@operato/dataset": "^1.0.0-alpha.45",
+    "@things-factory/dataset": "^5.0.0-alpha.22",
+    "@things-factory/shell": "^5.0.0-alpha.22"
   },
-  "gitHead": "055536f981d229d51ae63f46585036b35fa86602"
+  "gitHead": "8e06de9c59237f1800b2ff4f1c53162a0228342a"
 }

package/server/controllers/data-use-case-ccp.ts

@@ -0,0 +1,92 @@
+import { DataItemSpecSet, DataUseCase, EvaluationResult } from '@things-factory/dataset'
+
+export class DataUseCaseCCP implements DataUseCase {
+  getSpecification(): DataItemSpecSet {
+    return {
+      name: 'CCP',
+      description: 'Critical Control Point Data Spec',
+      help: '',
+      specs: [
+        {
+          type: 'ccp-limits' /* A value which seperates acceptability from unacceptability */,
+          label: 'critical limits',
+          name: 'criticalLimits'
+        },
+        {
+          type: 'ccp-limits',
+          label: 'target limits',
+          name: 'targetLimits'
+        }
+      ]
+    }
+  }
+
+  evaluate(spec: any, values: any | any[]): EvaluationResult {
+    if (!spec || typeof values === 'undefined') {
+      return
+    }
+
+    if (!(values instanceof Array)) {
+      values = [values]
+    }
+
+    const {
+      minimum: criticalMinimum,
+      maximum: criticalMaximum,
+      acceptables: criticalAcceptables
+    } = spec['criticalLimits'] || {}
+
+    const {
+      minimum: targetMinimum,
+      maximum: targetMaximum,
+      acceptables: targetAcceptables
+    } = spec['targetLimits'] || {}
+
+    var oos = false
+    var ooc = false
+
+    for (let i = 0; i < values.length; i++) {
+      const value = values[i]
+
+      if (typeof criticalMinimum !== 'undefined' && criticalMinimum !== null && value < criticalMinimum) {
+        oos = true
+        break
+      }
+
+      if (typeof criticalMaximum !== 'undefined' && criticalMaximum !== null && value > criticalMaximum) {
+        oos = true
+        break
+      }
+
+      if (
+        typeof criticalAcceptables !== 'undefined' &&
+        criticalAcceptables !== null &&
+        criticalAcceptables.includes(value)
+      ) {
+        oos = true
+        break
+      }
+    }
+
+    for (let i = 0; i < values.length; i++) {
+      const value = values[i]
+
+      if (typeof targetMinimum !== 'undefined' && targetMinimum !== null && value < targetMinimum) {
+        ooc = true
+        break
+      }
+
+      if (typeof targetMaximum !== 'undefined' && targetMaximum !== null && value > targetMaximum) {
+        ooc = true
+        break
+      }
+
+      if (typeof targetAcceptables !== 'undefined' && targetAcceptables !== null && targetAcceptables.includes(value)) {
+        ooc = true
+        break
+      }
+    }
+
+    return { oos, ooc }
+  }
+}

package/server/controllers/index.ts

@@ -0,0 +1 @@
+export * from './data-use-case-ccp'

package/server/index.ts

@@ -2,3 +2,10 @@ export * from './migrations'
 export * from './middlewares'
 
 import './routes'
+
+import { DataUseCase } from '@things-factory/dataset'
+import { DataUseCaseCCP } from './controllers'
+
+process.on('bootstrap-module-start' as any, async ({ app, config, schema }: any) => {
+  DataUseCase.registerUseCase('CCP', new DataUseCaseCCP())
+})

package/translations/en.json

@@ -1 +1,8 @@
-{}
+{
+  "field.critical control point": "critical control point",
+  "field.corrective action": "corrective action",
+  "label.critical limits": "critical limits",
+  "label.target limits": "target limits",
+  "text.measurement": "measurement",
+  "text.observation": "observation"
+}

package/translations/ko.json

@@ -1 +1,13 @@
-{}
+{
+  "field.critical control point": "중점 관리점",
+  "field.corrective action": "개선 조치",
+  "label.critical limits": "허용 한계",
+  "label.target limits": "목표 한계",
+  "text.measurement": "측정",
+  "text.observation": "관찰",
+  "text.control limit": "허용 한계",
+  "text.target limit": "목표 기준",
+  "text.operating limit": "목표 기준",
+  "text.minimum value": "최소값",
+  "text.maximum value": "최대값"
+}

package/translations/ms.json

@@ -1 +1,8 @@
-{}
+{
+  "field.critical control point": "critical control point",
+  "field.corrective action": "corrective action",
+  "label.critical limits": "critical limits",
+  "label.target limits": "target limits",
+  "text.measurement": "measurement",
+  "text.observation": "observation"
+}

package/translations/zh.json

@@ -1 +1,8 @@
-{}
+{
+  "field.critical control point": "critical control point",
+  "field.corrective action": "corrective action",
+  "label.critical limits": "critical limits",
+  "label.target limits": "target limits",
+  "text.measurement": "measurement",
+  "text.observation": "observation"
+}