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

ng6-seed/src/app/personal-discussion/location-service/get-geometric-location.service.ts

@@ -1,6 +1,7 @@
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';//for Datatables
 import { Http } from '@angular/http';
+import { environment } from 'environments/environment'
 
 @Injectable()
 
@@ -8,7 +9,8 @@ export class GetGeometricLocationService {
   MAP_API_KEY: string;
   MAP_API_URL: string;
   constructor(private _http: Http) { 
-    this.MAP_API_KEY = 'AIzaSyCXsHTus6hyIB8jYvt9ZEIbZve-2vWeQRg'
+    // this.MAP_API_KEY = 'AIzaSyCXsHTus6hyIB8jYvt9ZEIbZve-2vWeQRg'
+    this.MAP_API_KEY = environment.map_api_key
     this.MAP_API_URL = `https://maps.googleapis.com/maps/api/geocode/json?key=${this.MAP_API_KEY}&address=`;
   }
   findLocations(address:string, postalCode?: string,state?:string, city?: string): Observable<any> {

ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts

@@ -525,8 +525,8 @@ export class AddPdComponent implements OnInit, OnDestroy {
     this._PDtriggerForm.controls['applicant_title_name'].setValidators([Validators.required]);
     this._PDtriggerForm.controls['applicant_title_name'].updateValueAndValidity();
 
-    this._PDtriggerForm.controls['mobile_no'].setValidators([Validators.required]);
+    this._PDtriggerForm.controls['mobile_no'].setValidators(Validators.compose([Validators.required]));
-    this._PDtriggerForm.controls['mobile_no'].updateValueAndValidity();
+   
 
     // this._PDtriggerForm.controls['addressline1'].setValidators([Validators.required]);
     // this._PDtriggerForm.controls['addressline1'].updateValueAndValidity();

ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.module.ts

@@ -127,6 +127,7 @@ import {PurchaseCalculationComponent} from './list-pd/start-pd/forms/assessed-in
 import { QueriesDocsComponent } from './list-pd/start-pd/forms/queries-docs/queries-docs.component';
 import {AngularSplitModule} from 'angular-split';
 import { ImageDocsComponent } from './list-pd/start-pd/forms/image-docs/image-docs.component'
+import { environment } from 'environments/environment'
 
 /**
  * Custom angular notifier options
@@ -203,7 +204,7 @@ const pdCustomNotifierOptions: NotifierOptions = {
       MatDatepickerModule,
       MatDialogModule,MatSortModule,
     NgxMatSelectSearchModule,MatTooltipModule, MatExpansionModule,ResizableModule,
-    AgmCoreModule.forRoot({apiKey: 'AIzaSyCXsHTus6hyIB8jYvt9ZEIbZve-2vWeQRg'}),OwlDateTimeModule, 
+    AgmCoreModule.forRoot({apiKey: environment.map_api_key}),OwlDateTimeModule, 
          OwlNativeDateTimeModule,
          AngularSplitModule
   ],

ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts

@@ -38,7 +38,7 @@ export class PdTrigerService {
 
     constructor(private _http: HttpClient,
         private _aws: AwsService) {
-        this.MAP_API_KEY = 'AIzaSyBtdO5k6CRntAMJCF-H5uZjTCoSGX95cdk'
+        this.MAP_API_KEY = environment.map_api_key
         this.MAP_API_URL = `https://maps.googleapis.com/maps/api/geocode/json?key=${this.MAP_API_KEY}&address=`;
     }
 

ng6-seed/src/app/quality-check/qc-service/qc.service.ts

@@ -41,7 +41,7 @@ export class QcService {
 
     constructor(private _http: HttpClient,
         private _aws: AwsService) {
-        this.MAP_API_KEY = 'AIzaSyBtdO5k6CRntAMJCF-H5uZjTCoSGX95cdk'
+        this.MAP_API_KEY = environment.map_api_key;
         this.MAP_API_URL = `https://maps.googleapis.com/maps/api/geocode/json?key=${this.MAP_API_KEY}&address=`;
     }
 

ng6-seed/src/environments/environment.prod.ts

@@ -1,6 +1,6 @@
 export const environment = {
   production: true,
-
+  map_api_key:'AIzaSyA3lYDYxwtn5vLSl45SOKbtK7G6cEyXGr0',
   environmentName: 'Production Environment',//Live Environment.
 
   apiEndpoint: 'https://pdgenie.com/sparqprod/api/',

ng6-seed/src/environments/environment.stage.ts

@@ -1,6 +1,6 @@
 export const environment = {
   production: true,
-
+  map_api_key:'AIzaSyA3lYDYxwtn5vLSl45SOKbtK7G6cEyXGr0',
   environmentName: 'Testing Environment',//Test Environment.
 
   apiEndpoint: 'https://demo.pdgenie.com/sparqtest/api/',

ng6-seed/src/environments/environment.ts

@@ -5,6 +5,8 @@
 
 export const environment = {
   production: false,
+//AIzaSyCXsHTus6hyIB8jYvt9ZEIbZve-2vWeQRg
+  map_api_key:'AIzaSyA3lYDYxwtn5vLSl45SOKbtK7G6cEyXGr0',
   
   environmentName: 'Development Environment',//Localhost Environment.