@shisyamo4131/air-guard-v2-schemas 1.1.0 → 1.2.1

package/package.json

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

package/src/OperationResult.js

@@ -8,19 +8,19 @@
  * - Provides comprehensive billing calculations including statistics, sales amounts, and tax.
  * - Supports both daily and hourly billing with adjusted quantities.
  * ---------------------------------------------------------------------------
- * @props {string|null} siteOperationScheduleId - Associated SiteOperationSchedule document ID
+ * @prop {string|null} siteOperationScheduleId - Associated SiteOperationSchedule document ID
  * - If this OperationResult was created from a SiteOperationSchedule, this property holds that ID.
  * - If this property is set, the instance cannot be deleted.
- * @props {boolean} useAdjustedQuantity - Flag to indicate if adjusted quantities are used for billing
- * @props {number} adjustedQuantityBase - Adjusted quantity for base workers
+ * @prop {boolean} useAdjustedQuantity - Flag to indicate if adjusted quantities are used for billing
+ * @prop {number} adjustedQuantityBase - Adjusted quantity for base workers
  * - Quantity used for billing base workers when `useAdjustedQuantity` is true.
- * @props {number} adjustedOvertimeBase - Adjusted overtime for base workers
+ * @prop {number} adjustedOvertimeBase - Adjusted overtime for base workers
  * - Overtime used for billing base workers when `useAdjustedQuantity` is true.
- * @props {number} adjustedQuantityQualified - Adjusted quantity for qualified workers
+ * @prop {number} adjustedQuantityQualified - Adjusted quantity for qualified workers
  * - Quantity used for billing qualified workers when `useAdjustedQuantity` is true.
- * @props {number} adjustedOvertimeQualified - Adjusted overtime for qualified workers
+ * @prop {number} adjustedOvertimeQualified - Adjusted overtime for qualified workers
  * - Overtime used for billing qualified workers when `useAdjustedQuantity` is true.
- * @props {Date} billingDateAt - Billing date
+ * @prop {Date} billingDateAt - Billing date
  * ---------------------------------------------------------------------------
  * @computed {Object} statistics - Statistics of workers (read-only)
  * - Contains counts and total work minutes for base and qualified workers, including OJT breakdowns.
@@ -40,39 +40,39 @@
  * - Sum of `salesAmount` and `tax`.
  * ---------------------------------------------------------------------------
  * @inherited - The following properties are inherited from Operation:
- * @props {string} siteId - Site document ID (trigger property)
+ * @prop {string} siteId - Site document ID (trigger property)
  * - Automatically synchronizes to all `employees` and `outsourcers` when changed.
- * @props {number} requiredPersonnel - Required number of personnel
- * @props {boolean} qualificationRequired - Qualification required flag
- * @props {string} workDescription - Work description
- * @props {string} remarks - Remarks
- * @props {Array<OperationResultDetail>} employees - Assigned employees
+ * @prop {number} requiredPersonnel - Required number of personnel
+ * @prop {boolean} qualificationRequired - Qualification required flag
+ * @prop {string} workDescription - Work description
+ * @prop {string} remarks - Remarks
+ * @prop {Array<OperationResultDetail>} employees - Assigned employees
  * - Array of `OperationResultDetail` instances representing assigned employees
- * @props {Array<OperationResultDetail>} outsourcers - Assigned outsourcers
+ * @prop {Array<OperationResultDetail>} outsourcers - Assigned outsourcers
  * - Array of `OperationResultDetail` instances representing assigned outsourcers
  * ---------------------------------------------------------------------------
  * @inherited - The following properties are inherited from Agreement (via Operation):
