full help texts and verbose names in models

models/client.py

@@ -4,6 +4,7 @@ from django.db import models
 from tickets.models import Ticket
 
 from dbsynce.docs.database.client import Client as HelpTexts
+from dbsynce.docs.verbose_names.client import Client as VerboseName
 
 from core.settings_vars import METASERVICE_ID
 
@@ -18,7 +19,8 @@ class Client(models.Model):
     # ID METASERVICE
     id_metaservice = models.PositiveIntegerField(
         default=METASERVICE_ID,
-        help_text=HelpTexts.id_metaservice
+        verbose_name = VerboseNames.id_metaservice,
+        help_text=HelpTexts.id_metaservice,
     )
 
     # DATA
@@ -26,13 +28,15 @@ class Client(models.Model):
         max_length=50,
         #TODO ADD CORRECT DEFAULT!
         default="DSMPUB",
-        help_text=HelpTexts.requirements
+        verbose_name = VerboseNames.requirements,
+        help_text=HelpTexts.requirements,
     )
     status = models.CharField(
         max_length=1,
         default="1",
         choices = list(dicts.activity_status_by_code.items()),
-        help_text=HelpTexts.status
+        verbose_name = VerboseNames.status,
+        help_text=HelpTexts.status,
     )
 
     # OTHER
@@ -40,25 +44,29 @@ class Client(models.Model):
         max_length=1,
         default="f",
         choices = list(dicts.is_global_by_code.items()),
-        help_text=HelpTexts.is_global
+        verbose_name = VerboseNames.is_global,
+        help_text=HelpTexts.is_global,
     )
     is_visible = models.CharField(
         max_length=1,
         default="f",
         choices = list(dicts.is_visible_by_code.items()),
-        help_text=HelpTexts.is_visible
+        verbose_name = VerboseNames.is_visible,
+        help_text=HelpTexts.is_visible,
     )
 
     # FK
     ticket_status = models.ForeignKey(
         Ticket,
         on_delete=models.DO_NOTHING,
-        help_text=HelpTexts.ticket_status
+        verbose_name = VerboseNames.ticket_status,
+        help_text=HelpTexts.ticket_status,
     )
     user = models.ForeignKey(
         get_user_model(),
         on_delete=models.DO_NOTHING,
-        help_text=HelpTexts.user
+        verbose_name = VerboseNames.user,
+        help_text=HelpTexts.user,
     )
 
     class Meta:

models/company.py

@@ -4,6 +4,7 @@ from django.db import models
 from tickets.models import Ticket
 
 from dbsynce.docs.database.company import Company as HelpTexts
+from dbsynce.docs.verbose_names.company import Company as VerboseName
 from core.settings_vars import METASERVICE_ID
 
 from dbsynce.lib import dicts
@@ -21,7 +22,8 @@ class Company(models.Model):
     # FIXME: id_metaservice должно принимать текущий идентификатор метасервиса, на котором происходит создание записи
     id_metaservice = models.PositiveIntegerField(
         default=METASERVICE_ID,
-        help_text=HelpTexts.id_metaservice
+        verbose_name = VerboseName.id_metaservice,
+        help_text=HelpTexts.id_metaservice,
     )
 
     # DATA
@@ -29,24 +31,28 @@ class Company(models.Model):
         "Ограничения",
         max_length=50,
         default="DS01y04y05y06y07yMPUCS13MPUB",
