Merge pull request #3165 from moodpulse/uuid_price_and_company

UUID-ы в прайсы, компании, факторы

api/views.py

@@ -2949,7 +2949,7 @@ def update_company(request):
             company_data.pk,
             130002,
             request.user.doctorprofile,
-            {"old_company_data": old_company_data, "new_company_data": new_company_data},
+            {"old_company_data": str(old_company_data), "new_company_data": str(new_company_data)},
         )
         return JsonResponse({"ok": True})
     else:
@@ -3023,6 +3023,7 @@ def get_harmful_factors(request):
             "title": factor.title,
             "description": factor.description,
             "template_id": factor.template_id,
+            "cpp_key": factor.cpp_key,
         }
         for factor in HarmfulFactor.objects.all().order_by("title")
     ]

clients/management/commands/import_harmful_factors.py

@@ -0,0 +1,42 @@
+from django.core.management.base import BaseCommand
+from openpyxl import load_workbook
+
+from clients.models import HarmfulFactor
+
+
+class Command(BaseCommand):
+    def add_arguments(self, parser):
+        parser.add_argument('path', type=str)
+
+    def handle(self, *args, **kwargs):
+        """
+        :param path - xlsx файл со столбцами:
+        Идентификатор
+        Код
+        Наименование
+        """
+
+        fp = kwargs["path"]
+        self.stdout.write("Path: " + fp)
+        wb = load_workbook(filename=fp)
+        ws = wb[wb.sheetnames[0]]
+        starts = False
+        cpp_key, title, description = '', '', ''
+        for row in ws.rows:
+            cells = [str(x.value) for x in row]
+            if not starts:
+                if "Идентификатор" in cells:
+                    cpp_key = cells.index("Идентификатор")
+                    title = cells.index("Код")
+                    description = cells.index("Наименование")
+                    starts = True
+            else:
+                harmful_factor = HarmfulFactor.objects.filter(title=cells[title]).first()
+                if harmful_factor:
+                    harmful_factor.cpp_key = cells[cpp_key]
+                    harmful_factor.save()
+                    self.stdout.write(f'Фактор {harmful_factor.title} обновлён, UUID={harmful_factor.cpp_key}')
+                else:
+                    new_harmful_factor = HarmfulFactor(title=cells[title], description=cells[description], cpp_key=cells[cpp_key])
+                    new_harmful_factor.save()
+                    self.stdout.write(f'Фактор {new_harmful_factor.title} создан, UUID={new_harmful_factor.cpp_key}')

clients/models.py

@@ -1041,8 +1041,9 @@ class Meta:
 
 class HarmfulFactor(models.Model):
     title = models.CharField(max_length=255, help_text='Наименование')
-    description = models.CharField(max_length=255, help_text='Описание', blank=True, default=None, null=True)
+    description = models.CharField(max_length=1024, help_text='Описание', blank=True, default=None, null=True)
     template = models.ForeignKey(AssignmentTemplates, db_index=True, null=True, blank=True, default=None, on_delete=models.CASCADE)
+    cpp_key = models.UUIDField(null=True, blank=True, editable=False, help_text="UUID, с справочника", db_index=True)
 
     class Meta:
         verbose_name = 'Фактор вредности'

contracts/models.py

@@ -1,5 +1,6 @@
 import calendar
 import datetime
+import uuid
 from decimal import Decimal
 
 from django.db import models
@@ -33,6 +34,7 @@ class PriceName(models.Model):
     external_performer = models.BooleanField(default=False, blank=True, help_text='Прайс внешний исполнитель', db_index=True)
     subcontract = models.BooleanField(default=False, blank=True, help_text='Прайс субподряд', db_index=True)
     symbol_code = models.CharField(max_length=55, unique=True, blank=True, null=True, default=None, help_text='Код прайса', db_index=True)
+    uuid = models.UUIDField(default=uuid.uuid4, editable=False, help_text="UUID, генерируется автоматически", db_index=True)
 
     def __str__(self):
         return "{}".format(self.title)
@@ -63,7 +65,7 @@ def as_json(price):
         else:
             company_title = ""
             company_id = ""
-        json_data = {"id": price.id, "title": price.title, "start": price.date_start, "end": price.date_end, "company": company_id, "companyTitle": company_title}
+        json_data = {"id": price.id, "title": price.title, "start": price.date_start, "end": price.date_end, "company": company_id, "companyTitle": company_title, "uuid": str(price.uuid)}
         return json_data
 
     @staticmethod
