@sumaris-net/ngx-components 1.19.12 → 1.19.13-rc3
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 +40 -37
- package/bundles/sumaris-net.ngx-components.umd.js.map +1 -1
- package/bundles/sumaris-net.ngx-components.umd.min.js +1 -1
- package/bundles/sumaris-net.ngx-components.umd.min.js.map +1 -1
- package/esm2015/src/app/shared/material/latlong/material.latlong.js +41 -38
- package/fesm2015/sumaris-net.ngx-components.js +40 -37
- package/fesm2015/sumaris-net.ngx-components.js.map +1 -1
- package/package.json +1 -1
- package/src/app/shared/material/latlong/material.latlong.d.ts +4 -3
- package/src/assets/i18n/fr.json +1 -1
- package/sumaris-net.ngx-components.metadata.json +1 -1
|
@@ -5332,7 +5332,7 @@
|
|
|
5332
5332
|
return;
|
|
5333
5333
|
this.value = (typeof obj === 'string') ? parseFloat(obj.replace(/,/g, '.')) : obj;
|
|
5334
5334
|
this.writing = true;
|
|
5335
|
-
var strValue = this.
|
|
5335
|
+
var strValue = this._format(this.value, { placeholderChar: this.placeholderChar });
|
|
5336
5336
|
var sign = isNotNil(this.value) ? (this.value < 0 ? -1 : 1) :
|
|
5337
5337
|
// Use default sign, if any
|
|
5338
5338
|
(this.defaultSign ? (this.defaultSign === '-' ? -1 : 1) : null);
|
|
@@ -5365,41 +5365,8 @@
|
|
|
5365
5365
|
this.disabling = false;
|
|
5366
5366
|
this.markForCheck();
|
|
5367
5367
|
};
|
|
5368
|
-
MatLatLongField.prototype.
|
|
5369
|
-
|
|
5370
|
-
return; // Skip if call by self
|
|
5371
|
-
this.writing = true;
|
|
5372
|
-
if (this.textFormControl.invalid || this.signFormControl.invalid) {
|
|
5373
|
-
this.formControl.markAsPending();
|
|
5374
|
-
this.formControl.setErrors(Object.assign(Object.assign(Object.assign({}, this.formControl.errors), this.textFormControl.errors), this.signFormControl.errors));
|
|
5375
|
-
this.writing = false;
|
|
5376
|
-
return;
|
|
5377
|
-
}
|
|
5378
|
-
var parsedValue = isNotNilOrBlank(strValue) ? parseLatitudeOrLongitude(strValue, this.pattern, 7 /*=precision of the converted double value */, this.placeholderChar) : null;
|
|
5379
|
-
// DEBUG
|
|
5380
|
-
//console.debug('parsedValue=', parsedValue);
|
|
5381
|
-
if (isNaN(parsedValue)) {
|
|
5382
|
-
this.formControl.markAsPending();
|
|
5383
|
-
this.formControl.setErrors(this.type === 'latitude' ? { latitude: true } : { longitude: true });
|
|
5384
|
-
this.writing = false;
|
|
5385
|
-
return;
|
|
5386
|
-
}
|
|
5387
|
-
var sign = (this.pattern === 'DD') ? 1 /*ignore sign*/ : (this.signFormControl.value || 1);
|
|
5388
|
-
this.value = isNotNil(parsedValue) ? sign * parsedValue : null;
|
|
5389
|
-
// Get the model value
|
|
5390
|
-
//console.debug("[mat-latlon] Setting value {" + this.value + "} parsed from {" + strValue + "}");
|
|
5391
|
-
this.formControl.patchValue(this.value, { emitEvent: false });
|
|
5392
|
-
this.writing = false;
|
|
5393
|
-
this.markForCheck();
|
|
5394
|
-
this._onChangeCallback(this.value);
|
|
5395
|
-
};
|
|
5396
|
-
MatLatLongField.prototype.checkIfTouched = function () {
|
|
5397
|
-
if (this.formControl.touched || this.textFormControl.touched) {
|
|
5398
|
-
this.markForCheck();
|
|
5399
|
-
this._onTouchedCallback();
|
|
5400
|
-
return true;
|
|
5401
|
-
}
|
|
5402
|
-
return false;
|
|
5368
|
+
MatLatLongField.prototype._format = function (value, opts) {
|
|
5369
|
+
return this.formatFn(value, Object.assign(Object.assign(Object.assign({}, this.formatFnOptions), { placeholderChar: this.placeholderChar }), opts));
|
|
5403
5370
|
};
|
|
5404
5371
|
MatLatLongField.prototype._onFocus = function (event) {
|
|
5405
5372
|
var _this = this;
|
|
@@ -5510,6 +5477,42 @@
|
|
|
5510
5477
|
}
|
|
5511
5478
|
}
|
|
5512
5479
|
};
|
|
5480
|
+
MatLatLongField.prototype.onFormChange = function (strValue) {
|
|
5481
|
+
if (this.writing)
|
|
5482
|
+
return; // Skip if call by self
|
|
5483
|
+
this.writing = true;
|
|
5484
|
+
if (this.textFormControl.invalid || this.signFormControl.invalid) {
|
|
5485
|
+
this.formControl.markAsPending();
|
|
5486
|
+
this.formControl.setErrors(Object.assign(Object.assign(Object.assign({}, this.formControl.errors), this.textFormControl.errors), this.signFormControl.errors));
|
|
5487
|
+
this.writing = false;
|
|
5488
|
+
return;
|
|
5489
|
+
}
|
|
5490
|
+
var parsedValue = isNotNilOrBlank(strValue) ? parseLatitudeOrLongitude(strValue, this.pattern, 7 /*=precision of the converted double value */, this.placeholderChar) : null;
|
|
5491
|
+
// DEBUG
|
|
5492
|
+
//console.debug('parsedValue=', parsedValue);
|
|
5493
|
+
if (isNaN(parsedValue)) {
|
|
5494
|
+
this.formControl.markAsPending();
|
|
5495
|
+
this.formControl.setErrors(this.type === 'latitude' ? { latitude: true } : { longitude: true });
|
|
5496
|
+
this.writing = false;
|
|
5497
|
+
return;
|
|
5498
|
+
}
|
|
5499
|
+
var sign = (this.pattern === 'DD') ? 1 /*ignore sign*/ : (this.signFormControl.value || 1);
|
|
5500
|
+
this.value = isNotNil(parsedValue) ? sign * parsedValue : null;
|
|
5501
|
+
// Get the model value
|
|
5502
|
+
//console.debug("[mat-latlon] Setting value {" + this.value + "} parsed from {" + strValue + "}");
|
|
5503
|
+
this.formControl.patchValue(this.value, { emitEvent: false });
|
|
5504
|
+
this.writing = false;
|
|
5505
|
+
this.markForCheck();
|
|
5506
|
+
this._onChangeCallback(this.value);
|
|
5507
|
+
};
|
|
5508
|
+
MatLatLongField.prototype.checkIfTouched = function () {
|
|
5509
|
+
if (this.formControl.touched || this.textFormControl.touched) {
|
|
5510
|
+
this.markForCheck();
|
|
5511
|
+
this._onTouchedCallback();
|
|
5512
|
+
return true;
|
|
5513
|
+
}
|
|
5514
|
+
return false;
|
|
5515
|
+
};
|
|
5513
5516
|
MatLatLongField.prototype.markForCheck = function () {
|
|
5514
5517
|
this.cd.markForCheck();
|
|
5515
5518
|
};
|
|
@@ -5518,7 +5521,7 @@
|
|
|
5518
5521
|
MatLatLongField.decorators = [
|
|
5519
5522
|
{ type: i0.Component, args: [{
|
|
5520
5523
|
selector: 'mat-latlong-field',
|
|
5521
|
-
template: "<!-- readonly -->\n<mat-form-field *ngIf=\"readonly; else writable\"\n [floatLabel]=\"floatLabel\"\n class=\"mat-form-field-disabled\">\n\n <div matPrefix>\n <ng-container *ngTemplateOutlet=\"matPrefixTemplate\"></ng-container>\n </div>\n\n <input matInput hidden type=\"text\"\n readonly\n [placeholder]=\"placeholder\"\n [formControl]=\"formControl\">\n <ion-text>{{
|
|
5524
|
+
template: "<!-- readonly -->\n<mat-form-field *ngIf=\"readonly; else writable\"\n [floatLabel]=\"floatLabel\"\n class=\"mat-form-field-disabled\">\n\n <div matPrefix>\n <ng-container *ngTemplateOutlet=\"matPrefixTemplate\"></ng-container>\n </div>\n\n <input matInput hidden type=\"text\"\n readonly\n [placeholder]=\"placeholder\"\n [formControl]=\"formControl\">\n <ion-text>{{_format(value, {placeholderChar: null})}}</ion-text>\n\n <div matSuffix>\n <ng-container *ngTemplateOutlet=\"matSuffixTemplate\"></ng-container>\n </div>\n</mat-form-field>\n\n<!-- writable -->\n<ng-template #writable>\n\n <ion-grid class=\"ion-no-padding\">\n <ion-row class=\"ion-no-padding no-wrap\">\n <ion-col class=\"text ion-no-padding\">\n <mat-form-field [floatLabel]=\"floatLabel\"\n [class.mat-form-field-disabled]=\"formControl.disabled\"\n [class.mat-form-field-invalid]=\"formControl.touched && formControl.invalid\">\n\n <mat-label *ngIf=\"placeholder\">{{placeholder}}</mat-label>\n\n <div matPrefix>\n <ng-container *ngTemplateOutlet=\"matPrefixTemplate\"></ng-container>\n </div>\n\n <input matInput #inputElement\n type=\"text\"\n autocomplete=\"off\"\n [textMask]=\"textMaskConfig\"\n [formControl]=\"textFormControl\"\n [placeholder]=\"inputPlaceholder|translate\"\n (keypress)=\"onKeypress($event)\"\n (keydown.tab)=\"moveCaretToSeparator($event, true)\"\n (keydown.shift.tab)=\"moveCaretToSeparator($event, false)\"\n (focus)=\"_onFocus($event)\"\n (blur)=\"_onBlur($event)\"\n [required]=\"required\"\n [tabindex]=\"tabindex\">\n\n <div matSuffix *ngIf=\"!showSignControl\">\n <ng-container *ngTemplateOutlet=\"matSuffixTemplate\"></ng-container>\n </div>\n\n <div class=\"mat-form-field-subscript mat-form-field-subscript-wrapper\">\n\n <!-- errors -->\n <ng-container *ngIf=\"formControl.touched && formControl.errors|mapKeys|arrayFirst; let errorKey\" [ngSwitch]=\"errorKey\">\n <mat-error *ngSwitchCase=\"'required'\" translate>ERROR.FIELD_REQUIRED</mat-error>\n <mat-error *ngSwitchCase=\"'latitude'\" translate>ERROR.FIELD_NOT_VALID_LATITUDE</mat-error>\n <mat-error *ngSwitchCase=\"'longitude'\" translate>ERROR.FIELD_NOT_VALID_LONGITUDE</mat-error>\n <mat-error *ngSwitchCase=\"'min'\">{{'ERROR.FIELD_MIN_COMPACT'|translate: {min: _format(formControl.errors.min.min, {placeholderChar: null}) } }}</mat-error>\n <mat-error *ngSwitchCase=\"'max'\">{{'ERROR.FIELD_MAX_COMPACT'|translate: {max: _format(formControl.errors.max.max, {placeholderChar: null}) } }}</mat-error>\n <mat-error *ngSwitchCase=\"'msg'\">{{(formControl.errors.msg?.key || formControl.errors.msg) | translate: formControl.errors.msg?.params}}</mat-error>\n </ng-container>\n <ng-content select=\"mat-error\"></ng-content>\n\n <!-- mat hint -->\n <div class=\"mat-form-field-hint-wrapper\" [class.cdk-visually-hidden]=\"formControl.invalid\">\n <div class=\"mat-form-field-hint-spacer\"></div>\n <ng-content select=\"mat-hint\"></ng-content>\n </div>\n </div>\n </mat-form-field>\n </ion-col>\n\n <!-- sign -->\n <ion-col class=\"sign ion-no-padding\" [ngSwitch]=\"type\" *ngIf=\"showSignControl\">\n\n <!-- sign on latitude -->\n <mat-form-field *ngSwitchCase=\"'latitude'\"\n floatLabel=\"never\"\n [class.mat-form-field-invalid]=\"formControl.touched && signFormControl.invalid\">\n <mat-label *ngIf=\"placeholder && floatLabel != 'never'\" translate>COMMON.LAT_LONG.LAT_SIGN_PLACEHOLDER</mat-label>\n <mat-select [formControl]=\"signFormControl\"\n [tabindex]=\"tabindex+1\">\n <mat-option [value]=\"1\">{{'COMMON.LAT_LONG.LAT_SIGN_N'|translate}}</mat-option>\n <mat-option [value]=\"-1\" >{{'COMMON.LAT_LONG.LAT_SIGN_S'|translate}}</mat-option>\n </mat-select>\n\n <div matSuffix>\n <ng-container *ngTemplateOutlet=\"matSuffixTemplate\"></ng-container>\n </div>\n </mat-form-field>\n\n <!-- sign on longitude -->\n <mat-form-field floatLabel=\"never\"\n *ngSwitchCase=\"'longitude'\"\n [class.mat-form-field-invalid]=\"formControl.touched && signFormControl.invalid\">\n <mat-label *ngIf=\"placeholder && floatLabel != 'never'\" translate>COMMON.LAT_LONG.LONG_SIGN_PLACEHOLDER</mat-label>\n <mat-select [formControl]=\"signFormControl\"\n [tabindex]=\"tabindex+2\">\n <mat-option [value]=\"1\" translate>{{'COMMON.LAT_LONG.LONG_SIGN_E'|translate}}</mat-option>\n <mat-option [value]=\"-1\" translate>{{'COMMON.LAT_LONG.LONG_SIGN_W'|translate}}</mat-option>\n </mat-select>\n\n <div matSuffix>\n <ng-container *ngTemplateOutlet=\"matSuffixTemplate\"></ng-container>\n </div>\n </mat-form-field>\n </ion-col>\n </ion-row>\n </ion-grid>\n\n</ng-template>\n\n<ng-template #matPrefixTemplate>\n <ng-content select=\"[matPrefix]\"></ng-content>\n</ng-template>\n\n\n<ng-template #matSuffixTemplate>\n <ng-content select=\"[matSuffix]\"></ng-content>\n</ng-template>\n",
|
|
5522
5525
|
providers: [
|
|
5523
5526
|
{
|
|
5524
5527
|
provide: i1.NG_VALUE_ACCESSOR,
|