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

sharix_admin/forms/service.py

@@ -18,7 +18,7 @@ class ServiceTariffUpdateForm(forms.ModelForm):
             'status',
             'ticket_status',
             'servicetype',
-            'resource_id',
+            'resource',
             'requirements',
             'price_alg',
             'price_km',
@@ -33,7 +33,7 @@ class ServiceTariffUpdateForm(forms.ModelForm):
             'ticket_status': forms.TextInput(attrs={'readonly': True}),
 
             'servicetype': forms.Select(attrs={'class': 'form-select'}),
-            'resource_id': forms.Select(attrs={'class': 'form-select'}),
+            'resource': forms.Select(attrs={'class': 'form-select'}),
         }
 
 
@@ -52,7 +52,7 @@ class ServiceTariffCreateForm(forms.ModelForm):
 
         widgets = {
             'servicetype': forms.Select(attrs={'class': 'form-select'}),
-            'resource_id': forms.Select(attrs={'class': 'form-select'}),
+            'resource': forms.Select(attrs={'class': 'form-select'}),
             'ticket_status': forms.TextInput(attrs={'readonly': True}),
         }
 
@@ -136,7 +136,7 @@ class ServiceInformationUpdateForm(forms.ModelForm):
 
             'servicetype': forms.Select(attrs={'class': 'form-select'}),
             # 'repr': forms.Select(attrs={'class': 'form-select'}),
-            # 'resource_id': forms.Select(attrs={'class': 'form-select'}),
+            # 'resource': forms.Select(attrs={'class': 'form-select'}),
         }
 
 
@@ -158,7 +158,7 @@ class ServiceInformationCreateForm(forms.ModelForm):
             "is_visible",
             "ticket_status",
             "id_metaservice",
-            "resource_id"
+            "resource"
         ]
 
         widgets = {
@@ -166,7 +166,7 @@ class ServiceInformationCreateForm(forms.ModelForm):
             # 'legal_name': forms.TextInput(label = 'Название')
             # 'servicetype': forms.Select(attrs={'class': 'form-select'}),
             # 'repr': forms.Select(attrs={'class': 'form-select'}),
-            # 'resource_id': forms.Select(attrs={'class': 'form-select'}),
+            # 'resource': forms.Select(attrs={'class': 'form-select'}),
             # 'ticket_status': forms.Select(attrs={'class': 'form-select'}),
         }
 

sharix_admin/tables.py

@@ -242,7 +242,7 @@ class ProviderTable(tables.Table):
         }
         exclude = (
             'type',
-            'company_id',
+            'company',
             'id_metaservice',
             'requirements',
             'ticket_status',
@@ -304,7 +304,7 @@ class ServiceTariffTable(tables.Table):
             "class": "table table-layout-fixed"
         }
         exclude = (
-            'resource_id',
+            'resource',
             'price_alg',
             'price_min',
             'price_amount',
@@ -442,7 +442,7 @@ class ServiceTable(tables.Table):
             "class": "table table-layout-fixed"
         }
         exclude = (
-            'resource_id',
+            'resource',
             'requirements',
             'id_metaservice',
             'price_alg',

sharix_admin/templates/sharix_admin/partner/doc.html

@@ -10,7 +10,7 @@
     <li><b>Статус:</b> {{ doc.status }}</li>
     <li><b>Дата проверки:</b> {{ doc.check_date }}</li>
     <li><b>Срок окончания действия документа:</b> {{ doc.expire_date }}</li>
-    <li><b>Компания:</b> {{ doc.company_id.legal_name }}</li>
+    <li><b>Компания:</b> {{ doc.company.legal_name }}</li>
 </ul>
 
 <h5 class="my-3">Файлы</h6>

sharix_admin/templates/sharix_admin/resource.html

@@ -11,13 +11,13 @@
     <script>
       // Запрос на изменения статуса ресурса
       $('.status-toggle').change(function() {
-        var resource_id = $(this).data('resource-id');
+        var resource = $(this).data('resource-id');
         var new_status = $(this).prop('checked') ? 'active' : 'deactivated';
         $.ajax({
           url: '{% url "resource/change_status" %}',
           type: 'POST',
           data: {
-            'resource_id': resource_id,
+            'resource': resource,
             'new_status': new_status,
             'csrfmiddlewaretoken': '{{ csrf_token }}'
           },

sharix_admin/views/cooperate.py

@@ -64,7 +64,7 @@ class CooperateView(BaseView, FormView):
             doc_codes = parse_requirements(instance.requirements)
             Documents.objects.bulk_create([
                 Documents(
-                    company_id=instance,
+                    company=instance,
                     user_id=self.request.user,
                     doc_type=doc_code
                 ) for doc_code in doc_codes

sharix_admin/views/partner.py

@@ -34,7 +34,7 @@ class PartnerDetailView(PartnerBaseView, DetailView):
 
         docs = Documents.objects.filter(
             user_id=self.request.user,
-            company_id=self.object
+            company=self.object
         ).prefetch_related('files').order_by('doc_type')
 
         context.update({"docs": docs})
@@ -81,7 +81,7 @@ class PartnerDocUploadView(PartnerBaseView, FormView):
         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,
+            company=self.company,
             doc_type=kwargs.get('doc_code')
         ).first()
 
@@ -136,7 +136,7 @@ class PartnerDocView(PartnerBaseView, DetailView):
 
         self.doc = Documents.objects.filter(
             user_id=self.request.user,
-            company_id=self.company,
+            company=self.company,
             doc_type=kwargs.get('doc_code')
         ).first()
 

sharix_admin/views/resource.py

@@ -33,10 +33,10 @@ class ResourceListView(UserPassesTestMixin, SingleTableView):
 @group_required('PARTNER-ADMIN')
 def change_resource_status(request):
     if request.method == 'POST':
-        resource_id = request.POST.get('resource_id')
+        resource = request.POST.get('resource')
         new_status = request.POST.get('new_status')
 
-        resource = Resource.objects.get(pk=resource_id)
+        resource = Resource.objects.get(pk=resource)
         resource.status = new_status
         resource.save()
         return JsonResponse({'status': 'success'})