From 5404f44fbca6cdb42d4968f51fea8af6669c7dfe Mon Sep 17 00:00:00 2001
From: Kseninia Mikhaylova <k.mikhailova@svs-tech.pro>
Date: Thu, 22 Aug 2024 16:28:15 +0300
Subject: [PATCH] update values in loop

---
 back/tgbot/serializers.py  | 2 +-
 front/pages/stat/index.vue | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/back/tgbot/serializers.py b/back/tgbot/serializers.py
index cb360f8..8351ab1 100644
--- a/back/tgbot/serializers.py
+++ b/back/tgbot/serializers.py
@@ -44,7 +44,7 @@ class TgStatItemSerializer(serializers.Serializer):
             return None
         if isinstance(obj.get("location__parent"), list):
             location_parent_ids = obj.get("location__parent")
-            queryset = Territory.objects.filter(id__in=obj.get("location__parent"))
+            queryset = Territory.objects.filter(id__in=obj.get("location__parent")).values('name')
             for q in queryset:
                 q.count = location_parent_ids.count(q.id)
             serializer = TerritorySerializer(queryset, many=True)
diff --git a/front/pages/stat/index.vue b/front/pages/stat/index.vue
index f0fdb22..816753c 100644
--- a/front/pages/stat/index.vue
+++ b/front/pages/stat/index.vue
@@ -4,7 +4,7 @@ const data = ref([] as RootObject[])
 data.value = await apiCall<RootObject[]>(`stat/?type=location`, 'get')
 
 interface RootObject {
-    location: Location;
+    location: Location | Location[];
     inv_count: number;
     tmc: Tmc[];
 }
@@ -42,7 +42,10 @@ const getData = async () => {
         </UCard>
         <UCard v-for="item in data" class="col-span-6" v-if="data && !isOrg">
             <template #header>
-                {{ item.tmc[0].tmc__name }} <UBadge>{{ item.tmc[0].count }}</UBadge>
+                <template v-for="el in item.tmc">
+                    {{ el.tmc__name }}, всего {{ el.count }}
+                </template>
+                <UBadge>{{ item.inv_count }}</UBadge>
             </template>
             <UTable :rows="item.location" />
         </UCard>