@pksep/zod-shared 0.0.519 → 0.0.521

package/dist/product/dto/get-deficit.dto.js

@@ -6,7 +6,6 @@ const utils_1 = require("../../utils");
 exports.GetDeficitProductSchema = zod_1.z.object({
     productIds: zod_1.z.number().int().array(),
     statusWorking: zod_1.z.nativeEnum(utils_1.statusWorkingsDeficit),
-    statusDeficit: zod_1.z.nativeEnum(utils_1.enumDeficit),
     searchString: zod_1.z.string(),
     shipmentIds: zod_1.z.number().int().array().optional().nullable(),
     page: zod_1.z.number().int().optional()

package/dist/product/schemas/product-deficit.schema.d.ts

@@ -33,7 +33,6 @@ export declare const ProductDeficitSchema: z.ZodObject<{
         ban: z.ZodDefault<z.ZodBoolean>;
         date_order: z.ZodDate;
         date_shipments: z.ZodDate;
-        date_by_urgency: z.ZodDate;
         number_order: z.ZodString;
         kol: z.ZodNumber;
         bron: z.ZodDefault<z.ZodBoolean>;
@@ -92,7 +91,6 @@ export declare const ProductDeficitSchema: z.ZodObject<{
         date_shipments: Date;
         productId: number;
         date_order: Date;
-        date_by_urgency: Date;
         bron: boolean;
         is_custom_product: boolean;
         buyerId: number;
@@ -121,7 +119,6 @@ export declare const ProductDeficitSchema: z.ZodObject<{
         date_shipments: Date;
         productId: number;
         date_order: Date;
-        date_by_urgency: Date;
         buyerId: number;
         manager_id: number;
         status?: string | undefined;
@@ -158,7 +155,6 @@ export declare const ProductDeficitSchema: z.ZodObject<{
         date_shipments: Date;
         productId: number;
         date_order: Date;
-        date_by_urgency: Date;
         bron: boolean;
         is_custom_product: boolean;
         buyerId: number;
@@ -216,7 +212,6 @@ export declare const ProductDeficitSchema: z.ZodObject<{
         date_shipments: Date;
         productId: number;
         date_order: Date;
-        date_by_urgency: Date;
         buyerId: number;
         manager_id: number;
         status?: string | undefined;

package/dist/production-tasks/interfaces/production-tasks.d.ts

@@ -51,6 +51,7 @@ export interface IrecalculateStartTimeDetalByEquipment {
     equipmentId: number;
     startTime?: Date;
     transaction?: any;
+    preventTaskRelative?: boolean;
 }
 export interface IFilterByDate<T> {
     itemToSort: T[];
@@ -198,6 +199,11 @@ export interface IGetActualTaskRelative {
     };
     transaction?: any;
 }
+export interface IRelevanceOfProductionTask {
+    operationId: number;
+    isStopActualPositions?: boolean;
+    transaction?: any;
+}
 export interface IActualOperationPos {
     userId: number;
     indexStartFrom?: number | null;

package/dist/production-tasks/schemas/operation-positions.schema.d.ts

@@ -14,7 +14,9 @@ export declare const OperationPositionSchema: z.ZodObject<{
     equipment_id: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
     production_operation_pos_id: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
     operation_id: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
+    count_created: z.ZodDefault<z.ZodNumber>;
     plan_ready_time: z.ZodOptional<z.ZodNullable<z.ZodDate>>;
+    is_relevance: z.ZodDefault<z.ZodBoolean>;
     createdAt: z.ZodDate;
     updatedAt: z.ZodDate;
 }, "strip", z.ZodTypeAny, {
@@ -23,6 +25,8 @@ export declare const OperationPositionSchema: z.ZodObject<{
     createdAt: Date;
     updatedAt: Date;
     create_time_minutes: number;
+    count_created: number;
+    is_relevance: boolean;
     user_id?: number | null | undefined;
     idx?: number | undefined;
     equipment_id?: number | null | undefined;
@@ -44,7 +48,9 @@ export declare const OperationPositionSchema: z.ZodObject<{
     detal_idx?: number | undefined;
     create_time_minutes?: number | undefined;
     production_operation_pos_id?: number | null | undefined;
+    count_created?: number | undefined;
     plan_ready_time?: Date | null | undefined;
+    is_relevance?: boolean | undefined;
 }>;
 export type ModelOperationPosition = z.infer<typeof OperationPositionSchema> & {
     responsibleUser?: ModelUser;

package/dist/production-tasks/schemas/operation-positions.schema.js

@@ -13,7 +13,9 @@ exports.OperationPositionSchema = zod_1.z.object({
     equipment_id: zod_1.z.number().int().nullish(),
     production_operation_pos_id: zod_1.z.number().nullish(),
     operation_id: zod_1.z.number().int().nullish(),
+    count_created: zod_1.z.number().int().nonnegative().default(0),
     plan_ready_time: zod_1.z.date().nullish(),
+    is_relevance: zod_1.z.boolean().default(true),
     createdAt: zod_1.z.date(),
     updatedAt: zod_1.z.date()
 });

package/dist/sclad/dto/set-warehouse-readiness-date.dto.d.ts

@@ -0,0 +1,12 @@
+import { z } from 'zod';
+export declare const setWarehouseReadinessDateSchema: z.ZodObject<{
+    id: z.ZodNumber;
+    date: z.ZodOptional<z.ZodNullable<z.ZodString>>;
+}, "strip", z.ZodTypeAny, {
+    id: number;
+    date?: string | null | undefined;
+}, {
+    id: number;
+    date?: string | null | undefined;
+}>;
+export type setWarehouseReadinessDateDto = z.infer<typeof setWarehouseReadinessDateSchema>;

package/dist/sclad/dto/set-warehouse-readiness-date.dto.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setWarehouseReadinessDateSchema = void 0;
+const zod_1 = require("zod");
+exports.setWarehouseReadinessDateSchema = zod_1.z.object({
+    id: zod_1.z.number(),
+    date: zod_1.z.string().nullish()
+});

package/dist/shipments/dto/shipments-list-pagination-response.dto.d.ts

@@ -2,7 +2,6 @@ import { z } from 'zod';
 export declare const ShipmentsListPaginationResponseSchema: z.ZodObject<{
     count: z.ZodNumber;
     rows: z.ZodArray<z.ZodObject<{
-        date_by_urgency: z.ZodUnion<[z.ZodString, z.ZodDate]>;
         date_shipments: z.ZodUnion<[z.ZodString, z.ZodDate]>;
         id: z.ZodNumber;
         number_order: z.ZodString;
@@ -100,7 +99,6 @@ export declare const ShipmentsListPaginationResponseSchema: z.ZodObject<{
         id: number;
         number_order: string;
         date_shipments: string | Date;
-        date_by_urgency: string | Date;
         product?: {
             id: number;
             name: string;
@@ -133,7 +131,6 @@ export declare const ShipmentsListPaginationResponseSchema: z.ZodObject<{
         id: number;
         number_order: string;
         date_shipments: string | Date;
-        date_by_urgency: string | Date;
         product?: {
             id: number;
             name: string;
@@ -169,7 +166,6 @@ export declare const ShipmentsListPaginationResponseSchema: z.ZodObject<{
         id: number;
         number_order: string;
         date_shipments: string | Date;
-        date_by_urgency: string | Date;
         product?: {
             id: number;
             name: string;
@@ -205,7 +201,6 @@ export declare const ShipmentsListPaginationResponseSchema: z.ZodObject<{
         id: number;
         number_order: string;
         date_shipments: string | Date;
-        date_by_urgency: string | Date;
         product?: {
             id: number;
             name: string;

package/dist/shipments/index.d.ts

@@ -15,7 +15,6 @@ export * from './dto/shipments-paginate.dto';
 export * from './dto/up-create-shipments.dto';
 export * from './types/increment-shipments-kolvo.type';
 export * from './types/update-shipments-by-product.type';
-export * from './dto/change-date-urgency.dto';
 export * from './dto/format-list-shipment.dto';
 export * from './interface/interface';
 export * from './dto/entity-filtering-by-shipment.dto';

package/dist/shipments/index.js

@@ -31,7 +31,6 @@ __exportStar(require("./dto/shipments-paginate.dto"), exports);
 __exportStar(require("./dto/up-create-shipments.dto"), exports);
 __exportStar(require("./types/increment-shipments-kolvo.type"), exports);
 __exportStar(require("./types/update-shipments-by-product.type"), exports);
-__exportStar(require("./dto/change-date-urgency.dto"), exports);
 __exportStar(require("./dto/format-list-shipment.dto"), exports);
 __exportStar(require("./interface/interface"), exports);
 __exportStar(require("./dto/entity-filtering-by-shipment.dto"), exports);

package/dist/shipments/schemas/shipment-list-item.schema.d.ts

@@ -1,6 +1,5 @@
 import { z } from 'zod';
 export declare const ShipmentListItem: z.ZodObject<{
-    date_by_urgency: z.ZodUnion<[z.ZodString, z.ZodDate]>;
     date_shipments: z.ZodUnion<[z.ZodString, z.ZodDate]>;
     id: z.ZodNumber;
     number_order: z.ZodString;
@@ -98,7 +97,6 @@ export declare const ShipmentListItem: z.ZodObject<{
     id: number;
     number_order: string;
     date_shipments: string | Date;
-    date_by_urgency: string | Date;
     product?: {
         id: number;
         name: string;
@@ -131,7 +129,6 @@ export declare const ShipmentListItem: z.ZodObject<{
     id: number;
     number_order: string;
     date_shipments: string | Date;
-    date_by_urgency: string | Date;
     product?: {
         id: number;
         name: string;

package/dist/shipments/schemas/shipment-list-item.schema.js

@@ -5,7 +5,6 @@ const zod_1 = require("zod");
 const shipments_detal_schema_1 = require("./shipments-detal.schema");
 const shipments_cbed_schema_1 = require("./shipments-cbed.schema");
 exports.ShipmentListItem = zod_1.z.object({
-    date_by_urgency: zod_1.z.union([zod_1.z.string(), zod_1.z.date()]),
     date_shipments: zod_1.z.union([zod_1.z.string(), zod_1.z.date()]),
     id: zod_1.z.number().int(),
     number_order: zod_1.z.string(),

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

@@ -16,7 +16,6 @@ export declare const ShipmentsSchema: z.ZodObject<{
     ban: z.ZodDefault<z.ZodBoolean>;
     date_order: z.ZodDate;
     date_shipments: z.ZodDate;
-    date_by_urgency: z.ZodDate;
     number_order: z.ZodString;
     kol: z.ZodNumber;
     bron: z.ZodDefault<z.ZodBoolean>;
@@ -75,7 +74,6 @@ export declare const ShipmentsSchema: z.ZodObject<{
     date_shipments: Date;
     productId: number;
     date_order: Date;
-    date_by_urgency: Date;
     bron: boolean;
     is_custom_product: boolean;
     buyerId: number;
@@ -104,7 +102,6 @@ export declare const ShipmentsSchema: z.ZodObject<{
     date_shipments: Date;
     productId: number;
     date_order: Date;
-    date_by_urgency: Date;
     buyerId: number;
     manager_id: number;
     status?: string | undefined;

package/dist/shipments/schemas/shipments.schema.js

@@ -9,7 +9,6 @@ exports.ShipmentsSchema = zod_1.z.object({
     ban: zod_1.z.boolean().default(false),
     date_order: zod_1.z.date(),
     date_shipments: zod_1.z.date(),
-    date_by_urgency: zod_1.z.date(),
     number_order: zod_1.z.string(),
     kol: zod_1.z.number().int().nonnegative(),
     bron: zod_1.z.boolean().default(false),

package/dist/specification/schema/attributes.schema.d.ts

@@ -896,7 +896,6 @@ export declare const SpecificationAttributesSchema: z.ZodObject<{
             ban: z.ZodDefault<z.ZodBoolean>;
             date_order: z.ZodDate;
             date_shipments: z.ZodDate;
-            date_by_urgency: z.ZodDate;
             number_order: z.ZodString;
             kol: z.ZodNumber;
             bron: z.ZodDefault<z.ZodBoolean>;
@@ -955,7 +954,6 @@ export declare const SpecificationAttributesSchema: z.ZodObject<{
             date_shipments: Date;
             productId: number;
             date_order: Date;
-            date_by_urgency: Date;
             bron: boolean;
             is_custom_product: boolean;
             buyerId: number;
@@ -984,7 +982,6 @@ export declare const SpecificationAttributesSchema: z.ZodObject<{
             date_shipments: Date;
             productId: number;
             date_order: Date;
-            date_by_urgency: Date;
             buyerId: number;
             manager_id: number;
             status?: string | undefined;
@@ -1082,7 +1079,6 @@ export declare const SpecificationAttributesSchema: z.ZodObject<{
             date_shipments: Date;
             productId: number;
             date_order: Date;
-            date_by_urgency: Date;
             bron: boolean;
             is_custom_product: boolean;
             buyerId: number;
@@ -1364,7 +1360,6 @@ export declare const SpecificationAttributesSchema: z.ZodObject<{
             date_shipments: Date;
             productId: number;
             date_order: Date;
-            date_by_urgency: Date;
             buyerId: number;
             manager_id: number;
             status?: string | undefined;
@@ -2456,7 +2451,6 @@ export declare const SpecificationAttributesSchema: z.ZodObject<{
             date_shipments: Date;
             productId: number;
             date_order: Date;
-            date_by_urgency: Date;
             bron: boolean;
             is_custom_product: boolean;
             buyerId: number;
@@ -2887,7 +2881,6 @@ export declare const SpecificationAttributesSchema: z.ZodObject<{
             date_shipments: Date;
             productId: number;
             date_order: Date;
-            date_by_urgency: Date;
             buyerId: number;
             manager_id: number;
             status?: string | undefined;

package/dist/user/dto/get-one-user.dto.d.ts

@@ -0,0 +1,16 @@
+import { z } from 'zod';
+export declare const UserIncludeSchema: z.ZodEnum<["role", "documents", "avatars", "detals", "cbeds", "products", "equipments", "actions", "actionsUser", "responsibleForProduct", "responsibleForDocuments", "typeOperations", "tableConfigs"]>;
+export declare const GetOneUserDtoSchema: z.ZodObject<{
+    id: z.ZodNumber;
+    includes: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodEnum<["role", "documents", "avatars", "detals", "cbeds", "products", "equipments", "actions", "actionsUser", "responsibleForProduct", "responsibleForDocuments", "typeOperations", "tableConfigs"]>, "many">>>, ("role" | "documents" | "equipments" | "actions" | "products" | "cbeds" | "responsibleForProduct" | "responsibleForDocuments" | "typeOperations" | "detals" | "avatars" | "actionsUser" | "tableConfigs")[], unknown>;
+    attributes: z.ZodEffects<z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodString, "many">>>, string[], unknown>;
+}, "strip", z.ZodTypeAny, {
+    includes: ("role" | "documents" | "equipments" | "actions" | "products" | "cbeds" | "responsibleForProduct" | "responsibleForDocuments" | "typeOperations" | "detals" | "avatars" | "actionsUser" | "tableConfigs")[];
+    id: number;
+    attributes: string[];
+}, {
+    id: number;
+    includes?: unknown;
+    attributes?: unknown;
+}>;
+export type GetOneUserDtoType = z.infer<typeof GetOneUserDtoSchema>;

package/dist/user/dto/get-one-user.dto.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GetOneUserDtoSchema = exports.UserIncludeSchema = void 0;
+const zod_1 = require("zod");
+const utils_1 = require("../../utils");
+exports.UserIncludeSchema = zod_1.z.enum([
+    'role',
+    'documents',
+    'avatars',
+    'detals',
+    'cbeds',
+    'products',
+    'equipments',
+    'actions',
+    'actionsUser',
+    'responsibleForProduct',
+    'responsibleForDocuments',
+    'typeOperations',
+    'tableConfigs'
+]);
+exports.GetOneUserDtoSchema = zod_1.z.object({
+    id: zod_1.z.number(),
+    includes: zod_1.z.preprocess(value => typeof value === 'string' ? (0, utils_1.parseParamsOrBody)({ value }, []) : value, zod_1.z.array(exports.UserIncludeSchema).optional().default([])),
+    attributes: zod_1.z.preprocess(value => typeof value === 'string' ? (0, utils_1.parseParamsOrBody)({ value }, []) : value, zod_1.z.array(zod_1.z.string()).optional().default([]))
+});

package/dist/user/index.d.ts

@@ -1,6 +1,7 @@
 export * from './dto/add-role.dto';
 export * from './dto/ban-user.dto';
 export * from './dto/get-users.dto';
+export * from './dto/get-one-user.dto';
 export * from './dto/create-user.dto';
 export * from './schemas/user.schema';
 export * from './interfaces/create-user.interface';
@@ -8,3 +9,5 @@ export * from './dto/tabel-unique.dto';
 export * from './default-value/model';
 export * from './dto/auth-user.dto';
 export * from './enums';
+export * from './schemas/user-table-config.schema';
+export * from './dto/update-user-table-config.dto';

package/dist/user/index.js

@@ -17,6 +17,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./dto/add-role.dto"), exports);
 __exportStar(require("./dto/ban-user.dto"), exports);
 __exportStar(require("./dto/get-users.dto"), exports);
+__exportStar(require("./dto/get-one-user.dto"), exports);
 __exportStar(require("./dto/create-user.dto"), exports);
 __exportStar(require("./schemas/user.schema"), exports);
 __exportStar(require("./interfaces/create-user.interface"), exports);
@@ -24,3 +25,5 @@ __exportStar(require("./dto/tabel-unique.dto"), exports);
 __exportStar(require("./default-value/model"), exports);
 __exportStar(require("./dto/auth-user.dto"), exports);
 __exportStar(require("./enums"), exports);
+__exportStar(require("./schemas/user-table-config.schema"), exports);
+__exportStar(require("./dto/update-user-table-config.dto"), exports);

package/dist/utils/date.methods.d.ts

@@ -28,7 +28,13 @@ export declare class DateMethods {
      * @param planReadyTime
      * @returns
      */
-    calculateDeltaTime: (calculatedCreateTime: Date, planReadyTime: Date) => number;
+    calculateDeltaTime: (calculatedCreateTime: Date, planReadyTime: Date, config?: {
+        holidays?: Array<{
+            month: number;
+            day: number;
+        }>;
+        skipDefaultJanuaryHolidays?: boolean;
+    }) => number;
     /**
      * Функция возвращает текущее время в UTC формате
      * @param config

package/dist/utils/date.methods.js

@@ -54,11 +54,58 @@ class DateMethods {
          * @param planReadyTime
          * @returns
          */
-        this.calculateDeltaTime = (calculatedCreateTime, planReadyTime) => {
-            const calculateDate = new Date(calculatedCreateTime);
-            const planReadyDate = new Date(planReadyTime);
-            const diffInMs = planReadyDate.getTime() - calculateDate.getTime();
-            return Math.round(diffInMs / (1000 * 60));
+        this.calculateDeltaTime = (calculatedCreateTime, planReadyTime, config) => {
+            const calculatedCreateTimeDate = new Date(calculatedCreateTime);
+            const planReadyTimeDate = new Date(planReadyTime);
+            const sign = calculatedCreateTimeDate <= planReadyTimeDate ? 1 : -1;
+            const start = calculatedCreateTimeDate <= planReadyTimeDate
+                ? calculatedCreateTimeDate
+                : planReadyTimeDate;
+            const end = calculatedCreateTimeDate <= planReadyTimeDate
+                ? planReadyTimeDate
+                : calculatedCreateTimeDate;
+            const workDayStartHour = 5;
+            const workDayHours = 8;
+            const workDayEndHour = workDayStartHour + workDayHours;
+            const isWorkDay = (date) => {
+                var _a, _b;
+                const dayOfWeek = date.getUTCDay();
+                const month = date.getUTCMonth();
+                const day = date.getUTCDate();
+                const skipJanuary = (_a = config === null || config === void 0 ? void 0 : config.skipDefaultJanuaryHolidays) !== null && _a !== void 0 ? _a : true;
+                if (skipJanuary && month === 0 && day >= 1 && day <= 14) {
+                    return false;
+                }
+                if ((_b = config === null || config === void 0 ? void 0 : config.holidays) === null || _b === void 0 ? void 0 : _b.length) {
+                    const isHoliday = config.holidays.some((h) => h.month === month && h.day === day);
+                    if (isHoliday) {
+                        return false;
+                    }
+                }
+                return dayOfWeek !== 0 && dayOfWeek !== 6;
+            };
+            let totalMinutes = 0;
+            const current = new Date(start);
+            while (current < end) {
+                if (!isWorkDay(current)) {
+                    current.setUTCDate(current.getUTCDate() + 1);
+                    current.setUTCHours(0, 0, 0, 0);
+                    continue;
+                }
+                const workStart = new Date(current);
+                workStart.setUTCHours(workDayStartHour, 0, 0, 0);
+                const workEnd = new Date(current);
+                workEnd.setUTCHours(workDayEndHour, 0, 0, 0);
+                const actualStart = current > workStart ? current : workStart;
+                const actualEnd = end < workEnd ? end : workEnd;
+                if (actualStart < actualEnd) {
+                    totalMinutes +=
+                        (actualEnd.getTime() - actualStart.getTime()) / (1000 * 60);
+                }
+                current.setUTCDate(current.getUTCDate() + 1);
+                current.setUTCHours(0, 0, 0, 0);
+            }
+            return Math.round(totalMinutes) * sign;
         };
         /**
          * Функция возвращает текущее время в UTC формате

package/dist/utils/index.d.ts

@@ -24,3 +24,6 @@ export * from './interfaces';
 export * from './methods/utils';
 export * from './promise-pool';
 export * from './default-value/default-value';
+export * from './tables-config/enum';
+export * from './tables-config/methods';
+export * from './tables-config/tables-array';

package/dist/utils/index.js

@@ -40,3 +40,6 @@ __exportStar(require("./interfaces"), exports);
 __exportStar(require("./methods/utils"), exports);
 __exportStar(require("./promise-pool"), exports);
 __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);

package/dist/utils/methods.d.ts

@@ -40,21 +40,27 @@ export declare const leftToDoByProductionTask: (marks: ModelMarks[], myQuantity:
  * @param startDate
  * @param totalMinutes
  * @returns
- * Возвращает время окончания работы над ТЗ
- * Обратить внимание, что считается только рабочее время.
- * Суббота и воскресенье не считаются за рабочий день.
- */
-/**
- *
- * @param startDate
- * @param totalMinutes
- * @returns
- * Возвращает время окончания работы над ТЗ
+ * Возвращает время окончания работы над ПЗ
  * Обратить внимание, что считается только рабочее время.
  * Суббота и воскресенье не считаются за рабочий день.
  * Если startDate выходит за пределы рабочего времени, отсчет начинается от ближайшей рабочей даты.
  */
-export declare const calculateEndDate: (startDate: Date, totalMinutes: number) => Date;
+export interface HolidayConfig {
+    /**
+     * Массив кастомных выходных дней
+     * month: 0-11 (где 0 - январь), day: 1-31
+     */
+    holidays?: Array<{
+        month: number;
+        day: number;
+    }>;
+    /**
+     * Пропускать стандартные новогодние праздники (с 1 по 14 января).
+     * По умолчанию true.
+     */
+    skipDefaultJanuaryHolidays?: boolean;
+}
+export declare const calculateEndDate: (startDate: Date, totalMinutes: number, config?: HolidayConfig) => Date;
 /**
  * Функция получает сущность и генерирует из него элемент спецификации
  * @param entity

package/dist/utils/methods.js

@@ -113,26 +113,7 @@ const leftToDoByProductionTask = (marks, myQuantity) => {
     return moreMinusNum(myQuantity - createByMarks);
 };
 exports.leftToDoByProductionTask = leftToDoByProductionTask;
-/**
- *
- * @param startDate
- * @param totalMinutes
- * @returns
- * Возвращает время окончания работы над ТЗ
- * Обратить внимание, что считается только рабочее время.
- * Суббота и воскресенье не считаются за рабочий день.
- */
-/**
- *
- * @param startDate
- * @param totalMinutes
- * @returns
- * Возвращает время окончания работы над ТЗ
- * Обратить внимание, что считается только рабочее время.
- * Суббота и воскресенье не считаются за рабочий день.
- * Если startDate выходит за пределы рабочего времени, отсчет начинается от ближайшей рабочей даты.
- */
-const calculateEndDate = (startDate, totalMinutes) => {
+const calculateEndDate = (startDate, totalMinutes, config) => {
     let currentDate = new Date(startDate);
     let remainingMinutes = totalMinutes;
     const workDayStartHour = 5;
@@ -140,7 +121,21 @@ const calculateEndDate = (startDate, totalMinutes) => {
     const workDayEndHour = workDayStartHour + workDayHours;
     // Функция для проверки, является ли дата рабочим днем
     const isWorkDay = (date) => {
+        var _a, _b;
         const dayOfWeek = date.getUTCDay();
+        const month = date.getUTCMonth();
+        const day = date.getUTCDate();
+        const skipJanuary = (_a = config === null || config === void 0 ? void 0 : config.skipDefaultJanuaryHolidays) !== null && _a !== void 0 ? _a : true;
+        if (skipJanuary && month === 0 && day >= 1 && day <= 14) {
+            return false;
+        }
+        // Проверяем кастомные праздники из конфига
+        if ((_b = config === null || config === void 0 ? void 0 : config.holidays) === null || _b === void 0 ? void 0 : _b.length) {
+            const isHoliday = config.holidays.some(holiday => holiday.month === month && holiday.day === day);
+            if (isHoliday) {
+                return false;
+            }
+        }
         return dayOfWeek !== 0 && dayOfWeek !== 6;
     };
     const getWorkDayStart = (date) => {

package/dist/utils/operation.d.ts

@@ -25,7 +25,7 @@ export declare class OperationTime {
         preTime: number;
         mainTime: number;
         helperTime: number;
-    } | null, count?: number);
+    } | null | ModelOperation, count?: number);
     private timeKolvo;
 }
 export declare function worksHors(operation: any, kolvo_all?: number): number;

package/dist/utils/tables-config/methods.d.ts

@@ -1,5 +1,9 @@
 import { UserTableConfigItem } from '../../user';
 import { tablesEnumConfig } from './enum';
 export declare const generateDefaultConfigArray: (configArray: tablesEnumConfig[]) => UserTableConfigItem[];
+/**
+ * Возвращает список колонок из `arrayToCheck`, которые отсутствуют в текущей конфигурации `columns`.
+ * Используется на фронтенде для определения недостающих колонок в пользовательской конфигурации таблиц.
+ */
 export declare const checkMissingColumns: (columns: UserTableConfigItem[], arrayToCheck: tablesEnumConfig[]) => tablesEnumConfig[];
 export declare const createCorrectColumnConfig: (columns: UserTableConfigItem[], arrayToCheck: tablesEnumConfig[]) => UserTableConfigItem[];

package/dist/utils/tables-config/methods.js

@@ -8,6 +8,10 @@ const generateDefaultConfigArray = (configArray) => configArray.map(currentConfi
     };
 });
 exports.generateDefaultConfigArray = generateDefaultConfigArray;
+/**
+ * Возвращает список колонок из `arrayToCheck`, которые отсутствуют в текущей конфигурации `columns`.
+ * Используется на фронтенде для определения недостающих колонок в пользовательской конфигурации таблиц.
+ */
 const checkMissingColumns = (columns, arrayToCheck) => {
     const columnsSet = new Set();
     columns.forEach(currentColumn => columnsSet.add(currentColumn.columnName));

package/dist/utils/workings.js

@@ -90,14 +90,6 @@ const sortProductionItems = (data) => {
     try {
         const sortedResults = (0, lodash_1.orderBy)(data.itemToSort, [
             item => ((0, exports.getValueByPath)(item, data.shipmentPath) ? 0 : 1),
-            item => {
-                const foundedShipment = (0, exports.getValueByPath)(item, data.shipmentPath);
-                if (!foundedShipment)
-                    return Infinity;
-                return foundedShipment.date_by_urgency
-                    ? new Date(foundedShipment.date_by_urgency).getTime()
-                    : Infinity;
-            },
             item => {
                 const foundedShipment = (0, exports.getValueByPath)(item, data.shipmentPath);
                 if (!foundedShipment)
@@ -121,7 +113,7 @@ const sortProductionItems = (data) => {
                 var _a, _b;
                 return ((_b = (_a = (0, exports.getValueByPath)(item, data.entityPath)) === null || _a === void 0 ? void 0 : _a.designation) === null || _b === void 0 ? void 0 : _b.toLocaleLowerCase()) || '';
             }
-        ], ['asc', 'asc', 'asc', 'asc', 'asc']);
+        ], ['asc', 'asc', 'asc', 'asc']);
         return sortedResults;
     }
     catch (error) {
@@ -138,13 +130,6 @@ exports.sortProductionItems = sortProductionItems;
 const sortShipments = (data) => {
     try {
         const sortedResults = (0, lodash_1.orderBy)(data.shipments, [
-            item => {
-                if (!item)
-                    return Infinity;
-                return item.date_by_urgency
-                    ? new Date(item.date_by_urgency).getTime()
-                    : Infinity;
-            },
             item => {
                 return item.date_shipments
                     ? new Date(item.date_shipments).getTime()

package/package.json

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