Эх сурвалжийг харах

improvements for activation

ShariX Developer 3 долоо хоног өмнө
parent
commit
b31441e693

+ 4 - 0
docs/database/template.py

@@ -207,5 +207,9 @@ class Template():
     tax_method = (
         "Система налогооблажения определяется по словарю."
     )
+
+    order = (
+        "Заказ"
+    )
     
 

+ 4 - 0
docs/verbose_names/template.py

@@ -197,5 +197,9 @@ class Template():
     tax_method = (
         "Система налогооблажения"
     )
+
+    order = (
+        "Заказ"
+    )
     
 

+ 11 - 1
models/client.py

@@ -10,6 +10,8 @@ from core.settings_vars import METASERVICE_ID
 
 from dbsynce.lib import dicts
 
+import core.settings_vars as sv
+
 class Client(models.Model):
     """
     Client - это таблица с клиентами. Клиент/пользователь/аккаунт 
@@ -27,7 +29,7 @@ class Client(models.Model):
     requirements = models.CharField(
         max_length=50,
         #TODO ADD CORRECT DEFAULT!
-        default="DSMPUB",
+        default=sv.MIN_CLIENT_REQUIREMENTS,
         verbose_name = VerboseName.requirements,
         help_text=HelpTexts.requirements,
     )
@@ -69,6 +71,14 @@ class Client(models.Model):
         help_text=HelpTexts.user,
     )
 
+    def deactivate(self):
+        self.status = "1"
+        self.save()
+
+    def activate(self):
+        self.status = "0"
+        self.save()
+
     class Meta:
         db_table = "client"
         verbose_name = "Клиента"

+ 7 - 2
models/company.py

@@ -8,6 +8,7 @@ from dbsynce.docs.verbose_names.company import Company as VerboseName
 from core.settings_vars import METASERVICE_ID
 
 from dbsynce.lib import dicts
+import core.settings_vars as sv
 
 class Company(models.Model):
     """
@@ -30,7 +31,7 @@ class Company(models.Model):
     requirements = models.CharField(
 #        "Ограничения",
         max_length=50,
-        default="DS01y04y05y06y07yMPUCS13MPUB",
+        default=sv.MIN_COMPANY_REQUIREMENTS,
         verbose_name = VerboseName.requirements,
         help_text=HelpTexts.requirements,
     )
@@ -135,7 +136,11 @@ class Company(models.Model):
     )
 
     def deactivate(self):
-        self.status = "deactivated"
+        self.status = "1"
+        self.save()
+
+    def activate(self):
+        self.status = "0"
         self.save()
 
     class Meta:

+ 8 - 0
models/permissions.py

@@ -97,6 +97,14 @@ class Permissions(models.Model):
         help_text=HelpTexts.checked_by,
     )
 
+    def deactivate(self):
+        self.status = "1"
+        self.save()
+
+    def activate(self):
+        self.status = "0"
+        self.save()
+
     class Meta:
         db_table = "permissions"
         verbose_name = "Разрешение"

+ 10 - 1
models/provider.py

@@ -10,6 +10,7 @@ from dbsynce.docs.verbose_names.provider import Provider as VerboseName
 from core.settings_vars import METASERVICE_ID
 
 from dbsynce.lib import dicts
+import core.settings_vars as sv
 
 class Provider(models.Model):
     """
@@ -37,7 +38,7 @@ class Provider(models.Model):
     requirements = models.CharField(
         max_length=50,
         #TODO ADD CORRECT DEFAULT!
-        default="DSMPUB",
+        default=sv.MIN_PROVIDER_REQUIREMENTS,
         verbose_name = VerboseName.requirements,
         help_text=HelpTexts.requirements,
     )
@@ -115,6 +116,14 @@ class Provider(models.Model):
         help_text=HelpTexts.resource,
     )
 
+    def deactivate(self):
+        self.status = "1"
+        self.save()
+
+    def activate(self):
+        self.status = "0"
+        self.save()
+
     class Meta:
         db_table = "provider"
         verbose_name = "Поставщик"

+ 10 - 1
models/relationship.py

@@ -8,6 +8,7 @@ from dbsynce.docs.verbose_names.relationship import Relationship as VerboseName
 from core.settings_vars import METASERVICE_ID
 
 from dbsynce.lib import dicts
+import core.settings_vars as sv
 
 class Relationship(models.Model):
     """
