@7365admin1/layer-common 3.1.2-staging.38 → 3.1.2

package/composables/useCleaningSchedulePermission.ts

@@ -1,23 +1,58 @@
 export function useCleaningSchedulePermission() {
+  const { hasPermission } = usePermission();
+  const { permissions } = useCleaningPermission();
+
   const { userAppRole } = useLocalSetup();
 
-  const can = (action: string) =>
-    computed(() => {
-      const permissions = userAppRole.value?.permissions;
-      if (!permissions) return false;
-      if (permissions.includes("*")) return true;
-      return permissions.some((permission) =>
-        permission.endsWith(`-schedule-mgmt:${action}`),
-      );
-    });
+  const canViewSchedules = computed(() => {
+    if (!userAppRole.value) return false;
+    if (userAppRole.value.permissions.includes("*")) return true;
+    return hasPermission(userAppRole.value, permissions, "cleaning-schedule-mgmt", "see-all-schedules");
+  });
+
+  const canViewScheduleDetails = computed(() => {
+    if (!userAppRole.value) return false;
+    if (userAppRole.value.permissions.includes("*")) return true;
+    return hasPermission(userAppRole.value, permissions, "cleaning-schedule-mgmt", "see-schedule-details");
+  });
+
+  const canDownloadSchedule = computed(() => {
+    if (!userAppRole.value) return false;
+    if (userAppRole.value.permissions.includes("*")) return true;
+    return hasPermission(userAppRole.value, permissions, "cleaning-schedule-mgmt", "download-schedule");
+  });
+
+  const canManageScheduleTasks = computed(() => {
+    if (!userAppRole.value) return false;
+    if (userAppRole.value.permissions.includes("*")) return true;
+    return hasPermission(userAppRole.value, permissions, "cleaning-schedule-mgmt", "manage-schedule-tasks");
+  });
+
+  const canGenerateChecklist = computed(() => {
+    if (!userAppRole.value) return false;
+    if (userAppRole.value.permissions.includes("*")) return true;
+    return hasPermission(userAppRole.value, permissions, "cleaning-schedule-mgmt", "generate-checklist");
+  });
+
+  const canViewHistory = computed(() => {
+    if (!userAppRole.value) return false;
+    if (userAppRole.value.permissions.includes("*")) return true;
+    return hasPermission(userAppRole.value, permissions, "cleaning-schedule-mgmt", "view-history");
+  });
+
+  const canAddRemarks = computed(() => {
+    if (!userAppRole.value) return false;
+    if (userAppRole.value.permissions.includes("*")) return true;
+    return hasPermission(userAppRole.value, permissions, "cleaning-schedule-mgmt", "add-remarks");
+  });
 
   return {
-    canViewSchedules: can("see-all-schedules"),
-    canViewScheduleDetails: can("see-schedule-details"),
-    canDownloadSchedule: can("download-schedule"),
-    canManageScheduleTasks: can("manage-schedule-tasks"),
-    canGenerateChecklist: can("generate-checklist"),
-    canViewHistory: can("view-history"),
-    canAddRemarks: can("add-remarks"),
+    canViewSchedules,
+    canViewScheduleDetails,
+    canDownloadSchedule,
+    canManageScheduleTasks,
+    canGenerateChecklist,
+    canViewHistory,
+    canAddRemarks,
   };
 }

package/composables/useEquipment.ts

@@ -27,7 +27,6 @@ export default function useEquipment() {
           name: payload.name,
           unitOfMeasurement: payload.unitOfMeasurement,
           serviceType,
-          ...(payload.attachment ? { attachment: payload.attachment } : {}),
         },
       }
     );
@@ -41,7 +40,6 @@ export default function useEquipment() {
         body: {
           name: payload.name,
           unitOfMeasurement: payload.unitOfMeasurement,
-          ...(payload.attachment ? { attachment: payload.attachment } : {}),
         },
       }
     );

package/composables/useLocalAuth.ts

@@ -183,4 +183,4 @@ export default function useLocalAuth() {
     updateVerificationStatus,
     signUp,
   };
-}
+}

package/composables/useNFCPatrolDailyReport.ts

