From ddd6968a850c251c49d3b624452a51f1a370e556 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Fri, 21 Dec 2018 11:23:51 +0530 Subject: [PATCH 1/4] pd view discussion options enabled --- .../list-pd/view-pd/view-pd.component.html | 2 +- .../list-pd/view-pd/view-pd.component.ts | 27 ++++++++++++------- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html index 8697b5004..3c7d65a08 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html @@ -11,7 +11,7 @@
- + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts index bcf27d053..64fd67858 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts @@ -60,16 +60,7 @@ export class ViewPdComponent implements OnInit, OnDestroy { this.route.params.subscribe(params => { this.viewID = params['pdid']; }); - let courrentDateTime: string = this.pipe.transform(new Date(), 'yyyy-MM-dd HH:mm'); - let scheduledDateTime: string="2018-12-03 08:20"; - let diffInMs: number = Date.parse(courrentDateTime) - Date.parse(scheduledDateTime); - let diffInHours: number = Math.floor(diffInMs / 1000 / 60 / 60); - if(diffInHours>=-4){ - this.enableStartPD=true; - } - else { - this.enableStartPD=false; - } + this.viewPdDetails(this.viewID); } @@ -84,6 +75,22 @@ export class ViewPdComponent implements OnInit, OnDestroy { //this.applicantPDLogsData= data.records.pd_logs.master; this.currentPDStatus = data.records.pd_master_details[0].pd_status; this.pdAdditionalReqData = data.records.pd_additional_requirements; + // enable pd start time + if(data.records.pd_master_details[0].scheduled_on_for_validation){ + let courrentDateTime: string = this.pipe.transform(new Date(), 'yyyy-MM-dd HH:mm'); + let scheduledDateTime: string=data.records.pd_master_details[0].scheduled_on_for_validation; + let diffInMs: number = Date.parse(courrentDateTime) - Date.parse(scheduledDateTime); + let diffInHours: number = Math.floor(diffInMs / 1000 / 60 / 60); + if(diffInHours>=-4){ + this.enableStartPD=true; + } + else { + this.enableStartPD=false; + } + } + else { + this.enableStartPD=false; + } } }, error => this.errorMessage = error); } From 1b2a5b310bf9240c4799eb5153358252f83948a6 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Fri, 21 Dec 2018 11:24:18 +0530 Subject: [PATCH 2/4] merge : kms --- .../forms/family-details/family-details.component.ts | 3 +-- ng6-seed/src/app/settings/service/entity/entity.service.ts | 6 +++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts index 4187be04d..93585e27d 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts @@ -254,5 +254,4 @@ export class FamilyDetailsComponent implements OnInit { // } // } -} - +} \ No newline at end of file diff --git a/ng6-seed/src/app/settings/service/entity/entity.service.ts b/ng6-seed/src/app/settings/service/entity/entity.service.ts index 1a859a99f..d40a3639e 100755 --- a/ng6-seed/src/app/settings/service/entity/entity.service.ts +++ b/ng6-seed/src/app/settings/service/entity/entity.service.ts @@ -5,6 +5,10 @@ import { catchError } from 'rxjs/operators'; import { of } from 'rxjs'; import 'rxjs/add/operator/map'; + +/** Environment */ +import { environment } from 'environments/environment'; + /** Imported Service Files Are., */ import { AwsService } from '../../../AwsService/aws.service'; /** Consant Value For Created Date And Updated Date */ @@ -20,7 +24,7 @@ const currentdate = new Date().toJSON().slice(0, 19).replace('T', ' '); * Kdk */ export class EntityService { - private apiUrl = "http://ssa.sineedge.com/sparqapi/api/"; + private apiUrl = environment.apiEndpoint; private serviceUrl = 'https://jsonplaceholder.typicode.com/users'; constructor(private _http: HttpClient, From 74eb2f9237c414570bc05825d57b54b76ec8320e Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Fri, 21 Dec 2018 12:41:21 +0530 Subject: [PATCH 3/4] pd button changes --- .../manage-pd/list-pd/add-pd/add-pd.component.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html index 43e2b6a27..46efa23f7 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html @@ -207,12 +207,12 @@ - + - + +
- + From 80c7a6a9836b86fedb388d85c22339e81d986663 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Fri, 21 Dec 2018 12:55:03 +0530 Subject: [PATCH 4/4] UI changes --- .../manage-pd/list-pd/start-pd/start-pd.component.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.html index 3c40f3481..7f6e2a2a5 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.html @@ -16,13 +16,13 @@
- - + +
{{ (formButton.form_name.length>17)? (formButton.form_name | slice:0:17)+'..':(formButton.form_name) }}
- Q{{formButton.pd_form_order}} + {{quesIndex+1}}