Sineedge/sparq-vendor
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fairoj : SAL changes and some label changes and prod configuration changes

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2020-10-07 19:36:42 +05:30
parent 41582545f3
commit 66bcb27c16
7 changed files with 358 additions and 240 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ng6-seed/angular.json
View File

@ -86,7 +86,7 @@
"fileReplacements": [ "fileReplacements": [
{ {
"replace": "src/environments/environment.ts", "replace": "src/environments/environment.ts",
"with": "src/environments/environment.stage.ts" "with": "src/environments/environment.prod.ts"
}] }]
} }
} }

4
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-questions/common-ques/common-ques.component.html
View File

@ -135,7 +135,7 @@
</div> </div>
</div> </div>
<mat-form-field appearance="fill"> <mat-form-field appearance="fill">
<mat-label>Designation</mat-label> <mat-label>Designation in company</mat-label>
<mat-select formControlName="designation_entered"> <mat-select formControlName="designation_entered">
<ngx-mat-select-search [formControl]="designationFilterCtrl" <ngx-mat-select-search [formControl]="designationFilterCtrl"
[placeholderLabel]="'Search Designation...'" [placeholderLabel]="'Search Designation...'"
@ -146,7 +146,7 @@
<mat-error align="end" style="font-size:13px" *ngIf="getQuestionControl().at(0)['controls']['designation_entered'].errors?.required || getQuestionControl().at(0)['controls']['designation_entered'].touched">Designation required</mat-error> <mat-error align="end" style="font-size:13px" *ngIf="getQuestionControl().at(0)['controls']['designation_entered'].errors?.required || getQuestionControl().at(0)['controls']['designation_entered'].touched">Designation required</mat-error>
</mat-form-field> </mat-form-field>
<mat-form-field appearance="fill"> <mat-form-field appearance="fill">
<mat-label>Relation</mat-label> <mat-label>Relation with applicant</mat-label>
<mat-select formControlName="relation_entered"> <mat-select formControlName="relation_entered">
<ngx-mat-select-search [formControl]="relationFilterCtrl" <ngx-mat-select-search [formControl]="relationFilterCtrl"
[placeholderLabel]="'Search Relation...'" [placeholderLabel]="'Search Relation...'"

341
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-questions/employer-info/employer-info.component.html
View File

