Browse Source

add: second arg to formatDate method in time.adapter

pull/19736/head
masumulu28 2 years ago
parent
commit
2f4974dbf3
  1. 9
      npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form-prop.component.html
  2. 2
      npm/ng-packs/packages/theme-shared/src/lib/adapters/time.adapter.ts

9
npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form-prop.component.html

@ -21,11 +21,9 @@
class="form-control" class="form-control"
/> />
} }
@case ('hidden') { @case ('hidden') {
<input [formControlName]="prop.name" type="hidden" /> <input [formControlName]="prop.name" type="hidden" />
} }
@case ('checkbox') { @case ('checkbox') {
<div class="form-check" validationTarget> <div class="form-check" validationTarget>
<input <input
@ -42,7 +40,6 @@
></ng-template> ></ng-template>
</div> </div>
} }
@case ('select') { @case ('select') {
<ng-template [ngTemplateOutlet]="label"></ng-template> <ng-template [ngTemplateOutlet]="label"></ng-template>
<select <select
@ -59,7 +56,6 @@
} }
</select> </select>
} }
@case ('multiselect') { @case ('multiselect') {
<ng-template [ngTemplateOutlet]="label"></ng-template> <ng-template [ngTemplateOutlet]="label"></ng-template>
<select <select
@ -77,7 +73,6 @@
} }
</select> </select>
} }
@case ('typeahead') { @case ('typeahead') {
<ng-template [ngTemplateOutlet]="label"></ng-template> <ng-template [ngTemplateOutlet]="label"></ng-template>
<div #typeahead class="position-relative" validationStyle validationTarget> <div #typeahead class="position-relative" validationStyle validationTarget>
@ -100,7 +95,6 @@
<input [formControlName]="prop.name" type="hidden" /> <input [formControlName]="prop.name" type="hidden" />
</div> </div>
} }
@case ('date') { @case ('date') {
<ng-template [ngTemplateOutlet]="label"></ng-template> <ng-template [ngTemplateOutlet]="label"></ng-template>
<input <input
@ -118,12 +112,10 @@
<ng-template [ngTemplateOutlet]="label"></ng-template> <ng-template [ngTemplateOutlet]="label"></ng-template>
<ngb-timepicker [formControlName]="prop.name"></ngb-timepicker> <ngb-timepicker [formControlName]="prop.name"></ngb-timepicker>
} }
@case ('dateTime') { @case ('dateTime') {
<ng-template [ngTemplateOutlet]="label"></ng-template> <ng-template [ngTemplateOutlet]="label"></ng-template>
<abp-extensible-date-time-picker [prop]="prop" [meridian]="meridian$ | async" /> <abp-extensible-date-time-picker [prop]="prop" [meridian]="meridian$ | async" />
} }
@case ('textarea') { @case ('textarea') {
<ng-template [ngTemplateOutlet]="label"></ng-template> <ng-template [ngTemplateOutlet]="label"></ng-template>
<textarea <textarea
@ -135,7 +127,6 @@
class="form-control" class="form-control"
></textarea> ></textarea>
} }
@case ('passwordinputgroup') { @case ('passwordinputgroup') {
<ng-template [ngTemplateOutlet]="label"></ng-template> <ng-template [ngTemplateOutlet]="label"></ng-template>
<div class="input-group form-group" validationTarget> <div class="input-group form-group" validationTarget>

2
npm/ng-packs/packages/theme-shared/src/lib/adapters/time.adapter.ts

@ -24,7 +24,7 @@ export class TimeAdapter extends NgbTimeAdapter<string | Date> {
if (!value) return ''; if (!value) return '';
const date = new Date(0, 0, 1, value.hour, value.minute, value.second); const date = new Date(0, 0, 1, value.hour, value.minute, value.second);
const formattedDate = formatDate(date, 'HH:mm', 'en'); const formattedDate = formatDate(date, 'HH:mm:ss', 'en');
return formattedDate; return formattedDate;
} }

Loading…
Cancel
Save