Merge branch 'master' of https://bitbucket.org/sriramv18/sparqsineedge
This commit is contained in:
venbatechnologies@gmail.com
commit
35cf6d7e29
@ -56,7 +56,7 @@
|
||||
<mat-icon style="color: white;">short_text</mat-icon>
|
||||
</button>
|
||||
<mat-sidenav #mailnav [mode]="isOver() ? 'over' : 'side'" [opened]="!isOver()" class="mail-sidebar pl-xs pr-xs">
|
||||
<mat-card style="text-align:center;"> <button mat-raised-button color="red" *ngIf="reGenerateBtn" (click)="reGeneratePFReport()" style="padding: 0 58px !important;">Re-generate Report</button></mat-card>
|
||||
<mat-card style="text-align:center;" *ngIf="qcStatus !== 'QC_COMPLETED'"> <button mat-raised-button color="red" *ngIf="reGenerateBtn" (click)="reGeneratePFReport()" style="padding: 0 58px !important;" >Re-generate Report</button></mat-card>
|
||||
<button mat-menu-item *ngFor="let pd of pdReportVersionList" [ngClass]="{'active': selectedItem == item}" (click)="changeVersion(pd)" style="font-size: 0.9em !important;height:6% !important;line-height: normal !important;">
|
||||
{{ pd.doc_name }}<span *ngIf="pd.is_latest == 1" [style.color]="'green'">( Current Version )</span><br>
|
||||
<span style="color:rgba(117, 115, 115, 0.87)!important;font-size:13px !important;">{{pd.createdby}}</span><br>
|
||||
@ -64,13 +64,14 @@
|
||||
<hr>
|
||||
|
||||
</button>
|
||||
|
||||
<mat-card *ngIf="qcStatus === 'QC_COMPLETED'" style="text-align:center;position: absolute;
|
||||
bottom: 10px;"> <button mat-raised-button color="red" *ngIf="reGenerateBtn" (click)="reportReview()" style="padding: 0 58px !important;">QC Review</button> </mat-card>
|
||||
</mat-sidenav>
|
||||
|
||||
|
||||
<div class="main-content" fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="100" fxFlex.lg="100" fxFlex.xl="100">
|
||||
|
||||
<figure>
|
||||
{{qcStatus}}
|
||||
<figure style="min-height: 240px;">
|
||||
|
||||
<div *ngIf="latestPDDetails">
|
||||
<div style="margin: 12px;
|
||||
@ -78,8 +79,8 @@
|
||||
padding: 8px;">
|
||||
<div style="text-align: right;" class="mb-1">
|
||||
<button mat-raised-button mat-icon-button class="hover-icon " type="button" matTooltip="Edit" matTooltipPosition="above"
|
||||
*ngIf="latestPDDetails.is_latest == 1" (click)="addNewQuestion()"><mat-icon>edit</mat-icon></button>
|
||||
<button mat-stroked-button *ngIf="latestPDDetails.is_latest == 0" (click)="changeDocumentEdit()">Restore</button>
|
||||
*ngIf="latestPDDetails.is_latest == 1 && qcStatus !== 'QC_COMPLETED'" (click)="addNewQuestion()"><mat-icon>edit</mat-icon></button>
|
||||
<button mat-stroked-button *ngIf="latestPDDetails.is_latest == 0 && qcStatus !== 'QC_COMPLETED'" (click)="changeDocumentEdit()">Restore</button>
|
||||
</div>
|
||||
<div *ngIf="reGenerateBtn">
|
||||
<pdf-viewer [src]="latestPDDetails.doc_uri" [original-size]="false" [page]="1">
|
||||
|
||||
@ -10,6 +10,7 @@ import { MatDialog,
|
||||
MatDialogRef,
|
||||
MAT_DIALOG_DATA } from "@angular/material";
|
||||
import { ModelEditPdReportComponent} from './model-edit-pd-report/model-edit-pd-report.component';
|
||||
import { QcReviewComponent } from './qc-review/qc-review.component';
|
||||
|
||||
/**sweet alert */
|
||||
// import Swal from 'sweetalert2';
|
||||
@ -117,12 +118,14 @@ export class PdReportComponent implements OnInit {
|
||||
})
|
||||
}
|
||||
|
||||
public qcStatus: string = '';
|
||||
getPdReportVersionList(){
|
||||
this.pdTrigerService.getPdDocVersionList(this.startPD).subscribe(data => {
|
||||
if(data.status == 200 && data.dataStatus){
|
||||
this.pdReportVersionList = [...data.records].reverse();
|
||||
this.pdReportVersionList = [...data.records.reports_urls].reverse();
|
||||
let datas = this.pdReportVersionList.filter((a)=>{return a.is_latest == 1;})
|
||||
this.latestPDDetails = datas[0];
|
||||
this.qcStatus = data.records.pdstatus;
|
||||
// alert(JSON.stringify(this.latestPDDetails));
|
||||
this.reGenerateBtn = true;
|
||||
} else {
|
||||
@ -174,6 +177,22 @@ export class PdReportComponent implements OnInit {
|
||||
console.log(this.latestPDDetails);
|
||||
}
|
||||
|
||||
|
||||
|
||||
reportReview(): void {
|
||||
const dialogRef = this.dialog.open(QcReviewComponent, {
|
||||
data: { startId : this.startPD },
|
||||
disableClose: true
|
||||
});
|
||||
dialogRef.afterClosed()
|
||||
.subscribe(dataresult => {
|
||||
// this.getPdReportFinalTemplateDetails();
|
||||
// this.getQuestionsMasters();
|
||||
// this.getBranch();
|
||||
// this.isPopupOpened = false;
|
||||
});
|
||||
}
|
||||
|
||||
changeDocumentEdit() : void{
|
||||
|
||||
|
||||
@ -200,8 +219,6 @@ export class PdReportComponent implements OnInit {
|
||||
} else {
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
|
||||
|
||||
// Swal('User Created');
|
||||
|
||||
@ -0,0 +1,23 @@
|
||||
<h2 mat-dialog-title>QC Completed Review</h2>
|
||||
<mat-dialog-content class="mat-typography">
|
||||
<!--<h3>Develop across all platforms</h3>-->
|
||||
<div style="margin: 12px; width: 340px;">
|
||||
<form role="form" *ngIf="showForm" [formGroup]="ngForm" accept-charset="UTF-8" novalidate>
|
||||
<div>
|
||||
<mat-form-field appearance="outline" style="width: 100%">
|
||||
<mat-label>Remarks</mat-label>
|
||||
<textarea matInput placeholder="Remarks" formControlName="qc_remarks"></textarea>
|
||||
</mat-form-field>
|
||||
</div>
|
||||
<div>
|
||||
<app-rating [rating]="ngForm.get('qc_rating').value" (ratingClick)='ratingComponentClick($event)'></app-rating>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</mat-dialog-content>
|
||||
<mat-dialog-actions align="end">
|
||||
<button mat-button class="btn btn-primary" (click)="myClick()">Save</button>
|
||||
<button mat-button mat-dialog-close>Cancel</button>
|
||||
</mat-dialog-actions>
|
||||
|
||||
|
||||
@ -0,0 +1,25 @@
|
||||
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
|
||||
import { QcReviewComponent } from './qc-review.component';
|
||||
|
||||
describe('QcReviewComponent', () => {
|
||||
let component: QcReviewComponent;
|
||||
let fixture: ComponentFixture<QcReviewComponent>;
|
||||
|
||||
beforeEach(async(() => {
|
||||
TestBed.configureTestingModule({
|
||||
declarations: [ QcReviewComponent ]
|
||||
})
|
||||
.compileComponents();
|
||||
}));
|
||||
|
||||
beforeEach(() => {
|
||||
fixture = TestBed.createComponent(QcReviewComponent);
|
||||
component = fixture.componentInstance;
|
||||
fixture.detectChanges();
|
||||
});
|
||||
|
||||
it('should create', () => {
|
||||
expect(component).toBeTruthy();
|
||||
});
|
||||
});
|
||||
@ -0,0 +1,87 @@
|
||||
import { Component, OnInit, ViewChild , Input, Inject} from '@angular/core';
|
||||
import { FormGroup, FormBuilder, Validators } from '@angular/forms';
|
||||
import { PdTrigerService } from '../../../../pd-service/pd-triger.service';
|
||||
import { NotifierService } from "angular-notifier";
|
||||
|
||||
|
||||
import {
|
||||
MatDialog,
|
||||
MatDialogRef,
|
||||
MAT_DIALOG_DATA
|
||||
} from '@angular/material';
|
||||
|
||||
@Component({
|
||||
selector: 'app-qc-review',
|
||||
templateUrl: './qc-review.component.html',
|
||||
styleUrls: ['./qc-review.component.scss']
|
||||
})
|
||||
export class QcReviewComponent implements OnInit {
|
||||
|
||||
@Input() questionId: number;
|
||||
ngForm: FormGroup;
|
||||
recordData: any;
|
||||
showForm: Boolean;
|
||||
/**
|
||||
* Notifier service
|
||||
*/
|
||||
private notifier: NotifierService;
|
||||
constructor( private _formBuilder: FormBuilder,
|
||||
private pdTrigerService: PdTrigerService,
|
||||
notifier: NotifierService ,
|
||||
private dialogRef: MatDialogRef<QcReviewComponent>,
|
||||
@Inject(MAT_DIALOG_DATA) public data: any) {
|
||||
this.notifier = notifier;
|
||||
|
||||
// this.mycontent = `<p>My html content</p>`;
|
||||
}
|
||||
|
||||
ngOnInit() {
|
||||
this.getQcCompleteReviewStatus();
|
||||
}
|
||||
|
||||
getQcCompleteReviewStatus() {
|
||||
this.pdTrigerService.getQCReportFinalReviewDetails(this.data.startId, "QC").subscribe(data => {
|
||||
if(data['dataStatus']){
|
||||
this.recordData = data.records[0];
|
||||
this.ngForm = this._formBuilder.group({
|
||||
qc_remarks: [this.recordData.qc_remarks],
|
||||
qc_rating: [Number(this.recordData.qc_rating)],
|
||||
pd_status: [this.recordData.pd_status],
|
||||
})
|
||||
this.showForm = true;
|
||||
}
|
||||
},err => {
|
||||
|
||||
});
|
||||
}
|
||||
|
||||
onChange($event: any): void {
|
||||
console.log('onChange');
|
||||
// this.log += new Date() + "<br />";
|
||||
}
|
||||
|
||||
myClick(): void {
|
||||
let template = this.ngForm.value;
|
||||
template.pd_id = this.data.startId;
|
||||
console.log(JSON.stringify(template));
|
||||
this.pdTrigerService.pdReviewStatusUpdate(template).subscribe(data=>{
|
||||
this.notifier.notify('success', 'Your Changes Updated.!');
|
||||
this.dialogRef.close();
|
||||
}, err => {
|
||||
this.notifier.notify('warning', 'Something Wents Wrong Try Again.!');
|
||||
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
|
||||
// =============================
|
||||
|
||||
ratingClicked: number;
|
||||
itemIdRatingClicked: string;
|
||||
rating : number = 1;
|
||||
|
||||
ratingComponentClick(e){
|
||||
this.ngForm.controls.qc_rating.setValue(e.rating);
|
||||
}
|
||||
}
|
||||
@ -249,10 +249,10 @@
|
||||
<mat-select formControlName="area_of_sale" placeholder="Area of Sale" (selectionChange)="changeManufacturingAreaSale(manufacturing,m)" required>
|
||||
<mat-option value="Within India">Within India</mat-option>
|
||||
<mat-option value="Export">Export</mat-option>
|
||||
<!-- <mat-option value="Both">Both</mat-option> -->
|
||||
<mat-option value="Both">Both</mat-option>
|
||||
</mat-select>
|
||||
</mat-form-field>
|
||||
<ng-container *ngIf="manufacturing.value.india_where_sale_done !=undefined">
|
||||
<ng-container *ngIf="manufacturing.value.india_where_sale_done !=undefined && manufacturing.value.countries_where_export_done ==undefined">
|
||||
<div formArrayName="india_where_sale_done">
|
||||
<div fxLayout="row nowrap" *ngFor="let saleList of manufacturing.get('india_where_sale_done').controls; let s = index" [formGroupName]="s">
|
||||
|
||||
@ -283,7 +283,7 @@
|
||||
</div>
|
||||
</ng-container>
|
||||
|
||||
<ng-container *ngIf="manufacturing.value.countries_where_export_done !=undefined">
|
||||
<ng-container *ngIf="manufacturing.value.countries_where_export_done !=undefined && manufacturing.value.india_where_sale_done ==undefined">
|
||||
<div formArrayName="countries_where_export_done">
|
||||
<div fxLayout="row nowrap" *ngFor="let countryList of manufacturing.get('countries_where_export_done').controls; let c = index" [formGroupName]="c">
|
||||
|
||||
@ -305,6 +305,58 @@
|
||||
</div>
|
||||
</div>
|
||||
</ng-container>
|
||||
<ng-container *ngIf="manufacturing.value.countries_where_export_done !=undefined && manufacturing.value.india_where_sale_done !=undefined">
|
||||
|
||||
<mat-tab-group>
|
||||
<mat-tab label="Within India" formArrayName="india_where_sale_done">
|
||||
|
||||
<div fxLayout="row nowrap" class="tab_class" *ngFor="let saleList of manufacturing.get('india_where_sale_done').controls; let s = index" [formGroupName]="s">
|
||||
<mat-form-field style="width:35%;">
|
||||
<mat-select placeholder="State" formControlName="state_name" required>
|
||||
<mat-option *ngFor="let SL of stateList" [value]="SL.state_id">
|
||||
{{SL.state_name}}
|
||||
</mat-option>
|
||||
</mat-select>
|
||||
</mat-form-field>
|
||||
<mat-form-field style="width:45%;">
|
||||
<mat-select multiple formControlName="city_name" placeholder="City" required>
|
||||
<mat-option *ngFor="let CL of filterCity(stateList,saleList.value.state_name)" [value]="CL.city_id">{{CL.city_name}}</mat-option>
|
||||
|
||||
</mat-select>
|
||||
</mat-form-field>
|
||||
|
||||
<button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button (click)="addMoreState(m,'1')" *ngIf="s==0"
|
||||
matTooltip="Add More State" matTooltipPosition="right" color="primary">
|
||||
<mat-icon>add</mat-icon>
|
||||
</button>
|
||||
<button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button (click)="removeState(m,s,'1')" *ngIf="s>0"
|
||||
matTooltip="Remove State" matTooltipPosition="right">
|
||||
<mat-icon>delete</mat-icon>
|
||||
</button>
|
||||
</div>
|
||||
</mat-tab>
|
||||
<mat-tab label="Export" formArrayName="countries_where_export_done">
|
||||
<div fxLayout="row nowrap" class="tab_class" *ngFor="let countryList of manufacturing.get('countries_where_export_done').controls; let c = index" [formGroupName]="c">
|
||||
<mat-form-field style="width:35%;">
|
||||
<input matInput placeholder="Countries Where The Export Is Being Done" formControlName="country_name" >
|
||||
</mat-form-field>
|
||||
<mat-form-field style="width:45%;">
|
||||
<input matInput placeholder="Approx % of Sale" formControlName="approx_sale" required>
|
||||
</mat-form-field>
|
||||
|
||||
<button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button (click)="addMoreState(m,'2')" *ngIf="c==0"
|
||||
matTooltip="Add More Country" matTooltipPosition="right" color="primary">
|
||||
<mat-icon>add</mat-icon>
|
||||
</button>
|
||||
<button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button (click)="removeState(m,c,'2')" *ngIf="c>0"
|
||||
matTooltip="Remove Country" matTooltipPosition="right">
|
||||
<mat-icon>delete</mat-icon>
|
||||
</button>
|
||||
</div>
|
||||
</mat-tab>
|
||||
</mat-tab-group>
|
||||
|
||||
</ng-container>
|
||||
|
||||
</mat-card-content>
|
||||
<mat-card-actions>
|
||||
@ -337,10 +389,10 @@
|
||||
<mat-select formControlName="area_of_sale" placeholder="Area of Sale" (selectionChange)="changeRetailAreaSale(retail,r)" required>
|
||||
<mat-option value="Within India">Within India</mat-option>
|
||||
<mat-option value="Export">Export</mat-option>
|
||||
<!-- <mat-option value="Both">Both</mat-option> -->
|
||||
<mat-option value="Both">Both</mat-option>
|
||||
</mat-select>
|
||||
</mat-form-field>
|
||||
<ng-container *ngIf="retail.value.india_where_sale_done !=undefined">
|
||||
<ng-container *ngIf="retail.value.india_where_sale_done !=undefined && retail.value.countries_where_export_done ==undefined">
|
||||
<div formArrayName="india_where_sale_done">
|
||||
<div fxLayout="row nowrap" *ngFor="let saleList of retail.get('india_where_sale_done').controls; let s = index" [formGroupName]="s">
|
||||
|
||||
@ -371,7 +423,7 @@
|
||||
</div>
|
||||
</ng-container>
|
||||
|
||||
<ng-container *ngIf="retail.value.countries_where_export_done !=undefined">
|
||||
<ng-container *ngIf="retail.value.india_where_sale_done ==undefined && retail.value.countries_where_export_done !=undefined">
|
||||
<div formArrayName="countries_where_export_done">
|
||||
<div fxLayout="row nowrap" *ngFor="let countryList of retail.get('countries_where_export_done').controls; let c = index" [formGroupName]="c">
|
||||
|
||||
@ -394,6 +446,59 @@
|
||||
</div>
|
||||
</ng-container>
|
||||
|
||||
<ng-container *ngIf="retail.value.countries_where_export_done !=undefined && retail.value.india_where_sale_done !=undefined">
|
||||
|
||||
<mat-tab-group>
|
||||
<mat-tab label="Within India" formArrayName="india_where_sale_done">
|
||||
|
||||
<div fxLayout="row nowrap" class="tab_class" *ngFor="let saleList of retail.get('india_where_sale_done').controls; let s = index" [formGroupName]="s">
|
||||
<mat-form-field style="width:35%;">
|
||||
<mat-select placeholder="State" formControlName="state_name" required>
|
||||
<mat-option *ngFor="let SL of stateList" [value]="SL.state_id">
|
||||
{{SL.state_name}}
|
||||
</mat-option>
|
||||
</mat-select>
|
||||
</mat-form-field>
|
||||
<mat-form-field style="width:45%;">
|
||||
<mat-select multiple formControlName="city_name" placeholder="City" required>
|
||||
<mat-option *ngFor="let CL of filterCity(stateList,saleList.value.state_name)" [value]="CL.city_id">{{CL.city_name}}</mat-option>
|
||||
|
||||
</mat-select>
|
||||
</mat-form-field>
|
||||
|
||||
<button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button (click)="addRetailMoreState(r,'1')" *ngIf="s==0"
|
||||
matTooltip="Add More State" matTooltipPosition="right" color="primary">
|
||||
<mat-icon>add</mat-icon>
|
||||
</button>
|
||||
<button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button (click)="removeRetailState(r,s,'1')" *ngIf="s>0"
|
||||
matTooltip="Remove State" matTooltipPosition="right">
|
||||
<mat-icon>delete</mat-icon>
|
||||
</button>
|
||||
</div>
|
||||
</mat-tab>
|
||||
<mat-tab label="Export" formArrayName="countries_where_export_done">
|
||||
<div fxLayout="row nowrap" class="tab_class" *ngFor="let countryList of retail.get('countries_where_export_done').controls; let c = index" [formGroupName]="c">
|
||||
<mat-form-field style="width:35%;">
|
||||
<input matInput placeholder="Countries Where The Export Is Being Done" formControlName="country_name" >
|
||||
</mat-form-field>
|
||||
<mat-form-field style="width:45%;">
|
||||
<input matInput placeholder="Approx % of Sale" formControlName="approx_sale" required>
|
||||
</mat-form-field>
|
||||
|
||||
<button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button (click)="addRetailMoreState(r,'2')" *ngIf="c==0"
|
||||
matTooltip="Add More Country" matTooltipPosition="right" color="primary">
|
||||
<mat-icon>add</mat-icon>
|
||||
</button>
|
||||
<button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button (click)="removeRetailState(r,c,'2')" *ngIf="c>0"
|
||||
matTooltip="Remove Country" matTooltipPosition="right">
|
||||
<mat-icon>delete</mat-icon>
|
||||
</button>
|
||||
</div>
|
||||
</mat-tab>
|
||||
</mat-tab-group>
|
||||
|
||||
</ng-container>
|
||||
|
||||
</mat-card-content>
|
||||
<mat-card-actions>
|
||||
<mat-form-field style="width: 92%">
|
||||
@ -425,10 +530,10 @@
|
||||
<mat-select formControlName="area_of_sale" placeholder="Area of Sale" (selectionChange)="changeWholesaleAreaSale(wholesale,w)" required>
|
||||
<mat-option value="Within India">Within India</mat-option>
|
||||
<mat-option value="Export">Export</mat-option>
|
||||
<!-- <mat-option value="Both">Both</mat-option> -->
|
||||
<mat-option value="Both">Both</mat-option>
|
||||
</mat-select>
|
||||
</mat-form-field>
|
||||
<ng-container *ngIf="wholesale.value.india_where_sale_done !=undefined">
|
||||
<ng-container *ngIf="wholesale.value.india_where_sale_done !=undefined && wholesale.value.countries_where_export_done ==undefined">
|
||||
<div formArrayName="india_where_sale_done">
|
||||
<div fxLayout="row nowrap" *ngFor="let saleList of wholesale.get('india_where_sale_done').controls; let s = index" [formGroupName]="s">
|
||||
|
||||
@ -459,7 +564,7 @@
|
||||
</div>
|
||||
</ng-container>
|
||||
|
||||
<ng-container *ngIf="wholesale.value.countries_where_export_done !=undefined">
|
||||
<ng-container *ngIf="wholesale.value.india_where_sale_done ==undefined && wholesale.value.countries_where_export_done !=undefined">
|
||||
<div formArrayName="countries_where_export_done">
|
||||
<div fxLayout="row nowrap" *ngFor="let countryList of wholesale.get('countries_where_export_done').controls; let c = index" [formGroupName]="c">
|
||||
|
||||
@ -481,6 +586,58 @@
|
||||
</div>
|
||||
</div>
|
||||
</ng-container>
|
||||
<ng-container *ngIf="wholesale.value.countries_where_export_done !=undefined && wholesale.value.india_where_sale_done !=undefined">
|
||||
|
||||
<mat-tab-group>
|
||||
<mat-tab label="Within India" formArrayName="india_where_sale_done">
|
||||
|
||||
<div fxLayout="row nowrap" class="tab_class" *ngFor="let saleList of wholesale.get('india_where_sale_done').controls; let s = index" [formGroupName]="s">
|
||||
<mat-form-field style="width:35%;">
|
||||
<mat-select placeholder="State" formControlName="state_name" required>
|
||||
<mat-option *ngFor="let SL of stateList" [value]="SL.state_id">
|
||||
{{SL.state_name}}
|
||||
</mat-option>
|
||||
</mat-select>
|
||||
</mat-form-field>
|
||||
<mat-form-field style="width:45%;">
|
||||
<mat-select multiple formControlName="city_name" placeholder="City" required>
|
||||
<mat-option *ngFor="let CL of filterCity(stateList,saleList.value.state_name)" [value]="CL.city_id">{{CL.city_name}}</mat-option>
|
||||
|
||||
</mat-select>
|
||||
</mat-form-field>
|
||||
|
||||
<button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button (click)="addWholesaleMoreState(w,'1')" *ngIf="s==0"
|
||||
matTooltip="Add More State" matTooltipPosition="right" color="primary">
|
||||
<mat-icon>add</mat-icon>
|
||||
</button>
|
||||
<button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button (click)="removeWholesaleState(w,s,'1')" *ngIf="s>0"
|
||||
matTooltip="Remove State" matTooltipPosition="right">
|
||||
<mat-icon>delete</mat-icon>
|
||||
</button>
|
||||
</div>
|
||||
</mat-tab>
|
||||
<mat-tab label="Export" formArrayName="countries_where_export_done">
|
||||
<div fxLayout="row nowrap" class="tab_class" *ngFor="let countryList of wholesale.get('countries_where_export_done').controls; let c = index" [formGroupName]="c">
|
||||
<mat-form-field style="width:35%;">
|
||||
<input matInput placeholder="Countries Where The Export Is Being Done" formControlName="country_name" >
|
||||
</mat-form-field>
|
||||
<mat-form-field style="width:45%;">
|
||||
<input matInput placeholder="Approx % of Sale" formControlName="approx_sale" required>
|
||||
</mat-form-field>
|
||||
|
||||
<button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button (click)="addWholesaleMoreState(w,'2')" *ngIf="c==0"
|
||||
matTooltip="Add More Country" matTooltipPosition="right" color="primary">
|
||||
<mat-icon>add</mat-icon>
|
||||
</button>
|
||||
<button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button (click)="removeWholesaleState(w,c,'2')" *ngIf="c>0"
|
||||
matTooltip="Remove Country" matTooltipPosition="right">
|
||||
<mat-icon>delete</mat-icon>
|
||||
</button>
|
||||
</div>
|
||||
</mat-tab>
|
||||
</mat-tab-group>
|
||||
|
||||
</ng-container>
|
||||
|
||||
</mat-card-content>
|
||||
<mat-card-actions>
|
||||
@ -513,10 +670,10 @@
|
||||
<mat-select formControlName="area_of_sale" placeholder="Area of Service" (selectionChange)="changeServiceArea(serviceprovider,sp)" required>
|
||||
<mat-option value="Within India">Within India</mat-option>
|
||||
<mat-option value="Export">Export</mat-option>
|
||||
<!-- <mat-option value="Both">Both</mat-option> -->
|
||||
<mat-option value="Both">Both</mat-option>
|
||||
</mat-select>
|
||||
</mat-form-field>
|
||||
<ng-container *ngIf="serviceprovider.value.india_where_sale_done !=undefined">
|
||||
<ng-container *ngIf="serviceprovider.value.india_where_sale_done !=undefined && serviceprovider.value.countries_where_export_done ==undefined">
|
||||
<div formArrayName="india_where_sale_done">
|
||||
<div fxLayout="row nowrap" *ngFor="let saleList of serviceprovider.get('india_where_sale_done').controls; let s = index" [formGroupName]="s">
|
||||
|
||||
@ -547,7 +704,7 @@
|
||||
</div>
|
||||
</ng-container>
|
||||
|
||||
<ng-container *ngIf="serviceprovider.value.countries_where_export_done !=undefined">
|
||||
<ng-container *ngIf="serviceprovider.value.countries_where_export_done !=undefined && serviceprovider.value.india_where_sale_done ==undefined">
|
||||
<div formArrayName="countries_where_export_done">
|
||||
<div fxLayout="row nowrap" *ngFor="let countryList of serviceprovider.get('countries_where_export_done').controls; let c = index" [formGroupName]="c">
|
||||
|
||||
@ -569,6 +726,59 @@
|
||||
</div>
|
||||
</div>
|
||||
</ng-container>
|
||||
<ng-container *ngIf="serviceprovider.value.countries_where_export_done !=undefined && serviceprovider.value.india_where_sale_done !=undefined">
|
||||
|
||||
<mat-tab-group>
|
||||
<mat-tab label="Within India" formArrayName="india_where_sale_done">
|
||||
|
||||
<div fxLayout="row nowrap" class="tab_class" *ngFor="let saleList of serviceprovider.get('india_where_sale_done').controls; let s = index" [formGroupName]="s">
|
||||
<mat-form-field style="width:35%;">
|
||||
<mat-select placeholder="Where, In India, Is The Service Provided" formControlName="state_name" required>
|
||||
<mat-option *ngFor="let SL of stateList" [value]="SL.state_id">
|
||||
{{SL.state_name}}
|
||||
</mat-option>
|
||||
</mat-select>
|
||||
</mat-form-field>
|
||||
<mat-form-field style="width:45%;">
|
||||
<mat-select multiple formControlName="city_name" placeholder="City" required>
|
||||
<mat-option *ngFor="let CL of filterCity(stateList,saleList.value.state_name)" [value]="CL.city_id">{{CL.city_name}}</mat-option>
|
||||
|
||||
</mat-select>
|
||||
</mat-form-field>
|
||||
|
||||
|
||||
<button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button (click)="addServiceMoreState(sp,'1')" *ngIf="s==0"
|
||||
matTooltip="Add More State" matTooltipPosition="right" color="primary">
|
||||
<mat-icon>add</mat-icon>
|
||||
</button>
|
||||
<button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button (click)="removeServiceState(sp,s,'1')" *ngIf="s>0"
|
||||
matTooltip="Remove State" matTooltipPosition="right">
|
||||
<mat-icon>delete</mat-icon>
|
||||
</button>
|
||||
</div>
|
||||
</mat-tab>
|
||||
<mat-tab label="Export" formArrayName="countries_where_export_done">
|
||||
<div fxLayout="row nowrap" class="tab_class" *ngFor="let countryList of serviceprovider.get('countries_where_export_done').controls; let c = index" [formGroupName]="c">
|
||||
<mat-form-field style="width:35%;">
|
||||
<input matInput placeholder="Countries Where Services Are Being Exported" formControlName="country_name" >
|
||||
</mat-form-field>
|
||||
<mat-form-field style="width:45%;">
|
||||
<input matInput placeholder="Approx % of Sale" formControlName="approx_sale" required>
|
||||
</mat-form-field>
|
||||
|
||||
<button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button (click)="addServiceMoreState(sp,'2')" *ngIf="c==0"
|
||||
matTooltip="Add More Country" matTooltipPosition="right" color="primary">
|
||||
<mat-icon>add</mat-icon>
|
||||
</button>
|
||||
<button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button (click)="removeServiceState(sp,c,'2')" *ngIf="c>0"
|
||||
matTooltip="Remove Country" matTooltipPosition="right">
|
||||
<mat-icon>delete</mat-icon>
|
||||
</button>
|
||||
</div>
|
||||
</mat-tab>
|
||||
</mat-tab-group>
|
||||
|
||||
</ng-container>
|
||||
|
||||
</mat-card-content>
|
||||
<mat-card-actions>
|
||||
|
||||
@ -132,4 +132,7 @@ mat-header-cell mat-cell {
|
||||
.example-margin {
|
||||
margin: 0 10px;
|
||||
}
|
||||
.tab_class {
|
||||
margin-top: 3%;
|
||||
}
|
||||
|
||||
|
||||
@ -247,6 +247,19 @@ export class BusinessInfoComponent implements OnInit {
|
||||
innercontrol.push(this.createCountrySale())
|
||||
});
|
||||
}
|
||||
else if(element.area_of_sale=='Both'){
|
||||
manufacturingControl.controls[index].addControl('india_where_sale_done', this.fb.array([]));
|
||||
element.india_where_sale_done.forEach((innerElement,innerIndex) => {
|
||||
let innercontrol:any = manufacturingControl.controls[index].get('india_where_sale_done') as FormArray;
|
||||
innercontrol.push(this.createStateSale())
|
||||
});
|
||||
manufacturingControl.controls[index].addControl('countries_where_export_done', this.fb.array([]));
|
||||
element.countries_where_export_done.forEach((innerElement,innerIndex) => {
|
||||
let innercontrol:any = manufacturingControl.controls[index].get('countries_where_export_done') as FormArray;
|
||||
innercontrol.push(this.createCountrySale())
|
||||
});
|
||||
|
||||
}
|
||||
});
|
||||
businessVal.manufacturing_activity_details=selectedManufacturing;
|
||||
}
|
||||
@ -280,6 +293,18 @@ export class BusinessInfoComponent implements OnInit {
|
||||
innercontrol.push(this.createCountrySale())
|
||||
});
|
||||
}
|
||||
else if(element.area_of_sale=='Both'){
|
||||
retailControl.controls[index].addControl('india_where_sale_done', this.fb.array([]));
|
||||
element.india_where_sale_done.forEach((innerElement,innerIndex) => {
|
||||
let innercontrol:any = retailControl.controls[index].get('india_where_sale_done') as FormArray;
|
||||
innercontrol.push(this.createStateSale())
|
||||
});
|
||||
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;
|
||||
innercontrol.push(this.createCountrySale())
|
||||
});
|
||||
}
|
||||
});
|
||||
businessVal.retail_trading_activity_details=selectedRetail;
|
||||
}
|
||||
@ -314,6 +339,19 @@ export class BusinessInfoComponent implements OnInit {
|
||||
innercontrol.push(this.createCountrySale())
|
||||
});
|
||||
}
|
||||
else if(element.area_of_sale=='Both'){
|
||||
wholesaleControl.controls[index].addControl('india_where_sale_done', this.fb.array([]));
|
||||
element.india_where_sale_done.forEach((innerElement,innerIndex) => {
|
||||
let innercontrol:any = wholesaleControl.controls[index].get('india_where_sale_done') as FormArray;
|
||||
innercontrol.push(this.createStateSale())
|
||||
});
|
||||
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;
|
||||
innercontrol.push(this.createCountrySale())
|
||||
});
|
||||
}
|
||||
|
||||
});
|
||||
businessVal.wholesale_trading_activity_details=selectedWholesale;
|
||||
}
|
||||
@ -348,6 +386,18 @@ export class BusinessInfoComponent implements OnInit {
|
||||
innercontrol.push(this.createCountrySale())
|
||||
});
|
||||
}
|
||||
else if(element.area_of_sale=='Both'){
|
||||
serviceProviderControl.controls[index].addControl('india_where_sale_done', this.fb.array([]));
|
||||
element.india_where_sale_done.forEach((innerElement,innerIndex) => {
|
||||
let innercontrol:any = serviceProviderControl.controls[index].get('india_where_sale_done') as FormArray;
|
||||
innercontrol.push(this.createStateSale())
|
||||
});
|
||||
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;
|
||||
innercontrol.push(this.createCountrySale())
|
||||
});
|
||||
}
|
||||
});
|
||||
businessVal.service_provider_activity_details=selectedService;
|
||||
}
|
||||
@ -566,12 +616,20 @@ export class BusinessInfoComponent implements OnInit {
|
||||
|
||||
if(getDetails.value.area_of_sale=="Within India"){
|
||||
control.controls[getIndex].removeControl('countries_where_export_done');
|
||||
control.controls[getIndex].removeControl('india_where_sale_done');
|
||||
control.controls[getIndex].addControl('india_where_sale_done', this.fb.array([this.createStateSale()]));
|
||||
}
|
||||
else if(getDetails.value.area_of_sale=="Export"){
|
||||
control.controls[getIndex].removeControl('countries_where_export_done');
|
||||
control.controls[getIndex].removeControl('india_where_sale_done');
|
||||
control.controls[getIndex].addControl('countries_where_export_done', this.fb.array([this.createCountrySale()]));
|
||||
}
|
||||
else if(getDetails.value.area_of_sale=="Both") {
|
||||
control.controls[getIndex].removeControl('india_where_sale_done');
|
||||
control.controls[getIndex].removeControl('countries_where_export_done');
|
||||
control.controls[getIndex].addControl('india_where_sale_done', this.fb.array([this.createStateSale()]));
|
||||
control.controls[getIndex].addControl('countries_where_export_done', this.fb.array([this.createCountrySale()]));
|
||||
}
|
||||
}
|
||||
|
||||
// change retail options
|
||||
@ -580,10 +638,18 @@ export class BusinessInfoComponent implements OnInit {
|
||||
|
||||
if(getDetails.value.area_of_sale=="Within India"){
|
||||
control.controls[getIndex].removeControl('countries_where_export_done');
|
||||
control.controls[getIndex].removeControl('india_where_sale_done');
|
||||
control.controls[getIndex].addControl('india_where_sale_done', this.fb.array([this.createStateSale()]));
|
||||
}
|
||||
else if(getDetails.value.area_of_sale=="Export"){
|
||||
control.controls[getIndex].removeControl('countries_where_export_done');
|
||||
control.controls[getIndex].removeControl('india_where_sale_done');
|
||||
control.controls[getIndex].addControl('countries_where_export_done', this.fb.array([this.createCountrySale()]));
|
||||
}
|
||||
else if(getDetails.value.area_of_sale=="Both"){
|
||||
control.controls[getIndex].removeControl('countries_where_export_done');
|
||||
control.controls[getIndex].removeControl('india_where_sale_done');
|
||||
control.controls[getIndex].addControl('india_where_sale_done', this.fb.array([this.createStateSale()]));
|
||||
control.controls[getIndex].addControl('countries_where_export_done', this.fb.array([this.createCountrySale()]));
|
||||
}
|
||||
}
|
||||
@ -594,12 +660,20 @@ export class BusinessInfoComponent implements OnInit {
|
||||
|
||||
if(getDetails.value.area_of_sale=="Within India"){
|
||||
control.controls[getIndex].removeControl('countries_where_export_done');
|
||||
control.controls[getIndex].removeControl('india_where_sale_done');
|
||||
control.controls[getIndex].addControl('india_where_sale_done', this.fb.array([this.createStateSale()]));
|
||||
}
|
||||
else if(getDetails.value.area_of_sale=="Export"){
|
||||
control.controls[getIndex].removeControl('countries_where_export_done');
|
||||
control.controls[getIndex].removeControl('india_where_sale_done');
|
||||
control.controls[getIndex].addControl('countries_where_export_done', this.fb.array([this.createCountrySale()]));
|
||||
}
|
||||
else if(getDetails.value.area_of_sale=="Both"){
|
||||
control.controls[getIndex].removeControl('countries_where_export_done');
|
||||
control.controls[getIndex].removeControl('india_where_sale_done');
|
||||
control.controls[getIndex].addControl('india_where_sale_done', this.fb.array([this.createStateSale()]));
|
||||
control.controls[getIndex].addControl('countries_where_export_done', this.fb.array([this.createCountrySale()]));
|
||||
}
|
||||
}
|
||||
// change service provider
|
||||
changeServiceArea(getDetails: any, getIndex) {
|
||||
@ -607,11 +681,19 @@ export class BusinessInfoComponent implements OnInit {
|
||||
|
||||
if(getDetails.value.area_of_sale=="Within India"){
|
||||
control.controls[getIndex].removeControl('countries_where_export_done');
|
||||
control.controls[getIndex].removeControl('india_where_sale_done');
|
||||
control.controls[getIndex].addControl('india_where_sale_done', this.fb.array([this.createStateSale()]));
|
||||
}
|
||||
else if(getDetails.value.area_of_sale=="Export"){
|
||||
control.controls[getIndex].removeControl('countries_where_export_done');
|
||||
control.controls[getIndex].removeControl('india_where_sale_done');
|
||||
control.controls[getIndex].addControl('india_where_sale_done', this.fb.array([this.createCountrySale()]));
|
||||
control.controls[getIndex].addControl('countries_where_export_done', this.fb.array([this.createCountrySale()]));
|
||||
}
|
||||
else if(getDetails.value.area_of_sale=="Both"){
|
||||
control.controls[getIndex].removeControl('countries_where_export_done');
|
||||
control.controls[getIndex].removeControl('india_where_sale_done');
|
||||
control.controls[getIndex].addControl('india_where_sale_done', this.fb.array([this.createStateSale()]));
|
||||
control.controls[getIndex].addControl('countries_where_export_done', this.fb.array([this.createCountrySale()]));
|
||||
}
|
||||
}
|
||||
|
||||
@ -715,6 +797,7 @@ export class BusinessInfoComponent implements OnInit {
|
||||
control = control.controls[windex].get('countries_where_export_done') as FormArray;
|
||||
control.push(this.createCountrySale())
|
||||
}
|
||||
|
||||
}
|
||||
// remove for whole sale
|
||||
removeWholesaleState(mindex,sindex,type) {
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
|
||||
</mat-dialog-content>
|
||||
<mat-dialog-actions align="end">
|
||||
<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Save" matTooltipPosition="above" (click)="addMoreApplicant()"><mat-icon>add</mat-icon></button>
|
||||
<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Save" matTooltipPosition="above" (click)="saveApplicant(_OtherForm.value)"><mat-icon>save</mat-icon></button>
|
||||
<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Add More" matTooltipPosition="above" (click)="addMoreApplicant()"><mat-icon>add</mat-icon></button>
|
||||
<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Add List" matTooltipPosition="above" (click)="saveApplicant(_OtherForm.value)"><mat-icon>save</mat-icon></button>
|
||||
</mat-dialog-actions>
|
||||
|
||||
@ -15,12 +15,14 @@
|
||||
</mat-card-header>
|
||||
<mat-card-content>
|
||||
<div fxLayout="row wrap" class="example-section" formArrayName="applicant_list">
|
||||
<div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="25" fxFlex.lg="25" fxFlex.xl="25" *ngFor="let applicant of _generalForm.controls.applicant_list['controls']; let c = index;" [formGroupName]="c">
|
||||
<div fxFlex.xs="100" fxFlex.sm="50" fxFlex.md="25" fxFlex.lg="25" fxFlex.xl="25" *ngFor="let applicant of _generalForm.controls.applicant_list['controls']; let c = index;" [formGroupName]="c">
|
||||
<mat-checkbox class="example-margin" color="primary" formControlName="exist_status" (change)="checkboxChange($event, c, applicant.controls)">{{applicant.controls.applicant_name.value}}</mat-checkbox>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</mat-card-content>
|
||||
<mat-card-actions align="end">
|
||||
<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Add Other Applicant" matTooltipPosition="above" color="primary" (click)="addOtherApplicant()"><mat-icon>add</mat-icon></button>
|
||||
</mat-card-actions>
|
||||
</mat-card>
|
||||
|
||||
<mat-card>
|
||||
|
||||
@ -3,7 +3,7 @@ import { FormBuilder, FormGroup, Validators, FormControl, FormArray } from '@ang
|
||||
import { MatDialog, MatDialogRef, MAT_DIALOG_DATA , DialogPosition} from '@angular/material';
|
||||
import { NotifierService } from 'angular-notifier';
|
||||
import { PdTrigerService } from './../../../../../pd-service/pd-triger.service';
|
||||
import {OtherApplicantDetailsComponent} from './../other-applicant-details/other-applicant-details.component';
|
||||
import {OtherApplicantDetailsComponent} from './../dialogue/other-applicant-details/other-applicant-details.component';
|
||||
@Component({
|
||||
selector: 'app-general-info',
|
||||
templateUrl: './general-info.component.html',
|
||||
@ -27,7 +27,7 @@ export class GeneralInfoComponent implements OnInit {
|
||||
this.form_id = 18;
|
||||
this.pd_applicants_details = this.pd_all_details.pdapplicants_detials;
|
||||
// push Other options to applicant details
|
||||
this.pd_applicants_details.push({'pd_co_applicant_id':"0",'applicant_name':'Others', });
|
||||
// this.pd_applicants_details.push({'pd_co_applicant_id':"0",'applicant_name':'Others', });
|
||||
}
|
||||
|
||||
ngOnInit() {
|
||||
@ -147,37 +147,11 @@ export class GeneralInfoComponent implements OnInit {
|
||||
// checkand un check function
|
||||
checkboxChange(event, index, item) {
|
||||
if(item.exist_status.value){
|
||||
if(item.pd_co_applicant_id.value==0){
|
||||
const dialogRef = this.dialog.open(OtherApplicantDetailsComponent, {
|
||||
data: '',
|
||||
width:'40%',
|
||||
disableClose: true
|
||||
});
|
||||
dialogRef.afterClosed()
|
||||
.subscribe(dataresult => {
|
||||
if(dataresult.data.length>0){
|
||||
let relationControl = <FormArray>this._generalForm.controls['applicant_relation'];
|
||||
dataresult.data.forEach(element => {
|
||||
let applicant_details: any= {'pd_co_applicant_id':element.pd_co_applicant_id,'applicant_name':element.applicant_name,'applicant_relation_to':'','relation':'','company_name':element.company_name,'company_relation':''};
|
||||
relationControl.push(this.createApplicantRelation(applicant_details));
|
||||
// push related to details
|
||||
this.fetch_related_details.push(element.applicant_name);
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
|
||||
// exist_status
|
||||
});
|
||||
|
||||
}
|
||||
else{
|
||||
let relationControl = <FormArray>this._generalForm.controls['applicant_relation'];
|
||||
let applicant_details: any= {'pd_co_applicant_id':item.pd_co_applicant_id.value,'applicant_name':item.applicant_name.value,'applicant_relation_to':'','relation':'','company_name':item.company_name.value,'company_relation':''};
|
||||
relationControl.push(this.createApplicantRelation(applicant_details));
|
||||
// push related to details
|
||||
this.fetch_related_details.push(item.applicant_name.value);
|
||||
}
|
||||
|
||||
}
|
||||
else {
|
||||
@ -192,6 +166,30 @@ export class GeneralInfoComponent implements OnInit {
|
||||
}
|
||||
}
|
||||
|
||||
// add more applicant details
|
||||
addOtherApplicant() {
|
||||
const dialogRef = this.dialog.open(OtherApplicantDetailsComponent, {
|
||||
data: '',
|
||||
width:'40%',
|
||||
disableClose: true
|
||||
});
|
||||
dialogRef.afterClosed()
|
||||
.subscribe(dataresult => {
|
||||
if(dataresult.data.length>0){
|
||||
let relationControl = <FormArray>this._generalForm.controls['applicant_relation'];
|
||||
dataresult.data.forEach(element => {
|
||||
let applicant_details: any= {'pd_co_applicant_id':element.pd_co_applicant_id,'applicant_name':element.applicant_name,'applicant_relation_to':'','relation':'','company_name':element.company_name,'company_relation':''};
|
||||
relationControl.push(this.createApplicantRelation(applicant_details));
|
||||
// push related to details
|
||||
this.fetch_related_details.push(element.applicant_name);
|
||||
});
|
||||
|
||||
}
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
|
||||
// remove other details
|
||||
removeOthers(index, item: any){
|
||||
console.log(item)
|
||||
|
||||
@ -79,7 +79,7 @@ import { AllocationViewMoreComponent } from './list-pd/allocation-view-more/allo
|
||||
import { PdRequirementComponent } from './list-pd/pd-requirement/pd-requirement.component';
|
||||
import { GeneralInfoComponent } from './list-pd/start-pd/forms/general-info/general-info.component';
|
||||
import { ModelEditPdReportComponent } from './list-pd/pd-report/model-edit-pd-report/model-edit-pd-report.component';
|
||||
import { OtherApplicantDetailsComponent } from './list-pd/start-pd/forms/other-applicant-details/other-applicant-details.component';
|
||||
import { OtherApplicantDetailsComponent } from './list-pd/start-pd/forms/dialogue/other-applicant-details/other-applicant-details.component';
|
||||
import { NeighbourHoodComponent } from './list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component';
|
||||
|
||||
// import ngx-viewer module
|
||||
@ -87,6 +87,8 @@ import { NgxViewerModule } from 'ngx-viewer';
|
||||
import { FinalRemarksComponent } from './list-pd/start-pd/forms/final-remarks/final-remarks.component';
|
||||
|
||||
import { BusinessOtherFamilyMemberComponent } from './list-pd/start-pd/forms/dialogue/business-other-family-member/business-other-family-member.component';
|
||||
import { QcReviewComponent } from './list-pd/pd-report/qc-review/qc-review.component';
|
||||
import { SharedModule } from "app/shared/shared.module";
|
||||
|
||||
/**
|
||||
* Custom angular notifier options
|
||||
@ -264,7 +266,7 @@ const pdCustomNotifierOptions: NotifierOptions = {
|
||||
// AgmCoreModule.forRoot({apiKey: 'AIzaSyBtdO5k6CRntAMJCF-H5uZjTCoSGX95cdk'}), OwlDateTimeModule,
|
||||
// OwlNativeDateTimeModule,
|
||||
// ],
|
||||
declarations: [RentalInfoComponent, TelePdAllocationComponent, FinancialInfoComponent, BusinessInfoComponent, EmploymentInfoComponent, StockComponent, BankingDetailsComponent, ListPdComponent, FamilyDetailsComponent, AddressComponent, ManagePdComponent, MapPdViewComponent, AddPdComponent, ViewPdComponent, PdAllocationComponent, SmartPdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, StartPdComponent, InprogressPdComponent, AllPdComponent, ScheduledPdComponent, CompletedPdComponent, QcCompletedPdComponent, ClientInfoComponent, CurrentLoanComponent, AssetsInfoComponent, LoanDetailsComponent, OtherIncomeComponent, SupplierInfoComponent, PersonalInfoComponent, LenderRepresentativeComponent, PdReportComponent, AssessedIncomeComponent, AllocationViewMoreComponent, PdRequirementComponent, GeneralInfoComponent, ModelEditPdReportComponent, OtherApplicantDetailsComponent, NeighbourHoodComponent, DialogChangeCurrentVenrsion, FinalRemarksComponent, BusinessOtherFamilyMemberComponent],
|
||||
declarations: [RentalInfoComponent, TelePdAllocationComponent, FinancialInfoComponent, BusinessInfoComponent, EmploymentInfoComponent, StockComponent, BankingDetailsComponent, ListPdComponent, FamilyDetailsComponent, AddressComponent, ManagePdComponent, MapPdViewComponent, AddPdComponent, ViewPdComponent, PdAllocationComponent, SmartPdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, StartPdComponent, InprogressPdComponent, AllPdComponent, ScheduledPdComponent, CompletedPdComponent, QcCompletedPdComponent, ClientInfoComponent, CurrentLoanComponent, AssetsInfoComponent, LoanDetailsComponent, OtherIncomeComponent, SupplierInfoComponent, PersonalInfoComponent, LenderRepresentativeComponent, PdReportComponent, AssessedIncomeComponent, AllocationViewMoreComponent, PdRequirementComponent, GeneralInfoComponent, ModelEditPdReportComponent, OtherApplicantDetailsComponent, NeighbourHoodComponent, DialogChangeCurrentVenrsion, FinalRemarksComponent, BusinessOtherFamilyMemberComponent, QcReviewComponent],
|
||||
|
||||
// exports: [PdAllocationComponent, SmartPdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, StartPdComponent, CompletedPdComponent, QcCompletedPdComponent],
|
||||
// providers: [PdTrigerService, GetGeometricLocationService],
|
||||
@ -273,6 +275,7 @@ const pdCustomNotifierOptions: NotifierOptions = {
|
||||
CommonModule,
|
||||
ManagePdRoutingModule,
|
||||
NgxViewerModule,
|
||||
SharedModule,
|
||||
NotifierModule.withConfig(pdCustomNotifierOptions),
|
||||
CKEditorModule,
|
||||
PdfViewerModule,
|
||||
@ -307,7 +310,7 @@ const pdCustomNotifierOptions: NotifierOptions = {
|
||||
{provide: MAT_DATE_FORMATS, useValue: MAT_MOMENT_DATE_FORMATS}],
|
||||
|
||||
entryComponents: [PdAllocationComponent, SmartPdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, TelePdAllocationComponent, AllocationViewMoreComponent, PersonalInfoComponent,
|
||||
ClientInfoComponent, SupplierInfoComponent, CurrentLoanComponent, LoanDetailsComponent, OtherIncomeComponent, AssetsInfoComponent, AddressComponent, FamilyDetailsComponent, BankingDetailsComponent, StockComponent, EmploymentInfoComponent, BusinessInfoComponent, FinancialInfoComponent, LenderRepresentativeComponent,RentalInfoComponent, AssessedIncomeComponent, GeneralInfoComponent, PdRequirementComponent, ModelEditPdReportComponent, OtherApplicantDetailsComponent, NeighbourHoodComponent, DialogChangeCurrentVenrsion, FinalRemarksComponent, BusinessOtherFamilyMemberComponent],
|
||||
ClientInfoComponent, SupplierInfoComponent, CurrentLoanComponent, LoanDetailsComponent, OtherIncomeComponent, AssetsInfoComponent, AddressComponent, FamilyDetailsComponent, BankingDetailsComponent, StockComponent, EmploymentInfoComponent, BusinessInfoComponent, FinancialInfoComponent, LenderRepresentativeComponent,RentalInfoComponent, AssessedIncomeComponent, GeneralInfoComponent, PdRequirementComponent, ModelEditPdReportComponent, OtherApplicantDetailsComponent, NeighbourHoodComponent, DialogChangeCurrentVenrsion, FinalRemarksComponent, BusinessOtherFamilyMemberComponent, QcReviewComponent],
|
||||
|
||||
})
|
||||
export class ManagePdModule {
|
||||
|
||||
@ -331,6 +331,23 @@ getTypeofActivityForSuppliedInfoForm(pd_id: any): Observable<any>{
|
||||
)
|
||||
}
|
||||
|
||||
getQCReportFinalReviewDetails(pd_id: any, flag : string ): Observable<any>{
|
||||
return this._http.post<any>(this.apiUrl+"getQCLenderRemarks", {"records": { "pd_id" : pd_id, "flag" :flag }})
|
||||
.pipe(
|
||||
catchError(this.handleError('operation', []))
|
||||
)
|
||||
}
|
||||
|
||||
// pd review status update details
|
||||
pdReviewStatusUpdate(editData: any): Observable<any> {
|
||||
editData.fk_updatedby = this._aws.getlocale();
|
||||
// editData.updatedon = currentdate;
|
||||
return this._http.post<any>(this.apiUrl + "updatePDMaster", {records: editData})
|
||||
|
||||
.pipe(
|
||||
catchError(this.handleError('operation', []))
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
// inWords(num) {
|
||||
|
||||
16
ng6-seed/src/app/shared/rating/rating.component.html
Normal file
16
ng6-seed/src/app/shared/rating/rating.component.html
Normal file
@ -0,0 +1,16 @@
|
||||
<fieldset class="rating">
|
||||
<input type="radio" [name]="inputName" value="5" [checked]="rating===5" />
|
||||
<label title="Rocks!" (click)='onClick(5)'>5 stars</label>
|
||||
|
||||
<input type="radio" [name]="inputName" value="4" [checked]="rating===4" />
|
||||
<label title="Pretty good" (click)='onClick(4)'>4 stars</label>
|
||||
|
||||
<input type="radio" [name]="inputName" value="3" [checked]="rating===3" />
|
||||
<label title="Meh" (click)='onClick(3)'>3 stars</label>
|
||||
|
||||
<input type="radio" [name]="inputName" value="2" [checked]="rating===2" />
|
||||
<label title="Kinda bad" (click)='onClick(2)'>2 stars</label>
|
||||
|
||||
<input type="radio" [name]="inputName" value="1" [checked]="rating===1" />
|
||||
<label title="Sucks big time" (click)='onClick(1)'>1 star</label>
|
||||
</fieldset>
|
||||
42
ng6-seed/src/app/shared/rating/rating.component.scss
Normal file
42
ng6-seed/src/app/shared/rating/rating.component.scss
Normal file
@ -0,0 +1,42 @@
|
||||
|
||||
.rating {
|
||||
float:left;
|
||||
}
|
||||
|
||||
.rating:not(:checked) > input {
|
||||
position:absolute;
|
||||
top:-9999px;
|
||||
clip:rect(0,0,0,0);
|
||||
}
|
||||
|
||||
.rating:not(:checked) > label {
|
||||
float:right;
|
||||
width:1em;
|
||||
padding:0.1em;
|
||||
overflow:hidden;
|
||||
white-space:nowrap;
|
||||
cursor:pointer;
|
||||
font-size:200%;
|
||||
line-height:1.2;
|
||||
color:#ddd;
|
||||
}
|
||||
|
||||
.rating:not(:checked) > label:before {
|
||||
content: '★ ';
|
||||
}
|
||||
|
||||
.rating > input:checked ~ label {
|
||||
color: #f70;
|
||||
}
|
||||
|
||||
.rating:not(:checked) > label:hover,
|
||||
.rating:not(:checked) > label:hover ~ label {
|
||||
color: gold;
|
||||
}
|
||||
|
||||
|
||||
.rating > input:checked ~ label:hover,
|
||||
.rating > input:checked ~ label:hover ~ label,
|
||||
.rating > label:hover ~ input:checked ~ label {
|
||||
color: #ea0;
|
||||
}
|
||||
25
ng6-seed/src/app/shared/rating/rating.component.spec.ts
Normal file
25
ng6-seed/src/app/shared/rating/rating.component.spec.ts
Normal file
@ -0,0 +1,25 @@
|
||||
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
|
||||
import { RatingComponent } from './rating.component';
|
||||
|
||||
describe('RatingComponent', () => {
|
||||
let component: RatingComponent;
|
||||
let fixture: ComponentFixture<RatingComponent>;
|
||||
|
||||
beforeEach(async(() => {
|
||||
TestBed.configureTestingModule({
|
||||
declarations: [ RatingComponent ]
|
||||
})
|
||||
.compileComponents();
|
||||
}));
|
||||
|
||||
beforeEach(() => {
|
||||
fixture = TestBed.createComponent(RatingComponent);
|
||||
component = fixture.componentInstance;
|
||||
fixture.detectChanges();
|
||||
});
|
||||
|
||||
it('should create', () => {
|
||||
expect(component).toBeTruthy();
|
||||
});
|
||||
});
|
||||
25
ng6-seed/src/app/shared/rating/rating.component.ts
Normal file
25
ng6-seed/src/app/shared/rating/rating.component.ts
Normal file
@ -0,0 +1,25 @@
|
||||
import { Component, Input, Output, EventEmitter, OnInit } from '@angular/core';
|
||||
|
||||
@Component({
|
||||
selector: 'app-rating',
|
||||
templateUrl: './rating.component.html',
|
||||
styleUrls: ['./rating.component.scss']
|
||||
})
|
||||
export class RatingComponent implements OnInit {
|
||||
@Input() rating: number;
|
||||
@Input() itemId: number;
|
||||
@Output() ratingClick: EventEmitter<any> = new EventEmitter<any>();
|
||||
|
||||
inputName: string;
|
||||
ngOnInit() {
|
||||
this.inputName = this.itemId + '_rating';
|
||||
}
|
||||
onClick(rating: number): void {
|
||||
this.rating = rating;
|
||||
this.ratingClick.emit({
|
||||
itemId: this.itemId,
|
||||
rating: rating
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
@ -4,19 +4,22 @@ import { MenuItems } from './menu-items/menu-items';
|
||||
import { HorizontalMenuItems } from './menu-items/horizontal-menu-items';
|
||||
import { AccordionAnchorDirective, AccordionLinkDirective, AccordionDirective } from './accordion';
|
||||
import { ToggleFullscreenDirective } from './fullscreen/toggle-fullscreen.directive';
|
||||
import { RatingComponent} from './rating/rating.component';
|
||||
|
||||
@NgModule({
|
||||
declarations: [
|
||||
AccordionAnchorDirective,
|
||||
AccordionLinkDirective,
|
||||
AccordionDirective,
|
||||
ToggleFullscreenDirective
|
||||
ToggleFullscreenDirective,
|
||||
RatingComponent
|
||||
],
|
||||
exports: [
|
||||
AccordionAnchorDirective,
|
||||
AccordionLinkDirective,
|
||||
AccordionDirective,
|
||||
ToggleFullscreenDirective
|
||||
ToggleFullscreenDirective,
|
||||
RatingComponent
|
||||
],
|
||||
providers: [ MenuItems, HorizontalMenuItems ]
|
||||
})
|
||||
|
||||
Loading…
Reference in New Issue
Block a user