@shisyamo4131/air-guard-v2-schemas 2.3.7-dev.25 → 2.3.7-dev.27

package/package.json

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

package/src/Employee.js

@@ -84,27 +84,42 @@ const classProps = {
   // Security guard related fields
   hasSecurityGuardRegistration: defField("check", { label: "警備員登録" }),
   priorSecurityExperienceYears: defField("number", {
-    label: "年",
+    label: "入社前経験(年)",
     default: 0,
+    required: true,
     component: {
       attrs: {
         required: (item) => item.hasSecurityGuardRegistration,
         disabled: (item) => !item.hasSecurityGuardRegistration,
+        suffix: "年",
       },
     },
   }),
   priorSecurityExperienceMonths: defField("number", {
-    label: "月",
+    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,
+    component: {
+      attrs: {
+        required: (item) => item.hasSecurityGuardRegistration,
+        disabled: (item) => !item.hasSecurityGuardRegistration,
+      },
+    },
+  }),
+  bloodType: defField("bloodType", {
     component: {
       attrs: {
         required: (item) => item.hasSecurityGuardRegistration,
@@ -112,7 +127,6 @@ const classProps = {
       },
     },
   }),
-  bloodType: defField("bloodType"),
   emergencyContactName: defField("emergencyContactName", {
     component: {
       attrs: {
@@ -153,6 +167,14 @@ const classProps = {
       },
     },
   }),
+  domicile: defField("domicile", {
+    component: {
+      attrs: {
+        required: (item) => item.hasSecurityGuardRegistration,
+        disabled: (item) => !item.hasSecurityGuardRegistration,
+      },
+    },
+  }),
 
   remarks: defField("remarks"),
 };
@@ -263,11 +285,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();
@@ -355,6 +378,52 @@ export default class Employee extends FireModel {
     }
   }
 
+  _validateSecurityGuardFields() {
+    if (this.hasSecurityGuardRegistration) {
+      if (!this.dateOfSecurityGuardRegistration) {
+        throw new Error(
+          "[Employee.js] dateOfSecurityGuardRegistration is required when hasSecurityGuardRegistration is true."
+        );
+      }
+      if (!this.emergencyContactName) {
+        throw new Error(
+          "[Employee.js] emergencyContactName is required when hasSecurityGuardRegistration is true."
+        );
+      }
+      if (!this.emergencyContactRelationDetail) {
+        throw new Error(
+          "[Employee.js] emergencyContactRelationDetail is required when hasSecurityGuardRegistration is true."
+        );
+      }
+      if (!this.emergencyContactAddress) {
+        throw new Error(
+          "[Employee.js] emergencyContactAddress is required when hasSecurityGuardRegistration is true."
+        );
+      }
+      if (!this.emergencyContactPhone) {
+        throw new Error(
+          "[Employee.js] emergencyContactPhone is required when hasSecurityGuardRegistration is true."
+        );
+      }
+      if (!this.domicile) {
+        throw new Error(
+          "[Employee.js] domicile is required when hasSecurityGuardRegistration is true."
+        );
+      }
+    } else {
+      this.priorSecurityExperienceYears = 0;
+      this.priorSecurityExperienceMonths = 0;
+      this.dateOfSecurityGuardRegistration = null;
+      this.bloodType = BLOOD_TYPE_VALUES.A.value;
+      this.emergencyContactName = null;
+      this.emergencyContactRelation = null;
+      this.emergencyContactRelationDetail = null;
+      this.emergencyContactAddress = null;
+      this.emergencyContactPhone = null;
+      this.domicile = null;
+    }
+  }
+
   /**
    * 新しい従業員ドキュメントが作成される前に実行されるフック。
    * - 親クラスの `beforeCreate` を呼び出します。
@@ -364,6 +433,7 @@ export default class Employee extends FireModel {
     await super.beforeCreate();
     this._validateForeignerRequiredFields();
     this._validateTerminatedRequiredFields();
+    this._validateSecurityGuardFields();
   }
 
   /**
@@ -390,6 +460,7 @@ export default class Employee extends FireModel {
 
     this._validateForeignerRequiredFields();
     this._validateTerminatedRequiredFields();
+    this._validateSecurityGuardFields();
   }
 
   /**

package/src/parts/fieldDefinitions.js

@@ -260,6 +260,11 @@ export const fieldDefinitions = {
     label: "表示名",
     length: 6,
   },
+  domicile: {
+    ...generalDefinitions.oneLine,
+    label: "本籍地",
+    length: 30,
+  },
   email: {
     ...generalDefinitions.oneLine,
     label: "email",