@7365admin1/layer-common 3.0.31-staging.23 → 3.1.0

package/components/Nfc/NFCPatrolReportMain.vue

@@ -14,63 +14,44 @@
         </v-col>
       </v-row>
 
-      <v-tabs
-        v-model="activeTab"
-        class="mb-6"
-        bg-color="transparent"
-        grow
-      >
-        <v-tab value="patrol" class="text-none border-thin">
-          Patrol Report
-        </v-tab>
-
-        <v-tab value="daily" class="text-none border-thin">
-          Daily Report
-        </v-tab>
-
-        <v-tab value="monthly" class="text-none border-thin">
-          Monthly Report
-        </v-tab>
+      <v-tabs v-model="activeTab" class="mb-6" bg-color="transparent" grow>
+        <v-tab value="patrol" class="text-none border-thin">Patrol Report</v-tab>
+        <v-tab value="daily" class="text-none border-thin">Daily Report</v-tab>
+        <v-tab value="monthly" class="text-none border-thin">Monthly Report</v-tab>
       </v-tabs>
 
       <v-window v-model="activeTab" class="pt-4">
         <v-window-item value="patrol">
-          <div v-if="activeTab === 'patrol'">
-            <PatrolReportTab
-              :active="true"
-              :site="site"
-              :filters="filters"
-              :options="options"
-              @update:filters="updateFilters"
-              @export="exportReport"
-            />
-          </div>
+          <PatrolReportTab
+            :active="activeTab === 'patrol'"
+            :site="site"
+            :filters="filters"
+            :options="options"
+            @update:filters="updateFilters"
+            @export="exportReport"
+          />
         </v-window-item>
 
         <v-window-item value="daily">
-          <div v-if="activeTab === 'daily'">
-            <DailyReportTab
-              :active="true"
-              :site="site"
-              :filters="filters"
-              :options="options"
-              @update:filters="updateFilters"
-              @export="exportReport"
-            />
-          </div>
+          <DailyReportTab
+            :active="activeTab === 'daily'"
+            :site="site"
+            :filters="filters"
+            :options="options"
+            @update:filters="updateFilters"
+            @export="exportReport"
+          />
         </v-window-item>
 
         <v-window-item value="monthly">
-          <div v-if="activeTab === 'monthly'">
-            <MonthlyReportTab
-              :active="true"
-              :site="site"
-              :filters="filters"
-              :options="options"
-              @update:filters="updateFilters"
-              @export="exportReport"
-            />
-          </div>
+          <MonthlyReportTab
+            :active="activeTab === 'monthly'"
+            :site="site"
+            :filters="filters"
+            :options="options"
+            @update:filters="updateFilters"
+            @export="exportReport"
+          />
         </v-window-item>
       </v-window>
     </v-col>
@@ -78,20 +59,15 @@
 </template>
 
 <script setup lang="ts">
-import html2canvas from "html2canvas";
-import jsPDF from "jspdf";
-
 import type {
   NFCPatrolReportFilters,
   NFCPatrolReportTab,
 } from "../../types/nfc-patrol-report";
-
+import { useNFCPatrolReportExport } from "../../composables/useNFCPatrolReportExport";
 import { useNFCPatrolReportFilters } from "../../composables/useNFCPatrolReportFilters";
-
-import PatrolReportTab from "./PatrolReport/PatrolReportTab.vue";
 import DailyReportTab from "./PatrolReport/DailyReportTab.vue";
 import MonthlyReportTab from "./PatrolReport/MonthlyReportTab.vue";
