@shisyamo4131/air-guard-v2-schemas 2.3.7-dev.26 → 2.3.7-dev.28

package/package.json

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

package/src/Customer.js

@@ -1,39 +1,11 @@
-/*****************************************************************************
- * Customer ver 1.1.0
- * @author shisyamo4131
- *
- * @description Customer model.
- *
+/**
+ * Customer
+ * @version 1.1.1
+ * @description This module defines the Customer model for managing customer data.
  * @hasMany Sites - related sites associated with the customer
- *
- * @prop {string} code - customer code
- * @prop {string} name - customer name
- * @prop {string} nameKana - customer name in kana
- * @prop {string} zipcode - postal code
- * @prop {string} prefCode - prefecture code
- * @prop {string} city - city name
- * @prop {string} address - address details
- * @prop {string} building - building name
- * @prop {object} location - geographical location
- * @prop {string} tel - telephone number
- * @prop {string} fax - fax number
- * @prop {string} contractStatus - contract status
- * @prop {number} paymentMonth - payment site in months
- * @prop {string} paymentDate - payment site date
- * @prop {string} remarks - additional remarks
- *
- * @readonly
- * @prop {string} fullAddress - full address combining prefecture, city, and address (read-only)
- * @prop {string} prefecture - prefecture name derived from `prefCode` (read-only)
- *
- * @static
- * @prop {string} STATUS_ACTIVE - constant for active contract status
- * @prop {string} STATUS_TERMINATED - constant for terminated contract status
- *
- * @method getPaymentDueDateAt
- * @param {Date} baseDate - base date in UTC (JST - 9 hours)
- * @returns {Date} payment due date in UTC (JST - 9 hours)
- *****************************************************************************/
+ * @author shisyamo4131
+ * @update 2025-12-08 - Changed `paymentMonth` type from direct number to select field.
+ */
 import FireModel from "@shisyamo4131/air-firebase-v2";
 import { defField } from "./parts/fieldDefinitions.js";
 import { defAccessor } from "./parts/accessorDefinitions.js";
