@shisyamo4131/air-guard-v2-schemas 1.3.1-dev.6 → 1.3.1-dev.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shisyamo4131/air-guard-v2-schemas",
-  "version": "1.3.1-dev.6",
+  "version": "1.3.1-dev.8",
   "description": "Schemas for AirGuard V2",
   "type": "module",
   "main": "index.js",

package/src/OperationResult.js

@@ -205,12 +205,14 @@ const classProps = {
     customClass: OperationResultDetail,
   }),
   isLocked: defField("check", {
-    label: "ロック",
+    label: "実績確定",
     default: false,
   }),
-
-  /** add */
   agreement: defField("object", { label: "取極め", customClass: Agreement }),
+  ignoreEmptyAgreement: defField("check", {
+    label: "取極めなしを無視",
+    default: false,
+  }),
 };
 
 export default class OperationResult extends Operation {
@@ -232,6 +234,7 @@ export default class OperationResult extends Operation {
     super.afterInitialize();
 
     /** Computed properties */
+    let _agreement = this.agreement;
     Object.defineProperties(this, {
       statistics: {
         configurable: true,
@@ -417,7 +420,17 @@ export default class OperationResult extends Operation {
         set(v) {},
       },
 
-      /** add */
+      agreement: {
+        configurable: true,
+        enumerable: true,
+        get() {
+          return _agreement;
+        },
+        set(v) {
+          _agreement = v;
+          this.refreshBillingDateAt();
+        },
+      },
       hasAgreement: {
         configurable: true,
         enumerable: true,
@@ -431,7 +444,7 @@ export default class OperationResult extends Operation {
         enumerable: true,
         get() {
           if (this.hasAgreement) return true;
-          return this.useAdjustedQuantity;
+          return this.ignoreEmptyAgreement;
         },
         set(v) {},
       },
@@ -471,20 +484,22 @@ export default class OperationResult extends Operation {
   }
 
   /**
-   * Override `beforeDelete`.
-   * - Prevents deletion if the instance has `siteOperationScheduleId`.
+   * Override create method to validate billingDateAt when ignoreEmptyAgreement is true
+   * @param {*} options
+   * @returns {Promise<DocumentReference>}
    */
-  async beforeDelete() {
-    await super.beforeDelete();
-    if (this.siteOperationScheduleId) {
+  async create(options = {}) {
+    if (this.ignoreEmptyAgreement && !this.billingDateAt) {
       throw new Error(
-        "この稼働実績は現場稼働予定から作成されているため、削除できません。"
+        "[OperationResult] Billing date is required when 'ignoreEmptyAgreement' is true."
       );
     }
+    return await super.create(options);
   }
 
   /**
    * Override update method to prevent editing if isLocked is true
+   * - Also validate billingDateAt when ignoreEmptyAgreement is true
    * @param {*} options
    * @returns {Promise<void>}
    */
@@ -494,7 +509,12 @@ export default class OperationResult extends Operation {
         "[OperationResult] This OperationResult is locked and cannot be edited."
       );
     }
-    return super.update(options);
+    if (this.ignoreEmptyAgreement && !this.billingDateAt) {
+      throw new Error(
+        "[OperationResult] Billing date is required when 'ignoreEmptyAgreement' is true."
+      );
+    }
+    return await super.update(options);
   }
 
   /**
@@ -508,6 +528,6 @@ export default class OperationResult extends Operation {
         "[OperationResult] This OperationResult is locked and cannot be deleted."
       );
     }
-    return super.delete(options);
+    return await super.delete(options);
   }
 }