fix(admin-borrow): resolve error in api

Author: ngyngcphu

components/app/ReceiptAdmin/ReturnTable/column.ts

@@ -7,6 +7,19 @@ const statusMap = {
   on_time: 'Đúng hạn',
 };
 
+const deviceStatusMap = {
+  healthy: 'Không hư hỏng',
+  broken: 'Hư hỏng',
+  assessing: 'Đang đánh giá',
+  lost: 'Mất',
+};
+
+const deviceStatusColorMap = {
+  healthy: 'bg-green-100 text-green-800',
+  broken: 'bg-red-100 text-red-800',
+  assessing: 'bg-yellow-100 text-yellow-800',
+  lost: 'bg-gray-100 text-gray-800',
+};
 export const columns: AugmentedColumnDef<ReturnedReceiptDevice>[] = [
   {
     id: 'name',
@@ -32,17 +45,6 @@ export const columns: AugmentedColumnDef<ReturnedReceiptDevice>[] = [
       ),
     enableSorting: true,
   },
-  {
-    id: 'quantity',
-    title: 'Số lượng',
-    cell: ({ row }) =>
-      h(
-        'span',
-        { class: 'text-slate-500 text-sm font-normal leading-tight' },
-        row.original.quantity,
-      ),
-    enableSorting: true,
-  },
   {
     id: 'borrowedPlace',
     title: 'Nơi mượn',
@@ -120,4 +122,29 @@ export const columns: AugmentedColumnDef<ReturnedReceiptDevice>[] = [
       ),
     enableSorting: true,
   },
+  {
+    id: 'deviceStatus',
+    title: 'Trạng thái thiết bị',
+    cell: ({ row }) =>
+      h(
+        'span',
+        {
+          class: `inline-flex items-center rounded-full px-2.5 py-0.5 text-xs font-medium ${
+            deviceStatusColorMap[row.original.deviceStatus]
+          }`,
+        },
+        deviceStatusMap[row.original.deviceStatus],
+      ),
+    enableSorting: true,
+  },
+  {
+    id: 'note',
+    title: 'Ghi chú',
+    cell: ({ row }) =>
+      h(
+        'span',
+        { class: 'text-slate-500 text-sm font-normal leading-tight' },
+        row.original.note,
+      ),
+  },
 ];

components/app/ReceiptAdmin/ReturnTable/schema.ts

@@ -12,6 +12,13 @@ export const ReturnedReceiptDeviceSchema = Type.Object({
   expectedReturnedAt: Type.Date(),
   returnedAt: Type.Date(),
   status: Type.Union([Type.Literal('on_time'), Type.Literal('late')]),
+  deviceStatus: Type.Union([
+    Type.Literal('healthy'),
+    Type.Literal('broken'),
+    Type.Literal('assessing'),
+    Type.Literal('lost'),
+  ]),
+  note: Type.Optional(Type.String()),
 });
 
 export type ReturnedReceiptDevice = Static<typeof ReturnedReceiptDeviceSchema>;

lib/utils.ts

@@ -21,14 +21,24 @@ export function formatDate (value: string, isRelative: boolean = true): string {
   const now = new Date();
 
   if (isRelative) {
+    if (date > now) {
+      return date.toLocaleDateString('en-US', {
+        month: 'short',
+        day: '2-digit', 
+        year: 'numeric'
+      });
+    }
+
     const diffInMinutes = Math.floor(
       (now.getTime() - date.getTime()) / (1000 * 60),
     );
     const diffInHours = Math.floor(diffInMinutes / 60);
     const diffInDays = Math.floor(diffInHours / 24);
 
-    if (diffInMinutes < 60) {
-      return 'a minute ago';
+    if (diffInMinutes < 5) {
+      return 'just now';
+    } else if (diffInMinutes < 60) {
+      return `${diffInMinutes} minutes ago`;
     } else if (diffInHours < 24) {
       return `${diffInHours} hours ago`;
     } else if (diffInDays < 30) {

nuxt.config.ts

@@ -14,6 +14,9 @@ export default defineNuxtConfig({
     'shadcn-nuxt',
     '@sidebase/nuxt-auth',
   ],
+  build: { 
+    transpile: ['vue-toastification'] 
+  },
   nitro: {
     preset: 'bun',
   },
@@ -34,7 +37,7 @@ export default defineNuxtConfig({
     },
   },
   eslint: {},
-  css: ['~/assets/css/fonts.css', '~/assets/css/main.css'],
+  css: ['~/assets/css/fonts.css', '~/assets/css/main.css', 'vue-toastification/dist/index.css'],
   postcss: {
     plugins: {
       tailwindcss: {},