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

business info - countries search and general info - relation - changes : ps

Browse Source
This commit is contained in:
saravanakumarkandasami 2019-05-19 16:01:50 +05:30
parent 1091ba7871
commit e869d8d71e
18 changed files with 164 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.sourcemaps/main.js.map
View File

File diff suppressed because one or more lines are too long

BIN
platforms/android/.gradle/4.1/fileHashes/fileHashes.bin
View File

Binary file not shown.

BIN
platforms/android/.gradle/4.1/fileHashes/fileHashes.lock
View File

Binary file not shown.

BIN
platforms/android/.gradle/4.1/taskHistory/fileSnapshots.bin
View File

Binary file not shown.

BIN
platforms/android/.gradle/4.1/taskHistory/taskHistory.bin
View File

Binary file not shown.

BIN
platforms/android/.gradle/4.1/taskHistory/taskHistory.lock
View File

Binary file not shown.

2
platforms/android/app/build/intermediates/assets/debug/www/build/main.js
View File

File diff suppressed because one or more lines are too long

2
platforms/android/app/build/intermediates/incremental/packageDebug/debug/dex-renamer-state.txt
View File

@ -1,4 +1,4 @@
#Sat May 18 10:35:27 IST 2019
#Sat May 18 21:07:28 IST 2019
base.0=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\transforms\\dexMerger\\debug\\0
path.0=classes.dex
renamed.0=classes.dex

2
platforms/android/app/build/intermediates/incremental/packageDebug/debug/file-input-save-data.txt
View File

@ -1,5 +1,5 @@
#Internal package file, do not edit.
#Sat May 18 10:35:27 IST 2019
#Sat May 18 21:07:28 IST 2019
60.set=ASSET
52.set=ASSET
53.base=S\:\\pd_office\\pd_officer\\platforms\\android\\app\\build\\intermediates\\assets\\debug

2
platforms/android/app/src/main/assets/www/build/main.js
View File

File diff suppressed because one or more lines are too long

4
src/app/app.module.ts
View File

@ -185,7 +185,7 @@ import { CompleteListPage } from '../pages/complete-list/complete-list';
PdQuestionAssessedSummaryPage,
PdQuestionAssessedDailyPurchasePage,
PdQuestionAssessedImagesPage,
RupeeCurrencyFormatPipe,
RupeeCurrencyFormatPipe,SearchRelationPipe,
PdQuestionRentalDashPage,
MapAddressPage
// PipesModule
@ -303,7 +303,7 @@ import { CompleteListPage } from '../pages/complete-list/complete-list';
AwsServiceProvider,
QuestionCategoryProvider,
CameraProvider,Camera,
PdPipe,SearchRelationPipe,LocationAccuracy,
PdPipe,LocationAccuracy,
LoadingProvider,Geolocation,
DatabaseProvider,
StorageProvider

105
src/pages/pd-question/pd-question-business-group/pd-question-business-info/pd-question-business-info.html
View File