-
+import PatrolReportTab from "./PatrolReport/PatrolReportTab.vue";
 
 const props = defineProps<{
   site: string;
@@ -99,16 +75,11 @@ const props = defineProps<{
 }>();
 
 const router = useRouter();
-
-
 const activeTab = ref<NFCPatrolReportTab>("patrol");
+const { filters, options, fetchOptions } = useNFCPatrolReportFilters(props.site);
+const { exportReport: exportActiveReport } = useNFCPatrolReportExport();
 
-const { filters, options, fetchOptions } =
-  useNFCPatrolReportFilters(props.site);
-
-onMounted(() => {
-  fetchOptions();
-});
+onMounted(fetchOptions);
 
 function goBack() {
   router.back();
@@ -120,72 +91,11 @@ function updateFilters(value: NFCPatrolReportFilters) {
   filters.date = value.date;
 }
 
-async function exportReport(type: "pdf" | "csv") {
-  const report = document.querySelector(
-    ".report-export",
-  ) as HTMLElement | null;
-
-  if (!report) return;
-
-  if (type === "pdf") {
-    const canvas = await html2canvas(report, {
-      scale: 2,
-      useCORS: true,
-      backgroundColor: "#fff",
-    });
-
-    const pdf = new jsPDF("p", "mm", "a4");
-
-    const pdfWidth = pdf.internal.pageSize.getWidth();
-    const pdfHeight = pdf.internal.pageSize.getHeight();
-
-    const imgWidth = pdfWidth;
-    const imgHeight = (canvas.height * imgWidth) / canvas.width;
-
-    const imgData = canvas.toDataURL("image/png");
-
-    let heightLeft = imgHeight;
-    let position = 0;
-
-    pdf.addImage(imgData, "PNG", 0, position, imgWidth, imgHeight);
-
-    heightLeft -= pdfHeight;
-
-    while (heightLeft > 0) {
-      position -= pdfHeight;
-
-      pdf.addPage();
-      pdf.addImage(imgData, "PNG", 0, position, imgWidth, imgHeight);
-
-      heightLeft -= pdfHeight;
-    }
-
-    pdf.save(`${activeTab.value}-report.pdf`);
-    return;
-  }
-
-  const table = report.querySelector("table");
-
-  if (!table) return;
-
-  const csv = Array.from(table.querySelectorAll("tr"))
-    .map((row) =>
-      Array.from(row.querySelectorAll("th,td"))
-        .map((cell) => `"${cell.textContent?.trim().replace(/"/g, '""') ?? ""}"`)
-        .join(","),
-    )
-    .join("\n");
-
-  const blob = new Blob([csv], {
-    type: "text/csv;charset=utf-8;",
+async function exportReport() {
+  await exportActiveReport(activeTab.value, {
+    route: filters.route,
+    timeRange: filters.timeRange,
+    date: filters.date,
   });
-
-  const link = document.createElement("a");
-
-  link.href = URL.createObjectURL(blob);
-  link.download = `${activeTab.value}-report.csv`;
-  link.click();
-
-  URL.revokeObjectURL(link.href);
 }
 </script>

package/components/Nfc/PatrolReport/DailyReportTab.vue

@@ -3,11 +3,10 @@
     <ReportFilters
       :model-value="filters"
       :options="options"
-      :show-time-filter="false"
       @update:model-value="$emit('update:filters', $event)"
-      @export="(type) => $emit('export', type)"
+      @export="$emit('export')"
     />
-    <div class="report-export">
+
     <v-divider :thickness="1" class="border-opacity-100" />
 
     <template v-if="report">
@@ -16,7 +15,6 @@
       <SummaryReportTable :title="report.title" :rows="report.rows" />
     </template>
 
-
     <ReportEmptyState
       v-else-if="!loading && notFound"
       title="No Daily Report"
@@ -24,7 +22,6 @@
     />
 
     <ReportEmptyState v-else-if="!loading" />
-    </div>
   </div>
 </template>
 
@@ -41,23 +38,23 @@ import SummaryReportTable from "./SummaryReportTable.vue";
 
 const props = defineProps<{
   active: boolean;
-  site: string;
+  site: string; // ✅ thêm
   filters: NFCPatrolReportFilters;
   options: NFCPatrolReportFilterOptions;
 }>();
 
 defineEmits<{
   "update:filters": [value: NFCPatrolReportFilters];
-  export: [type: "pdf" | "csv"];
+  export: [];
 }>();
 
 const { report, loading, notFound, fetchReport } = useNFCPatrolDailyReport(
   props.filters,
-  props.site,
+  props.site, // ✅
 );
 
 watch(
-  () => [props.filters.route, props.filters.date, props.active],
+  () => [props.filters.route, props.filters.timeRange, props.filters.date, props.active],
   () => {
     if (props.active) {
       void fetchReport();
@@ -65,5 +62,4 @@ watch(
   },
   { immediate: true },
 );
-
 </script>

package/components/Nfc/PatrolReport/MonthlyReportTab.vue

@@ -3,30 +3,23 @@
     <ReportFilters
       :model-value="filters"
       :options="options"
-      :show-time-filter="false"
-      :show-date-filter="false"
       @update:model-value="$emit('update:filters', $event)"
-      @export="(type) => $emit('export', type)"
+      @export="$emit('export')"
     />
-    <div class="report-export">
+
     <v-divider :thickness="1" class="border-opacity-100" />
 
     <template v-if="report">
       <ReportLocationHeader :location="report.location" />
       <v-divider :thickness="1" class="border-opacity-100 mb-6" />
-
-      <MonthlyReportTable
-        :title="report.title"
-        :rows="report.rows"
-      />
+      <SummaryReportTable :title="report.title" :rows="report.rows" />
     </template>
 
     <ReportEmptyState
       v-else-if="!loading"
-      title="No Monthly Report"
-      message="No patrol log found for this route"
+      title="No Monthly Report Selected"
+      message="Please select a route, time range, and date to view the monthly report"
     />
-    </div>
   </div>
 </template>
 
@@ -35,13 +28,11 @@ import type {
   NFCPatrolReportFilterOptions,
   NFCPatrolReportFilters,
 } from "../../../types/nfc-patrol-report";
-
 import { useNFCPatrolMonthlyReport } from "../../../composables/useNFCPatrolMonthlyReport";
-
 import ReportEmptyState from "./ReportEmptyState.vue";
 import ReportFilters from "./ReportFilters.vue";
 import ReportLocationHeader from "./ReportLocationHeader.vue";
-import MonthlyReportTable from "./MonthlyReportTable.vue";
+import SummaryReportTable from "./SummaryReportTable.vue";
 
 const props = defineProps<{
   active: boolean;
@@ -52,14 +43,14 @@ const props = defineProps<{
 
 defineEmits<{
   "update:filters": [value: NFCPatrolReportFilters];
-  export: [type: "pdf" | "csv"];
+  export: [];
 }>();
 
-const { report, loading, notFound, fetchReport } =
+const { report, loading, fetchReport } =
   useNFCPatrolMonthlyReport(props.filters, props.site);
 
 watch(
-  () => [props.filters.route, props.active],
+  () => [props.filters.route, props.filters.timeRange, props.filters.date, props.active],
   () => {
     if (props.active) {
       void fetchReport();
@@ -67,5 +58,4 @@ watch(
   },
   { immediate: true },
 );
-
 </script>

package/components/Nfc/PatrolReport/PatrolReportTab.vue

@@ -4,9 +4,9 @@
       :model-value="filters"
       :options="options"
       @update:model-value="$emit('update:filters', $event)"
-      @export="(type) => $emit('export', type)"
+      @export="$emit('export')"
     />
-    <div class="report-export">
+
     <v-divider :thickness="1" class="border-opacity-100" />
 
     <template v-if="report">
@@ -30,7 +30,6 @@
     <ReportEmptyState v-else-if="!loading" />
 
     <RemarksDialog v-model="dialogRemarks" :remarks="selectedActivityRemarks" />
-    </div>
   </div>
 </template>
 
@@ -56,7 +55,7 @@ const props = defineProps<{
 
 defineEmits<{
   "update:filters": [value: NFCPatrolReportFilters];
-  export: [type: "pdf" | "csv"];
+  export: [];
 }>();
 
 const {
@@ -78,5 +77,4 @@ watch(
   },
   { immediate: true },
 );
-
 </script>

package/components/Nfc/PatrolReport/ReportFilters.vue

@@ -16,12 +16,7 @@
       />
     </v-col>
 
-    <v-col
-      v-if="showTimeFilter"
-      cols="12"
-      md="2"
-      class="px-md-2 mb-2 mb-md-0"
-    >
+    <v-col cols="12" md="2" class="px-md-2 mb-2 mb-md-0">
       <v-select
         :model-value="modelValue.timeRange"
         :items="options.timeRanges"
@@ -35,12 +30,7 @@
       />
     </v-col>
 
-    <v-col
-      v-if="showDateFilter"
-      cols="12"
-      md="2"
-      class="px-md-2 mb-2 mb-md-0"
-    >
+    <v-col cols="12" md="2" class="px-md-2 mb-2 mb-md-0">
       <v-text-field
         :model-value="modelValue.date"
         type="date"
@@ -56,31 +46,17 @@
     <v-spacer />
 
     <v-col cols="12" md="2" class="pl-md-2">
-      <v-menu>
-        <template #activator="{ props: menuProps }">
-          <v-btn
-            v-bind="menuProps"
-            variant="outlined"
-            block
-            size="large"
-            rounded="lg"
-            class="text-none"
-            prepend-icon="mdi-export"
-          >
-            Export
-          </v-btn>
-        </template>
-
-        <v-list density="compact">
-          <v-list-item @click="$emit('export', 'pdf')">
-            <v-list-item-title>PDF</v-list-item-title>
-          </v-list-item>
-
-          <v-list-item @click="$emit('export', 'csv')">
-            <v-list-item-title>CSV</v-list-item-title>
-          </v-list-item>
-        </v-list>
-      </v-menu>
+      <v-btn
+        variant="outlined"
+        block
+        size="large"
+        rounded="lg"
+        class="text-none"
+        prepend-icon="mdi-export"
+        @click="$emit('export')"
+      >
+        Export
+      </v-btn>
     </v-col>
   </v-row>
 </template>
@@ -91,22 +67,14 @@ import type {
   NFCPatrolReportFilters,
 } from "../../../types/nfc-patrol-report";
 
-const props = withDefaults(
-  defineProps<{
-    modelValue: NFCPatrolReportFilters;
-    options: NFCPatrolReportFilterOptions;
-    showTimeFilter?: boolean;
-    showDateFilter?: boolean;
-  }>(),
-  {
-    showTimeFilter: true,
-    showDateFilter: true,
-  },
-);;
+const props = defineProps<{
+  modelValue: NFCPatrolReportFilters;
+  options: NFCPatrolReportFilterOptions;
+}>();
 
 const emit = defineEmits<{
   "update:modelValue": [value: NFCPatrolReportFilters];
-  export: [type: "pdf" | "csv"];
+  export: [];
 }>();
 
 function updateFilter(key: keyof NFCPatrolReportFilters, value: unknown) {

package/components/PhotoUpload.vue

@@ -59,21 +59,6 @@
     </v-col>
   </v-row>
 
-  <v-dialog v-model="showPhotoPreview" max-width="900">
-    <v-card>
-      <v-card-actions class="pa-2 justify-end">
-        <v-btn
-          icon="mdi-close"
-          variant="text"
-          @click="showPhotoPreview = false"
-        />
-      </v-card-actions>
-      <v-card-text class="pa-2 pt-0">
-        <v-img :src="selectedPhoto" contain max-height="80vh" />
-      </v-card-text>
-    </v-card>
-  </v-dialog>
-
   <v-dialog v-model="photoOptionsDialog" max-width="420">
     <v-card>
       <v-card-title class="d-flex align-center pa-4">
@@ -211,8 +196,6 @@ const photos = ref<string[]>([...props.modelValue]);
 const photosIds = ref<string[]>([...props.photoIds]);
 const photoOptionsDialog = ref(false);
 const showCameraDialog = ref(false);
-const showPhotoPreview = ref(false);
-const selectedPhoto = ref("");
 const videoRef = ref<HTMLVideoElement | null>(null);
 const canvasRef = ref<HTMLCanvasElement | null>(null);
 const fileInputRef = ref<HTMLInputElement | null>(null);
@@ -222,8 +205,10 @@ const uploading = ref(false);
 const { addFile } = useFile();
 
 function viewPhoto(photoData: string) {
-  selectedPhoto.value = photoData;
-  showPhotoPreview.value = true;
+  const link = document.createElement("a");
+  link.href = photoData;
+  link.target = "_blank";
+  link.click();
 }
 
 watch(

package/components/ServiceProviderMain.vue

@@ -548,7 +548,7 @@
               variant="flat"
               class="text-none sp-invite-submit-btn"
               height="76"
-              :disabled="!canSubmitInvite"
+              :disabled="!validServiceProvider"
               :loading="disableServiceProvider"
               @click="submitServiceProviderInvite()"
             >
@@ -574,7 +574,6 @@ type ListTab = "active" | "pending" | "inactive";
 
 type TableRow = {
   _id: string;
-  userId: string;
   serviceProviderOrgId: string;
   companyName: string;
   email: string;
@@ -734,10 +733,11 @@ const {
   updateStatus: updateServiceProviderStatus,
   invite,
 } = useServiceProvider();
-const { getAllByUserId } = useMember();
+const { getAll: getAllMembers } = useMember();
 
 const { getVerifications, cancelUserInvitation, getVerificationByEmail } =
   useVerification();
+const { getOrgsByMembership } = useMember();
 
 const existingAccount = ref<any>(null);
 const checkingExistingAccount = ref(false);
@@ -757,10 +757,11 @@ const createInviteDialog = ref(false);
 // const loadingInviteRoles = ref(false);
 // const serviceProviderInviteRoles = ref<Array<Record<string, any>>>([]);
 
+const { getByUserType } = useMember();
+const { getOrgs } = useOrg();
 
 async function checkExistingAccount(email: string) {
   existingAccount.value = null;
-  messageServiceProvider.value = "";
 
   if (!email.trim() || emailRule(email) !== true) return;
 
@@ -769,50 +770,30 @@ async function checkExistingAccount(email: string) {
   try {
     const user = await getUserByEmail(email);
 
-if (!user?._id) return;
-
-const members = await getAllByUserId(user._id);
-
-const appMember = (members.items ?? []).find(
-  (member: any) => member.type === serviceProviderInvite.value.app
-);
-
-if (!appMember) {
-  existingAccount.value = null;
-  return;
-}
+    if (!user?._id) return;
 
-if (
-  appMember.org === props.orgId &&
-  (appMember.siteId || "") === (props.siteId || "")
-) {
-  existingAccount.value = null;
-  messageServiceProvider.value =
-    "This user is already a member of this service provider.";
-  return;
-}
+    const orgs = await getOrgs({
+      user: user._id,
+    });
 
-existingAccount.value = {
-  _id: appMember.org,
-  text: appMember.orgName,
-  org: appMember.org,
-  orgName: appMember.orgName,
-  siteId: appMember.siteId,
-  siteName: appMember.siteName,
-};
+    const matchedOrg = orgs.items?.find(
+      (org: any) => org.type === serviceProviderInvite.value.app
+    );
 
+    if (matchedOrg) {
+      existingAccount.value = {
+        _id: matchedOrg.value,
+        text: matchedOrg.text,
+        ...matchedOrg,
+      };
+    }
   } catch (error) {
     existingAccount.value = null;
   } finally {
     checkingExistingAccount.value = false;
   }
 }
-const canSubmitInvite = computed(() => {
-  return (
-    validServiceProvider.value &&
-    !messageServiceProvider.value
-  );
-});
+
 watch(
   () => serviceProviderInvite.value.email,
   async (value) => {
@@ -958,7 +939,6 @@ function formatEmailCell(value: unknown): string {
 function mapProviderRows(raw: Record<string, any>[]): TableRow[] {
   return raw.map((row) => ({
     _id: String(row._id ?? ""),
-    userId: String(row.user ?? ""),
     serviceProviderOrgId: String(row.serviceProviderOrgId ?? ""),
     companyName: row.name ?? "-",
     email: formatEmailCell(row.email),
@@ -981,7 +961,6 @@ function inviteTypeLabel(t: string) {
 function mapInviteRows(raw: Record<string, any>[]): TableRow[] {
   return raw.map((row) => ({
     _id: String(row._id ?? ""),
-    userId: String(row.user ?? ""),
     serviceProviderOrgId: String(row.metadata?.serviceProviderOrgId ?? ""),
     companyName: row.metadata?.name || "-",
     email: formatEmailCell(row.email),
@@ -1050,12 +1029,16 @@ async function openView(row: TableRow) {
 
   loadingMembers.value = true;
   try {
-    const data = await getAllByUserId(row.userId);
-
+    const data = await getAllMembers({
+      page: 1,
+      limit: 1000,
+      org: row.serviceProviderOrgId,
+      status: "active",
+    });
     serviceProviderMembers.value = (data.items ?? []).map((member: any) => ({
-      _id: member._id,
-      name: member.name || "-",
-      role: member.role || "-",
+      _id: String(member._id ?? ""),
+      name: member.name || member.fullName || member.email || "-",
+      role: member.roleName || member.role?.name || "-",
     }));
   } catch (error: any) {
     showMessage(errorConverter(error), "error");