@shisyamo4131/air-guard-v2-schemas 2.3.7-dev.15 → 2.3.7-dev.17

package/package.json

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

package/src/Employee.js

@@ -15,9 +15,8 @@ const classProps = {
   lastNameKana: defField("lastNameKana", { required: true }),
   firstNameKana: defField("firstNameKana", { required: true }),
   displayName: defField("displayName", { required: true }),
-  title: defField("oneLine", { label: "肩書", required: true }),
   gender: defField("gender", { required: true }),
-  dateOfBirth: defField("dateAt", { label: "生年月日", required: true }),
+  dateOfBirth: defField("dateOfBirth", { required: true }),
   zipcode: defField("zipcode", { required: true }),
   prefCode: defField("prefCode", { required: true }),
   city: defField("city", { required: true }),
@@ -26,10 +25,10 @@ const classProps = {
   location: defField("location", { hidden: true }), // 非表示でOK
   mobile: defField("mobile", { required: true }),
   email: defField("email", { required: false }),
-  dateOfHire: defField("dateAt", { label: "入社日", required: true }),
+  dateOfHire: defField("dateOfHire", { required: true }),
   employmentStatus: defField("employmentStatus", { required: true }),
-  dateOfTermination: defField("dateAt", {
-    label: "退職日",
+  title: defField("title"),
+  dateOfTermination: defField("dateOfTermination", {
     default: null,
     component: {
       attrs: {
@@ -52,60 +51,61 @@ const classProps = {
       },
     },
   }),
-  residenceStatus: {
-    type: String,
-    default: null,
-    label: "在留資格",
-    required: undefined,
+  residenceStatus: defField("residenceStatus", {
     component: {
-      name: "air-text-field",
       attrs: {
         required: (item) => item.isForeigner,
       },
     },
-  },
-  periodOfStay: defField("dateAt", {
-    label: "在留期間満了日",
+  }),
+  periodOfStay: defField("periodOfStay", {
     component: {
       attrs: {
         required: (item) => item.isForeigner,
       },
     },
   }),
-  remarks: defField("multipleLine", { label: "備考" }),
+  remarks: defField("remarks"),
 };
 
 /*****************************************************************************
- * Employee Model
- * @props {string} code - Employee code.
- * @props {string} lastName - Last name.
- * @props {string} firstName - First name.
- * @props {string} lastNameKana - Last name in Kana.
- * @props {string} firstNameKana - First name in Kana.
- * @props {string} displayName - Display name.
- * @props {string} title - Job title.
- * @props {string} gender - Gender.
- * @props {Date} dateOfBirth - Date of birth.
- * @props {string} zipcode - Postal code.
- * @props {string} prefCode - Prefecture code.
- * @props {string} city - City name.
- * @props {string} address - Address details.
- * @props {string} building - Building name.
- * @props {object} location - Geographical location.
- * @props {string} mobile - Mobile phone number.
- * @props {string} email - Email address.
- * @props {Date} dateOfHire - Date of hire.
- * @props {string} employmentStatus - Employment status.
- * @props {Date} dateOfTermination - Date of termination.
- * @props {boolean} isForeigner - Is the employee a foreigner.
- * @props {string} foreignName - Foreign name.
- * @props {string} nationality - Nationality.
- * @props {string} residenceStatus - Residence status.
- * @props {Date} periodOfStay - Period of stay expiration date.
- * @props {string} remarks - Additional remarks.
- * @computed {string} fullName - Full name combining last and first names (read-only)
- * @computed {string} fullAddress - Full address combining prefecture, city, and address (read-only)
- * @computed {string} prefecture - Prefecture name derived from `prefCode` (read-only)
+ * @prop {string} code - Employee code.
+ * @prop {string} lastName - Last name.
+ * @prop {string} firstName - First name.
+ * @prop {string} lastNameKana - Last name in Kana.
+ * @prop {string} firstNameKana - First name in Kana.
+ * @prop {string} displayName - Display name.
+ * @prop {string} gender - Gender.
+ * @prop {Date} dateOfBirth - Date of birth.
+ * @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} mobile - Mobile phone number.
+ * @prop {string} email - Email address.
+ * @prop {Date} dateOfHire - Date of hire.
+ * @prop {string} employmentStatus - Employment status.
+ * @prop {string} title - Job title.
+ * @prop {Date} dateOfTermination - Date of termination.
+ * @prop {boolean} isForeigner - Is the employee a foreigner.
+ * @prop {string} foreignName - Foreign name.
+ * @prop {string} nationality - Nationality.
+ * @prop {string} residenceStatus - Residence status.
+ * @prop {Date} periodOfStay - Period of stay expiration date.
+ * @prop {string} remarks - Additional remarks.
+ *
+ * @prop {string} fullName - Full name combining last and first names (read-only)
+ * @prop {string} fullNameKana - Full name in Kana combining last and first names (read-only)
+ * @prop {string} fullAddress - Full address combining prefecture, city, and address (read-only)
+ * @prop {string} prefecture - Prefecture name derived from `prefCode` (read-only)
+ * @prop {number} age - Age calculated from `dateOfBirth` (read-only)
+ * @prop {number} yearsOfService - Years of service calculated from `dateOfHire` (read-only)
+ *
+ * @static
+ * @prop {string} STATUS_ACTIVE - constant for active employment status
+ * @prop {string} STATUS_TERMINATED - constant for terminated employment status
  *****************************************************************************/
 export default class Employee extends FireModel {
   static className = "従業員";
@@ -114,6 +114,7 @@ export default class Employee extends FireModel {
   static logicalDelete = true;
   static classProps = classProps;
   static tokenFields = [
+    "code",
     "lastName",
     "firstName",
     "lastNameKana",
@@ -134,14 +135,50 @@ export default class Employee extends FireModel {
     super.afterInitialize(item);
     Object.defineProperties(this, {
       fullName: defAccessor("fullName"),
+      fullNameKana: defAccessor("fullNameKana"),
       fullAddress: defAccessor("fullAddress"),
       prefecture: defAccessor("prefecture"),
+      age: {
+        enumerable: true,
+        configurable: true,
+        get() {
+          if (!this.dateOfBirth) return null;
+          const today = new Date();
+          let age = today.getUTCFullYear() - this.dateOfBirth.getUTCFullYear();
+          const m = today.getUTCMonth() - this.dateOfBirth.getUTCMonth();
+          const d = today.getUTCDate() - this.dateOfBirth.getUTCDate();
+          if (m < 0 || (m === 0 && d < 0)) age--;
+          return age;
+        },
+        set() {},
+      },
+      yearsOfService: {
+        enumerable: true,
+        configurable: true,
+        get() {
+          if (!this.dateOfHire) return null;
+          const today = new Date();
+          let years = today.getUTCFullYear() - this.dateOfHire.getUTCFullYear();
+          const m = today.getUTCMonth() - this.dateOfHire.getUTCMonth();
+          const d = today.getUTCDate() - this.dateOfHire.getUTCDate();
+          if (m < 0 || (m === 0 && d < 0)) years--;
+          return years;
+        },
+        set() {},
+      },
     });
   }
 
   /**
    * 外国籍の場合の必須フィールドを検証します。
-   * エラーがある場合は例外をスローします。
+   * - エラーがある場合は例外をスローします。
+   * - `isForeigner` が false の場合、以下のプロパティを初期化します。
+   *  - `foreignName`
+   *  - `nationality`
+   *  - `residenceStatus`
+   *  - `periodOfStay`
+   * @returns {void}
+   * @throws {Error} 外国籍の場合に必須フィールドが未入力の場合。
    */
   _validateForeignerRequiredFields() {
     if (this.isForeigner) {
@@ -165,20 +202,31 @@ export default class Employee extends FireModel {
           "[Employee.js] periodOfStay is required when isForeigner is true."
         );
       }
+    } else {
+      // 外国籍でない場合、関連フィールドを初期化
+      this.foreignName = null;
+      this.nationality = null;
+      this.residenceStatus = null;
+      this.periodOfStay = null;
     }
   }
 
   /**
    * 退職済である場合の必須フィールドを検証します。
-   * エラーがある場合は例外をスローします。
+   * - エラーがある場合は例外をスローします。
+   * - `employmentStatus` が `active` の場合、`dateOfTermination` を初期化します。
+   * @returns {void}
+   * @throws {Error} 退職済の場合に必須フィールドが未入力の場合。
    */
   _validateTerminatedRequiredFields() {
-    if (this.employmentStatus === "terminated") {
+    if (this.employmentStatus === VALUES.TERMINATED.value) {
       if (!this.dateOfTermination) {
         throw new Error(
           "[Employee.js] dateOfTermination is required when employmentStatus is 'terminated'."
         );
       }
+    } else {
+      this.dateOfTermination = null;
     }
   }
 

package/src/parts/accessorDefinitions.js

@@ -11,16 +11,12 @@ import { OPTIONS } from "../constants/prefectures.js";
  */
 const accessorImplementations = {
   customerId: {
-    enumerable: true,
     get() {
       return this?.customer?.docId;
     },
-    set(value) {
-      // No-op setter for read-only access
-    },
+    set() {},
   },
   fullAddress: {
-    enumerable: true,
     get() {
       // 同じオブジェクトに 'prefecture' アクセサが定義されていることを前提とします
       const prefecture = this.prefecture || "";
@@ -28,53 +24,41 @@ const accessorImplementations = {
       const address = this.address || "";
       return `${prefecture}${city}${address}`;
     },
-    set(value) {
-      // No-op setter for read-only access
-    },
+    set() {},
   },
   fullName: {
-    enumerable: true,
     get() {
       if (!this.lastName || !this.firstName) return "";
       return `${this.lastName} ${this.firstName}`;
     },
-    set(value) {
-      // No-op setter for read-only access
+    set() {},
+  },
+  fullNameKana: {
+    get() {
+      if (!this.lastNameKana || !this.firstNameKana) return "";
+      return `${this.lastNameKana} ${this.firstNameKana}`;
     },
+    set() {},
   },
   prefecture: {
-    enumerable: true,
     get() {
-      // if (!this.hasOwnProperty("prefCode")) {
-      //   console.warn(
-      //     "[アクセサ: prefecture] このオブジェクトに prefCode が定義されていません。"
-      //   );
-      //   return "";
-      // }
-
       if (!this.prefCode) return ""; // No warning if prefCode is falsy but present
-
       const result = OPTIONS.find(({ value }) => value === this.prefCode);
-
       if (!result) {
         console.warn(
           `[アクセサ: prefecture] prefCode '${this.prefCode}' は OPTIONS に見つかりません。`
         );
         return "";
       }
-
       if (!result.hasOwnProperty("title")) {
         console.warn(
           `[アクセサ: prefecture] OPTIONS の prefCode '${this.prefCode}' に title が定義されていません。`
         );
         return "";
       }
-
       return result.title;
     },
-    set(value) {
-      // No-op setter for read-only access
-    },
+    set() {},
   },
 };
 
@@ -90,7 +74,7 @@ const accessorImplementations = {
  */
 export const defAccessor = (
   key,
-  { configurable = false, enumerable = false } = {}
+  { configurable = true, enumerable = true } = {}
 ) => {
   const implementation = accessorImplementations[key];
   if (!implementation) {

package/src/parts/fieldDefinitions.js

@@ -147,11 +147,30 @@ export const fieldDefinitions = {
   code: generalDefinitions.code,
   /** dateAt */
   dateAt: generalDefinitions.dateAt,
+  dateOfBirth: {
+    ...generalDefinitions.dateAt,
+    label: "生年月日",
+  },
+  dateOfHire: {
+    ...generalDefinitions.dateAt,
+    label: "入社日",
+  },
+  dateOfTermination: {
+    ...generalDefinitions.dateAt,
+    label: "退職日",
+  },
+  periodOfStay: {
+    ...generalDefinitions.dateAt,
+    label: "在留期間満了日",
+  },
   /** dateTimeAt */
   dateTimeAt: generalDefinitions.dateTimeAt,
   /** multiple-line */
   multipleLine: generalDefinitions.multipleLine,
-
+  remarks: {
+    ...generalDefinitions.multipleLine,
+    label: "備考",
+  },
   /** number */
   number: generalDefinitions.number,
   breakMinutes: {
@@ -276,6 +295,13 @@ export const fieldDefinitions = {
     ...generalDefinitions.oneLine,
     label: "本名",
     length: 50,
+    component: {
+      name: generalDefinitions.oneLine.component.name,
+      attrs: {
+        hint: "パスポート等の表記をご入力ください。",
+        persistentHint: true,
+      },
+    },
   },
   lastName: {
     ...generalDefinitions.oneLine,
@@ -326,6 +352,11 @@ export const fieldDefinitions = {
     label: "国籍",
     length: 50,
   },
+  residenceStatus: {
+    ...generalDefinitions.oneLine,
+    label: "在留資格",
+    length: 10,
+  },
   siteId: {
     ...generalDefinitions.oneLine,
     label: "現場",
@@ -350,6 +381,11 @@ export const fieldDefinitions = {
       },
     },
   },
+  title: {
+    ...generalDefinitions.oneLine,
+    label: "肩書",
+    length: 20,
+  },
   workDescription: {
     ...generalDefinitions.oneLine,
     label: "作業内容",