@@ -53,10 +25,23 @@ const classProps = {
   tel: defField("tel", { colsDefinition: { cols: 12, sm: 6 } }),
   fax: defField("fax", { colsDefinition: { cols: 12, sm: 6 } }),
   contractStatus: defField("contractStatus", { required: true }),
-  paymentMonth: defField("number", {
+  paymentMonth: defField("select", {
     default: 1,
     label: "入金サイト（月数）",
     required: true,
+    component: {
+      attrs: {
+        items: [
+          { text: "当月", value: 0 },
+          { text: "翌月", value: 1 },
+          { text: "翌々月", value: 2 },
+          { text: "3ヶ月後", value: 3 },
+          { text: "4ヶ月後", value: 4 },
+          { text: "5ヶ月後", value: 5 },
+          { text: "6ヶ月後", value: 6 },
+        ],
+      },
+    },
   }),
   paymentDate: defField("select", {
     label: "入金サイト（日付）",
@@ -71,6 +56,35 @@ const classProps = {
   remarks: defField("multipleLine", { label: "備考" }),
 };
 
+/*****************************************************************************
+ * @prop {string} code - customer code
+ * @prop {string} name - customer name
+ * @prop {string} nameKana - customer name in kana
+ * @prop {string} zipcode - postal code
+ * @prop {string} prefCode - prefecture code
+ * @prop {string} city - city name
+ * @prop {string} address - address details
+ * @prop {string} building - building name
+ * @prop {object} location - geographical location
+ * @prop {string} tel - telephone number
+ * @prop {string} fax - fax number
+ * @prop {string} contractStatus - contract status
+ * @prop {number} paymentMonth - payment site in months
+ * @prop {string} paymentDate - payment site date
+ * @prop {string} remarks - additional remarks
+ *
+ * @readonly
+ * @prop {string} fullAddress - full address combining prefecture, city, and address (read-only)
+ * @prop {string} prefecture - prefecture name derived from `prefCode` (read-only)
+ *
+ * @static
+ * @prop {string} STATUS_ACTIVE - constant for active contract status
+ * @prop {string} STATUS_TERMINATED - constant for terminated contract status
+ *
+ * @method getPaymentDueDateAt
+ * @param {Date} baseDate - base date in UTC (JST - 9 hours)
+ * @returns {Date} payment due date in UTC (JST - 9 hours)
+ *****************************************************************************/
 export default class Customer extends FireModel {
   static className = "取引先";
   static collectionPath = "Customers";

package/src/Employee.js

@@ -6,7 +6,8 @@
 import FireModel from "@shisyamo4131/air-firebase-v2";
 import { defField } from "./parts/fieldDefinitions.js";
 import { defAccessor } from "./parts/accessorDefinitions.js";
-import { VALUES } from "./constants/employment-status.js";
+import { VALUES as EMPLOYMENT_STATUS_VALUES } from "./constants/employment-status.js";
+import { VALUES as BLOOD_TYPE_VALUES } from "./constants/blood-type.js";
 
 const classProps = {
   code: defField("code", { label: "従業員コード" }),
@@ -32,16 +33,20 @@ const classProps = {
     default: null,
     component: {
       attrs: {
-        required: (item) => item.employmentStatus === VALUES.TERMINATED.value,
-        disabled: (item) => item.employmentStatus !== VALUES.TERMINATED.value,
+        required: (item) =>
+          item.employmentStatus === EMPLOYMENT_STATUS_VALUES.TERMINATED.value,
+        disabled: (item) =>
+          item.employmentStatus !== EMPLOYMENT_STATUS_VALUES.TERMINATED.value,
       },
     },
   }),
   reasonOfTermination: defField("reasonOfTermination", {
     component: {
       attrs: {
-        required: (item) => item.employmentStatus === VALUES.TERMINATED.value,
-        disabled: (item) => item.employmentStatus !== VALUES.TERMINATED.value,
+        required: (item) =>
+          item.employmentStatus === EMPLOYMENT_STATUS_VALUES.TERMINATED.value,
+        disabled: (item) =>
+          item.employmentStatus !== EMPLOYMENT_STATUS_VALUES.TERMINATED.value,
       },
     },
   }),
@@ -83,32 +88,6 @@ const classProps = {
 
   // Security guard related fields
   hasSecurityGuardRegistration: defField("check", { label: "警備員登録" }),
-  priorSecurityExperienceYears: defField("number", {
-    label: "入社前経験(年)",
-    default: 0,
-    required: true,
-    component: {
-      attrs: {
-        required: (item) => item.hasSecurityGuardRegistration,
-        disabled: (item) => !item.hasSecurityGuardRegistration,
-        suffix: "年",
-      },
-    },
-  }),
-  priorSecurityExperienceMonths: defField("number", {
-    label: "入社前経験(月)",
-    default: 0,
-    required: true,
-    component: {
-      attrs: {
-        required: (item) => item.hasSecurityGuardRegistration,
-        disabled: (item) => !item.hasSecurityGuardRegistration,
-        suffix: "ヶ月",
-        min: 0,
-        max: 11,
-      },
-    },
-  }),
   dateOfSecurityGuardRegistration: defField("dateAt", {
     label: "警備員登録日",
     default: null,
@@ -206,6 +185,15 @@ const classProps = {
  * @prop {string} nationality - Nationality.
  * @prop {string} residenceStatus - Residence status.
  * @prop {Date} periodOfStay - Period of stay expiration date.
+ * @prop {boolean} hasSecurityGuardRegistration - Has security guard registration.
+ * @prop {Date} dateOfSecurityGuardRegistration - Date of security guard registration.
+ * @prop {string} bloodType - Blood type.
+ * @prop {string} emergencyContactName - Emergency contact name.
+ * @prop {string} emergencyContactRelation - Emergency contact relation.
+ * @prop {string} emergencyContactRelationDetail - Emergency contact relation detail.
+ * @prop {string} emergencyContactAddress - Emergency contact address.
+ * @prop {string} emergencyContactPhone - Emergency contact phone number.
+ * @prop {string} domicile - Domicile.
  * @prop {string} remarks - Additional remarks.
  *
  * @prop {string} fullName - Full name combining last and first names (read-only)
@@ -244,8 +232,8 @@ export default class Employee extends FireModel {
     { title: "名前", key: "fullName" },
   ];
 
-  static STATUS_ACTIVE = VALUES.ACTIVE.value;
-  static STATUS_TERMINATED = VALUES.TERMINATED.value;
+  static STATUS_ACTIVE = EMPLOYMENT_STATUS_VALUES.ACTIVE.value;
+  static STATUS_TERMINATED = EMPLOYMENT_STATUS_VALUES.TERMINATED.value;
 
   _skipToTerminatedCheck = false;
 
@@ -285,11 +273,12 @@ export default class Employee extends FireModel {
 
   /**
    * 入社日からの勤続年数を計算します。
+   * - 退職日が設定されている場合は、退職日までの勤続年数を計算します。
    * @returns {{years: number, months: number}|null} 勤続年数（年数と月数）。dateOfHireが設定されていない場合はnull。
    */
   get yearsOfService() {
     if (!this.dateOfHire) return null;
-    const today = new Date();
+    const today = this.dateOfTermination || new Date();
 
     let years = today.getUTCFullYear() - this.dateOfHire.getUTCFullYear();
     let months = today.getUTCMonth() - this.dateOfHire.getUTCMonth();
@@ -360,7 +349,7 @@ export default class Employee extends FireModel {
    * @throws {Error} 退職済の場合に必須フィールドが未入力の場合。
    */
   _validateTerminatedRequiredFields() {
-    if (this.employmentStatus === VALUES.TERMINATED.value) {
+    if (this.employmentStatus === EMPLOYMENT_STATUS_VALUES.TERMINATED.value) {
       if (!this.dateOfTermination) {
         throw new Error(
           "[Employee.js] dateOfTermination is required when employmentStatus is 'terminated'."
@@ -410,8 +399,6 @@ export default class Employee extends FireModel {
         );
       }
     } else {
-      this.priorSecurityExperienceYears = 0;
-      this.priorSecurityExperienceMonths = 0;
       this.dateOfSecurityGuardRegistration = null;
       this.bloodType = BLOOD_TYPE_VALUES.A.value;
       this.emergencyContactName = null;