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

merge changes

Browse Source
This commit is contained in:
gandhimathi 2018-10-12 11:00:22 +05:30
parent 27ad8d75ff
commit 57a01dfd60
66 changed files with 433 additions and 904 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ng6-seed/src/app/layouts/admin/admin-layout.component.html
View File

@ -13,7 +13,7 @@
<div class="user-pro-wrap">
<div class="user-profile-thumb text-center">
<div class="user-i">
<img [src]="profileurl ||'https://upload.wikimedia.org/wikipedia/commons/thumb/a/ac/No_image_available.svg/1024px-No_image_available.svg.png'" class="rad-full mb-1" width="100" height="100" alt="">
<img [src]="profileurl ||'https://image.ibb.co/mGjZB9/usernew.png'" class="rad-full mb-1" width="100" height="100" alt="">
<div> <span>{{fullName}}</span></div>
</div>
</div>

2
ng6-seed/src/app/settings/masters/component/branch/branch-list/branch-list.component.html
View File

@ -70,7 +70,7 @@
</mat-row>
</mat-table>
<mat-paginator *ngIf="!noRecordFound" [pageSizeOptions]="[5, 10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
<mat-paginator *ngIf="!noRecordFound" [pageSize]="pageSize" [pageSizeOptions]="[5, 10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
</div>

3
ng6-seed/src/app/settings/masters/component/branch/branch-list/branch-list.component.ts
View File