- * @props {number} unitPriceBase - Base unit price (JPY)
- * @props {number} overtimeUnitPriceBase - Overtime unit price (JPY/hour)
- * @props {number} unitPriceQualified - Qualified unit price (JPY)
- * @props {number} overtimeUnitPriceQualified - Qualified overtime unit price (JPY/hour)
- * @props {string} billingUnitType - Billing unit type
- * @props {boolean} includeBreakInBilling - Whether to include break time in billing if `billingUnitType` is `PER_HOUR`.
- * @props {number} cutoffDate - Cutoff date value from CutoffDate.VALUES
+ * @prop {number} unitPriceBase - Base unit price (JPY)
+ * @prop {number} overtimeUnitPriceBase - Overtime unit price (JPY/hour)
+ * @prop {number} unitPriceQualified - Qualified unit price (JPY)
+ * @prop {number} overtimeUnitPriceQualified - Qualified overtime unit price (JPY/hour)
+ * @prop {string} billingUnitType - Billing unit type
+ * @prop {boolean} includeBreakInBilling - Whether to include break time in billing if `billingUnitType` is `PER_HOUR`.
+ * @prop {number} cutoffDate - Cutoff date value from CutoffDate.VALUES
  * - The cutoff date for billing, using values defined in the CutoffDate utility class.
  * ---------------------------------------------------------------------------
  * @inherited - The following properties are inherited from WorkingResult (via Operation):
- * @props {Date} dateAt - Date of operation (placement date) (trigger property)
+ * @prop {Date} dateAt - Date of operation (placement date) (trigger property)
  * - Automatically synchronizes to all `employees` and `outsourcers` when changed.
- * @props {string} dayType - Day type (e.g., `WEEKDAY`, `WEEKEND`, `HOLIDAY`)
- * @props {string} shiftType - `DAY` or `NIGHT` (trigger property)
+ * @prop {string} dayType - Day type (e.g., `WEEKDAY`, `WEEKEND`, `HOLIDAY`)
+ * @prop {string} shiftType - `DAY` or `NIGHT` (trigger property)
  * - Automatically synchronizes to all `employees` and `outsourcers` when changed.
- * @props {string} startTime - Start time (HH:MM format)
- * @props {boolean} isStartNextDay - Next day start flag
+ * @prop {string} startTime - Start time (HH:MM format)
+ * @prop {boolean} isStartNextDay - Next day start flag
  * - `true` if the actual work starts the day after the placement date `dateAt`
- * @props {string} endTime - End time (HH:MM format)
- * @props {number} breakMinutes - Break time (minutes)
- * @props {number} regulationWorkMinutes - Regulation work minutes (trigger property)
+ * @prop {string} endTime - End time (HH:MM format)
+ * @prop {number} breakMinutes - Break time (minutes)
+ * @prop {number} regulationWorkMinutes - Regulation work minutes (trigger property)
  * - Indicates the maximum working time treated as regular working hours.
  * - Automatically synchronizes to all `employees` and `outsourcers` when changed.
  * ---------------------------------------------------------------------------
