@shisyamo4131/air-guard-v2-schemas 2.4.2-dev.10 → 2.4.2-dev.12

package/package.json

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

package/src/Company.js

@@ -1,14 +1,7 @@
-/**
+/*****************************************************************************
  * Company Model
- * @version 1.0.0
  * @author shisyamo4131
- * @update 2026-01-06 - Add `firstDayOfWeek` property.
- * @update 2025-12-29 - Add `isCompleteRequiredFields` computed property.
- * @update 2025-12-02 - Add maintenance information properties.
- * @update 2025-12-01 - Add Stripe integration fields (stripeCustomerId, subscription).
- * @update 2025-11-27 - Add bank information fields for billing.
- * @update 2025-11-23 - Set `usePrefix` to false.
- */
+ *****************************************************************************/
 import FireModel from "@shisyamo4131/air-firebase-v2";
 import { defField } from "./parts/fieldDefinitions.js";
 import { defAccessor } from "./parts/accessorDefinitions.js";
@@ -56,11 +49,19 @@ const classProps = {
   }),
 
   /**
-   * Field to manage the display order of site-shift type pairs for placement management.
+   * Property to manage the display order of site-shift type pairs for arrangement management.
    * Format: { siteId, shiftType }
+   * NOTE: `key` is a unique identifier combined from siteId and shiftType.
    */
   siteOrder: defField("array", { customClass: SiteOrder, hidden: true }),
 
+  /**
+   * Property to manage the display order of site-shift type pairs for site-operation-schedule.
+   * Format: { siteId, shiftType, key }
+   * NOTE: `key` is a unique identifier combined from siteId and shiftType.
+   */
+  scheduleOrder: defField("array", { customClass: SiteOrder, hidden: true }),
+
   /** Geolocation */
   location: defField("location", { hidden: true }),
 
