avvir 0.4.17 → 0.4.18

package/dist/avvir_api.node.js

@@ -1745,50 +1745,26 @@ var Config = {
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   "DateFormatter": () => (/* binding */ DateFormatter),
 /* harmony export */   "DateConverter": () => (/* binding */ DateConverter),
 /* harmony export */   "default": () => (__WEBPACK_DEFAULT_EXPORT__)
 /* harmony export */ });
 /* harmony import */ var moment__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2245);
 /* harmony import */ var moment__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(moment__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var _date_formatter__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(2228);
 
-var DateFormatter = /** @class */ (function () {
-    function DateFormatter(format) {
-        this.formatString = format;
-    }
-    DateFormatter.prototype.format = function (date) {
-        if (date) {
-            return moment__WEBPACK_IMPORTED_MODULE_0___default()(date).format(this.formatString);
-        }
-        else {
-            return "";
-        }
-    };
-    return DateFormatter;
-}());
 
 var DateConverter = /** @class */ (function () {
     function DateConverter() {
     }
-    DateConverter.getDateFormatter = function (format) {
-        return new DateFormatter(format);
+    DateConverter.getLocalizedDateFormatter = function () {
+        return new _date_formatter__WEBPACK_IMPORTED_MODULE_1__["default"]("l");
+    };
+    DateConverter.getDateFormatter = function (format, secondaryFormat) {
+        return new _date_formatter__WEBPACK_IMPORTED_MODULE_1__["default"](format, secondaryFormat);
     };
     DateConverter.dateToText = function (date, format) {
         if (date instanceof Date) {
-            if (format) {
-                return moment__WEBPACK_IMPORTED_MODULE_0___default()(date).format(format);
-            }
-            else {
-                return "last scanned: " + moment__WEBPACK_IMPORTED_MODULE_0___default()(date).format("MMM D, YYYY");
-            }
-        }
-        else if (moment__WEBPACK_IMPORTED_MODULE_0___default().isMoment(date)) {
-            if (format) {
-                return date.format(format);
-            }
-            else {
-                return "last scanned: " + date.format("MMM D, YYYY");
-            }
+            return moment__WEBPACK_IMPORTED_MODULE_0___default()(date).format(format);
         }
         else {
             return "";
@@ -1797,37 +1773,40 @@ var DateConverter = /** @class */ (function () {
     DateConverter.instantToDate = function (instant) {
         if (typeof instant === "number") {
             var epochMillis = instant * 1000;
-            return moment__WEBPACK_IMPORTED_MODULE_0___default()(epochMillis).toDate();
+            return new Date(epochMillis);
         }
         else {
             return null;
         }
     };
-    DateConverter.dateToISO = function (date) {
-        if (date == null) {
-            return "";
+    DateConverter.dateToInstant = function (date) {
+        if (date instanceof Date) {
+            return date.getTime() / 1000;
         }
-        else if (date instanceof Date || moment__WEBPACK_IMPORTED_MODULE_0___default().isMoment(date)) {
-            return date.toISOString();
+        else {
+            return null;
         }
-        return date + "";
     };
-    DateConverter.dateToInstant = function (date) {
+    DateConverter.localDateToMoment = function (localDate) {
+        if (this.isValidDateString(localDate)) {
+            return moment__WEBPACK_IMPORTED_MODULE_0___default()(localDate);
+        }
+        return null;
+    };
+    DateConverter.dateToLocalDate = function (date) {
         if (date instanceof Date) {
-            var epochMillis = moment__WEBPACK_IMPORTED_MODULE_0___default()(date).utc(false).toDate().valueOf();
-            return epochMillis / 1000;
+            return date.toISOString().substring(0, 10);
         }
-        else if (moment__WEBPACK_IMPORTED_MODULE_0___default().isMoment(date) && date.isValid()) {
-            var epochMillis = date.utc(false).toDate().valueOf();
-            return epochMillis / 1000;
+        else if (moment__WEBPACK_IMPORTED_MODULE_0___default().isMoment(date)) {
+            return moment__WEBPACK_IMPORTED_MODULE_0___default()(date).format("YYYY-MM-DD");
         }
         else {
             return null;
         }
     };
     DateConverter.millisecondsToDate = function (epochMillis) {
-        if (epochMillis || epochMillis === 0) {
-            return moment__WEBPACK_IMPORTED_MODULE_0___default()(epochMillis).toDate();
+        if (typeof epochMillis === "number") {
+            return new Date(epochMillis);
         }
         else {
             return null;
@@ -1836,20 +1815,134 @@ var DateConverter = /** @class */ (function () {
     DateConverter.isValidDate = function (value) {
         return (value instanceof Date && !isNaN(value.valueOf())) || value === null;
     };
+    DateConverter.isValidDateString = function (value) {
+        return (typeof value === "string")
+            && !!value.match(/^\d{4}-\d{2}-\d{2}$/);
+    };
     DateConverter.tsvStringToDate = function (dateString) {
-        if (dateString) {
+        if (typeof dateString === "string") {
             return moment__WEBPACK_IMPORTED_MODULE_0___default()(dateString, "MM/DD/YYYY").toDate();
         }
         else {
             return null;
         }
     };
+    /**
+     * truncate 2 dates to days and compare
+     * @param date1
+     * @param date2
+     * @returns true when date2 is on or after the day of date1;
+     * false if either date1 or date2 is null
+     */
+    DateConverter.isOnOrAfterDay = function (date1, date2) {
+        if (date1 == null || date2 == null) {
+            return false;
+        }
+        return this.dateToString(date1) <= this.dateToString(date2);
+    };
+    /**
+     * truncate 2 dates to days and compare
+     * @param date1
+     * @param date2
+     * @returns true when date2 is on the same day as date1
+     */
+    DateConverter.isOnDay = function (date1, date2) {
+        if (date1 == null || date2 == null) {
+            return false;
+        }
+        return this.dateToString(date1) === this.dateToString(date2);
+    };
+    DateConverter.dateToString = function (date) {
+        if (date instanceof Date) {
+            return this.pad(date.getUTCFullYear()) + "-" + this.pad(date.getUTCMonth() + 1) + "-" + this.pad(date.getUTCDate());
+        }
+        if (this.isValidDateString(date)) {
+            return date;
+        }
+        throw new TypeError("Expected date to be a Date or string");
+    };
+    DateConverter.dateToISO = function (date) {
+        if (date == null) {
+            return "";
+        }
+        else if (date instanceof Date || moment__WEBPACK_IMPORTED_MODULE_0___default().isMoment(date)) {
+            return date.toISOString();
+        }
+        return date + "";
+    };
+    DateConverter.pad = function (i) {
+        return i.toString().padStart(2, "0");
+    };
     return DateConverter;
 }());
 
 /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (DateConverter);
 
 
+/***/ }),
+
+/***/ 2228:
+/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   "DateFormatter": () => (/* binding */ DateFormatter),
+/* harmony export */   "default": () => (__WEBPACK_DEFAULT_EXPORT__)
+/* harmony export */ });
+/* harmony import */ var moment__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2245);
+/* harmony import */ var moment__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(moment__WEBPACK_IMPORTED_MODULE_0__);
+
+var DateFormatter = /** @class */ (function () {
+    function DateFormatter(format, secondaryFormat) {
+        this.formatString = format;
+        this.secondaryFormat = secondaryFormat;
+    }
+    /** Use formatLocal when displaying times relative to the user i.e. when
+     * somebody else replied to their comment, or when a file was uploaded. */
+    DateFormatter.prototype.formatLocal = function (date) {
+        if (date) {
+            return moment__WEBPACK_IMPORTED_MODULE_0___default()(date).format(this.formatString);
+        }
+        else {
+            return "";
+        }
+    };
+    /** Use formatUTC when all users should see the same information, regardless
+     * of their geographical location. i.e. dates pertaining to what happened on
+     * the job site */
+    DateFormatter.prototype.formatUTC = function (date) {
+        if (date) {
+            return moment__WEBPACK_IMPORTED_MODULE_0___default()(date).utc().format(this.formatString);
+        }
+        else {
+            return "";
+        }
+    };
+    DateFormatter.prototype.formatRangeLocal = function (startDate, endDate) {
+        var formatted = this.formatLocal(startDate);
+        if (endDate != null) {
+            formatted += " - ";
+            var endMoment = moment__WEBPACK_IMPORTED_MODULE_0___default()(endDate);
+            if (this.secondaryFormat
+                && moment__WEBPACK_IMPORTED_MODULE_0___default()(startDate).isSame(endMoment, "day")) {
+                formatted += endMoment.format(this.secondaryFormat);
+            }
+            else {
+                formatted += this.formatLocal(endDate);
+            }
+        }
+        return formatted;
+    };
+    DateFormatter.prototype.parseUTC = function (date) {
+        return moment__WEBPACK_IMPORTED_MODULE_0___default().utc(date, this.formatString).toDate();
+    };
+    return DateFormatter;
+}());
+
+/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (DateFormatter);
+
+
 /***/ }),
 
 /***/ 6781:
@@ -1859,17 +1952,19 @@ var DateConverter = /** @class */ (function () {
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "DateConverter": () => (/* reexport safe */ _date_converter__WEBPACK_IMPORTED_MODULE_0__.DateConverter),
-/* harmony export */   "DateFormatter": () => (/* reexport safe */ _date_converter__WEBPACK_IMPORTED_MODULE_0__.DateFormatter),
-/* harmony export */   "kebabCase": () => (/* reexport safe */ _kebab_case__WEBPACK_IMPORTED_MODULE_1__.kebabCase),
-/* harmony export */   "Matrix3Converter": () => (/* reexport safe */ _matrix_3_converter__WEBPACK_IMPORTED_MODULE_2__.Matrix3Converter),
-/* harmony export */   "Matrix4Converter": () => (/* reexport safe */ _matrix_4_converter__WEBPACK_IMPORTED_MODULE_3__.Matrix4Converter),
-/* harmony export */   "PurposeTypeConverter": () => (/* reexport safe */ _purpose_type_converter__WEBPACK_IMPORTED_MODULE_4__.PurposeTypeConverter)
+/* harmony export */   "DateFormatter": () => (/* reexport safe */ _date_formatter__WEBPACK_IMPORTED_MODULE_1__.DateFormatter),
+/* harmony export */   "kebabCase": () => (/* reexport safe */ _kebab_case__WEBPACK_IMPORTED_MODULE_2__.kebabCase),
+/* harmony export */   "Matrix3Converter": () => (/* reexport safe */ _matrix_3_converter__WEBPACK_IMPORTED_MODULE_3__.Matrix3Converter),
+/* harmony export */   "Matrix4Converter": () => (/* reexport safe */ _matrix_4_converter__WEBPACK_IMPORTED_MODULE_4__.Matrix4Converter),
+/* harmony export */   "PurposeTypeConverter": () => (/* reexport safe */ _purpose_type_converter__WEBPACK_IMPORTED_MODULE_5__.PurposeTypeConverter)
 /* harmony export */ });
 /* harmony import */ var _date_converter__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2024);
-/* harmony import */ var _kebab_case__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(5519);
-/* harmony import */ var _matrix_3_converter__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(28);
-/* harmony import */ var _matrix_4_converter__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(2908);
-/* harmony import */ var _purpose_type_converter__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(6154);
+/* harmony import */ var _date_formatter__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(2228);
+/* harmony import */ var _kebab_case__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(5519);
+/* harmony import */ var _matrix_3_converter__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(28);
+/* harmony import */ var _matrix_4_converter__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(2908);
+/* harmony import */ var _purpose_type_converter__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(6154);
+
 
 
 
@@ -2382,11 +2477,20 @@ function addInstantGetterAndSetterToApiModel(modelInstance, propertyName, initia
         },
         set: function (val) {
             if (typeof val === "string") {
-                dateVal = _converters_date_converter__WEBPACK_IMPORTED_MODULE_1__["default"].dateToInstant(moment__WEBPACK_IMPORTED_MODULE_0___default()(val, "MMM D, YYYY").utc(true));
+                var date = moment__WEBPACK_IMPORTED_MODULE_0___default()(val, "MMM D, YYYY").utc(true).toDate();
+                if (_converters_date_converter__WEBPACK_IMPORTED_MODULE_1__["default"].isValidDate(date)) {
+                    dateVal = _converters_date_converter__WEBPACK_IMPORTED_MODULE_1__["default"].dateToInstant(date);
+                }
+                else {
+                    dateVal = null;
+                }
             }
-            else if (val instanceof Date || moment__WEBPACK_IMPORTED_MODULE_0___default().isMoment(val)) {
+            else if (val instanceof Date) {
                 dateVal = _converters_date_converter__WEBPACK_IMPORTED_MODULE_1__["default"].dateToInstant(val);
             }
+            else if (moment__WEBPACK_IMPORTED_MODULE_0___default().isMoment(val)) {
+                dateVal = _converters_date_converter__WEBPACK_IMPORTED_MODULE_1__["default"].dateToInstant(val.toDate());
+            }
             else {
                 dateVal = val;
             }
@@ -6345,6 +6449,7 @@ var map = {
 	"./avvir_api.ts": 5489,
 	"./config.ts": 5508,
 	"./converters/date_converter.ts": 2024,
+	"./converters/date_formatter.ts": 2228,
 	"./converters/index.ts": 6781,
 	"./converters/kebab_case.ts": 5519,
 	"./converters/matrix_3_converter.ts": 28,

package/dist/esm/converters/date_converter.d.ts

@@ -1,18 +1,35 @@
 import { Moment } from "moment";
+import DateFormatter from "./date_formatter";
 import { DateLike } from "../models";
-export declare class DateFormatter {
-    constructor(format: string);
-    format(date?: Date): string;
-    private readonly formatString;
-}
 export declare class DateConverter {
-    static getDateFormatter(format: string): DateFormatter;
-    static dateToText(date: Date | Moment, format?: string): string;
+    static getLocalizedDateFormatter(): DateFormatter;
+    static getDateFormatter(format: string, secondaryFormat?: string): DateFormatter;
+    static dateToText(date: Date, format: string): string;
     static instantToDate(instant: number): Date | null;
-    static dateToISO(date: DateLike): string;
-    static dateToInstant(date: Date | Moment): number | null;
+    static dateToInstant(date: Date): number | null;
+    static localDateToMoment(localDate: string): Moment | null;
+    static dateToLocalDate(date: DateLike): string;
     static millisecondsToDate(epochMillis: number): Date | null;
     static isValidDate(value: any): boolean;
-    static tsvStringToDate(dateString: any): Date;
+    static isValidDateString(value: string): boolean;
+    static tsvStringToDate(dateString: string): Date;
+    /**
+     * truncate 2 dates to days and compare
+     * @param date1
+     * @param date2
+     * @returns true when date2 is on or after the day of date1;
+     * false if either date1 or date2 is null
+     */
+    static isOnOrAfterDay(date1: Date | string, date2: Date | string): boolean;
+    /**
+     * truncate 2 dates to days and compare
+     * @param date1
+     * @param date2
+     * @returns true when date2 is on the same day as date1
+     */
+    static isOnDay(date1: Date | string, date2: Date | string): boolean;
+    private static dateToString;
+    static dateToISO(date: DateLike): string;
+    private static pad;
 }
 export default DateConverter;

package/dist/esm/converters/date_converter.js

@@ -1,37 +1,15 @@
 import moment from "moment";
-export class DateFormatter {
-    constructor(format) {
-        this.formatString = format;
-    }
-    format(date) {
-        if (date) {
-            return moment(date).format(this.formatString);
-        }
-        else {
-            return "";
-        }
-    }
-}
+import DateFormatter from "./date_formatter";
 export class DateConverter {
-    static getDateFormatter(format) {
-        return new DateFormatter(format);
+    static getLocalizedDateFormatter() {
+        return new DateFormatter("l");
+    }
+    static getDateFormatter(format, secondaryFormat) {
+        return new DateFormatter(format, secondaryFormat);
     }
     static dateToText(date, format) {
         if (date instanceof Date) {
-            if (format) {
-                return moment(date).format(format);
-            }
-            else {
-                return `last scanned: ${moment(date).format("MMM D, YYYY")}`;
-            }
-        }
-        else if (moment.isMoment(date)) {
-            if (format) {
-                return date.format(format);
-            }
-            else {
-                return `last scanned: ${date.format("MMM D, YYYY")}`;
-            }
+            return moment(date).format(format);
         }
         else {
             return "";
@@ -40,37 +18,40 @@ export class DateConverter {
     static instantToDate(instant) {
         if (typeof instant === "number") {
             const epochMillis = instant * 1000;
-            return moment(epochMillis).toDate();
+            return new Date(epochMillis);
         }
         else {
             return null;
         }
     }
-    static dateToISO(date) {
-        if (date == null) {
-            return "";
+    static dateToInstant(date) {
+        if (date instanceof Date) {
+            return date.getTime() / 1000;
         }
-        else if (date instanceof Date || moment.isMoment(date)) {
-            return date.toISOString();
+        else {
+            return null;
         }
-        return date + "";
     }
-    static dateToInstant(date) {
+    static localDateToMoment(localDate) {
+        if (this.isValidDateString(localDate)) {
+            return moment(localDate);
+        }
+        return null;
+    }
+    static dateToLocalDate(date) {
         if (date instanceof Date) {
-            const epochMillis = moment(date).utc(false).toDate().valueOf();
-            return epochMillis / 1000;
+            return date.toISOString().substring(0, 10);
         }
-        else if (moment.isMoment(date) && date.isValid()) {
-            const epochMillis = date.utc(false).toDate().valueOf();
-            return epochMillis / 1000;
+        else if (moment.isMoment(date)) {
+            return moment(date).format("YYYY-MM-DD");
         }
         else {
             return null;
         }
     }
     static millisecondsToDate(epochMillis) {
-        if (epochMillis || epochMillis === 0) {
-            return moment(epochMillis).toDate();
+        if (typeof epochMillis === "number") {
+            return new Date(epochMillis);
         }
         else {
             return null;
@@ -79,14 +60,64 @@ export class DateConverter {
     static isValidDate(value) {
         return (value instanceof Date && !isNaN(value.valueOf())) || value === null;
     }
+    static isValidDateString(value) {
+        return (typeof value === "string")
+            && !!value.match(/^\d{4}-\d{2}-\d{2}$/);
+    }
     static tsvStringToDate(dateString) {
-        if (dateString) {
+        if (typeof dateString === "string") {
             return moment(dateString, "MM/DD/YYYY").toDate();
         }
         else {
             return null;
         }
     }
+    /**
+     * truncate 2 dates to days and compare
+     * @param date1
+     * @param date2
+     * @returns true when date2 is on or after the day of date1;
+     * false if either date1 or date2 is null
+     */
+    static isOnOrAfterDay(date1, date2) {
+        if (date1 == null || date2 == null) {
+            return false;
+        }
+        return this.dateToString(date1) <= this.dateToString(date2);
+    }
+    /**
+     * truncate 2 dates to days and compare
+     * @param date1
+     * @param date2
+     * @returns true when date2 is on the same day as date1
+     */
+    static isOnDay(date1, date2) {
+        if (date1 == null || date2 == null) {
+            return false;
+        }
+        return this.dateToString(date1) === this.dateToString(date2);
+    }
+    static dateToString(date) {
+        if (date instanceof Date) {
+            return `${this.pad(date.getUTCFullYear())}-${this.pad(date.getUTCMonth() + 1)}-${this.pad(date.getUTCDate())}`;
+        }
+        if (this.isValidDateString(date)) {
+            return date;
+        }
+        throw new TypeError("Expected date to be a Date or string");
+    }
+    static dateToISO(date) {
+        if (date == null) {
+            return "";
+        }
+        else if (date instanceof Date || moment.isMoment(date)) {
+            return date.toISOString();
+        }
+        return date + "";
+    }
+    static pad(i) {
+        return i.toString().padStart(2, "0");
+    }
 }
 export default DateConverter;
 //# sourceMappingURL=date_converter.js.map

package/dist/esm/converters/date_converter.js.map

@@ -1 +1 @@
-{"version":3,"file":"date_converter.js","sourceRoot":"","sources":["../../../source/converters/date_converter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"date_converter.js","sourceRoot":"","sources":["../../../source/converters/date_converter.ts"],"names":[],"mappings":"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"}

package/dist/esm/converters/date_formatter.d.ts

@@ -0,0 +1,16 @@
+import moment from "moment";
+export declare class DateFormatter {
+    constructor(format: string, secondaryFormat?: string);
+    /** Use formatLocal when displaying times relative to the user i.e. when
+     * somebody else replied to their comment, or when a file was uploaded. */
+    formatLocal(date: Date): string;
+    /** Use formatUTC when all users should see the same information, regardless
+     * of their geographical location. i.e. dates pertaining to what happened on
+     * the job site */
+    formatUTC(date: moment.MomentInput): string;
+    formatRangeLocal(startDate: Date, endDate?: Date): string;
+    parseUTC(date: string | null): Date;
+    private readonly formatString;
+    private readonly secondaryFormat?;
+}
+export default DateFormatter;

package/dist/esm/converters/date_formatter.js

@@ -0,0 +1,48 @@
+import moment from "moment";
+export class DateFormatter {
+    constructor(format, secondaryFormat) {
+        this.formatString = format;
+        this.secondaryFormat = secondaryFormat;
+    }
+    /** Use formatLocal when displaying times relative to the user i.e. when
+     * somebody else replied to their comment, or when a file was uploaded. */
+    formatLocal(date) {
+        if (date) {
+            return moment(date).format(this.formatString);
+        }
+        else {
+            return "";
+        }
+    }
+    /** Use formatUTC when all users should see the same information, regardless
+     * of their geographical location. i.e. dates pertaining to what happened on
+     * the job site */
+    formatUTC(date) {
+        if (date) {
+            return moment(date).utc().format(this.formatString);
+        }
+        else {
+            return "";
+        }
+    }
+    formatRangeLocal(startDate, endDate) {
+        let formatted = this.formatLocal(startDate);
+        if (endDate != null) {
+            formatted += " - ";
+            let endMoment = moment(endDate);
+            if (this.secondaryFormat
+                && moment(startDate).isSame(endMoment, "day")) {
+                formatted += endMoment.format(this.secondaryFormat);
+            }
+            else {
+                formatted += this.formatLocal(endDate);
+            }
+        }
+        return formatted;
+    }
+    parseUTC(date) {
+        return moment.utc(date, this.formatString).toDate();
+    }
+}
+export default DateFormatter;
+//# sourceMappingURL=date_formatter.js.map

package/dist/esm/converters/date_formatter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"date_formatter.js","sourceRoot":"","sources":["../../../source/converters/date_formatter.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAE5B,MAAM,OAAO,aAAa;IACxB,YAAY,MAAc,EAAE,eAAwB;QAClD,IAAI,CAAC,YAAY,GAAG,MAAM,CAAC;QAC3B,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;IACzC,CAAC;IAED;8EAC0E;IAC1E,WAAW,CAAC,IAAU;QACpB,IAAI,IAAI,EAAE;YACR,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;SAC/C;aAAM;YACL,OAAO,EAAE,CAAC;SACX;IACH,CAAC;IAED;;sBAEkB;IAClB,SAAS,CAAC,IAAwB;QAChC,IAAI,IAAI,EAAE;YACR,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;SACrD;aAAM;YACL,OAAO,EAAE,CAAC;SACX;IACH,CAAC;IAED,gBAAgB,CAAC,SAAe,EAAE,OAAc;QAC9C,IAAI,SAAS,GAAG,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;QAC5C,IAAI,OAAO,IAAI,IAAI,EAAE;YACnB,SAAS,IAAI,KAAK,CAAC;YACnB,IAAI,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;YAChC,IAAI,IAAI,CAAC,eAAe;mBACjB,MAAM,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,SAAS,EAAE,KAAK,CAAC,EACjD;gBACE,SAAS,IAAI,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;aACrD;iBAAM;gBACL,SAAS,IAAI,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;aACxC;SACF;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,QAAQ,CAAC,IAAmB;QAC1B,OAAO,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC,MAAM,EAAE,CAAC;IACtD,CAAC;CAIF;AAED,eAAe,aAAa,CAAC"}

package/dist/esm/converters/index.d.ts

@@ -1,4 +1,5 @@
-export { DateConverter, DateFormatter } from "./date_converter";
+export { DateConverter } from "./date_converter";
+export { DateFormatter } from "./date_formatter";
 export { kebabCase } from "./kebab_case";
 export { Matrix3Converter } from "./matrix_3_converter";
 export { Matrix4Converter } from "./matrix_4_converter";

package/dist/esm/converters/index.js

@@ -1,4 +1,5 @@
-export { DateConverter, DateFormatter } from "./date_converter";
+export { DateConverter } from "./date_converter";
+export { DateFormatter } from "./date_formatter";
 export { kebabCase } from "./kebab_case";
 export { Matrix3Converter } from "./matrix_3_converter";
 export { Matrix4Converter } from "./matrix_4_converter";

package/dist/esm/converters/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../source/converters/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,aAAa,EAAE,aAAa,EAAC,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAC,SAAS,EAAC,MAAM,cAAc,CAAC;AACvC,OAAO,EAAC,gBAAgB,EAAC,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAC,gBAAgB,EAAC,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAC,oBAAoB,EAAC,MAAM,0BAA0B,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../source/converters/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC"}

package/dist/esm/mixins/add_instant_getter_and_setter_to_api_model.js

@@ -8,11 +8,20 @@ export function addInstantGetterAndSetterToApiModel(modelInstance, propertyName,
         },
         set(val) {
             if (typeof val === "string") {
-                dateVal = DateConverter.dateToInstant(moment(val, "MMM D, YYYY").utc(true));
+                const date = moment(val, "MMM D, YYYY").utc(true).toDate();
+                if (DateConverter.isValidDate(date)) {
+                    dateVal = DateConverter.dateToInstant(date);
+                }
+                else {
+                    dateVal = null;
+                }
             }
-            else if (val instanceof Date || moment.isMoment(val)) {
+            else if (val instanceof Date) {
                 dateVal = DateConverter.dateToInstant(val);
             }
+            else if (moment.isMoment(val)) {
+                dateVal = DateConverter.dateToInstant(val.toDate());
+            }
             else {
                 dateVal = val;
             }

package/dist/esm/mixins/add_instant_getter_and_setter_to_api_model.js.map

@@ -1 +1 @@
-{"version":3,"file":"add_instant_getter_and_setter_to_api_model.js","sourceRoot":"","sources":["../../../source/mixins/add_instant_getter_and_setter_to_api_model.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,aAAa,MAAM,8BAA8B,CAAC;AAGzD,MAAM,UAAU,mCAAmC,CAAC,aAAqB,EAAE,YAAoB,EAAE,YAAuB;IACtH,IAAI,OAAO,CAAC;IACZ,MAAM,CAAC,cAAc,CAAC,aAAa,EAAE,YAAY,EAAE;QACjD,GAAG;YACD,OAAO,OAAO,CAAC;QACjB,CAAC;QACD,GAAG,CAAC,GAAG;YACL,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;gBAC3B,OAAO,GAAG,aAAa,CAAC,aAAa,CAAC,MAAM,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;aAC7E;iBAAM,IAAI,GAAG,YAAY,IAAI,IAAI,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBACtD,OAAO,GAAG,aAAa,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;aAC5C;iBAAM;gBACL,OAAO,GAAG,GAAG,CAAC;aACf;QACH,CAAC;QACD,UAAU,EAAE,IAAI;QAChB,YAAY,EAAE,IAAI;KACnB,CAAC,CAAC;IAEH,IAAI,YAAY,EAAE;QAChB,aAAa,CAAC,YAAY,CAAC,GAAG,YAAY,CAAC;KAC5C;AACH,CAAC;AAED,eAAe,mCAAmC,CAAC"}
+{"version":3,"file":"add_instant_getter_and_setter_to_api_model.js","sourceRoot":"","sources":["../../../source/mixins/add_instant_getter_and_setter_to_api_model.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAE5B,OAAO,aAAa,MAAM,8BAA8B,CAAC;AAGzD,MAAM,UAAU,mCAAmC,CAAC,aAAqB,EACrB,YAAoB,EACpB,YAAuB;IAEzE,IAAI,OAAO,CAAC;IACZ,MAAM,CAAC,cAAc,CAAC,aAAa,EAAE,YAAY,EAAE;QACjD,GAAG;YACD,OAAO,OAAO,CAAC;QACjB,CAAC;QACD,GAAG,CAAC,GAAG;YACL,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;gBAC3B,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC;gBAC3D,IAAI,aAAa,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE;oBACnC,OAAO,GAAG,aAAa,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;iBAC7C;qBAAM;oBACL,OAAO,GAAG,IAAI,CAAC;iBAChB;aACF;iBAAM,IAAI,GAAG,YAAY,IAAI,EAAE;gBAC9B,OAAO,GAAG,aAAa,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;aAC5C;iBAAM,IAAI,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBAC/B,OAAO,GAAG,aAAa,CAAC,aAAa,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC;aACrD;iBAAM;gBACL,OAAO,GAAG,GAAG,CAAC;aACf;QACH,CAAC;QACD,UAAU,EAAE,IAAI;QAChB,YAAY,EAAE,IAAI;KACnB,CAAC,CAAC;IAEH,IAAI,YAAY,EAAE;QAChB,aAAa,CAAC,YAAY,CAAC,GAAG,YAAY,CAAC;KAC5C;AACH,CAAC;AAED,eAAe,mCAAmC,CAAC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "avvir",
   "repository": "git@github.com:Avvir/avvir-javascript-client.git",
-  "version": "0.4.17",
+  "version": "0.4.18",
   "description": "Javascript client for Avvir APIs",
   "license": "Apache-2.0",
   "module": "dist/esm/index.js",

package/source/converters/date_converter.ts

@@ -1,40 +1,20 @@
 import moment, { Moment } from "moment";
-import {DateLike} from "../models";
 
-export class DateFormatter {
-  constructor(format: string) {
-    this.formatString = format;
-  }
+import DateFormatter from "./date_formatter";
+import { DateLike } from "../models";
 
-  format(date?: Date): string {
-    if (date) {
-      return moment(date).format(this.formatString);
-    } else {
-      return "";
-    }
+export class DateConverter {
+  static getLocalizedDateFormatter(): DateFormatter {
+    return new DateFormatter("l");
   }
 
-  private readonly formatString: string;
-}
-
-export class DateConverter {
-  static getDateFormatter(format: string): DateFormatter {
-    return new DateFormatter(format);
+  static getDateFormatter(format: string, secondaryFormat?: string): DateFormatter {
+    return new DateFormatter(format, secondaryFormat);
   }
 
-  static dateToText(date: Date | Moment, format?: string): string {
+  static dateToText(date: Date, format: string): string {
     if (date instanceof Date) {
-      if (format) {
-        return moment(date).format(format);
-      } else {
-        return `last scanned: ${moment(date).format("MMM D, YYYY")}`;
-      }
-    } else if (moment.isMoment(date)) {
-      if (format) {
-        return date.format(format);
-      } else {
-        return `last scanned: ${date.format("MMM D, YYYY")}`;
-      }
+      return moment(date).format(format);
     } else {
       return "";
     }
@@ -43,37 +23,40 @@ export class DateConverter {
   static instantToDate(instant: number): Date | null {
     if (typeof instant === "number") {
       const epochMillis = instant * 1000;
-      return moment(epochMillis).toDate();
+      return new Date(epochMillis);
     } else {
       return null;
     }
   }
 
-  static dateToISO(date: DateLike): string {
-    if (date == null) {
-      return ""
-    } else if (date instanceof Date || moment.isMoment(date)) {
-      return date.toISOString();
+  static dateToInstant(date: Date): number | null {
+    if (date instanceof Date) {
+      return date.getTime() / 1000;
+    } else {
+      return null;
     }
+  }
 
-    return date + "";
+  static localDateToMoment(localDate: string): Moment | null {
+    if (this.isValidDateString(localDate)) {
+      return moment(localDate);
+    }
+    return null;
   }
 
-  static dateToInstant(date: Date | Moment): number | null {
+  static dateToLocalDate(date: DateLike): string {
     if (date instanceof Date) {
-      const epochMillis = moment(date).utc(false).toDate().valueOf();
-      return epochMillis / 1000;
-    } else if (moment.isMoment(date) && date.isValid()) {
-      const epochMillis = date.utc(false).toDate().valueOf();
-      return epochMillis / 1000;
+      return date.toISOString().substring(0, 10);
+    } else if (moment.isMoment(date)) {
+      return moment(date).format("YYYY-MM-DD");
     } else {
       return null;
     }
   }
 
   static millisecondsToDate(epochMillis: number): Date | null {
-    if (epochMillis || epochMillis === 0) {
-      return moment(epochMillis).toDate();
+    if (typeof epochMillis === "number") {
+      return new Date(epochMillis);
     } else {
       return null;
     }
@@ -83,13 +66,71 @@ export class DateConverter {
     return (value instanceof Date && !isNaN(value.valueOf())) || value === null;
   }
 
-  static tsvStringToDate(dateString) {
-    if (dateString) {
+  static isValidDateString(value: string): boolean {
+    return (typeof value === "string")
+           && !!value.match(/^\d{4}-\d{2}-\d{2}$/);
+  }
+
+  static tsvStringToDate(dateString: string): Date {
+    if (typeof dateString === "string") {
       return moment(dateString, "MM/DD/YYYY").toDate();
     } else {
       return null;
     }
   }
+
+  /**
+   * truncate 2 dates to days and compare
+   * @param date1
+   * @param date2
+   * @returns true when date2 is on or after the day of date1;
+   * false if either date1 or date2 is null
+   */
+  static isOnOrAfterDay(date1: Date | string, date2: Date | string): boolean {
+    if (date1 == null || date2 == null) {
+      return false;
+    }
+
+    return this.dateToString(date1) <= this.dateToString(date2);
+  }
+
+  /**
+   * truncate 2 dates to days and compare
+   * @param date1
+   * @param date2
+   * @returns true when date2 is on the same day as date1
+   */
+  static isOnDay(date1: Date | string, date2: Date | string): boolean {
+    if (date1 == null || date2 == null) {
+      return false;
+    }
+
+    return this.dateToString(date1) === this.dateToString(date2);
+  }
+
+  private static dateToString(date: Date | string): string {
+    if (date instanceof Date) {
+      return `${this.pad(date.getUTCFullYear())}-${this.pad(date.getUTCMonth() + 1)}-${this.pad(date.getUTCDate())}`;
+    }
+    if (this.isValidDateString(date)) {
+      return date;
+    }
+    throw new TypeError("Expected date to be a Date or string");
+  }
+
+  static dateToISO(date: DateLike): string {
+    if (date == null) {
+      return "";
+    } else if (date instanceof Date || moment.isMoment(date)) {
+      return date.toISOString();
+    }
+
+    return date + "";
+  }
+
+  private static pad(i: number): string {
+    return i.toString().padStart(2, "0");
+  }
 }
 
 export default DateConverter;

package/source/converters/date_formatter.ts

@@ -0,0 +1,55 @@
+import moment from "moment";
+
+export class DateFormatter {
+  constructor(format: string, secondaryFormat?: string) {
+    this.formatString = format;
+    this.secondaryFormat = secondaryFormat;
+  }
+
+  /** Use formatLocal when displaying times relative to the user i.e. when
+   * somebody else replied to their comment, or when a file was uploaded. */
+  formatLocal(date: Date): string {
+    if (date) {
+      return moment(date).format(this.formatString);
+    } else {
+      return "";
+    }
+  }
+
+  /** Use formatUTC when all users should see the same information, regardless
+   * of their geographical location. i.e. dates pertaining to what happened on
+   * the job site */
+  formatUTC(date: moment.MomentInput): string {
+    if (date) {
+      return moment(date).utc().format(this.formatString);
+    } else {
+      return "";
+    }
+  }
+
+  formatRangeLocal(startDate: Date, endDate?: Date): string {
+    let formatted = this.formatLocal(startDate);
+    if (endDate != null) {
+      formatted += " - ";
+      let endMoment = moment(endDate);
+      if (this.secondaryFormat
+          && moment(startDate).isSame(endMoment, "day"))
+      {
+        formatted += endMoment.format(this.secondaryFormat);
+      } else {
+        formatted += this.formatLocal(endDate);
+      }
+    }
+
+    return formatted;
+  }
+
+  parseUTC(date: string | null): Date {
+    return moment.utc(date, this.formatString).toDate();
+  }
+
+  private readonly formatString: string;
+  private readonly secondaryFormat?: string;
+}
+
+export default DateFormatter;

package/source/converters/index.ts

@@ -1,5 +1,6 @@
-export {DateConverter, DateFormatter} from "./date_converter";
-export {kebabCase} from "./kebab_case";
-export {Matrix3Converter} from "./matrix_3_converter";
-export {Matrix4Converter} from "./matrix_4_converter";
-export {PurposeTypeConverter} from "./purpose_type_converter";
+export { DateConverter } from "./date_converter";
+export { DateFormatter } from "./date_formatter";
+export { kebabCase } from "./kebab_case";
+export { Matrix3Converter } from "./matrix_3_converter";
+export { Matrix4Converter } from "./matrix_4_converter";
+export { PurposeTypeConverter } from "./purpose_type_converter";

package/source/mixins/add_instant_getter_and_setter_to_api_model.ts

@@ -1,8 +1,12 @@
 import moment from "moment";
+
 import DateConverter from "../converters/date_converter";
-import {DateLike} from "../models";
+import { DateLike } from "../models";
 
-export function addInstantGetterAndSetterToApiModel(modelInstance: Object, propertyName: string, initialValue?: DateLike) {
+export function addInstantGetterAndSetterToApiModel(modelInstance: Object,
+                                                    propertyName: string,
+                                                    initialValue?: DateLike)
+{
   let dateVal;
   Object.defineProperty(modelInstance, propertyName, {
     get() {
@@ -10,9 +14,16 @@ export function addInstantGetterAndSetterToApiModel(modelInstance: Object, prope
     },
     set(val) {
       if (typeof val === "string") {
-        dateVal = DateConverter.dateToInstant(moment(val, "MMM D, YYYY").utc(true));
-      } else if (val instanceof Date || moment.isMoment(val)) {
+        const date = moment(val, "MMM D, YYYY").utc(true).toDate();
+        if (DateConverter.isValidDate(date)) {
+          dateVal = DateConverter.dateToInstant(date);
+        } else {
+          dateVal = null;
+        }
+      } else if (val instanceof Date) {
         dateVal = DateConverter.dateToInstant(val);
+      } else if (moment.isMoment(val)) {
+        dateVal = DateConverter.dateToInstant(val.toDate());
       } else {
         dateVal = val;
       }