@ -143,8 +143,8 @@
</div> </div>
</mat-step> </mat-step>
<!-- getQuestionControl().at(2).get('employer_details') || getQuestionControl().at(2).get('office_photographs') || getQuestionControl().at(2).get('nameboard_photographs') || getQuestionControl().at(2).get('docs_sighted') --> <!-- getQuestionControl().at(2).get('employer_details') || getQuestionControl().at(2).get('office_photographs') || getQuestionControl().at(2).get('nameboard_photographs') || getQuestionControl().at(2).get('docs_sighted') -->
<mat-step *ngIf="checkPartEnable(4) || checkPartEnable(5) || checkPartEnable(1) || checkPartEnable(1) == false" formGroupName="2" [stepControl]="questions?.get([2])"> <mat-step *ngIf="checkPartEnable(4)" formGroupName="2" [stepControl]="questions?.get([2])">
<ng-template matStepLabel>{{dynamicStepperHeadingForEmp}}</ng-template> <ng-template matStepLabel>Employment Information</ng-template>
<!-- START OF EMPLOYER INFO --> <!-- START OF EMPLOYER INFO -->
<div *ngIf="checkPartEnable(4) && getQuestionControl().at(2).get('employer_details')" formArrayName="employer_details"> <div *ngIf="checkPartEnable(4) && getQuestionControl().at(2).get('employer_details')" formArrayName="employer_details">
@ -380,93 +380,104 @@
</div> </div>
<!-- END OF EMPLOYER INFO --> <!-- END OF EMPLOYER INFO -->
<!-- START OF DOCS SIGHTED -->
<div *ngIf="checkPartEnable(5) && getQuestionControl().at(2).get('docs_sighted')" formArrayName="docs_sighted">
<mat-label><h5>{{dynamicStepperHeadingForEmp}}</h5></mat-label>
<hr/><br/><br/>
<div fxLayout="row">
<div fxLayout="column" fxFlex="85%">
<mat-form-field >
<mat-label>Salary register</mat-label>
<mat-select placeholder="Salary register" formControlName="sal_reg_seen"
required>
<mat-option>Select</mat-option>
<mat-option value="yes">Yes</mat-option>
<mat-option value="no">No</mat-option>
</mat-select>
<mat-error *ngIf="getDocsSightedGroup['controls']['sal_reg_seen'].hasError('required')">Salary register seen Required</mat-error>
</mat-form-field>
</div>
<div fxLayout="column" size="3" align="center" *ngIf="getDocsSightedGroup['value'].sal_reg_seen == 'yes'">
<div fxLayout="row" fxLayoutAlign="center center">
<img ngxViewer text="PD Photos" title="Salary Register"
*ngIf="getDocsSightedGroup['value'].sal_reg_seen_pic != ''"
src="{{getDocsSightedGroup['value'].sal_reg_seen_pic}}" style="max-width: 80px;max-height: 80px">
</div> <div class="mat-button-div">
<button mat-stroked-button matStepperPrevious>Back</button>
<button mat-raised-button matStepperNext>Next <mat-icon>keyboard_arrow_right</mat-icon></button>
</div>
<!-- <ion-button </mat-step>
(click)="capturePic(getDocsSightedGroup['controls']['sal_reg_seen_pic'], 'Salary register pic',getQuestionControl().at(2).value.form_id)"
fill="clear">
<ion-icon style="font-size: 20px" name="camera"></ion-icon>
</ion-button>
<mat-label *ngIf="getDocsSightedGroup['value'].sal_reg_seen_pic == ''" style="font-size: 11px">Capture the
Image </mat-label> -->
<!-- <mat-error align="end" style="font-size:12px" *ngIf="getEmployer_details.controls['visiting_card_pic'].errors?.required || getEmployer_details.controls['visiting_card_pic'].touched">Person Met pic is Required</mat-error> -->
</div>
</div>
<div *ngIf="checkPartEnable(5) && getQuestionControl().at(7).get('docs_sighted')">
<mat-step formGroupName="7" [stepControl]="questions?.get([7])">
<ng-template matStepLabel>Documents Sighted of applicant employment During FI</ng-template>
<!-- START OF DOCS SIGHTED -->
<div *ngIf="checkPartEnable(5) && getQuestionControl().at(7).get('docs_sighted')" formArrayName="docs_sighted">
<!-- <mat-label><h5>{{dynamicStepperHeadingForEmp}}</h5></mat-label>
<hr/><br/><br/> -->
<div fxLayout="row"> <div fxLayout="row">
<div fxLayout="column" fxFlex="85%"> <div fxLayout="column" fxFlex="85%">
<mat-form-field > <mat-form-field >
<mat-label>Attendance Register</mat-label> <mat-label>Salary register</mat-label>
<mat-select placeholder="Attendance Register" formControlName="attendance_seen" <mat-select placeholder="Salary register" formControlName="sal_reg_seen"
required> required>
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<mat-option value="yes">Yes</mat-option> <mat-option value="yes">Yes</mat-option>
<mat-option value="no">No</mat-option> <mat-option value="no">No</mat-option>
</mat-select> </mat-select>
<mat-error *ngIf="getDocsSightedGroup['controls']['attendance_seen'].hasError('required')">Attendance register Required</mat-error> <mat-error *ngIf="getDocsSightedGroup['controls']['sal_reg_seen'].hasError('required')">Salary register seen Required</mat-error>
</mat-form-field> </mat-form-field>
</div> </div>
<div fxLayout="column" size="3" align="center" *ngIf="getDocsSightedGroup['value'].attendance_seen == 'yes'"> <div fxLayout="column" size="3" align="center" *ngIf="getDocsSightedGroup['value'].sal_reg_seen == 'yes'">
<div fxLayout="row" fxLayoutAlign="center center"> <div fxLayout="row" fxLayoutAlign="center center">
<img ngxViewer text="PD Photos" title="Attendance Register" <img ngxViewer text="PD Photos" title="Salary Register"
*ngIf="getDocsSightedGroup['value'].attendance_seen_pic != ''" *ngIf="getDocsSightedGroup['value'].sal_reg_seen_pic != ''"
src="{{getDocsSightedGroup['value'].attendance_seen_pic}}" style="max-width: 80px;max-height: 80px"> src="{{getDocsSightedGroup['value'].sal_reg_seen_pic}}" style="max-width: 80px;max-height: 80px">
</div> </div>
<!-- <ion-button <!-- <ion-button
(click)="capturePic(getDocsSightedGroup['controls']['attendance_seen_pic'], 'Attendance register pic',getQuestionControl().at(2).value.form_id)" (click)="capturePic(getDocsSightedGroup['controls']['sal_reg_seen_pic'], 'Salary register pic',getQuestionControl().at(2).value.form_id)"
fill="clear"> fill="clear">
<ion-icon style="font-size: 20px" name="camera"></ion-icon> <ion-icon style="font-size: 20px" name="camera"></ion-icon>
</ion-button> </ion-button>
<mat-label *ngIf="getDocsSightedGroup['value'].attendance_seen_pic == ''" style="font-size: 11px">Capture the <mat-label *ngIf="getDocsSightedGroup['value'].sal_reg_seen_pic == ''" style="font-size: 11px">Capture the
Image </mat-label> --> Image </mat-label> -->
<!-- <mat-error align="end" style="font-size:12px" *ngIf="getEmployer_details.controls['visiting_card_pic'].errors?.required || getEmployer_details.controls['visiting_card_pic'].touched">Person Met pic is Required</mat-error> --> <!-- <mat-error align="end" style="font-size:12px" *ngIf="getEmployer_details.controls['visiting_card_pic'].errors?.required || getEmployer_details.controls['visiting_card_pic'].touched">Person Met pic is Required</mat-error> -->
</div> </div>
</div> </div>
<div fxLayout="row"> <div fxLayout="row">
<div fxLayout="column" fxFlex="85%"> <div fxLayout="column" fxFlex="85%">
<mat-form-field > <mat-form-field >
<mat-label>Cash voucher</mat-label> <mat-label>Attendance Register</mat-label>
<mat-select placeholder="Attendance Register" formControlName="attendance_seen"
required>
<mat-option>Select</mat-option>
<mat-option value="yes">Yes</mat-option>
<mat-option value="no">No</mat-option>
</mat-select>
<mat-error *ngIf="getDocsSightedGroup['controls']['attendance_seen'].hasError('required')">Attendance register Required</mat-error>
</mat-form-field>
</div>
<div fxLayout="column" size="3" align="center" *ngIf="getDocsSightedGroup['value'].attendance_seen == 'yes'">
<div fxLayout="row" fxLayoutAlign="center center">
<img ngxViewer text="PD Photos" title="Attendance Register"
*ngIf="getDocsSightedGroup['value'].attendance_seen_pic != ''"
src="{{getDocsSightedGroup['value'].attendance_seen_pic}}" style="max-width: 80px;max-height: 80px">
<mat-select placeholder="Cash voucher" formControlName="cash_voucher" </div>
required>
<mat-option>Select</mat-option> <!-- <ion-button
<mat-option value="yes">Yes</mat-option> (click)="capturePic(getDocsSightedGroup['controls']['attendance_seen_pic'], 'Attendance register pic',getQuestionControl().at(2).value.form_id)"
<mat-option value="no">No</mat-option> fill="clear">
</mat-select> <ion-icon style="font-size: 20px" name="camera"></ion-icon>
<mat-error *ngIf="getDocsSightedGroup['controls']['cash_voucher'].hasError('required')">Cash Voucher Required</mat-error> </ion-button>
<mat-label *ngIf="getDocsSightedGroup['value'].attendance_seen_pic == ''" style="font-size: 11px">Capture the
Image </mat-label> -->
<!-- <mat-error align="end" style="font-size:12px" *ngIf="getEmployer_details.controls['visiting_card_pic'].errors?.required || getEmployer_details.controls['visiting_card_pic'].touched">Person Met pic is Required</mat-error> -->
</div>
</div>
<div fxLayout="row">
<div fxLayout="column" fxFlex="85%">
<mat-form-field >
<mat-label>Cash voucher</mat-label>
<mat-select placeholder="Cash voucher" formControlName="cash_voucher"
required>
<mat-option>Select</mat-option>
<mat-option value="yes">Yes</mat-option>
<mat-option value="no">No</mat-option>
</mat-select>
<mat-error *ngIf="getDocsSightedGroup['controls']['cash_voucher'].hasError('required')">Cash Voucher Required</mat-error>
</mat-form-field> </mat-form-field>
</div> </div>
<div fxLayout="column" size="3" align="center" *ngIf="getDocsSightedGroup['value'].cash_voucher == 'yes'"> <div fxLayout="column" size="3" align="center" *ngIf="getDocsSightedGroup['value'].cash_voucher == 'yes'">
<div fxLayout="row" fxLayoutAlign="center center"> <div fxLayout="row" fxLayoutAlign="center center">
<img ngxViewer text="PD Photos" title="Cash Voucher" <img ngxViewer text="PD Photos" title="Cash Voucher"
*ngIf="getDocsSightedGroup['value'].cash_voucher_pic != ''" *ngIf="getDocsSightedGroup['value'].cash_voucher_pic != ''"
src="{{getDocsSightedGroup['value'].cash_voucher_pic}}" style="max-width: 80px;max-height: 80px"> src="{{getDocsSightedGroup['value'].cash_voucher_pic}}" style="max-width: 80px;max-height: 80px">
</div> </div>
@ -482,24 +493,24 @@ Image </mat-label> -->
</div> </div>
<div fxLayout="row"> <div fxLayout="row">
<div fxLayout="column" fxFlex="85%"> <div fxLayout="column" fxFlex="85%">
<mat-form-field > <mat-form-field >
<mat-label>Salary Certificate</mat-label> <mat-label>Salary Certificate</mat-label>
<mat-select placeholder="Salary Certificate" formControlName="sal_certificate" <mat-select placeholder="Salary Certificate" formControlName="sal_certificate"
required> required>
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<mat-option value="yes">Yes</mat-option> <mat-option value="yes">Yes</mat-option>
<mat-option value="no">No</mat-option> <mat-option value="no">No</mat-option>
</mat-select> </mat-select>
<mat-error *ngIf="getDocsSightedGroup['controls']['sal_certificate'].hasError('required')">Salary Certificate Required</mat-error> <mat-error *ngIf="getDocsSightedGroup['controls']['sal_certificate'].hasError('required')">Salary Certificate Required</mat-error>
</mat-form-field> </mat-form-field>
</div> </div>
<div fxLayout="column" size="3" align="center" *ngIf="getDocsSightedGroup['value'].sal_certificate == 'yes'"> <div fxLayout="column" size="3" align="center" *ngIf="getDocsSightedGroup['value'].sal_certificate == 'yes'">
<div fxLayout="row" fxLayoutAlign="center center"> <div fxLayout="row" fxLayoutAlign="center center">
<img ngxViewer text="PD Photos" title="Salary Certificate" <img ngxViewer text="PD Photos" title="Salary Certificate"
*ngIf="getDocsSightedGroup['value'].sal_certificate_pic != ''" *ngIf="getDocsSightedGroup['value'].sal_certificate_pic != ''"
src="{{getDocsSightedGroup['value'].sal_certificate_pic}}" style="max-width: 80px;max-height: 80px"> src="{{getDocsSightedGroup['value'].sal_certificate_pic}}" style="max-width: 80px;max-height: 80px">
</div> </div>
@ -515,24 +526,24 @@ Image </mat-label> -->
</div> </div>
<div fxLayout="row"> <div fxLayout="row">
<div fxLayout="column" fxFlex="85%"> <div fxLayout="column" fxFlex="85%">
<mat-form-field > <mat-form-field >
<mat-label>Salary Slip</mat-label> <mat-label>Salary Slip</mat-label>
<mat-select placeholder="Salary Slip" formControlName="sal_slip" <mat-select placeholder="Salary Slip" formControlName="sal_slip"
required> required>
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<mat-option value="yes">Yes</mat-option> <mat-option value="yes">Yes</mat-option>
<mat-option value="no">No</mat-option> <mat-option value="no">No</mat-option>
</mat-select> </mat-select>
<mat-error *ngIf="getDocsSightedGroup['controls']['sal_slip'].hasError('required')">Salary slip Required</mat-error> <mat-error *ngIf="getDocsSightedGroup['controls']['sal_slip'].hasError('required')">Salary slip Required</mat-error>
</mat-form-field> </mat-form-field>
</div> </div>
<div fxLayout="column" size="3" align="center" *ngIf="getDocsSightedGroup['value'].sal_slip == 'yes'"> <div fxLayout="column" size="3" align="center" *ngIf="getDocsSightedGroup['value'].sal_slip == 'yes'">
<div fxLayout="row" fxLayoutAlign="center center"> <div fxLayout="row" fxLayoutAlign="center center">
<img ngxViewer text="PD Photos" title="Salary Slip" <img ngxViewer text="PD Photos" title="Salary Slip"
*ngIf="getDocsSightedGroup['value'].sal_slip_pic != ''" *ngIf="getDocsSightedGroup['value'].sal_slip_pic != ''"
src="{{getDocsSightedGroup['value'].sal_slip_pic}}" style="max-width: 80px;max-height: 80px"> src="{{getDocsSightedGroup['value'].sal_slip_pic}}" style="max-width: 80px;max-height: 80px">
</div> </div>
<!-- <!--
@ -547,95 +558,110 @@ Image </mat-label> -->
</div> </div>
</div> </div>
<mat-form-field appearance="fill"> <mat-form-field appearance="fill">
<mat-label>Others please specify</mat-label> <mat-label>Others please specify</mat-label>
<mat-select placeholder="Others please specify" formControlName="other_doc" <mat-select placeholder="Others please specify" formControlName="other_doc"
required> required>
<mat-option>Select</mat-option> <mat-option>Select</mat-option>
<mat-option value="yes">Yes</mat-option> <mat-option value="yes">Yes</mat-option>
<mat-option value="no">No</mat-option> <mat-option value="no">No</mat-option>
</mat-select> </mat-select>
<mat-error *ngIf="getDocsSightedGroup['controls']['other_doc'].hasError('required')">Other Document Required</mat-error> <mat-error *ngIf="getDocsSightedGroup['controls']['other_doc'].hasError('required')">Other Document Required</mat-error>
</mat-form-field> </mat-form-field>
<div fxLayout="row" *ngIf="getDocsSightedGroup['value']['other_doc'] == 'yes'"> <div fxLayout="row" *ngIf="getDocsSightedGroup['value']['other_doc'] == 'yes'">
<div fxLayout="column" fxFlex="85%"> <div fxLayout="column" fxFlex="85%">
<mat-form-field appearance="fill"> <mat-form-field appearance="fill">
<mat-label>Specify the Document</mat-label> <mat-label>Specify the Document</mat-label>
<input matInput type="text" formControlName="other_doc_name"> <input matInput type="text" formControlName="other_doc_name">
<mat-error *ngIf="getDocsSightedGroup['controls']['other_doc_name'].hasError('required')">Required</mat-error> <mat-error *ngIf="getDocsSightedGroup['controls']['other_doc_name'].hasError('required')">Required</mat-error>
</mat-form-field> </mat-form-field>
</div> </div>
<div fxLayout="column" size="3" align="center" *ngIf="getDocsSightedGroup['value'].other_doc_name != ''"> <div fxLayout="column" size="3" align="center" *ngIf="getDocsSightedGroup['value'].other_doc_name != ''">
<div fxLayout="row" fxLayoutAlign="center center"> <div fxLayout="row" fxLayoutAlign="center center">
<img ngxViewer text="PD Photos" [title]="getDocsSightedGroup['value'].other_doc_name" <img ngxViewer text="PD Photos" [title]="getDocsSightedGroup['value'].other_doc_name"
*ngIf="getDocsSightedGroup['value'].other_doc_pic != ''" *ngIf="getDocsSightedGroup['value'].other_doc_pic != ''"
src="{{getDocsSightedGroup['value'].other_doc_pic}}" style="max-width: 80px;max-height: 80px"> src="{{getDocsSightedGroup['value'].other_doc_pic}}" style="max-width: 80px;max-height: 80px">
</div> </div>
<!-- <ion-button <!-- <ion-button
(click)="capturePic(getDocsSightedGroup['controls']['other_doc_pic'], 'Other Doc Pic',getQuestionControl().at(2).value.form_id)" (click)="capturePic(getDocsSightedGroup['controls']['other_doc_pic'], 'Other Doc Pic',getQuestionControl().at(2).value.form_id)"
fill="clear"> fill="clear">
<ion-icon style="font-size: 20px" name="camera"></ion-icon> <ion-icon style="font-size: 20px" name="camera"></ion-icon>
</ion-button> </ion-button>
<mat-label *ngIf="getDocsSightedGroup['value'].other_doc_pic == ''" style="font-size: 11px">Capture the <mat-label *ngIf="getDocsSightedGroup['value'].other_doc_pic == ''" style="font-size: 11px">Capture the
Image </mat-label> --> Image </mat-label> -->
<!-- <mat-error align="end" style="font-size:12px" *ngIf="getEmployer_details.controls['visiting_card_pic'].errors?.required || getEmployer_details.controls['visiting_card_pic'].touched">Person Met pic is Required</mat-error> --> <!-- <mat-error align="end" style="font-size:12px" *ngIf="getEmployer_details.controls['visiting_card_pic'].errors?.required || getEmployer_details.controls['visiting_card_pic'].touched">Person Met pic is Required</mat-error> -->
</div> </div>
</div> </div>
<div *ngIf="checkPartEnable(3)"> <div *ngIf="checkPartEnable(3)">
<mat-form-field appearance="fill"> <mat-form-field appearance="fill">
<mat-label>Why Documents are not available?</mat-label> <mat-label>Why Documents are not available?</mat-label>
<mat-select formControlName="doc_not_available" multiple> <mat-select formControlName="doc_not_available" multiple>
<mat-option *ngFor="let item of docNotAvailList" [value]="item">{{item}}</mat-option> <mat-option *ngFor="let item of docNotAvailList" [value]="item">{{item}}</mat-option>
</mat-select> </mat-select>
<mat-error *ngIf="getDocsSightedGroup['controls']['doc_not_available'].hasError('required')">Required</mat-error> <mat-error *ngIf="getDocsSightedGroup['controls']['doc_not_available'].hasError('required')">Required</mat-error>
</mat-form-field> </mat-form-field>
<mat-form-field appearance="fill" *ngIf="checkSpecifyField(getDocsSightedGroup['value']['doc_not_available'])"> <mat-form-field appearance="fill" *ngIf="checkSpecifyField(getDocsSightedGroup['value']['doc_not_available'])">
<mat-label>Specify the reason</mat-label> <mat-label>Specify the reason</mat-label>
<input matInput type="text" formControlName="doc_not_available_specify"/> <input matInput type="text" formControlName="doc_not_available_specify"/>
</mat-form-field> </mat-form-field>
</div> </div>
</div> </div>
<!-- END OF DOCS SIGHTED --> <!-- END OF DOCS SIGHTED -->
<div class="mat-button-div">
<!-- START OF OFFICE PHOTOGRAPHS --> <button mat-stroked-button matStepperPrevious>Back</button>
<div *ngIf="checkPartEnable(1) && getQuestionControl().at(2).get('office_photographs')"> <button mat-raised-button matStepperNext>Next <mat-icon>keyboard_arrow_right</mat-icon></button>
<br/> </div>
<mat-label><h5>{{dynamicStepperHeadingForEmp}}</h5></mat-label> </mat-step>
<hr/><br/><br/>
<div fxLayout="row" fxLayoutGap="10px" class="ion-align-items-center" formArrayName="office_photographs">
<div fxLayout="column" class="ion-align-self-center" *ngFor="let val of getPhotoControls('office_photographs');let i=index" [formGroupName]="i">
<!-- {{val.value | json}} -->
<div fxLayout="row" fxLayoutAlign="center center">
<img ngxViewer text="PD Photos" title="Office Photograph {{i+1}}" src="{{val.value.image}}" style="max-width: 80px;max-height: 80px"><br/>
</div>
<!-- <ion-button fill="clear" ><ion-icon style="font-size: 30px" name="camera"></ion-icon></ion-button><br/> -->
<div fxLayout="row" fxLayoutAlign="center center">
<mat-label style="font-size: 12px;text-align:left">Office Photograph {{i+1}}</mat-label>
</div>
</div>
<div *ngIf="getPhotoControls('office_photographs').length == 0" style="text-align: center;margin-top: 15px;">
No Photographs Found</div>
<div fxLayout="column" align="center" class="ion-align-self-center">
<!-- <img src="https://lh3.googleusercontent.com/proxy/euOnni6JKoCJKwXq9Hq8c6fkRaxI5SYQVsHUwx_w_Wt_9zGXsABxnFsjRv7_E3Xer35VR1oalGBRKWdlwQPMo9SoDqOrmx9h7zqmAXMG37rcrpaU_jPXMXAdffKjB0M_zy3yQNJRpOKvqUlx2JmvB68r8cDCGbVUQvW8Zk2yoR4I23i4ZM7U" style="max-width: 80px;max-height: 80px"/><br/> -->
<!-- <ion-button (click)="addMoreImage('office_photographs',getQuestionControl().at(2).value.form_id)"
fill="clear" ><ion-icon style="font-size: 30px" name="camera"></ion-icon></ion-button><br/>
<mat-label>Add More</mat-label> -->
</div>
</div><br/><br/>
</div> </div>
<!-- END OF OFFICE PHOTOGRAPHS -->
<!-- START OF NAME BOARD PHOTOGRAPHS --> <mat-step *ngIf="getQuestionControl().at(8).get('office_photographs')" formGroupName="8" [stepControl]="questions?.get([8])">
<div *ngIf="checkPartEnable(1) == false && getQuestionControl().at(2).get('nameboard_photographs')"> <ng-template matStepLabel>Office Setup Photographs</ng-template>
<!-- START OF OFFICE PHOTOGRAPHS -->
<div *ngIf="getQuestionControl().at(8).get('office_photographs')">
<br/>
<!-- <mat-label><h5>{{dynamicStepperHeadingForEmp}}</h5></mat-label>
<hr/><br/><br/> -->
<div fxLayout="row" fxLayoutGap="10px" class="ion-align-items-center" formArrayName="office_photographs">
<div fxLayout="column" class="ion-align-self-center" *ngFor="let val of getPhotoControls('office_photographs',8);let i=index" [formGroupName]="i">
<!-- {{val.value | json}} -->
<div fxLayout="row" fxLayoutAlign="center center">
<img ngxViewer text="PD Photos" title="Office Photograph {{i+1}}" src="{{val.value.image}}" style="max-width: 80px;max-height: 80px"><br/>
</div>
<!-- <ion-button fill="clear" ><ion-icon style="font-size: 30px" name="camera"></ion-icon></ion-button><br/> -->
<div fxLayout="row" fxLayoutAlign="center center">
<mat-label style="font-size: 12px;text-align:left">Office Photograph {{i+1}}</mat-label>
</div>
</div>
<div *ngIf="getPhotoControls('office_photographs',8).length == 0" style="text-align: center;margin-top: 15px;">
No Photographs Found</div>
<div fxLayout="column" align="center" class="ion-align-self-center">
<!-- <img src="https://lh3.googleusercontent.com/proxy/euOnni6JKoCJKwXq9Hq8c6fkRaxI5SYQVsHUwx_w_Wt_9zGXsABxnFsjRv7_E3Xer35VR1oalGBRKWdlwQPMo9SoDqOrmx9h7zqmAXMG37rcrpaU_jPXMXAdffKjB0M_zy3yQNJRpOKvqUlx2JmvB68r8cDCGbVUQvW8Zk2yoR4I23i4ZM7U" style="max-width: 80px;max-height: 80px"/><br/> -->
<!-- <ion-button (click)="addMoreImage('office_photographs',getQuestionControl().at(2).value.form_id)"
fill="clear" ><ion-icon style="font-size: 30px" name="camera"></ion-icon></ion-button><br/>
<mat-label>Add More</mat-label> -->
</div>
</div><br/><br/>
</div>
<!-- END OF OFFICE PHOTOGRAPHS -->
<div class="mat-button-div">
<button mat-stroked-button matStepperPrevious>Back</button>
<button mat-raised-button matStepperNext>Next <mat-icon>keyboard_arrow_right</mat-icon></button>
</div>
</mat-step>
<mat-step *ngIf="getQuestionControl().at(9).get('nameboard_photographs')" formGroupName="9" [stepControl]="questions?.get([9])">
<ng-template matStepLabel>Name board/Entrance photograph</ng-template>
<!-- START OF NAME BOARD PHOTOGRAPHS -->
<div *ngIf="getQuestionControl().at(9).get('nameboard_photographs')">
<br/> <br/>
<mat-label><h5>{{dynamicStepperHeadingForEmp}}</h5></mat-label> <!-- <mat-label><h5>{{dynamicStepperHeadingForEmp}}</h5></mat-label>
<hr/><br/><br/> <hr/><br/><br/> -->
<div fxLayout="row" class="ion-align-items-center" formArrayName="nameboard_photographs"> <div fxLayout="row" class="ion-align-items-center" formArrayName="nameboard_photographs">
<div fxLayout="column" size="6" align="center" class="ion-align-self-center" *ngFor="let val of getPhotoControls('nameboard_photographs');let i=index" [formGroupName]="i"> <div fxLayout="column" size="6" align="center" class="ion-align-self-center" *ngFor="let val of getPhotoControls('nameboard_photographs',9);let i=index" [formGroupName]="i">
<!-- {{val.value | json}} --> <!-- {{val.value | json}} -->
<div fxLayout="row" fxLayoutAlign="center center"> <div fxLayout="row" fxLayoutAlign="center center">
<img ngxViewer text="PD Photos" title="Name Board Photograph {{i+1}}" src="{{val.value.image}}" style="max-width: 80px;max-height: 80px"><br/> <img ngxViewer text="PD Photos" title="Name Board Photograph {{i+1}}" src="{{val.value.image}}" style="max-width: 80px;max-height: 80px"><br/>
@ -645,7 +671,7 @@ Image </mat-label> -->
<mat-label style="font-size: 12px;text-align:left">Name Board {{i+1}}</mat-label> <mat-label style="font-size: 12px;text-align:left">Name Board {{i+1}}</mat-label>
</div> </div>
</div> </div>
<div *ngIf="getPhotoControls('nameboard_photographs').length == 0" style="text-align: center;margin-top: 15px;"> <div *ngIf="getPhotoControls('nameboard_photographs',9).length == 0" style="text-align: center;margin-top: 15px;">
No Photographs Found</div> No Photographs Found</div>
<div fxLayout="column" align="center" class="ion-align-self-center"> <div fxLayout="column" align="center" class="ion-align-self-center">
<!-- <img src="https://lh3.googleusercontent.com/proxy/euOnni6JKoCJKwXq9Hq8c6fkRaxI5SYQVsHUwx_w_Wt_9zGXsABxnFsjRv7_E3Xer35VR1oalGBRKWdlwQPMo9SoDqOrmx9h7zqmAXMG37rcrpaU_jPXMXAdffKjB0M_zy3yQNJRpOKvqUlx2JmvB68r8cDCGbVUQvW8Zk2yoR4I23i4ZM7U" style="max-width: 80px;max-height: 80px"/><br/> --> <!-- <img src="https://lh3.googleusercontent.com/proxy/euOnni6JKoCJKwXq9Hq8c6fkRaxI5SYQVsHUwx_w_Wt_9zGXsABxnFsjRv7_E3Xer35VR1oalGBRKWdlwQPMo9SoDqOrmx9h7zqmAXMG37rcrpaU_jPXMXAdffKjB0M_zy3yQNJRpOKvqUlx2JmvB68r8cDCGbVUQvW8Zk2yoR4I23i4ZM7U" style="max-width: 80px;max-height: 80px"/><br/> -->
@ -657,11 +683,10 @@ Image </mat-label> -->
</div> </div>
<!-- END OF NAME BOARD PHOTOGRAPHS --> <!-- END OF NAME BOARD PHOTOGRAPHS -->
<div class="mat-button-div"> <div class="mat-button-div">
<button mat-stroked-button matStepperPrevious>Back</button> <button mat-stroked-button matStepperPrevious>Back</button>
<button mat-raised-button matStepperNext>Next <mat-icon>keyboard_arrow_right</mat-icon></button> <button mat-raised-button matStepperNext>Next <mat-icon>keyboard_arrow_right</mat-icon></button>
</div> </div>
</mat-step>
</mat-step>
<div *ngIf="docs_tobe_collect != null && docs_tobe_collect != undefined && docs_tobe_collect.length > 0" > <div *ngIf="docs_tobe_collect != null && docs_tobe_collect != undefined && docs_tobe_collect.length > 0" >
<mat-step formGroupName="6" [stepControl] ="questions?.get([6])"> <mat-step formGroupName="6" [stepControl] ="questions?.get([6])">