@@ -34,8 +34,6 @@ function mapLogToSummaryRow(log: Record<string, any>, index: number): NFCPatrolS
     id: log._id,
     routeName: `${index + 1}. ${log.route?.name ?? "-"}`,
     securityCheckSchedule: log.route?.startTime ?? "-",
-    guardName: log.sign?.guardName,
-    guardSignatureFileId: log.sign?.guardSignatureFileId,
     checked,
     missed,
     status: missed === 0 ? "Completed" : "Incomplete",
@@ -65,12 +63,15 @@ export function useNFCPatrolDailyReport(
 
     try {
       const [logsRes, siteInfo] = await Promise.all([
-        getPatrolLogs({
+        getPatrolLogs<NFCPatrolLogListResponse>({
           page: 1,
           limit: 100,
           site,
           date: filters.date,
           routeId: filters.route,
+          routeStartTime: filters.timeRange
+            ? filters.timeRange.split(" - ")[0]
+            : undefined,
         }),
         getSiteById(site),
       ]);

package/composables/useNFCPatrolMonthlyReport.ts

@@ -2,8 +2,6 @@ import type {
   NFCPatrolReportFilters,
   NFCPatrolSummaryReport,
   NFCPatrolReportSummaryRow,
-  NFCPatrolMonthlyReportRow,
-  NFCPatrolMonthlyReport,
 } from "../types/nfc-patrol-report";
 import useNFCPatrolLog from "./useNFCPatrolLog";
 import useSite from "./useSite";
@@ -14,55 +12,6 @@ interface NFCPatrolLogListResponse {
   pageRange?: string;
 }
 
-const MONTHS = [
-  "January",
-  "February",
-  "March",
-  "April",
-  "May",
-  "June",
-  "July",
-  "August",
-  "September",
-  "October",
-  "November",
-  "December",
-];
-function mapLogsToMonthlyRows(
-  logs: Record<string, any>[],
-): NFCPatrolMonthlyReportRow[] {
-  const rows = MONTHS.map((month) => ({
-    month,
-    checked: 0,
-    checkedPercentage: 0,
-    missed: 0,
-    missedPercentage: 0,
-  }));
-
-  logs.forEach((log) => {
-    const monthIndex = new Date(log.date).getMonth();
-
-    for (const checkpoint of log.checkPoints ?? []) {
-      if (checkpoint.status === "Completed") {
-        rows[monthIndex].checked++;
-      } else if (checkpoint.status === "Skipped") {
-        rows[monthIndex].missed++;
-      }
-    }
-  });
-
-  rows.forEach((row) => {
-    const total = row.checked + row.missed;
-
-    if (total > 0) {
-      row.checkedPercentage = Math.round((row.checked / total) * 100);
-      row.missedPercentage = Math.round((row.missed / total) * 100);
-    }
-  });
-
-  return rows;
-}
-
 function buildAddress(address?: Record<string, string>) {
   if (!address) return undefined;
 
@@ -78,7 +27,23 @@ function buildAddress(address?: Record<string, string>) {
   return parts.length ? parts.join(", ") : undefined;
 }
 
+function mapLogToSummaryRow(
+  log: Record<string, any>,
+  index: number,
+): NFCPatrolReportSummaryRow {
+  const checkpoints: Record<string, any>[] = log.checkPoints ?? [];
+  const checked = checkpoints.filter((cp) => cp.status === "Completed").length;
+  const missed = checkpoints.filter((cp) => cp.status === "Skipped").length;
 
+  return {
+    id: log._id,
+    routeName: `${index + 1}. ${log.route?.name ?? "-"}`,
+    securityCheckSchedule: log.route?.startTime ?? "-",
+    checked,
+    missed,
+    status: missed === 0 ? "Completed" : "Incomplete",
+  };
+}
 
 export function useNFCPatrolMonthlyReport(
   filters: NFCPatrolReportFilters,
@@ -87,12 +52,12 @@ export function useNFCPatrolMonthlyReport(
   const { getAll: getPatrolLogs } = useNFCPatrolLog();
   const { getSiteById } = useSite();
 
-  const report = ref<NFCPatrolMonthlyReport | null>(null);
+  const report = ref<NFCPatrolSummaryReport | null>(null);
   const loading = ref(false);
   const notFound = ref(false);
 
   async function fetchReport() {
-    if (!site || !filters.route) {
+    if (!site || !filters.date || !filters.route) {
       report.value = null;
       notFound.value = false;
       return;
@@ -100,16 +65,19 @@ export function useNFCPatrolMonthlyReport(
 
     loading.value = true;
     notFound.value = false;
-    const currentYear = new Date().getFullYear().toString();
+
     try {
       const [logsRes, siteInfo] = await Promise.all([
-        getPatrolLogs({
-            page: 1,
-            limit: 100,
-            site,
-            routeId: filters.route,
-            date: currentYear,
-            type: "month",
+        getPatrolLogs<NFCPatrolLogListResponse>({
+          page: 1,
+          limit: 100,
+          site,
+          date: filters.date,
+          routeId: filters.route,
+          routeStartTime: filters.timeRange
+            ? filters.timeRange.split(" - ")[0]
+            : undefined,
+          type: "month",
         }),
         getSiteById(site),
       ]);
@@ -125,7 +93,7 @@ export function useNFCPatrolMonthlyReport(
             address: buildAddress(siteInfo.address),
           },
           title: `Patrol Route Summary: ${routeName}`,
-          rows: mapLogsToMonthlyRows(logs),
+          rows: logs.map(mapLogToSummaryRow),
         };
       } else {
         report.value = null;

package/composables/useNFCPatrolReport.ts

@@ -51,8 +51,6 @@ function mapLogToPatrolReport(
   const activities: NFCPatrolActivity[] = checkpoints.map((cp) => ({
     id: cp.nfcTag_id,
     checkpoint: cp.nfcTag_name,
-    guardName: log.sign?.guardName,
-    guardSignatureFileId: log.sign?.guardSignatureFileId,
     startTime: formatTime(cp.startDateTime),
     endTime: formatTime(cp.endDateTime),
     actualTime: diffMinutes(cp.startDateTime, cp.endDateTime),

package/composables/useServiceProvider.ts

@@ -236,26 +236,6 @@ export default function useServiceProvider() {
     );
   }
 
-   async function getByEmail({
-    email = "",
-    orgId = "",
-    siteId = "",
-    serviceProviderOrgId = "",
-  } = {}) {
-    return useNuxtApp().$api<Record<string, any>>(
-      "/api/service-providers/email",
-      {
-        method: "GET",
-        query: {
-          email,
-          ...(orgId ? { orgId } : {}),
-          ...(siteId ? { siteId } : {}),
-          ...(serviceProviderOrgId ? { serviceProviderOrgId } : {}),
-        },
-      }
-    );
-  }
-
   return {
     serviceProviders,
     serviceProvider,
@@ -274,6 +254,5 @@ export default function useServiceProvider() {
     add,
     addViaInvite,
     updateStatus,
-    getByEmail,
   };
 }

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "3.1.2-staging.38",
+  "version": "3.1.2",
   "author": "7365admin1",
   "main": "./nuxt.config.ts",
   "publishConfig": {

package/types/customer.d.ts

@@ -41,5 +41,4 @@ type TSiteCategory =
   | "shopping_mall"
   | "mix_development"
   | "industrial"
-  | "co_working"
-  | "co_living";
+  | "co_working_co_living";

package/types/equipment.d.ts

@@ -6,10 +6,6 @@ declare type TEquipment = {
   unitOfMeasurement: string;
   createdAt: string;
   updatedAt: string;
-  attachment?: string;
 };
 
-declare type TEquipmentCreate = Pick<
-  TEquipment,
-  "name" | "unitOfMeasurement" | "attachment"
->;
+declare type TEquipmentCreate = Pick<TEquipment, "name" | "unitOfMeasurement">;

package/types/nfc-patrol-report.ts

@@ -26,7 +26,7 @@ export interface NFCPatrolReportFilterOptions {
 
 export interface NFCPatrolReportLocation {
   name?: string;
-  address?: string;
+  address?: string; 
 }
 
 export interface NFCPatrolRouteSummary {
@@ -47,8 +47,6 @@ export interface NFCPatrolRouteSummary {
 export interface NFCPatrolActivity {
   id: string;
   checkpoint: string;
-  guardName?: string;
-  guardSignatureFileId?: string;
   startTime: string;
   endTime: string;
   actualTime: string;
@@ -69,8 +67,6 @@ export interface NFCPatrolReportSummaryRow {
   id: string;
   routeName: string;
   securityCheckSchedule: string;
-  guardName?: string;
-  guardSignatureFileId?: string;
   checked: number;
   missed: number;
   status: NFCPatrolReportSummaryStatus;
@@ -81,17 +77,3 @@ export interface NFCPatrolSummaryReport {
   title: string;
   rows: NFCPatrolReportSummaryRow[];
 }
-
-export interface NFCPatrolMonthlyReportRow {
-  month: string;
-  checked: number;
-  checkedPercentage: number;
-  missed: number;
-  missedPercentage: number;
-}
-
-export interface NFCPatrolMonthlyReport {
-  location: NFCPatrolReportLocation;
-  title: string;
-  rows: NFCPatrolMonthlyReportRow[];
-}

package/components/Nfc/PatrolReport/MonthlyReportTable.vue

@@ -1,69 +0,0 @@
-<template>
-  <div class="mt-6">
-    <div class="text-h6 font-weight-bold mb-4">
-      {{ title }}
-    </div>
-
-    <v-table class="border rounded-lg">
-      <thead>
-        <tr>
-          <th class="text-left font-weight-bold">Month</th>
-          <th class="text-center font-weight-bold">Checked</th>
-          <th class="text-center font-weight-bold">% Checked</th>
-          <th class="text-center font-weight-bold">Missed</th>
-          <th class="text-center font-weight-bold">% Missed</th>
-        </tr>
-      </thead>
-
-      <tbody>
-        <tr
-          v-for="row in rows"
-          :key="row.month"
-        >
-          <td>{{ row.month }}</td>
-
-          <td class="text-center">
-            {{ row.checked }}
-          </td>
-
-          <td class="text-center">
-            {{ row.checkedPercentage }}%
-          </td>
-
-          <td class="text-center">
-            {{ row.missed }}
-          </td>
-
-          <td class="text-center">
-            {{ row.missedPercentage }}%
-          </td>
-        </tr>
-      </tbody>
-    </v-table>
-  </div>
-</template>
-
-<script setup lang="ts">
-import type { NFCPatrolMonthlyReportRow } from "../../../types/nfc-patrol-report";
-
-defineProps<{
-  title: string;
-  rows: NFCPatrolMonthlyReportRow[];
-}>();
-</script>
-
-<style scoped>
-.v-table {
-  border: 1px solid rgb(var(--v-theme-outline));
-}
-
-thead th {
-  background: transparent;
-  white-space: nowrap;
-  font-weight: 600;
-}
-
-tbody td {
-  height: 56px;
-}
-</style>

package/components/Nfc/PatrolReport/ReportDatePicker.vue

@@ -1,61 +0,0 @@
-<template>
-  <div class="d-flex flex-column">
-    <v-text-field
-      v-bind="$attrs"
-      :model-value="formattedDate"
-      autocomplete="off"
-      placeholder="DD/MM/YY"
-      readonly
-      @click="openDatePicker"
-    >
-      <template #append-inner>
-        <v-icon icon="mdi-calendar" @click.stop="openDatePicker" />
-      </template>
-    </v-text-field>
-
-    <input
-      ref="dateInput"
-      v-model="date"
-      class="native-date-input"
-      type="date"
-    />
-  </div>
-</template>
-
-<script setup lang="ts">
-defineOptions({ inheritAttrs: false });
-
-const date = defineModel<string>({ default: "" });
-const dateInput = ref<HTMLInputElement | null>(null);
-
-const formattedDate = computed(() => {
-  const match = date.value.match(/^(\d{4})-(\d{2})-(\d{2})$/);
-
-  if (!match) return "";
-
-  const [, year, month, day] = match;
-  return `${day}/${month}/${year.slice(-2)}`;
-});
-
-function openDatePicker() {
-  const input = dateInput.value;
-
-  if (!input) return;
-
-  if (input.showPicker) {
-    input.showPicker();
-  } else {
-    input.click();
-  }
-}
-</script>
-
-<style scoped>
-.native-date-input {
-  position: absolute;
-  width: 1px;
-  height: 1px;
-  opacity: 0;
-  pointer-events: none;
-}
-</style>