@ -322,10 +322,21 @@
<mat-label class="labelcss">Countries Where The Export Is Being Done for
{{manufacturing.value.main_products}}</mat-label>
<mat-select placeholder="Countries" formControlName="country_name">
<!-- <mat-select placeholder="Countries" formControlName="country_name">
<mat-option *ngFor="let CL of countryDataList" [value]="CL.country_id">
{{CL.country_name}}
</mat-option>
</mat-select> -->
<mat-select placeholder="Countries" formControlName="country_name">
<mat-option>
<ngx-mat-select-search formControlName="countrySearch" (keyup)="searchFun(countryList,c,'country')"
[placeholderLabel]="'Find Countries'" [noEntriesFoundLabel]="'No Matching Result'">
<ion-icon name="md-close" ngxMatSelectSearchClear></ion-icon>
</ngx-mat-select-search>
</mat-option>
<mat-option *ngFor="let CL of filteredCountry | async" [value]="CL.country_id">
{{CL.country_name}}
</mat-option>
</mat-select>
</mat-form-field>
<mat-form-field style="width:100%">
@ -438,10 +449,22 @@
<mat-form-field style="width:100%;">
<mat-label class="labelcss">Countries Where The Export Is Being Done for
{{manufacturing.value.main_products}}</mat-label>
<mat-select placeholder="Countries" formControlName="country_name">
<!-- <mat-select placeholder="Countries" formControlName="country_name">
<mat-option *ngFor="let CL of countryDataList" [value]="CL.country_id">
{{CL.country_name}}
</mat-option>
</mat-select> -->
<mat-select placeholder="Countries" formControlName="country_name">
<mat-option>
<ngx-mat-select-search formControlName="countrySearch" (keyup)="searchFun(countryList,c,'country')"
[placeholderLabel]="'Find Countries'" [noEntriesFoundLabel]="'No Matching Result'">
<ion-icon name="md-close" ngxMatSelectSearchClear></ion-icon>
</ngx-mat-select-search>
</mat-option>
<mat-option *ngFor="let CL of filteredCountry | async" [value]="CL.country_id">
{{CL.country_name}}
</mat-option>
</mat-select>
</mat-form-field>
<mat-form-field style="width:100%">
@ -601,10 +624,21 @@
{{retail.value.main_products}}</mat-label>
<!-- <input matInput placeholder="Countries Where The Export Is Being Done" formControlName="country_name" > -->
<mat-select placeholder="Countries Where The Export Is Being Done" formControlName="country_name">
<!-- <mat-select placeholder="Countries Where The Export Is Being Done" formControlName="country_name">
<mat-option *ngFor="let CL of countryDataList" [value]="CL.country_id">
{{CL.country_name}}
</mat-option>
</mat-select> -->
<mat-select placeholder="Countries Where The Export Is Being Done" formControlName="country_name">
<mat-option>
<ngx-mat-select-search formControlName="countrySearch" (keyup)="searchFun(countryList,c,'country')"
[placeholderLabel]="'Find Countries'" [noEntriesFoundLabel]="'No Matching Result'">
<ion-icon name="md-close" ngxMatSelectSearchClear></ion-icon>
</ngx-mat-select-search>
</mat-option>
<mat-option *ngFor="let CL of filteredCountry | async" [value]="CL.country_id">
{{CL.country_name}}
</mat-option>
</mat-select>
</mat-form-field>
<mat-form-field style="width:100%">
@ -715,10 +749,21 @@
<mat-label class="labelcss">Countries Where The Export Is Being Done for
{{retail.value.main_products}}</mat-label>
<mat-select placeholder="Countries Where The Export Is Being Done" formControlName="country_name">
<!-- <mat-select placeholder="Countries Where The Export Is Being Done" formControlName="country_name">
<mat-option *ngFor="let CL of countryDataList" [value]="CL.country_id">
{{CL.country_name}}
</mat-option>
</mat-select> -->
<mat-select placeholder="Countries Where The Export Is Being Done" formControlName="country_name">
<mat-option>
<ngx-mat-select-search formControlName="countrySearch" (keyup)="searchFun(countryList,c,'country')"
[placeholderLabel]="'Find Countries'" [noEntriesFoundLabel]="'No Matching Result'">
<ion-icon name="md-close" ngxMatSelectSearchClear></ion-icon>
</ngx-mat-select-search>
</mat-option>
<mat-option *ngFor="let CL of filteredCountry | async" [value]="CL.country_id">
{{CL.country_name}}
</mat-option>
</mat-select>
</mat-form-field>
<mat-form-field style="width:100%">
@ -880,10 +925,21 @@
<mat-form-field style="width:100%;">
<mat-label class="labelcss">Countries Where The Export Is Being Done for
{{wholesale.value.main_products}}</mat-label>
<mat-select placeholder="Countries" formControlName="country_name">
<!-- <mat-select placeholder="Countries" formControlName="country_name">
<mat-option *ngFor="let CL of countryDataList" [value]="CL.country_id">
{{CL.country_name}}
</mat-option>
</mat-select> -->
<mat-select placeholder="Countries" formControlName="country_name">
<mat-option>
<ngx-mat-select-search formControlName="countrySearch" (keyup)="searchFun(countryList,c,'country')"
[placeholderLabel]="'Find Countries'" [noEntriesFoundLabel]="'No Matching Result'">
<ion-icon name="md-close" ngxMatSelectSearchClear></ion-icon>
</ngx-mat-select-search>
</mat-option>
<mat-option *ngFor="let CL of filteredCountry | async" [value]="CL.country_id">
{{CL.country_name}}
</mat-option>
</mat-select>
</mat-form-field>
<mat-form-field style="width:100%;">
@ -994,10 +1050,21 @@
<mat-label class="labelcss">Countries Where The Export Is Being Done for
{{wholesale.value.main_products}}</mat-label>
<mat-select placeholder="Countries" formControlName="country_name">
<!-- <mat-select placeholder="Countries" formControlName="country_name">
<mat-option *ngFor="let CL of countryDataList" [value]="CL.country_id">
{{CL.country_name}}
</mat-option>
</mat-select> -->
<mat-select placeholder="Countries" formControlName="country_name">
<mat-option>
<ngx-mat-select-search formControlName="countrySearch" (keyup)="searchFun(countryList,c,'country')"
[placeholderLabel]="'Find Countries'" [noEntriesFoundLabel]="'No Matching Result'">
<ion-icon name="md-close" ngxMatSelectSearchClear></ion-icon>
</ngx-mat-select-search>
</mat-option>
<mat-option *ngFor="let CL of filteredCountry | async" [value]="CL.country_id">
{{CL.country_name}}
</mat-option>
</mat-select>
</mat-form-field>
<mat-form-field style="width:100%;">
@ -1158,10 +1225,21 @@
<mat-form-field style="width:100%;">
<mat-label class="labelcss">Countries Where The Export Is Being Done for
{{serviceprovider.value.main_products}}</mat-label>
<mat-select placeholder="Countries" formControlName="country_name">
<!-- <mat-select placeholder="Countries" formControlName="country_name">
<mat-option *ngFor="let CL of countryDataList" [value]="CL.country_id">
{{CL.country_name}}
</mat-option>
</mat-select> -->
<mat-select placeholder="Countries" formControlName="country_name">
<mat-option>
<ngx-mat-select-search formControlName="countrySearch" (keyup)="searchFun(countryList,c,'country')"
[placeholderLabel]="'Find Countries'" [noEntriesFoundLabel]="'No Matching Result'">
<ion-icon name="md-close" ngxMatSelectSearchClear></ion-icon>
</ngx-mat-select-search>
</mat-option>
<mat-option *ngFor="let CL of filteredCountry | async" [value]="CL.country_id">
{{CL.country_name}}
</mat-option>
</mat-select>
</mat-form-field>
<mat-form-field style="width:100%;">
@ -1279,10 +1357,21 @@
<mat-form-field style="width:100%;">
<mat-label class="labelcss">Countries Where The Export Is Being Done for
{{serviceprovider.value.main_products}}</mat-label>
<mat-select placeholder="Countries" formControlName="country_name">
<!-- <mat-select placeholder="Countries" formControlName="country_name">
<mat-option *ngFor="let CL of countryDataList" [value]="CL.country_id">
{{CL.country_name}}
</mat-option>
</mat-select> -->
<mat-select placeholder="Countries" formControlName="country_name">
<mat-option>
<ngx-mat-select-search formControlName="countrySearch" (keyup)="searchFun(countryList,c,'country')"
[placeholderLabel]="'Find Countries'" [noEntriesFoundLabel]="'No Matching Result'">
<ion-icon name="md-close" ngxMatSelectSearchClear></ion-icon>
</ngx-mat-select-search>
</mat-option>
<mat-option *ngFor="let CL of filteredCountry | async" [value]="CL.country_id">
{{CL.country_name}}
</mat-option>
</mat-select>
</mat-form-field>
<mat-form-field style="width:100%;">

