From def5f8873f734a35845d1ab10e45f517f59d6ec9 Mon Sep 17 00:00:00 2001
From: aarizona <ar.ariz.arizona@gmail.com>
Date: Thu, 30 May 2024 10:44:23 +0300
Subject: [PATCH] columns at front

---
 back/inventory/serializers.py                         |  9 ++++++++-
 front/helpers.ts                                      |  9 +++++++++
 front/pages/organization/index.vue                    |  8 ++++----
 .../organization/p_[org_id]/i_[inv_id]/index.vue      |  5 +++--
 front/pages/organization/p_[org_id]/index.vue         | 11 +++++++----
 5 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/back/inventory/serializers.py b/back/inventory/serializers.py
index e8958ee..e1aecff 100644
--- a/back/inventory/serializers.py
+++ b/back/inventory/serializers.py
@@ -22,7 +22,14 @@ class InventorySerializer(serializers.ModelSerializer):
 
     class Meta:
         model = InventoryItem
-        fields = ["id", "partner", "partner_name", "name", "total_elements"]
+        fields = [
+            "id",
+            "name",
+            "created_at",
+            "total_elements",
+            "partner",
+            "partner_name",
+        ]
 
     def get_total_elements(self, instance):
         return Element.objects.filter(inventory=instance).count()
diff --git a/front/helpers.ts b/front/helpers.ts
index 0f620d8..4b44a81 100644
--- a/front/helpers.ts
+++ b/front/helpers.ts
@@ -18,4 +18,13 @@ export type ApiTypeExternal = {
     'НаименованиеПолное': string;
     Description: string;
     Ref_Key: string;
+}
+
+export const makeColumns = (cols: string[]) => {
+    return cols.map(el => {
+        return {
+            key: el,
+            label: el.toUpperCase()
+        }
+    })
 }
\ No newline at end of file
diff --git a/front/pages/organization/index.vue b/front/pages/organization/index.vue
index 0a2f221..7653ec5 100644
--- a/front/pages/organization/index.vue
+++ b/front/pages/organization/index.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { apiBase } from '~/helpers';
+import { apiBase, makeColumns } from '~/helpers';
 import type { ApiTypeList } from '~/helpers';
 
 const headers = new Headers();
@@ -12,9 +12,9 @@ const { data } = await useFetch<ApiTypeList>(`${apiBase}/partner/`, { headers })
         <UButton icon="i-heroicons-plus" to="/organization/new">Новая инвентаризация</UButton>
     </div>
     <div class="mb-4">
-        <UTable :rows="data?.results">
-            <template #external_id-data="{ row }">
-                <NuxtLink :to="`/organization/p_${row.id}`">{{ row.external_id }}</NuxtLink>
+        <UTable :rows="data?.results":columns="makeColumns(['id', 'external_id', 'name', 'total_inventory'])">
+            <template #name-data="{ row }">
+                <NuxtLink :to="`/organization/p_${row.id}`">{{ row.name }}</NuxtLink>
             </template>
         </UTable>
     </div>
diff --git a/front/pages/organization/p_[org_id]/i_[inv_id]/index.vue b/front/pages/organization/p_[org_id]/i_[inv_id]/index.vue
index 28bbea8..4092512 100644
--- a/front/pages/organization/p_[org_id]/i_[inv_id]/index.vue
+++ b/front/pages/organization/p_[org_id]/i_[inv_id]/index.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { apiBase } from '~/helpers';
+import { apiBase, makeColumns } from '~/helpers';
 import type { ApiTypeList } from '~/helpers';
 
 const headers = new Headers();
@@ -15,6 +15,7 @@ const { data } = await useFetch<ApiTypeList>(`${apiBase}/element?inventory_id=${
             Добавить элемент</UButton>
     </div>
     <div class="mb-4">
-        <UTable :rows="data?.results" />
+        <UTable :rows="data?.results"
+            :columns="makeColumns(['id', 'external_id', 'element_id', 'photo', 'additional_text'])" />
     </div>
 </template>
\ No newline at end of file
diff --git a/front/pages/organization/p_[org_id]/index.vue b/front/pages/organization/p_[org_id]/index.vue
index 35a6b65..77fd27a 100644
--- a/front/pages/organization/p_[org_id]/index.vue
+++ b/front/pages/organization/p_[org_id]/index.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { apiBase } from '~/helpers';
+import { apiBase, makeColumns } from '~/helpers';
 import type { ApiTypeList } from '~/helpers';
 
 const headers = new Headers();
@@ -10,11 +10,14 @@ const route = useRoute()
 const { data } = await useFetch<ApiTypeList>(`${apiBase}/inventory?partner_id=${route.params.org_id}`, { headers })
 </script>
 <template>
-    <UTable :rows="data?.results">
-        <template #id-data="{ row }">
+    <UTable :rows="data?.results" :columns="makeColumns(['id', 'name', 'created_at', 'total_elements',])">
+        <template #name-data="{ row }">
             <NuxtLink :to="`/organization/p_${route.params.org_id}/i_${row.id}`">
-                {{ row.id }}
+                {{ row.name }}
             </NuxtLink>
         </template>
+        <template #created_at-data="{ row }">
+            {{ new Date(row.created_at).toLocaleString() }}
+        </template>
     </UTable>
 </template>
\ No newline at end of file