kui-crm_actions 0.0.28 → 0.0.30

package/index.d.ts

@@ -1,5 +1,5 @@
 import * as kui_crm from 'kui-crm';
-import { RoomType, CountryModel, RegionModel, CityModel, CountyModel, DistrictModel, LatLonParams, RoomTypes, RenovationType, RenovationStyle, ParkingTypes, InputParams, ResourceTypes as ResourceTypes$1, MeterTypes as MeterTypes$1, InputFileWithVisibilityFields, MeterFeaturesFormFields, ContractLinkModel, ImageBodyRequest, FileBodyRequest, CityParams, RenovationParams, RoomParams, PhoneParams, WifiParams, InternetProviderParams, TVTypes, CompanyAutocompleteFields, CountryAutocompleteFields, TaxesTypes as TaxesTypes$1, MetersCountParams, FillingTagsAutocompleteFields, ApartmentFillingVariants, FillingInfoFormFields as FillingInfoFormFields$1 } from 'kui-crm';
+import { RoomType, CountryModel, RegionModel, CityModel, CountyModel, DistrictModel, LatLonParams, RoomTypes, RenovationType, RenovationStyle, ParkingTypes, InputParams, ResourceTypes as ResourceTypes$1, MeterTypes as MeterTypes$2, InputFileWithVisibilityFields, MeterFeaturesFormFields, ContractLinkModel, ImageBodyRequest, FileBodyRequest, CityParams, RenovationParams, RoomParams, PhoneParams, WifiParams, InternetProviderParams, TVTypes, CompanyAutocompleteFields, CountryAutocompleteFields, TaxesTypes as TaxesTypes$1, MetersCountParams, FillingTagsAutocompleteFields, ApartmentFillingVariants, FillingInfoFormFields as FillingInfoFormFields$1 } from 'kui-crm';
 import * as yup from 'yup';
 import { Loader, MultistepForm } from 'kui-utils';
 import { DateTime } from 'luxon';
@@ -11,11 +11,11 @@ declare type RoomModel = {
     area: number | null;
     room_type?: RoomType | null;
 };
-declare type WaterMeterTypes = "cold" | "hot";
-declare type ElectricityMeterTypes = "T1" | "T2" | "T3";
+declare type WaterMeterTypes$1 = "cold" | "hot";
+declare type ElectricityMeterTypes$1 = "T1" | "T2" | "T3";
 declare type ResourceTypes = "water" | "electricity" | "gas" | "heating";
 declare type TaxesTypes = "resident" | "nonresident" | "individual-entrepreneur" | "company" | "self-employed";
