Fixed naming for new models

src/models/storage_turn_model.py

@@ -9,22 +9,22 @@ class storage_turn_model(abstract_reference):
     def __init__(self, name, warehouse, turn, nomenclature, measurement_unit):
         self.__vtor = validator()
 
-        self.Warehouse = warehouse
-        self.Turn = turn
-        self.Nomenclature = nomenclature
-        self.Measurement_unit = measurement_unit
+        self.warehouse = warehouse
+        self.turn = turn
+        self.nomenclature = nomenclature
+        self.measurement_unit = measurement_unit
 
         super().__init__(name)
 
     __warehouse = None
 
     @property
-    def Warehouse(self):
+    def warehouse(self):
         """Склад"""
         return self.__warehouse
 
-    @Warehouse.setter
-    def Warehouse(self, value):
+    @warehouse.setter
+    def warehouse(self, value):
         """Склад"""
         self.__vtor.check_type(value, warehouse_model)
         self.__warehouse = value
@@ -32,12 +32,12 @@ class storage_turn_model(abstract_reference):
     __turn = 0
 
     @property
-    def Turn(self):
+    def turn(self):
         """Оборот"""
         return self.__turn
 
-    @Turn.setter
-    def Turn(self, value):
+    @turn.setter
+    def turn(self, value):
         """Оборот"""
         self.__vtor.check_number(value)
         self.__turn = value
@@ -45,12 +45,12 @@ class storage_turn_model(abstract_reference):
     __nomenclature = None
 
     @property
-    def Nomenclature(self):
+    def nomenclature(self):
         """Номенклатура"""
         return self.__nomenclature
 
-    @Nomenclature.setter
-    def Nomenclature(self, value):
+    @nomenclature.setter
+    def nomenclature(self, value):
         """Номенклатура"""
         self.__vtor.check_type(value, nomenclature_model)
         self.__nomenclature = value
@@ -58,12 +58,12 @@ class storage_turn_model(abstract_reference):
     __measurement_unit = None
 
     @property
-    def Measurement_unit(self):
+    def measurement_unit(self):
         """Единица измерения"""
         return self.__measurement_unit
 
-    @Measurement_unit.setter
-    def Measurement_unit(self, value):
+    @measurement_unit.setter
+    def measurement_unit(self, value):
         """Единица измерения"""
         self.__vtor.check_type(value, measurement_unit_model)
         self.__measurement_unit = value

src/models/transaction_model.py

@@ -18,23 +18,23 @@ class transaction_model(abstract_reference):
         timeSpan,
     ):
         self.__vtor = validator()
-        self.Warehouse = warehouse
-        self.Nomenclature = nomenclature
-        self.Amount = amount
-        self.TransactionType = transactionType
-        self.MeasurementUnit = measurementUnit
-        self.TimeSpan = timeSpan
+        self.warehouse = warehouse
+        self.nomenclature = nomenclature
+        self.amount = amount
+        self.transaction_type = transactionType
+        self.measurement_unit = measurementUnit
+        self.time_span = timeSpan
         super().__init__(name)
 
     __warehouse = None
 
     @property
-    def Warehouse(self):
+    def warehouse(self):
         """Склад"""
         return self.__warehouse
 
-    @Warehouse.setter
-    def Warehouse(self, value):
+    @warehouse.setter
+    def warehouse(self, value):
         """Склад"""
         self.__vtor.check_type(value, warehouse_model)
         self.__warehouse = value
@@ -42,12 +42,12 @@ class transaction_model(abstract_reference):
     __nomenclature = None
 
     @property
-    def Nomenclature(self):
+    def nomenclature(self):
         """Номенклатура"""
         return self.__nomenclature
 
-    @Nomenclature.setter
-    def Nomenclature(self, value):
+    @nomenclature.setter
+    def nomenclature(self, value):
         """Номенклатура"""
         self.__vtor.check_type(value, nomenclature_model)
         self.__nomenclature = value
@@ -55,12 +55,12 @@ class transaction_model(abstract_reference):
     __amount = 0
 
     @property
-    def Amount(self):
+    def amount(self):
         """Количество товара"""
         return self.__amount
 
-    @Amount.setter
-    def Amount(self, value):
+    @amount.setter
+    def amount(self, value):
         """Количество товара"""
         self.__vtor.check_number(value)
         self.__amount = value
@@ -68,12 +68,12 @@ class transaction_model(abstract_reference):
     __transactionType = None
 
     @property
-    def TransactionType(self):
+    def transaction_type(self):
         """Тип транзакции"""
         return self.__transactionType
 
-    @TransactionType.setter
-    def TransactionType(self, value):
+    @transaction_type.setter
+    def transaction_type(self, value):
         """Тип транзакции"""
         self.__vtor.check_type(value, int)
         self.__transactionType = value
@@ -81,12 +81,12 @@ class transaction_model(abstract_reference):
     __measurementUnit = None
 
     @property
-    def MeasurementUnit(self):
+    def measurement_unit(self):
         """Единица измерения"""
         return self.__measurementUnit
 
-    @MeasurementUnit.setter
-    def MeasurementUnit(self, value):
+    @measurement_unit.setter
+    def measurement_unit(self, value):
         """Единица измерения"""
         self.__vtor.check_type(value, measurement_unit_model)
         self.__measurementUnit = value
@@ -94,12 +94,12 @@ class transaction_model(abstract_reference):
     __timeSpan = None
 
     @property
-    def TimeSpan(self):
+    def time_span(self):
         """Период"""
         return self.__timeSpan
 
-    @TimeSpan.setter
-    def TimeSpan(self, value):
+    @time_span.setter
+    def time_span(self, value):
         """Период"""
         self.__vtor.check_type(value, datetime.datetime)
         self.__timeSpan = value

src/models/warehouse_model.py

@@ -8,16 +8,16 @@ class warehouse_model(abstract_reference):
 
     def __init__(self, name, address):
         self.__vtor = validator()
-        self.Address = address
+        self.address = address
         super().__init__(name)
 
     @property
-    def Address(self):
+    def address(self):
         """Адрес склада"""
         return self.__address
 
-    @Address.setter
-    def Address(self, value):
+    @address.setter
+    def address(self, value):
         """Адрес склада"""
         self.__vtor.check_type(value, str)
         self.__vtor.check_length_greater(value, 0)