diff --git a/ng6-seed/package.json b/ng6-seed/package.json index 1d544e5dd..1136b3e4b 100755 --- a/ng6-seed/package.json +++ b/ng6-seed/package.json @@ -4,7 +4,7 @@ "license": "MIT", "scripts": { "production": "node --max_old_space_size=8192 node_modules/@angular/cli/bin/ng build --prod ", - "staging": "node --max_old_space_size=8192 node_modules/@angular/cli/bin/ng build --prod --configuration=staging", + "staging": "node --max_old_space_size=4096 node_modules/@angular/cli/bin/ng build --prod --configuration=staging", "ng": "ng", "start": "ng serve", "build": "ng build", diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html index a9c12196b..5eb623bd8 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html @@ -266,7 +266,7 @@ {{member.name + ' of' | titlecase}} - Not Applicable + Not Related @@ -284,7 +284,7 @@ *ngFor="let appc of individualsList | searchRelation : { currentApplicantID:_generalForm.controls.persons_with_relationships.value[i].pd_co_applicant_id, existRelationList:_generalForm.controls.persons_with_relationships.value}" [value]="appc.pd_co_applicant_id">{{appc.applicant_name | titlecase}} - Not Applicable + Not Related diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.ts index 949b3f7b2..44cc98431 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.ts @@ -325,8 +325,14 @@ pdf(fileURL){ this._neighbourhoodForm.controls.neighbourhood_status.setValidators([Validators.required]); this._neighbourhoodForm.controls.neighbourhood_status.updateValueAndValidity(); + if(this._neighbourhoodForm.controls.neighbourhood_status.value != 'Positive'){ this._neighbourhoodForm.controls.neighbour_reference_remark.setValidators([Validators.required]); this._neighbourhoodForm.controls.neighbour_reference_remark.updateValueAndValidity(); + } + else{ + this._neighbourhoodForm.controls.neighbour_reference_remark.clearValidators(); + this._neighbourhoodForm.controls.neighbour_reference_remark.updateValueAndValidity(); + } // } // if(formData.check_type==1){ diff --git a/ng6-seed/src/environments/environment.ts b/ng6-seed/src/environments/environment.ts index 0573e934c..0bd562f74 100755 --- a/ng6-seed/src/environments/environment.ts +++ b/ng6-seed/src/environments/environment.ts @@ -8,7 +8,7 @@ export const environment = { environmentName: 'Development Environment',//Localhost Environment. - // apiEndpoint: 'https://ssa.sineedge.com/sparqtest/api/', + //apiEndpoint: 'https://ssa.sineedge.com/sparqtest/api/', apiEndpoint: 'https://demo.pdgenie.com/sparqtest/api/', authorization: 'sparqvenba2018',