shareneus 1.4.47 → 1.4.49

package/dist/tasks/tasks/task-reports-pdf.service.js

@@ -16,7 +16,7 @@ class Group {
     }
 }
 class TaskReportsPDfService {
-    static GetPdfForUnAssignedTasks(TaskData, IsLandScape, ReportType, Image) {
+    static GetPdfForUnAssignedTasks(TaskData, IsLandScape, ReportType, Image, EntityData) {
         let Images;
         shared_pdf_service_1.SharedPDFService.convertImgToBase64URL(Image, function (base64Img) {
             Images = base64Img.toString();
@@ -36,7 +36,7 @@ class TaskReportsPDfService {
                 content: [
                     this.GetHeader(Images, ReportType),
                     // { text: ReportType.toString(), alignment: 'center', margin: 10, fontSize: 14 },
-                    this.GetTableForApproval(TaskData, ReportType),
+                    this.GetTableForApproval(TaskData, ReportType, EntityData.User.TZ),
                 ],
                 styles: shared_pdf_service_1.SharedPDFService.GetStyles(),
             };
@@ -60,7 +60,7 @@ class TaskReportsPDfService {
             };
         }
     }
-    static GetTableForApproval(TaskData, ReportType) {
+    static GetTableForApproval(TaskData, ReportType, TZ) {
         return {
             style: 'tableExample',
             marginTop: 7,
@@ -69,12 +69,12 @@ class TaskReportsPDfService {
             table: {
                 // widths: [30, 50, 200, 60, 100, 60],
                 widths: [30, 50, '*', 200, 50, 50],
-                body: this.GetApprovalTableHeaderBody(TaskData, ReportType)
+                body: this.GetApprovalTableHeaderBody(TaskData, ReportType, TZ)
             },
             layout: shared_print_service_1.PrintSharedService.LayOutStyle()
         };
     }
-    static GetApprovalTableHeaderBody(TaskData, ReportType) {
+    static GetApprovalTableHeaderBody(TaskData, ReportType, TZ) {
         var body = [];
         let SNo = 1;
         let columns = this.GetTableHeadersForApproval();
@@ -88,7 +88,7 @@ class TaskReportsPDfService {
                     }
                     else {
                         if (!tr_utils_1.TrUtils.IsNull(task['EstEnDt']) && column.Field === 'EstEnDt') {
-                            dataRow.push({ text: this.GetDueDate(task), alignment: 'left', nowrap: true });
+                            dataRow.push({ text: this.GetDueDate(task, TZ), alignment: 'left', nowrap: true });
                         }
                         else {
                             dataRow.push({ text: task[column.Field].toString(), alignment: 'left', nowrap: true });
@@ -121,8 +121,8 @@ class TaskReportsPDfService {
         ];
         return headersNames;
     }
-    static GetOverDuePrint(TaskData, IsLandScape, ReportType, Image) {
-        TaskData = this.PrepareDataForTable(TaskData);
+    static GetOverDuePrint(TaskData, IsLandScape, ReportType, Image, EntityData) {
+        TaskData = this.PrepareDataForTable(TaskData, EntityData);
         let Images;
         shared_pdf_service_1.SharedPDFService.convertImgToBase64URL(Image, function (base64Img) {
             Images = base64Img.toString();
@@ -209,10 +209,10 @@ class TaskReportsPDfService {
         ];
         return headersNames;
     }
-    static GetDueDate(params) {
+    static GetDueDate(params, TZ) {
         if (!tr_utils_1.TrUtils.IsEmpty(params.EstEnDt)) {
             let DueDays;
-            let TodayDate = my_date_1.MyDate.GetDateTimeNowInUTC();
+            let TodayDate = my_date_1.MyDate.GetDateTimeNowInUTC(TZ);
             let Days = my_date_1.MyDate.GetDaysDiffBetween(TodayDate, params.EstEnDt);
             if (Days > 1) {
                 DueDays = 'Due in' + ' ' + Days + ' ' + 'days';
@@ -232,21 +232,21 @@ class TaskReportsPDfService {
                     DueDays = Math.abs(Days) + ' ' + 'days overdue';
                 }
             }
-            return my_date_1.MyDate.GetWeekAndDate(params.EstEnDt) + ' , ' + DueDays;
+            return my_date_1.MyDate.GetWeekAndDate(params.EstEnDt, TZ) + ' , ' + DueDays;
         }
         return '';
     }
-    static PrepareDataForTable(overdueEmpTasks) {
+    static PrepareDataForTable(overdueEmpTasks, EntityData) {
         this.overdueTasks = [];
         overdueEmpTasks.forEach((overdueEmpTask) => {
             overdueEmpTask.Tasks.forEach((Task) => {
                 let TaskInfo = {
                     UserId: overdueEmpTask._id,
                     TId: Task.Code,
-                    DueDt: this.GetDueDate(Task),
+                    DueDt: this.GetDueDate(Task, EntityData.User.TZ),
                     Name: Task.Name,
                     Assignee: Task.Assignee.Name,
-                    AssDate: (Task.Assignee.Ass === true || Task.Assignee.Ass === false) ? '' : my_date_1.MyDate.GetWeekAndDate(Task.Assignee.Ass)
+                    AssDate: (Task.Assignee.Ass === true || Task.Assignee.Ass === false) ? '' : my_date_1.MyDate.GetWeekAndDate(Task.Assignee.Ass, EntityData.User.TZ)
                 };
                 this.overdueTasks.push(TaskInfo);
             });

package/dist/utils/my-date.d.ts

@@ -1,13 +1,12 @@
 export declare class MyDate {
-    static UserTimeZone: any;
-    static GetDateTimeNowInUTC(): Date;
-    static GetCurrentYear(): number;
+    static GetDateTimeNowInUTC(UserTimeZone: any): Date;
+    static GetCurrentYear(UserTimeZone: any): number;
     static ConvertUTCDateToReadable(UTCDateTime: any): string | null;
     static ConvertUTCDateToReadableExDate(UTCDateTime: any): string | null;
     static ConvertUTCDateToReadableExDateTxt(UTCDateTime: any): string | null;
-    static ConvertUTCDateTimeToReadable(UTCDateTime: any): string | null;
-    static GetMonthName(MonthNumber: number): any;
+    static ConvertUTCDateTimeToReadable(UTCDateTime: any, UserTimeZone: any): string | null;
+    static GetMonthName(MonthNumber: number, UserTimeZone: any): any;
     static GetDaysDiffBetween(startutcdate: any, endutcdate: any): number;
-    static GetWeekDateAndTime(UTCDateTime: any): string | null;
-    static GetWeekAndDate(UTCDateTime: any): string | null;
+    static GetWeekDateAndTime(UTCDateTime: any, UserTimeZone: any): string | null;
+    static GetWeekAndDate(UTCDateTime: any, UserTimeZone: any): string | null;
 }

package/dist/utils/my-date.js

@@ -11,12 +11,12 @@ const getYear_1 = __importDefault(require("date-fns/getYear"));
 const differenceInDays_1 = __importDefault(require("date-fns/differenceInDays"));
 const date_fns_tz_1 = require("date-fns-tz");
 class MyDate {
-    static GetDateTimeNowInUTC() {
-        const utcDate = (0, date_fns_tz_1.utcToZonedTime)(new Date(), this.UserTimeZone);
-        return (0, date_fns_tz_1.zonedTimeToUtc)(utcDate, this.UserTimeZone);
+    static GetDateTimeNowInUTC(UserTimeZone) {
+        const utcDate = (0, date_fns_tz_1.utcToZonedTime)(new Date(), UserTimeZone);
+        return (0, date_fns_tz_1.zonedTimeToUtc)(utcDate, UserTimeZone);
     }
-    static GetCurrentYear() {
-        const utcDate = (0, date_fns_tz_1.zonedTimeToUtc)(new Date(), this.UserTimeZone);
+    static GetCurrentYear(UserTimeZone) {
+        const utcDate = (0, date_fns_tz_1.zonedTimeToUtc)(new Date(), UserTimeZone);
         return (0, getYear_1.default)(utcDate);
     }
     static ConvertUTCDateToReadable(UTCDateTime) {
@@ -44,11 +44,11 @@ class MyDate {
         let Year = (0, format_1.default)(new Date(UTCDateTime), 'yy');
         return Month + '/' + Year;
     }
-    static ConvertUTCDateTimeToReadable(UTCDateTime) {
+    static ConvertUTCDateTimeToReadable(UTCDateTime, UserTimeZone) {
         if (tr_utils_1.TrUtils.IsEmpty(UTCDateTime)) {
             return null;
         }
-        const utcDate = (0, date_fns_tz_1.utcToZonedTime)(new Date(UTCDateTime), this.UserTimeZone);
+        const utcDate = (0, date_fns_tz_1.utcToZonedTime)(new Date(UTCDateTime), UserTimeZone);
         let Month = (0, format_1.default)(new Date(utcDate), 'MMM');
         let Day = (0, format_1.default)(new Date(utcDate), 'dd');
         let Year = (0, format_1.default)(new Date(utcDate), 'yyyy');
@@ -58,8 +58,8 @@ class MyDate {
         let strTime = hours + ':' + minutes + ' ' + ampm;
         return Day + '-' + Month + '-' + Year + ',  ' + strTime;
     }
-    static GetMonthName(MonthNumber) {
-        let utcDate = this.GetDateTimeNowInUTC();
+    static GetMonthName(MonthNumber, UserTimeZone) {
+        let utcDate = this.GetDateTimeNowInUTC(UserTimeZone);
         utcDate = (0, setMonth_1.default)(utcDate, (MonthNumber - 1));
         let MonthName = (0, format_1.default)(new Date(utcDate), 'MMMM');
         return MonthName;
@@ -70,26 +70,26 @@ class MyDate {
         }
         return (0, differenceInDays_1.default)(new Date(endutcdate), new Date(startutcdate));
     }
-    static GetWeekDateAndTime(UTCDateTime) {
+    static GetWeekDateAndTime(UTCDateTime, UserTimeZone) {
         if (tr_utils_1.TrUtils.IsEmpty(UTCDateTime)) {
             return null;
         }
-        const utcDate = (0, date_fns_tz_1.utcToZonedTime)(new Date(UTCDateTime), this.UserTimeZone);
+        const utcDate = (0, date_fns_tz_1.utcToZonedTime)(new Date(UTCDateTime), UserTimeZone);
         var year = (0, getYear_1.default)(utcDate);
-        if (year === this.GetCurrentYear()) {
+        if (year === this.GetCurrentYear(UserTimeZone)) {
             return (0, format_1.default)(new Date(utcDate), 'E, MMM do, h:mm a');
         }
         else {
-            return this.ConvertUTCDateTimeToReadable(UTCDateTime);
+            return this.ConvertUTCDateTimeToReadable(UTCDateTime, UserTimeZone);
         }
     }
-    static GetWeekAndDate(UTCDateTime) {
+    static GetWeekAndDate(UTCDateTime, UserTimeZone) {
         if (tr_utils_1.TrUtils.IsEmpty(UTCDateTime)) {
             return null;
         }
-        const utcDate = (0, date_fns_tz_1.zonedTimeToUtc)((0, date_fns_tz_1.utcToZonedTime)(new Date(UTCDateTime), this.UserTimeZone), this.UserTimeZone);
+        const utcDate = (0, date_fns_tz_1.zonedTimeToUtc)((0, date_fns_tz_1.utcToZonedTime)(new Date(UTCDateTime), UserTimeZone), UserTimeZone);
         var year = (0, getYear_1.default)(utcDate);
-        if (year === this.GetCurrentYear()) {
+        if (year === this.GetCurrentYear(UserTimeZone)) {
             return (0, format_1.default)(new Date(utcDate), 'E, MMM do');
         }
         else {

package/dist/utils/tr-utils.d.ts

@@ -1,5 +1,4 @@
 export declare class TrUtils {
-    static DecimalsNumber: number;
     static IsNull(Value: any): boolean;
     static IsEmpty(Value: any): boolean;
     static IsZero(Value: any): boolean;
@@ -7,8 +6,8 @@ export declare class TrUtils {
     static Stringify(RecordData: any): any;
     static ConcatObjects(obj1: any, obj2: any): any;
     static ConvertPercToVal(Discount: any, Total: any): number | null;
-    static FixedTo(value: any): number;
-    static FixPriceValue(Value: any): string;
+    static FixedTo(value: any, DecimalsNumber?: number): number;
+    static FixPriceValue(Value: any, DecimalsNumber?: number): string;
     static SetValueToZeroIfNull(Value: any): any;
     static SetPercToStringIfNull(Value: any): any;
     static SetPercToTrueIfNull(Value: any): any;

package/dist/utils/tr-utils.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TrUtils = void 0;
 class TrUtils {
+    // static DecimalsNumber:number=2;
     static IsNull(Value) {
         return Value === null || typeof Value === 'undefined';
     }
@@ -46,22 +47,22 @@ class TrUtils {
             return value;
         }
     }
-    static FixedTo(value) {
+    static FixedTo(value, DecimalsNumber = 2) {
         if (this.IsNull(value)) {
             value = 0;
         }
         value = Number(value);
-        let Result = value.toFixed(this.DecimalsNumber);
+        let Result = value.toFixed(DecimalsNumber);
         return Number(Result);
     }
-    static FixPriceValue(Value) {
+    static FixPriceValue(Value, DecimalsNumber = 2) {
         if (this.IsNull(Value)) {
             Value = 0;
         }
         if (typeof Value === 'string') {
             Value = Number(Value);
         }
-        let Result = Value.toFixed(this.DecimalsNumber);
+        let Result = Value.toFixed(DecimalsNumber);
         return Result;
     }
     static SetValueToZeroIfNull(Value) {
@@ -90,4 +91,3 @@ class TrUtils {
     }
 }
 exports.TrUtils = TrUtils;
-TrUtils.DecimalsNumber = 2;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shareneus",
-  "version": "1.4.47",
+  "version": "1.4.49",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",