60
src/pages/pd-question/pd-question-business-group/pd-question-business-info/pd-question-business-info.ts
View File

@ -71,12 +71,15 @@ export class PdQuestionBusinessInfoPage {
yearErrorMessage: any = [];
monthErrorMessage: any = [];
errorMessageForExistTotalWorkExperience : any = [];
countryDataListValue: any = [];
@ViewChild('shareholding') share_focus:ElementRef
private search:searchValue[]
protected _onDestroy = new Subject<void>();
public filteredCity: ReplaySubject<searchValue[]> = new ReplaySubject<searchValue[]>(1);
//public filterCity=new Rx.Subject()
public filteredState:ReplaySubject<searchValue[]>=new ReplaySubject<searchValue[]>(1)
public filteredCountry:ReplaySubject<searchValue[]>=new ReplaySubject<searchValue[]>(1)
cityData:any=[]
cityDataValue:any=[]
imageDisplay: any[];
@ -220,7 +223,7 @@ this.complete_status = this.pdDetails.pd_status == 'COMPLETED' ? true : false;
this.qustCat.getcommondrop('COUNTRY').subscribe(data=>{
this.countryDataList=data['records'].filter(val=>val.isactive==1);
this.filteredCountry.next(this.countryDataList.slice());
});
this.qustCat.getcommondrop('TITLES').subscribe(data=>{
this.titleData=data['records'].filter(val=>val.isactive==1);
@ -442,6 +445,7 @@ changeOfStartedBusiness(members,i,e){
manufacture_details.controls[index].addControl('countries_where_export_done', this.fb.array([]));
element.countries_where_export_done.forEach((innerElement,innerIndex) => {
let innercontrol:any = manufacture_details.controls[index].get('countries_where_export_done') as FormArray;
innerElement.countrySearch='';
innercontrol.push(this.createCountrySale())
});
}
@ -468,6 +472,7 @@ changeOfStartedBusiness(members,i,e){
manufacture_details.controls[index].addControl('countries_where_export_done', this.fb.array([]));
element.countries_where_export_done.forEach((innerElement,innerIndex) => {
let innercontrol:any = manufacture_details.controls[index].get('countries_where_export_done') as FormArray;
innerElement.countrySearch='';
innercontrol.push(this.createCountrySale())
});
@ -525,6 +530,7 @@ changeOfStartedBusiness(members,i,e){
retailControl.controls[index].addControl('countries_where_export_done', this.fb.array([]));
element.countries_where_export_done.forEach((innerElement,innerIndex) => {
let innercontrol:any = retailControl.controls[index].get('countries_where_export_done') as FormArray;
innerElement.countrySearch='';
innercontrol.push(this.createCountrySale())
});
}
@ -549,6 +555,7 @@ changeOfStartedBusiness(members,i,e){
retailControl.controls[index].addControl('countries_where_export_done', this.fb.array([]));
element.countries_where_export_done.forEach((innerElement,innerIndex) => {
let innercontrol:any = retailControl.controls[index].get('countries_where_export_done') as FormArray;
innerElement.countrySearch='';
innercontrol.push(this.createCountrySale())
});
}
@ -602,6 +609,7 @@ changeOfStartedBusiness(members,i,e){
wholesaleControl.controls[index].addControl('countries_where_export_done', this.fb.array([]));
element.countries_where_export_done.forEach((innerElement,innerIndex) => {
let innercontrol:any = wholesaleControl.controls[index].get('countries_where_export_done') as FormArray;
innerElement.countrySearch='';
innercontrol.push(this.createCountrySale())
});
}
@ -626,6 +634,7 @@ changeOfStartedBusiness(members,i,e){
wholesaleControl.controls[index].addControl('countries_where_export_done', this.fb.array([]));
element.countries_where_export_done.forEach((innerElement,innerIndex) => {
let innercontrol:any = wholesaleControl.controls[index].get('countries_where_export_done') as FormArray;
innerElement.countrySearch='';
innercontrol.push(this.createCountrySale())
});
}
@ -683,6 +692,7 @@ changeOfStartedBusiness(members,i,e){
element.countries_where_export_done.forEach((innerElement,innerIndex) => {
let innercontrol:any = serviceProviderControl.controls[index].get('countries_where_export_done') as FormArray;
innerElement.countrySearch='';
innercontrol.push(this.createCountrySale())
});
}
@ -708,6 +718,7 @@ changeOfStartedBusiness(members,i,e){
serviceProviderControl.controls[index].addControl('countries_where_export_done', this.fb.array([]));
element.countries_where_export_done.forEach((innerElement,innerIndex) => {
let innercontrol:any = serviceProviderControl.controls[index].get('countries_where_export_done') as FormArray;
innerElement.countrySearch='';
innercontrol.push(this.createCountrySale())
});
@ -1083,8 +1094,10 @@ changeBusinessActivity(event: any){
changeManufacturingAreaSale(getDetails: any, getIndex){
console.log('changeManufacturingAreaSale',getDetails.value.area_of_sale);
let control: any = this.businessForm.get('manufacturing_activity_details') as FormArray;
if(getDetails.value.area_of_sale=="Within India"){
console.log('Within India',getDetails.value.area_of_sale);
control.controls[getIndex].removeControl('countries_where_export_done');
control.controls[getIndex].removeControl('india_where_sale_done');
control.controls[getIndex].removeControl('pan_india_options');
@ -1095,6 +1108,7 @@ changeManufacturingAreaSale(getDetails: any, getIndex){
}
else if(getDetails.value.area_of_sale=="Export"){
console.log('Export',getDetails.value.area_of_sale);
control.controls[getIndex].removeControl('countries_where_export_done');
control.controls[getIndex].removeControl('india_where_sale_done');
control.controls[getIndex].removeControl('pan_india_options');
@ -1103,6 +1117,7 @@ changeManufacturingAreaSale(getDetails: any, getIndex){
control.controls[getIndex].addControl('countries_where_export_done', this.fb.array([this.createCountrySale()]));
}
else if(getDetails.value.area_of_sale=="Both") {
console.log('Both',getDetails.value.area_of_sale);
control.controls[getIndex].removeControl('india_where_sale_done');
control.controls[getIndex].removeControl('countries_where_export_done');
control.controls[getIndex].removeControl('pan_india_options');
@ -1523,6 +1538,7 @@ removeServiceProvider(index){
createCountrySale() {
return this.fb.group({
country_name: ['',Validators.compose([Validators.required])],
countrySearch:[''],
approx_sale: ['', Validators.compose([Validators.required])]
});
}
@ -2143,8 +2159,32 @@ toGetPOSMachinesDetails(e,flag){
}
}
}
// searchCountriesList(control:any,i:number){
// if(!this.countryDataList){
// return
// }
// let searchVal=control.controls['countrySearch'].value
// if(!searchVal){
// this.countryDataListValue=this.countryDataList.slice()
// return
// }
// else{
// searchVal=searchVal.toLowerCase();
// this.countryDataListValue=this.countryDataList.filter(val=>val.country_name.toLowerCase().indexOf(searchVal)>-1)
// }
// }
searchFun(control:any,i:number,option){
if (option == 'country') {
console.log('option',option,control);
control.controls['countrySearch'].valueChanges
.pipe(takeUntil(this._onDestroy))
.subscribe(() => {
this.searchCountries(control.controls['countrySearch'].value);
})
}
if (option == 'city') {
// this.cityData[i]=this.filterCity(this.stateList,control.value.state_name)
control.controls['citySearch'].valueChanges
@ -2212,6 +2252,24 @@ toGetPOSMachinesDetails(e,flag){
this.stateList.filter(res => res.state_name.toLowerCase().indexOf(searchVal) > -1)
)
}
searchCountries(val: any) {
console.log("Countrydata");
if(!this.countryDataList){
return
}
let searchVal = val
if (!searchVal) {
this.filteredCountry.next(this.countryDataList.slice())
return
}
else {
searchVal = searchVal.toLowerCase()
}
this.filteredCountry.next(
this.countryDataList.filter(val=>val.country_name.toLowerCase().indexOf(searchVal)>-1)
)
}
/*IMAGE SECTION*/
getPDImages(){

2
src/pages/pd-question/pd-question-general-info/pd-question-general-info.html
View File

@ -414,7 +414,7 @@
<mat-form-field style="width:100%" *ngIf="relation.controls['relationship'].value != 0">
<mat-select placeholder="RelationTo" formControlName="relation_to" >
<mat-option>Select</mat-option>
<mat-option *ngFor="let appc of individualsList" [disabled]="rel.applicant_name == relation.controls['applicant_name'].value"
<mat-option *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}}</mat-option>
<mat-option value="0"> Not Applicable </mat-option>
</mat-select>

BIN
www/assets/fonts/roboto-bold.ttf
View File

Binary file not shown.

BIN
www/assets/fonts/roboto-light.ttf
View File

Binary file not shown.

BIN
www/assets/fonts/roboto-medium.ttf
View File

Binary file not shown.

BIN
www/assets/fonts/roboto-regular.ttf
View File

Binary file not shown.