default list,remove settings option
This commit is contained in:
parent
0073dc7ba6
commit
119da953dd
@ -134,13 +134,13 @@
|
|||||||
<mat-icon>person</mat-icon>
|
<mat-icon>person</mat-icon>
|
||||||
</button>
|
</button>
|
||||||
<mat-menu #user="matMenu" class="opt-menu" x-position="before">
|
<mat-menu #user="matMenu" class="opt-menu" x-position="before">
|
||||||
<div mat-menu-item class="head-menu grad-blue">
|
<!-- <div mat-menu-item class="head-menu grad-blue">
|
||||||
Settings
|
Settings
|
||||||
</div>
|
</div>
|
||||||
<button mat-menu-item>
|
<button mat-menu-item>
|
||||||
<mat-icon>settings</mat-icon>
|
<mat-icon>settings</mat-icon>
|
||||||
Settings
|
Settings
|
||||||
</button>
|
</button> -->
|
||||||
<button mat-menu-item (click)="userprofile()">
|
<button mat-menu-item (click)="userprofile()">
|
||||||
<mat-icon>account_box</mat-icon>
|
<mat-icon>account_box</mat-icon>
|
||||||
Profile
|
Profile
|
||||||
@ -158,13 +158,13 @@
|
|||||||
<mat-icon>person</mat-icon>
|
<mat-icon>person</mat-icon>
|
||||||
</button>
|
</button>
|
||||||
<mat-menu #user="matMenu" class="opt-menu" x-position="before">
|
<mat-menu #user="matMenu" class="opt-menu" x-position="before">
|
||||||
<div mat-menu-item class="head-menu grad-blue">
|
<!-- <div mat-menu-item class="head-menu grad-blue">
|
||||||
Settings
|
Settings
|
||||||
</div>
|
</div>
|
||||||
<button mat-menu-item>
|
<button mat-menu-item>
|
||||||
<mat-icon>settings</mat-icon>
|
<mat-icon>settings</mat-icon>
|
||||||
Setting
|
Setting
|
||||||
</button>
|
</button> -->
|
||||||
<button mat-menu-item (click)="userprofile()">
|
<button mat-menu-item (click)="userprofile()">
|
||||||
<mat-icon>account_box</mat-icon>
|
<mat-icon>account_box</mat-icon>
|
||||||
Profile
|
Profile
|
||||||
|
|||||||
@ -26,9 +26,11 @@ export class AdvanceFilterComponent implements OnInit {
|
|||||||
constructor(private _fb:FormBuilder,private _pd:PdTrigerService,private salesPDService:SalesPdService) {
|
constructor(private _fb:FormBuilder,private _pd:PdTrigerService,private salesPDService:SalesPdService) {
|
||||||
this.todaydate = new Date();
|
this.todaydate = new Date();
|
||||||
this.getDropdown();
|
this.getDropdown();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ngOnInit() {
|
ngOnInit() {
|
||||||
|
|
||||||
let entity_id=localStorage.getItem('LocalSetEntity');
|
let entity_id=localStorage.getItem('LocalSetEntity');
|
||||||
|
|
||||||
this.searchForm=this._fb.group({
|
this.searchForm=this._fb.group({
|
||||||
@ -48,9 +50,14 @@ export class AdvanceFilterComponent implements OnInit {
|
|||||||
getDropdown(){
|
getDropdown(){
|
||||||
this._pd.getAllMasterDatas('PDSTATUS').subscribe(res=>
|
this._pd.getAllMasterDatas('PDSTATUS').subscribe(res=>
|
||||||
{
|
{
|
||||||
|
|
||||||
|
console.log(res);
|
||||||
if(res.dataStatus==true)
|
if(res.dataStatus==true)
|
||||||
{
|
{
|
||||||
this.pdStatus = res.records.filter(status=>status.isactive==1 && status.hasOwnProperty('avail_pd_types') && (status.avail_pd_types == '2' || status.avail_pd_types == '3' ))
|
this.pdStatus = res.records.filter(status=>status.isactive==1 && status.hasOwnProperty('avail_pd_types') && (status.avail_pd_types == '2' || status.avail_pd_types == '3' ))
|
||||||
|
console.log('ressss');
|
||||||
|
console.log(this.pdStatus);
|
||||||
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
this._pd.getAllMasterDatas('ENTITY').subscribe(res=>
|
this._pd.getAllMasterDatas('ENTITY').subscribe(res=>
|
||||||
@ -72,7 +79,7 @@ export class AdvanceFilterComponent implements OnInit {
|
|||||||
ngOnChanges(){
|
ngOnChanges(){
|
||||||
console.log(this.drop_down_datas)
|
console.log(this.drop_down_datas)
|
||||||
if(this.drop_down_datas != undefined){
|
if(this.drop_down_datas != undefined){
|
||||||
this.pdStatus=this.drop_down_datas.pd_status
|
//this.pdStatus=this.drop_down_datas.pd_status
|
||||||
if(this.ENTITY.length != 0) {
|
if(this.ENTITY.length != 0) {
|
||||||
this.entityCheck()
|
this.entityCheck()
|
||||||
}
|
}
|
||||||
|
|||||||
@ -3,6 +3,7 @@ import { MatTableDataSource, MatPaginator, MatSort, PageEvent, MatDialog, MatDia
|
|||||||
import { PdTrigerService } from 'app/personal-discussion/pd-service/pd-triger.service';
|
import { PdTrigerService } from 'app/personal-discussion/pd-service/pd-triger.service';
|
||||||
import { ApiServiceService } from 'app/lender-credit-pd/services/apiService/api-service.service';
|
import { ApiServiceService } from 'app/lender-credit-pd/services/apiService/api-service.service';
|
||||||
import { ActivatedRoute, Router } from '@angular/router';
|
import { ActivatedRoute, Router } from '@angular/router';
|
||||||
|
import { SalesPdService } from '../services/sales-pd.service';
|
||||||
//import { HomePage, Section1 } from '../home/home';
|
//import { HomePage, Section1 } from '../home/home';
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-sales-pd',
|
selector: 'app-sales-pd',
|
||||||
@ -38,7 +39,7 @@ export class SalesPdComponent implements OnInit {
|
|||||||
common: any;
|
common: any;
|
||||||
user_type: string ='';
|
user_type: string ='';
|
||||||
|
|
||||||
constructor(private _pdSales: PdTrigerService,private dialog:MatDialog,private route: ActivatedRoute, private router: Router,private _creditPdService:ApiServiceService) {
|
constructor(private _pdSales: PdTrigerService,private dialog:MatDialog,private route: ActivatedRoute, private router: Router,private _creditPdService:ApiServiceService,private salesPDService:SalesPdService) {
|
||||||
|
|
||||||
// this.common = JSON.parse(localStorage.getItem('commonSettings')).default_pd_list_count;
|
// this.common = JSON.parse(localStorage.getItem('commonSettings')).default_pd_list_count;
|
||||||
// this.common = this.common.count+' '+this.common.factor
|
// this.common = this.common.count+' '+this.common.factor
|
||||||
@ -48,17 +49,23 @@ export class SalesPdComponent implements OnInit {
|
|||||||
|
|
||||||
ngOnInit() {
|
ngOnInit() {
|
||||||
this.loadSalesPDDetails();
|
this.loadSalesPDDetails();
|
||||||
|
|
||||||
// this.salesPDpdf();
|
// this.salesPDpdf();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
loadSalesPDDetails() {
|
loadSalesPDDetails() {
|
||||||
this._pdSales.getSalesPd()
|
|
||||||
|
this.salesPDService.advancedFilter('')
|
||||||
.subscribe(
|
.subscribe(
|
||||||
data => {
|
data => {
|
||||||
|
|
||||||
if (data.status == 200) {
|
if (data.status == 200) {
|
||||||
|
|
||||||
this.salesPdData = data.records;
|
this.salesPdData = data.records;
|
||||||
|
console.log('this.salesPdData')
|
||||||
|
console.log(this.salesPdData)
|
||||||
this.dataLengthTab4 = data.records.length;
|
this.dataLengthTab4 = data.records.length;
|
||||||
this.dataSourceTab4.data = this.salesPdData;
|
this.dataSourceTab4.data = this.salesPdData;
|
||||||
this.recordStatus=false
|
this.recordStatus=false
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user