From 1205b5a03386024080149963a122af869f9f8e54 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Mon, 23 Dec 2019 12:05:46 +0530 Subject: [PATCH 1/2] Fairoj : Sales PD List modified --- ng6-seed/src/app/_guard/token.interceptor.ts | 1 + .../business-info-group.component.scss | 1 + .../list-pd/start-pd/start-pd.component.scss | 1 + .../qc-list/qc-start/qc-start.component.scss | 1 + .../src/app/sales-pd/sales-pd.component.html | 290 +++++++++--------- .../src/app/sales-pd/sales-pd.component.scss | 2 +- .../src/app/sales-pd/sales-pd.component.ts | 11 +- .../src/app/sales-pd/sales-pd.service.spec.ts | 12 + ng6-seed/src/app/sales-pd/sales-pd.service.ts | 9 + .../styles/scss/core/_main-sidebar.scss | 6 +- 10 files changed, 182 insertions(+), 152 deletions(-) create mode 100644 ng6-seed/src/app/sales-pd/sales-pd.service.spec.ts create mode 100644 ng6-seed/src/app/sales-pd/sales-pd.service.ts diff --git a/ng6-seed/src/app/_guard/token.interceptor.ts b/ng6-seed/src/app/_guard/token.interceptor.ts index 0d097cb91..1767891e3 100755 --- a/ng6-seed/src/app/_guard/token.interceptor.ts +++ b/ng6-seed/src/app/_guard/token.interceptor.ts @@ -54,6 +54,7 @@ export class TokenInterceptor implements HttpInterceptor{ private handleError (operation = 'operation', result?: T) { return (error: any): Observable => { if(error instanceof HttpErrorResponse){ + console.log("Error from interceptor >>>",error) console.error("Error: " + error.status); if(error.status == 401){ localStorage.clear(); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info-group/business-info-group.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info-group/business-info-group.component.scss index eb88eeecc..4df6c6f0a 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info-group/business-info-group.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info-group/business-info-group.component.scss @@ -23,6 +23,7 @@ mat-card .child_mat_card > mat-card { box-shadow: $base-card-box-shadow; transform: scale(0.95); transition: box-shadow 0.5s, transform 0.5s; + border: 1px solid lavender; &:hover { cursor: pointer; // background-color: #e00201 !important; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.scss index f89b4ea23..ac597212f 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.scss @@ -72,6 +72,7 @@ mat-card .child_mat_card > mat-card { box-shadow: $base-card-box-shadow; transform: scale(0.95); transition: box-shadow 0.5s, transform 0.5s; + border: 1px solid lavender; &:hover { cursor: pointer; // background-color: #e00201 !important; diff --git a/ng6-seed/src/app/quality-check/qc-list/qc-start/qc-start.component.scss b/ng6-seed/src/app/quality-check/qc-list/qc-start/qc-start.component.scss index f89b4ea23..ac597212f 100755 --- a/ng6-seed/src/app/quality-check/qc-list/qc-start/qc-start.component.scss +++ b/ng6-seed/src/app/quality-check/qc-list/qc-start/qc-start.component.scss @@ -72,6 +72,7 @@ mat-card .child_mat_card > mat-card { box-shadow: $base-card-box-shadow; transform: scale(0.95); transition: box-shadow 0.5s, transform 0.5s; + border: 1px solid lavender; &:hover { cursor: pointer; // background-color: #e00201 !important; diff --git a/ng6-seed/src/app/sales-pd/sales-pd.component.html b/ng6-seed/src/app/sales-pd/sales-pd.component.html index 9439827a1..e3a1eab83 100644 --- a/ng6-seed/src/app/sales-pd/sales-pd.component.html +++ b/ng6-seed/src/app/sales-pd/sales-pd.component.html @@ -1,148 +1,154 @@ -
-
- - - -
+
+
+ + +
- - - Sales PD - - - - - - - filter_list - - Advance Filter - - - - - - - -
- - - - - {{details.sales_pd_id}} - - - - - {{details.sales_pd_sno}} - - - - - - -- - - - {{details.applicant_name}} - - {{details.applicant_id}} - +
+ + + Sales PD + + + + + + + + + + + + {{details.sales_pd_id}} + + + + + {{details.sales_pd_sno}} + + + + + + -- + + + {{details.applicant_name}} +
+ {{details.applicant_id}} + + + + + {{details.short_name}}
+ {{details.abbr}} + - - - {{details.short_name}} - - - - - {{details.abbr}} - - - - + + - -- - - - {{details.officer_name}} - - - - - - {{details.createdon | date: 'dd/MM/yyyy'}} - - - - - - - - - - - - + -- + + + {{details.officer_name}} + + + + + + + -- + + + {{details.status}} + + + + + + {{details.createdon | date: 'dd/MM/yyyy'}} + + + + + + + + + + + + - - - - - + + + + + \ No newline at end of file diff --git a/ng6-seed/src/app/sales-pd/sales-pd.component.scss b/ng6-seed/src/app/sales-pd/sales-pd.component.scss index 51db57442..793673f90 100644 --- a/ng6-seed/src/app/sales-pd/sales-pd.component.scss +++ b/ng6-seed/src/app/sales-pd/sales-pd.component.scss @@ -4,7 +4,7 @@ } .cell{ display:inline !important; - text-align: center !important; + // text-align: center !important; } .cellhide{ display: none !important; diff --git a/ng6-seed/src/app/sales-pd/sales-pd.component.ts b/ng6-seed/src/app/sales-pd/sales-pd.component.ts index b65369a23..f119b4c25 100644 --- a/ng6-seed/src/app/sales-pd/sales-pd.component.ts +++ b/ng6-seed/src/app/sales-pd/sales-pd.component.ts @@ -1,18 +1,18 @@ import { Component, OnInit, ViewChild } from '@angular/core'; -import { MatPaginator, MatSort, MatTableDataSource, PageEvent } from '@angular/material'; +import { MatTableDataSource, MatPaginator, MatSort, PageEvent } from '@angular/material'; import { PdTrigerService } from 'app/personal-discussion/pd-service/pd-triger.service'; +import { UserService } from 'app/settings/service/user.service'; @Component({ selector: 'app-sales-pd', templateUrl: './sales-pd.component.html', styleUrls: ['./sales-pd.component.scss'] }) -export class SalesPdComponent implements OnInit { - +export class SalesPdComponent implements OnInit { public dataLengthTab4: number; public dataSourceTab4 = new MatTableDataSource(); - displayedColumns = ['SalesPdId','SalesPdSno','Applicant Name','Short Name','Abbr','Officer Name','Create On','Action']; + displayedColumns = ['SalesPdId','SalesPdSno','Applicant Name','Short Name','Officer Name','status','Create On','Action']; @ViewChild(MatPaginator) paginator: MatPaginator; @ViewChild(MatSort) sort: MatSort; @@ -33,7 +33,7 @@ export class SalesPdComponent implements OnInit { pageEvent: PageEvent; todaydate:Date = new Date(); - constructor(private _pdSales: PdTrigerService) { } + constructor(private _pdSales: PdTrigerService,private userService:UserService) { } ngOnInit() { this.loadSalesPDDetails(); @@ -94,5 +94,4 @@ export class SalesPdComponent implements OnInit { applyFilter(filterValue: string) { this.dataSourceTab4.filter = filterValue.trim().toLowerCase(); } - } diff --git a/ng6-seed/src/app/sales-pd/sales-pd.service.spec.ts b/ng6-seed/src/app/sales-pd/sales-pd.service.spec.ts new file mode 100644 index 000000000..3371d184c --- /dev/null +++ b/ng6-seed/src/app/sales-pd/sales-pd.service.spec.ts @@ -0,0 +1,12 @@ +import { TestBed } from '@angular/core/testing'; + +import { SalesPdService } from './sales-pd.service'; + +describe('SalesPdService', () => { + beforeEach(() => TestBed.configureTestingModule({})); + + it('should be created', () => { + const service: SalesPdService = TestBed.get(SalesPdService); + expect(service).toBeTruthy(); + }); +}); diff --git a/ng6-seed/src/app/sales-pd/sales-pd.service.ts b/ng6-seed/src/app/sales-pd/sales-pd.service.ts new file mode 100644 index 000000000..1ea766a1a --- /dev/null +++ b/ng6-seed/src/app/sales-pd/sales-pd.service.ts @@ -0,0 +1,9 @@ +import { Injectable } from '@angular/core'; + +@Injectable({ + providedIn: 'root' +}) +export class SalesPdService { + + constructor() { } +} diff --git a/ng6-seed/src/assets/styles/scss/core/_main-sidebar.scss b/ng6-seed/src/assets/styles/scss/core/_main-sidebar.scss index 67cb61bff..200ace760 100755 --- a/ng6-seed/src/assets/styles/scss/core/_main-sidebar.scss +++ b/ng6-seed/src/assets/styles/scss/core/_main-sidebar.scss @@ -189,8 +189,8 @@ overflow-x: hidden; overflow-y: auto; position: relative; - padding: 2rem; - margin-bottom: 2rem; + padding: 1.5rem; + // margin-bottom: 2rem; } @media(max-width:991px) { @@ -356,7 +356,7 @@ visibility: visible; } .mat-list-item>.mat-list-item-content>a>.menu-caret, - .mat-list-item>.mat-list-item-content>a>[fxflex], + .mat-list-item>.mat-list-item-content>a>[fxflex] { display: none; } From ee1262fcae56dd67cb2371d24317a24d6d2e6f8b Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Mon, 23 Dec 2019 19:29:11 +0530 Subject: [PATCH 2/2] Fairoj : Issue Fixes --- .../pd-collected-docs.component.html | 4 ++-- .../pd-collected-docs.component.ts | 17 +++++++++++++---- .../business-info/business-info.component.html | 2 +- .../rental-verification.component.ts | 15 +++++++++------ 4 files changed, 25 insertions(+), 13 deletions(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-collected-docs/pd-collected-docs.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-collected-docs/pd-collected-docs.component.html index 3def6ee06..d18c4624c 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-collected-docs/pd-collected-docs.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-collected-docs/pd-collected-docs.component.html @@ -13,12 +13,12 @@ - + - + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-collected-docs/pd-collected-docs.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-collected-docs/pd-collected-docs.component.ts index 3d46e8896..6b0186494 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-collected-docs/pd-collected-docs.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-collected-docs/pd-collected-docs.component.ts @@ -65,10 +65,19 @@ export class PdCollectedDocsComponent implements OnInit { } } - // removeRequirements(index: number) { - // const requirement_control = this._EditPDRequirementForm.controls['additional_requirements']; - // requirement_control.removeAt(index); - // } + removeRequirements(index: number) { + // const requirement_control = this._EditPDCollectedDocsForm.controls['docs_to_be_collected']; + // requirement_control.removeAt(index); + + const requirement_control = this._EditPDCollectedDocsForm.controls['docs_to_be_collected']; + if(requirement_control.value[index].add_req_id != ''){ + requirement_control.controls[index]['controls'].isactive.setValue(0) + } + else{ + requirement_control.removeAt(index); + } + + } updatePDCollectedDocs(formValue: any) { if(this._EditPDCollectedDocsForm.invalid) { diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html index bdba0bb11..908e4363f 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html @@ -1390,7 +1390,7 @@
-