@@ -203,7 +204,7 @@ export default class Company extends GeocodableMixin(FireModel) {
           const newOrder = new SiteOrder({ siteId, shiftType });
           if (this.some((order) => order.key === newOrder.key)) {
             throw new Error(
-              `SiteOrder with key ${newOrder.key} already exists.`
+              `SiteOrder with key ${newOrder.key} already exists.`,
             );
           }
           index === -1 ? this.push(newOrder) : this.splice(index, 0, newOrder);
@@ -253,13 +254,101 @@ export default class Company extends GeocodableMixin(FireModel) {
             key = `${arg.siteId}-${arg.shiftType}`;
           } else {
             throw new Error(
-              "Invalid argument for remove. Must be a string key or an object with siteId and shiftType."
+              "Invalid argument for remove. Must be a string key or an object with siteId and shiftType.",
+            );
+          }
+
+          const index = this.findIndex((order) => order.key === key);
+          if (index === -1) {
+            throw new Error(`ScheduleOrder with key ${key} does not exist.`);
+          }
+
+          this.splice(index, 1);
+        },
+        writable: false,
+        enumerable: false,
+        configurable: true,
+      },
+    });
+
+    /*************************************************************************
+     * CUSTOM METHODS FOR scheduleOrder ARRAY
+     * Note: These methods modify the scheduleOrder array directly.
+     * The Company instance itself is not updated by these methods.
+     * Use the provided public methods to interact with scheduleOrder.
+     *************************************************************************/
+    Object.defineProperties(this.scheduleOrder, {
+      /**
+       * Inserts a new ScheduleOrder into the `scheduleOrder` array.
+       * @param {Object} params - The parameters for the ScheduleOrder.
+       * @param {string} params.siteId - The ID of the site.
+       * @param {string} params.shiftType - The shift type associated with the site.
+       * @param {number} [index=-1] - The position to insert the new ScheduleOrder. Defaults to the end.
+       * @returns {ScheduleOrder} The newly created ScheduleOrder instance.
+       * @throws {Error} If a ScheduleOrder with the same key already exists.
+       */
+      add: {
+        value: function ({ siteId, shiftType }, index = -1) {
+          const newOrder = new ScheduleOrder({ siteId, shiftType });
+          if (this.some((order) => order.key === newOrder.key)) {
+            throw new Error(
+              `ScheduleOrder with key ${newOrder.key} already exists.`,
+            );
+          }
+          index === -1 ? this.push(newOrder) : this.splice(index, 0, newOrder);
+          return newOrder;
+        },
+        writable: false,
+        enumerable: false,
+        configurable: true,
+      },
+      /**
+       * Changes the order of a ScheduleOrder in the scheduleOrder array.
+       * Note: Company instance does not be updated by this method.
+       * @param {number} oldIndex - The current index of the ScheduleOrder.
+       * @param {number} newIndex - The new index to move the ScheduleOrder to.
+       * @returns {void}
+       * @throws {Error} If oldIndex or newIndex are out of bounds.
+       */
+      change: {
+        value: function (oldIndex, newIndex) {
+          const length = this.length;
+          if (oldIndex < 0 || oldIndex >= length) {
+            throw new Error("Invalid oldIndex for site order change.");
+          }
+          if (newIndex < 0 || newIndex >= length) {
+            throw new Error("Invalid newIndex for site order change.");
+          }
+          const [movedOrder] = this.splice(oldIndex, 1);
+          this.splice(newIndex, 0, movedOrder);
+        },
+        writable: false,
+        enumerable: false,
+        configurable: true,
+      },
+      /**
+       * Removes a ScheduleOrder from the scheduleOrder array.
+       * Note: Company instance does not be updated by this method.
+       * @param {string|Object} arg - The key or {siteId, shiftType} of the ScheduleOrder to remove.
+       * @returns {void}
+       * @throws {Error} If the ScheduleOrder does not exist or if the argument is invalid.
+       */
+      remove: {
+        value: function (arg) {
+          let key = "";
+          if (typeof arg === "string") {
+            key = arg;
+          } else if (typeof arg === "object" && arg.siteId && arg.shiftType) {
+            key = `${arg.siteId}-${arg.shiftType}`;
+          } else {
+            throw new Error(
+              "Invalid argument for remove. Must be a string key or an object with siteId and shiftType.",
             );
           }
 
           const index = this.findIndex((order) => order.key === key);
           if (index === -1) {
-            throw new Error(`SiteOrder with key ${key} does not exist.`);
+            throw new Error(`ScheduleOrder with key ${key} does not exist.`);
           }
 
           this.splice(index, 1);

package/src/SiteOperationSchedule.js

@@ -37,9 +37,13 @@
  * @getter {boolean} isEditable - Indicates whether the instance is editable (read-only)
  * - Returns `false` if `operationResultId` is set, `true` otherwise
  *
+ * @deprecated
  * @getter {boolean} isNotificatedAllWorkers - Indicates whether all workers have been notified (read-only)
  * - Returns `true` if all workers in the `workers` array have `hasNotification` set to `true`
  *
+ * @getter {boolean} isNotifiedAllWorkers - Indicates whether all workers have been notified (read-only)
+ * - Returns `true` if all workers in the `workers` array have `hasNotification` set to `true`
+ *
  * @inherited - The following properties are inherited from Operation:
  * @property {string} siteId - Site document ID (trigger property)
  * - Automatically synchronizes to all `employees` and `outsourcers` when changed.
@@ -339,7 +343,7 @@ export default class SiteOperationSchedule extends Operation {
         set(v) {
           if (typeof v !== "number" || isNaN(v) || v < 0) {
             throw new Error(
-              `breakMinutes must be a non-negative number. breakMinutes: ${v}`
+              `breakMinutes must be a non-negative number. breakMinutes: ${v}`,
             );
           }
           if (_breakMinutes === v) return;
@@ -354,7 +358,7 @@ export default class SiteOperationSchedule extends Operation {
         set(v) {
           if (typeof v !== "boolean") {
             throw new Error(
-              `isStartNextDay must be a boolean. isStartNextDay: ${v}`
+              `isStartNextDay must be a boolean. isStartNextDay: ${v}`,
             );
           }
           if (_isStartNextDay === v) return;
@@ -376,10 +380,22 @@ export default class SiteOperationSchedule extends Operation {
   }
 
   /**
+   * @deprecated
    * Returns whether all workers have been notified.
    * @returns {boolean} - Whether all workers have been notified.
    */
   get isNotificatedAllWorkers() {
+    console.warn(
+      "`isNotificatedAllWorkers` is deprecated. Use `isNotifiedAllWorkers` instead.",
+    );
+    return this.workers.every((worker) => worker.hasNotification);
+  }
+
+  /**
+   * Returns whether all workers have been notified.
+   * @returns {boolean} - Whether all workers have been notified.
+   */
+  get isNotifiedAddWorkers() {
     return this.workers.every((worker) => worker.hasNotification);
   }
 
@@ -397,7 +413,7 @@ export default class SiteOperationSchedule extends Operation {
   async beforeUpdate(args = {}) {
     if (this._beforeData.operationResultId) {
       throw new Error(
-        `Could not update this document. The OperationResult based on this document already exists. OperationResultId: ${this._beforeData.operationResultId}`
+        `Could not update this document. The OperationResult based on this document already exists. OperationResultId: ${this._beforeData.operationResultId}`,
       );
     }
     await super.beforeUpdate(args);
@@ -414,7 +430,7 @@ export default class SiteOperationSchedule extends Operation {
   async beforeDelete(args = {}) {
     if (this._beforeData.operationResultId) {
       throw new Error(
-        `Could not delete this document. The OperationResult based on this document already exists. OperationResultId: ${this._beforeData.operationResultId}`
+        `Could not delete this document. The OperationResult based on this document already exists. OperationResultId: ${this._beforeData.operationResultId}`,
       );
     }
     await super.beforeDelete(args);
@@ -588,7 +604,7 @@ export default class SiteOperationSchedule extends Operation {
     }
     if (dates.some((d) => !(d instanceof Date) && typeof d !== "string")) {
       throw new TypeError(
-        "日付の指定が無効です。Dateオブジェクトか文字列で指定してください。"
+        "日付の指定が無効です。Dateオブジェクトか文字列で指定してください。",
       );
     }
     if (dates.length > 20) {
@@ -632,7 +648,7 @@ export default class SiteOperationSchedule extends Operation {
       // トランザクションで一括作成
       await this.constructor.runTransaction(async (transaction) => {
         await Promise.all(
-          newSchedules.map((schedule) => schedule.create({ transaction }))
+          newSchedules.map((schedule) => schedule.create({ transaction })),
         );
       });
 
@@ -694,7 +710,7 @@ export default class SiteOperationSchedule extends Operation {
           className: "SiteOperationSchedule",
           arguments: {},
           state: this.toObject(),
-        }
+        },
       );
     }
   }
@@ -716,7 +732,7 @@ export default class SiteOperationSchedule extends Operation {
     // ドキュメントIDがない（現場稼働予定ドキュメントとして未作成）場合はエラー
     if (!this.docId) {
       throw new Error(
-        "不正な処理です。作成前の現場稼働予定から稼働実績を作成することはできません。"
+        "不正な処理です。作成前の現場稼働予定から稼働実績を作成することはできません。",
       );
     }
 
@@ -726,12 +742,12 @@ export default class SiteOperationSchedule extends Operation {
     const siteIsExist = await siteInstance.fetch({ docId: this.siteId });
     if (!siteIsExist) {
       throw new Error(
-        `不正な処理です。現場ID: ${this.siteId} の現場データが存在しません。`
+        `不正な処理です。現場ID: ${this.siteId} の現場データが存在しません。`,
       );
     }
     if (siteInstance.isTemporary) {
       throw new Error(
-        `不正な処理です。現場ID: ${this.siteId} の現場データは仮登録状態です。`
+        `不正な処理です。現場ID: ${this.siteId} の現場データは仮登録状態です。`,
       );
     }
 
@@ -813,8 +829,8 @@ export default class SiteOperationSchedule extends Operation {
     const color = !this.isEditable
       ? "grey"
       : this.shiftType === "DAY"
-      ? "orange"
-      : "indigo";
+        ? "orange"
+        : "indigo";
     return {
       name,
       start: this.dateAt,

package/src/parts/fieldDefinitions.js

@@ -320,6 +320,7 @@ export const fieldDefinitions = {
       name: generalDefinitions.oneLine.component.name,
       attrs: {
         inputType: "email",
+        inputmode: "email",
       },
     },
   },
@@ -347,6 +348,7 @@ export const fieldDefinitions = {
       attrs: {
         counter: true,
         inputType: "tel",
+        inputmode: "tel",
       },
     },
   },
@@ -359,6 +361,7 @@ export const fieldDefinitions = {
       attrs: {
         counter: true,
         inputType: "tel",
+        inputmode: "tel",
       },
     },
   },
@@ -421,6 +424,7 @@ export const fieldDefinitions = {
       attrs: {
         counter: true,
         inputType: "tel",
+        inputmode: "tel",
       },
     },
   },
@@ -482,6 +486,7 @@ export const fieldDefinitions = {
       attrs: {
         counter: true,
         inputType: "tel",
+        inputmode: "tel",
       },
     },
   },
@@ -704,7 +709,7 @@ export const defField = (key, options = {}) => {
 
   if (!baseConfigSource) {
     console.warn(
-      `[parts/fieldDefinitions.js defField] Definition for key "${key}" not found. Using fieldDefinitions.default as base.`
+      `[parts/fieldDefinitions.js defField] Definition for key "${key}" not found. Using fieldDefinitions.default as base.`,
     );
     baseConfigSource = effectiveDefaultDefinition;
     isFallback = true;