@@ -188,18 +188,6 @@ import CutoffDate from "./utils/CutoffDate.js";
 const classProps = {
   ...Operation.classProps,
   ...Agreement.classProps,
-  // Override Agreement's `cutoffDate` field to be hidden.
-  cutoffDate: defField("select", {
-    label: "締日区分",
-    default: CutoffDate.VALUES.END_OF_MONTH,
-    required: true,
-    hidden: true,
-    component: {
-      attrs: {
-        items: CutoffDate.OPTIONS,
-      },
-    },
-  }),
   siteOperationScheduleId: defField("oneLine", { hidden: true }),
   useAdjustedQuantity: defField("check", {
     label: "調整数量を使用",
@@ -247,7 +235,25 @@ export default class OperationResult extends Operation {
     super.afterInitialize();
 
     /** Computed properties */
+    let _cutoffDate = this.cutoffDate;
     Object.defineProperties(this, {
+      cutoffDate: {
+        configurable: true,
+        enumerable: true,
+        get() {
+          return _cutoffDate;
+        },
+        set(v) {
+          _cutoffDate = v;
+          // Update billingDateAt when cutoffDate changes
+          if (this.dateAt) {
+            this.billingDateAt = CutoffDate.calculateBillingDateAt(
+              this.dateAt,
+              this.cutoffDate
+            );
+          }
+        },
+      },
       statistics: {
         configurable: true,
         enumerable: true,
@@ -423,6 +429,12 @@ export default class OperationResult extends Operation {
     });
   }
 
+  setDateAtCallback(v) {
+    super.setDateAtCallback(v);
+    if (!this.cutoffDate) return;
+    this.billingDateAt = CutoffDate.calculateBillingDateAt(v, this.cutoffDate);
+  }
+
   /**
    * Override `beforeDelete`.
    * - Prevents deletion if the instance has `siteOperationScheduleId`.

package/src/utils/CutoffDate.js

@@ -11,8 +11,8 @@
  * @static {Array} OPTIONS - Options for selection components
  * @static {function} calculateActualCutoffDay - Calculate actual cutoff day for given year/month
  * @static {function} calculateBillingPeriod - Calculate billing period for given date and cutoff
- * @static {function} calculateCutoffDate - Calculate cutoff date as Date object for given sales date
- * @static {function} calculateCutoffDateString - Calculate cutoff date as string (YYYY-MM-DD) for given sales date
+ * @static {function} calculateBillingDateAt - Calculate cutoff date as Date object for given sales date
+ * @static {function} calculateBillingDateAtString - Calculate cutoff date as string (YYYY-MM-DD) for given sales date
  * @static {function} getDisplayText - Get display text for cutoff date value
  * @static {function} isValidCutoffDate - Validate cutoff date value
  *****************************************************************************/
@@ -179,14 +179,14 @@ export default class CutoffDate {
    * @example
    * // For JST 2024-03-15 with 10th cutoff
    * // Input: UTC date representing JST 2024-03-15
-   * const cutoffDate = CutoffDate.calculateCutoffDate(new Date('2024-03-14T15:00:00Z'), CutoffDate.VALUES.DAY_10);
+   * const cutoffDate = CutoffDate.calculateBillingDateAt(new Date('2024-03-14T15:00:00Z'), CutoffDate.VALUES.DAY_10);
    * // Returns: UTC date representing JST 2024-04-10
    *
    * // For JST 2024-03-05 with 10th cutoff
-   * const cutoffDate = CutoffDate.calculateCutoffDate(new Date('2024-03-04T15:00:00Z'), CutoffDate.VALUES.DAY_10);
+   * const cutoffDate = CutoffDate.calculateBillingDateAt(new Date('2024-03-04T15:00:00Z'), CutoffDate.VALUES.DAY_10);
    * // Returns: UTC date representing JST 2024-03-10
    */
-  static calculateCutoffDate(salesDate, cutoffDateValue) {
+  static calculateBillingDateAt(salesDate, cutoffDateValue) {
     // Convert UTC to JST by adding 9 hours to get the JST date
     const jstDate = new Date(salesDate.getTime() + 9 * 60 * 60 * 1000);
     const year = jstDate.getUTCFullYear();
@@ -230,11 +230,11 @@ export default class CutoffDate {
    * @returns {string} Cutoff date in YYYY-MM-DD format (JST)
    * @example
    * // For JST 2024-03-15 with 10th cutoff
-   * const cutoffDateString = CutoffDate.calculateCutoffDateString(new Date('2024-03-14T15:00:00Z'), CutoffDate.VALUES.DAY_10);
+   * const cutoffDateString = CutoffDate.calculateBillingDateAtString(new Date('2024-03-14T15:00:00Z'), CutoffDate.VALUES.DAY_10);
    * // Returns "2024-04-10"
    */
-  static calculateCutoffDateString(salesDate, cutoffDateValue) {
-    const cutoffDate = CutoffDate.calculateCutoffDate(
+  static calculateBillingDateAtString(salesDate, cutoffDateValue) {
+    const cutoffDate = CutoffDate.calculateBillingDateAt(
       salesDate,
       cutoffDateValue
     );