@shisyamo4131/air-guard-v2-schemas 2.4.2-dev.6 → 2.4.2-dev.61

package/src/parts/fieldDefinitions.js

@@ -2,6 +2,10 @@ import {
   VALUES as ARRANGEMENT_NOTIFICATION_STATUS_VALUES,
   OPTIONS as ARRANGEMENT_NOTIFICATION_STATUS_OPTIONS,
 } from "../constants/arrangement-notification-status.js";
+import {
+  VALUES as BILLING_UNIT_TYPE_VALUES,
+  OPTIONS as BILLING_UNIT_TYPE_OPTIONS,
+} from "../constants/billing-unit-type.js";
 import {
   VALUES as BLOOD_TYPE_VALUES,
   OPTIONS as BLOOD_TYPE_OPTIONS,
@@ -30,7 +34,15 @@ import {
   VALUES as GENDER_VALUES,
   OPTIONS as GENDER_OPTIONS,
 } from "../constants/gender.js";
+import {
+  VALUES as INSURANCE_STATUS_VALUES,
+  OPTIONS as INSURANCE_STATUS_OPTIONS,
+} from "../constants/insurance-status.js";
 import { OPTIONS as PREFECTURES_OPTIONS } from "../constants/prefectures.js";
+import {
+  VALUES as PAYMENT_MONTH_VALUES,
+  OPTIONS as PAYMENT_MONTH_OPTIONS,
+} from "../constants/payment-month.js";
 import {
   VALUES as SHIFT_TYPE_VALUES,
   OPTIONS as SHIFT_TYPE_OPTIONS,
@@ -40,6 +52,7 @@ import {
   OPTIONS as SITE_STATUS_OPTIONS,
 } from "../constants/site-status.js";
 import CutoffDate from "../utils/CutoffDate.js";
+import { VALIDATION_ERRORS } from "../errorDefinitions.js";
 
 export const DEFAULT_WORKING_MINUTES = 480;
 export const DEFAULT_BREAK_MINUTES = 60;
@@ -47,6 +60,25 @@ export const MINUTES_PER_HOUR = 60;
 export const MINUTES_PER_QUARTER_HOUR = 15;
 export const MAX_SCHEDULED_WORKING_MINUTES = 480; // 8時間 * 60分
 
+/**
+ * フィールド定義のデフォルト値
+ * - `air-firebase` が提供する `FireModel (BaseClass)` において、クラスが保有するフィールドの定義および値の検証に使用されます。
+ * - `component` プロパティは `air-vuetify` の入力コンポーネント生成の為の属性として使用されます。
+ *   但し、required, label, hidden, length は入力コンポーネントの属性としても使用されます。
+ * - `validator` の返り値は原則オブジェクトです。文字列を返すこともでき、その文字列がエラーメッセージとして扱われますが多言語対応のためには
+ *   オブジェクトを返すことを推奨します。
+ *   返り値が true/false の場合は、従来通りのバリデーション結果として扱われます。
+ * @key {String|Number|Boolean|Object|Array|Date} type - データの型
+ * @key {any} default - 既定値
+ * @key {String} label - フィールドのラベル
+ * @key {Number} length - 入力可能な最大文字数（文字列型の場合）
+ * @key {Boolean} required - 入力必須かどうか
+ * @key {Boolean} hidden - フィールドをUI上で非表示にするかどうか
+ * @key {Function} validator - フィールドの値を検証する関数。引数に値を取り、エラーメッセージを返すか、true/falseで検証結果を返す。
+ * @key {Object} component - フィールドに対応するUIコンポーネントの定義
+ * @key {String} component.name - 使用するコンポーネントの名前（AirVuetifyコンポーネントのみ指定可能）
+ * @key {Object} component.attrs - コンポーネントに渡す属性の定義
+ */
 const defaultDefinition = {
   type: String,
   default: null,
@@ -54,6 +86,7 @@ const defaultDefinition = {
   length: undefined,
   required: undefined,
   hidden: undefined,
+  validator: undefined,
   component: {
     name: undefined,
     attrs: {},
@@ -148,17 +181,36 @@ const generalDefinitions = {
 
 /** カスタムパーツ（汎用パーツ含む） */
 export const fieldDefinitions = {
-  /** array */
+  /*****************************************************************************
+   * ARRAY
+   *****************************************************************************/
   array: generalDefinitions.array,
-  /** check */
+
+  /*****************************************************************************
+   * CHECK
+   *****************************************************************************/
   check: generalDefinitions.check,
+  hasPeriodOfStayLimit: {
+    ...generalDefinitions.check,
+    label: "在留期間制限",
+  },
+  hasWorkRestrictions: {
+    ...generalDefinitions.check,
+    label: "就労制限",
+  },
   isForeigner: {
     ...generalDefinitions.check,
     label: "外国籍",
   },
-  /** code */
+
+  /*****************************************************************************
+   * CODE
+   *****************************************************************************/
   code: generalDefinitions.code,
-  /** dateAt */
+
+  /*****************************************************************************
+   * DATE AT
+   *****************************************************************************/
   dateAt: generalDefinitions.dateAt,
   dateOfBirth: {
     ...generalDefinitions.dateAt,
@@ -186,13 +238,17 @@ export const fieldDefinitions = {
     label: "退職日",
     default: null, // 2025-12-26 Set default to null
   },
+  enrollmentDateAt: {
+    ...generalDefinitions.dateAt,
+    label: "資格取得日",
+    default: null,
+  },
   // 2025-12-26 Added
   expirationDateAt: {
     ...generalDefinitions.dateAt,
     label: "有効期限",
     default: null,
   },
-  // 2025-12-26 Added
   issueDateAt: {
     ...generalDefinitions.dateAt,
     label: "取得日",
@@ -209,13 +265,21 @@ export const fieldDefinitions = {
     ...generalDefinitions.multipleLine,
     label: "備考",
   },
-  /** number */
+
+  /*****************************************************************************
+   * NUMBER
+   *****************************************************************************/
   number: generalDefinitions.number,
   breakMinutes: {
     ...generalDefinitions.number,
     label: "休憩時間（分）",
     default: DEFAULT_BREAK_MINUTES,
-    validator: (v) => v >= 0,
+    validator: (v) => {
+      if (v < 0) {
+        return VALIDATION_ERRORS.MIN_VALUE_ERROR(0);
+      }
+      return true;
+    },
     component: {
       ...generalDefinitions.number.component,
       attrs: {
@@ -228,7 +292,12 @@ export const fieldDefinitions = {
     ...generalDefinitions.number,
     label: "残業時間（分）",
     default: 0,
-    validator: (v) => v >= 0,
+    validator: (v) => {
+      if (v < 0) {
+        return VALIDATION_ERRORS.MIN_VALUE_ERROR(0);
+      }
+      return true;
+    },
     component: {
       ...generalDefinitions.number.component,
       attrs: {
@@ -241,7 +310,12 @@ export const fieldDefinitions = {
     ...generalDefinitions.number,
     label: "規定実働時間（分）",
     default: DEFAULT_WORKING_MINUTES,
-    validator: (v) => v >= 0,
+    validator: (v) => {
+      if (v < 0) {
+        return VALIDATION_ERRORS.MIN_VALUE_ERROR(0);
+      }
+      return true;
+    },
     component: {
       ...generalDefinitions.number.component,
       attrs: {
@@ -256,12 +330,24 @@ export const fieldDefinitions = {
     ...generalDefinitions.number,
   },
 
-  /** one-line */
+  /*****************************************************************************
+   * ONE LINE
+   *****************************************************************************/
   oneLine: generalDefinitions.oneLine,
+  abbreviation: {
+    ...generalDefinitions.oneLine,
+    label: "略称",
+    length: 20,
+  },
   address: {
     ...generalDefinitions.oneLine,
     label: "町域名・番地",
-    length: 15,
+    length: 30,
+  },
+  branchName: {
+    ...generalDefinitions.oneLine,
+    label: "支店名など",
+    length: 20,
   },
   building: {
     ...generalDefinitions.oneLine,
@@ -271,7 +357,23 @@ export const fieldDefinitions = {
   city: {
     ...generalDefinitions.oneLine,
     label: "市区町村",
-    length: 10,
+    length: 20,
+  },
+  companyName: {
+    ...generalDefinitions.oneLine,
+    label: "会社名",
+    length: 20,
+  },
+  companyNameKana: {
+    ...generalDefinitions.oneLine,
+    label: "会社名（カナ）",
+    length: 40,
+    component: {
+      name: generalDefinitions.oneLine.component.name,
+      attrs: {
+        inputType: "katakana",
+      },
+    },
   },
   customerId: {
     ...generalDefinitions.oneLine,
@@ -287,6 +389,21 @@ export const fieldDefinitions = {
       },
     },
   },
+
+  /**
+   * 取引先名
+   * - 2文字以上最大20文字
+   */
+  customerName: {
+    ...generalDefinitions.oneLine,
+    label: "取引先名",
+    length: 20,
+    component: {
+      name: generalDefinitions.oneLine.component.name,
+      attrs: { minLength: 2 },
+    },
+  },
+
   displayName: {
     ...generalDefinitions.oneLine,
     label: "表示名",
@@ -295,7 +412,7 @@ export const fieldDefinitions = {
   domicile: {
     ...generalDefinitions.oneLine,
     label: "本籍地",
-    length: 30,
+    length: 50,
   },
   email: {
     ...generalDefinitions.oneLine,
@@ -305,13 +422,14 @@ export const fieldDefinitions = {
       name: generalDefinitions.oneLine.component.name,
       attrs: {
         inputType: "email",
+        inputmode: "email",
       },
     },
   },
   emergencyContactAddress: {
     ...generalDefinitions.oneLine,
     label: "緊急連絡先住所",
-    length: 20,
+    length: 50,
   },
   emergencyContactName: {
     ...generalDefinitions.oneLine,
@@ -332,6 +450,7 @@ export const fieldDefinitions = {
       attrs: {
         counter: true,
         inputType: "tel",
+        inputmode: "tel",
       },
     },
   },
@@ -344,6 +463,7 @@ export const fieldDefinitions = {
       attrs: {
         counter: true,
         inputType: "tel",
+        inputmode: "tel",
       },
     },
   },
@@ -375,6 +495,11 @@ export const fieldDefinitions = {
       },
     },
   },
+  insuranceNumber: {
+    ...generalDefinitions.oneLine,
+    label: "被保険者番号（整理記号）",
+    length: 20,
+  },
   // 2025-12-26 Added
   issuedBy: {
     ...generalDefinitions.oneLine,
@@ -406,6 +531,7 @@ export const fieldDefinitions = {
       attrs: {
         counter: true,
         inputType: "tel",
+        inputmode: "tel",
       },
     },
   },
@@ -467,6 +593,7 @@ export const fieldDefinitions = {
       attrs: {
         counter: true,
         inputType: "tel",
+        inputmode: "tel",
       },
     },
   },
@@ -503,7 +630,9 @@ export const fieldDefinitions = {
     },
   },
 
-  /** object */
+  /*****************************************************************************
+   * OBJECT
+   *****************************************************************************/
   object: generalDefinitions.object,
 
   customer: {
@@ -520,15 +649,23 @@ export const fieldDefinitions = {
       },
     },
   },
+  employmentInsurance: {
+    ...generalDefinitions.object,
+    label: "雇用保険",
+  },
   location: {
     ...generalDefinitions.object,
     hidden: true,
   },
 
-  /** radio */
+  /*****************************************************************************
+   * RADIO
+   *****************************************************************************/
   radio: generalDefinitions.radio,
 
-  /** select */
+  /*****************************************************************************
+   * SELECT
+   *****************************************************************************/
   select: generalDefinitions.select,
   arrangementNotificationStatus: {
     ...generalDefinitions.select,
@@ -541,6 +678,18 @@ export const fieldDefinitions = {
       },
     },
   },
+  /** 請求単位 */
+  billingUnitType: {
+    ...generalDefinitions.select,
+    default: BILLING_UNIT_TYPE_VALUES.PER_DAY.value,
+    label: "請求単位",
+    component: {
+      name: generalDefinitions.select.component.name,
+      attrs: {
+        items: BILLING_UNIT_TYPE_OPTIONS,
+      },
+    },
+  },
   bloodType: {
     ...generalDefinitions.select,
     label: "血液型",
@@ -630,6 +779,39 @@ export const fieldDefinitions = {
       },
     },
   },
+  insuranceStatus: {
+    ...generalDefinitions.select,
+    default: INSURANCE_STATUS_VALUES.NOT_ENROLLED.value,
+    label: "保険状態",
+    component: {
+      name: generalDefinitions.select.component.name,
+      attrs: {
+        items: INSURANCE_STATUS_OPTIONS,
+      },
+    },
+  },
+  paymentDate: {
+    ...generalDefinitions.select,
+    default: CutoffDate.VALUES[0].value,
+    label: "入金サイト（日）",
+    component: {
+      name: generalDefinitions.select.component.name,
+      attrs: {
+        items: CutoffDate.OPTIONS,
+      },
+    },
+  },
+  paymentMonth: {
+    ...generalDefinitions.select,
+    default: PAYMENT_MONTH_VALUES[1].value,
+    label: "入金サイト（月数）",
+    component: {
+      name: generalDefinitions.select.component.name,
+      attrs: {
+        items: PAYMENT_MONTH_OPTIONS,
+      },
+    },
+  },
   prefCode: {
     ...generalDefinitions.select,
     label: "都道府県",
@@ -689,7 +871,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;
@@ -753,6 +935,10 @@ export const defField = (key, options = {}) => {
   if (options.hasOwnProperty("required")) {
     newConfig.required = options.required;
   }
+  // validatorの処理: optionsにvalidatorがあれば設定
+  if (options.hasOwnProperty("validator")) {
+    newConfig.validator = options.validator;
+  }
   // `hidden` は options にあればその値、なければ newConfig の値 (baseConfig または defaultDefinition 由来) を維持
   // defaultDefinition.hidden は undefined なので、指定がなければ undefined のままになる
   if (options.hasOwnProperty("hidden")) {

package/src/utils/index.js

@@ -15,14 +15,14 @@ export function getDateAt(date, time, dateOffset = 0) {
   // If date is not null/undefined and is not a string or Date, throw an error
   if (date != null && !(typeof date === "string" || date instanceof Date)) {
     throw new Error(
-      `[getDateAt] Invalid date type. Expected string or Date, got ${typeof date}`
+      `[getDateAt] Invalid date type. Expected string or Date, got ${typeof date}`,
     );
   }
 
   // If time is not null and is not a string, throw an error
   if (time != null && typeof time !== "string") {
     throw new Error(
-      `[getDateAt] Invalid time type. Expected string, got ${typeof time}`
+      `[getDateAt] Invalid time type. Expected string, got ${typeof time}`,
     );
   }
 
@@ -31,18 +31,30 @@ export function getDateAt(date, time, dateOffset = 0) {
   const [hour, minute] = time ? time.split(":").map(Number) : [0, 0];
   if (isNaN(hour) || isNaN(minute)) {
     throw new Error(
-      `[getDateAt] Invalid time format. Expected HH:MM, got ${time}`
+      `[getDateAt] Invalid time format. Expected HH:MM, got ${time}`,
     );
   }
 
   // If date is not provided, use the current date
-  const result = new Date(date || Date.now());
+  const baseDate = new Date(date || Date.now());
 
-  // JSTはUTC+9なので、UTC時刻として設定してから9時間引く
-  result.setUTCHours(hour - 9, minute, 0, 0);
-  result.setUTCDate(result.getUTCDate() + dateOffset);
+  // 入力日時から JST の日付成分を取得してから、JST時刻を合成する。
+  // これにより、UTC日付境界を跨ぐケースでも期待通りの JST 日付を保てる。
+  const jstDate = new Date(baseDate.getTime() + 9 * 60 * 60 * 1000);
+  const year = jstDate.getUTCFullYear();
+  const month = jstDate.getUTCMonth();
+  const day = jstDate.getUTCDate();
 
-  return result;
+  const utcMillis = Date.UTC(
+    year,
+    month,
+    day + dateOffset,
+    hour - 9,
+    minute,
+    0,
+    0,
+  );
+  return new Date(utcMillis);
 }
 
 export { ContextualError } from "./ContextualError.js";