Merge branch 'unstable' of blezz-tech/sharix-open-webapp-base into unstable

sharix_admin/forms/service.py

@@ -135,7 +135,7 @@ class ServiceInformationUpdateForm(forms.ModelForm):
             # 'ticket_status': forms.TextInput(attrs={'readonly': True}),
 
             'servicetype_id': forms.Select(attrs={'class': 'form-select'}),
-            # 'repr_id': forms.Select(attrs={'class': 'form-select'}),
+            # 'repr': forms.Select(attrs={'class': 'form-select'}),
             # 'resource_id': forms.Select(attrs={'class': 'form-select'}),
         }
 
@@ -165,7 +165,7 @@ class ServiceInformationCreateForm(forms.ModelForm):
             # 'servicetype_id': forms.CharField(max_length=255)
             # 'legal_name': forms.TextInput(label = 'Название')
             # 'servicetype_id': forms.Select(attrs={'class': 'form-select'}),
-            # 'repr_id': forms.Select(attrs={'class': 'form-select'}),
+            # 'repr': forms.Select(attrs={'class': 'form-select'}),
             # 'resource_id': forms.Select(attrs={'class': 'form-select'}),
             # 'ticket_status': forms.Select(attrs={'class': 'form-select'}),
         }
@@ -192,7 +192,7 @@ class PartnerInformationUpdateForm(forms.ModelForm):
         ]
         widgets = {
             'description': forms.Select(attrs={'class': 'form-select'}),
-            'repr_id': forms.Select(attrs={'class': 'form-select'}),
+            'repr': forms.Select(attrs={'class': 'form-select'}),
         }
 
 
@@ -218,7 +218,7 @@ class PartnerInformationCreateForm(forms.ModelForm):
 
         widgets = {
             'description': forms.Select(attrs={'class': 'form-select'}),
-            'repr_id': forms.Select(attrs={'class': 'form-select'}),
+            'repr': forms.Select(attrs={'class': 'form-select'}),
         }
 
         #     username = forms.CharField(label="Номер телефона",

sharix_admin/tables.py

@@ -87,9 +87,9 @@ class PartnersTable(tables.Table):
             "td": {"width": "20%"}
         }
     )
-    repr_id = tables.Column(
-        accessor='repr_id.full_name',
-        order_by=('repr_id.first_name', 'repr_id.last_name'),
+    repr = tables.Column(
+        accessor='repr.full_name',
+        order_by=('repr.first_name', 'repr.last_name'),
         verbose_name=_('Responsible'),
         attrs={
             "td": {"width": "15%"}

sharix_admin/templates/sharix_admin/partner.html

@@ -12,7 +12,7 @@
         <h5 class="card-title fw-bold mb-4">{{ company.legal_name }}</h5>
 
         <ul class="list-style-none">
-            <li><b>Представитель</b> {{ company.repr_id.get_full_name }}</li>
+            <li><b>Представитель</b> {{ company.repr.get_full_name }}</li>
             <li><b>Юр. адрес</b> {{ company.address }}</li>
             
             <!-- FIXME: Не настроено -->

sharix_admin/views/cooperate.py

@@ -28,8 +28,8 @@ class CooperateView(BaseView, FormView):
             # Сохраняем форму, чтобы получить объект компании
             instance = form.save(commit=False)
 
-            # Присваиваем полю repr_id идентификатор текущего пользователя
-            instance.repr_id = self.request.user
+            # Присваиваем полю repr идентификатор текущего пользователя
+            instance.repr = self.request.user
 
             # Создаем новую запись в БД, чтобы иметь доступ к ID
             instance.save()

sharix_admin/views/partner.py

@@ -27,7 +27,7 @@ class PartnerDetailView(PartnerBaseView, DetailView):
     page_title = 'О партнере'
 
     def get_object(self, queryset=None):
-        return get_object_or_404(Company, repr_id=self.request.user)
+        return get_object_or_404(Company, repr=self.request.user)
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
@@ -50,7 +50,7 @@ class PartnerEditView(PartnerBaseView, FormView):
 
     def get_form_kwargs(self):
         kwargs = super().get_form_kwargs()
-        kwargs['instance'] = get_object_or_404(Company, repr_id=self.request.user)
+        kwargs['instance'] = get_object_or_404(Company, repr=self.request.user)
         return kwargs
 
     def form_valid(self, form):
@@ -78,7 +78,7 @@ class PartnerDocUploadView(PartnerBaseView, FormView):
     success_url = reverse_lazy('partner_detail')
 
     def dispatch(self, request, *args, **kwargs):
-        self.company = get_object_or_404(Company, repr_id=self.request.user)
+        self.company = get_object_or_404(Company, repr=self.request.user)
         self.doc = Documents.objects.filter(
             user_id=self.request.user,
             company_id=self.company,
@@ -132,7 +132,7 @@ class PartnerDocView(PartnerBaseView, DetailView):
     context_object_name = 'doc'
 
     def dispatch(self, request, *args, **kwargs):
-        self.company = get_object_or_404(Company, repr_id=self.request.user)
+        self.company = get_object_or_404(Company, repr=self.request.user)
 
         self.doc = Documents.objects.filter(
             user_id=self.request.user,

sharix_admin/views/partner_info.py

@@ -83,7 +83,7 @@ class PartnerInformationUpdateView(UserPassesTestMixin, UpdateView):
         if (self.object.inn != form.initial['inn'] or
                 self.object.ogrn != form.initial['ogrn'] or
                 self.object.kpp != form.initial['kpp'] or
-                self.object.repr_id != form.initial['repr_id'] or
+                self.object.repr != form.initial['repr'] or
                 self.object.legal_name != form.initial['legal_name']):
             new_ticket = {
                 "ticket_list": 1,