@7365admin1/layer-common 1.10.9 → 1.11.0

package/components/EntryPassInformation.vue

@@ -82,13 +82,6 @@
             placeholder="Select cards..."
             return-object
           >
-            <template #item="{ props: itemProps, item }">
-              <v-list-item v-bind="itemProps">
-                <template #subtitle>
-                  <span class="text-caption text-grey">{{ item.raw.cardNo }}</span>
-                </template>
-              </v-list-item>
-            </template>
           </v-select>
         </div>
 
@@ -189,6 +182,8 @@
         </v-card>
       </v-container>
     </v-dialog>
+
+    <Snackbar v-model="snackbar" :text="snackbarText" :color="snackbarColor" />
   </div>
 </template>
 
@@ -226,7 +221,7 @@ const props = defineProps({
 
 const emit = defineEmits(["update:modelValue", "update:quantity", "update:cards"]);
 
-const { getAvailableContractorCards } = useAccessManagement();
+const { getAvailableContractorCards, generateQrVms } = useAccessManagement();
 
 const nfcEnabled = computed(() => props.settings?.data?.settings?.nfcPass ?? false);
 const printer = computed(() => props.settings?.data?.settings?.printer ?? { vendorId: null, productId: null });
@@ -250,6 +245,17 @@ const selectedCards = computed({
   },
 });
 
+// ─── Snackbar ─────────────────────────────────────────────────────
+const snackbar = ref(false);
+const snackbarText = ref("");
+const snackbarColor = ref("error");
+
+function showSnackbar(text: string, color = "error") {
+  snackbarText.value = text;
+  snackbarColor.value = color;
+  snackbar.value = true;
+}
+
 // ─── Card fetching ────────────────────────────────────────────────
 const cardItems = ref<any[]>([]);
 const cardsLoading = ref(false);
@@ -266,6 +272,27 @@ async function fetchCards(type: "NFC" | "QRCODE" = "NFC") {
     });
     cardItems.value = res?.data?.[0]?.items ?? [];
     availableCount.value = (res?.data?.[2] as any)?.count ?? cardItems.value.length;
+
+    if (type === "QRCODE" && props.settings?.data?._id && availableCount.value !== null && availableCount.value < 50) {
+      await generateQrVms({
+        site: props.settings.data.site,
+        unitId: props.unitId,
+        quantity: 50,
+      });
+      // Re-fetch to get the updated count after generation
+      const refreshed = await getAvailableContractorCards({
+        type,
+        siteId: props.siteId,
+        unitId: props.unitId,
+      });
+      cardItems.value = refreshed?.data?.[0]?.items ?? [];
+      availableCount.value = (refreshed?.data?.[2] as any)?.count ?? cardItems.value.length;
+    }
+  } catch (err: any) {
+    const msg = err?.data?.message ?? err?.message ?? String(err);
+    showSnackbar(`Entry pass service error: ${msg}`);
+    availableCount.value = null;
+    cardItems.value = [];
   } finally {
     cardsLoading.value = false;
   }