-        help_text=HelpTexts.requirements
+        verbose_name = VerboseName.requirements,
+        help_text=HelpTexts.requirements,
     )
     status = models.CharField(
         "Статус",
         max_length=1,
         default="1",
         choices = list(dicts.activity_status_by_code.items()),
-        help_text=HelpTexts.status
+        verbose_name = VerboseName.status,
+        help_text=HelpTexts.status,
     )
     legal_name = models.CharField(
         "Название организации",
         max_length=50,
+        verbose_name = VerboseName.legal_name,
         help_text=HelpTexts.legal_name
     )
     address = models.CharField(
         "Юридический адрес",
         max_length=300,
-        help_text=HelpTexts.address
+        verbose_name = VerboseName.address,
+        help_text=HelpTexts.address,
     )
     inn = models.CharField(
         "ИНН компании",

models/documents.py

@@ -8,6 +8,7 @@ from dbsynce.models.resource import Resource
 from tickets.models import Ticket
 
 from dbsynce.docs.database.documents import Documents as HelpTexts
+from dbsynce.docs.verbose_names.documents import Documents as VerboseName
 from core.settings_vars import METASERVICE_ID
 
 from dbsynce.lib import dicts
@@ -20,62 +21,69 @@ class Documents(models.Model):
     Что пока непонятно - документов может быть много разных.
     """
 
-    DOC_TYPES = [
-        ("01", "Паспорт"),
-        ("02", "ИНН"),
-        ("03", "СНИЛС"),
-        ("04", "Cвидетельство о регистрации компании"),
-        ("05", "Cистема налогообложения"),
-        ("06", "Доверенность / Приказ"),
-        ("07", "Права / Лицензия"),
-        ("08", "Документ, подтверждающий собственность"),
-        ("09", "Документ об образовании"),
-        ("10", "Медицинская книжка"),
-        ("11", "Cправка об отсутствии судимости"),
-        ("12", "Договор (в том числе о трудоустройстве)"),
-        ("13", "Фотография"),
-        ("99", "Иное"),
-    ]
-
-    DOC_TYPES_DICT = dict(DOC_TYPES)
+#    DOC_TYPES = [
+#        ("01", "Паспорт"),
+#        ("02", "ИНН"),
+#        ("03", "СНИЛС"),
+#        ("04", "Cвидетельство о регистрации компании"),
+#        ("05", "Cистема налогообложения"),
+#        ("06", "Доверенность / Приказ"),
+#        ("07", "Права / Лицензия"),
+#        ("08", "Документ, подтверждающий собственность"),
+#        ("09", "Документ об образовании"),
+#        ("10", "Медицинская книжка"),
+#        ("11", "Cправка об отсутствии судимости"),
+#        ("12", "Договор (в том числе о трудоустройстве)"),
+#        ("13", "Фотография"),
+#        ("99", "Иное"),
+#    ]
+
+#    DOC_TYPES_DICT = dict(DOC_TYPES)
 
     # ID METASERVICE
     # FIXME: id_metaservice должно принимать текущий идентификатор метасервиса, на котором происходит создание записи
     id_metaservice = models.PositiveIntegerField(
         default=METASERVICE_ID,
+        verbose_name = VerboseName.id_metaservice,
         help_text=HelpTexts.id_metaservice
     )
 
     # DATA
     check_date = models.DateTimeField(
         auto_now_add=True,
-        help_text="timestamp проверки"
+        verbose_name = VerboseName.check_date,
+        help_text=HelpTexts.check_date,
     )
     check_level = models.IntegerField(
         null=True,
         blank=True,
-        help_text=HelpTexts.check_level
+        verbose_name = VerboseName.check_level,
+        help_text=HelpTexts.check_level,
     )
     expire_date = models.DateField(
         null=True,
         blank=True,
-        help_text=HelpTexts.expire_date
+        verbose_name = VerboseName.expire_date,
+        help_text=HelpTexts.expire_date,
     )
     # FIXME: status должен иметь другое значение поумолчанию
     status = models.CharField(
         max_length=1,
         default="1",
-        help_text="активность на основе системы заявок"
+        verbose_name = VerboseName.status,
+        help_text=HelpTexts.status,
     )
     data_path = models.CharField(
         max_length=1024,
-        help_text=HelpTexts.data_path
+        verbose_name = VerboseName.data_path,
+        help_text=HelpTexts.data_path,
     )
     doc_type = models.CharField(
         max_length=2,
         choices = list(dicts.doc_type_by_code.items()),
         #choices=DOC_TYPES,
-        help_text=HelpTexts.doc_type
+        verbose_name = VerboseName.doc_type,
+        help_text=HelpTexts.doc_type,
     )
 
     # OTHER
@@ -83,13 +91,15 @@ class Documents(models.Model):
         max_length=1,
         default="f",
         choices = list(dicts.is_global_by_code.items()),
-        help_text=HelpTexts.is_global
+        verbose_name = VerboseName.is_global,
+        help_text=HelpTexts.is_global,
     )
     is_visible = models.CharField(
         max_length=1,
         default="f",
         choices = list(dicts.is_visible_by_code.items()),
-        help_text=HelpTexts.is_visible
+        verbose_name = VerboseName.is_visible,
+        help_text=HelpTexts.is_visible,
     )
 
     # FK
@@ -97,14 +107,16 @@ class Documents(models.Model):
         Company,
         on_delete=models.DO_NOTHING,
         null=True,
-        help_text=HelpTexts.company
+        verbose_name = VerboseName.company,
+        help_text=HelpTexts.company,
     )
 
     resource = models.ForeignKey(
         Resource,
         on_delete=models.DO_NOTHING,
         null=True,
-        #help_text=HelpTexts.resource
+        verbose_name = VerboseName.resource,
+        help_text=HelpTexts.resource,
     )
 #    service_category = models.ForeignKey(
 #        ServiceCategory,
@@ -124,14 +136,16 @@ class Documents(models.Model):
         get_user_model(),
         related_name="user_doc",
         on_delete=models.DO_NOTHING,
-        help_text=HelpTexts.user
+        verbose_name = VerboseName.user,
+        help_text=HelpTexts.user,
     )
     ticket_status = models.ForeignKey(
         Ticket,
         null=True,
         blank=True,
         on_delete=models.SET_NULL,
-        help_text=HelpTexts.ticket_status
+        verbose_name = VerboseName.ticket_status,
+        help_text=HelpTexts.ticket_status,
     )
     checked_by = models.ForeignKey(
         get_user_model(),
@@ -139,7 +153,8 @@ class Documents(models.Model):
         blank=True,
         related_name="checked_by_doc",
         on_delete=models.DO_NOTHING,
-        help_text=HelpTexts.checked_by
+        verbose_name = VerboseName.checked_by,
+        help_text=HelpTexts.checked_by,
     )
 
     class Meta:

models/orders.py

@@ -9,6 +9,7 @@ from dbsynce.models.service_category import ServiceCategory
 from tickets.models import Ticket
 
 from dbsynce.docs.database.orders import Orders as HelpTexts
+from dbsynce.docs.verbose_names.orders import Orders as VerboseName
 from core.settings_vars import METASERVICE_ID
 
 from dbsynce.lib import dicts
@@ -22,6 +23,7 @@ class Orders(models.Model):
     # ID METASERVICE
     id_metaservice = models.PositiveIntegerField(
         default=METASERVICE_ID,
+        verbose_name = VerboseName.id_metaservice,
         help_text=HelpTexts.id_metaservice
     )
 
@@ -31,11 +33,13 @@ class Orders(models.Model):
         default="1",
         #TODO - maybe a key? What is the meaning?
         #choices = list(tickets_dicts.service_request_type_by_code.items())
-        help_text=HelpTexts.status
+        verbose_name = VerboseName.status,
+        help_text=HelpTexts.status,
     )
     title = models.CharField(
         max_length=150,
         help_text=HelpTexts.title,
+        verbose_name = VerboseName.title,
         default='Заголовок'
     )
     note = models.CharField(

models/permissions.py

@@ -4,6 +4,7 @@ from django.db import models
 from tickets.models import Ticket
 
 from dbsynce.docs.database.permissions import Permissions as HelpTexts
+from dbsynce.docs.verbose_names.permissions import Permissions as VerboseName
 from core.settings_vars import METASERVICE_ID
 
 from dbsynce.lib import dicts
@@ -18,13 +19,15 @@ class Permissions(models.Model):
     # ID METASERVICE
     id_metaservice = models.PositiveIntegerField(
         default=METASERVICE_ID,
-        help_text=HelpTexts.id_metaservice
+        verbose_name = VerboseName.id_metaservice,
+        help_text=HelpTexts.id_metaservice,
     )
 
     # DATA
 
     id_permissions = models.BigIntegerField(
-        help_text="уникальный идентификатор определяющий наличие разрешения из множества в словаре - выданных пользователю/клиенту/аккаунту"
+        verbose_name = VerboseName.id_permissions,
+        help_text=HelpTexts.id_permissions,
     )
 
     #permission_type = models.BigIntegerField(
@@ -32,21 +35,25 @@ class Permissions(models.Model):
     #)
     check_level = models.CharField(
         max_length=10,
-        help_text=HelpTexts.check_level
+        verbose_name = VerboseName.check_level,
+        help_text=HelpTexts.check_level,
     )
     status = models.CharField(
         max_length=1,
         default="1",
         choices = list(dicts.activity_status_by_code.items()),
-        help_text=HelpTexts.status
+        verbose_name = VerboseName.status,
+        help_text=HelpTexts.status,
     )
     check_date = models.DateTimeField(
         null=True,
-        help_text=HelpTexts.check_date
+        verbose_name = VerboseName.check_date,
+        help_text=HelpTexts.check_date,
     )
     expire_date = models.DateField(
         null=True,
-        help_text=HelpTexts.expire_date
+        verbose_name = VerboseName.expire_level,
+        help_text=HelpTexts.expire_date,
     )
 
     # OTHER
@@ -54,12 +61,14 @@ class Permissions(models.Model):
         max_length=1,
         default="f",
         choices = list(dicts.is_global_by_code.items()),
+        verbose_name = VerboseName.is_global,
         help_text=HelpTexts.is_global,
     )
     is_visible = models.CharField(
         max_length=1,
         default="f",
         choices = list(dicts.is_visible_by_code.items()),
+        verbose_name = VerboseName.is_visible,
         help_text=HelpTexts.is_visible,
     )
 
@@ -68,13 +77,15 @@ class Permissions(models.Model):
         Ticket,
         on_delete=models.DO_NOTHING,
         null=True,
-        help_text=HelpTexts.ticket_status
+        verbose_name = VerboseName.ticket_status,
+        help_text=HelpTexts.ticket_status,
     )
     user = models.ForeignKey(
         get_user_model(),
         related_name="user_perm",
         on_delete=models.DO_NOTHING,
         null=True,
+        verbose_name = VerboseName.user,
         help_text=HelpTexts.user
     )
     checked_by = models.ForeignKey(
@@ -82,7 +93,8 @@ class Permissions(models.Model):
         related_name="checked_by_perm",
         on_delete=models.DO_NOTHING,
         null=True,
-        help_text=HelpTexts.checked_by
+        verbose_name = VerboseName.checked_by,
+        help_text=HelpTexts.checked_by,
     )
 
     class Meta:

models/provider.py

@@ -6,6 +6,7 @@ from dbsynce.models.resource import Resource
 from tickets.models import Ticket
 
 from dbsynce.docs.database.provider import Provider as HelpTexts
+from dbsynce.docs.verbose_names.provider import Provider as VerboseName
 from core.settings_vars import METASERVICE_ID
 
 from dbsynce.lib import dicts
@@ -20,12 +21,14 @@ class Provider(models.Model):
     # ID METASERVICE
     id_metaservice = models.PositiveIntegerField(
         default=METASERVICE_ID,
-        help_text=HelpTexts.id_metaservice
+        verbose_name = VerboseName.id_metaservice,
+        help_text=HelpTexts.id_metaservice,
     )
 
     # DATA
     gap = models.IntegerField(
-        help_text=HelpTexts.gap
+        verbose_name = VerboseName.gap,
+        help_text=HelpTexts.gap,
     )
 #    gap = models.DateTimeField(
 #        max_length=10,
@@ -35,28 +38,33 @@ class Provider(models.Model):
         max_length=50,
         #TODO ADD CORRECT DEFAULT!
         default="DSMPUB",
-        help_text=HelpTexts.requirements
+        verbose_name = VerboseName.requirements,
+        help_text=HelpTexts.requirements,
     )
     status = models.CharField(
         max_length=1,
         default="1",
         choices = list(dicts.activity_status_by_code.items()),
-        help_text=HelpTexts.status
+        verbose_name = VerboseName.status,
+        help_text=HelpTexts.status,
     )
     service_status = models.CharField(
         max_length=1,
         default="2",
         choices = list(dicts.service_status_by_code.items()),
-        help_text=HelpTexts.service_status
+        verbose_name = VerboseName.service_status,
+        help_text=HelpTexts.service_status,
     )
     location_type = models.CharField(
         max_length=1,
         choices = list(dicts.location_type_by_code.items()),
-        help_text=HelpTexts.location_type
+        verbose_name = VerboseName.location_type,
+        help_text=HelpTexts.location_type,
     )
     default_location = models.CharField(
         max_length=30,
-        help_text=HelpTexts.default_location
+        verbose_name = VerboseName.default_location,
+        help_text=HelpTexts.default_location,
     )
 
     # OTHER
@@ -64,13 +72,15 @@ class Provider(models.Model):
         max_length=1,
         default="f",
         choices = list(dicts.is_global_by_code.items()),
-        help_text=HelpTexts.is_global
+        verbose_name = VerboseName.is_global,
+        help_text=HelpTexts.is_global,
     )
     is_visible = models.CharField(
         max_length=1,
         default="f",
         choices = list(dicts.is_visible_by_code.items()),
-        help_text=HelpTexts.is_visible
+        verbose_name = VerboseName.is_visible,
+        help_text=HelpTexts.is_visible,
     )
 
     # FK
@@ -78,19 +88,22 @@ class Provider(models.Model):
         get_user_model(),
         on_delete=models.DO_NOTHING,
         null=True,
+        verbose_name = VerboseName.user,
         help_text=HelpTexts.user
     )
     ticket_status = models.ForeignKey(
         Ticket,
         on_delete=models.DO_NOTHING,
         null=True,
-        help_text=HelpTexts.ticket_status
+        verbose_name = VerboseName.ticket_status,
+        help_text=HelpTexts.ticket_status,
     )
     service = models.ForeignKey(
         Service,
         on_delete=models.DO_NOTHING,
+        verbose_name = VerboseName.service,
         null=True,
-        help_text=HelpTexts.service
+        help_text=HelpTexts.service,
     )
 
     resource = models.ForeignKey(
@@ -98,7 +111,8 @@ class Provider(models.Model):
         on_delete=models.DO_NOTHING,
         blank=True,
         null=True,
-        #help_text=HelpTexts.resource
+        verbose_name = VerboseName.resource,
+        help_text=HelpTexts.resource,
     )
 
     class Meta:

models/rating_neg.py

@@ -4,6 +4,7 @@ from django.db import models
 from dbsynce.models.service_category import ServiceCategory
 
 from dbsynce.docs.database.rating_neg import RatingNeg as HelpTexts
+from dbsynce.docs.verbose_names.rating_neg import RatingNeg as VerboseName
 from core.settings_vars import METASERVICE_ID
 
 from dbsynce.lib import dicts
@@ -16,12 +17,14 @@ class RatingNeg(models.Model):
     # ID METASERVICE
     id_metaservice = models.PositiveIntegerField(
         default=METASERVICE_ID,
-        help_text=HelpTexts.id_metaservice
+        verbose_name = VerboseName.id_metaservice,
+        help_text=HelpTexts.id_metaservice,
     )
 
     # DATA
     count = models.IntegerField(
-        help_text=HelpTexts.count  # Написать описание поля
+        verbose_name = VerboseName.count,
+        help_text=HelpTexts.count,
     )
 
     # OTHER
@@ -29,13 +32,15 @@ class RatingNeg(models.Model):
         max_length=1,
         default=False,
         choices = list(dicts.is_global_by_code.items()),
-        help_text=HelpTexts.is_global
+        verbose_name = VerboseName.is_global,
+        help_text=HelpTexts.is_global,
     )
     is_visible = models.CharField(
         max_length=1,
         default="f",
         choices = list(dicts.is_visible_by_code.items()),
-        help_text=HelpTexts.is_visible
+        verbose_name = VerboseName.is_visible,
+        help_text=HelpTexts.is_visible,
     )
 
     # FK
@@ -43,18 +48,21 @@ class RatingNeg(models.Model):
         get_user_model(),
         related_name="rating_neg_user_who",
         on_delete=models.DO_NOTHING,
-        help_text=HelpTexts.user_who
+        verbose_name = VerboseName.user_who,
+        help_text=HelpTexts.user_who,
     )
     user_whom = models.ForeignKey(
         get_user_model(),
         related_name="rating_neg_user_whom",
         on_delete=models.DO_NOTHING,
-        help_text=HelpTexts.user_whom
+        verbose_name = VerboseName.user_whom,
+        help_text=HelpTexts.user_whom,
     )
     service_category = models.ForeignKey(
         ServiceCategory,
         on_delete=models.DO_NOTHING,
-        help_text=HelpTexts.service_category
+        verbose_name = VerboseName.service_category,
+        help_text=HelpTexts.service_category,
     )
 
     class Meta:

models/rating_ok.py

@@ -4,6 +4,7 @@ from django.db import models
 from dbsynce.models.service_category import ServiceCategory
 
 from dbsynce.docs.database.rating_ok import RatingOk as HelpTexts
+from dbsynce.docs.verbose_names.rating_ok import RatingOk as VerboseName
 from core.settings_vars import METASERVICE_ID
 
 from dbsynce.lib import dicts
@@ -16,12 +17,14 @@ class RatingOk(models.Model):
     # ID METASERVICE
     id_metaservice = models.PositiveIntegerField(
         default=METASERVICE_ID,
-        help_text=HelpTexts.id_metaservice
+        verbose_name = VerboseName.id_metaservice,
+        help_text=HelpTexts.id_metaservice,
     )
 
     # DATA
     count = models.IntegerField(
-        help_text=HelpTexts.count  # Написать описание поля
+        verbose_name = VerboseName.id_metaservice,
+        help_text=HelpTexts.count,
     )
 
     # OTHER
@@ -29,13 +32,15 @@ class RatingOk(models.Model):
         max_length=1,
         default=False,
         choices = list(dicts.is_global_by_code.items()),
-        help_text=HelpTexts.is_global
+        verbose_name = VerboseName.is_global,
+        help_text=HelpTexts.is_global,
     )
     is_visible = models.CharField(
         max_length=1,
         default="f",
         choices = list(dicts.is_visible_by_code.items()),
-        help_text=HelpTexts.is_visible
+        verbose_name = VerboseName.is_visible,
+        help_text=HelpTexts.is_visible,
     )
 
     # FK
@@ -43,18 +48,21 @@ class RatingOk(models.Model):
         get_user_model(),
         related_name="rating_ok_user_who",
         on_delete=models.DO_NOTHING,
-        help_text=HelpTexts.user_who
+        verbose_name = VerboseName.user_who,
+        help_text=HelpTexts.user_who,
     )
     user_whom = models.ForeignKey(
         get_user_model(),
         related_name="rating_ok_user_whom",
         on_delete=models.DO_NOTHING,
-        help_text=HelpTexts.user_whom
+        verbose_name = VerboseName.user_whom,
+        help_text=HelpTexts.user_whom,
     )
     service_category = models.ForeignKey(
         ServiceCategory,
         on_delete=models.DO_NOTHING,
-        help_text=HelpTexts.service_category
+        verbose_name = VerboseName.service_category,
+        help_text=HelpTexts.service_category,
     )
 
     class Meta:

models/rating_pos.py

@@ -4,6 +4,7 @@ from django.db import models
 from dbsynce.models.service_category import ServiceCategory
 
 from dbsynce.docs.database.rating_pos import RatingPos as HelpTexts
+from dbsynce.docs.verbose_names.rating_pos import RatingPos as VerboseName
 from core.settings_vars import METASERVICE_ID
 
 from dbsynce.lib import dicts
@@ -16,12 +17,14 @@ class RatingPos(models.Model):
     # ID METASERVICE
     id_metaservice = models.PositiveIntegerField(
         default=METASERVICE_ID,
-        help_text=HelpTexts.id_metaservice
+        verbose_name = VerboseName.id_metaservice,
+        help_text=HelpTexts.id_metaservice,
     )
 
     # DATA
     count = models.IntegerField(
-        help_text=HelpTexts.count  # Написать описание поля
+        verbose_name = VerboseName.count,
+        help_text=HelpTexts.count,  # Написать описание поля
     )
 
     # OTHER
@@ -29,13 +32,15 @@ class RatingPos(models.Model):
         max_length=1,
         default=False,
         choices = list(dicts.is_global_by_code.items()),
-        help_text=HelpTexts.is_global
+        verbose_name = VerboseName.is_global,
+        help_text=HelpTexts.is_global,
     )
     is_visible = models.CharField(
         max_length=1,
         default="f",
         choices = list(dicts.is_visible_by_code.items()),
-        help_text=HelpTexts.is_visible
+        verbose_name = VerboseName.is_visible,
+        help_text=HelpTexts.is_visible,
     )
 
     # FK
@@ -43,13 +48,15 @@ class RatingPos(models.Model):
         get_user_model(),
         related_name="rating_pos_user_who",
         on_delete=models.DO_NOTHING,
-        help_text=HelpTexts.user_who
+        verbose_name = VerboseName.user_who,
+        help_text=HelpTexts.user_who,
     )
     user_whom = models.ForeignKey(
         get_user_model(),
         related_name="rating_pos_user_whom",
         on_delete=models.DO_NOTHING,
-        help_text=HelpTexts.user_whom
+        verbose_name = VerboseName.user_whom,
+        help_text=HelpTexts.user_whom,
     )
     service_category = models.ForeignKey(
         ServiceCategory,

models/relationship.py

@@ -4,6 +4,7 @@ from django.db import models
 from tickets.models import Ticket
 
 from dbsynce.docs.database.relationship import Relationship as HelpTexts
+from dbsynce.docs.verbose_names.relationship import Relationship as VerboseName
 from core.settings_vars import METASERVICE_ID
 
 from dbsynce.lib import dicts
@@ -18,25 +19,29 @@ class Relationship(models.Model):
     # ID METASERVICE
     id_metaservice = models.PositiveIntegerField(
         default=METASERVICE_ID,
-        help_text=HelpTexts.id_metaservice
+        verbose_name = VerboseName.id_metaservice,
+        help_text=HelpTexts.id_metaservice,
     )
 
     # DATA
     neg_type = models.IntegerField(
         choices = list(dicts.neg_type_by_code.items()),
-        help_text=HelpTexts.neg_type
+        verbose_name = VerboseName.neg_type,
+        help_text=HelpTexts.neg_type,
     )
     requirements = models.CharField(
         max_length=50,
         #TODO ADD CORRECT DEFAULT!
         default="DSMPUB",
-        help_text=HelpTexts.requirements
+        verbose_name = VerboseName.requirements,
+        help_text=HelpTexts.requirements,
     )
     status = models.CharField(
         max_length=1,
         default="1",
         choices = list(dicts.activity_status_by_code.items()),
-        help_text=HelpTexts.status
+        verbose_name = VerboseName.status,
+        help_text=HelpTexts.status,
     )
 
     # OTHER
@@ -44,13 +49,15 @@ class Relationship(models.Model):
         max_length=1,
         default="f",
         choices = list(dicts.is_global_by_code.items()),
-        help_text=HelpTexts.is_global
+        verbose_name = VerboseName.is_global,
+        help_text=HelpTexts.is_global,
     )
     is_visible = models.CharField(
         max_length=1,
         default="f",
         choices = list(dicts.is_visible_by_code.items()),
-        help_text=HelpTexts.is_visible
+        verbose_name = VerboseName.is_visible,
+        help_text=HelpTexts.is_visible,
     )
 
     # FK
@@ -58,18 +65,21 @@ class Relationship(models.Model):
         get_user_model(),
         related_name="user_who",
         on_delete=models.DO_NOTHING,
-        help_text=HelpTexts.user_who
+        verbose_name = VerboseName.user_who,
+        help_text=HelpTexts.user_who,
     )
     user_whom = models.ForeignKey(
         get_user_model(),
         related_name="user_whom",
         on_delete=models.DO_NOTHING,
-        help_text=HelpTexts.user_whom
+        verbose_name = VerboseName.user_whom,
+        help_text=HelpTexts.user_whom,
     )
     ticket_status = models.ForeignKey(
         Ticket,
         on_delete=models.DO_NOTHING,
-        help_text=HelpTexts.ticket_status
+        verbose_name = VerboseName.ticket_status,
+        help_text=HelpTexts.ticket_status,
     )
 
     class Meta:

models/resource.py

@@ -4,6 +4,7 @@ from django.db import models
 from tickets.models import Ticket
 
 from dbsynce.docs.database.resource import Resource as HelpTexts
+from dbsynce.docs.verbose_names.resource import Resource as VerboseName
 from core.settings_vars import METASERVICE_ID
 
 from dbsynce.lib import dicts
@@ -15,25 +16,29 @@ class Resource(models.Model):
     # ID METASERVICE
     id_metaservice = models.PositiveIntegerField(
         default=METASERVICE_ID,
-        help_text=HelpTexts.id_metaservice
+        verbose_name = VerboseName.id_metaservice,
+        help_text=HelpTexts.id_metaservice,
     )
 
     # DATA
     resource_type = models.CharField(
         max_length=10,
         choices = list(dicts.resource_type_by_code.items()),
+        verbose_name = VerboseName.resource_type,
         help_text=HelpTexts.resource_type,
     )
     requirements = models.CharField(
         max_length=50,
         default="DS01y04y05y06y07yMPUCS13MPUB",
-        help_text=HelpTexts.requirements
+        verbose_name = VerboseName.requirements,
+        help_text=HelpTexts.requirements,
     )
     status = models.CharField(
         max_length=1,
         default="1",
         choices = list(dicts.activity_status_by_code.items()),
-        help_text=HelpTexts.status
+        verbose_name = VerboseName.status,
+        help_text=HelpTexts.status,
     )
 
     # OTHER
@@ -41,13 +46,15 @@ class Resource(models.Model):
         max_length=1,
         default="1",
         choices = list(dicts.is_global_by_code.items()),
-        help_text=HelpTexts.is_global
+        verbose_name = VerboseName.is_global,
+        help_text=HelpTexts.is_global,
     )
     is_visible = models.CharField(
         max_length=1,
         default="1",
         choices = list(dicts.is_visible_by_code.items()),
-        help_text=HelpTexts.is_visible
+        verbose_name = VerboseName.is_visible,
+        help_text=HelpTexts.is_visible,
     )
 
     # FK
@@ -56,14 +63,16 @@ class Resource(models.Model):
         on_delete=models.SET_NULL,
         blank=True,
         null=True,
-        help_text=HelpTexts.ticket_status
+        verbose_name = VerboseName.ticket_status,
+        help_text=HelpTexts.ticket_status,
     )
     user = models.ForeignKey(
         get_user_model(),
         blank=True,
         null=True,
         on_delete=models.DO_NOTHING,
-        help_text=HelpTexts.user
+        verbose_name = VerboseName.user,
+        help_text=HelpTexts.user,
     )
 
     class Meta:

models/service.py

@@ -21,37 +21,42 @@ class Service(models.Model):
     # ID METASERVICE
     id_metaservice = models.PositiveIntegerField(
         default=METASERVICE_ID,
-        help_text=HelpTexts.id_metaservice
+        verbose_name = VerboseName.id_metaservice,
+        help_text=HelpTexts.id_metaservice,
     )
 
     codename = models.CharField(
         max_length=30,
-        #verbose_name = VerboseName.codename,
-        #help_text=HelpTexts.codename,
+        verbose_name = VerboseName.codename,
+        help_text=HelpTexts.codename,
     )
 
     requirements = models.CharField(
-        max_length=300,
+        max_length=50,
         #TODO fix default value!
         default="DSMPU",
-        #help_text=HelpTexts.requirements
+        verbose_name = VerboseName.requirements,
+        help_text=HelpTexts.requirements,
     )
 
     caption = models.CharField(
         max_length=255,
         null=True,
-        #help_text=HelpTexts.caption
+        verbose_name = VerboseName.caption,
+        help_text=HelpTexts.caption,
     )
     description = models.TextField(
         blank=True,
-        #help_text=HelpTexts.description
+        verbose_name = VerboseName.description,
+        help_text=HelpTexts.description,
     )
 
     resource_type = models.CharField(
         max_length=5,
         null=True,
         choices = list(dicts.resource_type_by_code.items()),
-        #help_text=HelpTexts.resource_type
+        verbose_name = VerboseName.description,
+        help_text=HelpTexts.resource_type,
     )
 
 
@@ -65,30 +70,36 @@ class Service(models.Model):
         max_digits=9,
         decimal_places=2,
         null=True,
-        help_text=HelpTexts.price_km
+        verbose_name = VerboseName.price_km,
+        help_text=HelpTexts.price_km,
     )
     price_min = models.DecimalField(
         max_digits=9,
         decimal_places=2,
         null=True,
-        help_text=HelpTexts.price_min
+        verbose_name = VerboseName.price_min,
+        help_text=HelpTexts.price_min,
     )
     price_amount = models.DecimalField(
         max_digits=9,
         decimal_places=2,
         null=True,
-        help_text=HelpTexts.price_amount
+        verbose_name = VerboseName.price_amount,
+        help_text=HelpTexts.price_amount,
     )
     company_comission = models.FloatField(
-        help_text=HelpTexts.company_comission
-    )
-    requirements = models.CharField(
-        max_length=50,
-        help_text=HelpTexts.requirements
+        verbose_name = VerboseName.company_comission,
+        help_text=HelpTexts.company_comission,
     )
+    #requirements = models.CharField(
+    #    max_length=50,
+    #    verbose_name = VerboseName.requirements,
+    #    help_text=HelpTexts.requirements,
+    #)
     status = models.CharField(
         max_length=1,
         choices = list(dicts.activity_status_by_code.items()),
+        verbose_name = VerboseName.status,
         help_text=HelpTexts.status,
         default="1",
     )
@@ -98,12 +109,14 @@ class Service(models.Model):
         max_length=1,
         default="f",
         choices = list(dicts.is_global_by_code.items()),
-        help_text=HelpTexts.is_global
+        verbose_name = VerboseName.is_global,
+        help_text=HelpTexts.is_global,
     )
     is_visible = models.CharField(
         max_length=1,
         default="f",
         choices = list(dicts.is_visible_by_code.items()),
+        verbose_name = VerboseName.is_visible,
         help_text=HelpTexts.is_visible
     )
 
@@ -112,7 +125,8 @@ class Service(models.Model):
         Ticket,
         null=True,
         on_delete=models.DO_NOTHING,
-        help_text=HelpTexts.ticket_status
+        verbose_name = VerboseName.ticket_status,
+        help_text=HelpTexts.ticket_status,
     )
     #resource = models.ForeignKey(
     #    Resource,
@@ -127,13 +141,15 @@ class Service(models.Model):
         on_delete=models.DO_NOTHING,
         blank=True,
         null=True,
-        #help_text=HelpTexts.company
+        verbose_name = VerboseName.company,
+        help_text=HelpTexts.company,
     )
 
     service_category = models.ForeignKey(
         ServiceCategory,
         on_delete=models.DO_NOTHING,
-        help_text=HelpTexts.service_category
+        verbose_name = VerboseName.service_category,
+        help_text=HelpTexts.service_category,
     )
 
     class Meta:

models/service_category.py

@@ -3,6 +3,8 @@ from django.db import models
 from tickets.models import Ticket
 
 from dbsynce.docs.database.service_category import ServiceCategory as HelpTexts
+from dbsynce.docs.verbose_names.service import ServiceCategory as VerboseName
+
 from core.settings_vars import METASERVICE_ID
 
 from dbsynce.lib import dicts
@@ -15,46 +17,55 @@ class ServiceCategory(models.Model):
     # ID METASERVICE
     id_metaservice = models.PositiveIntegerField(
         default=METASERVICE_ID,
-        help_text=HelpTexts.id_metaservice
+        verbose_name = VerboseName.id_metaservice,
+        help_text=HelpTexts.id_metaservice,
     )
 
     # DATA
     codename = models.CharField(
         max_length=30,
-        help_text=HelpTexts.codename
+        verbose_name = VerboseName.codename,
+        help_text=HelpTexts.codename,
     )
     requirements = models.CharField(
         max_length=50,
         #TODO fix default value!
         default="DSMPU",
-        help_text=HelpTexts.requirements
+        verbose_name = VerboseName.requirements,
+        help_text=HelpTexts.requirements,
     )
     status = models.CharField(
         max_length=1,
         default="1",
         choices = list(dicts.activity_status_by_code.items()),
         #choices = list(dicts.activity_status.items()),
-        help_text=HelpTexts.status
+        verbose_name = VerboseName.status,
+        help_text=HelpTexts.status,
     )
     caption = models.CharField(
         max_length=255,
-        help_text=HelpTexts.caption
+        verbose_name = VerboseName.caption,
+        help_text=HelpTexts.caption,
     )
     description = models.TextField(
         blank=True,
-        help_text=HelpTexts.description
+        verbose_name = VerboseName.description,
+        help_text=HelpTexts.description,
     )
     link_agreement = models.CharField(
         max_length=400,
-        help_text=HelpTexts.link_agreement
+        verbose_name = VerboseName.link_agreement,
+        help_text=HelpTexts.link_agreement,
     )
     price_type = models.CharField(
         max_length=1,
         choices = list(dicts.price_type_by_code.items()),
-        help_text=HelpTexts.price_type
+        verbose_name = VerboseName.price_type,
+        help_text=HelpTexts.price_type,
     )
     metaservice_comission = models.FloatField(
-        help_text=HelpTexts.metaservice_comission
+        verbose_name = VerboseName.metaservice_comission,
+        help_text=HelpTexts.metaservice_comission,
     )
 
     # OTHER
@@ -62,13 +73,15 @@ class ServiceCategory(models.Model):
         max_length=1,
         default="f",
         choices = list(dicts.is_global_by_code.items()),
-        help_text=HelpTexts.is_global
+        verbose_name = VerboseName.is_global,
+        help_text=HelpTexts.is_global,
     )
     is_visible = models.CharField(
         max_length=1,
         default="f",
         choices = list(dicts.is_visible_by_code.items()),
-        help_text=HelpTexts.is_visible
+        verbose_name = VerboseName.is_visible,
+        help_text=HelpTexts.is_visible,
     )
 
     # FK
@@ -76,7 +89,8 @@ class ServiceCategory(models.Model):
         Ticket,
         on_delete=models.DO_NOTHING,
         null=True,
-        help_text=HelpTexts.ticket_status
+        verbose_name = VerboseName.ticket_status,
+        help_text=HelpTexts.ticket_status,
     )
 
     class Meta: