Sineedge/sparqsineedge
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://bitbucket.org/sriramv18/sparqsineedge

Browse Source
This commit is contained in:
saravanakumarkandasami 2018-10-30 18:30:19 +05:30
commit 6f4c01b4fd
2 changed files with 48 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/schedule-pd/schedule-pd.component.html
View File

@ -2,14 +2,18 @@
<div style="max-height: 480px; width: 550px;">
<div class="column" fxFlex.xs="70" fxFlex.sm="70" fxFlex.md="70" fxFlex.lg="70" fxFlex.xl="70">
<owl-date-time-inline [min]="min" [pickerType]="'calendar'" [(ngModel)]="selectedMoment"></owl-date-time-inline>
<owl-date-time-inline [min]="min" [(ngModel)]="selectedMoment"></owl-date-time-inline>
</div>
<div class="column" fxFlex.xs="70" fxFlex.sm="70" fxFlex.md="70" fxFlex.lg="70" fxFlex.xl="70">
<mat-list style="margin-top: 20%;">
<!-- <mat-list-item>
<p>{{selectedMoment | date}}</p>
</mat-list-item> -->
<mat-list style="margin-top: 60%;">
<mat-list-item>
<strong>{{selectedMoment | date: 'dd/MM/yyyy'}}</strong>
</mat-list-item>
<mat-list-item>
<strong>{{selectedMoment | date:'h:mm a'}}</strong>
</mat-list-item>
<!-- <mat-list-item>
<mat-form-field>
<mat-select placeholder="Time" [formControl]="scheduleControl" required>
<mat-option *ngFor="let times of timeDetails" [value]="times.objectValue">
@ -18,36 +22,15 @@
</mat-select>
<mat-error *ngIf="scheduleControl.hasError('required')">Please Choose Time</mat-error>
</mat-form-field>
</mat-list-item>
</mat-list-item> -->
</mat-list>
<mat-list style="padding-top: 15%;">
<mat-list-item>
<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="closeScheduleComponent()"><mat-icon>close</mat-icon></button>
<button mat-raised-button [disabled]="scheduleControl.invalid" mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="upatePDSchedule(selectedMoment,scheduleControl.value)"><mat-icon>save</mat-icon></button>
<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Close" matTooltipPosition="below" type="button" (click)="closeScheduleComponent()"><mat-icon>close</mat-icon></button>
<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Schedule" matTooltipPosition="below" (click)="upatePDSchedule(selectedMoment)"><mat-icon>save</mat-icon></button>
</mat-list-item>
</mat-list>
</div>
<!-- <mat-card style="width: 580px; padding: 2px;">
<mat-card-header>
<mat-card-title>{{pageTitle}}</mat-card-title>
</mat-card-header>
<mat-card-content>
<input [owlDateTime]="dt1" [owlDateTimeTrigger]="dt1" placeholder="Date Time">
<owl-date-time #dt1></owl-date-time>
<input [owlDateTime]="dt2" placeholder="Date Time">
<span [owlDateTimeTrigger]="dt2"><i class="fa fa-calendar"></i></span>
<owl-date-time #dt2></owl-date-time>
<owl-date-time-inline [(ngModel)]="selectedMoment"></owl-date-time-inline>
</mat-card-content>
<mat-card-actions>
<div style="text-align:right;">
<button mat-raised-button mat-icon-button (click)="updatePdOfficer(selectedItem)" class="mr-1 mb-1 hover-icon" type="button"><mat-icon>save</mat-icon></button>
</div>
</mat-card-actions>
</mat-card> -->
</div>
<notifier-container></notifier-container>

77
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/schedule-pd/schedule-pd.component.ts
View File

@ -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<SchedulePdComponent>,
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();
});
}
}
}