last

kv/schemas.py

@@ -142,11 +142,12 @@ class WithdrawingSave(PersonalAccountInit, WithdrawingCheckSerializer, DateInit)
 
 class RecalculationSave(BaseModel):
     IDUser: int
-    IDService: int
+    IDService: int = None
     IDType: int
+    IDRecalculationCode: int = None
     Percent: float = None
-    IDOldChange: str = None
-    IDNewChange: str = None
+    OldValue: str = None
+    NewValue: str = None
     DateBegin: str
     DateEnd: str
 
@@ -156,10 +157,12 @@ class RepaymentInfoInit(BaseModel):
     IDMoneyType: int
 
 
-class RepaymentInit(RepaymentInfoInit):
+class RepaymentInit(BaseModel):
+    IDCashbox: int
     IDRepaymentType: int
     RepaymentNumber: int
-    RepaymentDate: date
+    RepaymentDate: str
+    IDMoneyType: int
 
 
 class RecieptCalculateInit(PersonalAccountInit):
@@ -229,6 +232,22 @@ class PersonalAccountSerializer(BaseModel):
     IDAccount: int
     FullName: Optional[str] = None
 
+class PersonalAccountDetailsInit(BaseModel):
+    ActionType: Optional[str] = None
+    ID: int = None
+    IDAddress: int = None
+    IDTenants: int = None
+    IDWorker: int = None
+    LastName: Optional[str] = None
+    FirstName: Optional[str] = None
+    Patronymic: Optional[str] = None
+    PassportSerialNumber: Optional[str] = None
+    PassportNumber: Optional[str] = None
+    PassportIssueBy: Optional[str] = None
+    PassportIssueDate: Optional[str] = None
+    PassportRegistrationPlace: Optional[str] = None
+    PassportRegistrationDate: Optional[str] = None
+    Note: Optional[str] = None
 
 class PersonalAccountDetailsSerializer(BaseModel):
     ID: int
@@ -332,7 +351,7 @@ class AddressDetailsSerializer(BaseModel):
     IDImprovementDegree: int = None
     CadastralNumber: Optional[str] = None
     Number: Optional[str] = None
-    Privatization: bool = None
+    Privatization: float = None
     Area: float = None
     AreaOwned: float = None
     AreaAboveNormal: float = None
@@ -353,10 +372,10 @@ class AddressDetailsSerializer(BaseModel):
     MeteringDeviceHeating: bool = None
     MeteringDeviceHotWater: bool = None
     MeteringDeviceColdWater: bool = None
-    ActAvailabilityMeteringDeviceInstallIDType: int = None
+    ActAvailabilityMeteringDeviceInstallIDType: bool = None
     ActAvailabilityMeteringDeviceInstallHeating: bool = None
     ActAvailabilityMeteringDeviceInstallWater: bool = None
-
+    
 
 class EditAdressInit(AddressDetailsSerializer):
     ActionType: Optional[str] = None
@@ -647,8 +666,9 @@ class AccrualsCanBeRecalculatedSerializer(BaseModel):
     Volume: float
     Amount: float
 
-class ObjectDetailsSerializer(BaseModel):
+class ObjectEditInit(BaseModel):
     IDObject: str = None
+    IDCIty: int = None
     IDFias: Optional[str] = None
     IDBoiler: str = None
     IDOwnershipType: int = None
@@ -656,7 +676,53 @@ class ObjectDetailsSerializer(BaseModel):
     BuildDate: int = None
     FloorNumber: int = None
     Entrance: int = None
-    CommissDate: date = None
+    CommissDate: int = None
+    Volume: float = None
+    FullArea: float = None
+    IDBuildingType: Optional[str] = None
+    IDOverlappingType: int = None
+    IDWallMaterial: int = None
+    IDRoofType: int = None
+    IDFoundationType: int = None
+    WithdrawingDate: Optional[str] = None
+    WithdrawingReason: Optional[str] = None
+    IDSystemHotWater: int = None
+    IDSystemHotWaterPeriodType: int = None
+    IDSystemColdWater: int = None
+    IDSystemColdWaterPeriodType: int = None
+    IDSystemSewerage: int = None
+    IDStandartVolume: int = None
+    IDHeatingType: int = None
+    IDGasType: int = None
+    IDWiringType: int = None
+    IDImprovementDegree: int = None
+    Amount: float = None
+    Deterioration: float = None
+    AreaRoof: float = None
+    AreaFoundation: float = None
+    AreaFacade: float = None
+    AreaPlub: float = None
+    AreaAttic: float = None
+    AreaTechnicalFloor: float = None
+    AreaBuilding: float = None
+    AreaLk: float = None
+    AreaYardArea: float = None
+    AreaBoiler: float = None
+    ActAvailabilityCounterInstallObjectHeating: int = None
+    ActAvailabilityCounterInstallObjectWater: int = None
+    DirectControl: bool = None
+
+class ObjectDetailsSerializer(BaseModel):
+    IDObject: str = None
+    IDCIty: int = None
+    IDFias: Optional[str] = None
+    IDBoiler: str = None
+    IDOwnershipType: int = None
+    IDProviderUtilityServices: int = None
+    BuildDate: int = None
+    FloorNumber: int = None
+    Entrance: int = None
+    CommissDate: int = None
     Volume: float = None
     FullArea: float = None
     IDBuildingType: Optional[str] = None
@@ -795,9 +861,9 @@ class ImprovementDegreeSerializer(BaseModel):
 
 
 class ObjectWaterSystemVolumesInit(BaseModel):
-    IDHotWater: int
-    IDColdWater: int
-    IDSewerage: int
+    IDPeriodTypeHotWater: int
+    IDPeriodTypeColdWater: int
+    IDPeriodTypeSewerage: int