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

Fairoj : Feeback version 4 changes and vendor form fetch complete check removal

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2020-10-03 20:50:03 +05:30
parent c70b100e1c
commit fa38233a61
19 changed files with 97 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -851,7 +851,9 @@ export class AddPdComponent implements OnInit, OnDestroy {
if (result.status == 200) {
this.disableAfterSubmit = false;
this.notifier.notify('success', 'PD Saved.');
setTimeout(()=>{
this.loadPdListCompoent(true);
},1000)
}
else {
this.disableAfterSubmit = false;

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

@ -924,7 +924,7 @@ export class AddressComponent implements OnInit {
// else {
// control.push(this.createAddresses(null));
// }
if(this.pd_all_details.pdmaster_details.fk_pd_type == '2' && this.pd_all_details.pdmaster_details.hasOwnProperty('vendor_status') && this.pd_all_details.pdmaster_details.vendor_status == 'COMPLETED' && this.pd_all_details.pdmaster_details.curr_vendor_ans_fetch_status == '0') {
if(this.pd_all_details.pdmaster_details.fk_pd_type == '2' && this.pd_all_details.pdmaster_details.curr_vendor_ans_fetch_status == '0') {
console.log(this.pd_all_details.pdmaster_details.vendor_status);
this.getDataFromVendor()
}

2
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.ts
View File

@ -220,7 +220,7 @@ export class BusinessAssetsInfoComponent implements OnInit {
} else {
// this.noRecordFound = true;
}
if(this.pd_all_details.pdmaster_details.fk_pd_type == '2' && this.pd_all_details.pdmaster_details.hasOwnProperty('vendor_status') && this.pd_all_details.pdmaster_details.vendor_status == 'COMPLETED' && this.pd_all_details.pdmaster_details.curr_vendor_ans_fetch_status == '0') {
if(this.pd_all_details.pdmaster_details.fk_pd_type == '2' && this.pd_all_details.pdmaster_details.curr_vendor_ans_fetch_status == '0') {
console.log(this.pd_all_details.pdmaster_details.vendor_status);
setTimeout(()=>{
this.getDataFromVendor()

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

@ -666,7 +666,7 @@ export class BusinessInfoComponent implements OnInit {
});
}
}
if(this.pd_all_details.pdmaster_details.fk_pd_type == '2' && this.pd_all_details.pdmaster_details.hasOwnProperty('vendor_status') && this.pd_all_details.pdmaster_details.vendor_status == 'COMPLETED' && this.pd_all_details.pdmaster_details.curr_vendor_ans_fetch_status == '0') {
if(this.pd_all_details.pdmaster_details.fk_pd_type == '2' && this.pd_all_details.pdmaster_details.curr_vendor_ans_fetch_status == '0') {
console.log(this.pd_all_details.pdmaster_details.vendor_status);
this.getDataFromVendor()
}

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

@ -67,7 +67,7 @@
</div>
</div>
<mat-form-field *ngIf="pd_cus_segment!='SAL-CHQ'" style="width: 45%">
<mat-select placeholder="Was the employer met?" formControlName="was_met" required>
<mat-select placeholder="Was the employer met?" formControlName="was_met" >
<mat-option>Select</mat-option>
<mat-option value="yes">Yes</mat-option>
<mat-option value="no">No</mat-option>
@ -77,7 +77,7 @@
<div fxLayout="row wrap" fxLayoutAlign="start none" *ngIf="employmentForm.controls['was_met'].value == 'yes'" [ngClass]="{'smartPd':fk_pd_type == '2'}">
<mat-form-field style="width: 45%">
<input matInput placeholder="Name of Person Met" formControlName="name_person_met"
autocomplete="off" required>
autocomplete="off" >
<!-- <mat-select placeholder="Name of Person Met" formControlName="name_person_met"
required (selectionChange)="filtercompanyrelationship(employmentForm.controls['employer_name'].value,$event.value)">
@ -91,7 +91,7 @@
<mat-form-field style="width: 45%">
<!-- <input matInput placeholder="Designation of Person Met" formControlName="designation_person_met"
required> -->
<mat-select placeholder="Designation of Person Met" formControlName="designation_person_met" required>
<mat-select placeholder="Designation of Person Met" formControlName="designation_person_met" >
<mat-option>Select</mat-option>
<mat-option *ngFor="let deslist of company_relationship_list" [value]="deslist.company_relationship_id">
{{deslist.name}}
@ -102,7 +102,7 @@
<mat-form-field style="width: 45%" *ngIf="employmentForm.value.designation_person_met == '1'">
<input matInput placeholder="Specify Person Met" formControlName="others_person_met"
autocomplete="off" required>
autocomplete="off" >
<mat-error *ngIf="employmentForm.controls['designation_person_met'].hasError('required')">
Required</mat-error>
</mat-form-field>
@ -131,7 +131,7 @@
<div [ngClass]="{'smartPd':fk_pd_type == '2'}">
<mat-form-field *ngIf="pd_cus_segment!='SAL-CHQ'" style="width: 45%" >
<mat-select placeholder="Salary amount confirmed ?" formControlName="confirm_salary"
required >
>
<mat-option>Select</mat-option>
<mat-option value="yes">Yes</mat-option>
<mat-option value="no">No</mat-option>
@ -146,7 +146,7 @@
<!-- <mat-error *ngIf="employmentForm.controls['sal_amount_was_not_confirmed'].hasError('required')">why salary amount was not confirmed Required</mat-error> -->
</mat-form-field>
<div fxLayout="row" fxLayoutAlign="start none" *ngIf="employmentForm.controls['confirm_salary'].value == 'yes'">
<div fxLayout="row" fxLayoutAlign="start none" *ngIf="employmentForm.controls['confirm_salary'].value == 'yes' && this.fk_pd_type != '2'">
<mat-form-field style="width: 45%">
<input matInput placeholder="What is the salary amount confirmed?"
formControlName="confirm_salary_amount" OnlyNumber type="text" autocomplete="off">
@ -160,7 +160,7 @@
<div [ngClass]="{'smartPd':fk_pd_type == '2'}">
<mat-form-field *ngIf="pd_cus_segment!='SAL-CHQ'" style="width: 45%" >
<mat-select placeholder="Attendance register seen ?" formControlName="attendance_seen"
required>
>
<mat-option>Select</mat-option>
<mat-option value="yes">Yes</mat-option>
<mat-option value="no">No</mat-option>
@ -169,7 +169,7 @@
</mat-form-field>
<mat-form-field *ngIf="pd_cus_segment!='SAL-CHQ'" style="width: 45%">
<mat-select placeholder="Salary register seen ?" formControlName="sal_reg_seen"
required>
>
<mat-option>Select</mat-option>
<mat-option value="yes">Yes</mat-option>
<mat-option value="no">No</mat-option>
@ -180,7 +180,7 @@
<div *ngIf="fk_pd_type == '2' || fk_pd_type == '3'" [ngClass]="{'smartPd':fk_pd_type == '2'}">
<mat-form-field style="width: 45%">
<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>
@ -189,7 +189,7 @@
</mat-form-field>
<mat-form-field style="width: 45%">
<mat-select placeholder="Salary Certificate" formControlName="sal_certificate"
required>
>
<mat-option>Select</mat-option>
<mat-option value="yes">Yes</mat-option>
<mat-option value="no">No</mat-option>
@ -198,7 +198,7 @@
</mat-form-field>
<mat-form-field style="width: 45%">
<mat-select placeholder="Salary Slip" formControlName="sal_slip"
required>
>
<mat-option>Select</mat-option>
<mat-option value="yes">Yes</mat-option>
<mat-option value="no">No</mat-option>
@ -239,7 +239,7 @@
<div [ngClass]="{'smartPd':fk_pd_type == '2'}">
<mat-form-field style="width: 45%" >
<mat-select placeholder="Mode of getting salary" formControlName="mode_of_getting_salary"
required>
>
<mat-option>Select</mat-option>
<mat-option value="bank_transfer">Bank Transfer</mat-option>
<mat-option value="paid_in_cash">Paid in Cash</mat-option>
@ -320,14 +320,14 @@
</div>
<mat-form-field style="width: 80%" [ngClass]="{'smartPd':fk_pd_type == '2'}">
<input matInput placeholder="Gross Monthly Salary" formControlName="gross_monthly_salary"
OnlyNumber type="text" autocomplete="off" required (change)="setValidationForNetSal($event.target.value)">
OnlyNumber type="text" autocomplete="off" (change)="setValidationForNetSal($event.target.value)">
<mat-hint align="start" style="font-size:90%" *ngIf="employmentForm.controls['gross_monthly_salary'].value != ''">{{"&#8377;"}} {{employmentForm.controls['gross_monthly_salary'].value | numberToWords}} Only</mat-hint>
<mat-error *ngIf="employmentForm.controls['gross_monthly_salary'].hasError('required')">Gross Monthly Salary Required</mat-error>
</mat-form-field>
<mat-form-field style="width:80%" [ngClass]="{'smartPd':fk_pd_type == '2'}">
<input matInput placeholder="Net Monthly Salary" formControlName="net_monthly_salary"
OnlyNumber type="text" autocomplete="off" required>
OnlyNumber type="text" autocomplete="off" >
<mat-hint align="start" style="font-size:90%" *ngIf="employmentForm.controls['net_monthly_salary'].value != ''">{{"&#8377;"}} {{employmentForm.controls['net_monthly_salary'].value | numberToWords}} Only</mat-hint>
<mat-error *ngIf="employmentForm.controls['net_monthly_salary'].hasError('required')">Net Monthly Salary Required</mat-error>
<mat-error *ngIf="employmentForm.controls['net_monthly_salary'].hasError('max')">Net Month Salary is greater than Gross monthly Salary</mat-error>

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

@ -236,7 +236,7 @@ export class EmploymentInfoComponent implements OnInit {
}
console.log(this.employmentForm.value)
// && this.pd_all_details.pdmaster_details.curr_vendor_ans_fetch_status == '0'
if(this.pd_all_details.pdmaster_details.fk_pd_type == '2' && this.pd_all_details.pdmaster_details.hasOwnProperty('vendor_status') && this.pd_all_details.pdmaster_details.vendor_status == 'COMPLETED' && this.pd_all_details.pdmaster_details.curr_vendor_ans_fetch_status == '0') {
if(this.pd_all_details.pdmaster_details.fk_pd_type == '2' && this.pd_all_details.pdmaster_details.curr_vendor_ans_fetch_status == '0') {
console.log(this.pd_all_details.pdmaster_details.vendor_status);
this.getDataFromVendor()
}
@ -286,19 +286,19 @@ export class EmploymentInfoComponent implements OnInit {
how_long_month: ['',Validators.compose([Validators.max(12)])],
total_business_experience: [''],
total_business_previous_experience: [''],
was_met: [this.pd_cus_segment == 'SAL-CHQ' ? 'no' : '', Validators.compose([Validators.required])],
name_person_met: [''],
designation_person_met: [''],
was_met: [this.pd_cus_segment == 'SAL-CHQ' ? 'no' : '', this.fk_pd_type != '2' && this.fk_pd_type != '3' ? Validators.compose([Validators.required]) : ''],
name_person_met: ['',this.fk_pd_type != '2' && this.fk_pd_type != '3' ? Validators.compose([Validators.required]) : ''],
designation_person_met: ['',this.fk_pd_type != '2' && this.fk_pd_type != '3' ? Validators.compose([Validators.required]) : ''],
others_person_met: [''],
confirm_salary: [this.pd_cus_segment == 'SAL-CHQ' ? 'no' : '', Validators.compose([Validators.required])],
confirm_salary: [this.pd_cus_segment == 'SAL-CHQ' ? 'no' : '', this.fk_pd_type != '2' && this.fk_pd_type != '3' ? Validators.compose([Validators.required]) : ''],
sal_amount_was_not_confirmed: [''],
confirm_salary_amount: [''],
attendance_seen: [this.pd_cus_segment == 'SAL-CHQ' ? 'no' : '', Validators.compose([Validators.required])],
sal_reg_seen: [this.pd_cus_segment == 'SAL-CHQ' ? 'no' : '', Validators.compose([Validators.required])],
from_date_the_salary_is_rcv: ['',Validators.compose([Validators.max(31), Validators.min(0)])],
to_date_the_salary_is_rcv: ['',Validators.compose([Validators.max(31), Validators.min(0)])],
gross_monthly_salary: ['', Validators.compose([Validators.required])],
net_monthly_salary: ['', Validators.compose([Validators.required])],
attendance_seen: [this.pd_cus_segment == 'SAL-CHQ' ? 'no' : '', this.fk_pd_type != '2' && this.fk_pd_type != '3' ? Validators.compose([Validators.required]) : ''],
sal_reg_seen: [this.pd_cus_segment == 'SAL-CHQ' ? 'no' : '',this.fk_pd_type != '2' && this.fk_pd_type != '3' ? Validators.compose([Validators.required]) : ''],
from_date_the_salary_is_rcv: ['',this.fk_pd_type != '2' && this.fk_pd_type != '3' ? Validators.compose([Validators.max(31), Validators.min(0)]) : ''],
to_date_the_salary_is_rcv: ['',this.fk_pd_type != '2' && this.fk_pd_type != '3' ? Validators.compose([Validators.max(31), Validators.min(0)]): ''],
gross_monthly_salary: ['', ,this.fk_pd_type != '2' && this.fk_pd_type != '3' ? Validators.compose([Validators.required]) : ''],
net_monthly_salary: ['', ,this.fk_pd_type != '2' && this.fk_pd_type != '3' ? Validators.compose([Validators.required]) : ''],
amount_paid_in_cash: [''],
amount_paid_through_bank: [''],
mode_of_getting_salary:[''],
@ -359,6 +359,15 @@ export class EmploymentInfoComponent implements OnInit {
}
else{
this.employmentForm.controls['was_met'].setValue('yes')
if(records.employer_details.hasOwnProperty('sal_amount_was_not_confirmed')&& records.employer_details.sal_amount_was_not_confirmed.length > 0) {
console.log("others check",records.employer_details.sal_amount_was_not_confirmed.filter(v=>v.includes('Others')).length > 0)
if(records.employer_details.sal_amount_was_not_confirmed.filter(v=>v.includes('Others')).length > 0 && records.employer_details.hasOwnProperty('sal_amount_was_not_confirmed_others')&& records.employer_details.sal_amount_was_not_confirmed_others) {
let otherIndex = records.employer_details.sal_amount_was_not_confirmed.findIndex(v=>v.includes('Others'))
if(otherIndex != -1) {
records.employer_details.sal_amount_was_not_confirmed[otherIndex] = records.employer_details.sal_amount_was_not_confirmed_others
}
}
}
}
let all_fetch = {...records.docs_sighted, ...records.employer_details}
console.log(records,all_fetch);
@ -513,7 +522,7 @@ export class EmploymentInfoComponent implements OnInit {
}
}
else if(this.pd_cus_segment == 'SAL-CHQ'){
else if(this.fk_pd_type == '2'){
this.employmentForm.controls.was_met.clearValidators();
this.employmentForm.controls.was_met.updateValueAndValidity();

7
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html
View File

@ -163,9 +163,14 @@
<mat-form-field>
<mat-select placeholder="Relationship" formControlName="family_member_relationship"
required>
<mat-option>
<ngx-mat-select-search [formControl]="relationFilterCtrl"
[placeholderLabel]="'Search Relation...'"
[noEntriesFoundLabel]="'no matching records found'"></ngx-mat-select-search>
</mat-option>
<mat-option>Select</mat-option>
<mat-option value="{{relation.relationship_id}}"
*ngFor="let relation of relationData">
*ngFor="let relation of filteredRelationShipList | async">
{{relation.name}}
</mat-option>
</mat-select>

30
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts
View File

@ -12,7 +12,7 @@ import { ActivatedRoute, Router } from "@angular/router";
import { PdTrigerService } from '../../../../../pd-service/pd-triger.service';
import { ImageCropComponent } from '../dialogue/image-crop/image-crop.component';
import { takeUntil } from 'rxjs/operators';
import { Subject } from 'rxjs';
import { Subject, ReplaySubject } from 'rxjs';
@Component({
@ -71,6 +71,8 @@ export class FamilyDetailsComponent implements OnInit {
addressList: any = [];
prod_catagory: any;
public relationFilterCtrl: FormControl = new FormControl();
public filteredRelationShipList: ReplaySubject<any> = new ReplaySubject<any>(1);
/** constructor Of the class */
constructor(notifier: NotifierService, private fb: FormBuilder, private route: ActivatedRoute,
private router: Router,
@ -185,6 +187,7 @@ export class FamilyDetailsComponent implements OnInit {
});
//this.retriveFile();
this.filterList();
}
pdf(fileURL){
window.open(fileURL);
@ -536,6 +539,7 @@ export class FamilyDetailsComponent implements OnInit {
if (data.status == 200) {
if (type == 1) {
this.relationData = data.records.filter(item => item.isactive == 1);
this.filteredRelationShipList.next(this.relationData.slice())
}
else if (type == 2) {
this.occupationData = data.records.filter(item => item.isactive == 1);
@ -866,6 +870,28 @@ export class FamilyDetailsComponent implements OnInit {
}
})
}
filterList() {
this.relationFilterCtrl.valueChanges.pipe().subscribe(()=>{
this.applyFilter(this.relationFilterCtrl.value,this.filteredRelationShipList,this.relationData,'name')
})
}
applyFilter(filtered_text,filter_list,raw_list,obj_name) {
if (!raw_list) {
return;
}
// get the search keyword
let search = filtered_text;
if (!search) {
filter_list.next(raw_list.slice());
return;
} else {
search = search.toLowerCase();
}
// filter the banks
filter_list.next(
raw_list.filter(bank => bank[obj_name].toLowerCase().indexOf(search) > -1)
);
}
}

2
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.html
View File

@ -137,7 +137,7 @@
</div>
</span>
<div class="toggle" fxLayout="row nowrap" *ngIf="fk_pd_type != '3'">
<div class="toggle" fxLayout="row nowrap" *ngIf="fk_pd_type != '3' && fk_pd_type != '2'">
<mat-label>Any additional visit (Godown /multiple rental properties)</mat-label>&nbsp;&nbsp;
<mat-slide-toggle formControlName="was_the_pd_address_ogl" color="primary"></mat-slide-toggle>
</div>

2
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.ts
View File

@ -298,7 +298,7 @@ export class FinalRemarksComponent implements OnInit {
this.noRecordsFound = true;
}
if(this.pd_all_details.pdmaster_details.fk_pd_type == '2' && this.pd_all_details.pdmaster_details.hasOwnProperty('vendor_status') && this.pd_all_details.pdmaster_details.vendor_status == 'COMPLETED' && this.pd_all_details.pdmaster_details.curr_vendor_ans_fetch_status == '0') {
if(this.pd_all_details.pdmaster_details.fk_pd_type == '2' && this.pd_all_details.pdmaster_details.curr_vendor_ans_fetch_status == '0') {
if((this.lender_short_name == 'CLIX' || this.lender_short_name == 'MWISE' || this.prod_catagory == 'LAEP')) {
console.log(this.pd_all_details.pdmaster_details.vendor_status);
this.getDataFromVendor()

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

@ -415,7 +415,7 @@ export class GeneralInfoComponent implements OnInit {
}
}
if(this.pd_all_details.pdmaster_details.fk_pd_type == '2' && this.pd_all_details.pdmaster_details.hasOwnProperty('vendor_status') && this.pd_all_details.pdmaster_details.vendor_status == 'COMPLETED' && this.pd_all_details.pdmaster_details.curr_vendor_ans_fetch_status == '0') {
if(this.pd_all_details.pdmaster_details.fk_pd_type == '2' && this.pd_all_details.pdmaster_details.curr_vendor_ans_fetch_status == '0') {
console.log(this.pd_all_details.pdmaster_details.vendor_status);
this.getDataFromVendor()
}

3
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts
View File

@ -900,10 +900,11 @@ export class LoanDetailsComponent implements OnInit {
// get end user final group data
let dataEnd_user_data = [];
if(this.loanDetailsForm.controls['end_use'].value.length > 0) {
this.loanDetailsForm.controls['end_use'].value.forEach(element => {
dataEnd_user_data.push({ end_use: element })
});
}
records.end_use_group = dataEnd_user_data;

2
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.ts
View File

@ -181,7 +181,7 @@ pdf(fileURL){
neighbourhoodControl.push(this.createNeighbourhood(this.default_neighbourhood_details));
referencecheckControl.push(this.createReerenceCheck(this.default_reference_details));
}
if(this.data.pdmaster_details.fk_pd_type == '2' && this.data.pdmaster_details.hasOwnProperty('vendor_status') && this.data.pdmaster_details.vendor_status == 'COMPLETED' && this.data.pdmaster_details.curr_vendor_ans_fetch_status == '0') {
if(this.data.pdmaster_details.fk_pd_type == '2' && this.data.pdmaster_details.curr_vendor_ans_fetch_status == '0') {
console.log(this.data.pdmaster_details.vendor_status);
this.getDataFromVendor()
}

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

@ -10,11 +10,12 @@
</button>
</div>
</h2>
<form [formGroup]="docsCollectedForm">
<mat-dialog-content style="border-bottom: 2px solid #e2412f8f;">
<mat-tab-group>
<mat-tab label="Questions">
<ng-template matTabContent>
<div [formGroup]="docsCollectedForm" *ngIf="loadComponent">
<div *ngIf="loadComponent">
<mat-card *ngIf="queries_docs.length !=0">
<mat-card-header>
<mat-card-title>
@ -123,12 +124,19 @@
</mat-tab>
</mat-tab-group>
</mat-dialog-content>
<mat-dialog-actions align="end">
<div align="end">
<mat-dialog-actions >
<div fxFlex="60" class="pb-0 text-sm-left" align="left">
<mat-form-field appearance="outline" style="width: 100%">
<mat-label>Remarks</mat-label>
<textarea matInput placeholder="Remarks" formControlName="common_remarks"></textarea>
</mat-form-field>
</div>
<div fxFlex="40" align="end">
<button type="submit" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button matTooltip="Submit"
matTooltipPosition="above" (click)="saveForm()" [disabled]="disableAfterSubmit===true">
<mat-icon>save</mat-icon>
</button>
</div>
</mat-dialog-actions>
</form>
<notifier-container></notifier-container>

3
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/queries-docs/queries-docs.component.ts
View File

@ -87,6 +87,7 @@ export class QueriesDocsComponent implements OnInit {
pdid:[this.pdid],
fk_createdby:[this.awsService.getlocale()],
link:[''],
common_remarks:[''],
addtional_requirements:this.fb.array([this.createview()])
})
this.getFullPD();
@ -199,7 +200,7 @@ export class QueriesDocsComponent implements OnInit {
this.docsCollectedForm.patchValue(retrieved_data)
}
if(this.pd_all_details.pdmaster_details.fk_pd_type == '2' && this.pd_all_details.pdmaster_details.hasOwnProperty('vendor_status') && this.pd_all_details.pdmaster_details.vendor_status == 'COMPLETED' && this.pd_all_details.pdmaster_details.curr_vendor_ans_fetch_status == '0') {
if(this.pd_all_details.pdmaster_details.fk_pd_type == '2' && this.pd_all_details.pdmaster_details.curr_vendor_ans_fetch_status == '0') {
console.log(this.pd_all_details.pdmaster_details.vendor_status);
setTimeout(()=>{
this.getDataFromVendor()

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

@ -352,7 +352,7 @@ export class StockComponent implements OnInit {
this.noRecordsFound = true;
}
}
if(this.pd_all_details.pdmaster_details.fk_pd_type == '2' && this.pd_all_details.pdmaster_details.hasOwnProperty('vendor_status') && this.pd_all_details.pdmaster_details.vendor_status == 'COMPLETED' && this.pd_all_details.pdmaster_details.curr_vendor_ans_fetch_status == '0') {
if(this.pd_all_details.pdmaster_details.fk_pd_type == '2' && this.pd_all_details.pdmaster_details.curr_vendor_ans_fetch_status == '0') {
console.log(this.pd_all_details.pdmaster_details.vendor_status);
this.getDataFromVendor()
}

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

@ -204,7 +204,7 @@ export class ViewPdComponent implements OnInit, OnDestroy {
this.enableStartPD = false;
}
this.existPDs=data.records.exist_pd_details
if(this.pdMasterData[0].fk_pd_type == '2') {
if(this.pdMasterData[0].fk_pd_type == '2' || this.pdMasterData[0].fk_pd_type == '3') {
if(data.records.vendor_form_status && data.records.vendor_form_status.length > 0) {
this.vendor_form_status_arr = JSON.stringify(data.records.vendor_form_status)
localStorage.setItem("vendorFormStatus_arr",this.vendor_form_status_arr)

2
ng6-seed/src/app/video-chat/video-player/video-player.component.html
View File

@ -27,7 +27,7 @@
<mat-card style="background-color: black;margin:0px;margin-top: 3px;">
<mat-card-content >
<div class="playbackListClass" fxLayout="row" *ngFor="let item of playbackList;let i=index" (click)="playVideo(i,item)">
<div fxLayout="column" fxFlex="90%" fxLayoutGap="10px">
<div fxLayout="column" fxFlex="85%" fxLayoutGap="10px">
<div>
<p style="color:white;margin:0px;font-size: 20px;font-weight: bold;white-space:pre-wrap">{{item.video_name}}</p>
<p *ngIf="item.date" style="color:white;margin:0px;font-size:16px;">{{item.date}}</p>

1
ng6-seed/src/app/video-chat/video-player/video-player.component.scss
View File

@ -1,6 +1,7 @@
::ng-deep { .video-player > mat-dialog-container {
background: black;
padding: 0;
overflow-y: scroll !important;
}
}
.mat-raised-button{