@pksep/zod-shared 0.0.518 → 0.0.520

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/schemas/user.schema.d.ts

@@ -287,6 +287,7 @@ export declare const UserSchema: z.ZodObject<{
         role_id: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
         parent_action_idL: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
         production_task_id: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
+        createdAt: z.ZodOptional<z.ZodUnion<[z.ZodDate, z.ZodString]>>;
     }, "strip", z.ZodTypeAny, {
         ban: boolean;
         action: import("../..").IActionText[];
@@ -301,6 +302,7 @@ export declare const UserSchema: z.ZodObject<{
         inventary_id?: number | null | undefined;
         responsible_id?: number | null | undefined;
         tech_process_id?: number | null | undefined;
+        createdAt?: string | Date | undefined;
         equipment_id?: number | null | undefined;
         movement_object_id?: number | null | undefined;
         deliveries_id?: number | null | undefined;
@@ -335,6 +337,7 @@ export declare const UserSchema: z.ZodObject<{
         inventary_id?: number | null | undefined;
         responsible_id?: number | null | undefined;
         tech_process_id?: number | null | undefined;
+        createdAt?: string | Date | undefined;
         equipment_id?: number | null | undefined;
         movement_object_id?: number | null | undefined;
         deliveries_id?: number | null | undefined;
@@ -543,6 +546,7 @@ export declare const UserSchema: z.ZodObject<{
         inventary_id?: number | null | undefined;
         responsible_id?: number | null | undefined;
         tech_process_id?: number | null | undefined;
+        createdAt?: string | Date | undefined;
         equipment_id?: number | null | undefined;
         movement_object_id?: number | null | undefined;
         deliveries_id?: number | null | undefined;
@@ -732,6 +736,7 @@ export declare const UserSchema: z.ZodObject<{
         inventary_id?: number | null | undefined;
         responsible_id?: number | null | undefined;
         tech_process_id?: number | null | undefined;
+        createdAt?: string | Date | undefined;
         equipment_id?: number | null | undefined;
         movement_object_id?: number | null | undefined;
         deliveries_id?: number | null | undefined;

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

@@ -21,6 +21,14 @@ export declare class DateMethods {
      * @returns
      */
     comparison: (one_date?: string, two_date?: string, operation?: string) => boolean;
+    /**
+     * Выссчитываем дельту двух дат.
+     * Результат возвращается в минутах
+     * @param calculatedCreateTime
+     * @param planReadyTime
+     * @returns
+     */
+    calculateDeltaTime: (calculatedCreateTime: Date, planReadyTime: Date) => number;
     /**
      * Функция возвращает текущее время в UTC формате
      * @param config

package/dist/utils/date.methods.js

@@ -47,6 +47,53 @@ class DateMethods {
             }
             return result;
         };
+        /**
+         * Выссчитываем дельту двух дат.
+         * Результат возвращается в минутах
+         * @param calculatedCreateTime
+         * @param planReadyTime
+         * @returns
+         */
+        this.calculateDeltaTime = (calculatedCreateTime, planReadyTime) => {
+            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) => {
+                const dayOfWeek = date.getUTCDay();
+                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 формате
          * @param config

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/tables-config/tables-array.js

@@ -177,10 +177,10 @@ exports.productionTaskByEquipmentTableConfig = [
     enum_1.tablesEnumConfig.startTime,
     enum_1.tablesEnumConfig.calculatedCreateTime,
     enum_1.tablesEnumConfig.calculateNeedsTime,
-    enum_1.tablesEnumConfig.calculateAssembleTime,
     enum_1.tablesEnumConfig.deltaTime,
-    enum_1.tablesEnumConfig.orderedByProduction,
+    enum_1.tablesEnumConfig.calculateAssembleTime,
     enum_1.tablesEnumConfig.remainingByProductionTask,
+    enum_1.tablesEnumConfig.orderedByProduction,
     enum_1.tablesEnumConfig.timeToProduction,
     enum_1.tablesEnumConfig.operationsLength,
     enum_1.tablesEnumConfig.prevOperation,

package/dist/utils/types/types.d.ts

@@ -26,6 +26,8 @@ export type RelativesProductionTasksType = {
     dueData: Date;
     relativeName: string;
     relativeDesignation: string;
+    equipmentId: number | null;
+    userId: number | null;
     relativeAttention: boolean;
     relativeDiscontinued: boolean;
     relativeDescription: string;

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.518",
+  "version": "0.0.520",
   "description": "Zod package for erp project. Contains dto, interfaces, schems, types, enum",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",