@@ -32,7 +33,7 @@ class Relationship(models.Model):
     requirements = models.CharField(
         max_length=50,
         #TODO ADD CORRECT DEFAULT!
-        default="DSMPUB",
+        default=sv.MIN_RELATIONSHIP_REQUIREMENTS,
         verbose_name = VerboseName.requirements,
         help_text=HelpTexts.requirements,
     )
@@ -82,6 +83,14 @@ class Relationship(models.Model):
         help_text=HelpTexts.ticket_status,
     )
 
+    def deactivate(self):
+        self.status = "1"
+        self.save()
+
+    def activate(self):
+        self.status = "0"
+        self.save()
+
     class Meta:
         db_table = "relationship"
         verbose_name = "Связь (Договорное отношение)"

+ 10 - 1
models/resource.py

@@ -8,6 +8,7 @@ from dbsynce.docs.verbose_names.resource import Resource as VerboseName
 from core.settings_vars import METASERVICE_ID
 
 from dbsynce.lib import dicts
+import core.settings_vars as sv
 
 class Resource(models.Model):
     """
@@ -29,7 +30,7 @@ class Resource(models.Model):
     )
     requirements = models.CharField(
         max_length=50,
-        default="DS01y04y05y06y07yMPUCS13MPUB",
+        default=sv.MIN_RESOURCE_REQUIREMENTS,
         verbose_name = VerboseName.requirements,
         help_text=HelpTexts.requirements,
     )
@@ -75,6 +76,14 @@ class Resource(models.Model):
         help_text=HelpTexts.user,
     )
 
+    def deactivate(self):
+        self.status = "1"
+        self.save()
+
+    def activate(self):
+        self.status = "0"
+        self.save()
+
     class Meta:
         db_table = "resource"
         verbose_name = "Ресурс"

+ 10 - 1
models/service.py

@@ -10,6 +10,7 @@ from dbsynce.docs.verbose_names.service import Service as VerboseName
 from core.settings_vars import METASERVICE_ID
 
 from dbsynce.lib import dicts
+import core.settings_vars as sv
 
 class Service(models.Model):
     """
@@ -34,7 +35,7 @@ class Service(models.Model):
     requirements = models.CharField(
         max_length=50,
         #TODO fix default value!
-        default="DSMPU",
+        default=sv.MIN_SERVICE_REQUIREMENTS,
         verbose_name = VerboseName.requirements,
         help_text=HelpTexts.requirements,
     )
@@ -152,6 +153,14 @@ class Service(models.Model):
         help_text=HelpTexts.service_category,
     )
 
+    def deactivate(self):
+        self.status = "1"
+        self.save()
+
+    def activate(self):
+        self.status = "0"
+        self.save()
+
     class Meta:
         db_table = "service"
         verbose_name = "Услуга"

+ 10 - 1
models/service_category.py

@@ -8,6 +8,7 @@ from dbsynce.docs.verbose_names.service_category import ServiceCategory as Verbo
 from core.settings_vars import METASERVICE_ID
 
 from dbsynce.lib import dicts
+import core.settings_vars as sv
 
 class ServiceCategory(models.Model):
     """
@@ -30,7 +31,7 @@ class ServiceCategory(models.Model):
     requirements = models.CharField(
         max_length=50,
         #TODO fix default value!
-        default="DSMPU",
+        default=sv.MIN_SERVICE_CATEGORY_REQUIREMENTS,
         verbose_name = VerboseName.requirements,
         help_text=HelpTexts.requirements,
     )
@@ -93,6 +94,14 @@ class ServiceCategory(models.Model):
         help_text=HelpTexts.ticket_status,
     )
 
+    def deactivate(self):
+        self.status = "1"
+        self.save()
+
+    def activate(self):
+        self.status = "0"
+        self.save()
+
     class Meta:
         db_table = "service_category"
         verbose_name = "Тип услуги"