@pksep/zod-shared 0.0.532 → 0.0.534

package/dist/user/schemas/user.schema.d.ts

@@ -32,6 +32,7 @@ export declare const UserSchema: z.ZodObject<{
     image: z.ZodOptional<z.ZodNullable<z.ZodString>>;
     session_id: z.ZodNullable<z.ZodNumber>;
     last_online: z.ZodNullable<z.ZodNumber>;
+    createdAt: z.ZodOptional<z.ZodString>;
     rolesId: z.ZodNumber;
     role: z.ZodAny;
     documents: z.ZodArray<z.ZodObject<{
@@ -309,6 +310,7 @@ export declare const UserSchema: z.ZodObject<{
         action: import("../..").IActionText[];
         type_object: string;
         id?: number | null | undefined;
+        createdAt?: string | Date | undefined;
         responsible_id?: number | null | undefined;
         equipment_id?: number | null | undefined;
         user_id?: number | null | undefined;
@@ -338,13 +340,13 @@ export declare const UserSchema: z.ZodObject<{
         role_id?: number | null | undefined;
         parent_action_idL?: number | null | undefined;
         production_task_id?: number | null | undefined;
-        createdAt?: string | Date | undefined;
         revision_id?: number | null | undefined;
     }, {
         action: import("../..").IActionText[];
         type_object: string;
         ban?: boolean | undefined;
         id?: number | null | undefined;
+        createdAt?: string | Date | undefined;
         responsible_id?: number | null | undefined;
         equipment_id?: number | null | undefined;
         user_id?: number | null | undefined;
@@ -374,7 +376,6 @@ export declare const UserSchema: z.ZodObject<{
         role_id?: number | null | undefined;
         parent_action_idL?: number | null | undefined;
         production_task_id?: number | null | undefined;
-        createdAt?: string | Date | undefined;
         revision_id?: number | null | undefined;
     }>, "many">;
     responsibleForProduct: z.ZodArray<z.ZodObject<{
@@ -658,6 +659,7 @@ export declare const UserSchema: z.ZodObject<{
         action: import("../..").IActionText[];
         type_object: string;
         id?: number | null | undefined;
+        createdAt?: string | Date | undefined;
         responsible_id?: number | null | undefined;
         equipment_id?: number | null | undefined;
         user_id?: number | null | undefined;
@@ -687,7 +689,6 @@ export declare const UserSchema: z.ZodObject<{
         role_id?: number | null | undefined;
         parent_action_idL?: number | null | undefined;
         production_task_id?: number | null | undefined;
-        createdAt?: string | Date | undefined;
         revision_id?: number | null | undefined;
     }[];
     responsibleForProduct: {
@@ -751,6 +752,7 @@ export declare const UserSchema: z.ZodObject<{
     }[];
     role?: any;
     image?: string | null | undefined;
+    createdAt?: string | undefined;
     subdivision?: import("../enums").EnumSubdivision | undefined;
 }, {
     banReason: string | null;
@@ -852,6 +854,7 @@ export declare const UserSchema: z.ZodObject<{
         type_object: string;
         ban?: boolean | undefined;
         id?: number | null | undefined;
+        createdAt?: string | Date | undefined;
         responsible_id?: number | null | undefined;
         equipment_id?: number | null | undefined;
         user_id?: number | null | undefined;
@@ -881,7 +884,6 @@ export declare const UserSchema: z.ZodObject<{
         role_id?: number | null | undefined;
         parent_action_idL?: number | null | undefined;
         production_task_id?: number | null | undefined;
-        createdAt?: string | Date | undefined;
         revision_id?: number | null | undefined;
     }[];
     responsibleForProduct: {
@@ -954,6 +956,7 @@ export declare const UserSchema: z.ZodObject<{
         };
     }[] | undefined;
     image?: string | null | undefined;
+    createdAt?: string | undefined;
     subdivision?: import("../enums").EnumSubdivision | undefined;
 }>;
 export type ModelUser = z.infer<typeof UserSchema> & {

package/dist/user/schemas/user.schema.js

@@ -29,6 +29,7 @@ exports.UserSchema = zod_1.z.object({
     image: zod_1.z.string().nullish(),
     session_id: zod_1.z.number().int().nullable(),
     last_online: zod_1.z.number().int().nullable(),
+    createdAt: zod_1.z.string().optional(),
     rolesId: zod_1.z.number().int(),
     role: zod_1.z.any(),
     documents: zod_1.z.array(document_1.DocumentsSchema),

package/dist/utils/index.d.ts

@@ -27,3 +27,4 @@ export * from './default-value/default-value';
 export * from './tables-config/enum';
 export * from './tables-config/methods';
 export * from './tables-config/tables-array';
+export * from './sorting';

package/dist/utils/index.js

@@ -43,3 +43,4 @@ __exportStar(require("./default-value/default-value"), exports);
 __exportStar(require("./tables-config/enum"), exports);
 __exportStar(require("./tables-config/methods"), exports);
 __exportStar(require("./tables-config/tables-array"), exports);
+__exportStar(require("./sorting"), exports);

package/dist/utils/methods.d.ts

@@ -22,10 +22,6 @@ export declare function moreMinusNum(num: number): number;
  */
 export declare function getFieldsSpetification(list: EntityCommonSpecification[], subKey: keyof EntityCommonSpecification): (string | number | boolean | undefined)[] | null;
 export declare const calculateByMeasurementRate: (units_measurement: IUnitsMeasurement[], ezId: number) => number;
-/**
- * Функция проверяет, является ли введенное обозначение исключением
- */
-export declare function isThisExclusionDesignation(designation: string, isProduct?: boolean): boolean;
 /**
  *
  * @param marks

package/dist/utils/methods.js

@@ -23,7 +23,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.intersect = exports.shipmentsNullOne = exports.differencesShipments = exports.dateDifference = exports.toFormatString = exports.comparison = exports.comparisonTimestamp = exports.parseDate = exports.dataFormat = exports.dateToTimestampFormat = exports.convertStringValuesToNumbers = exports.dateToFormat = exports.photoPreloadUrl = exports.isImage = exports.getReversDate = exports.isValidNumber = exports.returnTypePosition = exports.checkMissingEntity = exports.countChildrensRelative = exports.concatedLists = exports.countUniqueValueChildren = exports.removeArrDublicateByAttr = exports.getOnCommonListChildrens = exports.sleep = exports.parseBoolean = exports.strIsBoolean = exports.useWorkpieceCharacterizationItems = exports.getFileType = exports.calculateStartDate = exports.calculateEndDate = exports.WORK_DAY_END_MINUTE = exports.WORK_DAY_END_HOUR = exports.WORK_DAY_START_HOUR = exports.leftToDoByProductionTask = exports.calculateByMeasurementRate = void 0;
 exports.moreMinusNum = moreMinusNum;
 exports.getFieldsSpetification = getFieldsSpetification;
-exports.isThisExclusionDesignation = isThisExclusionDesignation;
 exports.organiseListCbedDetal = organiseListCbedDetal;
 exports.getFieldBySpetificationList = getFieldBySpetificationList;
 exports.lessPlusNum = lessPlusNum;
@@ -80,24 +79,6 @@ const calculateByMeasurementRate = (units_measurement, ezId) => {
     return convertRate;
 };
 exports.calculateByMeasurementRate = calculateByMeasurementRate;
-/**
- * Функция проверяет, является ли введенное обозначение исключением
- */
-function isThisExclusionDesignation(designation, isProduct = false) {
-    let exclusions = ['-', '', '?', '- архив'];
-    const productExclusions = [
-        'покупной',
-        '',
-        'ремонт',
-        'документ',
-        'оснастка',
-        'опция'
-    ];
-    if (isProduct)
-        exclusions = exclusions.concat(productExclusions);
-    const lowerDesignation = `${designation}`.toLowerCase();
-    return exclusions.includes(lowerDesignation);
-}
 /**
  *
  * @param marks
@@ -784,7 +765,7 @@ const countChildrensRelative = (data) => {
                     const foundedCbed = cbeds.find(cbed => listCbedItem.id === cbed.id);
                     return Object.assign(Object.assign(Object.assign({}, foundedCbed), (0, sequelize_1.addFieldByCondition)(data.isNeedsTypes, {
                         entity_type: enums_1.IzdType.cbed
-                    })), { count_to_obj: listCbedItem.quantity, count_to_needs: relativeNeeds * listCbedItem.quantity, needs: relativeNeeds * listCbedItem.quantity, parent_id: relative.id, parent_type: relativeType, parent_designation: (relative === null || relative === void 0 ? void 0 : relative.designation) || '-', parent_name: (relative === null || relative === void 0 ? void 0 : relative.name) || '-' });
+                    })), { count_to_obj: listCbedItem.quantity, count_to_needs: relativeNeeds * listCbedItem.quantity, needs: relativeNeeds * listCbedItem.quantity, parent_id: relative.id, parent_type: relativeType, parent_ava: relative === null || relative === void 0 ? void 0 : relative.ava_path, parent_designation: (relative === null || relative === void 0 ? void 0 : relative.designation) || '-', parent_name: (relative === null || relative === void 0 ? void 0 : relative.name) || '-' });
                 })) || [];
             relative.cbedGraph = [...relative.cbeds];
         }
@@ -794,7 +775,7 @@ const countChildrensRelative = (data) => {
                     const foundedDetal = detals.find(detal => listDetalItem.id === detal.id);
                     return Object.assign(Object.assign(Object.assign({}, foundedDetal), (0, sequelize_1.addFieldByCondition)(data.isNeedsTypes, {
                         entity_type: enums_1.IzdType.detal
-                    })), { count_to_obj: listDetalItem.quantity, count_to_needs: relativeNeeds * listDetalItem.quantity, needs: relativeNeeds * listDetalItem.quantity, parent_id: relative.id, parent_type: relativeType, parent_designation: (relative === null || relative === void 0 ? void 0 : relative.designation) || '-', parent_name: (relative === null || relative === void 0 ? void 0 : relative.name) || '-' });
+                    })), { count_to_obj: listDetalItem.quantity, count_to_needs: relativeNeeds * listDetalItem.quantity, needs: relativeNeeds * listDetalItem.quantity, parent_id: relative.id, parent_type: relativeType, parent_ava: relative === null || relative === void 0 ? void 0 : relative.ava_path, parent_designation: (relative === null || relative === void 0 ? void 0 : relative.designation) || '-', parent_name: (relative === null || relative === void 0 ? void 0 : relative.name) || '-' });
                 })) || [];
             relative.detalsGraph = [...relative.detals];
         }
@@ -837,7 +818,7 @@ const countChildrensRelative = (data) => {
                         : 0;
                 return Object.assign(Object.assign(Object.assign({}, foundedMaterials), (0, sequelize_1.addFieldByCondition)(data.isNeedsTypes, {
                     entity_type: enums_1.IzdType.material
-                })), { measure_id: listMaterialItem.measureId, count_to_obj_not_converted: listMaterialItem.quantity, count_to_needs_not_converted: relativeNeeds * listMaterialItem.quantity, count_to_obj: specificationConvertedQuantity, count_to_needs: relativeNeeds * specificationConvertedQuantity, needs: relativeNeeds * specificationConvertedQuantity, parent_id: relative.id, parent_type: relativeType, parent_designation: (relative === null || relative === void 0 ? void 0 : relative.designation) || '-', parent_name: (relative === null || relative === void 0 ? void 0 : relative.name) || '-' });
+                })), { measure_id: listMaterialItem.measureId, count_to_obj_not_converted: listMaterialItem.quantity, count_to_needs_not_converted: relativeNeeds * listMaterialItem.quantity, count_to_obj: specificationConvertedQuantity, count_to_needs: relativeNeeds * specificationConvertedQuantity, needs: relativeNeeds * specificationConvertedQuantity, parent_id: relative.id, parent_type: relativeType, parent_ava: relative === null || relative === void 0 ? void 0 : relative.ava_path, parent_designation: (relative === null || relative === void 0 ? void 0 : relative.designation) || '-', parent_name: (relative === null || relative === void 0 ? void 0 : relative.name) || '-' });
             });
             materialsArray.forEach((currentMaterial) => {
                 const materialKey = `${currentMaterial.parent_id}_${currentMaterial.parent_type}_${currentMaterial.id}`;

package/dist/utils/sorting.d.ts

@@ -0,0 +1,25 @@
+import { z } from 'zod';
+type SortValue = Date | number | string | boolean | null | undefined;
+type SortSelector<T> = (item: T) => SortValue;
+export declare enum ProductionPlanSortField {
+    calculateNeedsTime = "calculateNeedsTime",
+    calculatedCreateTime = "calculatedCreateTime",
+    warehouseReadinessDate = "warehouseReadinessDate",
+    orderedByProduction = "orderedByProduction"
+}
+export type ProductionPlanSortRule = {
+    sortField?: ProductionPlanSortField | null;
+    sortDesc?: boolean;
+};
+export declare const ProductionPlanSortRuleSchema: z.ZodObject<{
+    sortField: z.ZodOptional<z.ZodNullable<z.ZodNativeEnum<typeof ProductionPlanSortField>>>;
+    sortDesc: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
+}, "strip", z.ZodTypeAny, {
+    sortDesc: boolean;
+    sortField?: ProductionPlanSortField | null | undefined;
+}, {
+    sortField?: ProductionPlanSortField | null | undefined;
+    sortDesc?: boolean | undefined;
+}>;
+export declare const sortByRules: <T>(items: T[], rules: ProductionPlanSortRule[] | null | undefined, selectors: Partial<Record<ProductionPlanSortField, SortSelector<T>>>) => T[];
+export {};

package/dist/utils/sorting.js

@@ -0,0 +1,56 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.sortByRules = exports.ProductionPlanSortRuleSchema = exports.ProductionPlanSortField = void 0;
+const zod_1 = require("zod");
+var ProductionPlanSortField;
+(function (ProductionPlanSortField) {
+    ProductionPlanSortField["calculateNeedsTime"] = "calculateNeedsTime";
+    ProductionPlanSortField["calculatedCreateTime"] = "calculatedCreateTime";
+    ProductionPlanSortField["warehouseReadinessDate"] = "warehouseReadinessDate";
+    ProductionPlanSortField["orderedByProduction"] = "orderedByProduction";
+})(ProductionPlanSortField || (exports.ProductionPlanSortField = ProductionPlanSortField = {}));
+exports.ProductionPlanSortRuleSchema = zod_1.z.object({
+    sortField: zod_1.z.nativeEnum(ProductionPlanSortField).nullable().optional(),
+    sortDesc: zod_1.z.boolean().optional().default(false)
+});
+const normalizeSortValue = (value) => {
+    if (value instanceof Date)
+        return value.getTime();
+    if (typeof value === 'string') {
+        const dateTime = Date.parse(value);
+        return Number.isNaN(dateTime) ? value.toLocaleLowerCase() : dateTime;
+    }
+    return value;
+};
+const compareValues = (firstValue, secondValue, desc = false) => {
+    const isFirstNull = firstValue === null || firstValue === undefined;
+    const isSecondNull = secondValue === null || secondValue === undefined;
+    if (isFirstNull || isSecondNull) {
+        if (isFirstNull && isSecondNull)
+            return 0;
+        return isFirstNull ? (desc ? -1 : 1) : desc ? 1 : -1;
+    }
+    const normalizedFirstValue = normalizeSortValue(firstValue);
+    const normalizedSecondValue = normalizeSortValue(secondValue);
+    if (normalizedFirstValue < normalizedSecondValue)
+        return desc ? 1 : -1;
+    if (normalizedFirstValue > normalizedSecondValue)
+        return desc ? -1 : 1;
+    return 0;
+};
+const sortByRules = (items, rules, selectors) => {
+    const activeRules = (rules !== null && rules !== void 0 ? rules : []).filter(rule => rule.sortField && selectors[rule.sortField]);
+    if (!activeRules.length)
+        return items;
+    return [...items].sort((firstItem, secondItem) => {
+        var _a;
+        for (const rule of activeRules) {
+            const selector = selectors[rule.sortField];
+            const result = compareValues(selector(firstItem), selector(secondItem), (_a = rule.sortDesc) !== null && _a !== void 0 ? _a : false);
+            if (result !== 0)
+                return result;
+        }
+        return 0;
+    });
+};
+exports.sortByRules = sortByRules;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pksep/zod-shared",
-  "version": "0.0.532",
+  "version": "0.0.534",
   "description": "Zod package for erp project. Contains dto, interfaces, schems, types, enum",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",