@@ -387,6 +414,9 @@ const scanFrame = async () => {
         addCard(card);
         closeCameraDialog();
         return;
+      } else if (barcode.rawValue) {
+        showSnackbar(`Card "${barcode.rawValue}" not found in available cards.`, "warning");
+        return;
       }
     }
   } catch {

package/components/FeedbackMain.vue

@@ -109,29 +109,14 @@
         >
           <template #item.createdBy="{ item, index }">
             <v-avatar
-              v-if="
-                item?.createdBy &&
-                Boolean(item?.createdBy) &&
-                typeof item?.createdBy === 'object' &&
-                Object.keys(item?.createdBy).length > 0
-              "
+              v-if="item?.createdBy?.name"
               size="small"
               :color="materialColors[index % materialColors.length]"
               class="text-subtitle-2 mr-1 mr-md-4"
             >
-              {{
-                getInitial(
-                  `${item?.createdBy?.givenName ?? ""} ${
-                    item?.createdBy?.surname ?? ""
-                  }`
-                ) || ""
-              }}
+              {{ getInitial(item?.createdBy?.name) ?? "" }}
             </v-avatar>
-            {{
-              `${item?.createdBy?.givenName ?? ""} ${
-                item?.createdBy?.surname ?? ""
-              }`
-            }}
+            {{ item?.createdBy?.name ?? "N/A" }}
           </template>
           <template #item.subject="{ item }">
             {{ item.subject || "N/A" }}
@@ -685,7 +670,7 @@ const {
 } = useUtils();
 
 const headers: Array<Record<string, any>> = [
-  { title: "Name", value: "createdByName", align: "start" },
+  { title: "Name", value: "createdBy", align: "start" },
   { title: "Subject", value: "subject", align: "start" },
   { title: "Date", value: "createdAt", align: "start" },
   { title: "App", value: "app", align: "start" },

package/components/FileInputWithList.vue

@@ -0,0 +1,304 @@
+<template>
+  <div>
+    <v-file-input
+      v-model="files"
+      :label="label"
+      accept="image/*"
+      :prepend-icon="prependIcon"
+      hide-details
+      show-size
+      chips
+      multiple
+      clearable
+      @update:modelValue="handleFileSelect"
+      @click:clear="handleClear"
+      :hide-input="hasHideInput"
+    >
+      <template v-slot:append v-if="hasLabel">
+        <slot name="append">
+          <v-btn color="primary" height="50px" @click="openCameraDialog">
+            <v-icon>mdi-camera</v-icon>
+          </v-btn>
+        </slot>
+      </template>
+    </v-file-input>
+
+    <v-row no-gutters v-if="hasLabel">
+      <v-col cols="12" class="mt-1">
+        <v-chip-group column>
+          <template v-for="(file, index) in files" :key="file.name">
+            <v-chip
+              closable
+              class="text-wrap text-caption custom-chip"
+              @click:close="removeFile(index)"
+            >
+              <span class="chip-text">{{ file.name }}</span>
+            </v-chip>
+          </template>
+        </v-chip-group>
+      </v-col>
+    </v-row>
+
+    <!-- Camera Dialog -->
+    <v-dialog
+      v-model="showCameraDialog"
+      transition="dialog-bottom-transition"
+      width="800"
+      max-width="800"
+      persistent
+      @after-enter="startCamera"
+    >
+      <v-container
+        class="d-flex justify-center"
+        max-height="90vh"
+        width="800"
+        max-width="800"
+      >
+        <v-card elevation="2" class="d-flex flex-column align-center pa-2">
+          <v-toolbar>
+            <v-card-title class="text-h5">Take a Picture</v-card-title>
+            <v-spacer></v-spacer>
+            <v-btn
+              color="grey-darken-1"
+              icon="mdi-close"
+              @click="closeCameraDialog"
+            ></v-btn>
+          </v-toolbar>
+
+          <div
+            id="reader"
+            class="d-flex justify-center align-center"
+            style="
+              position: relative;
+              width: 500px;
+              min-width: 400px;
+              height: 400px;
+            "
+          >
+            <video
+              ref="video"
+              style="flex: 1; height: 400px; min-width: 300px"
+              class="video-shutter"
+              autoplay
+            ></video>
+            <canvas
+              ref="canvas"
+              style="flex: 1; height: 400px; min-width: 300px; display: none"
+            ></canvas>
+          </div>
+
+          <v-row align="center" justify="center">
+            <v-col cols="6">
+              <v-btn color="primary" icon class="mt-4" @click="switchCamera">
+                <v-icon>mdi-camera-switch</v-icon>
+              </v-btn>
+            </v-col>
+            <v-col cols="6">
+              <v-btn
+                color="secondary"
+                icon
+                class="mt-4"
+                @click="captureImageFromCamera"
+              >
+                <v-icon large>mdi-camera-outline</v-icon>
+              </v-btn>
+            </v-col>
+          </v-row>
+        </v-card>
+      </v-container>
+    </v-dialog>
+  </div>
+</template>
+
+<script setup lang="ts">
+interface FileWithPreview {
+  name: string;
+  data: File;
+  progress: number;
+  url: string;
+}
+
+const props = defineProps({
+  label: {
+    type: String,
+    default: "Select File",
+  },
+  prependIcon: {
+    type: String,
+    default: "mdi-paperclip",
+  },
+  required: {
+    type: Boolean,
+    default: true,
+  },
+  initFiles: {
+    type: Array,
+  },
+  hasLabel: {
+    type: Boolean,
+    default: true,
+  },
+  hasHideInput: {
+    type: Boolean,
+    default: false,
+  },
+});
+
+const emit = defineEmits<{
+  (event: "onFileAttach", payload: Array<{ data: File }>): void;
+  (event: "update:files", files: FileWithPreview[]): void;
+  (event: "onFileRemoved", payload: { index: number; file: File }): void;
+  (event: "onClear"): void;
+}>();
+
+const { showUploadedFiles } = useUploadFiles();
+
+const files = ref<File[]>([]);
+const attachedFiles = ref<FileWithPreview[]>([]);
+const showCameraDialog = ref(false);
+const video = ref<HTMLVideoElement | null>(null);
+const canvas = ref<HTMLCanvasElement | null>(null);
+const cameraFacingMode = ref<"environment" | "user">("environment");
+
+const message = ref("");
+const messageColor = ref("");
+const messageSnackbar = ref(false);
+
+function showMessage(msg: string, color: string) {
+  message.value = msg;
+  messageColor.value = color;
+  messageSnackbar.value = true;
+}
+
+watchEffect(() => {
+  if (Array.isArray(props.initFiles) && props.initFiles.length > 0) {
+    files.value = props.initFiles.filter((file) => file && file.name); // Ensure valid files
+  }
+});
+const handleFileSelect = async () => {
+  if (files.value && files.value.length > 0) {
+    const newFiles = files.value.map((file: File) => ({
+      name: file.name,
+      data: file,
+      progress: 0,
+      url: URL.createObjectURL(file),
+    }));
+
+    //   attachedFiles.value = [...newFiles];
+    showUploadedFiles(newFiles);
+
+    emit("update:files", newFiles);
+  } else {
+    files.value = [...(props.initFiles as typeof files.value)];
+  }
+};
+
+const handleClear = () => {
+  files.value = [];
+  emit("onClear");
+};
+
+const openCameraDialog = () => {
+  showCameraDialog.value = true;
+};
+
+const closeCameraDialog = () => {
+  showCameraDialog.value = false;
+  stopCamera();
+};
+
+const startCamera = async () => {
+  try {
+    const constraints = {
+      video: {
+        facingMode: cameraFacingMode.value,
+      },
+    };
+
+    const stream = await navigator.mediaDevices.getUserMedia(constraints);
+    if (video.value) {
+      video.value.srcObject = stream;
+      video.value.play();
+    }
+  } catch (error: any) {
+    showMessage(`Error accessing camera: ${error.message}`, "error");
+    closeCameraDialog();
+  }
+};
+
+const stopCamera = () => {
+  if (video.value) {
+    const stream = video.value.srcObject as MediaStream;
+    if (stream) {
+      stream.getTracks().forEach((track) => track.stop());
+    }
+  }
+};
+
+const switchCamera = async () => {
+  await stopCamera();
+  cameraFacingMode.value =
+    cameraFacingMode.value === "environment" ? "user" : "environment";
+  showMessage(
+    `Switched to ${
+      cameraFacingMode.value === "environment" ? "Back Camera" : "Front Camera"
+    }`,
+    "error"
+  );
+  startCamera();
+};
+
+const captureImageFromCamera = () => {
+  if (!video.value || !canvas.value) return;
+
+  const context = canvas.value.getContext("2d");
+  if (!context) return;
+
+  // Set canvas dimensions to match video
+  canvas.value.width = video.value.videoWidth;
+  canvas.value.height = video.value.videoHeight;
+
+  // Capture the frame
+  context.drawImage(video.value, 0, 0, canvas.value.width, canvas.value.height);
+
+  // Convert to file
+  canvas.value.toBlob((blob) => {
+    if (!blob) return;
+
+    const file = new File([blob], `camera-capture-${Date.now()}.png`, {
+      type: "image/png",
+    });
+
+    files.value = [file];
+    handleFileSelect();
+    closeCameraDialog();
+  }, "image/png");
+};
+
+const removeFile = (index) => {
+  const removedFile = files.value[index];
+  files.value = files.value.filter((_, i) => i !== index);
+  emit("onFileRemoved", { index, file: removedFile }); // Emit when a file is removed
+  // emit("onFilesUpdated", files.value); // Emit updated files list
+};
+
+// Cleanup
+onUnmounted(() => {
+  stopCamera();
+});
+</script>
+
+<style scoped>
+.custom-chip {
+  max-width: 100%;
+  height: auto !important;
+  white-space: normal;
+  padding: 3px 20px;
+}
+
+.chip-text {
+  word-break: break-word;
+  white-space: normal;
+  line-height: 1.2;
+}
+</style>