@sumaris-net/ngx-components 1.18.4 → 1.18.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bundles/sumaris-net.ngx-components.umd.js +7 -4
- package/bundles/sumaris-net.ngx-components.umd.js.map +1 -1
- package/bundles/sumaris-net.ngx-components.umd.min.js +2 -2
- package/bundles/sumaris-net.ngx-components.umd.min.js.map +1 -1
- package/doc/changelog.md +6 -0
- package/esm2015/src/app/shared/dates.js +3 -3
- package/esm2015/src/app/shared/pipes/date-format.pipe.js +6 -3
- package/fesm2015/sumaris-net.ngx-components.js +7 -4
- package/fesm2015/sumaris-net.ngx-components.js.map +1 -1
- package/package.json +1 -1
- package/src/app/shared/pipes/date-format.pipe.d.ts +3 -2
- package/src/theme/_ngx-components.scss +5 -5
- package/sumaris-net.ngx-components.metadata.json +1 -1
package/doc/changelog.md
CHANGED
|
@@ -282,3 +282,9 @@
|
|
|
282
282
|
# 1.18.4
|
|
283
283
|
[fix] Autocomplete: fix search in mobile searchbar
|
|
284
284
|
[enh] Material field components: allow to set 'required' as empty tag, and not only '[required]=true'
|
|
285
|
+
|
|
286
|
+
# 1.18.4
|
|
287
|
+
[fix] Autocomplete: fix panel width, on small screens
|
|
288
|
+
|
|
289
|
+
# 1.18.7
|
|
290
|
+
[fix] fix DateUtils.min() and DateUtils.max()
|
|
@@ -13,10 +13,10 @@ export class DateUtils {
|
|
|
13
13
|
this.toDuration = toDuration;
|
|
14
14
|
}
|
|
15
15
|
static min(date1, date2) {
|
|
16
|
-
return date1 && date2
|
|
16
|
+
return date1 && (!date2 || date1.isSameOrBefore(date2)) ? date1 : date2;
|
|
17
17
|
}
|
|
18
18
|
static max(date1, date2) {
|
|
19
|
-
return
|
|
19
|
+
return date1 && (!date2 || date1.isSameOrAfter(date2)) ? date1 : date2;
|
|
20
20
|
}
|
|
21
21
|
static equals(date1, date2) {
|
|
22
22
|
return DateUtils.isSame(date1, date2);
|
|
@@ -115,4 +115,4 @@ export function toDuration(value, unit) {
|
|
|
115
115
|
}
|
|
116
116
|
return duration;
|
|
117
117
|
}
|
|
118
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"dates.js","sourceRoot":"","sources":["../../../../../src/app/shared/dates.ts"],"names":[],"mappings":"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","sourcesContent":["import {Duration, isMoment, Moment, unitOfTime} from 'moment';\nimport * as momentImported from 'moment';\nimport {DATE_ISO_PATTERN} from './constants';\nimport * as momentTZImported from 'moment-timezone';\n\nconst moment = momentImported;\nconst tz = momentTZImported;\n\nexport const DATE_UNIX_TIMESTAMP = 'X';\nexport const DATE_UNIX_MS_TIMESTAMP = 'x';\n\nexport class DateUtils {\n  toDateISOString = toDateISOString;\n  fromDateISOString = fromDateISOString;\n  toDuration = toDuration;\n\n  static min(date1: Moment, date2: Moment): Moment {\n    return date1 && date2 && date1.isSameOrBefore(date2) ? date1 : date2;\n  }\n  static max(date1: Moment, date2: Moment): Moment {\n    return !date1 ? date2 : (!date2 || date1.isSameOrAfter(date2) ? date1 : date2);\n  }\n\n  static equals(date1: Moment | string, date2: Moment | string): boolean {\n    return DateUtils.isSame(date1, date2);\n  }\n\n  static isSame(date1: Moment | string, date2: Moment | string, granularity?: unitOfTime.StartOf): boolean {\n    const d1 = fromDateISOString(date1);\n    const d2 = fromDateISOString(date2);\n    return (!d1 && !d2) || d1.isSame(d2, granularity);\n  }\n\n  /**\n   * Create a copy of a date, without time fields (always return a new Moment object, or undefined).\n   * Same implementation as the Java class Dates.resetTime() (see any SUMARiS like Pod)\n   * @param value\n   * @param timezone a timezone (see https://momentjs.com/timezone/)\n   * @param keepLocalTime if true, only the timezone (and offset) is updated, keeping the local time same. Consequently, it will now point to a different point in time if the offset has changed.\n   */\n  static resetTime(value: Moment|string, timezone?: string, keepLocalTime?: boolean): Moment | undefined {\n    if (!value) return undefined;\n    const date = fromDateISOString(value);\n    // No timezone\n    if (!timezone) {\n      return date.clone().startOf('day');\n    }\n    // Use timezone\n    return date.clone() // clone the original date\n      .tz(timezone, keepLocalTime)\n      .startOf('day');\n  }\n\n  /**\n   * Test if a date is on the given day of week\n   * @param date\n   * @param weekday\n   * @param timezone\n   */\n  static isAtDay(date: string|Moment, weekday: number, timezone?: string): boolean {\n    date = date && fromDateISOString(date);\n    if (!date) return null;\n    if (timezone) date = date.clone().tz(timezone).startOf('day');\n    return date.day() === weekday;\n  }\n}\n\nexport function toDateISOString(value: any): string | undefined {\n  if (!value) return undefined;\n\n  // Already a valid ISO date time string (without timezone): use it\n  if (typeof value === 'string'\n    && value.indexOf('+') === -1\n    && value.lastIndexOf('Z') === value.length - 1) {\n\n    return value;\n  }\n  // Make sure to have a Moment object\n  value = fromDateISOString(value);\n  return value && value.toISOString() || undefined;\n}\n\nexport function fromDateISOString(value: any): Moment | undefined {\n  // Already a moment object: use it\n  if (!value || isMoment(value)) return value;\n\n  // Parse the input value, as a ISO date time\n  const date: Moment = moment(value, DATE_ISO_PATTERN);\n  if (date.isValid()) return date;\n\n  // Not valid: trying to convert from unix timestamp\n  if (typeof value === 'string') {\n    console.warn('Wrong date format - Trying to convert from local time: ' + value);\n    if (value.length === 10) {\n      return moment(value, DATE_UNIX_TIMESTAMP);\n    }\n    else if (value.length === 13) {\n      return moment(value, DATE_UNIX_MS_TIMESTAMP);\n    }\n  }\n\n  console.warn('Unable to parse date: ' + value);\n  return undefined;\n}\n\nexport function fromUnixTimestamp(timeInSec: number) {\n  return moment(timeInSec, DATE_UNIX_TIMESTAMP);\n}\nexport function fromUnixMsTimestamp(timeInMs: number) {\n  return moment(timeInMs, DATE_UNIX_MS_TIMESTAMP);\n}\n\nexport function toDuration(value: number, unit?: moment.unitOfTime.DurationConstructor): Duration {\n  if (!value) return undefined;\n\n  const duration = moment.duration(value, unit);\n\n  // fix 990+ ms\n  if (duration.milliseconds() >= 990) {\n    duration.add(1000 - duration.milliseconds(), 'ms');\n  }\n  // fix 59 s\n  if (duration.seconds() >= 59) {\n    duration.add(60 - duration.seconds(), 's');\n  }\n\n  return duration;\n}\n\n\n"]}
|
|
118
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"dates.js","sourceRoot":"","sources":["../../../../../src/app/shared/dates.ts"],"names":[],"mappings":"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","sourcesContent":["import {Duration, isMoment, Moment, unitOfTime} from 'moment';\nimport * as momentImported from 'moment';\nimport {DATE_ISO_PATTERN} from './constants';\nimport * as momentTZImported from 'moment-timezone';\n\nconst moment = momentImported;\nconst tz = momentTZImported;\n\nexport const DATE_UNIX_TIMESTAMP = 'X';\nexport const DATE_UNIX_MS_TIMESTAMP = 'x';\n\nexport class DateUtils {\n  toDateISOString = toDateISOString;\n  fromDateISOString = fromDateISOString;\n  toDuration = toDuration;\n\n  static min(date1: Moment, date2: Moment): Moment {\n    return date1 && (!date2 || date1.isSameOrBefore(date2)) ? date1 : date2;\n  }\n  static max(date1: Moment, date2: Moment): Moment {\n    return date1 && (!date2 || date1.isSameOrAfter(date2)) ? date1 : date2;\n  }\n\n  static equals(date1: Moment | string, date2: Moment | string): boolean {\n    return DateUtils.isSame(date1, date2);\n  }\n\n  static isSame(date1: Moment | string, date2: Moment | string, granularity?: unitOfTime.StartOf): boolean {\n    const d1 = fromDateISOString(date1);\n    const d2 = fromDateISOString(date2);\n    return (!d1 && !d2) || d1.isSame(d2, granularity);\n  }\n\n  /**\n   * Create a copy of a date, without time fields (always return a new Moment object, or undefined).\n   * Same implementation as the Java class Dates.resetTime() (see any SUMARiS like Pod)\n   * @param value\n   * @param timezone a timezone (see https://momentjs.com/timezone/)\n   * @param keepLocalTime if true, only the timezone (and offset) is updated, keeping the local time same. Consequently, it will now point to a different point in time if the offset has changed.\n   */\n  static resetTime(value: Moment|string, timezone?: string, keepLocalTime?: boolean): Moment | undefined {\n    if (!value) return undefined;\n    const date = fromDateISOString(value);\n    // No timezone\n    if (!timezone) {\n      return date.clone().startOf('day');\n    }\n    // Use timezone\n    return date.clone() // clone the original date\n      .tz(timezone, keepLocalTime)\n      .startOf('day');\n  }\n\n  /**\n   * Test if a date is on the given day of week\n   * @param date\n   * @param weekday\n   * @param timezone\n   */\n  static isAtDay(date: string|Moment, weekday: number, timezone?: string): boolean {\n    date = date && fromDateISOString(date);\n    if (!date) return null;\n    if (timezone) date = date.clone().tz(timezone).startOf('day');\n    return date.day() === weekday;\n  }\n}\n\nexport function toDateISOString(value: any): string | undefined {\n  if (!value) return undefined;\n\n  // Already a valid ISO date time string (without timezone): use it\n  if (typeof value === 'string'\n    && value.indexOf('+') === -1\n    && value.lastIndexOf('Z') === value.length - 1) {\n\n    return value;\n  }\n  // Make sure to have a Moment object\n  value = fromDateISOString(value);\n  return value && value.toISOString() || undefined;\n}\n\nexport function fromDateISOString(value: any): Moment | undefined {\n  // Already a moment object: use it\n  if (!value || isMoment(value)) return value;\n\n  // Parse the input value, as a ISO date time\n  const date: Moment = moment(value, DATE_ISO_PATTERN);\n  if (date.isValid()) return date;\n\n  // Not valid: trying to convert from unix timestamp\n  if (typeof value === 'string') {\n    console.warn('Wrong date format - Trying to convert from local time: ' + value);\n    if (value.length === 10) {\n      return moment(value, DATE_UNIX_TIMESTAMP);\n    }\n    else if (value.length === 13) {\n      return moment(value, DATE_UNIX_MS_TIMESTAMP);\n    }\n  }\n\n  console.warn('Unable to parse date: ' + value);\n  return undefined;\n}\n\nexport function fromUnixTimestamp(timeInSec: number) {\n  return moment(timeInSec, DATE_UNIX_TIMESTAMP);\n}\nexport function fromUnixMsTimestamp(timeInMs: number) {\n  return moment(timeInMs, DATE_UNIX_MS_TIMESTAMP);\n}\n\nexport function toDuration(value: number, unit?: moment.unitOfTime.DurationConstructor): Duration {\n  if (!value) return undefined;\n\n  const duration = moment.duration(value, unit);\n\n  // fix 990+ ms\n  if (duration.milliseconds() >= 990) {\n    duration.add(1000 - duration.milliseconds(), 'ms');\n  }\n  // fix 59 s\n  if (duration.seconds() >= 59) {\n    duration.add(60 - duration.seconds(), 's');\n  }\n\n  return duration;\n}\n\n\n"]}
|
|
@@ -22,8 +22,11 @@ export class DateFormatPipe {
|
|
|
22
22
|
const date = isMoment(value) ? value : this.dateAdapter.parse(value, DATE_ISO_PATTERN);
|
|
23
23
|
return date && this.dateAdapter.format(date, pattern) || '';
|
|
24
24
|
}
|
|
25
|
-
format(date,
|
|
26
|
-
return this.dateAdapter.format(date,
|
|
25
|
+
format(date, pattern) {
|
|
26
|
+
return this.dateAdapter.format(date, pattern);
|
|
27
|
+
}
|
|
28
|
+
parse(value, parseFormat) {
|
|
29
|
+
return isMoment(value) ? value : this.dateAdapter.parse(value, parseFormat || DATE_ISO_PATTERN);
|
|
27
30
|
}
|
|
28
31
|
}
|
|
29
32
|
DateFormatPipe.ɵprov = i0.ɵɵdefineInjectable({ factory: function DateFormatPipe_Factory() { return new DateFormatPipe(i0.ɵɵinject(i1.MomentDateAdapter), i0.ɵɵinject(i2.TranslateService)); }, token: DateFormatPipe, providedIn: "root" });
|
|
@@ -37,4 +40,4 @@ DateFormatPipe.ctorParameters = () => [
|
|
|
37
40
|
{ type: MomentDateAdapter },
|
|
38
41
|
{ type: TranslateService }
|
|
39
42
|
];
|
|
40
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
43
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGF0ZS1mb3JtYXQucGlwZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3NyYy9hcHAvc2hhcmVkL3BpcGVzL2RhdGUtZm9ybWF0LnBpcGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFDLFVBQVUsRUFBRSxJQUFJLEVBQWdCLE1BQU0sZUFBZSxDQUFDO0FBQzlELE9BQU8sRUFBQyxRQUFRLEVBQVMsTUFBTSxRQUFRLENBQUM7QUFDeEMsT0FBTyxFQUFDLGdCQUFnQixFQUFDLE1BQU0sY0FBYyxDQUFDO0FBQzlDLE9BQU8sRUFBQyxnQkFBZ0IsRUFBQyxNQUFNLHFCQUFxQixDQUFDO0FBQ3JELE9BQU8sRUFBQyxpQkFBaUIsRUFBQyxNQUFNLGtDQUFrQyxDQUFDOzs7O0FBTW5FLE1BQU0sT0FBTyxjQUFjO0lBTXpCLFlBQ1ksV0FBOEIsRUFDOUIsU0FBMkI7UUFEM0IsZ0JBQVcsR0FBWCxXQUFXLENBQW1CO1FBQzlCLGNBQVMsR0FBVCxTQUFTLENBQWtCO1FBR3JDLE1BQU0sWUFBWSxHQUFHLFNBQVMsQ0FBQyxPQUFPLENBQUMsQ0FBQyxxQkFBcUIsRUFBRSwwQkFBMEIsRUFBRSxrQ0FBa0MsQ0FBQyxDQUFDLENBQUM7UUFDaEksSUFBSSxDQUFDLFdBQVcsR0FBRyxZQUFZLENBQUMscUJBQXFCLENBQUMsQ0FBQztRQUN2RCxJQUFJLENBQUMsZUFBZSxHQUFHLFlBQVksQ0FBQywwQkFBMEIsQ0FBQyxDQUFDO1FBQ2hFLElBQUksQ0FBQyxzQkFBc0IsR0FBRyxZQUFZLENBQUMsa0NBQWtDLENBQUMsQ0FBQztJQUNqRixDQUFDO0lBRUQsU0FBUyxDQUFDLEtBQTZCLEVBQUUsSUFBOEQ7UUFDbkcsTUFBTSxPQUFPLEdBQUcsSUFBSSxJQUFJLElBQUksQ0FBQyxPQUFPO1lBQ2xDLENBQUMsSUFBSSxJQUFJLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLHNCQUFzQixDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsZUFBZSxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsQ0FBQztRQUMvRyxtRUFBbUU7UUFDbkUsTUFBTSxJQUFJLEdBQVcsUUFBUSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsS0FBSyxDQUFDLEtBQUssRUFBRSxnQkFBZ0IsQ0FBQyxDQUFDO1FBQy9GLE9BQU8sSUFBSSxJQUFJLElBQUksQ0FBQyxXQUFXLENBQUMsTUFBTSxDQUFDLElBQUksRUFBRSxPQUFPLENBQUMsSUFBSSxFQUFFLENBQUM7SUFDaEUsQ0FBQztJQUVELE1BQU0sQ0FBQyxJQUFZLEVBQUUsT0FBWTtRQUMvQixPQUFPLElBQUksQ0FBQyxXQUFXLENBQUMsTUFBTSxDQUFDLElBQUksRUFBRSxPQUFPLENBQUMsQ0FBQztJQUNoRCxDQUFDO0lBRUQsS0FBSyxDQUFDLEtBQWEsRUFBRSxXQUFnQjtRQUNuQyxPQUFPLFFBQVEsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDLEtBQUssQ0FBQyxLQUFLLEVBQUUsV0FBVyxJQUFJLGdCQUFnQixDQUFDLENBQUM7SUFDbEcsQ0FBQzs7OztZQW5DRixJQUFJLFNBQUM7Z0JBQ0YsSUFBSSxFQUFFLFlBQVk7YUFDckI7WUFDQSxVQUFVLFNBQUMsRUFBQyxVQUFVLEVBQUUsTUFBTSxFQUFDOzs7WUFMeEIsaUJBQWlCO1lBRGpCLGdCQUFnQiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7SW5qZWN0YWJsZSwgUGlwZSwgUGlwZVRyYW5zZm9ybX0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQge2lzTW9tZW50LCBNb21lbnR9IGZyb20gJ21vbWVudCc7XG5pbXBvcnQge0RBVEVfSVNPX1BBVFRFUk59IGZyb20gJy4uL2NvbnN0YW50cyc7XG5pbXBvcnQge1RyYW5zbGF0ZVNlcnZpY2V9IGZyb20gJ0BuZ3gtdHJhbnNsYXRlL2NvcmUnO1xuaW1wb3J0IHtNb21lbnREYXRlQWRhcHRlcn0gZnJvbSAnQGFuZ3VsYXIvbWF0ZXJpYWwtbW9tZW50LWFkYXB0ZXInO1xuXG5AUGlwZSh7XG4gICAgbmFtZTogJ2RhdGVGb3JtYXQnXG59KVxuQEluamVjdGFibGUoe3Byb3ZpZGVkSW46ICdyb290J30pXG5leHBvcnQgY2xhc3MgRGF0ZUZvcm1hdFBpcGUgaW1wbGVtZW50cyBQaXBlVHJhbnNmb3JtIHtcblxuICBwcml2YXRlIHJlYWRvbmx5IGRhdGVQYXR0ZXJuOiBzdHJpbmc7XG4gIHByaXZhdGUgcmVhZG9ubHkgZGF0ZVRpbWVQYXR0ZXJuOiBzdHJpbmc7XG4gIHByaXZhdGUgcmVhZG9ubHkgZGF0ZVRpbWVTZWNvbmRzUGF0dGVybjogc3RyaW5nO1xuXG4gIGNvbnN0cnVjdG9yKFxuICAgICAgcHJpdmF0ZSBkYXRlQWRhcHRlcjogTW9tZW50RGF0ZUFkYXB0ZXIsXG4gICAgICBwcml2YXRlIHRyYW5zbGF0ZTogVHJhbnNsYXRlU2VydmljZVxuICAgICAgKSB7XG5cbiAgICBjb25zdCB0cmFuc2xhdGlvbnMgPSB0cmFuc2xhdGUuaW5zdGFudChbJ0NPTU1PTi5EQVRFX1BBVFRFUk4nLCAnQ09NTU9OLkRBVEVfVElNRV9QQVRURVJOJywgJ0NPTU1PTi5EQVRFX1RJTUVfU0VDT05EU19QQVRURVJOJ10pO1xuICAgIHRoaXMuZGF0ZVBhdHRlcm4gPSB0cmFuc2xhdGlvbnNbJ0NPTU1PTi5EQVRFX1BBVFRFUk4nXTtcbiAgICB0aGlzLmRhdGVUaW1lUGF0dGVybiA9IHRyYW5zbGF0aW9uc1snQ09NTU9OLkRBVEVfVElNRV9QQVRURVJOJ107XG4gICAgdGhpcy5kYXRlVGltZVNlY29uZHNQYXR0ZXJuID0gdHJhbnNsYXRpb25zWydDT01NT04uREFURV9USU1FX1NFQ09ORFNfUEFUVEVSTiddO1xuICB9XG5cbiAgdHJhbnNmb3JtKHZhbHVlOiBzdHJpbmcgfCBNb21lbnQgfCBEYXRlLCBhcmdzPzogeyBwYXR0ZXJuPzogc3RyaW5nOyB0aW1lPzogYm9vbGVhbjsgc2Vjb25kcz86IGJvb2xlYW4gfSApOiBzdHJpbmcge1xuICAgICAgY29uc3QgcGF0dGVybiA9IGFyZ3MgJiYgYXJncy5wYXR0ZXJuIHx8XG4gICAgICAgIChhcmdzICYmIGFyZ3MudGltZSA/IChhcmdzLnNlY29uZHMgPyB0aGlzLmRhdGVUaW1lU2Vjb25kc1BhdHRlcm4gOiB0aGlzLmRhdGVUaW1lUGF0dGVybikgOiB0aGlzLmRhdGVQYXR0ZXJuKTtcbiAgICAgIC8vIEtlZXAgb3JpZ2luYWwgbW9tZW50IG9iamVjdCwgaWYgcG9zc2libGUgKHRvIGF2b2lkIGEgY29udmVyc2lvbilcbiAgICAgIGNvbnN0IGRhdGU6IE1vbWVudCA9IGlzTW9tZW50KHZhbHVlKSA/IHZhbHVlIDogdGhpcy5kYXRlQWRhcHRlci5wYXJzZSh2YWx1ZSwgREFURV9JU09fUEFUVEVSTik7XG4gICAgICByZXR1cm4gZGF0ZSAmJiB0aGlzLmRhdGVBZGFwdGVyLmZvcm1hdChkYXRlLCBwYXR0ZXJuKSB8fCAnJztcbiAgfVxuXG4gIGZvcm1hdChkYXRlOiBNb21lbnQsIHBhdHRlcm46IGFueSk6IHN0cmluZyB7XG4gICAgcmV0dXJuIHRoaXMuZGF0ZUFkYXB0ZXIuZm9ybWF0KGRhdGUsIHBhdHRlcm4pO1xuICB9XG5cbiAgcGFyc2UodmFsdWU6IHN0cmluZywgcGFyc2VGb3JtYXQ6IGFueSk6IE1vbWVudCB7XG4gICAgcmV0dXJuIGlzTW9tZW50KHZhbHVlKSA/IHZhbHVlIDogdGhpcy5kYXRlQWRhcHRlci5wYXJzZSh2YWx1ZSwgcGFyc2VGb3JtYXQgfHwgREFURV9JU09fUEFUVEVSTik7XG4gIH1cbn1cbiJdfQ==
|
|
@@ -1896,8 +1896,11 @@ class DateFormatPipe {
|
|
|
1896
1896
|
const date = isMoment(value) ? value : this.dateAdapter.parse(value, DATE_ISO_PATTERN);
|
|
1897
1897
|
return date && this.dateAdapter.format(date, pattern) || '';
|
|
1898
1898
|
}
|
|
1899
|
-
format(date,
|
|
1900
|
-
return this.dateAdapter.format(date,
|
|
1899
|
+
format(date, pattern) {
|
|
1900
|
+
return this.dateAdapter.format(date, pattern);
|
|
1901
|
+
}
|
|
1902
|
+
parse(value, parseFormat) {
|
|
1903
|
+
return isMoment(value) ? value : this.dateAdapter.parse(value, parseFormat || DATE_ISO_PATTERN);
|
|
1901
1904
|
}
|
|
1902
1905
|
}
|
|
1903
1906
|
DateFormatPipe.ɵprov = i0.ɵɵdefineInjectable({ factory: function DateFormatPipe_Factory() { return new DateFormatPipe(i0.ɵɵinject(i1.MomentDateAdapter), i0.ɵɵinject(i1$1.TranslateService)); }, token: DateFormatPipe, providedIn: "root" });
|
|
@@ -2386,10 +2389,10 @@ class DateUtils {
|
|
|
2386
2389
|
this.toDuration = toDuration;
|
|
2387
2390
|
}
|
|
2388
2391
|
static min(date1, date2) {
|
|
2389
|
-
return date1 && date2
|
|
2392
|
+
return date1 && (!date2 || date1.isSameOrBefore(date2)) ? date1 : date2;
|
|
2390
2393
|
}
|
|
2391
2394
|
static max(date1, date2) {
|
|
2392
|
-
return
|
|
2395
|
+
return date1 && (!date2 || date1.isSameOrAfter(date2)) ? date1 : date2;
|
|
2393
2396
|
}
|
|
2394
2397
|
static equals(date1, date2) {
|
|
2395
2398
|
return DateUtils.isSame(date1, date2);
|