-declare type MeterTypes = ElectricityMeterTypes | WaterMeterTypes | null;
+declare type MeterTypes$1 = ElectricityMeterTypes$1 | WaterMeterTypes$1 | null;
 declare type ApartmentMainInfoModelFields = {
     country: CountryModel;
     region: RegionModel;
@@ -76,7 +76,7 @@ declare type ApartmentDetailInfoModelFields = {
     payer_code: string;
 };
 
-declare const getPartialMeterInfoFields: (resource: ResourceTypes, type?: MeterTypes | undefined, name?: string | undefined, settings?: any) => InputParams<any>[];
+declare const getPartialMeterInfoFields: (resource: ResourceTypes, type?: MeterTypes$1 | undefined, name?: string | undefined, settings?: any) => InputParams<any>[];
 
 declare const getPartialMeterInfoSchema: (valuesFields: InputParams<any>[]) => yup.ObjectSchema<{
     [x: string]: any;
@@ -107,13 +107,13 @@ type UploadFileParams = {
 type PartialMeterInfoStepProps = {
   resource: ResourceTypes$1
   index: number
-  type?: MeterTypes$1
+  type?: MeterTypes$2
 }
 
 type PartialMeterInfoFields = {
   id: number
   resource: ResourceTypes$1
-  type?: MeterTypes$1
+  type?: MeterTypes$2
   number: string
   value?: string | number | null
   T1?: string | number | null
@@ -189,6 +189,10 @@ type InspectionImageFieldsSettings = {
   [key: string]: any
 }
 
+declare type WaterMeterTypes = "cold" | "hot";
+declare type ElectricityMeterTypes = "T1" | "T2" | "T3";
+declare type MeterTypes = ElectricityMeterTypes | WaterMeterTypes | null;
+
 type TransferInspectionTypes =
   | "maroom_tenant"
   | "tenant_maroom"
@@ -204,6 +208,21 @@ type TransferInspectionFormFields = {
   InspectionPartialMetersStepFields &
   InspectionRoomsImagesFields
 
+type MeterValue = string | number | null
+
+type MeterValuesFields = {
+  resource: ResourceTypes
+  type?: MeterTypes
+  value?: MeterValue
+  T1?: MeterValue
+  T2?: MeterValue
+  T3?: MeterValue
+  initialValue?: MeterValue
+  initialValueT1?: MeterValue
+  initialValueT2?: MeterValue
+  initialValueT3?: MeterValue
+}
+
 declare type InspectionAppraisalLiteModel = {
     id: number;
     date: string;
@@ -239,6 +258,9 @@ declare type PostApartmentInspectionRequest = {
     quarterly?: QuarterlyInspectionFieldsBody;
     transfer?: TransferInspectionFieldsBody;
 };
+declare type MeterValueModel = {
+    last_value: string | number | null;
+};
 declare type InspectionMeterValueModel = {
     cold?: string | number | null;
     hot?: string | number | null;
@@ -251,13 +273,13 @@ declare type InspectionMeterValueModel = {
 declare type PartialMeterModel = {
     id: number;
     passport_number: string;
-    meter_type?: MeterTypes;
+    meter_type?: MeterTypes$1;
     resource_type: ResourceTypes;
     values: InspectionMeterValueModel;
     photos: ImageBodyRequest[];
 };
 declare type InspectionMeterCommonFields = {
-    meter_type?: MeterTypes | null;
+    meter_type?: MeterTypes$1 | null;
     passport_number: string;
     resource_type: ResourceTypes;
     activation_date: string | null;
@@ -471,32 +493,6 @@ declare const inspectionsRequestBody: {
             };
         }[];
     };
-    getPartialMeterValues(meter: PartialMeterInfoFields): {
-        T1: string | number | null | undefined;
-        T2: string | number | null | undefined;
-        T3: string | number | null | undefined;
-        cold?: undefined;
-        hot?: undefined;
-    } | {
-        cold: string | number | null | undefined;
-        T1?: undefined;
-        T2?: undefined;
-        T3?: undefined;
-        hot?: undefined;
-    } | {
-        hot: string | number | null | undefined;
-        T1?: undefined;
-        T2?: undefined;
-        T3?: undefined;
-        cold?: undefined;
-    } | {
-        [x: string]: string | number | null | undefined;
-        T1?: undefined;
-        T2?: undefined;
-        T3?: undefined;
-        cold?: undefined;
-        hot?: undefined;
-    };
     getPostBodyInventoryInspection(inspection: InventoryInspectionFormFields, roomsImages: InspectionRoomPhotoRequest[], fillingFiles: FileBodyRequest[], metersFiles: FileBodyRequest[], metersImages: ImageBodyRequest[][], fillingImages: ImageBodyRequest[][]): InventoryInspectionPostBody;
     getInventoryInspectionMeters(meters: InspectionMeterFields$1[], metersFiles: FileBodyRequest[], metersImages: ImageBodyRequest[][]): {
         meters: {
@@ -517,26 +513,26 @@ declare const inspectionsRequestBody: {
             tariff: number | undefined;
         }[];
     };
-    getInventoryMeterValues(meter: InspectionMeterFields$1): {
-        T1: number | undefined;
-        T2: number | undefined;
-        T3: number | undefined;
+    getInspectionMeterValues(meter: MeterValuesFields, fieldName?: keyof MeterValuesFields | undefined): {
+        T1: string | number | null | undefined;
+        T2: string | number | null | undefined;
+        T3: string | number | null | undefined;
         cold?: undefined;
         hot?: undefined;
     } | {
-        cold: number | undefined;
+        cold: string | number | null | undefined;
         T1?: undefined;
         T2?: undefined;
         T3?: undefined;
         hot?: undefined;
     } | {
-        hot: number | undefined;
+        hot: string | number | null | undefined;
         T1?: undefined;
         T2?: undefined;
         T3?: undefined;
         cold?: undefined;
     } | {
-        [x: string]: number | undefined;
+        [x: string]: string | number | null | undefined;
         T1?: undefined;
         T2?: undefined;
         T3?: undefined;
@@ -627,8 +623,8 @@ declare const DetailApartmentInfoStepSchema: yup.ObjectSchema<{
     ceilingHeight: number;
     numberOfWindows: number;
     renovation: {
-        year: number;
         type: string;
+        year: number;
         style: string;
     };
 }, yup.AnyObject, {
@@ -885,4 +881,4 @@ declare type InspectionFieldsSettings = {
     [key: string]: InputParams<any>;
 };
 
-export { AdditionalInfoFieldsSchema, AdditionalInfoStepFields, AdditionalInfoStepSchema, ApartmentDetailInfoModelFields, ApartmentInspectionModel, ApartmentMainInfoModelFields, ApartmentPaymentsFormFields, BasicApartmentInfoFieldsSchema, BasicApartmentInfoStepFields, BasicApartmentInfoStepSchema, CommonInspectionFields, CommonInspectionFormFields, DetailApartmentInfoFieldsSchema, DetailApartmentInfoStepFields, DetailApartmentInfoStepSchema, ElectricityMeterTypes, FillingInfoFieldsSchema, FillingInfoFormFields, FillingInfoStepFields, FillingListInfoStepFields, HouseServicesInfoFieldsSchema, HouseServicesInfoStepFields, HouseServicesInfoStepSchema, InitialInspectionFieldsBody, InitialInspectionFormFields, InitialInspectionInfoFields, InitialInspectionPostBody, InspectionAppraisalLiteModel, InspectionFieldsSettings, InspectionFillingParams, InspectionImpairmentLiteModel, InspectionMeterCommonFields, InspectionMeterFields$1 as InspectionMeterFields, InspectionMeterValueModel, InspectionMetersStepFields$1 as InspectionMetersStepFields, InspectionPartialMetersStepFields, InspectionRoomImagesParams, InspectionRoomPhotoRequest, InspectionRoomPhotoTypes, InspectionRoomsImagesFields, InspectionTypes, InventoryInspectionFieldsBody, InventoryInspectionFormFields, InventoryInspectionPostBody, InventoryMeterModel, MeterInfoStepProps, MeterTypes, MetersInfoFieldsSchema, MetersInfoStepFields, MetersInfoStepSchema, PartialMeterInfoFields, PartialMeterInfoStepProps, PartialMeterModel, PostApartmentInspectionRequest, QuarterlyInspectionFieldsBody, QuarterlyInspectionFormFields, QuarterlyInspectionPostBody, ResourceTypes, RoomModel, RoomsApartmentInfoFieldsSchema, RoomsApartmentInfoStepFields, RoomsApartmentInfoStepSchema, SecurityApartmentInfoFieldsSchema, SecurityApartmentInfoStepFields, SecurityApartmentInfoStepSchema, TaxesTypes, TelecommunicationsInfoFieldsSchema, TelecommunicationsInfoStepFields, TelecommunicationsInfoStepSchema, TransferInspectionFieldsBody, TransferInspectionFormFields, TransferInspectionPostBody, TransferInspectionTypes, WaterMeterTypes, getAdditionalInfoStepFields, getApartmentPaymentFields, getBasicApartmentInfoFields, getDetailApartmentInfoFields, getFillingInfoFields, getHouseServicesInfoStep, getMetersInfoStepFields, getPartialMeterInfoFields, getPartialMeterInfoSchema, getRoomsApartmentInfoFields, getRoomsImagesSteps, getSecurityApartmentInfoFields, getTelecommunicationsInfoStepFields, inspectionsRequestBody, inspectionsRequests, renderMetersSteps, useMetersValues };
+export { AdditionalInfoFieldsSchema, AdditionalInfoStepFields, AdditionalInfoStepSchema, ApartmentDetailInfoModelFields, ApartmentInspectionModel, ApartmentMainInfoModelFields, ApartmentPaymentsFormFields, BasicApartmentInfoFieldsSchema, BasicApartmentInfoStepFields, BasicApartmentInfoStepSchema, CommonInspectionFields, CommonInspectionFormFields, DetailApartmentInfoFieldsSchema, DetailApartmentInfoStepFields, DetailApartmentInfoStepSchema, ElectricityMeterTypes$1 as ElectricityMeterTypes, FillingInfoFieldsSchema, FillingInfoFormFields, FillingInfoStepFields, FillingListInfoStepFields, HouseServicesInfoFieldsSchema, HouseServicesInfoStepFields, HouseServicesInfoStepSchema, InitialInspectionFieldsBody, InitialInspectionFormFields, InitialInspectionInfoFields, InitialInspectionPostBody, InspectionAppraisalLiteModel, InspectionFieldsSettings, InspectionFillingParams, InspectionImpairmentLiteModel, InspectionMeterCommonFields, InspectionMeterFields$1 as InspectionMeterFields, InspectionMeterValueModel, InspectionMetersStepFields$1 as InspectionMetersStepFields, InspectionPartialMetersStepFields, InspectionRoomImagesParams, InspectionRoomPhotoRequest, InspectionRoomPhotoTypes, InspectionRoomsImagesFields, InspectionTypes, InventoryInspectionFieldsBody, InventoryInspectionFormFields, InventoryInspectionPostBody, InventoryMeterModel, MeterInfoStepProps, MeterTypes$1 as MeterTypes, MeterValueModel, MeterValuesFields, MetersInfoFieldsSchema, MetersInfoStepFields, MetersInfoStepSchema, PartialMeterInfoFields, PartialMeterInfoStepProps, PartialMeterModel, PostApartmentInspectionRequest, QuarterlyInspectionFieldsBody, QuarterlyInspectionFormFields, QuarterlyInspectionPostBody, ResourceTypes, RoomModel, RoomsApartmentInfoFieldsSchema, RoomsApartmentInfoStepFields, RoomsApartmentInfoStepSchema, SecurityApartmentInfoFieldsSchema, SecurityApartmentInfoStepFields, SecurityApartmentInfoStepSchema, TaxesTypes, TelecommunicationsInfoFieldsSchema, TelecommunicationsInfoStepFields, TelecommunicationsInfoStepSchema, TransferInspectionFieldsBody, TransferInspectionFormFields, TransferInspectionPostBody, TransferInspectionTypes, WaterMeterTypes$1 as WaterMeterTypes, getAdditionalInfoStepFields, getApartmentPaymentFields, getBasicApartmentInfoFields, getDetailApartmentInfoFields, getFillingInfoFields, getHouseServicesInfoStep, getMetersInfoStepFields, getPartialMeterInfoFields, getPartialMeterInfoSchema, getRoomsApartmentInfoFields, getRoomsImagesSteps, getSecurityApartmentInfoFields, getTelecommunicationsInfoStepFields, inspectionsRequestBody, inspectionsRequests, renderMetersSteps, useMetersValues };

package/index.js

@@ -186,29 +186,10 @@ var inspectionsRequestBody = {
                 meter_type: meter.type,
                 passport_number: meter.number,
                 photos: metersImages[index],
-                values: clearNotValidFields(_this.getPartialMeterValues(meter)),
+                values: clearNotValidFields(_this.getInspectionMeterValues(meter)),
             }); }),
         };
     },
-    getPartialMeterValues: function (meter) {
-        var _a;
-        if (meter.resource === "electricity") {
-            return {
-                T1: meter.T1,
-                T2: meter.T2,
-                T3: meter.T3,
-            };
-        }
-        if (meter.resource === "water") {
-            if (meter.type === "cold") {
-                return { cold: meter.value };
-            }
-            return { hot: meter.value };
-        }
-        return _a = {},
-            _a[meter.resource] = meter.value,
-            _a;
-    },
     getPostBodyInventoryInspection: function (inspection, roomsImages, fillingFiles, metersFiles, metersImages, fillingImages) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
         return {
@@ -243,26 +224,28 @@ var inspectionsRequestBody = {
     getInventoryInspectionMeters: function (meters, metersFiles, metersImages) {
         var _this = this;
         return {
-            meters: (meters === null || meters === void 0 ? void 0 : meters.map(function (meter, index) { return (__assign(__assign({}, _this.getMeterCommonFields(meter)), { passport: metersFiles[index], values: clearNotValidFields(_this.getInventoryMeterValues(meter)), photos: metersImages[index], no_tariff: meter.noTariff, auto_sending: meter.withAutoSending })); })) || [],
+            meters: (meters === null || meters === void 0 ? void 0 : meters.map(function (meter, index) { return (__assign(__assign({}, _this.getMeterCommonFields(meter)), { passport: metersFiles[index], values: clearNotValidFields(_this.getInspectionMeterValues(meter, "initialValue")), photos: metersImages[index], no_tariff: meter.noTariff, auto_sending: meter.withAutoSending })); })) || [],
         };
     },
-    getInventoryMeterValues: function (meter) {
+    getInspectionMeterValues: function (meter, fieldName) {
         var _a;
         if (meter.resource === "electricity") {
+            var prefix = fieldName || "";
             return {
-                T1: meter.initialValueT1,
-                T2: meter.initialValueT2,
-                T3: meter.initialValueT3,
+                T1: meter["".concat(prefix, "T1")],
+                T2: meter["".concat(prefix, "T2")],
+                T3: meter["".concat(prefix, "T3")],
             };
         }
+        var valueField = (fieldName || "value");
         if (meter.resource === "water") {
             if (meter.type === "cold") {
-                return { cold: meter.initialValue };
+                return { cold: meter[valueField] };
             }
-            return { hot: meter.initialValue };
+            return { hot: meter[valueField] };
         }
         return _a = {},
-            _a[meter.resource] = meter.initialValue,
+            _a[meter.resource] = meter[valueField],
             _a;
     },
     getMeterCommonFields: function (meter) {