Browse Source

pass meridian to ngb time picker

pull/9144/head
mehmet-erim 5 years ago
parent
commit
15b0350fe2
  1. 2
      npm/ng-packs/packages/theme-shared/extensions/src/lib/components/date-time-picker/date-time-picker.component.ts
  2. 2
      npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.html
  3. 9
      npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.ts

2
npm/ng-packs/packages/theme-shared/extensions/src/lib/components/date-time-picker/date-time-picker.component.ts

@ -37,6 +37,7 @@ import { selfFactory } from '../../utils/factory.util';
#timepicker #timepicker
[formControlName]="prop.name" [formControlName]="prop.name"
(ngModelChange)="setDate($event)" (ngModelChange)="setDate($event)"
[meridian]="meridian"
></ngb-timepicker> ></ngb-timepicker>
`, `,
changeDetection: ChangeDetectionStrategy.OnPush, changeDetection: ChangeDetectionStrategy.OnPush,
@ -58,6 +59,7 @@ import { selfFactory } from '../../utils/factory.util';
}) })
export class DateTimePickerComponent { export class DateTimePickerComponent {
@Input() prop: FormProp; @Input() prop: FormProp;
@Input() meridian = false;
@ViewChild(NgbInputDatepicker) date: NgbInputDatepicker; @ViewChild(NgbInputDatepicker) date: NgbInputDatepicker;
@ViewChild(NgbTimepicker) time: NgbTimepicker; @ViewChild(NgbTimepicker) time: NgbTimepicker;

2
npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.html

@ -110,7 +110,7 @@
<ng-template ngSwitchCase="dateTime"> <ng-template ngSwitchCase="dateTime">
<ng-template [ngTemplateOutlet]="label"></ng-template> <ng-template [ngTemplateOutlet]="label"></ng-template>
<abp-date-time-picker [prop]="prop"></abp-date-time-picker> <abp-date-time-picker [prop]="prop" [meridian]="meridian"></abp-date-time-picker>
</ng-template> </ng-template>
<ng-template ngSwitchCase="textarea"> <ng-template ngSwitchCase="textarea">

9
npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.ts

@ -1,4 +1,4 @@
import { ABP, AbpValidators, TrackByService } from '@abp/ng.core'; import { ABP, AbpValidators, ConfigStateService, TrackByService } from '@abp/ng.core';
import { import {
ChangeDetectionStrategy, ChangeDetectionStrategy,
ChangeDetectorRef, ChangeDetectorRef,
@ -82,6 +82,12 @@ export class ExtensibleFormPropComponent implements OnChanges {
typeaheadFormatter = (option: ABP.Option<any>) => option.key; typeaheadFormatter = (option: ABP.Option<any>) => option.key;
get meridian() {
return (
this.configState.getDeep('localization.currentCulture.dateTimeFormat.shortTimePattern') || ''
).includes('tt');
}
get isInvalid() { get isInvalid() {
const control = this.form.get(this.prop.name); const control = this.form.get(this.prop.name);
return control.touched && control.invalid; return control.touched && control.invalid;
@ -90,6 +96,7 @@ export class ExtensibleFormPropComponent implements OnChanges {
constructor( constructor(
public readonly cdRef: ChangeDetectorRef, public readonly cdRef: ChangeDetectorRef,
public readonly track: TrackByService, public readonly track: TrackByService,
protected configState: ConfigStateService,
groupDirective: FormGroupDirective, groupDirective: FormGroupDirective,
) { ) {
this.form = groupDirective.form; this.form = groupDirective.form;

Loading…
Cancel
Save