From 15b0350fe2d60e7c5869daffe57ddfc505235a9d Mon Sep 17 00:00:00 2001
From: mehmet-erim <bilgi@mehmeterim.com>
Date: Sat, 22 May 2021 03:14:46 +0300
Subject: [PATCH] pass meridian to ngb time picker

---
 .../date-time-picker/date-time-picker.component.ts       | 2 ++
 .../extensible-form/extensible-form-prop.component.html  | 2 +-
 .../extensible-form/extensible-form-prop.component.ts    | 9 ++++++++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/date-time-picker/date-time-picker.component.ts b/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/date-time-picker/date-time-picker.component.ts
index 157f9f49e2..7890e65b36 100644
--- a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/date-time-picker/date-time-picker.component.ts
+++ b/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
       [formControlName]="prop.name"
       (ngModelChange)="setDate($event)"
+      [meridian]="meridian"
     ></ngb-timepicker>
   `,
   changeDetection: ChangeDetectionStrategy.OnPush,
@@ -58,6 +59,7 @@ import { selfFactory } from '../../utils/factory.util';
 })
 export class DateTimePickerComponent {
   @Input() prop: FormProp;
+  @Input() meridian = false;
 
   @ViewChild(NgbInputDatepicker) date: NgbInputDatepicker;
   @ViewChild(NgbTimepicker) time: NgbTimepicker;
diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.html b/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.html
index f3f60a56dc..c3fdbdff07 100644
--- a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.html
+++ b/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 [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 ngSwitchCase="textarea">
diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.ts b/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.ts
index 893d6e6344..238eb8d066 100644
--- a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/extensible-form/extensible-form-prop.component.ts
+++ b/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 {
   ChangeDetectionStrategy,
   ChangeDetectorRef,
@@ -82,6 +82,12 @@ export class ExtensibleFormPropComponent implements OnChanges {
 
   typeaheadFormatter = (option: ABP.Option<any>) => option.key;
 
+  get meridian() {
+    return (
+      this.configState.getDeep('localization.currentCulture.dateTimeFormat.shortTimePattern') || ''
+    ).includes('tt');
+  }
+
   get isInvalid() {
     const control = this.form.get(this.prop.name);
     return control.touched && control.invalid;
@@ -90,6 +96,7 @@ export class ExtensibleFormPropComponent implements OnChanges {
   constructor(
     public readonly cdRef: ChangeDetectorRef,
     public readonly track: TrackByService,
+    protected configState: ConfigStateService,
     groupDirective: FormGroupDirective,
   ) {
     this.form = groupDirective.form;