@@ -146,6 +148,7 @@ class Company(models.Model):
     bik = models.CharField(max_length=9, default='', blank=True)
     contract = models.ForeignKey(Contract, blank=True, null=True, db_index=True, on_delete=models.CASCADE)
     email = models.CharField(max_length=128, blank=True, default='', help_text="email")
+    uuid = models.UUIDField(default=uuid.uuid4, editable=False, help_text="UUID, генерируется автоматически", db_index=True)
 
     def __str__(self):
         return "{}".format(self.title)
@@ -186,6 +189,7 @@ def as_json(company):
             "kpp": company.kpp,
             "bik": company.bik,
             "contractId": company.contract_id,
+            "uuid": company.uuid,
         }
         return json_data
 

l2-frontend/src/construct/ConstructCompany.vue

@@ -9,7 +9,7 @@
           v-if="!isNewCompany"
           class="text-center"
         >
-          {{ originShortTitle }}
+          {{ originShortTitle }} (<strong>UUID:</strong> {{ company_uuid }})
         </h6>
         <div class="margin-right margin-left">
           <FormulateForm
@@ -443,6 +443,7 @@ export default {
       excludedResearches: [],
       researches: [],
       month: false,
+      company_uuid: '',
     };
   },
   computed: {
@@ -511,6 +512,7 @@ export default {
       await this.getDepartments(company.pk);
       this.editorCompany = this.currentCompany.data;
       this.originShortTitle = this.editorCompany.shortTitle;
+      this.company_uuid = this.editorCompany.uuid;
     },
     clearEditCompany() {
       this.getContracts();

l2-frontend/src/construct/ConstructHarmfulFactor.vue

@@ -25,6 +25,7 @@
           <colgroup>
             <col width="150">
             <col>
+            <col width="285">
             <col width="200">
             <col width="99">
           </colgroup>
@@ -40,6 +41,9 @@
               >
                 <strong>Описание</strong>
               </th>
+              <th class="text-center">
+                <strong>UUID</strong>
+              </th>
               <th
                 class="text-center"
               >
@@ -76,6 +80,9 @@
                 class="form-control padding-left"
               >
             </td>
+            <td class="table-row padding-left">
+              {{ factor.cpp_key }}
+            </td>
             <td>
               <Treeselect
                 v-model="factor.template_id"

l2-frontend/src/construct/ConstructPrice.vue

@@ -1,8 +1,5 @@
 <template>
-  <div>
-    <h4>
-      Прайс
-    </h4>
+  <div class="negative-margin-top">
     <div class="radio-button-object">
       <RadioField
         v-model="searchTypesObject"
@@ -115,6 +112,20 @@
             </div>
           </td>
         </tr>
+        <tr
+          v-if="priceIsSelected"
+          class="height-row border"
+        >
+          <td class="border text-center">
+            <strong>UUID</strong>
+          </td>
+          <td
+            class=" padding-left"
+            :colspan="priceIsActive ? 4 : 3"
+          >
+            {{ priceData.uuid }}
+          </td>
+        </tr>
       </table>
     </div>
     <span v-if="priceIsSelected">
@@ -256,6 +267,7 @@
           <col>
           <col width="100">
           <col width="100">
+          <col width="100">
         </colgroup>
         <tr>
           <td class="border">
@@ -371,6 +383,7 @@ export default {
           start: '',
           end: '',
           company: null,
+          uuid: '',
         };
         this.activeStatus.ok = true;
       } else {
@@ -572,9 +585,8 @@ export default {
   width: 50%;
   margin-left: auto;
   margin-right: auto;
-  margin-top: 2%;
-  margin-bottom: 2%;
-  alignment: center;
+  margin-top: 10px;
+  margin-bottom: 10px;
 }
 
 ::v-deep .form-control {
@@ -590,7 +602,7 @@ export default {
   table-layout: fixed;
 }
 .margin-bottom {
-  margin-bottom: 20px;
+  margin-bottom: 10px;
 }
 .border {
   border: 1px solid #ddd;
@@ -603,11 +615,11 @@ export default {
   border: 0;
 }
 .edit-price {
-  margin: 20px 0;
+  margin: 10px 0;
 }
 .scroll {
   min-height: 106px;
-  max-height: calc(100vh - 600px);
+  max-height: calc(100vh - 463px);
   overflow-y: auto;
 }
 .sticky {
@@ -662,4 +674,10 @@ export default {
 .r-padding {
   padding-right: 10px;
 }
+.negative-margin-top {
+  margin-top: -20px;
+}
+.height-row {
+  height: 37px;
+}
 </style>