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

salaried case changes

Browse Source
This commit is contained in:
Your Name 2021-06-30 17:33:31 +05:30
parent 04b253a75f
commit cfbf1077b8
7 changed files with 17017 additions and 490 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17385
ng6-seed/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

2
ng6-seed/package.json
View File

@ -52,7 +52,7 @@
"intl": "^1.2.4", "intl": "^1.2.4",
"jquery": "^3.4.1", "jquery": "^3.4.1",
"karma-jasmine": "^1.1.1", "karma-jasmine": "^1.1.1",
"leaflet": "^1.6.0", "leaflet": "^1.7.1",
"mat-table-exporter": "^1.2.5", "mat-table-exporter": "^1.2.5",
"mat-video": "^2.7.2", "mat-video": "^2.7.2",
"moment": "^2.24.0", "moment": "^2.24.0",

13
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html
View File

@ -196,9 +196,9 @@
<mat-checkbox class="table-checkbox-com" color="primary" <mat-checkbox class="table-checkbox-com" color="primary"
formControlName="is_company_applicant"> formControlName="is_company_applicant">
Is Applicant</mat-checkbox> Is Applicant</mat-checkbox>
<div *ngIf="split_customer_abbr != 'SAL'">
<mat-form-field style="width: 45%;"> <mat-form-field style="width: 45%;">
<mat-label *ngIf="customer_segment_abbr == 'SEP_INDV' && split_customer_abbr != 'SAL'">Entity type</mat-label> <mat-label *ngIf="customer_segment_abbr == 'SEP_INDV' && split_customer_abbr != 'SAL'">git type</mat-label>
<mat-label *ngIf="customer_segment_abbr != 'SEP_INDV' && split_customer_abbr != 'SAL'">Business Entity Type</mat-label> <mat-label *ngIf="customer_segment_abbr != 'SEP_INDV' && split_customer_abbr != 'SAL'">Business Entity Type</mat-label>
<mat-label *ngIf="split_customer_abbr == 'SAL'">Company/Firm Entity Type</mat-label> <mat-label *ngIf="split_customer_abbr == 'SAL'">Company/Firm Entity Type</mat-label>
<mat-select formControlName="business_entity_type" <mat-select formControlName="business_entity_type"
@ -224,8 +224,9 @@
<mat-error *ngIf="com.controls['business_entity_type_other'].invalid">Please <mat-error *ngIf="com.controls['business_entity_type_other'].invalid">Please
Specify Others Required</mat-error> Specify Others Required</mat-error>
</mat-form-field> </mat-form-field>
</div>
<!-- <p><span *ngIf="customer_segment_abbr == 'SEP_INDV' && split_customer_abbr != 'SAL'">Number of Years in Current Profession</span> <div *ngIf="split_customer_abbr != 'SAL'">
<p><span *ngIf="customer_segment_abbr == 'SEP_INDV' && split_customer_abbr != 'SAL'">Number of Years in Current Profession</span>
<span *ngIf="customer_segment_abbr != 'SEP_INDV' && split_customer_abbr != 'SAL'">Number of Years For Which The Business Has Been Running</span> <span *ngIf="customer_segment_abbr != 'SEP_INDV' && split_customer_abbr != 'SAL'">Number of Years For Which The Business Has Been Running</span>
<span *ngIf="split_customer_abbr == 'SAL'">Number of Years For Which The Company/Firm Has Been Running</span></p> <span *ngIf="split_customer_abbr == 'SAL'">Number of Years For Which The Company/Firm Has Been Running</span></p>
<mat-form-field style="width: 20%;"> <mat-form-field style="width: 20%;">
@ -250,8 +251,8 @@
placeholder="Enter Date of Formation, If Available"> placeholder="Enter Date of Formation, If Available">
<mat-datepicker-toggle matSuffix [for]="picker"></mat-datepicker-toggle> <mat-datepicker-toggle matSuffix [for]="picker"></mat-datepicker-toggle>
<mat-datepicker #picker></mat-datepicker> <mat-datepicker #picker></mat-datepicker>
</mat-form-field>--> </mat-form-field>
</div>
<div fxLayout="row nowrap" [style.display]="'block'"> <div fxLayout="row nowrap" [style.display]="'block'">
<div align="right"> <div align="right">
<button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button <button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button

68
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts
View File