229
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-questions/employer-info/employer-info.component.ts
View File

@ -16,38 +16,39 @@ import { takeUntil } from 'rxjs/operators';
styleUrls: ['./employer-info.component.scss'] styleUrls: ['./employer-info.component.scss']
}) })
export class EmployerInfoComponent implements OnInit { export class EmployerInfoComponent implements OnInit {
stepperInfo= [{ raw_stepper_info = [{
form_name:'General Section', form_name:'General Section',
form_id:18, form_id:18,
stepper_index:0, stepper_index:0,
}, },
{ // {
form_name:'Employer information', // form_name:'Employer information',
form_id:"12", // form_id:"12",
stepper_index:1 // stepper_index:1
}, // },
{ {
form_name:'Credit Manager Queries', form_name:'Credit Manager Queries',
form_id:24, form_id:24,
stepper_index:2, stepper_index:1,
is_dynamic:true is_dynamic:true
}, },
{ {
form_name:'Address Information', form_name:'Address Information',
form_id:5, form_id:5,
stepper_index:3, stepper_index:2,
is_dynamic:true is_dynamic:true
},{ },{
form_name:'Final Remarks', form_name:'Final Remarks',
form_id:20, form_id:20,
stepper_index:4, stepper_index:3,
is_dynamic:true is_dynamic:true
},{ },{
form_name:'Submit', form_name:'Submit',
form_id:'COMMENTS', form_id:'COMMENTS',
stepper_index:4, stepper_index:3,
is_dynamic:true is_dynamic:true
},] },]
stepperInfo:any = []
// public person_met_entered:FormControl= new FormControl('') // public person_met_entered:FormControl= new FormControl('')
// public designation_entered:FormControl= new FormControl('') // public designation_entered:FormControl= new FormControl('')
// public relation_entered:FormControl= new FormControl('') // public relation_entered:FormControl= new FormControl('')
@ -107,7 +108,7 @@ export class EmployerInfoComponent implements OnInit {
notifier: NotifierService; notifier: NotifierService;
get questions() { return this.employerForm.get('questions');} get questions() { return this.employerForm.get('questions');}
get getEmployer_details() {return this.questions.get([2]).get('employer_details')} get getEmployer_details() {return this.questions.get([2]).get('employer_details')}
get getDocsSightedGroup() {return this.questions.get([2]).get('docs_sighted')} get getDocsSightedGroup() {return this.questions.get([7]).get('docs_sighted')}
employerform_pdinfo:any; employerform_pdinfo:any;
@ -132,12 +133,12 @@ export class EmployerInfoComponent implements OnInit {
console.log("constr",this.pdDetails,this.docs_tobe_collect) console.log("constr",this.pdDetails,this.docs_tobe_collect)
if(this.pdDetails.lender_short_name == 'CLIX' || this.pdDetails.lender_short_name == 'MWISE' || this.pdDetails.prod_catagory == 'LAEP') if(this.pdDetails.lender_short_name == 'CLIX' || this.pdDetails.lender_short_name == 'MWISE' || this.pdDetails.prod_catagory == 'LAEP')
{ {
let Index = this.stepperInfo.findIndex(vv=>vv.form_id == 'COMMENTS') let Index = this.raw_stepper_info.findIndex(vv=>vv.form_id == 'COMMENTS')
this.stepperInfo[Index].stepper_index+=1 this.raw_stepper_info[Index].stepper_index+=1
} }
if(this.docs_tobe_collect == null || this.docs_tobe_collect == undefined || this.docs_tobe_collect.length == 0) { if(this.docs_tobe_collect == null || this.docs_tobe_collect == undefined || this.docs_tobe_collect.length == 0) {
// this.stepperInfo // this.stepperInfo
for(let value of this.stepperInfo) { for(let value of this.raw_stepper_info) {
if(value.is_dynamic) { if(value.is_dynamic) {
value.stepper_index-=1 value.stepper_index-=1
} }
@ -152,7 +153,7 @@ export class EmployerInfoComponent implements OnInit {
// this.loadingProvider.dataLoader() // this.loadingProvider.dataLoader()
this.employerForm=this._formBuilder.group({ this.employerForm=this._formBuilder.group({
questions:this._formBuilder.array([this.addGeneralControls(),this.addAddressControls(), questions:this._formBuilder.array([this.addGeneralControls(),this.addAddressControls(),
this.addEmployerInfoForm(),this.addNeighbourhoodControls(),this.addFinalRemarksControls(), this.addEmployerInfoForm('Employment Information','12'),this.addNeighbourhoodControls(),this.addFinalRemarksControls(),
this._formBuilder.group({ this._formBuilder.group({
final_comments:['',Validators.required], final_comments:['',Validators.required],
final_visit_status:['',Validators.compose([Validators.required])], final_visit_status:['',Validators.compose([Validators.required])],
@ -161,7 +162,7 @@ export class EmployerInfoComponent implements OnInit {
company_existence_months:[''], company_existence_months:[''],
form_id:["COMMENTS"], form_id:["COMMENTS"],
form_name:["Comments"] form_name:["Comments"]
}), this.addCreditManagerQueries()]) }), this.addCreditManagerQueries(),this.addEmployerInfoForm('Documents Sighted','12.1'),this.addEmployerInfoForm('Office Setup Photographs','12.2'),this.addEmployerInfoForm('Name Board Photographs','12.3')])
}) })
@ -512,35 +513,41 @@ export class EmployerInfoComponent implements OnInit {
// }) // })
// } // }
// } // }
if(group_obj.hasOwnProperty('office_photographs') && group_obj.office_photographs && this.getQuestionControl().at(2).get('office_photographs')) { // For Documents Sighted
group_obj.office_photographs.forEach(()=>{ if(group_obj.hasOwnProperty('docs_sighted') && group_obj.docs_sighted && this.getQuestionControl().at(7)) {
this.addMoreImage('office_photographs') datas.push({docs_sighted:group_obj.docs_sighted})
})
} }
// name board photo handling else {
if(group_obj.hasOwnProperty('nameboard_photographs') && group_obj.nameboard_photographs && this.getQuestionControl().at(2).get('nameboard_photographs')) { datas.push({dummy:1})
group_obj.nameboard_photographs.forEach(()=>{ }
this.addMoreImage('nameboard_photographs') if(group_obj.hasOwnProperty('office_photographs') && group_obj.office_photographs && this.getQuestionControl().at(8)) {
// datas[8].office_photographs = group_obj.office_photograph
datas.push({office_photographs:group_obj.office_photographs})
group_obj.office_photographs.forEach(()=>{
this.addMoreImage('office_photographs','',8)
}) })
} }
// // For Other Documents images else {
// if(group_obj.form_id == "13" && group_obj.hasOwnProperty('other_documents') && group_obj.other_documents == 'yes') { datas.push({dummy:1})
// if(group_obj.other_documents_info) { }
// group_obj.other_documents_info.forEach(doc=>{ // name board photo handling
// this.addOtherDocumentsGroup() if(group_obj.hasOwnProperty('nameboard_photographs') && group_obj.nameboard_photographs && this.getQuestionControl().at(9)) {
// }) // datas[9].nameboard_photographs = group_obj.nameboard_photographs
// } datas.push({nameboard_photographs:group_obj.nameboard_photographs})
// } group_obj.nameboard_photographs.forEach(()=>{
// // FOR STOCK IMAGES this.addMoreImage('nameboard_photographs','',9)
// if(group_obj.form_id == "11" && group_obj.hasOwnProperty('images') && group_obj.images) { })
// group_obj.images.forEach(()=>{ }
// this.addMoreStockImage() else {
// }) datas.push({dummy:1})
// } }
} }
} }
this.getQuestionControl().at(2).patchValue(datas[employer_group_index]) this.getQuestionControl().at(2).patchValue(datas[employer_group_index])
this.getQuestionControl().at(7).patchValue(datas[7])
this.getQuestionControl().at(8).patchValue(datas[8])
this.getQuestionControl().at(9).patchValue(datas[9])
},200) },200)
console.log("final output",this.employerForm.value) console.log("final output",this.employerForm.value)
} }
@ -674,17 +681,17 @@ export class EmployerInfoComponent implements OnInit {
docs_to_be_sighted:this._formBuilder.array([]) docs_to_be_sighted:this._formBuilder.array([])
}) })
} }
addEmployerInfoForm() { addEmployerInfoForm(form_name,form_id) {
return this._formBuilder.group({ return this._formBuilder.group({
form_name:"Employer Information", form_name:[form_name],
form_id:["12"], form_id:[form_id],
// employer_details:this.getEmployerDetailsControls(), // employer_details:this.getEmployerDetailsControls(),
// docs_sighted:this.getDocsSightedDetailsControls(), // docs_sighted:this.getDocsSightedDetailsControls(),
// office_photographs:this._formBuilder.array([]), // office_photographs:this._formBuilder.array([]),
// nameboard_photographs:this._formBuilder.array([]) // nameboard_photographs:this._formBuilder.array([])
// docs_to_be_sighted:this._formBuilder.array([]) // docs_to_be_sighted:this._formBuilder.array([])
}) })
} }
// START OF EMPLOYER FORM GROUP // START OF EMPLOYER FORM GROUP
getDocsSightedDetailsControls() { getDocsSightedDetailsControls() {
return this._formBuilder.group({ return this._formBuilder.group({
@ -827,16 +834,16 @@ export class EmployerInfoComponent implements OnInit {
// return stockCtrl.controls // return stockCtrl.controls
// } // }
getPhotoControls(formArrayName) { getPhotoControls(formArrayName,groupIndex) {
let formArray = this.employerForm.get('questions') as FormArray; let formArray = this.employerForm.get('questions') as FormArray;
// console.log(formArray); // console.log(formArray);
let officeControl = formArray.at(2).get(formArrayName) as FormArray let officeControl = formArray.at(groupIndex).get(formArrayName) as FormArray
// console.log(business_group_ctrl); // console.log(business_group_ctrl);
// let stockCtrl = business_group_ctrl.at(0).get('office_photographs') as FormArray // let stockCtrl = business_group_ctrl.at(0).get('office_photographs') as FormArray
// console.log("stock",stockCtrl); // console.log("stock",stockCtrl);
// console.log(this.employerForm.value); // console.log(this.employerForm.value);
return officeControl.controls return officeControl.controls
} }
// getBusinessAssetSightImage() { // getBusinessAssetSightImage() {
// let formArray = this.employerForm.get('questions') as FormArray; // let formArray = this.employerForm.get('questions') as FormArray;
@ -907,10 +914,10 @@ export class EmployerInfoComponent implements OnInit {
// } // }
// // console.log(this.employerForm.value); // // console.log(this.employerForm.value);
// } // }
addMoreImage(formArrayName,form_id?) { addMoreImage(formArrayName,form_id?,formGroupIndex?) {
let formArray = this.employerForm.get('questions') as FormArray; let formArray = this.employerForm.get('questions') as FormArray;
// console.log(formArray); // console.log(formArray);
let officeControl = formArray.at(2).get(formArrayName) as FormArray let officeControl = formArray.at(formGroupIndex).get(formArrayName) as FormArray
// console.log(business_group_ctrl); // console.log(business_group_ctrl);
// let officeControl = business_group_ctrl.at(0).get('office_photographs') as FormArray // let officeControl = business_group_ctrl.at(0).get('office_photographs') as FormArray
// console.log("stock",stockCtrl); // console.log("stock",stockCtrl);
@ -1303,6 +1310,64 @@ export class EmployerInfoComponent implements OnInit {
// } // }
// // return invalid; // // return invalid;
// } // }
checkingStepperIndex() {
let whole_emp_sections = [{
form_name:'Employment information',
form_id:"12",
stepper_index:1
},{
form_name:'Document Sighted',
form_id:"12.1",
stepper_index:2
},
{
form_name:'Officer Setup Photographs',
form_id:"12.2",
stepper_index:3
},
{
form_name:'Name Board Photographs',
form_id:"12.3",
stepper_index:4
}]
// FOR ADDING THE STEPPER INDEX DYNAMICALLY
this.stepperInfo = JSON.parse(JSON.stringify(this.raw_stepper_info))
let count =0
if(this.getQuestionControl().at(2).get('employer_details')) {
count=4
this.stepperInfo.push(...whole_emp_sections)
}
else if(this.getQuestionControl().at(7).get('docs_sighted')) {
count=3
let temp = whole_emp_sections.filter(v=>v.form_id != '12').map(ve=>{return {form_name:ve.form_name,form_id:ve.form_id,stepper_index:ve.stepper_index -=1}})
this.stepperInfo.push(...temp)
// console.log("asdffffffffff",temp)
// debugger;
// this.stepperInfo.push()
}
else if(this.getQuestionControl().at(8).get('office_photographs')) {
count=2
let temp = whole_emp_sections.filter(v=>v.form_id != '12' && v.form_id != '12.1').map(ve=>{return {form_name:ve.form_name,form_id:ve.form_id,stepper_index:ve.stepper_index -=2}})
this.stepperInfo.push(...temp)
}
else if(this.getQuestionControl().at(9).get('nameboard_photographs')) {
let temp = whole_emp_sections.filter(v=>v.form_id != '12' && v.form_id != '12.1' && v.form_id != '12.2').map(ve=>{return {form_name:ve.form_name,form_id:ve.form_id,stepper_index:ve.stepper_index -=3}})
this.stepperInfo.push(...temp)
count=1
}
if(count != 0) {
for(let value of this.stepperInfo) {
if(value.is_dynamic) {
value.stepper_index+=count
}
}
// this.changeDetRef.detectChanges()
console.log("Modified stepper index value",this.stepperInfo,this.myStepper)
}
}
onSubmit(flag?) { onSubmit(flag?) {
if(this.spinner_access) { if(this.spinner_access) {
this.notifier.notify("info","Form processing please wait..."); this.notifier.notify("info","Form processing please wait...");
@ -1310,6 +1375,7 @@ export class EmployerInfoComponent implements OnInit {
} }
if(this.employerForm.invalid && flag != 'go_back') { if(this.employerForm.invalid && flag != 'go_back') {
console.log('form value',this.employerForm.getRawValue()) console.log('form value',this.employerForm.getRawValue())
this.checkingStepperIndex()
let invalidMsg = "Please Fill all the required fields and capture the image" let invalidMsg = "Please Fill all the required fields and capture the image"
let tempMsg = this.findInvalidControls() let tempMsg = this.findInvalidControls()
if(tempMsg != '') { if(tempMsg != '') {
@ -1344,6 +1410,21 @@ export class EmployerInfoComponent implements OnInit {
// return // return
// } // }
// } // }
// FOR MERGING EMPLOYMENT SECTION,DOCS SIGHTED,OFFICE AND NAME BOARD PHOTOGRAPH INTO SINGLE OBJ
if(this.getQuestionControl().at(7).get('docs_sighted')) {
records.questions[2].docs_sighted = records.questions[7].docs_sighted
}
if(this.getQuestionControl().at(8).get('office_photographs')) {
records.questions[2].office_photographs = records.questions[8].office_photographs
}
if(this.getQuestionControl().at(9).get('nameboard_photographs')) {
records.questions[2].nameboard_photographs = records.questions[9].nameboard_photographs
}
records.questions = records.questions.filter(v=>v.form_id != '12.1' && v.form_id != '12.2' && v.form_id != '12.3')
this.spinner_access = true; this.spinner_access = true;
console.log(records); console.log(records);
records.pdid = this.pdDetails.pd_id; records.pdid = this.pdDetails.pd_id;
@ -1532,6 +1613,9 @@ export class EmployerInfoComponent implements OnInit {
checkPartEnable(flag) { checkPartEnable(flag) {
let general_controls = this.getQuestionControl().at(0)['controls'] let general_controls = this.getQuestionControl().at(0)['controls']
let employement_controls:any = this.getQuestionControl().at(2) let employement_controls:any = this.getQuestionControl().at(2)
let name_board_controls:any = this.getQuestionControl().at(9)
let office_photo_controls:any = this.getQuestionControl().at(8)
let docs_sighted_controls:any = this.getQuestionControl().at(7)
let applicant_arr = this.getQuestionControl().at(0).get('individuals').value let applicant_arr = this.getQuestionControl().at(0).get('individuals').value
let return_value = '' let return_value = ''
switch (flag) { switch (flag) {
@ -1551,18 +1635,20 @@ export class EmployerInfoComponent implements OnInit {
general_controls.person_met_entered.setValidators(Validators.required); general_controls.person_met_entered.setValidators(Validators.required);
// general_controls.person_met_entered_pic.setValidators(Validators.required); // general_controls.person_met_entered_pic.setValidators(Validators.required);
// FOR ADDING OFFICE PHOTO // FOR ADDING OFFICE PHOTO
employement_controls.addControl('office_photographs',this._formBuilder.array([])) office_photo_controls.addControl('office_photographs', this._formBuilder.array([]))
name_board_controls.addControl('nameboard_photographs', this._formBuilder.array([]))
// employement_controls.addControl('office_photographs',this._formBuilder.array([]))
this.dynamicStepperHeadingForEmp = "Office Setup Photographs" this.dynamicStepperHeadingForEmp = "Office Setup Photographs"
// FOR REMOVING NAME BOARD PHOTO // FOR REMOVING NAME BOARD PHOTO
employement_controls.removeControl('nameboard_photographs') // employement_controls.removeControl('nameboard_photographs')
return true return true
} }
else if(general_controls.is_met_during_visit.value == 'no'){ else if(general_controls.is_met_during_visit.value == 'no'){
// FOR ADDING NAME BOARD PHOTO // FOR ADDING NAME BOARD PHOTO
employement_controls.addControl('nameboard_photographs',this._formBuilder.array([])) name_board_controls.addControl('nameboard_photographs', this._formBuilder.array([]))
this.dynamicStepperHeadingForEmp = "Name board/Entrance photograph" this.dynamicStepperHeadingForEmp = "Name board/Entrance photograph"
// FOR REMOVING OFFICE PHOTO // FOR REMOVING OFFICE PHOTO
employement_controls.removeControl('office_photographs') office_photo_controls.removeControl('office_photographs')
return false return false
} }
@ -1598,7 +1684,10 @@ export class EmployerInfoComponent implements OnInit {
// FOR ENABLING EMPLOYMENT INFOMATION SECTIONS // FOR ENABLING EMPLOYMENT INFOMATION SECTIONS
case 4: case 4:
if (general_controls.is_employer_available.value == 'yes') { if (general_controls.is_employer_available.value == 'yes') {
employement_controls.addControl('employer_details',this.getEmployerDetailsControls()) employement_controls.addControl('employer_details', this.getEmployerDetailsControls())
docs_sighted_controls.addControl('docs_sighted', this.getDocsSightedDetailsControls())
name_board_controls.addControl('nameboard_photographs', this._formBuilder.array([]))
office_photo_controls.addControl('office_photographs', this._formBuilder.array([]))
this.dynamicStepperHeadingForEmp = "Employment Information" this.dynamicStepperHeadingForEmp = "Employment Information"
return true; return true;
} }
@ -1611,13 +1700,15 @@ export class EmployerInfoComponent implements OnInit {
// let applicant_arr = this.getQuestionControl().at(0).get('individuals').value // let applicant_arr = this.getQuestionControl().at(0).get('individuals').value
// console.log(applicant_arr) // console.log(applicant_arr)
if(applicant_arr && applicant_arr.length > 0) { if(applicant_arr && applicant_arr.length > 0) {
if(general_controls.is_employer_available.value == 'no' && applicant_arr.filter(vv=>vv.is_person_met == true).length != 0 ){ if ((general_controls.is_employer_available.value == 'no' && applicant_arr.filter(vv => vv.is_person_met == true).length != 0) || (general_controls.is_employer_available.value == 'yes')) {
employement_controls.addControl('docs_sighted',this.getDocsSightedDetailsControls()) docs_sighted_controls.addControl('docs_sighted', this.getDocsSightedDetailsControls())
name_board_controls.addControl('nameboard_photographs', this._formBuilder.array([]))
office_photo_controls.addControl('office_photographs', this._formBuilder.array([]))
this.dynamicStepperHeadingForEmp = "Documents Sighted of applicant employment During FI" this.dynamicStepperHeadingForEmp = "Documents Sighted of applicant employment During FI"
return true; return true;
} }
else{ else{
employement_controls.removeControl('docs_sighted') docs_sighted_controls.removeControl('docs_sighted')
return false return false
} }
} }

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

@ -19,10 +19,11 @@
<mat-list-item role="listitem" style="height:48px !important;"> <mat-list-item role="listitem" style="height:48px !important;">
<div fxFlex="row"> <div fxFlex="row">
<div fxFlex="100"> <div fxFlex="100">
<div fxFlex="50" align="left"> <div fxFlex="30" align="left">
<strong>{{master.lender_short_name}}</strong> <strong>{{master.lender_short_name}}</strong><br/>
<span *ngIf="master.fin_institute_name != null">{{master.fin_institute_name}}</span>
</div> </div>
<div fxFlex="50" align="right"> <div fxFlex="70" align="right">
{{master.branch_name}} {{master.branch_name}}
</div> </div>
</div> </div>
@ -152,7 +153,7 @@
<!-- <span><button mat-raised-button mat-button-md mat-icon-button class="mr-1 mb-1 hover-icon" type="button" [matTooltip]="master.fk_primary_address_id ? 'Initiate PD for this address' : 'Initiate Address for PD Process'" matTooltipPosition="above" (click)="initiateAddtionalPD(master,addresses,master.fk_primary_address_id ? true : false)"><mat-icon>where_to_vote</mat-icon></button></span> --> <!-- <span><button mat-raised-button mat-button-md mat-icon-button class="mr-1 mb-1 hover-icon" type="button" [matTooltip]="master.fk_primary_address_id ? 'Initiate PD for this address' : 'Initiate Address for PD Process'" matTooltipPosition="above" (click)="initiateAddtionalPD(master,addresses,master.fk_primary_address_id ? true : false)"><mat-icon>where_to_vote</mat-icon></button></span> -->
<button *ngIf="VendorRoleID != 22" mat-raised-button mat-button-md mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Allocate" matTooltipPosition="above" (click)="pdAllocationTo(master,addresses)"><mat-icon>verified_user</mat-icon></button> <button *ngIf="VendorRoleID != 22" mat-raised-button mat-button-md mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Allocate" matTooltipPosition="above" (click)="pdAllocationTo(master,addresses)"><mat-icon>verified_user</mat-icon></button>
<span><button mat-raised-button mat-button-md mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Schedule" matTooltipPosition="above" (click)="scheduleDetails(master,addresses)"><mat-icon>schedule</mat-icon></button></span> <span><button mat-raised-button mat-button-md mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Schedule" matTooltipPosition="above" (click)="scheduleDetails(master,addresses)"><mat-icon>schedule</mat-icon></button></span>
<span *ngIf="VendorRoleID != 22 && addresses.addtional_pd_data[0].is_qc_enabled == '1'"><button *ngIf="roleAccessDetails.discussions && addresses.assigned_pd && addresses.addtional_pd_data[0].pd_type_name && addresses.addtional_pd_data[0].vendor_status!=pdStatusCheck.DRAFT && addresses.addtional_pd_data[0].vendor_status!=pdStatusCheck.TRIGGERED" mat-raised-button mat-button-md mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Discussion" matTooltipPosition="above" (click)="getPDStart(addresses,addresses.addtional_pd_data[0].vendor_status)"><mat-icon>question_answer</mat-icon></button></span> <span *ngIf="VendorRoleID != 22 && addresses.addtional_pd_data[0].is_qc_enabled == '1'"><button *ngIf="roleAccessDetails.discussions && addresses.assigned_pd && addresses.addtional_pd_data[0].pd_type_name && addresses.addtional_pd_data[0].vendor_status!=pdStatusCheck.DRAFT && addresses.addtional_pd_data[0].vendor_status!=pdStatusCheck.TRIGGERED && addresses.addtional_pd_data[0].vendor_status!=pdStatusCheck.QC_COMPLETED" mat-raised-button mat-button-md mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Discussion" matTooltipPosition="above" (click)="getPDStart(addresses,addresses.addtional_pd_data[0].vendor_status)"><mat-icon>question_answer</mat-icon></button></span>
</div> </div>
</div> </div>
</div> </div>
@ -193,7 +194,7 @@
<div fxFlex="60" align="right"> <div fxFlex="60" align="right">
<span><button *ngIf="VendorRoleID != 22" mat-raised-button mat-button-md mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Allocate" matTooltipPosition="above" (click)="pdAllocationTo(master,addresses)"><mat-icon>verified_user</mat-icon></button></span> <span><button *ngIf="VendorRoleID != 22" mat-raised-button mat-button-md mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Allocate" matTooltipPosition="above" (click)="pdAllocationTo(master,addresses)"><mat-icon>verified_user</mat-icon></button></span>
<span><button mat-raised-button mat-button-md mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Schedule" matTooltipPosition="above" (click)="scheduleDetails(master,addresses)"><mat-icon>schedule</mat-icon></button></span> <span><button mat-raised-button mat-button-md mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Schedule" matTooltipPosition="above" (click)="scheduleDetails(master,addresses)"><mat-icon>schedule</mat-icon></button></span>
<span *ngIf="VendorRoleID != 22 && addresses.addtional_pd_data[0].is_qc_enabled == '1'"><button *ngIf="roleAccessDetails.discussions && addresses.assigned_pd && addresses.addtional_pd_data[0].pd_type_name && addresses.addtional_pd_data[0].vendor_status!=pdStatusCheck.DRAFT && addresses.addtional_pd_data[0].vendor_status!=pdStatusCheck.TRIGGERED" mat-raised-button mat-button-md mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Discussion" matTooltipPosition="above" (click)="getPDStart(addresses,addresses.addtional_pd_data[0].vendor_status)"><mat-icon>question_answer</mat-icon></button></span> <span *ngIf="VendorRoleID != 22 && addresses.addtional_pd_data[0].is_qc_enabled == '1'"><button *ngIf="roleAccessDetails.discussions && addresses.assigned_pd && addresses.addtional_pd_data[0].pd_type_name && addresses.addtional_pd_data[0].vendor_status!=pdStatusCheck.DRAFT && addresses.addtional_pd_data[0].vendor_status!=pdStatusCheck.TRIGGERED && addresses.addtional_pd_data[0].vendor_status!=pdStatusCheck.QC_COMPLETED" mat-raised-button mat-button-md mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Discussion" matTooltipPosition="above" (click)="getPDStart(addresses,addresses.addtional_pd_data[0].vendor_status)"><mat-icon>question_answer</mat-icon></button></span>
</div> </div>
</div> </div>
<div fxLayout="row nowrap"> <div fxLayout="row nowrap">

1
ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.html
View File

@ -23,6 +23,7 @@
<div fxFlex="100"> <div fxFlex="100">
<div fxFlex="50" align="left"> <div fxFlex="50" align="left">
<strong>{{master.lender_short_name}}</strong> <strong>{{master.lender_short_name}}</strong>
<span *ngIf="master.fin_institute_name != null">{{master.fin_institute_name}}</span>
</div> </div>
<div fxFlex="50" align="right"> <div fxFlex="50" align="right">
{{master.branch_name}} {{master.branch_name}}

4
ng6-seed/src/environments/environment.prod.ts
View File

@ -16,8 +16,8 @@ export const environment = {
// For Vendor // For Vendor
// venIdentityPoolId: "ap-south-1:5ad3ce43-4260-4273-87b2-e6a377b8e874", // venIdentityPoolId: "ap-south-1:5ad3ce43-4260-4273-87b2-e6a377b8e874",
venUserPoolId: "ap-south-1_K57yPaWxV", // Username venUserPoolId: "ap-south-1_7Xvnpr2At", // Username
venClientId: "5sntllm6nbqo120mteqqd8b9nq", // ClientName venClientId: "5dvpr90r2na4te5k0qrint0m5i", // ClientName
firebase: { firebase: {
apiKey: "AIzaSyCk86rasBR2-sXlVu6ACUO406EM_1mcwgo", apiKey: "AIzaSyCk86rasBR2-sXlVu6ACUO406EM_1mcwgo",