From d57fdaa6e417f6a32c492d69670e9786ca48d756 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Tue, 30 Oct 2018 18:29:48 +0530 Subject: [PATCH] pd schedule changes --- .../schedule-pd/schedule-pd.component.html | 41 +++------- .../schedule-pd/schedule-pd.component.ts | 77 +++++++++---------- 2 files changed, 48 insertions(+), 70 deletions(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/schedule-pd/schedule-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/schedule-pd/schedule-pd.component.html index 06e1137aa..1ea7fc302 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/schedule-pd/schedule-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/schedule-pd/schedule-pd.component.html @@ -2,14 +2,18 @@
- +
- - + + + {{selectedMoment | date: 'dd/MM/yyyy'}} + + + {{selectedMoment | date:'h:mm a'}} + + - - + +
- - - -
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/schedule-pd/schedule-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/schedule-pd/schedule-pd.component.ts index 17d0b8174..3b66706a0 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/schedule-pd/schedule-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/schedule-pd/schedule-pd.component.ts @@ -21,39 +21,39 @@ export class SchedulePdComponent implements OnInit { public selectedMoment = new Date(); errorMessage: any; notifier : NotifierService; - scheduleControl = new FormControl('', [Validators.required]); - timeDetails: Timeslot[] = [ - {id: '1', name: '06:00 AM', objectValue:'06:00:00'}, - {id: '2', name: '06:30 AM', objectValue:'06:30:00'}, - {id: '3', name: '07:00 AM', objectValue:'07:00:00'}, - {id: '4', name: '07:30 AM', objectValue:'07:30:00'}, - {id: '5', name: '08:00 AM', objectValue:'08:00:00'}, - {id: '6', name: '08:30 AM', objectValue:'08:30:00'}, - {id: '7', name: '09:00 AM', objectValue:'09:00:00'}, - {id: '8', name: '09:30 AM', objectValue:'09:30:00'}, - {id: '9', name: '10:00 AM', objectValue:'10:00:00'}, - {id: '10', name: '10:30 AM', objectValue:'10:30:00'}, - {id: '11', name: '11:00 AM', objectValue:'11:00:00'}, - {id: '12', name: '11:30 AM', objectValue:'11:30:00'}, - {id: '13', name: '12:00 PM', objectValue:'12:00:00'}, - {id: '14', name: '12:30 PM', objectValue:'12:30:00'}, - {id: '15', name: '01:00 PM', objectValue:'13:00:00'}, - {id: '16', name: '01:30 PM', objectValue:'13:30:00'}, - {id: '17', name: '02:00 PM', objectValue:'14:00:00'}, - {id: '18', name: '02:30 PM', objectValue:'14:30:00'}, - {id: '19', name: '03:00 PM', objectValue:'15:00:00'}, - {id: '20', name: '03:30 PM', objectValue:'15:30:00'}, - {id: '21', name: '04:00 PM', objectValue:'16:00:00'}, - {id: '22', name: '04:30 PM', objectValue:'16:30:00'}, - {id: '23', name: '05.00 PM', objectValue:'17:00:00'}, - {id: '24', name: '05:30 PM', objectValue:'17:30:00'}, - {id: '25', name: '06:00 PM', objectValue:'18:00:00'}, - {id: '26', name: '06:30 PM', objectValue:'18:30:00'}, - {id: '27', name: '07:00 PM', objectValue:'19:00:00'}, - {id: '28', name: '07:30 PM', objectValue:'19:30:00'}, - {id: '29', name: '08:00 PM', objectValue:'20:00:00'}, + //scheduleControl = new FormControl('', [Validators.required]); + // timeDetails: Timeslot[] = [ + // {id: '1', name: '06:00 AM', objectValue:'06:00:00'}, + // {id: '2', name: '06:30 AM', objectValue:'06:30:00'}, + // {id: '3', name: '07:00 AM', objectValue:'07:00:00'}, + // {id: '4', name: '07:30 AM', objectValue:'07:30:00'}, + // {id: '5', name: '08:00 AM', objectValue:'08:00:00'}, + // {id: '6', name: '08:30 AM', objectValue:'08:30:00'}, + // {id: '7', name: '09:00 AM', objectValue:'09:00:00'}, + // {id: '8', name: '09:30 AM', objectValue:'09:30:00'}, + // {id: '9', name: '10:00 AM', objectValue:'10:00:00'}, + // {id: '10', name: '10:30 AM', objectValue:'10:30:00'}, + // {id: '11', name: '11:00 AM', objectValue:'11:00:00'}, + // {id: '12', name: '11:30 AM', objectValue:'11:30:00'}, + // {id: '13', name: '12:00 PM', objectValue:'12:00:00'}, + // {id: '14', name: '12:30 PM', objectValue:'12:30:00'}, + // {id: '15', name: '01:00 PM', objectValue:'13:00:00'}, + // {id: '16', name: '01:30 PM', objectValue:'13:30:00'}, + // {id: '17', name: '02:00 PM', objectValue:'14:00:00'}, + // {id: '18', name: '02:30 PM', objectValue:'14:30:00'}, + // {id: '19', name: '03:00 PM', objectValue:'15:00:00'}, + // {id: '20', name: '03:30 PM', objectValue:'15:30:00'}, + // {id: '21', name: '04:00 PM', objectValue:'16:00:00'}, + // {id: '22', name: '04:30 PM', objectValue:'16:30:00'}, + // {id: '23', name: '05.00 PM', objectValue:'17:00:00'}, + // {id: '24', name: '05:30 PM', objectValue:'17:30:00'}, + // {id: '25', name: '06:00 PM', objectValue:'18:00:00'}, + // {id: '26', name: '06:30 PM', objectValue:'18:30:00'}, + // {id: '27', name: '07:00 PM', objectValue:'19:00:00'}, + // {id: '28', name: '07:30 PM', objectValue:'19:30:00'}, + // {id: '29', name: '08:00 PM', objectValue:'20:00:00'}, - ]; + // ]; public min = new Date(); constructor(notifier: NotifierService, private dialogRef: MatDialogRef, private _pd: PdTrigerService, @@ -71,15 +71,12 @@ export class SchedulePdComponent implements OnInit { } // update pd schedule - upatePDSchedule(date:any,time:string){ - let myFormattedDate = this.pipe.transform(date, 'yyyy-MM-dd'); - if(!this.scheduleControl.valid){ - this.notifier.notify('warning', 'Please Choose Schedule Date/Time.!'); - } - else { + upatePDSchedule(date:any){ + let myFormattedDate = this.pipe.transform(date, 'yyyy-MM-dd h:mm a'); + let updateData = { "fk_pd_id":this.data.pd_id, - "schedule_time":myFormattedDate +' '+ time, + "schedule_time":myFormattedDate, } this._pd.updateSchedule(updateData).subscribe( result => { @@ -97,6 +94,4 @@ export class SchedulePdComponent implements OnInit { this.dialogRef.close(); }); } - } - }