@ -504,7 +504,7 @@ export class GeneralInfoComponent implements OnInit {
company_name: [elementValue.company_name], company_name: [elementValue.company_name],
company_messrs_name: ['M/s'], company_messrs_name: ['M/s'],
is_company_applicant: [elementValue.is_company_applicant], is_company_applicant: [elementValue.is_company_applicant],
business_entity_type: [elementValue.business_entity_type, Validators.required], business_entity_type: [elementValue.business_entity_type],
business_years: [elementValue.business_years], business_years: [elementValue.business_years],
business_month: [elementValue.business_month], business_month: [elementValue.business_month],
business_date_object: [elementValue.business_date_object], business_date_object: [elementValue.business_date_object],
@ -952,46 +952,46 @@ export class GeneralInfoComponent implements OnInit {
} }
/**************************** submit form details Ends Here ***********************/ /**************************** submit form details Ends Here ***********************/
// convert month to year business has been running //convert month to year business has been running
// ConvertMonthintoYearforBusiness(e, controlIndex, flag) { ConvertMonthintoYearforBusiness(e, controlIndex, flag) {
// let converted_month: number = e % 12; let converted_month: number = e % 12;
// let converted_year: number = e / 12; let converted_year: number = e / 12;
// if (flag == 1) { if (flag == 1) {
// let control: any = this._generalForm.get('companies') as FormArray; let control: any = this._generalForm.get('companies') as FormArray;
// control = control.controls[controlIndex]; control = control.controls[controlIndex];
// let business_year = control.controls.business_years.value; let business_year = control.controls.business_years.value;
// control.controls.business_years.setValue(+business_year + +Math.floor(converted_year)); control.controls.business_years.setValue(+business_year + +Math.floor(converted_year));
// control.controls.business_month.setValue(Math.floor(converted_month)); control.controls.business_month.setValue(Math.floor(converted_month));
// } }
// if (flag == 2) { if (flag == 2) {
// let ri_year = this._generalForm.controls.rental_income_rcv_in_years.value; let ri_year = this._generalForm.controls.rental_income_rcv_in_years.value;
// this._generalForm.controls['rental_income_rcv_in_years'].setValue(+ri_year + +Math.floor(converted_year)); this._generalForm.controls['rental_income_rcv_in_years'].setValue(+ri_year + +Math.floor(converted_year));
// this._generalForm.controls['rental_income_rcv_in_month'].setValue(Math.floor(converted_month)); this._generalForm.controls['rental_income_rcv_in_month'].setValue(Math.floor(converted_month));
// } }
// } }
// getDateObjects(values: any, controlIndex) { getDateObjects(values: any, controlIndex) {
// let control: any = this._generalForm.get('companies') as FormArray; let control: any = this._generalForm.get('companies') as FormArray;
// control = control.controls[controlIndex]; control = control.controls[controlIndex];
// let pd_initiation_date: string = this.pd_all_details.pdmaster_details.pd_date_of_initiation.split('/').reverse().join("/"); let pd_initiation_date: string = this.pd_all_details.pdmaster_details.pd_date_of_initiation.split('/').reverse().join("/");
// let selected_date = this.pipe.transform(values, 'yyyy/MM/dd');; let selected_date = this.pipe.transform(values, 'yyyy/MM/dd');;
// let diffInMs: number = Date.parse(pd_initiation_date) - Date.parse(selected_date); let diffInMs: number = Date.parse(pd_initiation_date) - Date.parse(selected_date);
// let diff: number = Math.floor(diffInMs / 1000); let diff: number = Math.floor(diffInMs / 1000);
// diff /= (60 * 60 * 24 * 30); diff /= (60 * 60 * 24 * 30);
// diff = Math.abs(Math.round(diff)); diff = Math.abs(Math.round(diff));
// control.controls['business_years'].setValue(0); control.controls['business_years'].setValue(0);
// control.controls['business_month'].setValue(0); control.controls['business_month'].setValue(0);
// if (diff) { if (diff) {
// control.controls['business_years'].setValue(Math.floor(diff / 12)); control.controls['business_years'].setValue(Math.floor(diff / 12));
// control.controls['business_month'].setValue(Math.floor(diff % 12)); control.controls['business_month'].setValue(Math.floor(diff % 12));
// } }
// } }
// check entity type and create other form control // check entity type and create other form control
checkEntityType(value, controlIndex) { checkEntityType(value, controlIndex) {

9
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/queries-docs/covid questions.json Normal file
View File

File diff suppressed because one or more lines are too long

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

@ -22,6 +22,19 @@
<div fxFlex="100" align="left" style="padding:15px !important;"> <div fxFlex="100" align="left" style="padding:15px !important;">
{{ formButton.form_name }} {{ formButton.form_name }}
</div> </div>
<!--<div fxFlex="20" align="end">
<span style="padding: 2px 9px 3px 9px !important;" class="menu-badge mat-purple ng-star-inserted" align="center">{{quesIndex+1}}</span>
</div> -->
</mat-card-header>
</mat-card>
<mat-card fxFlex.xs="80" fxFlex.sm="45" fxFlex.md="32" fxFlex.lg="32" fxFlex.xl="33" *ngFor="let photoButton of photographButtons;let quesIndex=index" [ngStyle]="{'background-color':photoButton.isAnswered == false ? '#fff' : '#4caf50' ,'color':'#fff'}" (click)="OnSelectDirectForms(photoButton)">
<mat-card-header>
<span style="padding: 17px 14px 3px 15px !important;border-radius: 0px 0px 0px 15px!important;width: 50px !important;" class="menu-badge mat-purple ng-star-inserted" align="center">{{actualQuestions+1}}</span>
<div fxFlex="100" align="left" style="padding:15px !important;">
{{ photoButton.form_name }}
</div>
<!--<div fxFlex="20" align="end"> <!--<div fxFlex="20" align="end">
<span style="padding: 2px 9px 3px 9px !important;" class="menu-badge mat-purple ng-star-inserted" align="center">{{quesIndex+1}}</span> <span style="padding: 2px 9px 3px 9px !important;" class="menu-badge mat-purple ng-star-inserted" align="center">{{quesIndex+1}}</span>
</div> --> </div> -->
@ -29,6 +42,7 @@
</mat-card> </mat-card>
</div> </div>
</mat-card-content> </mat-card-content>
<mat-card-actions align="end"> <mat-card-actions align="end">
<button matTooltip="Complete Discussion" matTooltipPosition="above" [disabled]="actualQuestions==0 || actualQuestions!=answeredQuestions || currentPDStatus===false" mat-raised-button color="primary" (click)="pdStatusDialogue(pdStatusCheck.COMPLETED,2);"><span>{{currentPDStatus === true ? 'COMPLETE':'COMPLETED' }}</span></button> <button matTooltip="Complete Discussion" matTooltipPosition="above" [disabled]="actualQuestions==0 || actualQuestions!=answeredQuestions || currentPDStatus===false" mat-raised-button color="primary" (click)="pdStatusDialogue(pdStatusCheck.COMPLETED,2);"><span>{{currentPDStatus === true ? 'COMPLETE':'COMPLETED' }}</span></button>
</mat-card-actions> </mat-card-actions>

8
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.ts
View File

@ -69,6 +69,7 @@ export class StartPdComponent implements OnInit, OnDestroy {
answeredQuestions: number; answeredQuestions: number;
private notifier: NotifierService; private notifier: NotifierService;
vendor_status_arr: any = []; vendor_status_arr: any = [];
photographButtons: any[];
constructor(notifier: NotifierService, private dialog: MatDialog, private fb: FormBuilder, private route: ActivatedRoute, constructor(notifier: NotifierService, private dialog: MatDialog, private fb: FormBuilder, private route: ActivatedRoute,
private router: Router, private router: Router,
@ -134,7 +135,12 @@ export class StartPdComponent implements OnInit, OnDestroy {
let filterApplicantName= data.records.pdapplicants_detials.filter(item => item.applicant_type == 1); let filterApplicantName= data.records.pdapplicants_detials.filter(item => item.applicant_type == 1);
this.mainApplicantName = filterApplicantName.length > 0 ? filterApplicantName[0].applicant_name : ''; this.mainApplicantName = filterApplicantName.length > 0 ? filterApplicantName[0].applicant_name : '';
this.currentPDStatus = data.records.pdmaster_details.pd_status=='INPROGRESS' ? true : data.records.pdmaster_details.pd_status=='SCHEDULED' ? true :data.records.pdmaster_details.pd_status=='ALLOCATED' ? true : false; this.currentPDStatus = data.records.pdmaster_details.pd_status=='INPROGRESS' ? true : data.records.pdmaster_details.pd_status=='SCHEDULED' ? true :data.records.pdmaster_details.pd_status=='ALLOCATED' ? true : false;
this.categoryFormButtons = Object.keys(data.records.template_forms).map((item)=>data.records.template_forms[item]).filter(item=>item.isAnswerable===true); let categoryFormButtons1 = Object.keys(data.records.template_forms).map((item)=>data.records.template_forms[item]).filter(item=>item.isAnswerable===true);
this.categoryFormButtons =categoryFormButtons1.filter(item=>item.form_id!=26);
this.photographButtons=categoryFormButtons1.filter(item=>item.form_id==26);
console.log(this.photographButtons);
// this.categoryFormButtons = this.categoryFormButtons.filter(item=>item.isAnswerable===true); // this.categoryFormButtons = this.categoryFormButtons.filter(item=>item.isAnswerable===true);
this.actualQuestions = this.categoryFormButtons.length; this.actualQuestions = this.categoryFormButtons.length;
let getAnsweredFormsCount = this.categoryFormButtons.filter(item=>item.isAnswered===true); let getAnsweredFormsCount = this.categoryFormButtons.filter(item=>item.isAnswered===true);