@my-devkit/core 1.0.91 → 1.0.93

package/dist/date-helper.d.ts

@@ -1,5 +1,6 @@
 export declare class DateHelper {
     static getUTCTimestamp(): number;
-    static getElapsedTime(startDate: Date): number;
-    static getReadableElapsedTime(startDate: Date): string;
+    static getElapsedTime(startDate: Date, endDate?: Date): number;
+    static getReadableElapsedTime(startDate: Date, endDate?: Date, short?: boolean): string;
+    static addDays(startDate: Date, numberOfDays: number): Date;
 }

package/dist/date-helper.js

@@ -8,22 +8,34 @@ var DateHelper = /** @class */ (function () {
         var now = new Date;
         return Date.UTC(now.getUTCFullYear(), now.getUTCMonth(), now.getUTCDate(), now.getUTCHours(), now.getUTCMinutes(), now.getUTCSeconds(), now.getUTCMilliseconds());
     };
-    DateHelper.getElapsedTime = function (startDate) {
-        return (new Date()).getTime() - startDate.getTime();
+    DateHelper.getElapsedTime = function (startDate, endDate) {
+        if (endDate === void 0) { endDate = new Date(); }
+        return Math.abs(endDate.getTime() - startDate.getTime());
     };
-    DateHelper.getReadableElapsedTime = function (startDate) {
-        var elapsedTime = this.getElapsedTime(startDate);
-        var minutes = Math.floor(elapsedTime / 60000);
-        var seconds = Math.floor(elapsedTime / 1000) - 60000 * minutes;
-        var miliseconds = elapsedTime - 60000 * minutes - 1000 * seconds;
+    DateHelper.getReadableElapsedTime = function (startDate, endDate, short) {
+        if (endDate === void 0) { endDate = new Date(); }
+        if (short === void 0) { short = false; }
+        var elapsedTime = this.getElapsedTime(startDate, endDate);
+        var hours = Math.floor(elapsedTime / (60 * 60 * 1000));
+        elapsedTime = elapsedTime - (60 * 60 * 1000) * hours;
+        var minutes = Math.floor(elapsedTime / (60 * 1000));
+        elapsedTime = elapsedTime - (60 * 1000) * minutes;
+        var seconds = Math.floor(elapsedTime / 1000);
+        var miliseconds = elapsedTime - 1000 * seconds;
+        if (hours) {
+            return short ? "".concat(hours, " h") : "".concat(hours, " h ").concat(minutes, " min  ").concat(seconds, " sec ").concat(miliseconds, " ms");
+        }
         if (minutes) {
-            return "".concat(minutes, " min  ").concat(seconds, " sec ").concat(miliseconds, " ms");
+            return short ? "".concat(minutes, " min") : "".concat(minutes, " min  ").concat(seconds, " sec ").concat(miliseconds, " ms");
         }
-        else if (seconds) {
-            return "".concat(seconds, " sec ").concat(miliseconds, " ms");
+        if (seconds) {
+            return short ? "".concat(seconds, " sec") : "".concat(seconds, " sec ").concat(miliseconds, " ms");
         }
         return "".concat(miliseconds, " ms");
     };
+    DateHelper.addDays = function (startDate, numberOfDays) {
+        return new Date(Date.UTC(startDate.getUTCFullYear(), startDate.getUTCMonth(), startDate.getUTCDate() + numberOfDays, startDate.getUTCHours(), startDate.getUTCMinutes(), startDate.getUTCSeconds()));
+    };
     return DateHelper;
 }());
 exports.DateHelper = DateHelper;

package/dist/date-helper.js.map

@@ -1 +1 @@
-{"version":3,"file":"date-helper.js","sourceRoot":"","sources":["../src/date-helper.ts"],"names":[],"mappings":";;;AAAA;IAAA;IAyBA,CAAC;IAxBiB,0BAAe,GAA7B;QACI,IAAM,GAAG,GAAG,IAAI,IAAI,CAAC;QACrB,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,EAAE,EAAE,GAAG,CAAC,WAAW,EAAE,EAAE,GAAG,CAAC,UAAU,EAAE,EACrE,GAAG,CAAC,WAAW,EAAE,EAAE,GAAG,CAAC,aAAa,EAAE,EAAE,GAAG,CAAC,aAAa,EAAE,EAAE,GAAG,CAAC,kBAAkB,EAAE,CAAC,CAAC;IAC/F,CAAC;IAEa,yBAAc,GAA5B,UAA6B,SAAe;QACxC,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,OAAO,EAAE,GAAG,SAAS,CAAC,OAAO,EAAE,CAAC;IACxD,CAAC;IAEa,iCAAsB,GAApC,UAAqC,SAAe;QAChD,IAAM,WAAW,GAAG,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;QAEnD,IAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,GAAG,KAAK,CAAC,CAAC;QAChD,IAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,GAAG,IAAI,CAAC,GAAG,KAAK,GAAG,OAAO,CAAC;QACjE,IAAM,WAAW,GAAG,WAAW,GAAG,KAAK,GAAG,OAAO,GAAG,IAAI,GAAG,OAAO,CAAC;QAEnE,IAAI,OAAO,EAAE;YACT,OAAO,UAAG,OAAO,mBAAS,OAAO,kBAAQ,WAAW,QAAK,CAAC;SAC7D;aAAM,IAAI,OAAO,EAAE;YAChB,OAAO,UAAG,OAAO,kBAAQ,WAAW,QAAK,CAAC;SAC7C;QACD,OAAO,UAAG,WAAW,QAAK,CAAC;IAC/B,CAAC;IACL,iBAAC;AAAD,CAAC,AAzBD,IAyBC;AAzBY,gCAAU"}
+{"version":3,"file":"date-helper.js","sourceRoot":"","sources":["../src/date-helper.ts"],"names":[],"mappings":";;;AAAA;IAAA;IA6CA,CAAC;IA5CiB,0BAAe,GAA7B;QACI,IAAM,GAAG,GAAG,IAAI,IAAI,CAAC;QACrB,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,EAAE,EAAE,GAAG,CAAC,WAAW,EAAE,EAAE,GAAG,CAAC,UAAU,EAAE,EACrE,GAAG,CAAC,WAAW,EAAE,EAAE,GAAG,CAAC,aAAa,EAAE,EAAE,GAAG,CAAC,aAAa,EAAE,EAAE,GAAG,CAAC,kBAAkB,EAAE,CAAC,CAAC;IAC/F,CAAC;IAEa,yBAAc,GAA5B,UAA6B,SAAe,EAAE,OAAoB;QAApB,wBAAA,EAAA,cAAc,IAAI,EAAE;QAC9D,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC;IAC7D,CAAC;IAEa,iCAAsB,GAApC,UAAqC,SAAe,EAAE,OAAoB,EAAE,KAAa;QAAnC,wBAAA,EAAA,cAAc,IAAI,EAAE;QAAE,sBAAA,EAAA,aAAa;QACrF,IAAI,WAAW,GAAG,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAE1D,IAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,GAAG,CAAC,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC;QACzD,WAAW,GAAG,WAAW,GAAG,CAAC,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,GAAG,KAAK,CAAC;QACrD,IAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,GAAG,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC;QACtD,WAAW,GAAG,WAAW,GAAG,CAAC,EAAE,GAAG,IAAI,CAAC,GAAG,OAAO,CAAC;QAClD,IAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,GAAG,IAAI,CAAC,CAAC;QAC/C,IAAM,WAAW,GAAG,WAAW,GAAG,IAAI,GAAG,OAAO,CAAC;QAEjD,IAAI,KAAK,EAAE;YACP,OAAO,KAAK,CAAC,CAAC,CAAC,UAAG,KAAK,OAAI,CAAC,CAAC,CAAC,UAAG,KAAK,gBAAM,OAAO,mBAAS,OAAO,kBAAQ,WAAW,QAAK,CAAC;SAC/F;QAED,IAAI,OAAO,EAAE;YACT,OAAO,KAAK,CAAC,CAAC,CAAC,UAAG,OAAO,SAAM,CAAC,CAAC,CAAC,UAAG,OAAO,mBAAS,OAAO,kBAAQ,WAAW,QAAK,CAAC;SACxF;QAED,IAAI,OAAO,EAAE;YACT,OAAO,KAAK,CAAC,CAAC,CAAC,UAAG,OAAO,SAAM,CAAC,CAAC,CAAC,UAAG,OAAO,kBAAQ,WAAW,QAAK,CAAC;SACxE;QACD,OAAO,UAAG,WAAW,QAAK,CAAC;IAC/B,CAAC;IAEa,kBAAO,GAArB,UAAsB,SAAe,EAAE,YAAoB;QACvD,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CACpB,SAAS,CAAC,cAAc,EAAE,EAC1B,SAAS,CAAC,WAAW,EAAE,EACvB,SAAS,CAAC,UAAU,EAAE,GAAG,YAAY,EACrC,SAAS,CAAC,WAAW,EAAE,EACvB,SAAS,CAAC,aAAa,EAAE,EACzB,SAAS,CAAC,aAAa,EAAE,CAC5B,CAAC,CAAC;IACP,CAAC;IACL,iBAAC;AAAD,CAAC,AA7CD,IA6CC;AA7CY,gCAAU"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@my-devkit/core",
-    "version": "1.0.91",
+    "version": "1.0.93",
     "description": "My Devkit: common tools",
     "main": "dist/index.js",
     "typings": "dist/index.d.ts",

package/src/date-helper.ts

@@ -5,22 +5,42 @@ export class DateHelper {
             now.getUTCHours(), now.getUTCMinutes(), now.getUTCSeconds(), now.getUTCMilliseconds());
     }
 
-    public static getElapsedTime(startDate: Date): number {
-        return (new Date()).getTime() - startDate.getTime();
+    public static getElapsedTime(startDate: Date, endDate = new Date()): number {
+        return Math.abs(endDate.getTime() - startDate.getTime());
     }
 
-    public static getReadableElapsedTime(startDate: Date): string {
-        const elapsedTime = this.getElapsedTime(startDate);
+    public static getReadableElapsedTime(startDate: Date, endDate = new Date(), short = false): string {
+        let elapsedTime = this.getElapsedTime(startDate, endDate);
 
-        const minutes = Math.floor(elapsedTime / 60000);
-        const seconds = Math.floor(elapsedTime / 1000) - 60000 * minutes;
-        const miliseconds = elapsedTime - 60000 * minutes - 1000 * seconds;
+        const hours = Math.floor(elapsedTime / (60 * 60 * 1000));
+        elapsedTime = elapsedTime - (60 * 60 * 1000) * hours;
+        const minutes = Math.floor(elapsedTime / (60 * 1000));
+        elapsedTime = elapsedTime - (60 * 1000) * minutes;
+        const seconds = Math.floor(elapsedTime / 1000);
+        const miliseconds = elapsedTime - 1000 * seconds;
+
+        if (hours) {
+            return short ? `${hours} h` : `${hours} h ${minutes} min  ${seconds} sec ${miliseconds} ms`;
+        }
 
         if (minutes) {
-            return `${minutes} min  ${seconds} sec ${miliseconds} ms`;
-        } else if (seconds) {
-            return `${seconds} sec ${miliseconds} ms`;
+            return short ? `${minutes} min` : `${minutes} min  ${seconds} sec ${miliseconds} ms`;
+        }
+
+        if (seconds) {
+            return short ? `${seconds} sec` : `${seconds} sec ${miliseconds} ms`;
         }
         return `${miliseconds} ms`;
     }
+
+    public static addDays(startDate: Date, numberOfDays: number): Date {
+        return new Date(Date.UTC(
+            startDate.getUTCFullYear(),
+            startDate.getUTCMonth(),
+            startDate.getUTCDate() + numberOfDays,
+            startDate.getUTCHours(),
+            startDate.getUTCMinutes(),
+            startDate.getUTCSeconds()
+        ));
+    }
 }