@ -31,6 +31,9 @@ export class BranchListComponent implements OnInit {
userdata2:any = [];
color = 'primary';
// pagination variable details
pageSize = 10;
// changed(id: number,isactive : number) {
// console.log('Id',id);
// console.log('Isactive',isactive)

2
ng6-seed/src/app/settings/masters/component/city/city-list/city-list.component.html
View File

@ -161,7 +161,7 @@
</mat-row>
</mat-table>
<mat-paginator *ngIf="!noRecordFound" [pageSizeOptions]="[5, 10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
<mat-paginator *ngIf="!noRecordFound" [pageSize]="pageSize" [pageSizeOptions]="[5, 10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
</div>

2
ng6-seed/src/app/settings/masters/component/city/city-list/city-list.component.ts
View File

@ -29,6 +29,8 @@ export class CityListComponent implements OnInit {
userData = null;
color = 'primary';
// pagination variable details
pageSize = 10;
public dataLength: number;
public dataSource = new MatTableDataSource();

2
ng6-seed/src/app/settings/masters/component/comments-on-locality/comments-on-locality-list/comments-on-locality-list.component.html
View File

@ -140,7 +140,7 @@
</mat-row>
</mat-table>
<mat-paginator *ngIf="!noRecordFound" [pageSizeOptions]="[5, 10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
<mat-paginator *ngIf="!noRecordFound" [pageSize]="pageSize" [pageSizeOptions]="[5, 10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
</div>
<!-- <div *ngIf="noRecordFound" class="nocontent">No records found</div> -->
</mat-card-content>

2
ng6-seed/src/app/settings/masters/component/comments-on-locality/comments-on-locality-list/comments-on-locality-list.component.ts
View File

@ -30,6 +30,8 @@ export class CommentsOnLocalityListComponent implements OnInit {
CommentsOnLocalityList: any = [];
userData = null;
color = 'primary';
// pagination variable details
pageSize = 10;
public dataLength: number;
public dataSource = new MatTableDataSource();

2
ng6-seed/src/app/settings/masters/component/company/company-list/company-list.component.html
View File

@ -137,7 +137,7 @@
</mat-row>
</mat-table>
<mat-paginator [pageSizeOptions]="[5, 10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
<mat-paginator [pageSize]="pageSize" [pageSizeOptions]="[5, 10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
</div>
<!-- <div *ngIf="noRecordFound" style="color: red; font-size: 16px;">No records found</div> -->
<div *ngIf="noRecordFound" class="nocontent">No records found</div>

2
ng6-seed/src/app/settings/masters/component/company/company-list/company-list.component.ts
View File

@ -38,6 +38,8 @@ export class CompanyListComponent implements OnInit {
CompanyList: any = [];
userData = null;
color = 'primary';
// pagination variable details
pageSize = 10;
public dataLength: number;
public dataSource = new MatTableDataSource();

2
ng6-seed/src/app/settings/masters/component/customer-behaviour/customer-behaviour-list/customer-behaviour-list.component.html
View File

@ -140,7 +140,7 @@
</mat-row>
</mat-table>
<mat-paginator *ngIf="!noRecordFound" [pageSizeOptions]="[5, 10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
<mat-paginator *ngIf="!noRecordFound" [pageSize]="pageSize" [pageSizeOptions]="[5, 10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
</div>
<!-- <div *ngIf="noRecordFound" style="color: red; font-size: 16px;">No records found</div> -->

2
ng6-seed/src/app/settings/masters/component/customer-behaviour/customer-behaviour-list/customer-behaviour-list.component.ts
View File

@ -30,6 +30,8 @@ export class CustomerBehaviourListComponent implements OnInit {
noRecordFound: boolean = false;
userData = null;
color = 'primary';
// pagination variable details
pageSize = 10;
public dataLength: number;
public dataSource = new MatTableDataSource();

2
ng6-seed/src/app/settings/masters/component/customer-segment/customer-segment-list/customer-segment-list.component.html
View File

@ -137,7 +137,7 @@
</mat-row>
</mat-table>
<mat-paginator *ngIf="!noRecordFound" [pageSizeOptions]="[5, 10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
<mat-paginator *ngIf="!noRecordFound" [pageSize]="pageSize" [pageSizeOptions]="[5, 10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
</div>
</mat-card-content>

3
ng6-seed/src/app/settings/masters/component/customer-segment/customer-segment-list/customer-segment-list.component.ts
View File

@ -28,6 +28,9 @@ export class CustomerSegmentListComponent implements OnInit {
CustomerSegmentList: any = [];
noRecordFound: boolean = false;
color = 'primary';
// pagination variable details
pageSize = 10;
// displayedColumns = ['customer_segment_id', 'abbr', 'name', 'isactive','actions'];
userData = null;

2
ng6-seed/src/app/settings/masters/component/designation/designation-list/designation-list.component.html
View File

@ -136,7 +136,7 @@
</mat-row>
</mat-table>
<mat-paginator *ngIf="!noRecordFound" [pageSizeOptions]="[5, 10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
<mat-paginator *ngIf="!noRecordFound" [pageSize]="pageSize" [pageSizeOptions]="[5, 10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
</div>
</mat-card-content>

2
ng6-seed/src/app/settings/masters/component/designation/designation-list/designation-list.component.ts
View File

@ -29,6 +29,8 @@ export class DesignationListComponent implements OnInit {
noRecordFound: boolean = false;
DesignationList: any = [];
color = 'primary';
// pagination variable details
pageSize = 10;
userData = null;

2
ng6-seed/src/app/settings/masters/component/frequency/frequency-list/frequency-list.component.html
View File

@ -143,7 +143,7 @@
</mat-row>
</mat-table>
<mat-paginator *ngIf="!noRecordFound" [pageSizeOptions]="[5, 10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
<mat-paginator *ngIf="!noRecordFound" [pageSize]="pageSize" [pageSizeOptions]="[5, 10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
</div>
<!-- <div *ngIf="noRecordFound" class="nocontent">No records found</div> -->

2
ng6-seed/src/app/settings/masters/component/frequency/frequency-list/frequency-list.component.ts
View File

@ -30,6 +30,8 @@ export class FrequencyListComponent implements OnInit {
FrequencyList: any = [];
noRecordFound: boolean = false;
color = 'primary';
// pagination variable details
pageSize = 10;
userData = null;

2
ng6-seed/src/app/settings/masters/component/industry_classification/industry_classification-list/industry_classification-list.component.html
View File

@ -73,7 +73,7 @@
</mat-row>
</mat-table>
<mat-paginator *ngIf="!noRecordFound" [pageSizeOptions]="[5, 10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
<mat-paginator *ngIf="!noRecordFound" [pageSize]="pageSize" [pageSizeOptions]="[5, 10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
</div>
<!-- <div *ngIf="noRecordFound" class="example-container mat-elevation-z8">

2
ng6-seed/src/app/settings/masters/component/industry_classification/industry_classification-list/industry_classification-list.component.ts
View File

@ -39,6 +39,8 @@ export class IndustryClassificationListComponent implements OnInit {
userData = null;
color = 'primary';
// pagination variable details
pageSize = 10;
public dataLength: number;
public dataSource = new MatTableDataSource();

2
ng6-seed/src/app/settings/masters/component/lender-hierarchy/lender-hierarchy-list/lender-hierarchy-list.component.html
View File

@ -133,7 +133,7 @@
</mat-row>
</mat-table>
<mat-paginator *ngIf="!noRecordFound" [pageSizeOptions]="[5, 10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
<mat-paginator *ngIf="!noRecordFound" [pageSize]="pageSize" [pageSizeOptions]="[5, 10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
</div>
<!-- <div *ngIf="noRecordFound" class="nocontent">No records found</div> -->

3
ng6-seed/src/app/settings/masters/component/lender-hierarchy/lender-hierarchy-list/lender-hierarchy-list.component.ts
View File

@ -32,6 +32,9 @@ export class LenderHierarchyListComponent implements OnInit {
loader: boolean = false;
LenderHierarchyList: any = [];
color = 'primary';
// pagination variable details
pageSize = 10;
//displayedColumns = ['lender_hierarchy_id', 'lender_hierarchy','isactive','actions'];
userData = null;

2
ng6-seed/src/app/settings/masters/component/members-occupation/members-occupation-list/members-occupation-list.component.html
View File

@ -151,7 +151,7 @@
</mat-row>
</mat-table>
<mat-paginator *ngIf="!noRecordFound" [pageSizeOptions]="[5, 10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
<mat-paginator *ngIf="!noRecordFound" [pageSize]="pageSize" [pageSizeOptions]="[5, 10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
</div>
<!-- <div *ngIf="noRecordFound" class="nocontent">No records found</div> -->

3
ng6-seed/src/app/settings/masters/component/members-occupation/members-occupation-list/members-occupation-list.component.ts
View File

@ -31,6 +31,9 @@ export class MembersOccupationListComponent implements OnInit {
loader: boolean = false;
MemberOccupationList: any = [];
color = 'primary';
// pagination variable details
pageSize = 10;
userData = null;
noRecordFound: boolean = false;

2
ng6-seed/src/app/settings/masters/component/pd-allocation-type/pd-allocation-type-list.component.html
View File

@ -80,7 +80,7 @@
<mat-row *matRowDef="let row; columns: displayedColumns;"></mat-row>
</mat-table>
<mat-paginator [pageSizeOptions]="[5, 10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
<mat-paginator [pageSize]="pageSize" [pageSizeOptions]="[5, 10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
</div>
<div *ngIf="noRecordFound" class="nocontent">No records found</div>

3
ng6-seed/src/app/settings/masters/component/pd-allocation-type/pd-allocation-type-list.component.ts
View File

@ -29,6 +29,9 @@ export class PdAllocationTypeListComponent implements OnInit {
noRecordFound: boolean = false;
dataSourceRecords = null;
color = 'primary';
// pagination variable details
pageSize = 10;
private notifier: NotifierService;
public dataLength: number;

2
ng6-seed/src/app/settings/masters/component/pd-location-approach/pd-location-approach-list/pd-location-approach-list.component.html
View File

@ -130,7 +130,7 @@
</mat-row>
</mat-table>
<mat-paginator *ngIf="!noRecordFound" [pageSizeOptions]="[5, 10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
<mat-paginator *ngIf="!noRecordFound" [pageSize]="pageSize" [pageSizeOptions]="[5, 10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
</div>
<!-- <div *ngIf="noRecordFound" class="nocontent">No records found</div> -->

3
ng6-seed/src/app/settings/masters/component/pd-location-approach/pd-location-approach-list/pd-location-approach-list.component.ts
View File

@ -37,6 +37,9 @@ export class PdLocationApproachListComponent implements OnInit {
loader: boolean = false;
PdLocationApproachList: any = [];
color = 'primary';
// pagination variable details
pageSize = 10;
userData = null;
noRecordFound: boolean = false;
public dataLength: number;

2
ng6-seed/src/app/settings/masters/component/pd-type/pd-type-list/pd-type-list.component.html
View File

@ -130,7 +130,7 @@
</mat-row>
</mat-table>
<mat-paginator *ngIf="!noRecordFound" [pageSizeOptions]="[5, 10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
<mat-paginator *ngIf="!noRecordFound" [pageSize]="pageSize" [pageSizeOptions]="[5, 10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
</div>
<!-- -->

3
ng6-seed/src/app/settings/masters/component/pd-type/pd-type-list/pd-type-list.component.ts
View File

@ -30,6 +30,9 @@ export class PdTypeListComponent implements OnInit {
PDTypeList: any = [];
noRecordFound: boolean = false;
color = 'primary';
// pagination variable details
pageSize = 10;
userData = null;
public dataLength: number;

6
ng6-seed/src/app/settings/masters/component/product/product-list/product-list.component.html
View File

@ -21,9 +21,9 @@
<input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter">
</mat-form-field>
</div>
<div *ngIf="noRecordFound" class="ml-xs mr-xs" style="width: 10%; text-align: right;">
<div *ngIf="noRecordFound" class="nocontent ml-xs mr-xs" style="width: 90%;">No records found</div>
<div class="ml-xs mr-xs" style="width: 10%; text-align: right;">
<button mat-fab class="mr-1 mb-1" style="margin-top: 7px;" [color]="color" (click)="addProductMaster()" matTooltip="Add Product" matTooltipPosition="above"><mat-icon>add</mat-icon></button>
</div>
</div>
@ -82,7 +82,7 @@
</mat-table>
<!-- <mat-paginator [pageSizeOptions]="[5, 10, 25, 50, 100]" showFirstLastButtons></mat-paginator> -->
<mat-paginator *ngIf="!noRecordFound" [pageSizeOptions]="[5, 10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
<mat-paginator *ngIf="!noRecordFound" [pageSize]="pageSize" [pageSizeOptions]="[5, 10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
</div>
<!-- <div *ngIf="noRecordFound" class="nocontent">No records found</div> -->

2
ng6-seed/src/app/settings/masters/component/product/product-list/product-list.component.ts
View File

@ -31,6 +31,8 @@ export class ProductListComponent implements OnInit {
noRecordFound: boolean = false;
userData = null;
color = 'primary';
// pagination variable details
pageSize = 10;
public dataLength: number;
public dataSource = new MatTableDataSource();

2
ng6-seed/src/app/settings/masters/component/question-category/question-category-list/question-category-list.component.html
View File

@ -74,7 +74,7 @@
</mat-table>
<!-- <mat-paginator [pageSizeOptions]="[5, 10, 25, 50, 100]" showFirstLastButtons></mat-paginator> -->
<mat-paginator *ngIf="!noRecordFound" [pageSizeOptions]="[5, 10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
<mat-paginator *ngIf="!noRecordFound" [pageSize]="pageSize" [pageSizeOptions]="[5, 10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
</div>
<div *ngIf="noRecordFound" class="nocontent">No records found</div>

2
ng6-seed/src/app/settings/masters/component/question-category/question-category-list/question-category-list.component.ts
View File

@ -29,6 +29,8 @@ export class QuestionCategoryListComponent implements OnInit {
noRecordFound: boolean = false;
userData = null;
color = 'primary';
// pagination variable details
pageSize = 10;
public dataLength: number;
public dataSource = new MatTableDataSource();

5
ng6-seed/src/app/settings/masters/component/regions/regions-list/regions-list.component.html
View File

@ -11,7 +11,7 @@
<button mat-fab class="mr-1 mb-1" style="margin-top: 7px;" [color]="color" (click)="addregions()" matTooltip="Add Region" matTooltipPosition="above"><mat-icon>add</mat-icon></button>
</div>
</div>
</div>
<mat-table *ngIf="!noRecordFound" [dataSource]="dataSource" matSort >
@ -58,6 +58,7 @@
<mat-row *matRowDef="let row; columns: displayedColumns;">
</mat-row>
</mat-table>
<mat-paginator *ngIf="!noRecordFound" [pageSize]="pageSize" [pageSizeOptions]="[5, 10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
</div>
</mat-card-content>
<notifier-container></notifier-container>

2
ng6-seed/src/app/settings/masters/component/regions/regions-list/regions-list.component.ts
View File

@ -32,6 +32,8 @@ export class RegionsListComponent implements OnInit {
noRecordFound: boolean = false;
color = 'primary';
userData = null;
// pagination variable details
pageSize = 10;
public dataLength: number;
public dataSource = new MatTableDataSource();

2
ng6-seed/src/app/settings/masters/component/relation-ship/relation-ship-list/relation-ship-list.component.html
View File

@ -153,7 +153,7 @@
</mat-row>
</mat-table>
<mat-paginator *ngIf="!noRecordFound" [pageSizeOptions]="[5, 10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
<mat-paginator *ngIf="!noRecordFound" [pageSize]="pageSize" [pageSizeOptions]="[5, 10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
</div>
<!-- <div *ngIf="noRecordFound" class="nocontent">No records found</div> -->

3
ng6-seed/src/app/settings/masters/component/relation-ship/relation-ship-list/relation-ship-list.component.ts
View File

@ -29,6 +29,9 @@ export class RelationShipListComponent implements OnInit {
RelationShipList: any = [];
noRecordFound: boolean = false;
color = 'primary';
// pagination variable details
pageSize = 10;
//displayedColumns = ['relationship_id','name','createdon','fk_createdby','updatedon','isactive','fk_updatedby','actions'];
//relationship_id, name, createdon, fk_createdby, updatedon, fk_updatedby, isactive

2
ng6-seed/src/app/settings/masters/component/states/states-list/states-list.component.html
View File

@ -176,7 +176,7 @@
</mat-row>
</mat-table>
<mat-paginator *ngIf="!noRecordFound" [pageSizeOptions]="[5, 10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
<mat-paginator *ngIf="!noRecordFound" [pageSize]="pageSize" [pageSizeOptions]="[5, 10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
</div>

3
ng6-seed/src/app/settings/masters/component/states/states-list/states-list.component.ts
View File

@ -29,6 +29,9 @@ export class StatesListComponent implements OnInit {
loader: boolean = false;
StateList: any = [];
color = 'primary';
// pagination variable details
pageSize = 10;
noRecordFound: boolean = false;
//displayedColumns = ['states_id', 'fk_city_id', 'name', 'createdon', 'fk_createdby', 'updatedon', 'fk_updatedby', 'isactive','actions'];

6
ng6-seed/src/app/settings/masters/component/sub-product/sub-product-list/sub-product-list.component.html
View File

@ -104,9 +104,9 @@
<input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter">
</mat-form-field>
</div>
<div *ngIf="noRecordFound" class="ml-xs mr-xs" style="width: 10%; text-align: right;">
<div *ngIf="noRecordFound" class="nocontent ml-xs mr-xs" style="width: 90%;">No records found</div>
<div class="ml-xs mr-xs" style="width: 10%; text-align: right;">
<button mat-fab class="mr-1 mb-1" style="margin-top: 7px;" [color]="color" (click)="addSubProductMaster()" matTooltip="Add Sub Product" matTooltipPosition="above"><mat-icon>add</mat-icon></button>
</div>
</div>
@ -165,7 +165,7 @@
</mat-row>
</mat-table>
<mat-paginator *ngIf="!noRecordFound" [pageSizeOptions]="[5, 10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
<mat-paginator *ngIf="!noRecordFound" [pageSize]="pageSize" [pageSizeOptions]="[5, 10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
</div>
<!-- <div *ngIf="noRecordFound" class="nocontent">No records found</div> -->

2
ng6-seed/src/app/settings/masters/component/sub-product/sub-product-list/sub-product-list.component.ts
View File

@ -33,6 +33,8 @@ export class SubProductListComponent implements OnInit {
userData = null;
noRecordFound: boolean = false;
// pagination variable details
pageSize = 10;
public dataLength: number;
public dataSource = new MatTableDataSource();

2
ng6-seed/src/app/settings/masters/component/title/title-list/title-list.component.html
View File

@ -149,7 +149,7 @@
</mat-row>
</mat-table>
<mat-paginator *ngIf="!noRecordFound" [pageSizeOptions]="[5, 10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
<mat-paginator *ngIf="!noRecordFound" [pageSize]="pageSize" [pageSizeOptions]="[5, 10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
</div>
<!-- <div *ngIf="noRecordFound" class="nocontent">No records found</div> -->

3
ng6-seed/src/app/settings/masters/component/title/title-list/title-list.component.ts
View File

@ -27,6 +27,9 @@ export class TitleListComponent implements OnInit {
TitleList: any = [];
noRecordFound: boolean = false;
color = 'primary';
// pagination variable details
pageSize = 10;
//displayedColumns = ['title_id','name','createdon','fk_createdby','updatedon','isactive','fk_updatedby','actions'];
//title_id, name, createdon, fk_createdby, updatedon, fk_updatedby, isactive

2
ng6-seed/src/app/settings/masters/component/type-of-activity/activity-list/activity-list.component.html
View File

@ -143,7 +143,7 @@
</mat-row>
</mat-table>
<mat-paginator *ngIf="!noRecordFound" [pageSizeOptions]="[5, 10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
<mat-paginator *ngIf="!noRecordFound" [pageSize]="pageSize" [pageSizeOptions]="[5, 10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
</div>

3
ng6-seed/src/app/settings/masters/component/type-of-activity/activity-list/activity-list.component.ts
View File

@ -33,6 +33,9 @@ export class ActivityListComponent implements OnInit {
userData = null;
noRecordFound: boolean = false;
color = 'primary';
// pagination variable details
pageSize = 10;
public dataLength: number;
public dataSource = new MatTableDataSource();
displayedColumns = ['serialno','name','actions', 'isactive'];

2
ng6-seed/src/app/settings/masters/component/uom/uom-list/uom-list.component.html
View File

@ -70,7 +70,7 @@
</mat-row>
</mat-table>
<mat-paginator *ngIf="!noRecordFound" [pageSizeOptions]="[5, 10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
<mat-paginator *ngIf="!noRecordFound" [pageSize]="pageSize" [pageSizeOptions]="[5, 10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
</div>
<!-- <div *ngIf="noRecordFound" class="nocontent">No records found</div> -->

3
ng6-seed/src/app/settings/masters/component/uom/uom-list/uom-list.component.ts
View File

@ -33,6 +33,9 @@ export class UomListComponent implements OnInit {
loader: boolean = false;
UOMList: any = [];
color = 'primary';
// pagination variable details
pageSize = 10;
//displayedColumns = ['uom_id','name','createdon','fk_createdby','updatedon','isactive','fk_updatedby','actions'];
//uom_id, name, createdon, fk_createdby, updatedon, fk_updatedby, isactive

10
ng6-seed/src/app/settings/masters/masters.component.html
View File

@ -89,12 +89,12 @@
<div *ngIf="masterCtrl.value =='master-24'">
<app-pd-notification-list></app-pd-notification-list>
</div>
<div *ngIf="masterCtrl.value =='master-25'">
<!-- <app-pd-office-lender-list></app-pd-office-lender-list>
</div>
<div *ngIf="masterCtrl.value =='master-26'">-->
<!-- <app-pd-team-list></app-pd-team-list> -->
<!--<div *ngIf="masterCtrl.value =='master-25'">
<app-pd-office-lender-list></app-pd-office-lender-list>
</div>
<div *ngIf="masterCtrl.value =='master-26'">
<app-pd-team-list></app-pd-team-list>
</div>-->
</mat-card>

2
ng6-seed/src/app/settings/masters/masters.component.ts
View File

@ -125,7 +125,7 @@ export class MastersComponent implements OnInit {
{id: 'master-23',name: 'PD Allocation Type'},
{id: 'master-24',name: 'PD Notification'},
// {id: 'master-25',name: 'PD Office Lender'},
{id: 'master-25',name: 'PD Team'},
// {id: 'master-25',name: 'PD Team'},
];

6
ng6-seed/src/app/settings/pd-team/pd-team-add/pd-team-add.component.html
View File

@ -28,7 +28,7 @@
<div fxLayout="row wrap" fxLayoutGap="32px" fxLayoutAlign="flex-start">
<mat-form-field fxFlex="0 1 auto" class="ml-xs">
<mat-select placeholder="City" required formControlName="fk_city" multiple>
<mat-option *ngFor="let cd of citydatas" [value]="cd" (onSelectionChange)="onChangeCityDatas($event)" >{{ cd.name }} </mat-option>
<mat-option *ngFor="let cd of citydatas" [value]="cd.city_id" (onSelectionChange)="onChangeCityDatas($event)" >{{ cd.name }} </mat-option>
</mat-select>
<mat-error *ngIf="submitted && f.fk_city.hasError('required')" class="mat-text-warn">You must Select Cities.</mat-error>
</mat-form-field>
@ -47,7 +47,7 @@
<div fxLayout="row wrap" fxLayoutGap="32px" fxLayoutAlign="flex-start">
<mat-form-field fxFlex="0 1 auto" class="ml-xs">
<mat-select placeholder="Product" required formControlName="fk_product" multiple>
<mat-option *ngFor="let pd of productdatas " [value]="pd" (onSelectionChange)="onChangeProductDatas($event)" >{{ pd.name }} </mat-option>
<mat-option *ngFor="let pd of productdatas " [value]="pd.product_id" (onSelectionChange)="onChangeProductDatas($event)" >{{ pd.name }} </mat-option>
</mat-select>
<mat-error *ngIf="submitted && f.fk_product.hasError('required')" class="mat-text-warn">You must Select Product.</mat-error>
</mat-form-field>
@ -64,7 +64,7 @@
<mat-form-field fxFlex="0 1 auto" class="ml-xs">
<mat-select placeholder="Customer Segment" required formControlName="fk_customer_segment" multiple>
<mat-option *ngFor="let csd of customerSegmentdatas" [value]="csd" (onSelectionChange)="onChangeCustomerSegmentDatas($event)">{{csd.name}}</mat-option>
<mat-option *ngFor="let csd of customerSegmentdatas" [value]="csd.customer_segment_id" (onSelectionChange)="onChangeCustomerSegmentDatas($event)">{{csd.name}}</mat-option>
</mat-select>
<mat-error *ngIf="submitted && f.fk_customer_segment.hasError('required')" class="mat-text-warn">You must Select Customer Segment.</mat-error>
</mat-form-field>

105
ng6-seed/src/app/settings/pd-team/pd-team-add/pd-team-add.component.ts
View File

@ -10,8 +10,9 @@ import { FormBuilder,
import { MastersService } from '../../service/masters/masters.service';
import { PdTeamService } from '../../service/masters/pd-team.service';
import { NotifierService } from 'angular-notifier';
import { PdTeamDialogComponent } from '../pd-team-dialog/pd-team-dialog.component';
import { Router } from '@angular/router';
import { empty } from 'rxjs';
@Component({
selector: 'app-pd-team-add',
@ -21,6 +22,7 @@ import { Router } from '@angular/router';
export class PdTeamAddComponent implements OnInit {
public _pdTeamForm: FormGroup;
private notifier: NotifierService;
public submitted = false;
color = 'primary';
errorMessage:string;
@ -32,7 +34,7 @@ productdatas: any[];
customerSegmentdatas: any[];
//This Type Of Array Declaration
pdTeamCityArray: Array<{teamid: number, cityid: number}> = [];
pdTeamCityArray:any= [];
pdTeamProductArray: Array<{teamid: number, productid: number}> = [];
pdTeamCustomerSegmentArray: Array<{teamid: number, customerid: number}> = [];
@ -47,13 +49,24 @@ constructor(private _formBuilder: FormBuilder,
private _router: Router,
private _masterService: MastersService)
{
this._notifier = _notifier;
this.notifier = _notifier;
}
ngOnInit() {
this.PdTeamFormDatas();
/** For Checking City Validation datas - checking purpose - Already exists are not */
this._pdTeamService.getAllPdTeamCityMapping()
.subscribe(
dataresult => {
if(dataresult.dataStatus == true){
//this.AllPDTeamMapData = dataresult.records;
this.pdTeamCityArray = dataresult.records;
}
});
// console.log('All Datas for Validation purpose',this.pdTeamCityArray);
/** To Display The City Data For City DropDown */
this._masterService.getAllMasterData('CITY').subscribe(
dataresult => {
@ -117,69 +130,87 @@ onNoClick(): void {
/** To Save/Edited Popup Data */
onSubmit() {
this.submitted = true;
// stop here if form is invalid
if (this._pdTeamForm.invalid) {
// this.errorMessage = "Please Fill All Mandate Fields.";
// return;
alert('Please Fill All Mandate Fields.');
} else {
var pdTeamFormValues = this._pdTeamForm.value;
//To Remove The "Null" With Key also
Object.keys(pdTeamFormValues).forEach(
(key) => ( pdTeamFormValues[key] == null) && delete pdTeamFormValues[key]);
// stop here if form is invalid
// if (pdTeamFormValues.invalid) {
// // this.errorMessage = "Please Fill All Mandate Fields.";
// // return;
// alert('Please Fill All Mandate Fields.');
// } else {
//To Remove The "Null" With Key also
this._pdTeamService.addPdTeamDetail(this._pdTeamForm.value).subscribe(
dataresult => {
if (dataresult.status == 200) {
console.log(dataresult);
this._notifier.notify('success', 'Record Edited Successfully.!');
// alert('Record Successfully.!');
this.notifier.notify('success', 'Record Edited Successfully.!');
alert('Success.!');
this._router.navigate(['/setting/pdteam/pdteamlist']);
this._pdTeamForm.reset();
}
else {
this._notifier.notify('warning', 'Something Wents Wrong Try Again.!');
this.notifier.notify('warning', 'Something Wents Wrong Try Again.!');
alert('Wrong.!');
//alert('Some Thing Wents Wrong Try Again !');
//this.errorMessage = "Some Thing Wents Wrong Try Again !";
}
}, error => {
this._notifier.notify('warning', 'Something Wents Wrong Try Again.!');
// this.errorMessage = "Something Wents Wrong Try Again !";
//alert('Some Thing Wents Wrong Try Again !');
});
}
}
/** To Reset Popup Data For Add*/
onResetForAdd(){
alert("reset function");
}
/**on change function for customer segment to dispaly the as List in html page */
onChangeCustomerSegmentDatas($event){
let CustomerSegmentName = $event.source.value.name;
//let CustomerSegmentName = $event.source.value.name;
let CustomerSegmentName = this.customerSegmentdatas.filter(cs=>cs.customer_segment_id == $event.source.value)[0];
if($event.source._selected === true ){
this.selectedSegmentDatas.push(CustomerSegmentName);
this.selectedSegmentDatas.push(CustomerSegmentName.name);
}
else if($event.source._selected === false ){
let index = this.selectedSegmentDatas.indexOf(CustomerSegmentName);
let index = this.selectedSegmentDatas.indexOf(CustomerSegmentName.name);
this.selectedSegmentDatas.splice(index,1);
}
}
/**on change function for City to display the as List in html page */
onChangeCityDatas($event){
var mycheck = 0 ;
//let cityName = $event.source.value;
let cityName = this.citydatas.filter(city=>city.city_id == $event.source.value)[0];
let cityName = $event.source.value.name;
if($event.source._selected === true ){
this.selectedCityDatas.push(cityName);
for(let Duplication_City of this.pdTeamCityArray){
let teamname = Duplication_City.team_name;
let dup_cityname = Duplication_City.CITYMAP.filter(city=>city.city_id == $event.source.value);
if(dup_cityname != ''){
for(let data of dup_cityname){
if(data.name == cityName.name){
alert('"'+data.name+'" Already Existing with "'+ teamname +'"');
$event.source._selected = false;
mycheck++;
}
}
}
}
if(mycheck == 0){
this.selectedCityDatas.push(cityName.name);
}
}
else if($event.source._selected === false ){
let index = this.selectedCityDatas.indexOf(cityName);
let index = this.selectedCityDatas.indexOf(cityName.name);
this.selectedCityDatas.splice(index,1);
}
@ -188,12 +219,14 @@ onChangeCityDatas($event){
/**on change function for Product to display the data as List in html page */
onChangeProductDatas($event){
let productName = $event.source.value.name;
//let productName = $event.source.value.name;
let productName = this.productdatas.filter(product=>product.product_id == $event.source.value )[0];
if($event.source._selected === true ){
this.selectedProductDatas.push(productName);
this.selectedProductDatas.push(productName.name);
}
else if($event.source._selected === false ){
let index = this.selectedProductDatas.indexOf(productName);
let index = this.selectedProductDatas.indexOf(productName.name);
this.selectedProductDatas.splice(index,1);
}

86
ng6-seed/src/app/settings/pd-team/pd-team-dialog/pd-team-dialog.component.html
View File

@ -1,86 +0,0 @@
<div class="ml-xs mr-xs" style="width: 100%;"
fxLayout="row"
fxLayoutAlign="center">
<h2 mat-dialog-title style="width: 70%;"> PD Team Details &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</h2>
<div style="width: 30%;text-align:right;">
<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button>
</div>
</div>
<form [formGroup]="_pdTeamForm" (submit)="onSubmit()">
<div class="form-group">
<mat-dialog-content>
<div class="ml-xs mr-xs">
<mat-form-field style="width: 100%">
<input matInput type="text" placeholder="Team Name" required [formControl]="_pdTeamForm.controls['team_name']">
<mat-error *ngIf="!_pdTeamForm.controls['team_name'].valid && _pdTeamForm.controls['team_name'].touched" class="mat-text-warn">You must include a team name.</mat-error>
</mat-form-field>
</div>
<div class="ml-xs mr-xs">
<mat-form-field>
<mat-select placeholder="Pick Up Lender Name" required [formControl]="_pdTeamForm.controls['fk_lender_id']" (selectionChange)="doSomething()" >
<mat-option *ngFor="let ld of lenderdatas" [value]="ld" >{{ ld.short_name }} {{ ld.full_name }} </mat-option>
</mat-select>
<mat-error *ngIf="!_pdTeamForm.controls['fk_lender_id'].valid && _pdTeamForm.controls['fk_lender_id'].touched" class="mat-text-warn">You must Pick up Lender Name.</mat-error>
</mat-form-field>
</div>
<div class="ml-xs mr-xs">
<mat-form-field>
<mat-select placeholder="Pick Up City name" required [formControl]="_pdTeamForm.controls['fk_city_id']" (selectionChange)="doSomething()" >
<mat-option *ngFor="let cd of citydatas" [value]="cd">{{ cd.name }}</mat-option>
</mat-select>
<mat-error *ngIf="!_pdTeamForm.controls['fk_city_id'].valid && _pdTeamForm.controls['fk_city_id'].touched" class="mat-text-warn">You must Pick Up the City Name.</mat-error>
</mat-form-field>
</div>
<table>
<thead>
<th style="text-align: center;">S.no</th>
<th style="text-align: left;">Lender Name</th>
<th style="text-align: left;">City Name</th>
<th style="text-align: right;">Action</th>
</thead>
<tr *ngFor="let PD of PDTeamMapping; let i=index">
<td style="text-align: center;">{{i+1}}</td>
<td style="text-align: left;">{{PD.lender_name }}</td>
<td style="text-align: left;">{{PD.city_name }}</td>
<td style="text-align: right;">
<button mat-icon-button class="hover-icon" matTooltip="RemoveData" matTooltipPosition="above" type="button" (click)="deletePdTeamMap(PD,i)"><mat-icon>delete</mat-icon></button>
</td>
</tr>
<tr *ngFor="let PM of tempArray; let i=index">
<td style="text-align: center;" >{{i+PDTeamMaplen+1}}</td>
<td style="text-align: left;">{{PM.lenderid.full_name}}</td>
<td style="text-align: left;">{{PM.cityid.name}}</td>
<td style="text-align: right;">
<button mat-icon-button matTooltip="RemoveData" matTooltipPosition="above" (click)="removevalue(i)"><mat-icon>delete</mat-icon></button>
</td>
</tr>
</table>
<hr><br>
<div class="row" style="text-align:right;">
<!-- <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" [color]='color' matTooltip="Reset" matTooltipPosition="above" type="reset" ><mat-icon>settings_backup_restore</mat-icon></button> -->
<!-- <button *ngIf="_pdTeamForm.controls['pdteam_id']);else Editreset;" mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" [color]='color' matTooltip="Reset" matTooltipPosition="above" type="reset" ><mat-icon>settings_backup_restore</mat-icon></button> -->
<button *ngIf="isEmptyObject(_pdTeamForm.controls['pdteam_id']);else Editreset;"
mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Reset" matTooltipPosition="above" type="button" (click)="onResetForAdd()" ><mat-icon>settings_backup_restore</mat-icon></button>
<ng-template #Editreset>
<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Reset" matTooltipPosition="above" type="button" (click)="onResetForEdit()" ><mat-icon>settings_backup_restore</mat-icon></button>
</ng-template>
<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Save" matTooltipPosition="above" type="submit" [disabled]="!_pdTeamForm.valid"><mat-icon>save</mat-icon></button>
</div>
</mat-dialog-content>
</div>
</form>
<notifier-container></notifier-container>

3
ng6-seed/src/app/settings/pd-team/pd-team-dialog/pd-team-dialog.component.scss
View File

@ -1,3 +0,0 @@
mat-form-field{
width:100%;
}

25
ng6-seed/src/app/settings/pd-team/pd-team-dialog/pd-team-dialog.component.spec.ts
View File

@ -1,25 +0,0 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { PdTeamDialogComponent } from './pd-team-dialog.component';
describe('PdTeamDialogComponent', () => {
let component: PdTeamDialogComponent;
let fixture: ComponentFixture<PdTeamDialogComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ PdTeamDialogComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(PdTeamDialogComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

537
ng6-seed/src/app/settings/pd-team/pd-team-dialog/pd-team-dialog.component.ts
View File

@ -1,537 +0,0 @@
import { Component,
OnInit,
Inject } from '@angular/core';
import { FormBuilder,
FormGroup,
Validators,
FormControl } from '@angular/forms';
import { MatDialog,
MatDialogRef,
MAT_DIALOG_DATA } from '@angular/material';
/** Service */
import { MastersService } from '../../service/masters/masters.service';
import { PdTeamService } from '../../service/masters/pd-team.service';
import { NotifierService } from 'angular-notifier';
@Component({
selector: 'app-pd-team-dialog',
templateUrl: './pd-team-dialog.component.html',
styleUrls: ['./pd-team-dialog.component.scss']
})
export class PdTeamDialogComponent implements OnInit {
public _pdTeamForm: FormGroup;
private notifier: NotifierService;
color = 'primary';
citydatas: any[];
lenderdatas: any[];
errorMessage:string;
selectedValueForLender: any;
selectedValueForCity: any;
tempArray: Array<{lenderid: number, cityid: number}> = [];
PDTeamMapping: any[];
AllPDTeamMapData: any[];
PDTeamMaplen:any = 0;
constructor(private _formBuilder: FormBuilder,notifier: NotifierService,
private dialogRef: MatDialogRef<PdTeamDialogComponent>,
private _pdTeamService: PdTeamService,
private _masterService: MastersService,
@Inject(MAT_DIALOG_DATA) public data: any) {
this.notifier = notifier;
}
ngOnInit() {
this.PdTeamFormDatas();
if(isNaN(this.data.pdteam_id)){}
else{
this._pdTeamService.getAllPdTeamMapListWithPK(this.data.pdteam_id) // note, removed this.countries =
.subscribe(
dataresult => {
if(dataresult.dataStatus == true){
this.PDTeamMapping = dataresult.records;
this.PDTeamMaplen = this.PDTeamMapping.length;
}
});
}
this._pdTeamService.getAllPdTeamMapList() // note, removed this.countries =
.subscribe(
dataresult => {
if(dataresult.dataStatus == true){
this.AllPDTeamMapData = dataresult.records;
}
});
/** For City Drop Datas*/
this._masterService.getAllMasterData('CITY')
.subscribe(
dataresult => {
if (dataresult.status == 200) {
this.citydatas = dataresult.records;
this.citydatas = this.citydatas.filter(city=>city.isactive == 1 );
}
}, error => this.errorMessage = <any> error);
/** For Entity Drop Datas*/
this._masterService.getAllMasterData('ENTITY')
.subscribe(
dataresult => {
if (dataresult.status == 200) {
this.lenderdatas = dataresult.records;
this.lenderdatas = this.lenderdatas.filter(entity=>entity.isactive == 1 );
}
}, error => this.errorMessage = <any> error);
}
/** Pd Team Form Datas */
PdTeamFormDatas(){
this._pdTeamForm = this._formBuilder.group({
pdteam_id: [this.data.pdteam_id],
team_name: [this.data.team_name, Validators.compose([Validators.required])],
fk_city_id: [null, Validators.compose([Validators.required])],
fk_lender_id: [null, Validators.compose([Validators.required])],
temp_array: [this.tempArray]
});
}
// isactivePDTeamChild(PD.pdteam_map_id,PD.isactive)
isactivePDTeamChild(id: number,isactive : number) {
let ActiveDatas = isactive == 0
? { 'pdteam_map_id':id,'isactive': '1'}
: { 'pdteam_map_id':id,'isactive': '0'}
//private _masterService: MastersService,
this._masterService.editMasterDetails(ActiveDatas,'PDTEAMMAP')
.subscribe(dataresult=>{
if (dataresult.dataStatus == true){
//alert("Successfully InActive !");
this.notifier.notify('success', 'Record Successfully InActive.!');
}
else{
//alert("SomeThing Wents Wrong Try Again !");
this.notifier.notify('warning', 'Sorry Try Again !');
}
});
}
// deletePdTeamMap(arr: any) {
// //console.log(arr);
// //var PrimaryKeyWithValue ={'pdteam_map_id':arr.id};
// //fk_team_id
// this._pdTeamService.updatePdTeam(arr)
// .subscribe( data => { });
// this._pdTeamService.deletePdTeamMap(arr)
// .subscribe( data => { });
// //this.getPdTeam();
// }
deletePdTeamMap(PdTeamMaparr,i) {
let datas :any = [];
this._pdTeamService.deletePdTeamMapDetails(PdTeamMaparr)
.subscribe(data => {
datas = data;
if(datas.dataStatus == true){
this.PDTeamMapping.splice(i, 1);
//alert('Deleted Successfully');
}
});
}
removevalue(i:number) {
//const index: number = this.tempArray.indexOf(i);
if (i !== -1) {
this.tempArray.splice(i, 1);
}
//console.log('delete function',this.tempArray);
}
doSomething(){
var check = 0 ;
// console.log(this._pdTeamForm.controls['fk_city_id'].value.city_id);
// console.log(this._pdTeamForm.controls['fk_lender_id'].value.entity_id);
if((this._pdTeamForm.controls['fk_city_id'].value.city_id != '')
&&(this._pdTeamForm.controls['fk_lender_id'].value.entity_id != ''))
{
this.tempArray.forEach(item => {
if((item.cityid['city_id'] == this._pdTeamForm.controls['fk_city_id'].value.city_id) &&
(item.lenderid['entity_id'] == this._pdTeamForm.controls['fk_lender_id'].value.entity_id))
{
check++;
//alert('');
this.notifier.notify('info', 'Already Exists.!');
}
});
if(this.AllPDTeamMapData !== undefined){
this.AllPDTeamMapData.forEach(item => {
if(item.fk_team_id != this._pdTeamForm.controls['pdteam_id'].value){
if((item.fk_city_id == this._pdTeamForm.controls['fk_city_id'].value.city_id) &&
(item.fk_lender_id == this._pdTeamForm.controls['fk_lender_id'].value.entity_id))
{
check++;
//this.notifier.notify('success', 'Already Exists.!');
//alert('Already Exists on Other Team "'+item.team_name+'"');
this.notifier.notify( 'info', 'Already Exists on Other Team'+item.team_name );
}
}
});
}
if(isNaN(this.data.pdteam_id)) {}
else{
// console.log(this.PDTeamMapping.length);
if(this.PDTeamMapping !== undefined){
this.PDTeamMapping.forEach(item => {
if((item.fk_city_id == this._pdTeamForm.controls['fk_city_id'].value.city_id) &&
(item.fk_lender_id == this._pdTeamForm.controls['fk_lender_id'].value.entity_id))
{
check++;
//alert('Already Exists');
this.notifier.notify( 'info', 'Already Exists');
}
});
}
}
}
// this.tempArray.forEach(this.data, function (value, key) {
// if((value.cityid.city_id == this._pdTeamForm.controls['fk_city_id'].value.city_id) &&
// (value.lenderid.entity_id == this._pdTeamForm.controls['fk_lender_id'].value.entity_id))
// {
// check++;
// console.log('for loop');
// }
// });
if(check == 0){
if((this._pdTeamForm.controls['fk_lender_id'].value != null) && (this._pdTeamForm.controls['fk_city_id'].value != null)){
this.tempArray.push({
'lenderid':this._pdTeamForm.controls['fk_lender_id'].value,
'cityid': this._pdTeamForm.controls['fk_city_id'].value
})
}
//console.log('if condition',check);
}
else{
//console.log('else condition',check);
}
// console.log('Temparray',this.tempArray);
// console.log(this._pdTeamForm.controls['fk_city_id'].value);
// console.log(this._pdTeamForm.controls['fk_lender_id'].value);
}
/** For Popup Close Button */
onNoClick(): void {
this.dialogRef.close();
}
// OnSumbitForAdd(){
// this._pdTeamForm.controls['team_name'].value;
// this._pdTeamService.addPdTeamDetail(pdTeamFormValues).subscribe(
// dataresult=>{
// if (dataresult.dataStatus == true){ }
// })
// }
/** To Save/Edited Popup Data */
onSubmit() {
var pdTeamFormValues = this._pdTeamForm.value;
if(isNaN(this.data.pdteam_id)) {
//console.log(pdTeamFormValues);
//To Remove The "Null" With Key
Object.keys(pdTeamFormValues).forEach(
//getAllPdTeam();
(key) => ( pdTeamFormValues[key] == null) && delete pdTeamFormValues[key] &&
delete pdTeamFormValues['fk_lender_id'] && delete pdTeamFormValues['fk_city_id']);
//this.lenderdatas = this.lenderdatas.filter(entity=>entity.isactive == 1 );
//this.lenderdatas = this.lenderdatas.filter(entity=>entity.isactive == 1 );
//console.log(pdTeamFormValues);
//this._memberService.addMasterDetails(OccupationFormValues,'OCCUPATIONMEMBERS').subscribe(
this._pdTeamService.addPdTeamDetail(pdTeamFormValues).subscribe(
dataresult=>{
console.log(dataresult);
if (dataresult.dataStatus == true){
//After Saving the data then popup close
this.dialogRef.close();
//Need To Dispaly saving Datas
// alert("Data Saved Successfully");
this.notifier.notify('success', 'Record Saved Successfully.!');
}
else{
//alert("");
this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !');
}
});
} else {
Object.keys(pdTeamFormValues).forEach(
(key) => delete pdTeamFormValues['fk_lender_id'] && delete pdTeamFormValues['fk_city_id']);
this._pdTeamService.editPdTeamDetail(pdTeamFormValues).subscribe(
dataresult=>{
if (dataresult.dataStatus == true){
//After Editing the data then popup close
this.dialogRef.close();
//Need To Display saving Datas
//alert("Data Edited Successfully");
this.notifier.notify('success', 'Record Edited Successfully.!');
}
else{
//alert("SomeThing Wents Wrong Try Again !");
this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !');
}
});
}
}
// onSubmit() {
// if (isNaN(this.data.ID)) {
// this._memberService.addMembersOccupation(this._occupationForm.value);
// this.dialogRef.close();
// } else {
// this._memberService.editMembersOccupation(this._occupationForm.value);
// this.dialogRef.close();
// }
// }
/** To Reset Popup Data For Add*/
onResetForAdd(){
this._pdTeamForm.reset();
this.tempArray = [];
//console.log(this.tempArray);
}
/** To Reset Popup Data For Edit*/
onResetForEdit(){
this.PdTeamFormDatas();
this.tempArray = [];
}
isEmptyObject(obj) {
return (obj && (Object.keys(obj).length === 0));
}
}
/** End Of Pd Dialog Component */
/*
import { Component,
OnInit,
ViewChild,
Inject } from '@angular/core';
import { FormBuilder,
FormGroup,
FormArray,
Validators,
FormControl } from '@angular/forms';
import { MatDialog,
MatOption,
MatDialogRef,
MAT_DIALOG_DATA } from '@angular/material';
/** Service *
import { MastersService } from '../../../../service/masters/masters.service';
import { PdTeamService } from '../../../../service/masters/pd-team.service';
@Component({
selector: 'app-pd-team-dialog',
templateUrl: './pd-team-dialog.component.html',
styleUrls: ['./pd-team-dialog.component.scss']
})
export class PdTeamDialogComponent implements OnInit {
public _pdTeamForm: FormGroup;
citydatas: any[];
lenderdatas: any[];
errorMessage:string;
@ViewChild('allSelected') private allSelected: MatOption;
constructor(private _formBuilder: FormBuilder,
private dialogRef: MatDialogRef<PdTeamDialogComponent>,
private _MastersService: MastersService,
private _PdTeamService: PdTeamService,
@Inject(MAT_DIALOG_DATA) public data: any) { }
ngOnInit() {
this._pdTeamForm = this._formBuilder.group({
pdteam_id: [this.data.pdteam_id],
team_name: [this.data.team_name, Validators.compose([Validators.required])],
fk_city_id: [this.data.fk_city_id, Validators.compose([Validators.required])],
fk_lender_id: [this.data.fk_lender_id, Validators.compose([Validators.required])],
// city_ids: this._formBuilder.array([
// this._formBuilder.group({
// pdteam_city_mapping_id: [this.data.pdteam_city_mapping_id],
// fk_team_id:[this.data.pdteam_id],
// fk_city_id: [this.data.fk_city_id]
// })
// ])
// city_ids: [this._formBuilder.group({
// pdteam_city_mapping_id: [this.data.pdteam_city_mapping_id],
// fk_team_id:[this.data.pdteam_id],
// fk_city_id: [this.data.fk_city_id, Validators.compose([Validators.required])],
// })
// ]
// fk_city_id: this._formBuilder.array([this.data.fk_city_id, Validators.compose([Validators.required])])
});
console.log(this._pdTeamForm);
/** For SelectDrop Datas For Multiple Datas*
// this._MastersService.getAllMasterData('CITY')
// .subscribe(
// data => {
// let userRole:any = [];
// if (data.status == 200) {
// this.citydatas = data.records;
// this.citydatas = this.citydatas.filter(city=>city.isactive == 1 );
// if(this.data.pdteam_id != null){
// for (let cities of this.data[0]) {
// //console.log(role);
// userRole.push(this.citydatas.filter(city => city.city_id == cities.fk_city_id)[0]);
// this._pdTeamForm.controls['fk_city_id'].setValue(userRole);
// }
// console.log(userRole);
// }
// }
// }, error => this.errorMessage = <any> error);
/** For Drop Datas*
this._MastersService.getAllMasterData('CITY')
.subscribe(
dataresult => {
if (dataresult.status == 200) {
this.citydatas = dataresult.records;
this.citydatas = this.citydatas.filter(city=>city.isactive == 1 );
}
}, error => this.errorMessage = <any> error);
/** For Drop Datas*
this._MastersService.getAllMasterData('ENTITY')
.subscribe(
dataresult => {
if (dataresult.status == 200) {
this.lenderdatas = dataresult.records;
this.lenderdatas = this.lenderdatas.filter(entity=>entity.isactive == 1 );
}
}, error => this.errorMessage = <any> error);
}
//pdteam_id, team_name, createdon, fk_createdby, updatedon, fk_updatedby, isactive
/** For Popup Close Button *
onNoClick(): void {
this.dialogRef.close();
}
//pdteam_id, team_name, createdon, fk_createdby, updatedon, fk_updatedby, isactive
/** To Save/Edited Popup Data *
onSubmit() {
var pdTeamFormValues = this._pdTeamForm.value;
console.log('b4 null val pdTeamFormValues',pdTeamFormValues);
if(isNaN(this.data.pdteam_id)) {
Object.keys(pdTeamFormValues).forEach(
(key) => (pdTeamFormValues[key] == null) && delete pdTeamFormValues[key]
);
console.log('After null val pdTeamFormValues',pdTeamFormValues);
// // var start_index = 2
// // var number_of_elements_to_remove = 1;
// // var removed_elements = pdTeamFormValues.splice(start_index, number_of_elements_to_remove);
// // console.log(removed_elements);
// //["k"]
// pdTeamFormValues.splice(3, 1);
// console.log(pdTeamFormValues);
this._PdTeamService.addPdTeamDetail(pdTeamFormValues).subscribe(
dataresult=>{
if (dataresult.dataStatus == true){
//After Saving the data then popup close
this.dialogRef.close();
//Need To Dispaly saving Datas
alert("Data Saved Successfully");
}
else{
alert("SomeThing Wents Wrong Try Again !");
}
});
} else { alert('Not Yet Completed Edit Function'); }
// //this._MastersService.editProductMaster(this._pdTeamForm.value);
// this._MastersService.editMasterDetails(this._pdTeamForm.value,'PDTEAM').subscribe( dataresult=>{
// if (dataresult.dataStatus == true){
// //After Editing0 the data then popup close
// this.dialogRef.close();
// //Need To Display saving Datas
// alert("Data Edited Successfully");
// }
// else{
// alert("SomeThing Wents Wrong Try Again !");
// }
// });
// }
}
/** To Reset Popup Data /
onReset(){
this._pdTeamForm.reset();
}
}
/** End Of Product Master Component*/

9
ng6-seed/src/app/settings/pd-team/pd-team-edit/pd-team-edit.component.html
View File

@ -28,7 +28,7 @@
<div fxLayout="row wrap" fxLayoutGap="32px" fxLayoutAlign="flex-start">
<mat-form-field fxFlex="0 1 auto" class="ml-xs">
<mat-select placeholder="City" required formControlName="fk_city" multiple>
<mat-option *ngFor="let cd of citydatas" [value]="cd" (onSelectionChange)="onChangeCityDatas($event)" >{{ cd.name }} </mat-option>
<mat-option *ngFor="let cd of citydatas" [value]="cd.city_id" (onSelectionChange)="onChangeCityDatas($event)" >{{ cd.name }} </mat-option>
</mat-select>
<mat-error *ngIf="submitted && f.fk_city.hasError('required')" class="mat-text-warn">You must Select Cities.</mat-error>
</mat-form-field>
@ -47,7 +47,7 @@
<div fxLayout="row wrap" fxLayoutGap="32px" fxLayoutAlign="flex-start">
<mat-form-field fxFlex="0 1 auto" class="ml-xs">
<mat-select placeholder="Product" required formControlName="fk_product" multiple>
<mat-option *ngFor="let pd of productdatas " [value]="pd" (onSelectionChange)="onChangeProductDatas($event)" >{{ pd.name }} </mat-option>
<mat-option *ngFor="let pd of productdatas " [value]="pd.product_id" (onSelectionChange)="onChangeProductDatas($event)" >{{ pd.name }} </mat-option>
</mat-select>
<mat-error *ngIf="submitted && f.fk_product.hasError('required')" class="mat-text-warn">You must Select Product.</mat-error>
</mat-form-field>
@ -64,7 +64,7 @@
<mat-form-field fxFlex="0 1 auto" class="ml-xs">
<mat-select placeholder="Customer Segment" required formControlName="fk_customer_segment" multiple>
<mat-option *ngFor="let csd of customerSegmentdatas" [value]="csd" (onSelectionChange)="onChangeCustomerSegmentDatas($event)">{{csd.name}}</mat-option>
<mat-option *ngFor="let csd of customerSegmentdatas" [value]="csd.customer_segment_id" (onSelectionChange)="onChangeCustomerSegmentDatas($event)">{{csd.name}}</mat-option>
</mat-select>
<mat-error *ngIf="submitted && f.fk_customer_segment.hasError('required')" class="mat-text-warn">You must Select Customer Segment.</mat-error>
</mat-form-field>
@ -77,7 +77,8 @@
</div>
<div class="row" style="text-align:right;">
<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Reset" matTooltipPosition="above" type="reset"><mat-icon>settings_backup_restore</mat-icon></button>
<!-- <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Reset" matTooltipPosition="above" type="reset"><mat-icon>settings_backup_restore</mat-icon></button> -->
<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Reset" matTooltipPosition="above" type="button" (click)="onResetForEdit()" ><mat-icon>settings_backup_restore</mat-icon></button>
<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Save" matTooltipPosition="above" type="submit"><mat-icon>save</mat-icon></button>
</div>
</mat-card>

211
ng6-seed/src/app/settings/pd-team/pd-team-edit/pd-team-edit.component.ts
View File

@ -1,41 +1,44 @@
import { Component, OnInit, Inject } from '@angular/core';
import { Component, OnInit, Input } from '@angular/core';
import { FormBuilder,
FormGroup,
Validators,
FormControl } from '@angular/forms';
import { MatDialog,
MatDialogRef,
MAT_DIALOG_DATA } from '@angular/material';
/** Service */
import { MastersService } from '../../service/masters/masters.service';
import { PdTeamService } from '../../service/masters/pd-team.service';
import { NotifierService } from 'angular-notifier';
import { PdTeamDialogComponent } from '../pd-team-dialog/pd-team-dialog.component';
import { Router } from '@angular/router';
/** Here this component is like as a partent component */
import { PdTeamListComponent } from './../pd-team-list/pd-team-list.component';
@Component({
selector: 'app-pd-team-edit',
templateUrl: './pd-team-edit.component.html',
styleUrls: ['./pd-team-edit.component.scss']
})
export class PdTeamEditComponent implements OnInit {
public _pdTeamForm: FormGroup;
public submitted = false;
private notifier: NotifierService;
color = 'primary';
errorMessage:string;
//This "childMessage" to get the function or data from partent component
@Input() public childMessage: any;
//This Type Of Array Declaration for select dropdown to list the datas
citydatas: any[];
lenderdatas: any[];
productdatas: any[];
customerSegmentdatas: any[];
//This Type Of Array Declaration
pdTeamCityArray: Array<{teamid: number, cityid: number}> = [];
//This Type Of Array Declaration for Validation
pdTeamCityArray:any= [];
pdTeamProductArray: Array<{teamid: number, productid: number}> = [];
pdTeamCustomerSegmentArray: Array<{teamid: number, customerid: number}> = [];
@ -43,24 +46,40 @@ export class PdTeamEditComponent implements OnInit {
selectedCityDatas : any=[];
selectedProductDatas : any=[];
selectedSegmentDatas : any=[];
//EditDatasforFormGroup: any;
constructor(private _formBuilder: FormBuilder,
private _notifier: NotifierService,
private _pdTeamService: PdTeamService,
private _router: Router,
private _masterService: MastersService)
{
this._notifier = _notifier;
private _PdTeamListComponent: PdTeamListComponent,
private _masterService: MastersService) {
this.notifier = _notifier;
}
/** Onready function */
ngOnInit() {
this.PdTeamFormDatas();
//console.log('hai I am Child This onready function',this.childMessage);
// this._pdTeamService.getAllPDTeamWithPDTeamID(this.childMessage).subscribe(
// dataresult => {
// console.log(dataresult);
// this.EditDatasforFormGroup = dataresult.records;
// console.log(this.EditDatasforFormGroup);
// });
/** For Checking City Validation datas - checking purpose - Already exists are not */
this._pdTeamService.getAllPdTeamCityMapping().subscribe(
dataresult => {
if(dataresult.dataStatus == true){
//this.AllPDTeamMapData = dataresult.records;
this.pdTeamCityArray = dataresult.records;
}
}, error => this.errorMessage = <any> error);
/** To Display The City Data For City DropDown */
this._masterService.getAllMasterData('CITY').subscribe(
dataresult => {
if (dataresult.status == 200) {
if (dataresult.dataStatus == true) {
this.citydatas = dataresult.records;
this.citydatas = this.citydatas.filter(city=>city.isactive == 1 );
}
@ -70,7 +89,7 @@ export class PdTeamEditComponent implements OnInit {
/** To Display The Entities Data For Entities DropDown */
this._masterService.getAllMasterData('ENTITY').subscribe(
dataresult => {
if (dataresult.status == 200) {
if (dataresult.dataStatus == true) {
this.lenderdatas = dataresult.records;
this.lenderdatas = this.lenderdatas.filter(entity=>entity.isactive == 1 );
}
@ -79,7 +98,7 @@ export class PdTeamEditComponent implements OnInit {
/** To Display The Entities Data For Entities DropDown */
this._masterService.getAllMasterData('PRODUCTS').subscribe(
dataresult => {
if (dataresult.status == 200) {
if (dataresult.dataStatus == true) {
this.productdatas = dataresult.records;
this.productdatas = this.productdatas.filter(product=>product.isactive == 1 );
}
@ -88,25 +107,50 @@ export class PdTeamEditComponent implements OnInit {
/** To Display The Entities Data For Entities DropDown */
this._masterService.getAllMasterData('CUSTOMERSEGMENT').subscribe(
dataresult => {
if (dataresult.status == 200) {
if (dataresult.dataStatus == true) {
this.customerSegmentdatas = dataresult.records;
this.customerSegmentdatas = this.customerSegmentdatas.filter(segment=>segment.isactive == 1 );
}
}, error => this.errorMessage = <any> error);
}, error => this.errorMessage = <any> error)
}
/** Pd Team Form Datas */
PdTeamFormDatas(){
this._pdTeamForm = this._formBuilder.group({
pdteam_id: [null, Validators.compose([Validators.required])],
team_name: [null, Validators.compose([Validators.required])],
fk_lender: [null, Validators.compose([Validators.required])],
fk_city: [null, Validators.compose([Validators.required])],
fk_customer_segment: [null, Validators.compose([Validators.required])],
fk_product:[null, Validators.compose([Validators.required])],
//console.log('Patricular pdteam_id Datas',this.childMessage);
// let PdTeamcity:any = [];
// for (let ptc of this.childMessage[0].CITYMAP) {
// //PdTeamcity.push(ptc);
// PdTeamcity.push(this.citydatas.filter(dataresults => this.selectedCityDatas == ptc));
// //this._pdTeamForm.controls['fk_city'].setValue(PdTeamcity);
// }
// console.log('PdTeamcity',PdTeamcity);
let PdTeamCity:any = [];
for(let ptc of this.childMessage[0].CITYMAP){
PdTeamCity.push(ptc.city_id);
}
let PdTeamProduct:any = [];
for(let ptp of this.childMessage[0].PRODUCTS){
PdTeamProduct.push(ptp.product_id);
}
let PdTeamCS:any = [];
for(let ptcs of this.childMessage[0].CUSTOMERSEGMENT){
PdTeamCS.push(ptcs.customer_segment_id);
}
this._pdTeamForm = this._formBuilder.group({
pdteam_id: [this.childMessage[0].pdteam_id, Validators.compose([Validators.required])],
team_name: [this.childMessage[0].team_name, Validators.compose([Validators.required])],
fk_lender: [this.childMessage[0].fk_lender_id, Validators.compose([Validators.required])],
fk_city: [PdTeamCity, Validators.compose([Validators.required])],
fk_customer_segment: [PdTeamCS, Validators.compose([Validators.required])],
fk_product:[PdTeamProduct, Validators.compose([Validators.required])],
});
}
/** convenience getter for easy access to form fields */
@ -114,94 +158,101 @@ export class PdTeamEditComponent implements OnInit {
/** For Popup Close Button */
onNoClick(): void {
this._router.navigate(['/setting/pdteam/pdteamlist']);
this._PdTeamListComponent.changeListView();
}
/** To Save/Edited Popup Data */
/** To Save/Edited Popup Data */
onSubmit() {
this.submitted = true;
// stop here if form is invalid
if (this._pdTeamForm.invalid) {
// this.errorMessage = "Please Fill All Mandate Fields.";
// return;
alert('Please Fill All Mandate Fields.');
} else {
var pdTeamFormValues = this._pdTeamForm.value;
//To Remove The "Null" With Key also
Object.keys(pdTeamFormValues).forEach(
(key) => ( pdTeamFormValues[key] == null) && delete pdTeamFormValues[key]);
this._pdTeamService.addPdTeamDetail(this._pdTeamForm.value).subscribe(
dataresult => {
if (dataresult.status == 200) {
console.log(dataresult);
// this._notifier.notify('success', 'Record Saved Successfully.!');
alert('Record Saved Successfully.!');
this._router.navigate(['/setting/pdteam/pdteamlist']);
this._pdTeamForm.reset();
}
else {
//this._notifier.notify('warning', 'Something Wents Wrong Try Again.!');
alert('Some Thing Wents Wrong Try Again !');
//this.errorMessage = "Some Thing Wents Wrong Try Again !";
}
}, error => {
// this._notifier.notify('warning', 'Something Wents Wrong Try Again.!');
// this.errorMessage = "Something Wents Wrong Try Again !";
alert('Some Thing Wents Wrong Try Again !');
});
}
}
/** To Reset Popup Data For Add*/
onResetForAdd(){
alert("reset function");
onResetForEdit(){
this.PdTeamFormDatas();
}
/**on change function for customer segment to dispaly the as List in html page */
onChangeCustomerSegmentDatas($event){
let CustomerSegmentName = $event.source.value.name;
//let CustomerSegmentName = $event.source.value.name;
let CustomerSegmentName = this.customerSegmentdatas.filter(cs=>cs.customer_segment_id == $event.source.value)[0];
if($event.source._selected === true ){
this.selectedSegmentDatas.push(CustomerSegmentName);
this.selectedSegmentDatas.push(CustomerSegmentName.name);
}
else if($event.source._selected === false ){
let index = this.selectedSegmentDatas.indexOf(CustomerSegmentName);
let index = this.selectedSegmentDatas.indexOf(CustomerSegmentName.name);
this.selectedSegmentDatas.splice(index,1);
}
}
/**on change function for City to display the as List in html page */
onChangeCityDatas($event){
var mycheck = 0 ;
//let cityName = $event.source.value;
let cityName = this.citydatas.filter(city=>city.city_id == $event.source.value)[0];
let cityName = $event.source.value.name;
if($event.source._selected === true ){
this.selectedCityDatas.push(cityName);
for(let Duplication_City of this.pdTeamCityArray){
let teamname = Duplication_City.team_name;
let dup_cityname = Duplication_City.CITYMAP.filter(city=>city.city_id == $event.source.value);
if(dup_cityname != ''){
for(let data of dup_cityname){
if(data.name == cityName.name){
alert('"'+data.name+'" Already Existing with "'+ teamname +'"');
$event.source._selected = false;
mycheck++;
}
}
}
}
if(mycheck == 0){
this.selectedCityDatas.push(cityName.name);
}
}
else if($event.source._selected === false ){
let index = this.selectedCityDatas.indexOf(cityName);
let index = this.selectedCityDatas.indexOf(cityName.name);
this.selectedCityDatas.splice(index,1);
}
}
/**on change function for Product to display the data as List in html page */
onChangeProductDatas($event){
let productName = $event.source.value.name;
//let productName = $event.source.value.name;
let productName = this.productdatas.filter(product=>product.product_id == $event.source.value )[0];
if($event.source._selected === true ){
this.selectedProductDatas.push(productName);
this.selectedProductDatas.push(productName.name);
}
else if($event.source._selected === false ){
let index = this.selectedProductDatas.indexOf(productName);
let index = this.selectedProductDatas.indexOf(productName.name);
this.selectedProductDatas.splice(index,1);
}
}
/** To Edited form Data */
onSubmit() {
var pdTeamFormValues = this._pdTeamForm.value;
Object.keys(pdTeamFormValues).forEach(
(key) => ( pdTeamFormValues[key] == null) && delete pdTeamFormValues[key]);
this._pdTeamService.editPdTeamDetail(pdTeamFormValues).subscribe(
dataresult=>{
if (dataresult.dataStatus == true){
alert("Data Edited Successfully");
this.notifier.notify('success', 'Record Edited Successfully.!');
}
/** End Of PD TEAM ADD Component */
else{
alert("SomeThing Wents Wrong Try Again !");
this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !');
}
});
}
}
/** End Of PD Team Edit Component */

14
ng6-seed/src/app/settings/pd-team/pd-team-list/pd-team-list.component.html
View File

@ -1,4 +1,5 @@
<mat-card>
<div *ngIf="listView">
<mat-card>
<div fxLayout="row" fxLayoutAlign="start center" class="mb-1">
<div class="ml-xs mr-xs" style="width: 30%;">
<mat-card-title><span> PD Team Masters</span></mat-card-title>
@ -22,8 +23,6 @@
</div>
</div>
<mat-table *ngIf="!noRecordFound" [dataSource]="dataSource" matSort >
<ng-container matColumnDef="serialno">
@ -67,7 +66,7 @@
<mat-header-cell *matHeaderCellDef> Actions </mat-header-cell>
<mat-cell *matCellDef="let row">
<button mat-icon-button [color]="color" class="hover-icon" matTooltip="Edit" matTooltipPosition="above" (click)="editPdTeam(row)"><mat-icon>edit</mat-icon></button>
<button mat-icon-button [color]="color" class="hover-icon" matTooltip="Edit" matTooltipPosition="above" (click)="editPdTeam(row.pdteam_id)"><mat-icon>edit</mat-icon></button>
</mat-cell>
</ng-container>
@ -79,7 +78,10 @@
<mat-paginator *ngIf="!noRecordFound" [pageSizeOptions]="[5, 10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
</div>
<!-- <div *ngIf="noRecordFound" class="nocontent">No records found</div> -->
</mat-card-content>
</mat-card>
</div>
<notifier-container></notifier-container>
<div *ngIf="!listView">
<app-pd-team-edit [childMessage]="parentMessage"></app-pd-team-edit>
</div>

25
ng6-seed/src/app/settings/pd-team/pd-team-list/pd-team-list.component.ts
View File

@ -11,8 +11,6 @@ import { PdTeamService } from '../../service/masters/pd-team.service';
import { NotifierService } from 'angular-notifier';
/** Dialog Component */
import { PdTeamDialogComponent } from '../pd-team-dialog/pd-team-dialog.component';
/** Add Component */
//import { } from '../pd-team-add/pd-team-add.component;
/** Edit Component */
@ -33,10 +31,13 @@ export class PdTeamListComponent implements OnInit {
color = 'primary';
userData = null;
noRecordFound: boolean = false;
private notifier: NotifierService;
private notifier: NotifierService;
public listView: any = true;
public dataLength: number;
public dataSource = new MatTableDataSource();
public parentMessage: any = [];
displayedColumns = ['serialno','team_name','lender_name','actions','isactive'];
@ViewChild(MatPaginator) paginator: MatPaginator;
@ -50,7 +51,7 @@ export class PdTeamListComponent implements OnInit {
this.notifier = notifier;
}
ngOnInit() {}
ngOnInit() { this.getPdTeam(); }
/** To add data */
addPdTeam() {
@ -58,8 +59,20 @@ export class PdTeamListComponent implements OnInit {
}
/** To edit data */
editPdTeam() {
this.router.navigate(['/setting/pdteam/editpdteam']);
editPdTeam(detail){
this._PdTeamService.getAllPDTeamWithPDTeamID(detail).subscribe(
dataresult => {
this.parentMessage = dataresult;
this.parentMessage = this.parentMessage.records;
this.listView = false;
});
}
changeListView(){
this.getPdTeam();
this.listView = true;
}
/** To get data for listing */

17
ng6-seed/src/app/settings/pd-team/pd-team.module.ts
View File

@ -1,6 +1,8 @@
import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import { CommonModule } from '@angular/common';
import { NotifierModule, NotifierOptions } from 'angular-notifier';
import { FlexLayoutModule } from '@angular/flex-layout';
import {
MatCardModule,
MatIconModule,
@ -17,19 +19,17 @@ import { MatTooltipModule } from '@angular/material/tooltip';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { NgxMatSelectSearchModule } from 'ngx-mat-select-search';
import { NgxDatatableModule } from '@swimlane/ngx-datatable';
import { NotifierModule, NotifierOptions } from 'angular-notifier';
import { FlexLayoutModule } from '@angular/flex-layout';
import { PdTeamDialogComponent } from './pd-team-dialog/pd-team-dialog.component';
import { PdTeamListComponent } from './pd-team-list/pd-team-list.component';
import { PdTeamAddComponent } from './pd-team-add/pd-team-add.component';
import { PdTeamEditComponent } from './pd-team-edit/pd-team-edit.component';
/** Route */
import { PdTeamRoutes } from './pd-team.routing';
/** Service */
import { PdTeamService } from '../service/masters/pd-team.service';
import { PdTeamAddComponent } from './pd-team-add/pd-team-add.component';
import { PdTeamEditComponent } from './pd-team-edit/pd-team-edit.component';
/**
* Custom angular notifier options
@ -100,12 +100,13 @@ const customNotifierOptions: NotifierOptions = {
MatTooltipModule,
NotifierModule.withConfig(customNotifierOptions),
],
declarations: [PdTeamDialogComponent,
declarations: [
PdTeamListComponent,
PdTeamAddComponent,
PdTeamEditComponent],
providers: [PdTeamService ],
entryComponents: [PdTeamDialogComponent]
providers: [PdTeamService]
//entryComponents: [PdTeamDialogComponent]
})
export class PdTeamModule { }

40
ng6-seed/src/app/settings/service/masters/pd-team.service.ts
View File

@ -25,6 +25,7 @@ export class PdTeamService {
//private apiUrl = "http://ssa.sineedge.com/sparqapi/api/";
private apiUrl = "http://localhost/sparqapi/api/";
pk: { "primary_key": any; };
constructor(private _http: HttpClient,
@ -37,7 +38,7 @@ private apiUrl = "http://localhost/sparqapi/api/";
* 1st argument is "Records": any - Set of Data To Adding to database
*/
addPdTeamDetail(Records: any): Observable<any> {
console.log('From Service Data',Records);
console.log('Add PD team Details In Service',Records);
Records.fk_createdby = this._aws.getlocale();//to get user id for who is created the Record
Records.createdon = currentdate;//to get Current date and Time for when the Record is created
// Records.fk_updatedby = this._aws.getlocale();//to get user id for who is update the record
@ -58,7 +59,7 @@ return this._http.post<any>(this.apiUrl+"savePDTeam", ArrayData)
* 1st argument is "Records": any - Set of Updated Data
*/
editPdTeamDetail(Records: any): Observable<any> {
console.log('Update PD team Details In Service',Records);
Records.fk_updatedby = this._aws.getlocale();//to get user id for who is update the record
Records.updatedon = currentdate;//to get Current date and Time for when the Record is updated
@ -134,16 +135,24 @@ return this._http.post<any>(this.apiUrl+"savePDTeam", ArrayData)
* TO Get the Master Datas using API Call
* 1st argument is "TableName" :string - Table Name
*/
getAllPdTeamList(): Observable<any> {
getAllPdTeam(): Observable<any> {
return this._http.get<any>(this.apiUrl+"getListOfPDTeam")
return this._http.post<any>(this.apiUrl+'getListOfPDTeam','')
.pipe(
catchError(this.handleError('role', []))
)
}
getAllPDTeamWithPDTeamID(Primarykey): Observable<any> {
/** Get All PD Team Child Data using API call Based on Primary Key */
var pk = { "primary_key":Primarykey }
return this._http.post<any>(this.apiUrl+'getListOfPDTeam',pk)
.pipe(
catchError(this.handleError('role', []))
)
}
// /** Get All PD Team Child Data using API call Based on Primary Key */
getAllPdTeamMapListWithPK(Primarykey): Observable<any> {
var pk = { "primary_key":Primarykey }
@ -165,6 +174,14 @@ return this._http.post<any>(this.apiUrl+"savePDTeam", ArrayData)
)
}
getAllPdTeamCityMapping(): Observable<any> {
//var vaildateKey = { "vaildate_key": 'cityvaildation1' }
return this._http.get<any>(this.apiUrl+'getListOfPDTeamCityMapping')
.pipe(
catchError(this.handleError('role', []))
)
}
/**
* TO get City Data For Listing Screen
@ -192,12 +209,11 @@ return this._http.post<any>(this.apiUrl+"savePDTeam", ArrayData)
/**
*
*/
getAllPdTeam(): Observable<any> {
return this._http.get(this.apiUrl+'getListOfPDTeam')
.pipe(
catchError(this.handleError('role', []))
)
}
// getAllPdTeam(): Observable<any> {
// return this._http.get(this.apiUrl+'getListOfPDTeam')
// .pipe(
// catchError(this.handleError('role', []))
// )
// }
}

2
ng6-seed/src/assets/styles/scss/_app.variables.scss
View File

@ -37,7 +37,7 @@ $main-bg-color:linear-gradient(58deg, #f44336, #673ab7);
//
// Typography
//
$font-size-base: 0.875rem !default;
$font-size-base: 1.2rem !default;
$font-weight-base: 400 !default;
$font-weight-medium: 500 !default;
$font-weight-bold: 600 !default;

2
ng6-seed/src/assets/styles/scss/_material.variables.scss
View File

@ -4,7 +4,7 @@
@import '~@angular/material/theming';
/**-- $primary: mat-palette($mat-deep-purple); --*/
$primary: mat-palette($mat-light-blue);
$primary: mat-palette($mat-red);
$accent: mat-palette($mat-amber, A200, A100, A400);
$warn: mat-palette($mat-red);
$theme: mat-light-theme($primary, $accent, $warn);

4
ng6-seed/src/assets/styles/scss/core/_main-header.scss
View File

@ -91,10 +91,10 @@ mat-toolbar {
.head-menu {
font-size: 1.3rem !important;
border-bottom: 2px solid rgba(255, 255, 255, 0.2);
background: linear-gradient(58deg, #f44336, #673ab7);
background: linear-gradient(58deg, #ca2126, #ca2126);
color: #fff;
&:hover {
background: linear-gradient(58deg, #f44336, #673ab7);
background: linear-gradient(58deg, #ca2126, #673ab7);
}
}
img {

2
ng6-seed/src/assets/styles/scss/core/_main-sidebar.scss
View File

@ -39,7 +39,7 @@
flex-direction: row;
align-items: center;
height: 48px;
padding: 0 16px;
padding: 0 8px;
color: $sidebar-menu-color;
}
.sub-menu {

4
ng6-seed/src/assets/styles/scss/material/_buttons.scss
View File

@ -11,6 +11,10 @@ $mat-fab-padding: 16px !default;
}
}
[mat-raised-button] {
color:red;
}
[mat-icon-button] {
&[mat-button-sm] {
padding: 0;