master :ps

This commit is contained in:
venbatechnologies@gmail.com 2018-10-07 00:17:56 +05:30
parent bf18fbd17f
commit dc93b1e186
75 changed files with 866 additions and 398 deletions

View File

@ -6,7 +6,7 @@
<div class="branding text-center"> <div class="branding text-center">
<!-- <h2><i class="fa fa-superpowers" aria-hidden="true"></i> <span> OPTIMA</span> <!-- <h2><i class="fa fa-superpowers" aria-hidden="true"></i> <span> OPTIMA</span>
</h2> --> </h2> -->
<h2><img [src]="'https://download.zoho.com/webdownload?x-service=CLIQ&event-id=0e17e076835b478c3ae33ddb3d3408e239e7c1f79dd4c2a1b626222e2cc1f221a8d3a027733fc52e82bc85cc5b0111d594abef51a345b4a64531af51c8e8c5bd'" style="height: 50px;;"> <span> {{userDep}} </span> <h2><img [src]="'http://ssa.sineedge.com/sparqapi/logo/sine_edge_icon.png'" style="height: 50px;;"> <span> {{userDep}} </span>
</h2> </h2>
</div> </div>
<div class="main-nav"> <div class="main-nav">

View File

@ -4,12 +4,12 @@
<div fxLayout="column" fxFlex.xl="40" fxFlex.lg="40" fxFlex.md="50" fxFlex.sm="80" fxFlex.xs="90"> <div fxLayout="column" fxFlex.xl="40" fxFlex.lg="40" fxFlex.md="50" fxFlex.sm="80" fxFlex.xs="90">
<mat-card class="login-session"> <mat-card class="login-session">
<div> <div>
<h2 class="base-border">Login Form</h2> <h2 class="base-border">Login</h2>
<p>Enter Your Login Details</p> <!-- <p>Enter Your Login Details</p> -->
<form #form="ngForm" (ngSubmit)="login()"> <form #form="ngForm" (ngSubmit)="login()">
<div fxLayout="column" fxLayoutAlign="start stretch"> <div fxLayout="column" fxLayoutAlign="start stretch">
<mat-form-field style="width: 100%"> <mat-form-field style="width: 100%">
<input matInput placeholder="E-Mail/Mobile Num" type="text" name="email" required [(ngModel)]="email"> <input matInput placeholder="E-Mail" type="text" name="email" required [(ngModel)]="email">
</mat-form-field> </mat-form-field>
<mat-form-field style="width: 100%" class="mb-1"> <mat-form-field style="width: 100%" class="mb-1">

View File

@ -4,7 +4,7 @@ fxLayoutAlign="center">
<h2 mat-dialog-title style="width: 30%;"> Branch &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;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</h2> <h2 mat-dialog-title style="width: 30%;"> Branch &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;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</h2>
<div style="width: 40%;"></div> <div style="width: 40%;"></div>
<div style="width: 30%;text-align:right;"> <div style="width: 30%;text-align:right;">
<button mat-raised-button mat-icon-button class="mr-1 mb-1" matTooltip="Close" matTooltipPosition="above" color="warn" (click)="onNoClick()"><mat-icon>close</mat-icon></button> <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>
</div> </div>
@ -38,10 +38,10 @@ fxLayoutAlign="center">
<div class="row" style="text-align:right;"> <div class="row" style="text-align:right;">
<button *ngIf="isEmptyObject(_branchForm.controls['branch_id']);else editreset;" 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 *ngIf="isEmptyObject(_branchForm.controls['branch_id']);else editreset;" 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>
<ng-template #editreset> <ng-template #editreset>
<button mat-raised-button mat-icon-button class="mr-1 mb-1" matTooltip="Reset" matTooltipPosition="above" [color]="color" 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="Reset" matTooltipPosition="above" type="button" (click)="onResetForEdit()" ><mat-icon>settings_backup_restore</mat-icon></button>
</ng-template> </ng-template>
<button mat-raised-button mat-icon-button class="mr-1 mb-1" matTooltip="Save" matTooltipPosition="above" [color]="color" type="submit" [disabled]="!_branchForm.valid"><mat-icon>save</mat-icon></button> <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Save" matTooltipPosition="above" type="submit" [disabled]="!_branchForm.valid"><mat-icon>save</mat-icon></button>
</div> </div>
</mat-dialog-content> </mat-dialog-content>

View File

@ -14,6 +14,7 @@ import { MatDialog,
import { MastersService } from '../../../../service/masters/masters.service'; import { MastersService } from '../../../../service/masters/masters.service';
/** Model */ /** Model */
import { Branch,City } from '../../../model/branch'; import { Branch,City } from '../../../model/branch';
import { NotifierService } from 'angular-notifier';
@Component({ @Component({
selector: 'app-jazz-dialog', selector: 'app-jazz-dialog',
@ -28,11 +29,19 @@ export class BranchDialogComponent implements OnInit {
citydatas: City[]; citydatas: City[];
errorMessage:string; errorMessage:string;
color = 'primary'; color = 'primary';
/**
* Notifier service
*/
private notifier: NotifierService;
constructor(private _formBuilder: FormBuilder, constructor(
notifier: NotifierService,
private _formBuilder: FormBuilder,
private dialogRef: MatDialogRef<BranchDialogComponent>, private dialogRef: MatDialogRef<BranchDialogComponent>,
private _mastersService: MastersService, private _mastersService: MastersService,
@Inject(MAT_DIALOG_DATA) public data: Branch) { } @Inject(MAT_DIALOG_DATA) public data: Branch) {
this.notifier = notifier;
}
ngOnInit() { ngOnInit() {
@ -82,10 +91,12 @@ export class BranchDialogComponent implements OnInit {
dataresult=>{ dataresult=>{
if (dataresult.dataStatus == true){ if (dataresult.dataStatus == true){
this.dialogRef.close();//After Saving the BRANCH data then popup close this.dialogRef.close();//After Saving the BRANCH data then popup close
alert("Data Saved Successfully"); //alert("Data Saved Successfully");
this.notifier.notify('success', 'Record Saved Successfully.!');
} }
else{ else{
alert("SomeThing Wents Wrong Try Again !"); this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !');
//alert("SomeThing Wents Wrong Try Again !");
} }
}); });
@ -95,10 +106,12 @@ export class BranchDialogComponent implements OnInit {
if (dataresult.dataStatus == true){ if (dataresult.dataStatus == true){
this.dialogRef.close();//After Editing the BRANCH data then popup close this.dialogRef.close();//After Editing the BRANCH data then popup close
alert("Data Edited Successfully"); //alert("Data Edited Successfully");
this.notifier.notify('success', 'Record Edited Successfully.!');
} }
else{ else{
alert("SomeThing Wents Wrong Try Again !"); this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !');
//alert("SomeThing Wents Wrong Try Again !");
} }
}); });
} }

View File

@ -1,10 +1,10 @@
<div style="text-align: right;"> <!-- <div style="text-align: right;">
<!-- <button mat-stroked-button [color]="color" (click)="addBranch()"> + Add Branch</button> --> <!-- <button mat-stroked-button [color]="color" (click)="addBranch()"> + Add Branch</button> -->
<!-- <button mat-icon-button class="mr-1 mb-1 hover-icon" style="height: 40%;" ><mat-icon>add_box</mat-icon></button> --> <!-- <button mat-icon-button class="mr-1 mb-1 hover-icon" style="height: 40%;" ><mat-icon>add_box</mat-icon></button> -->
<button mat-fab class="mr-1 mb-1" [color]="color" (click)="addBranch()" matTooltip="Add Branch" matTooltipPosition="above"><mat-icon>add</mat-icon></button> <!-- <button mat-fab class="mr-1 mb-1" [color]="color" (click)="addBranch()" matTooltip="Add Branch" matTooltipPosition="above"><mat-icon>add</mat-icon></button> -->
<!-- <mat-button-toggle class="mr-1 mb-1">Single toggle</mat-button-toggle> --> <!-- <mat-button-toggle class="mr-1 mb-1">Single toggle</mat-button-toggle> -->
</div> <!-- </div> -->
<!-- <br> --> <!-- <br> -->
<!-- <div *ngIf="loader"> <!-- <div *ngIf="loader">
<mat-progress-bar mode="indeterminate" [color]="color" class="mb-1"></mat-progress-bar> <mat-progress-bar mode="indeterminate" [color]="color" class="mb-1"></mat-progress-bar>
@ -12,14 +12,29 @@
<br> --> <br> -->
<mat-card-content> <mat-card-content>
<div *ngIf="!noRecordFound" class="example-container mat-elevation-z8"> <div *ngIf="!noRecordFound" class="example-container mat-elevation-z8">
<div class="example-header"> <!-- <div class="example-header" fxLayout="row">
<div class="ml-xs mr-xs" style="width: 80%;">
<mat-form-field> <mat-form-field>
<input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter"> <input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter">
</mat-form-field> </mat-form-field>
</div> </div>
<div class="ml-xs mr-xs" style="width: 10%; text-align: right;">
<button mat-fab class="mr-1 mb-1" [color]="color" (click)="addBranch()" matTooltip="Add Branch" matTooltipPosition="above"><mat-icon>add</mat-icon></button>
</div>
</div> -->
<div fxLayout="row" fxLayoutAlign="start center" class="example-header">
<div class="ml-xs mr-xs" style="width: 90%;">
<mat-form-field dividerColor="primary" class="ml-xs mr-xs" style="width: 30%;">
<input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter">
</mat-form-field>
</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="primary" ><mat-icon>add</mat-icon></button> -->
<button mat-fab class="mr-1 mb-1" style="margin-top: 7px;" [color]="color" (click)="addBranch()" matTooltip="Add Branch" matTooltipPosition="above"><mat-icon>add</mat-icon></button>
</div>
</div>
<mat-table [dataSource]="dataSource" matSort> <mat-table [dataSource]="dataSource" matSort>
<ng-container matColumnDef="serialno"> <ng-container matColumnDef="serialno">
<mat-header-cell *matHeaderCellDef mat-sort-header>Sl </mat-header-cell> <mat-header-cell *matHeaderCellDef mat-sort-header>Sl </mat-header-cell>
<mat-cell *matCellDef="let row;" class="example-margin"> {{row.serialno}} </mat-cell> <mat-cell *matCellDef="let row;" class="example-margin"> {{row.serialno}} </mat-cell>

View File

@ -20,7 +20,7 @@ fxLayoutAlign="center">
<div style="width: 40%;"></div> <div style="width: 40%;"></div>
<div style="width: 30%;text-align:right;"> <div style="width: 30%;text-align:right;">
<!-- <button color="warn" 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> --> <!-- <button color="warn" 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> -->
<button mat-raised-button mat-icon-button class="mr-1 mb-1" matTooltip="Close" matTooltipPosition="above" color="warn" (click)="onNoClick()"><mat-icon>close</mat-icon></button> <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>
</div> </div>
@ -54,11 +54,11 @@ fxLayoutAlign="center">
</div> --> </div> -->
<br> <br>
<div class="row" style="text-align:right;"> <div class="row" style="text-align:right;">
<button *ngIf="isEmptyObject(_cityForm.controls['city_id']);else editreset;" mat-raised-button mat-icon-button class="mr-1 mb-1" matTooltip="Reset" matTooltipPosition="above" type="reset" [color]="color"><mat-icon>settings_backup_restore</mat-icon></button> <button *ngIf="isEmptyObject(_cityForm.controls['city_id']);else editreset;" 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>
<ng-template #editreset> <ng-template #editreset>
<button mat-raised-button mat-icon-button class="mr-1 mb-1" matTooltip="Reset" matTooltipPosition="above" type="button" (click)="onResetForEdit()" [color]="color"><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>
</ng-template> </ng-template>
<button mat-raised-button mat-icon-button class="mr-1 mb-1" matTooltip="Save" matTooltipPosition="above" type="submit" [disabled]="!_cityForm.valid" [color]="color"><mat-icon>save</mat-icon></button> <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Save" matTooltipPosition="above" type="submit" [disabled]="!_cityForm.valid" ><mat-icon>save</mat-icon></button>
<!-- <button mat-button >RESET</button> --> <!-- <button mat-button >RESET</button> -->
</div> </div>

View File

@ -11,6 +11,7 @@ import { MatDialog,
/** Service */ /** Service */
import { MastersService } from '../../../../service/masters/masters.service'; import { MastersService } from '../../../../service/masters/masters.service';
import { NotifierService } from 'angular-notifier';
/** Model */ /** Model */
import { States } from '../../../model/states'; import { States } from '../../../model/states';
@Component({ @Component({
@ -22,15 +23,18 @@ export class CityDialogComponent implements OnInit {
public _cityForm: FormGroup; public _cityForm: FormGroup;
private notifier: NotifierService;
stateDatas: any[]; stateDatas: any[];
errorMessage:string; errorMessage:string;
color = 'primary'; color = 'primary';
constructor(private _formBuilder: FormBuilder, constructor(private _formBuilder: FormBuilder,notifier: NotifierService,
private dialogRef: MatDialogRef<CityDialogComponent>, private dialogRef: MatDialogRef<CityDialogComponent>,
private _mastersService: MastersService, private _mastersService: MastersService,
@Inject(MAT_DIALOG_DATA) public data: any) { } @Inject(MAT_DIALOG_DATA) public data: any) {
this.notifier = notifier;
}
ngOnInit() { ngOnInit() {
@ -85,10 +89,12 @@ export class CityDialogComponent implements OnInit {
dataresult=>{ dataresult=>{
if (dataresult.dataStatus == true){ if (dataresult.dataStatus == true){
this.dialogRef.close();//After Saving the City data then popup close this.dialogRef.close();//After Saving the City data then popup close
alert("Data Saved Successfully"); //alert("Data Saved Successfully");
this.notifier.notify('success', 'Record Saved Successfully.!');
} }
else{ else{
alert("SomeThing Wents Wrong Try Again !"); //alert("SomeThing Wents Wrong Try Again !");
this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !');
} }
}); });
@ -100,10 +106,12 @@ export class CityDialogComponent implements OnInit {
if (dataresult.dataStatus == true){ if (dataresult.dataStatus == true){
this.dialogRef.close();//After Editing the City data then popup close this.dialogRef.close();//After Editing the City data then popup close
alert("Data Edited Successfully"); //alert("Data Edited Successfully");
this.notifier.notify('success', 'Record Edited Successfully.!');
} }
else{ else{
alert("SomeThing Wents Wrong Try Again !"); //alert("SomeThing Wents Wrong Try Again !");
this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !');
} }
}); });

View File

@ -1,7 +1,7 @@
<div style="text-align: right;"> <!-- <div style="text-align: right;">
<!-- <button mat-stroked-button [color]="color" (click)="addCity()"> + Add City</button> --> <!- <button mat-stroked-button [color]="color" (click)="addCity()"> + Add City</button> ->
<button mat-fab class="mr-1 mb-1" [color]="color" (click)="addCity()" matTooltip="Add City" matTooltipPosition="above"><mat-icon>add</mat-icon></button> <button mat-fab class="mr-1 mb-1" [color]="color" (click)="addCity()" matTooltip="Add City" matTooltipPosition="above"><mat-icon>add</mat-icon></button>
</div> </div> -->
<!-- displayedColumns = ['city_id','name', 'fk_state_id','state_name' , 'isactive','actions']; <!-- displayedColumns = ['city_id','name', 'fk_state_id','state_name' , 'isactive','actions'];
<div *ngIf="!noRecordFound" class="example-container mat-elevation-z8"> <div *ngIf="!noRecordFound" class="example-container mat-elevation-z8">
@ -70,10 +70,23 @@
<br>--> <br>-->
<mat-card-content> <mat-card-content>
<div *ngIf="!noRecordFound" class="filter-container mat-elevation-z8"> <div *ngIf="!noRecordFound" class="filter-container mat-elevation-z8">
<div class="filter-header"> <!-- <div class="filter-header">
<mat-form-field> <mat-form-field>
<input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter"> <input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter">
</mat-form-field> </mat-form-field>
</div> -->
<div fxLayout="row" fxLayoutAlign="start center" class="filter-header">
<div class="ml-xs mr-xs" style="width: 90%;">
<mat-form-field dividerColor="primary" class="ml-xs mr-xs" style="width: 30%;">
<input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter">
</mat-form-field>
</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)="addBranch()" matTooltip="Add Branch" matTooltipPosition="above"><mat-icon>add</mat-icon></button> -->
<button mat-fab class="mr-1 mb-1" style="margin-top: 7px;" [color]="color" (click)="addCity()" matTooltip="Add City" matTooltipPosition="above"><mat-icon>add</mat-icon></button>
</div>
</div> </div>
@ -154,3 +167,4 @@
<!-- <div *ngIf="noRecordFound" style="color: red; font-size: 16px;">No records found</div> --> <!-- <div *ngIf="noRecordFound" style="color: red; font-size: 16px;">No records found</div> -->
<div *ngIf="noRecordFound" class="nocontent">No records found</div> <div *ngIf="noRecordFound" class="nocontent">No records found</div>
</mat-card-content> </mat-card-content>
<notifier-container></notifier-container>

View File

@ -19,7 +19,7 @@ fxLayoutAlign="center">
<h2 mat-dialog-title style="width: 70%;"> Comment On Locality &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</h2> <h2 mat-dialog-title style="width: 70%;"> Comment On Locality &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</h2>
<div style="width: 25%;text-align:right;"> <div style="width: 25%;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> --> <!-- <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> -->
<button mat-raised-button mat-icon-button class="mr-1 mb-1" matTooltip="Close" matTooltipPosition="above" color="warn" (click)="onNoClick()"><mat-icon>close</mat-icon></button> <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>
</div> </div>
@ -39,11 +39,11 @@ fxLayoutAlign="center">
<br> <br>
<div class="row" style="text-align:right;"> <div class="row" style="text-align:right;">
<button *ngIf="isEmptyObject(_CommentOnLocalityForm.controls['comments_on_locality_id']);else editreset;" mat-raised-button mat-icon-button class="mr-1 mb-1" matTooltip="Reset" matTooltipPosition="above" type="reset" [color]="color" ><mat-icon>settings_backup_restore</mat-icon></button> <button *ngIf="isEmptyObject(_CommentOnLocalityForm.controls['comments_on_locality_id']);else editreset;" 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>
<ng-template #editreset> <ng-template #editreset>
<button mat-raised-button mat-icon-button class="mr-1 mb-1" matTooltip="Reset" matTooltipPosition="above" type="button" (click)="onResetForEdit()" [color]="color" ><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>
</ng-template> </ng-template>
<button mat-raised-button mat-icon-button class="mr-1 mb-1" matTooltip="Save" matTooltipPosition="above" type="submit" [disabled]="!_CommentOnLocalityForm.valid" [color]="color"><mat-icon>save</mat-icon></button> <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Save" matTooltipPosition="above" type="submit" [disabled]="!_CommentOnLocalityForm.valid" ><mat-icon>save</mat-icon></button>
<!-- <button mat-button >RESET</button> --> <!-- <button mat-button >RESET</button> -->
</div> </div>

View File

@ -13,6 +13,7 @@ import { MatDialog,
/** Service */ /** Service */
import { MastersService } from '../../../../service/masters/masters.service'; import { MastersService } from '../../../../service/masters/masters.service';
import { NotifierService } from 'angular-notifier';
@Component({ @Component({
@ -24,11 +25,14 @@ export class CommentsOnLocalityDialogComponent implements OnInit {
color = 'primary'; color = 'primary';
public _CommentOnLocalityForm: FormGroup; public _CommentOnLocalityForm: FormGroup;
private notifier: NotifierService;
constructor(private _formBuilder: FormBuilder, constructor(private _formBuilder: FormBuilder,notifier: NotifierService,
private dialogRef: MatDialogRef<CommentsOnLocalityDialogComponent>, private dialogRef: MatDialogRef<CommentsOnLocalityDialogComponent>,
private _mastersService: MastersService, private _mastersService: MastersService,
@Inject(MAT_DIALOG_DATA) public data: any) { } @Inject(MAT_DIALOG_DATA) public data: any) {
this.notifier = notifier;
}
ngOnInit() { this.commentOnLocalityFormDatas(); } ngOnInit() { this.commentOnLocalityFormDatas(); }
@ -59,10 +63,12 @@ export class CommentsOnLocalityDialogComponent implements OnInit {
dataresult=>{ dataresult=>{
if (dataresult.dataStatus == true){ if (dataresult.dataStatus == true){
this.dialogRef.close();//After Saving the City data then popup close this.dialogRef.close();//After Saving the City data then popup close
alert("Data Saved Successfully"); //alert("Data Saved Successfully");
this.notifier.notify('success', 'Record Saved Successfully.!');
} }
else{ else{
alert("SomeThing Wents Wrong Try Again !"); //alert("SomeThing Wents Wrong Try Again !");
this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !');
} }
}); });
@ -74,10 +80,13 @@ export class CommentsOnLocalityDialogComponent implements OnInit {
if (dataresult.dataStatus == true){ if (dataresult.dataStatus == true){
this.dialogRef.close();//After Editing the City data then popup close this.dialogRef.close();//After Editing the City data then popup close
alert("Data Edited Successfully"); //alert("Data Edited Successfully");
this.notifier.notify('success', 'Record Edited Successfully.!');
} }
else{ else{
alert("SomeThing Wents Wrong Try Again !"); //alert("SomeThing Wents Wrong Try Again !");
this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !');
} }
}); });
} }

View File

@ -1,8 +1,8 @@
<div style="text-align: right;"> <!-- <div style="text-align: right;">
<!-- <button mat-stroked-button [color]="color" (click)="addCommentsOnLocality()" > + Add Comments On Locality</button> --> <!- <button mat-stroked-button [color]="color" (click)="addCommentsOnLocality()" > + Add Comments On Locality</button> ->
<button mat-fab class="mr-1 mb-1" [color]="color" (click)="addCommentsOnLocality()" matTooltip="Add Comments On Locality" matTooltipPosition="above"><mat-icon>add</mat-icon></button> <button mat-fab class="mr-1 mb-1" [color]="color" (click)="addCommentsOnLocality()" matTooltip="Add Comments On Locality" matTooltipPosition="above"><mat-icon>add</mat-icon></button>
</div> </div> -->
<mat-card-content> <mat-card-content>
<!-- <div *ngIf="loader"> <!-- <div *ngIf="loader">
<mat-progress-bar mode="indeterminate" [color]="color" class="mb-1"></mat-progress-bar> <mat-progress-bar mode="indeterminate" [color]="color" class="mb-1"></mat-progress-bar>
@ -64,10 +64,23 @@
<br>--> <br>-->
<div *ngIf="!noRecordFound" class="filter-container mat-elevation-z8"> <div *ngIf="!noRecordFound" class="filter-container mat-elevation-z8">
<div class="filter-header"> <!-- <div class="filter-header">
<mat-form-field> <mat-form-field>
<input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter"> <input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter">
</mat-form-field> </mat-form-field>
</div> -->
<div fxLayout="row" fxLayoutAlign="start center" class="filter-header">
<div class="ml-xs mr-xs" style="width: 90%;">
<mat-form-field dividerColor="primary" class="ml-xs mr-xs" style="width: 30%;">
<input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter">
</mat-form-field>
</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)="addCommentsOnLocality()" matTooltip="Add Comments On Locality" matTooltipPosition="above"><mat-icon>add</mat-icon></button>
</div>
</div> </div>
@ -126,8 +139,9 @@
</mat-row> </mat-row>
</mat-table> </mat-table>
<mat-paginator [pageSizeOptions]="[5, 10, 25, 50, 100]"></mat-paginator> <mat-paginator [pageSizeOptions]="[5, 10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
</div> </div>
<div *ngIf="noRecordFound" class="nocontent">No records found</div> <div *ngIf="noRecordFound" class="nocontent">No records found</div>
</mat-card-content> </mat-card-content>
<notifier-container></notifier-container>

View File

@ -19,7 +19,7 @@ fxLayoutAlign="center">
<h2 mat-dialog-title> Customer Behaviour &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;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</h2> <h2 mat-dialog-title> Customer Behaviour &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;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</h2>
<div style="text-align:right;"> <div style="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> --> <!-- <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> -->
<button mat-raised-button mat-icon-button class="mr-1 mb-1" matTooltip="Close" matTooltipPosition="above" color="warn" (click)="onNoClick()"><mat-icon>close</mat-icon></button> <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>
</div> </div>
@ -43,11 +43,11 @@ fxLayoutAlign="center">
<br> <br>
<div class="row" style="text-align:right;"> <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 *ngIf="isEmptyObject(_customerBehaviourForm.controls['customer_behaviour_id']);else editreset;" mat-raised-button mat-icon-button class="mr-1 mb-1" [color]="color" matTooltip="Reset" matTooltipPosition="above" type="reset" ><mat-icon>settings_backup_restore</mat-icon></button> <button *ngIf="isEmptyObject(_customerBehaviourForm.controls['customer_behaviour_id']);else editreset;" 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>
<ng-template #editreset> <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()" [color]="color"><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>
</ng-template> </ng-template>
<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Save" matTooltipPosition="above" type="submit" [disabled]="!_customerBehaviourForm.valid" [color]="color"><mat-icon>save</mat-icon></button> <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Save" matTooltipPosition="above" type="submit" [disabled]="!_customerBehaviourForm.valid"><mat-icon>save</mat-icon></button>
<!-- <button mat-button >RESET</button> --> <!-- <button mat-button >RESET</button> -->
</div> </div>

View File

@ -11,6 +11,7 @@ import { MatDialog,
MAT_DIALOG_DATA } from '@angular/material'; MAT_DIALOG_DATA } from '@angular/material';
/** Service */ /** Service */
import { MastersService } from '../../../../service/masters/masters.service'; import { MastersService } from '../../../../service/masters/masters.service';
import { NotifierService } from 'angular-notifier';
@Component({ @Component({
@ -21,11 +22,14 @@ import { MastersService } from '../../../../service/masters/masters.service';
export class CustomerBehaviourDialogComponent implements OnInit { export class CustomerBehaviourDialogComponent implements OnInit {
color = 'primary'; color = 'primary';
public _customerBehaviourForm: FormGroup; public _customerBehaviourForm: FormGroup;
private notifier: NotifierService;
constructor(private _formBuilder: FormBuilder, constructor(private _formBuilder: FormBuilder,notifier: NotifierService,
private dialogRef: MatDialogRef<CustomerBehaviourDialogComponent>, private dialogRef: MatDialogRef<CustomerBehaviourDialogComponent>,
private _MastersService: MastersService, private _MastersService: MastersService,
@Inject(MAT_DIALOG_DATA) public data: any) { } @Inject(MAT_DIALOG_DATA) public data: any) {
this.notifier = notifier;
}
@ -76,10 +80,12 @@ onNoClick(): void {
dataresult=>{ dataresult=>{
if (dataresult.dataStatus == true){ if (dataresult.dataStatus == true){
this.dialogRef.close();//After Saving the data then popup close this.dialogRef.close();//After Saving the data then popup close
alert("Data Saved Successfully"); //alert("Data Saved Successfully");
this.notifier.notify('success', 'Record Saved Successfully.!');
} }
else{ else{
alert("SomeThing Wents Wrong Try Again !"); //alert("SomeThing Wents Wrong Try Again !");
this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !');
} }
}); });
@ -91,10 +97,12 @@ onNoClick(): void {
if (dataresult.dataStatus == true){ if (dataresult.dataStatus == true){
this.dialogRef.close();//After Editing the City data then popup close this.dialogRef.close();//After Editing the City data then popup close
alert("Data Edited Successfully"); //alert("Data Edited Successfully");
this.notifier.notify('success', 'Record Edited Successfully.!');
} }
else{ else{
alert("SomeThing Wents Wrong Try Again !"); //alert("SomeThing Wents Wrong Try Again !");
this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !');
} }
}); });
//After Editing the data then popup close //After Editing the data then popup close

View File

@ -1,9 +1,9 @@
<div style="text-align: right;"> <!-- <div style="text-align: right;">
<!-- <button mat-stroked-button [color]="color" (click)="addCustomerBehaviour()" > + Add CustomerBehaviour</button> --> <!- <button mat-stroked-button [color]="color" (click)="addCustomerBehaviour()" > + Add CustomerBehaviour</button> ->
<button mat-fab class="mr-1 mb-1" [color]="color" (click)="addCustomerBehaviour()" matTooltip="Add Customer Behaviour" matTooltipPosition="above"><mat-icon>add</mat-icon></button> <button mat-fab class="mr-1 mb-1" [color]="color" (click)="addCustomerBehaviour()" matTooltip="Add Customer Behaviour" matTooltipPosition="above"><mat-icon>add</mat-icon></button>
</div> </div> -->
<mat-card-content> <mat-card-content>
<!-- <div *ngIf="loader"> <!-- <div *ngIf="loader">
<mat-progress-bar mode="indeterminate" [color]="color" class="mb-1"></mat-progress-bar> <mat-progress-bar mode="indeterminate" [color]="color" class="mb-1"></mat-progress-bar>
@ -64,13 +64,25 @@
<br>--> <br>-->
<div *ngIf="!noRecordFound" class="filter-container mat-elevation-z8"> <div *ngIf="!noRecordFound" class="filter-container mat-elevation-z8">
<div class="filter-header"> <!-- <div class="filter-header">
<mat-form-field> <mat-form-field>
<input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter"> <input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter">
</mat-form-field> </mat-form-field>
</div> </div>
-->
<div fxLayout="row" fxLayoutAlign="start center" class="filter-header">
<div class="ml-xs mr-xs" style="width: 90%;">
<mat-form-field dividerColor="primary" class="ml-xs mr-xs" style="width: 30%;">
<input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter">
</mat-form-field>
</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)="addCustomerBehaviour()" matTooltip="Add Customer Behaviour" matTooltipPosition="above"><mat-icon>add</mat-icon></button>
</div>
</div>
<mat-table [dataSource]="dataSource" matSort > <mat-table [dataSource]="dataSource" matSort >
@ -135,3 +147,4 @@
</mat-card-content> </mat-card-content>
<notifier-container></notifier-container>

View File

@ -19,7 +19,7 @@ fxLayoutAlign="center">
<h2 mat-dialog-title style="width: 72%;"> Customer Segment &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</h2> <h2 mat-dialog-title style="width: 72%;"> Customer Segment &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</h2>
<div style="width: 28%;text-align:right;"> <div style="width: 28%;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> --> <!-- <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> -->
<button mat-raised-button mat-icon-button class="mr-1 mb-1" matTooltip="Close" matTooltipPosition="above" color="warn" (click)="onNoClick()"><mat-icon>close</mat-icon></button> <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>
</div> </div>

View File

@ -11,6 +11,7 @@ import { MatDialog,
MAT_DIALOG_DATA } from '@angular/material'; MAT_DIALOG_DATA } from '@angular/material';
/** Service */ /** Service */
import { MastersService } from '../../../../service/masters/masters.service'; import { MastersService } from '../../../../service/masters/masters.service';
import { NotifierService } from 'angular-notifier';
@Component({ @Component({
@ -21,11 +22,12 @@ import { MastersService } from '../../../../service/masters/masters.service';
export class CustomerSegmentDialogComponent implements OnInit { export class CustomerSegmentDialogComponent implements OnInit {
color = 'primary'; color = 'primary';
public _customerSegmentForm: FormGroup; public _customerSegmentForm: FormGroup;
private notifier: NotifierService;
constructor(private _formBuilder: FormBuilder, constructor(private _formBuilder: FormBuilder,notifier: NotifierService,
private dialogRef: MatDialogRef<CustomerSegmentDialogComponent>, private dialogRef: MatDialogRef<CustomerSegmentDialogComponent>,
private _MastersService: MastersService, private _MastersService: MastersService,
@Inject(MAT_DIALOG_DATA) public data: any) { } @Inject(MAT_DIALOG_DATA) public data: any) { this.notifier = notifier; }
ngOnInit() { ngOnInit() {
@ -74,10 +76,12 @@ export class CustomerSegmentDialogComponent implements OnInit {
dataresult=>{ dataresult=>{
if (dataresult.dataStatus == true){ if (dataresult.dataStatus == true){
this.dialogRef.close();//After Saving the BRANCH data then popup close this.dialogRef.close();//After Saving the BRANCH data then popup close
alert("Data Saved Successfully"); //alert("Data Saved Successfully");
this.notifier.notify('success', 'Record Saved Successfully.!');
} }
else{ else{
alert("SomeThing Wents Wrong Try Again !"); //alert("SomeThing Wents Wrong Try Again !");
this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !');
} }
}); });
@ -88,10 +92,12 @@ export class CustomerSegmentDialogComponent implements OnInit {
if (dataresult.dataStatus == true){ if (dataresult.dataStatus == true){
this.dialogRef.close();//After Editing the BRANCH data then popup close this.dialogRef.close();//After Editing the BRANCH data then popup close
alert("Data Edited Successfully"); //alert("Data Edited Successfully");
this.notifier.notify('success', 'Record Edited Successfully.!');
} }
else{ else{
alert("SomeThing Wents Wrong Try Again !"); //alert("SomeThing Wents Wrong Try Again !");
this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !');
} }
}); });
} }

View File

@ -1,8 +1,7 @@
<div style="text-align: right;"> <!-- <div style="text-align: right;">
<!-- <button mat-stroked-button [color]="color" (click)="addCustomerSegment()" > + Add CustomerSegment</button> --> <!-- <button mat-stroked-button [color]="color" (click)="addCustomerSegment()" > + Add CustomerSegment</button> ->
<button mat-fab class="mr-1 mb-1" [color]="color" (click)="addCustomerSegment()" matTooltip="Add Customer Segment" matTooltipPosition="above"><mat-icon>add</mat-icon></button> </div> -->
</div>
<mat-card-content> <mat-card-content>
<!-- <div *ngIf="loader"> <!-- <div *ngIf="loader">
<mat-progress-bar mode="indeterminate" [color]="color" class="mb-1"></mat-progress-bar> <mat-progress-bar mode="indeterminate" [color]="color" class="mb-1"></mat-progress-bar>
@ -69,10 +68,20 @@
<br>--> <br>-->
<div *ngIf="!noRecordFound" class="filter-container mat-elevation-z8"> <div *ngIf="!noRecordFound" class="filter-container mat-elevation-z8">
<div class="filter-header"> <!-- <div class="filter-header">
<mat-form-field> <mat-form-field>
<input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter"> <input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter">
</mat-form-field> </mat-form-field>
</div> -->
<div fxLayout="row" fxLayoutAlign="start center" class="filter-header">
<div class="ml-xs mr-xs" style="width: 90%;">
<mat-form-field dividerColor="primary" class="ml-xs mr-xs" style="width: 30%;">
<input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter">
</mat-form-field>
</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)="addCustomerSegment()" matTooltip="Add Customer Segment" matTooltipPosition="above"><mat-icon>add</mat-icon></button>
</div>
</div> </div>
@ -132,4 +141,4 @@
<div *ngIf="noRecordFound" class="nocontent">No records found</div> <div *ngIf="noRecordFound" class="nocontent">No records found</div>
</mat-card-content> </mat-card-content>
<notifier-container></notifier-container>

View File

@ -20,7 +20,7 @@ fxLayoutAlign="center">
<div style="width: 40%;"></div> <div style="width: 40%;"></div>
<div style="width: 30%;text-align:right;"> <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> --> <!-- <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> -->
<button mat-raised-button mat-icon-button class="mr-1 mb-1" matTooltip="Close" matTooltipPosition="above" color="warn" (click)="onNoClick()"><mat-icon>close</mat-icon></button> <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>
</div> </div>

View File

@ -11,6 +11,7 @@ import { MatDialog,
MAT_DIALOG_DATA } from '@angular/material'; MAT_DIALOG_DATA } from '@angular/material';
/** Service */ /** Service */
import { MastersService } from '../../../../service/masters/masters.service'; import { MastersService } from '../../../../service/masters/masters.service';
import { NotifierService } from 'angular-notifier';
@Component({ @Component({
@ -21,12 +22,15 @@ import { MastersService } from '../../../../service/masters/masters.service';
export class DesignationDialogComponent implements OnInit { export class DesignationDialogComponent implements OnInit {
public _designationForm: FormGroup; public _designationForm: FormGroup;
private notifier: NotifierService;
color="primary"; color="primary";
constructor(private _formBuilder: FormBuilder, constructor(private _formBuilder: FormBuilder,notifier: NotifierService,
private dialogRef: MatDialogRef<DesignationDialogComponent>, private dialogRef: MatDialogRef<DesignationDialogComponent>,
private _MastersService: MastersService, private _MastersService: MastersService,
@Inject(MAT_DIALOG_DATA) public data: any) { } @Inject(MAT_DIALOG_DATA) public data: any) {
this.notifier = notifier;
}
ngOnInit() { ngOnInit() {
@ -71,10 +75,12 @@ export class DesignationDialogComponent implements OnInit {
//After Saving the data then popup close //After Saving the data then popup close
this.dialogRef.close(); this.dialogRef.close();
//Need To Dispaly saving Datas //Need To Dispaly saving Datas
alert("Data Saved Successfully"); //alert("Data Saved Successfully");
this.notifier.notify('success', 'Record Saved Successfully.!');
} }
else{ else{
alert("SomeThing Wents Wrong Try Again !"); //alert("SomeThing Wents Wrong Try Again !");
this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !');
} }
}); });
@ -86,10 +92,12 @@ export class DesignationDialogComponent implements OnInit {
//After Editing the data then popup close //After Editing the data then popup close
this.dialogRef.close(); this.dialogRef.close();
//Need To Display saving Datas //Need To Display saving Datas
alert("Data Edited Successfully"); //alert("Data Edited Successfully");
this.notifier.notify('success', 'Record Edited Successfully.!');
} }
else{ else{
alert("SomeThing Wents Wrong Try Again !"); //alert("SomeThing Wents Wrong Try Again !");
this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !');
} }
}); });
} }

View File

@ -1,9 +1,9 @@
<mat-card-content> <mat-card-content>
<div style="text-align: right;"> <!-- <div style="text-align: right;">
<!-- <button mat-stroked-button [color]="color" (click)="addDesignation()" > + Add Designation</button> --> <!-- <button mat-stroked-button [color]="color" (click)="addDesignation()" > + Add Designation</button> ->
<button mat-fab class="mr-1 mb-1" [color]="color" (click)="addDesignation()" matTooltip="Add Designation" matTooltipPosition="above"><mat-icon>add</mat-icon></button> <button mat-fab class="mr-1 mb-1" [color]="color" (click)="addDesignation()" matTooltip="Add Designation" matTooltipPosition="above"><mat-icon>add</mat-icon></button>
</div> </div>
<br> <br> -->
<!-- <div *ngIf="loader"> <!-- <div *ngIf="loader">
<mat-progress-bar mode="indeterminate" [color]="color" class="mb-1"></mat-progress-bar> <mat-progress-bar mode="indeterminate" [color]="color" class="mb-1"></mat-progress-bar>
</div> </div>
@ -68,10 +68,21 @@
<br>--> <br>-->
<div *ngIf="!noRecordFound" class="filter-container mat-elevation-z8"> <div *ngIf="!noRecordFound" class="filter-container mat-elevation-z8">
<div class="filter-header"> <!-- <div class="filter-header">
<mat-form-field> <mat-form-field>
<input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter"> <input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter">
</mat-form-field> </mat-form-field>
</div> -->
<div fxLayout="row" fxLayoutAlign="start center" class="filter-header">
<div class="ml-xs mr-xs" style="width: 90%;">
<mat-form-field dividerColor="primary" class="ml-xs mr-xs" style="width: 30%;">
<input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter">
</mat-form-field>
</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)="addDesignation()" matTooltip="Add Designation" matTooltipPosition="above"><mat-icon>add</mat-icon></button>
</div>
</div> </div>
@ -130,3 +141,5 @@
<div *ngIf="noRecordFound" class="nocontent">No records found</div> <div *ngIf="noRecordFound" class="nocontent">No records found</div>
</mat-card-content> </mat-card-content>
<notifier-container></notifier-container>

View File

@ -20,7 +20,7 @@ fxLayoutAlign="center">
<div style="width: 40%;"></div> <div style="width: 40%;"></div>
<div style="width: 30%;text-align:right;"> <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> --> <!-- <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> -->
<button mat-raised-button mat-icon-button class="mr-1 mb-1" matTooltip="Close" matTooltipPosition="above" color="warn" (click)="onNoClick()"><mat-icon>close</mat-icon></button> <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>
</div> </div>
@ -41,11 +41,11 @@ fxLayoutAlign="center">
<br> <br>
<div class="row" style="text-align:right;"> <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 *ngIf="isEmptyObject(_frequencyForm.controls['frequency_id']);else editreset;" mat-raised-button mat-icon-button class="mr-1 mb-1" [color]="color" matTooltip="Reset" matTooltipPosition="above" type="reset" ><mat-icon>settings_backup_restore</mat-icon></button> <button *ngIf="isEmptyObject(_frequencyForm.controls['frequency_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>
<ng-template #editreset> <ng-template #editreset>
<button mat-raised-button mat-icon-button class="mr-1 mb-1" [color]="color" 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="Reset" matTooltipPosition="above" type="button" (click)="onResetForEdit()" ><mat-icon>settings_backup_restore</mat-icon></button>
</ng-template> </ng-template>
<button mat-raised-button mat-icon-button class="mr-1 mb-1" [color]="color" matTooltip="Save" matTooltipPosition="above" type="submit" [disabled]="!_frequencyForm.valid"><mat-icon>save</mat-icon></button> <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Save" matTooltipPosition="above" type="submit" [disabled]="!_frequencyForm.valid"><mat-icon>save</mat-icon></button>
</div> </div>
</mat-dialog-content> </mat-dialog-content>

View File

@ -11,6 +11,7 @@ import { MatDialog,
MAT_DIALOG_DATA } from '@angular/material'; MAT_DIALOG_DATA } from '@angular/material';
/** Service */ /** Service */
import { MastersService } from '../../../../service/masters/masters.service'; import { MastersService } from '../../../../service/masters/masters.service';
import { NotifierService } from 'angular-notifier';
@Component({ @Component({
selector: 'app-jazz-dialog', selector: 'app-jazz-dialog',
@ -21,12 +22,15 @@ export class FrequencyDialogComponent implements OnInit {
public _frequencyForm: FormGroup; public _frequencyForm: FormGroup;
private notifier: NotifierService;
color = 'primary'; color = 'primary';
constructor(private _formBuilder: FormBuilder, constructor(private _formBuilder: FormBuilder,notifier: NotifierService,
private dialogRef: MatDialogRef<FrequencyDialogComponent>, private dialogRef: MatDialogRef<FrequencyDialogComponent>,
private _MastersService: MastersService, private _MastersService: MastersService,
@Inject(MAT_DIALOG_DATA) public data: any) { } @Inject(MAT_DIALOG_DATA) public data: any) {
this.notifier = notifier;
}
ngOnInit() { ngOnInit() {
@ -58,10 +62,12 @@ export class FrequencyDialogComponent implements OnInit {
//After Saving the data then popup close //After Saving the data then popup close
this.dialogRef.close(); this.dialogRef.close();
//Need To Dispaly saving Datas //Need To Dispaly saving Datas
alert("Data Saved Successfully"); //alert("Data Saved Successfully");
this.notifier.notify('success', 'Record Saved Successfully.!');
} }
else{ else{
alert("SomeThing Wents Wrong Try Again !"); //alert("SomeThing Wents Wrong Try Again !");
this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !');
} }
}); });
@ -71,10 +77,12 @@ export class FrequencyDialogComponent implements OnInit {
//After Editing the data then popup close //After Editing the data then popup close
this.dialogRef.close(); this.dialogRef.close();
//Need To Display saving Datas //Need To Display saving Datas
alert("Data Edited Successfully"); //alert("Data Edited Successfully");
this.notifier.notify('success', 'Record Edited Successfully.!');
} }
else{ else{
alert("SomeThing Wents Wrong Try Again !"); // alert("SomeThing Wents Wrong Try Again !");
this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !');
} }
}); });
} }

View File

@ -1,8 +1,8 @@
<div style="text-align: right;"> <!-- <div style="text-align: right;">
<!-- <button mat-stroked-button [color]="color" (click)="addFrequency()" > + Add Frequency</button> --> <!-- <button mat-stroked-button [color]="color" (click)="addFrequency()" > + Add Frequency</button> ->
<button mat-fab class="mr-1 mb-1" [color]="color" (click)="addFrequency()" matTooltip="Add Frequency" matTooltipPosition="above"><mat-icon>add</mat-icon></button> <button mat-fab class="mr-1 mb-1" [color]="color" (click)="addFrequency()" matTooltip="Add Frequency" matTooltipPosition="above"><mat-icon>add</mat-icon></button>
</div> </div> -->
<mat-card-content> <mat-card-content>
<!-- <div *ngIf="loader"> <!-- <div *ngIf="loader">
<mat-progress-bar mode="indeterminate" [color]="color" class="mb-1"></mat-progress-bar> <mat-progress-bar mode="indeterminate" [color]="color" class="mb-1"></mat-progress-bar>
@ -77,10 +77,21 @@
<br>--> <br>-->
<div *ngIf="!noRecordFound" class="filter-container mat-elevation-z8"> <div *ngIf="!noRecordFound" class="filter-container mat-elevation-z8">
<div class="filter-header"> <!-- <div class="filter-header">
<mat-form-field> <mat-form-field>
<input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter"> <input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter">
</mat-form-field> </mat-form-field>
</div> -->
<div fxLayout="row" fxLayoutAlign="start center" class="filter-header">
<div class="ml-xs mr-xs" style="width: 90%;">
<mat-form-field dividerColor="primary" class="ml-xs mr-xs" style="width: 30%;">
<input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter">
</mat-form-field>
</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)="addFrequency()" matTooltip="Add Frequency" matTooltipPosition="above"><mat-icon>add</mat-icon></button>
</div>
</div> </div>
@ -137,3 +148,4 @@
</mat-card-content> </mat-card-content>
<notifier-container></notifier-container>

View File

@ -1,6 +1,6 @@
<!-- <div class="mb-1"> <!-- <div class="mb-1">
<h2 mat-dialog-title>Industry Classification &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;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <h2 mat-dialog-title>Industry Classification &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;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<button mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button> <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" [color]='color' matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button>
</h2> </h2>
</div> </div>
<div class="container" <div class="container"
@ -10,7 +10,7 @@
fxLayoutGap="35px" fxLayoutGap="35px"
fxLayoutGap.xs="0"> fxLayoutGap.xs="0">
<div class="mat-dialog-title" fxFlex fxFlexOrder="1">Industry Classification</div> <div class="mat-dialog-title" fxFlex fxFlexOrder="1">Industry Classification</div>
<div fxFlex="20px" fxFlexOrder="3" style="text-align:right;"><button mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button></div> <div fxFlex="20px" fxFlexOrder="3" style="text-align:right;"><button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" [color]='color' matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button></div>
<div fxFlex="15px" fxFlexOrder="2"></div> <div fxFlex="15px" fxFlexOrder="2"></div>
</div>--> </div>-->
<div class="ml-xs mr-xs" style="width: 100%;" <div class="ml-xs mr-xs" style="width: 100%;"
@ -18,7 +18,7 @@ fxLayout="row"
fxLayoutAlign="center"> fxLayoutAlign="center">
<h2 mat-dialog-title style="width: 70%;"> Industry Classification &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> <h2 mat-dialog-title style="width: 70%;"> Industry Classification &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;"> <div style="width: 30%;text-align:right;">
<button mat-raised-button mat-icon-button class="mr-1 mb-1" color='warn' matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button> <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>
</div> </div>
@ -39,12 +39,12 @@ fxLayoutAlign="center">
</div> </div>
<br> <br>
<div class="row" style="text-align:right;"> <div class="row" style="text-align:right;">
<!-- <button mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' 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" [color]='color' matTooltip="Reset" matTooltipPosition="above" type="reset" ><mat-icon>settings_backup_restore</mat-icon></button> -->
<button *ngIf="isEmptyObject(_IndustryClassificationForm.controls['industry_classification_id']);else editreset;" mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' matTooltip="Reset" matTooltipPosition="above" type="reset" ><mat-icon>settings_backup_restore</mat-icon></button> <button *ngIf="isEmptyObject(_IndustryClassificationForm.controls['industry_classification_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>
<ng-template #editreset> <ng-template #editreset>
<button mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' 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="Reset" matTooltipPosition="above" type="button" (click)="onResetForEdit()" ><mat-icon>settings_backup_restore</mat-icon></button>
</ng-template> </ng-template>
<button mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' matTooltip="Save" matTooltipPosition="above" type="submit" [disabled]="!_IndustryClassificationForm.valid"><mat-icon>save</mat-icon></button> <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Save" matTooltipPosition="above" type="submit" [disabled]="!_IndustryClassificationForm.valid"><mat-icon>save</mat-icon></button>
</div> </div>

View File

@ -11,6 +11,7 @@ import { MatDialog,
MAT_DIALOG_DATA } from '@angular/material'; MAT_DIALOG_DATA } from '@angular/material';
/** Service */ /** Service */
import { MastersService } from '../../../../service/masters/masters.service'; import { MastersService } from '../../../../service/masters/masters.service';
import { NotifierService } from 'angular-notifier';
@Component({ @Component({
@ -22,11 +23,14 @@ export class IndustryClassificationDialogComponent implements OnInit {
color = 'primary'; color = 'primary';
public _IndustryClassificationForm: FormGroup; public _IndustryClassificationForm: FormGroup;
private notifier: NotifierService;
constructor(private _formBuilder: FormBuilder, constructor(private _formBuilder: FormBuilder,notifier: NotifierService,
private dialogRef: MatDialogRef<IndustryClassificationDialogComponent>, private dialogRef: MatDialogRef<IndustryClassificationDialogComponent>,
private _contactService: MastersService, private _contactService: MastersService,
@Inject(MAT_DIALOG_DATA) public data: any) { } @Inject(MAT_DIALOG_DATA) public data: any) {
this.notifier = notifier;
}
ngOnInit() { ngOnInit() {
@ -74,10 +78,12 @@ onNoClick(): void {
//After Saving the data then popup close //After Saving the data then popup close
this.dialogRef.close(); this.dialogRef.close();
//Need To Dispaly saving Datas //Need To Dispaly saving Datas
alert("Data Saved Successfully"); //alert("Data Saved Successfully");
this.notifier.notify('success', 'Record Saved Successfully.!');
} }
else{ else{
alert("SomeThing Wents Wrong Try Again !"); //alert("SomeThing Wents Wrong Try Again !");
this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !');
} }
}); });
@ -88,10 +94,12 @@ onNoClick(): void {
//After Editing the data then popup close //After Editing the data then popup close
this.dialogRef.close(); this.dialogRef.close();
//Need To Display saving Datas //Need To Display saving Datas
alert("Data Edited Successfully"); //alert("Data Edited Successfully");
this.notifier.notify('success', 'Record Edited Successfully.!');
} }
else{ else{
alert("SomeThing Wents Wrong Try Again !"); //alert("SomeThing Wents Wrong Try Again !");
this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !');
} }
}); });
} }

View File

@ -1,18 +1,28 @@
<div style="text-align: right;"> <!-- <div style="text-align: right;">
<!-- <button mat-stroked-button [color]="color" (click)="addIndustryClassification()" > + Add Industry Classification</button> --> <!- <button mat-stroked-button [color]="color" (click)="addIndustryClassification()" > + Add Industry Classification</button> ->
<button mat-fab class="mr-1 mb-1" [color]="color" (click)="addIndustryClassification()" matTooltip="Add Industry Classification" matTooltipPosition="above"><mat-icon>add</mat-icon></button>
</div> </div> -->
<mat-card-content> <mat-card-content>
<!-- <div *ngIf="loader"> <!-- <div *ngIf="loader">
<mat-progress-bar mode="indeterminate" [color]="color" class="mb-1"></mat-progress-bar> <mat-progress-bar mode="indeterminate" [color]="color" class="mb-1"></mat-progress-bar>
</div> <br> --> </div> <br> -->
<div *ngIf="!noRecordFound" class="filter-container mat-elevation-z8"> <div *ngIf="!noRecordFound" class="filter-container mat-elevation-z8">
<div class="filter-header"> <!-- <div class="filter-header">
<mat-form-field> <mat-form-field>
<input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter"> <input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter">
</mat-form-field> </mat-form-field>
</div> -->
<div fxLayout="row" fxLayoutAlign="start center" class="filter-header">
<div class="ml-xs mr-xs" style="width: 90%;">
<mat-form-field dividerColor="primary" class="ml-xs mr-xs" style="width: 30%;">
<input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter">
</mat-form-field>
</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)="addIndustryClassification()" matTooltip="Add Industry Classification" matTooltipPosition="above"><mat-icon>add</mat-icon></button>
</div>
</div> </div>
<mat-table [dataSource]="dataSource" matSort > <mat-table [dataSource]="dataSource" matSort >
@ -70,3 +80,4 @@
</div> --> </div> -->
<div *ngIf="noRecordFound" class="nocontent">No records found</div> <div *ngIf="noRecordFound" class="nocontent">No records found</div>
</mat-card-content> </mat-card-content>
<notifier-container></notifier-container>

View File

@ -1,6 +1,6 @@
<!-- <div class="mb-1"> <!-- <div class="mb-1">
<h2 mat-dialog-title>Lender Hierarchy &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;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <h2 mat-dialog-title>Lender Hierarchy &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;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<button mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button> <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" [color]='color' matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button>
</h2> </h2>
</div> </div>
<div class="container" <div class="container"
@ -10,7 +10,7 @@ fxLayoutAlign="center"
fxLayoutGap="35px" fxLayoutGap="35px"
fxLayoutGap.xs="0"> fxLayoutGap.xs="0">
<div class="mat-dialog-title" fxFlex fxFlexOrder="1">Lender Hierarchy </div> <div class="mat-dialog-title" fxFlex fxFlexOrder="1">Lender Hierarchy </div>
<div fxFlex="20px" fxFlexOrder="3" style="text-align:right;"><button mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button></div> <div fxFlex="20px" fxFlexOrder="3" style="text-align:right;"><button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" [color]='color' matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button></div>
<div fxFlex="15px" fxFlexOrder="2"></div> <div fxFlex="15px" fxFlexOrder="2"></div>
</div>--> </div>-->
<div class="ml-xs mr-xs" style="width: 100%;" <div class="ml-xs mr-xs" style="width: 100%;"
@ -18,7 +18,7 @@ fxLayout="row"
fxLayoutAlign="center"> fxLayoutAlign="center">
<h2 mat-dialog-title style="width: 70%;"> Lender Hierarchy &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</h2> <h2 mat-dialog-title style="width: 70%;"> Lender Hierarchy &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</h2>
<div style="width: 30%;text-align:right;"> <div style="width: 30%;text-align:right;">
<button mat-raised-button mat-icon-button class="mr-1 mb-1" color='warn' matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button> <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>
</div> </div>
@ -38,12 +38,12 @@ fxLayoutAlign="center">
</div> </div>
<br> <br>
<div class="row" style="text-align:right;"> <div class="row" style="text-align:right;">
<!-- <button mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' 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" [color]='color' matTooltip="Reset" matTooltipPosition="above" type="reset" ><mat-icon>settings_backup_restore</mat-icon></button> -->
<button *ngIf="isEmptyObject(_lenderHierarchyForm.controls['lender_hierarchy_id']);else editreset;" mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' matTooltip="Reset" matTooltipPosition="above" type="reset" ><mat-icon>settings_backup_restore</mat-icon></button> <button *ngIf="isEmptyObject(_lenderHierarchyForm.controls['lender_hierarchy_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>
<ng-template #editreset> <ng-template #editreset>
<button mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' 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="Reset" matTooltipPosition="above" type="button" (click)="onResetForEdit()" ><mat-icon>settings_backup_restore</mat-icon></button>
</ng-template> </ng-template>
<button mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' matTooltip="Save" matTooltipPosition="above" type="submit" [disabled]="!_lenderHierarchyForm.valid"><mat-icon>save</mat-icon></button> <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Save" matTooltipPosition="above" type="submit" [disabled]="!_lenderHierarchyForm.valid"><mat-icon>save</mat-icon></button>
</div> </div>
</mat-dialog-content> </mat-dialog-content>

View File

@ -10,6 +10,7 @@ import { MatDialog,
MAT_DIALOG_DATA } from '@angular/material'; MAT_DIALOG_DATA } from '@angular/material';
/** Service */ /** Service */
import { MastersService } from '../../../../service/masters/masters.service'; import { MastersService } from '../../../../service/masters/masters.service';
import { NotifierService } from 'angular-notifier';
@Component({ @Component({
selector: 'app-jazz-dialog', selector: 'app-jazz-dialog',
@ -19,11 +20,14 @@ import { MastersService } from '../../../../service/masters/masters.service';
export class LenderHierarchyDialogComponent implements OnInit { export class LenderHierarchyDialogComponent implements OnInit {
color = 'primary'; color = 'primary';
public _lenderHierarchyForm: FormGroup; public _lenderHierarchyForm: FormGroup;
private notifier: NotifierService;
constructor(private _formBuilder: FormBuilder, constructor(private _formBuilder: FormBuilder,notifier: NotifierService,
private dialogRef: MatDialogRef<LenderHierarchyDialogComponent>, private dialogRef: MatDialogRef<LenderHierarchyDialogComponent>,
private _MastersService: MastersService, private _MastersService: MastersService,
@Inject(MAT_DIALOG_DATA) public data: any) { } @Inject(MAT_DIALOG_DATA) public data: any) {
this.notifier = notifier;
}
ngOnInit() { ngOnInit() {
@ -71,10 +75,12 @@ export class LenderHierarchyDialogComponent implements OnInit {
//After Saving the data then popup close //After Saving the data then popup close
this.dialogRef.close(); this.dialogRef.close();
//Need To Dispaly saving Datas //Need To Dispaly saving Datas
alert("Data Saved Successfully"); //alert("Data Saved Successfully");
this.notifier.notify('success', 'Record Saved Successfully.!');
} }
else{ else{
alert("SomeThing Wents Wrong Try Again !"); //alert("SomeThing Wents Wrong Try Again !");
this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !');
} }
}); });
@ -89,10 +95,12 @@ export class LenderHierarchyDialogComponent implements OnInit {
//After Editing the data then popup close //After Editing the data then popup close
this.dialogRef.close(); this.dialogRef.close();
//Need To Display saving Datas //Need To Display saving Datas
alert("Data Edited Successfully"); //alert("Data Edited Successfully");
this.notifier.notify('success', 'Record Edited Successfully.!');
} }
else{ else{
alert("SomeThing Wents Wrong Try Again !"); //alert("SomeThing Wents Wrong Try Again !");
this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !');
} }
}); });
} }

View File

@ -1,9 +1,9 @@
<div style="text-align: right;"> <!-- <div style="text-align: right;">
<!-- <button mat-stroked-button [color]="color" (click)="addLenderHierarchy()" > + Add LenderHierarchy</button> --> <!-- <button mat-stroked-button [color]="color" (click)="addLenderHierarchy()" > + Add LenderHierarchy</button> ->
<button mat-fab class="mr-1 mb-1" [color]="color" (click)="addLenderHierarchy()" matTooltip="Add Lender Hierarchy" matTooltipPosition="above"><mat-icon>add</mat-icon></button>
</div>
</div> -->
<mat-card-content> <mat-card-content>
<!-- <div *ngIf="loader"> <!-- <div *ngIf="loader">
<mat-progress-bar mode="indeterminate" [color]="color" class="mb-1"></mat-progress-bar> <mat-progress-bar mode="indeterminate" [color]="color" class="mb-1"></mat-progress-bar>
@ -63,10 +63,21 @@
<br>--> <br>-->
<div *ngIf="!noRecordFound" class="filter-container mat-elevation-z8"> <div *ngIf="!noRecordFound" class="filter-container mat-elevation-z8">
<div class="filter-header"> <!-- <div class="filter-header">
<mat-form-field> <mat-form-field>
<input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter"> <input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter">
</mat-form-field> </mat-form-field>
</div> -->
<div fxLayout="row" fxLayoutAlign="start center" class="filter-header">
<div class="ml-xs mr-xs" style="width: 90%;">
<mat-form-field dividerColor="primary" class="ml-xs mr-xs" style="width: 30%;">
<input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter">
</mat-form-field>
</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)="addLenderHierarchy()" matTooltip="Add Lender Hierarchy" matTooltipPosition="above"><mat-icon>add</mat-icon></button>
</div>
</div> </div>
@ -127,3 +138,4 @@
<div *ngIf="noRecordFound" class="nocontent">No records found</div> <div *ngIf="noRecordFound" class="nocontent">No records found</div>
</mat-card-content> </mat-card-content>
<notifier-container></notifier-container>

View File

@ -1,6 +1,6 @@
<!-- <div class="mb-1"> <!-- <div class="mb-1">
<h2 mat-dialog-title>Occupation of Non earning members &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;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <h2 mat-dialog-title>Occupation of Non earning members &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;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<button mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button> <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" [color]='color' matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button>
</h2> </h2>
</div> </div>
<div class="container" <div class="container"
@ -10,14 +10,14 @@
fxLayoutGap="35px" fxLayoutGap="35px"
fxLayoutGap.xs="0"> fxLayoutGap.xs="0">
<div class="mat-dialog-title" fxFlex fxFlexOrder="1">Occupation of Non earning members </div> <div class="mat-dialog-title" fxFlex fxFlexOrder="1">Occupation of Non earning members </div>
<div fxFlex="20px" fxFlexOrder="3" style="text-align:right;"><button mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button></div> <div fxFlex="20px" fxFlexOrder="3" style="text-align:right;"><button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" [color]='color' matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button></div>
<div fxFlex="2px"></div> <div fxFlex="2px"></div>
</div>--> </div>-->
<div class="ml-xs mr-xs" style="width: 100%;" <div class="ml-xs mr-xs" style="width: 100%;"
fxLayout="row"> fxLayout="row">
<h2 mat-dialog-title style="width: 85%;">Occupation of Non earning members</h2> <h2 mat-dialog-title style="width: 85%;">Occupation of Non earning members</h2>
<div style="width: 10%;text-align:right;"> <div style="width: 10%;text-align:right;">
<button mat-raised-button mat-icon-button class="mr-1 mb-1" color='warn' matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button> <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>
</div> </div>
@ -38,12 +38,12 @@ fxLayout="row">
</div> </div>
<br> <br>
<div class="row" style="text-align:right;"> <div class="row" style="text-align:right;">
<!-- <button mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' 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" [color]='color' matTooltip="Reset" matTooltipPosition="above" type="reset" ><mat-icon>settings_backup_restore</mat-icon></button> -->
<button *ngIf="isEmptyObject(_occupationForm.controls['occupation_non_earning_member_id']);else editreset;" mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' matTooltip="Reset" matTooltipPosition="above" type="reset" ><mat-icon>settings_backup_restore</mat-icon></button> <button *ngIf="isEmptyObject(_occupationForm.controls['occupation_non_earning_member_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>
<ng-template #editreset> <ng-template #editreset>
<button mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' 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="Reset" matTooltipPosition="above" type="button" (click)="onResetForEdit()" ><mat-icon>settings_backup_restore</mat-icon></button>
</ng-template> </ng-template>
<button mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' matTooltip="Save" matTooltipPosition="above" type="submit" [disabled]="!_occupationForm.valid"><mat-icon>save</mat-icon></button> <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Save" matTooltipPosition="above" type="submit" [disabled]="!_occupationForm.valid"><mat-icon>save</mat-icon></button>
<!-- <button mat-button >RESET</button> --> <!-- <button mat-button >RESET</button> -->
</div> </div>

View File

@ -10,6 +10,7 @@ import { MatDialog,
MAT_DIALOG_DATA } from '@angular/material'; MAT_DIALOG_DATA } from '@angular/material';
/** Service */ /** Service */
import { MastersService } from '../../../../service/masters/masters.service'; import { MastersService } from '../../../../service/masters/masters.service';
import { NotifierService } from 'angular-notifier';
@Component({ @Component({
selector: 'app-jazz-dialog', selector: 'app-jazz-dialog',
@ -20,11 +21,14 @@ export class MembersOccupationDialogComponent implements OnInit {
color = 'primary'; color = 'primary';
public _occupationForm: FormGroup; public _occupationForm: FormGroup;
private notifier: NotifierService;
constructor(private _formBuilder: FormBuilder, constructor(private _formBuilder: FormBuilder,notifier: NotifierService,
private dialogRef: MatDialogRef<MembersOccupationDialogComponent>, private dialogRef: MatDialogRef<MembersOccupationDialogComponent>,
private _memberService: MastersService, private _memberService: MastersService,
@Inject(MAT_DIALOG_DATA) public data: any) { } @Inject(MAT_DIALOG_DATA) public data: any) {
this.notifier = notifier;
}
occupationFormDatas(){ occupationFormDatas(){
this._occupationForm = this._formBuilder.group({ this._occupationForm = this._formBuilder.group({
@ -56,10 +60,12 @@ export class MembersOccupationDialogComponent implements OnInit {
//After Saving the data then popup close //After Saving the data then popup close
this.dialogRef.close(); this.dialogRef.close();
//Need To Dispaly saving Datas //Need To Dispaly saving Datas
alert("Data Saved Successfully"); //alert("Data Saved Successfully");
this.notifier.notify('success', 'Record Saved Successfully.!');
} }
else{ else{
alert("SomeThing Wents Wrong Try Again !"); //alert("SomeThing Wents Wrong Try Again !");
this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !');
} }
}); });
@ -70,10 +76,12 @@ export class MembersOccupationDialogComponent implements OnInit {
//After Editing the data then popup close //After Editing the data then popup close
this.dialogRef.close(); this.dialogRef.close();
//Need To Display saving Datas //Need To Display saving Datas
alert("Data Edited Successfully"); //alert("Data Edited Successfully");
this.notifier.notify('success', 'Record Edited Successfully.!');
} }
else{ else{
alert("SomeThing Wents Wrong Try Again !"); //alert("SomeThing Wents Wrong Try Again !");
this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !');
} }
}); });
} }

View File

@ -1,8 +1,8 @@
<div style="text-align: right;"> <!-- <div style="text-align: right;">
<!-- <button mat-stroked-button [color]="color" (click)="addMemberOccupation()" > + Add Member's Occupation</button> --> <!-- <button mat-stroked-button [color]="color" (click)="addMemberOccupation()" > + Add Member's Occupation</button> ->
<button mat-fab class="mr-1 mb-1" [color]="color" (click)="addMemberOccupation()" matTooltip="Add Member's Occupation" matTooltipPosition="above"><mat-icon>add</mat-icon></button>
</div> </div> -->
<mat-card-content> <mat-card-content>
<!-- <div *ngIf="loader"> <!-- <div *ngIf="loader">
<mat-progress-bar mode="indeterminate" [color]="color" class="mb-1"></mat-progress-bar> <mat-progress-bar mode="indeterminate" [color]="color" class="mb-1"></mat-progress-bar>
@ -81,10 +81,21 @@
<br>--> <br>-->
<div *ngIf="!noRecordFound" class="filter-container mat-elevation-z8"> <div *ngIf="!noRecordFound" class="filter-container mat-elevation-z8">
<div class="filter-header"> <!-- <div class="filter-header">
<mat-form-field> <mat-form-field>
<input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter"> <input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter">
</mat-form-field> </mat-form-field>
</div> -->
<div fxLayout="row" fxLayoutAlign="start center" class="filter-header">
<div class="ml-xs mr-xs" style="width: 90%;">
<mat-form-field dividerColor="primary" class="ml-xs mr-xs" style="width: 30%;">
<input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter">
</mat-form-field>
</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)="addMemberOccupation()" matTooltip="Add Member's Occupation" matTooltipPosition="above"><mat-icon>add</mat-icon></button>
</div>
</div> </div>
@ -145,3 +156,4 @@
</mat-card-content> </mat-card-content>
<notifier-container></notifier-container>

View File

@ -1,16 +1,23 @@
<mat-card-content> <mat-card-content>
<div style="text-align: right;"> <!-- <div style="text-align: right;">
<!-- <button mat-raised-button [color]="color" (click)="addPDAllocationType()" > + Add PDAllocationType</button> --> <!-- <button mat-raised-button [color]="color" (click)="addPDAllocationType()" > + Add PDAllocationType</button> ->
</div> </div>
<br> <br> -->
<!-- <div *ngIf="loader"> <!-- <div *ngIf="loader">
<mat-progress-bar mode="indeterminate" [color]="color" class="mb-1"></mat-progress-bar> <mat-progress-bar mode="indeterminate" [color]="color" class="mb-1"></mat-progress-bar>
</div> <br> --> </div> <br> -->
<div *ngIf="!noRecordFound" class="filter-container mat-elevation-z8"> <div *ngIf="!noRecordFound" class="filter-container mat-elevation-z8">
<div class="filter-header"> <!-- <div class="filter-header">
<mat-form-field> <mat-form-field>
<input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter"> <input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter">
</mat-form-field> </mat-form-field>
</div> -->
<div fxLayout="row" fxLayoutAlign="start center" class="filter-header">
<div class="ml-xs mr-xs" style="width: 90%;">
<mat-form-field dividerColor="primary" class="ml-xs mr-xs" style="width: 30%;">
<input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter">
</mat-form-field>
</div>
</div> </div>
<mat-table [dataSource]="dataSource" matSort > <mat-table [dataSource]="dataSource" matSort >
@ -81,3 +88,4 @@
</mat-card-content> </mat-card-content>
<notifier-container></notifier-container>

View File

@ -11,6 +11,7 @@ import { MatDialog,
MatTableDataSource } from '@angular/material'; MatTableDataSource } from '@angular/material';
/** Service */ /** Service */
import { MastersService } from '../../../service/masters/masters.service'; import { MastersService } from '../../../service/masters/masters.service';
import { NotifierService } from 'angular-notifier';
/** Model */ /** Model */
import { PdAllocationType } from '../../model/pd'; import { PdAllocationType } from '../../model/pd';
@ -28,7 +29,7 @@ export class PdAllocationTypeListComponent implements OnInit {
noRecordFound: boolean = false; noRecordFound: boolean = false;
dataSourceRecords = null; dataSourceRecords = null;
color = 'primary'; color = 'primary';
private notifier: NotifierService;
public dataLength: number; public dataLength: number;
public dataSource = new MatTableDataSource(); public dataSource = new MatTableDataSource();
@ -39,8 +40,9 @@ export class PdAllocationTypeListComponent implements OnInit {
@ViewChild(MatSort) sort: MatSort; @ViewChild(MatSort) sort: MatSort;
constructor(private _MastersService: MastersService) { constructor(private _MastersService: MastersService,notifier: NotifierService) {
this.getPDAllocationType(); this.getPDAllocationType();
this.notifier = notifier;
} }
ngOnInit() {} ngOnInit() {}
@ -106,10 +108,12 @@ export class PdAllocationTypeListComponent implements OnInit {
if (dataresult.dataStatus == true){ if (dataresult.dataStatus == true){
//this.getPDAllocationType(); //this.getPDAllocationType();
alert("Done"); //alert("Done");
this.notifier.notify('success', 'Done.!');
} }
else{ else{
alert("SomeThing Wents Wrong Try Again !"); //alert("SomeThing Wents Wrong Try Again !");
this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !');
} }
}); });
//console.log('at last Completed Section'); //console.log('at last Completed Section');

View File

@ -1,6 +1,6 @@
<!-- <div class="mb-1"> <!-- <div class="mb-1">
<h2 mat-dialog-title>PD Location Approach &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;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <h2 mat-dialog-title>PD Location Approach &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;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<button mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button> <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" [color]='color' matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button>
</h2> </h2>
</div> </div>
<div class="container" <div class="container"
@ -10,7 +10,7 @@
fxLayoutGap="35px" fxLayoutGap="35px"
fxLayoutGap.xs="0"> fxLayoutGap.xs="0">
<div class="mat-dialog-title" fxFlex fxFlexOrder="1">PD Location Approach</div> <div class="mat-dialog-title" fxFlex fxFlexOrder="1">PD Location Approach</div>
<div fxFlex="20px" fxFlexOrder="3" style="text-align:right;"><button mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button></div> <div fxFlex="20px" fxFlexOrder="3" style="text-align:right;"><button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" [color]='color' matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button></div>
<div fxFlex="2px" fxFlexOrder="2"></div> <div fxFlex="2px" fxFlexOrder="2"></div>
</div>--> </div>-->
<div class="ml-xs mr-xs" style="width: 100%;" <div class="ml-xs mr-xs" style="width: 100%;"
@ -19,7 +19,7 @@ fxLayoutAlign="center">
<h2 mat-dialog-title style="width: 70%;">PD Location Approach &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;&nbsp;&nbsp;&nbsp;&nbsp;</h2> <h2 mat-dialog-title style="width: 70%;">PD Location Approach &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;&nbsp;&nbsp;&nbsp;&nbsp;</h2>
<div style="width: 30%;text-align:right;"> <div style="width: 30%;text-align:right;">
<button mat-raised-button mat-icon-button class="mr-1 mb-1" color='warn' matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button> <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>
</div> </div>
@ -41,12 +41,12 @@ fxLayoutAlign="center">
<br> <br>
<div class="row" style="text-align:right;"> <div class="row" style="text-align:right;">
<!-- <button mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' 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" [color]='color' matTooltip="Reset" matTooltipPosition="above" type="reset" ><mat-icon>settings_backup_restore</mat-icon></button> -->
<button *ngIf="isEmptyObject(_pdLocationApproachForm.controls['pd_location_approach_id']);else editreset;" mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' matTooltip="Reset" matTooltipPosition="above" type="reset" ><mat-icon>settings_backup_restore</mat-icon></button> <button *ngIf="isEmptyObject(_pdLocationApproachForm.controls['pd_location_approach_id']);else editreset;" 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>
<ng-template #editreset> <ng-template #editreset>
<button mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' 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="Reset" matTooltipPosition="above" type="button" (click)="onResetForEdit()" ><mat-icon>settings_backup_restore</mat-icon></button>
</ng-template> </ng-template>
<button mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' matTooltip="Save" matTooltipPosition="above" type="submit" [disabled]="!_pdLocationApproachForm.valid"><mat-icon>save</mat-icon></button> <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Save" matTooltipPosition="above" type="submit" [disabled]="!_pdLocationApproachForm.valid"><mat-icon>save</mat-icon></button>
<!-- <button mat-button >RESET</button> --> <!-- <button mat-button >RESET</button> -->
</div> </div>

View File

@ -10,6 +10,7 @@ import { MatDialog,
MAT_DIALOG_DATA } from '@angular/material'; MAT_DIALOG_DATA } from '@angular/material';
/** Service */ /** Service */
import { MastersService } from '../../../../service/masters/masters.service'; import { MastersService } from '../../../../service/masters/masters.service';
import { NotifierService } from 'angular-notifier';
@Component({ @Component({
selector: 'app-jazz-dialog', selector: 'app-jazz-dialog',
@ -19,11 +20,14 @@ import { MastersService } from '../../../../service/masters/masters.service';
export class PdLocationApproachDialogComponent implements OnInit { export class PdLocationApproachDialogComponent implements OnInit {
color = 'primary'; color = 'primary';
public _pdLocationApproachForm: FormGroup; public _pdLocationApproachForm: FormGroup;
private notifier: NotifierService;
constructor(private _formBuilder: FormBuilder, constructor(private _formBuilder: FormBuilder,notifier: NotifierService,
private dialogRef: MatDialogRef<PdLocationApproachDialogComponent>, private dialogRef: MatDialogRef<PdLocationApproachDialogComponent>,
private _MastersService: MastersService, private _MastersService: MastersService,
@Inject(MAT_DIALOG_DATA) public data: any) { } @Inject(MAT_DIALOG_DATA) public data: any) {
this.notifier = notifier;
}
//pd_location_approach_id, description, createdon, fk_createdby, updatedon, fk_updatedby, isactive //pd_location_approach_id, description, createdon, fk_createdby, updatedon, fk_updatedby, isactive
@ -69,10 +73,12 @@ export class PdLocationApproachDialogComponent implements OnInit {
//After Saving the data then popup close //After Saving the data then popup close
this.dialogRef.close(); this.dialogRef.close();
//Need To Dispaly saving Datas //Need To Dispaly saving Datas
alert("Data Saved Successfully"); //alert("Data Saved Successfully");
this.notifier.notify('success', 'Record Saved Successfully.!');
} }
else{ else{
alert("SomeThing Wents Wrong Try Again !"); //alert("SomeThing Wents Wrong Try Again !");
this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !');
} }
}); });
@ -86,10 +92,12 @@ export class PdLocationApproachDialogComponent implements OnInit {
//After Editing the data then popup close //After Editing the data then popup close
this.dialogRef.close(); this.dialogRef.close();
//Need To Display saving Datas //Need To Display saving Datas
alert("Data Edited Successfully"); //alert("Data Edited Successfully");
this.notifier.notify('success', 'Record Edited Successfully.!');
} }
else{ else{
alert("SomeThing Wents Wrong Try Again !"); //alert("SomeThing Wents Wrong Try Again !");
this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !');
} }
}); });
} }

View File

@ -1,8 +1,8 @@
<div style="text-align: right;"> <!-- <div style="text-align: right;">
<!-- <button mat-stroked-button [color]="color" (click)="addPdLocationApproach()" > + Add Pd Location Approach</button> --> <!-- <button mat-stroked-button [color]="color" (click)="addPdLocationApproach()" > + Add Pd Location Approach</button> ->
<button mat-fab class="mr-1 mb-1" [color]="color" (click)="addPdLocationApproach()" matTooltip="Add Pd Location Approach" matTooltipPosition="above"><mat-icon>add</mat-icon></button>
</div> </div> -->
<mat-card-content> <mat-card-content>
<!-- <div *ngIf="loader"> <!-- <div *ngIf="loader">
<mat-progress-bar mode="indeterminate" [color]="color" class="mb-1"></mat-progress-bar> <mat-progress-bar mode="indeterminate" [color]="color" class="mb-1"></mat-progress-bar>
@ -64,10 +64,21 @@
<br>--> <br>-->
<div *ngIf="!noRecordFound" class="filter-container mat-elevation-z8"> <div *ngIf="!noRecordFound" class="filter-container mat-elevation-z8">
<div class="filter-header"> <!-- <div class="filter-header">
<mat-form-field> <mat-form-field>
<input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter"> <input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter">
</mat-form-field> </mat-form-field>
</div> -->
<div fxLayout="row" fxLayoutAlign="start center" class="filter-header">
<div class="ml-xs mr-xs" style="width: 90%;">
<mat-form-field dividerColor="primary" class="ml-xs mr-xs" style="width: 30%;">
<input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter">
</mat-form-field>
</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)="addPdLocationApproach()" matTooltip="Add Pd Location Approach" matTooltipPosition="above"><mat-icon>add</mat-icon></button>
</div>
</div> </div>
<mat-table [dataSource]="dataSource" matSort > <mat-table [dataSource]="dataSource" matSort >
@ -123,3 +134,4 @@
<div *ngIf="noRecordFound" class="nocontent">No records found</div> <div *ngIf="noRecordFound" class="nocontent">No records found</div>
</mat-card-content> </mat-card-content>
<notifier-container></notifier-container>

View File

@ -1,19 +1,26 @@
<mat-card-content> <mat-card-content>
<div style="text-align: right;"> <!-- <div style="text-align: right;">
<!-- <button mat-raised-button color="primary" (click)="addPDAllocationType()" > + Add PDAllocationType</button> --> <button mat-raised-button color="primary" (click)="addPDAllocationType()" > + Add PDAllocationType</button> -->
<!-- displayedColumns = ['','fk_pd_status_id', <!-- displayedColumns = ['','fk_pd_status_id',
'sms_lender','sms_pdofficer','sms_pdincharge', 'sms_lender','sms_pdofficer','sms_pdincharge',
'mail_lender', 'mail_pdincharge','mail_pdofficer']; --> 'mail_lender', 'mail_pdincharge','mail_pdofficer'];
</div> </div>
<br> <br> -->
<!-- <div *ngIf="loader"> <!-- <div *ngIf="loader">
<mat-progress-bar mode="indeterminate" color="accent" class="mb-1"></mat-progress-bar> <mat-progress-bar mode="indeterminate" color="accent" class="mb-1"></mat-progress-bar>
</div> <br> --> </div> <br> -->
<div *ngIf="!noRecordFound" class="filter-container mat-elevation-z8"> <div *ngIf="!noRecordFound" class="filter-container mat-elevation-z8">
<div class="filter-header"> <!-- <div class="filter-header">
<mat-form-field> <mat-form-field>
<input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter"> <input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter">
</mat-form-field> </mat-form-field>
</div> -->
<div fxLayout="row" fxLayoutAlign="start center" class="filter-header">
<div class="ml-xs mr-xs" style="width: 90%;">
<mat-form-field dividerColor="primary" class="ml-xs mr-xs" style="width: 30%;">
<input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter">
</mat-form-field>
</div>
</div> </div>
<mat-table [dataSource]="dataSource" matSort > <mat-table [dataSource]="dataSource" matSort >
@ -134,3 +141,4 @@
</mat-card-content> </mat-card-content>
<notifier-container></notifier-container>

View File

@ -11,6 +11,7 @@ import 'rxjs/add/operator/map';
/** Service */ /** Service */
import { MastersService } from '../../../service/masters/masters.service'; import { MastersService } from '../../../service/masters/masters.service';
import { NotifierService } from 'angular-notifier';
@Component({ @Component({
selector: 'app-pd-notification-list', selector: 'app-pd-notification-list',
@ -29,7 +30,7 @@ export class PdNotificationListComponent implements OnInit {
}; };
notificationData = null; notificationData = null;
noRecordFound: boolean = false; noRecordFound: boolean = false;
private notifier: NotifierService;
public dataLength: number; public dataLength: number;
public dataSource = new MatTableDataSource(); public dataSource = new MatTableDataSource();
@ -38,9 +39,10 @@ export class PdNotificationListComponent implements OnInit {
@ViewChild(MatPaginator) paginator: MatPaginator; @ViewChild(MatPaginator) paginator: MatPaginator;
@ViewChild(MatSort) sort: MatSort; @ViewChild(MatSort) sort: MatSort;
constructor(private dialog: MatDialog, constructor(private dialog: MatDialog,notifier: NotifierService,
private _MastersService: MastersService) { private _MastersService: MastersService) {
this.getPdNotification(); this.getPdNotification();
this.notifier = notifier;
} }
ngOnInit() {} ngOnInit() {}
@ -126,6 +128,12 @@ export class PdNotificationListComponent implements OnInit {
}); });
//console.log(this.notificationData); //console.log(this.notificationData);
this.dataLength = data.records.length; this.dataLength = data.records.length;
// if(data.records.length >= 1){
// this.notificationData = this.notificationData.map((val, i)=>{
// val['serialno'] = i + 1;
// return val;
// })
// }
this.dataSource.data = this.notificationData; this.dataSource.data = this.notificationData;
}else{ }else{
this.noRecordFound = true; this.noRecordFound = true;
@ -184,10 +192,13 @@ SaveData(dataSource){
this._MastersService.saveAllPDNotification(PDNotificationArray).subscribe( this._MastersService.saveAllPDNotification(PDNotificationArray).subscribe(
dataresult => { dataresult => {
if(dataresult.dataStatus == true){ if(dataresult.dataStatus == true){
alert('Updated Successfully !'); //alert('Updated Successfully !');
this.getPdNotification(); this.getPdNotification();
this.notifier.notify('success', 'Record Updated Successfully.!');
}else{ }else{
alert('Sorry Try Again !'); //alert('Sorry Try Again !');
this.notifier.notify('warning', 'Sorry Try Again !');
} }
}); });

View File

@ -3,7 +3,7 @@
fxLayoutAlign="center"> 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> <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;"> <div style="width: 30%;text-align:right;">
<button mat-raised-button mat-icon-button class="mr-1 mb-1" color='warn' matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button> <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>
</div> </div>
@ -75,14 +75,14 @@
<br> <br>
<div class="row" style="text-align:right;"> <div class="row" style="text-align:right;">
<!-- <button mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' 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" [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" [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;" <button *ngIf="isEmptyObject(_pdTeamForm.controls['pdteam_id']);else Editreset;"
mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' matTooltip="Reset" matTooltipPosition="above" type="button" (click)="onResetForAdd()" ><mat-icon>settings_backup_restore</mat-icon></button> 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> <ng-template #Editreset>
<button mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' 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="Reset" matTooltipPosition="above" type="button" (click)="onResetForEdit()" ><mat-icon>settings_backup_restore</mat-icon></button>
</ng-template> </ng-template>
<button mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' matTooltip="Save" matTooltipPosition="above" type="submit" [disabled]="!_pdTeamForm.valid"><mat-icon>save</mat-icon></button> <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> </div>
</mat-dialog-content> </mat-dialog-content>

View File

@ -11,6 +11,7 @@ import { MatDialog,
/** Service */ /** Service */
import { MastersService } from '../../../../service/masters/masters.service'; import { MastersService } from '../../../../service/masters/masters.service';
import { PdTeamService } from '../../../../service/masters/pd-team.service'; import { PdTeamService } from '../../../../service/masters/pd-team.service';
import { NotifierService } from 'angular-notifier';
@Component({ @Component({
selector: 'app-pd-team-dialog', selector: 'app-pd-team-dialog',
@ -22,6 +23,7 @@ import { PdTeamService } from '../../../../service/masters/pd-team.service';
export class PdTeamDialogComponent implements OnInit { export class PdTeamDialogComponent implements OnInit {
public _pdTeamForm: FormGroup; public _pdTeamForm: FormGroup;
private notifier: NotifierService;
color = 'primary'; color = 'primary';
citydatas: any[]; citydatas: any[];
lenderdatas: any[]; lenderdatas: any[];
@ -34,11 +36,13 @@ AllPDTeamMapData: any[];
PDTeamMaplen:any = 0; PDTeamMaplen:any = 0;
constructor(private _formBuilder: FormBuilder, constructor(private _formBuilder: FormBuilder,notifier: NotifierService,
private dialogRef: MatDialogRef<PdTeamDialogComponent>, private dialogRef: MatDialogRef<PdTeamDialogComponent>,
private _pdTeamService: PdTeamService, private _pdTeamService: PdTeamService,
private _masterService: MastersService, private _masterService: MastersService,
@Inject(MAT_DIALOG_DATA) public data: any) { } @Inject(MAT_DIALOG_DATA) public data: any) {
this.notifier = notifier;
}
ngOnInit() { ngOnInit() {
@ -267,7 +271,8 @@ if (dataresult.dataStatus == true){
//After Saving the data then popup close //After Saving the data then popup close
this.dialogRef.close(); this.dialogRef.close();
//Need To Dispaly saving Datas //Need To Dispaly saving Datas
alert("Data Saved Successfully"); // alert("Data Saved Successfully");
this.notifier.notify('success', 'Record Saved Successfully.!');
} }
else{ else{
alert("SomeThing Wents Wrong Try Again !"); alert("SomeThing Wents Wrong Try Again !");
@ -285,10 +290,12 @@ if (dataresult.dataStatus == true){
//After Editing the data then popup close //After Editing the data then popup close
this.dialogRef.close(); this.dialogRef.close();
//Need To Display saving Datas //Need To Display saving Datas
alert("Data Edited Successfully"); //alert("Data Edited Successfully");
this.notifier.notify('success', 'Record Edited Successfully.!');
} }
else{ else{
alert("SomeThing Wents Wrong Try Again !"); //alert("SomeThing Wents Wrong Try Again !");
this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !');
} }
}); });
} }

View File

@ -1,8 +1,8 @@
<div style="text-align: right;"> <!-- <div style="text-align: right;">
<!-- <button mat-stroked-button [color]="color" (click)="addPdTeam()" > + Add PD Team</button> --> <!- <button mat-stroked-button [color]="color" (click)="addPdTeam()" > + Add PD Team</button> ->
<button mat-fab class="mr-1 mb-1" [color]="color" (click)="addPdTeam()" matTooltip="Add PD Team" matTooltipPosition="above"><mat-icon>add</mat-icon></button>
</div> </div> -->
<mat-card-content> <mat-card-content>
<!-- <div *ngIf="loader"> <!-- <div *ngIf="loader">
<mat-progress-bar mode="indeterminate" [color]="color" class="mb-1"></mat-progress-bar> <mat-progress-bar mode="indeterminate" [color]="color" class="mb-1"></mat-progress-bar>
@ -72,10 +72,20 @@
<div *ngIf="!noRecordFound" class="filter-container mat-elevation-z8"> <div *ngIf="!noRecordFound" class="filter-container mat-elevation-z8">
<div class="filter-header"> <!-- <div class="filter-header">
<mat-form-field> <mat-form-field>
<input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter"> <input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter">
</mat-form-field> </mat-form-field>
</div> -->
<div fxLayout="row" fxLayoutAlign="start center" class="filter-header">
<div class="ml-xs mr-xs" style="width: 90%;">
<mat-form-field dividerColor="primary" class="ml-xs mr-xs" style="width: 30%;">
<input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter">
</mat-form-field>
</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)="addPdTeam()" matTooltip="Add PD Team" matTooltipPosition="above"><mat-icon>add</mat-icon></button>
</div>
</div> </div>
@ -136,3 +146,4 @@ onclick="return confirm('Are you sure?')">
<div *ngIf="noRecordFound" class="nocontent">No records found</div> <div *ngIf="noRecordFound" class="nocontent">No records found</div>
</mat-card-content> </mat-card-content>
<notifier-container></notifier-container>

View File

@ -1,6 +1,6 @@
<!-- <div class="mb-1"> <!-- <div class="mb-1">
<h2 mat-dialog-title>PD TYPE &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;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <h2 mat-dialog-title>PD TYPE &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;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<button mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button> <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" [color]='color' matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button>
</h2> </h2>
</div> </div>
<div class="container" <div class="container"
@ -10,7 +10,7 @@
fxLayoutGap="35px" fxLayoutGap="35px"
fxLayoutGap.xs="0"> fxLayoutGap.xs="0">
<div class="mat-dialog-title" fxFlex fxFlexOrder="1">PD type</div> <div class="mat-dialog-title" fxFlex fxFlexOrder="1">PD type</div>
<div fxFlex="20px" fxFlexOrder="3" style="text-align:right;"><button mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button></div> <div fxFlex="20px" fxFlexOrder="3" style="text-align:right;"><button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" [color]='color' matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button></div>
<div fxFlex="15px" fxFlexOrder="2" ></div> <div fxFlex="15px" fxFlexOrder="2" ></div>
</div>--> </div>-->
<div class="ml-xs mr-xs" style="width: 100%;" <div class="ml-xs mr-xs" style="width: 100%;"
@ -19,7 +19,7 @@ fxLayoutAlign="center">
<h2 mat-dialog-title style="width: 30%;"> PD type &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;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</h2> <h2 mat-dialog-title style="width: 30%;"> PD type &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;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</h2>
<div style="width: 40%;"></div> <div style="width: 40%;"></div>
<div style="width: 30%;text-align:right;"> <div style="width: 30%;text-align:right;">
<button mat-raised-button mat-icon-button class="mr-1 mb-1" color='warn' matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button> <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>
</div> </div>
@ -41,12 +41,12 @@ fxLayoutAlign="center">
<br> <br>
<div class="row" style="text-align:right;"> <div class="row" style="text-align:right;">
<!-- <button mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' 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" [color]='color' matTooltip="Reset" matTooltipPosition="above" type="reset" ><mat-icon>settings_backup_restore</mat-icon></button> -->
<button *ngIf="isEmptyObject(_pdTypeForm.controls['pd_type_id']);else editreset;" mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' matTooltip="Reset" matTooltipPosition="above" type="reset" ><mat-icon>settings_backup_restore</mat-icon></button> <button *ngIf="isEmptyObject(_pdTypeForm.controls['pd_type_id']);else editreset;" 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>
<ng-template #editreset> <ng-template #editreset>
<button mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' 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="Reset" matTooltipPosition="above" type="button" (click)="onResetForEdit()" ><mat-icon>settings_backup_restore</mat-icon></button>
</ng-template> </ng-template>
<button mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' matTooltip="Save" matTooltipPosition="above" type="submit" [disabled]="!_pdTypeForm.valid"><mat-icon>save</mat-icon></button> <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Save" matTooltipPosition="above" type="submit" [disabled]="!_pdTypeForm.valid"><mat-icon>save</mat-icon></button>
<!-- <button mat-button >RESET</button> --> <!-- <button mat-button >RESET</button> -->
</div> </div>

View File

@ -11,6 +11,8 @@ import { MatDialog,
/** Service */ /** Service */
import { MastersService } from '../../../../service/masters/masters.service'; import { MastersService } from '../../../../service/masters/masters.service';
import { NotifierService } from 'angular-notifier';
@Component({ @Component({
selector: 'app-jazz-dialog', selector: 'app-jazz-dialog',
templateUrl: './pd-type-dialog.component.html', templateUrl: './pd-type-dialog.component.html',
@ -19,12 +21,15 @@ import { MastersService } from '../../../../service/masters/masters.service';
export class PdTypeDialogComponent implements OnInit { export class PdTypeDialogComponent implements OnInit {
public _pdTypeForm: FormGroup; public _pdTypeForm: FormGroup;
private notifier: NotifierService;
color = 'primary'; color = 'primary';
constructor(private _formBuilder: FormBuilder, constructor(private _formBuilder: FormBuilder,notifier: NotifierService,
private dialogRef: MatDialogRef<PdTypeDialogComponent>, private dialogRef: MatDialogRef<PdTypeDialogComponent>,
private _pdTypeService: MastersService, private _pdTypeService: MastersService,
@Inject(MAT_DIALOG_DATA) public data: any) { } @Inject(MAT_DIALOG_DATA) public data: any) {
this.notifier = notifier;
}
ngOnInit() { ngOnInit() {
@ -68,10 +73,12 @@ export class PdTypeDialogComponent implements OnInit {
//After Saving the data then popup close //After Saving the data then popup close
this.dialogRef.close(); this.dialogRef.close();
//Need To Dispaly saving Datas //Need To Dispaly saving Datas
alert("Data Saved Successfully"); //alert("Data Saved Successfully");
this.notifier.notify('success', 'Record Saved Successfully.!');
} }
else{ else{
alert("SomeThing Wents Wrong Try Again !"); //alert("SomeThing Wents Wrong Try Again !");
this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !');
} }
}); });
@ -84,10 +91,12 @@ export class PdTypeDialogComponent implements OnInit {
//After Editing the data then popup close //After Editing the data then popup close
this.dialogRef.close(); this.dialogRef.close();
//Need To Display saving Datas //Need To Display saving Datas
alert("Data Edited Successfully"); //alert("Data Edited Successfully");
this.notifier.notify('success', 'Record Edited Successfully.!');
} }
else{ else{
alert("SomeThing Wents Wrong Try Again !"); //alert("SomeThing Wents Wrong Try Again !");
this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !');
} }
}); });
} }

View File

@ -1,8 +1,8 @@
<div style="text-align: right;"> <!-- <div style="text-align: right;">
<!-- <button mat-stroked-button [color]="color" (click)="addPDType()" > + Add PDType</button> --> <!-- <button mat-stroked-button [color]="color" (click)="addPDType()" > + Add PDType</button> --
<button mat-fab class="mr-1 mb-1" [color]="color" (click)="addPDType()" matTooltip="Add PD Type" matTooltipPosition="above"><mat-icon>add</mat-icon></button>
</div> </div> -->
<mat-card-content> <mat-card-content>
<!-- <div *ngIf="loader"> <!-- <div *ngIf="loader">
<mat-progress-bar mode="indeterminate" [color]="color" class="mb-1"></mat-progress-bar> <mat-progress-bar mode="indeterminate" [color]="color" class="mb-1"></mat-progress-bar>
@ -62,10 +62,22 @@
<br> <br>
<div *ngIf="!noRecordFound" class="filter-container mat-elevation-z8"> <div *ngIf="!noRecordFound" class="filter-container mat-elevation-z8">
<div class="filter-header"> <!-- <div class="filter-header">
<mat-form-field> <mat-form-field>
<input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter"> <input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter">
</mat-form-field> </mat-form-field>
</div> -->
<div fxLayout="row" fxLayoutAlign="start center" class="filter-header">
<div class="ml-xs mr-xs" style="width: 90%;">
<mat-form-field dividerColor="primary" class="ml-xs mr-xs" style="width: 30%;">
<input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter">
</mat-form-field>
</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)="addPDType()" matTooltip="Add PD Type" matTooltipPosition="above"><mat-icon>add</mat-icon></button>
</div>
</div> </div>
@ -122,3 +134,4 @@
<div *ngIf="noRecordFound" class="nocontent">No records found</div> <div *ngIf="noRecordFound" class="nocontent">No records found</div>
</mat-card-content> </mat-card-content>
<notifier-container></notifier-container>

View File

@ -1,6 +1,6 @@
<!-- <div class="ml-xs mr-xs"> <!-- <div class="ml-xs mr-xs">
<h2 mat-dialog-title> Product 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;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <h2 mat-dialog-title> Product 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;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<button mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button> <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" [color]='color' matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button>
</h2> </h2>
</div> </div>
<div class="container" <div class="container"
@ -10,7 +10,7 @@
fxLayoutGap="35px" fxLayoutGap="35px"
fxLayoutGap.xs="0"> fxLayoutGap.xs="0">
<div class="mat-dialog-title" fxFlex fxFlexOrder="1">Product Details</div> <div class="mat-dialog-title" fxFlex fxFlexOrder="1">Product Details</div>
<div fxFlex="20px" fxFlexOrder="3" style="text-align:right;"><button mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button></div> <div fxFlex="20px" fxFlexOrder="3" style="text-align:right;"><button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" [color]='color' matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button></div>
<div fxFlex="15px" fxFlexOrder="2"></div> <div fxFlex="15px" fxFlexOrder="2"></div>
</div>--> </div>-->
<div class="ml-xs mr-xs" style="width: 100%;" <div class="ml-xs mr-xs" style="width: 100%;"
@ -18,7 +18,7 @@ fxLayout="row"
fxLayoutAlign="center"> fxLayoutAlign="center">
<h2 mat-dialog-title style="width: 70%;"> Product 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;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</h2> <h2 mat-dialog-title style="width: 70%;"> Product 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;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</h2>
<div style="width: 30%;text-align:right;"> <div style="width: 30%;text-align:right;">
<button mat-raised-button mat-icon-button class="mr-1 mb-1" color='warn' matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button> <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>
</div> </div>
@ -45,12 +45,12 @@ fxLayoutAlign="center">
</div> </div>
<div class="row" style="text-align:right;"> <div class="row" style="text-align:right;">
<!-- <button mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' 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" [color]='color' matTooltip="Reset" matTooltipPosition="above" type="reset" ><mat-icon>settings_backup_restore</mat-icon></button> -->
<button *ngIf="isEmptyObject(_productMasterForm.controls['product_id']);else editreset;" mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' matTooltip="Reset" matTooltipPosition="above" type="reset" ><mat-icon>settings_backup_restore</mat-icon></button> <button *ngIf="isEmptyObject(_productMasterForm.controls['product_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>
<ng-template #editreset> <ng-template #editreset>
<button mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' 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="Reset" matTooltipPosition="above" type="button" (click)="onResetForEdit()" ><mat-icon>settings_backup_restore</mat-icon></button>
</ng-template> </ng-template>
<button mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' matTooltip="Save" matTooltipPosition="above" type="submit" [disabled]="!_productMasterForm.valid"><mat-icon>save</mat-icon></button> <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Save" matTooltipPosition="above" type="submit" [disabled]="!_productMasterForm.valid"><mat-icon>save</mat-icon></button>
</div> </div>
</mat-dialog-content> </mat-dialog-content>

View File

@ -10,6 +10,7 @@ import { MatDialog,
MAT_DIALOG_DATA } from '@angular/material'; MAT_DIALOG_DATA } from '@angular/material';
/** Service */ /** Service */
import { MastersService } from '../../../../service/masters/masters.service'; import { MastersService } from '../../../../service/masters/masters.service';
import { NotifierService } from 'angular-notifier';
@Component({ @Component({
selector: 'app-jazz-dialog', selector: 'app-jazz-dialog',
@ -20,11 +21,14 @@ import { MastersService } from '../../../../service/masters/masters.service';
export class ProductDialogComponent implements OnInit { export class ProductDialogComponent implements OnInit {
public _productMasterForm: FormGroup; public _productMasterForm: FormGroup;
private notifier: NotifierService;
color = 'primary'; color = 'primary';
constructor(private _formBuilder: FormBuilder, constructor(private _formBuilder: FormBuilder,notifier: NotifierService,
private dialogRef: MatDialogRef<ProductDialogComponent>, private dialogRef: MatDialogRef<ProductDialogComponent>,
private _MastersService: MastersService, private _MastersService: MastersService,
@Inject(MAT_DIALOG_DATA) public data: any) { } @Inject(MAT_DIALOG_DATA) public data: any) {
this.notifier = notifier;
}
ngOnInit() { ngOnInit() {
this.productFormDatas(); this.productFormDatas();
@ -61,10 +65,12 @@ export class ProductDialogComponent implements OnInit {
//After Saving the data then popup close //After Saving the data then popup close
this.dialogRef.close(); this.dialogRef.close();
//Need To Dispaly saving Datas //Need To Dispaly saving Datas
alert("Data Saved Successfully"); //alert("Data Saved Successfully");
this.notifier.notify('success', 'Record Saved Successfully.!');
} }
else{ else{
alert("SomeThing Wents Wrong Try Again !"); //alert("SomeThing Wents Wrong Try Again !");
this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !');
} }
}); });
@ -75,10 +81,12 @@ export class ProductDialogComponent implements OnInit {
//After Editing the data then popup close //After Editing the data then popup close
this.dialogRef.close(); this.dialogRef.close();
//Need To Display saving Datas //Need To Display saving Datas
alert("Data Edited Successfully"); //alert("Data Edited Successfully");
this.notifier.notify('success', 'Record Edited Successfully.!');
} }
else{ else{
alert("SomeThing Wents Wrong Try Again !"); //alert("SomeThing Wents Wrong Try Again !");
this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !');
} }
}); });
} }

View File

@ -1,20 +1,31 @@
<div style="text-align: right;"> <!-- <div style="text-align: right;">
<!-- <button mat-stroked-button [color]="color" (click)="addProductMaster()" > + Add Product</button> --> <!-- <button mat-stroked-button [color]="color" (click)="addProductMaster()" > + Add Product</button> ->
<button mat-fab class="mr-1 mb-1" [color]="color" (click)="addProductMaster()" matTooltip="Add Product" matTooltipPosition="above"><mat-icon>add</mat-icon></button>
</div> </div> -->
<mat-card-content> <mat-card-content>
<!-- <div *ngIf="loader"> <!-- <div *ngIf="loader">
<mat-progress-bar mode="indeterminate" [color]="color" class="mb-1"></mat-progress-bar> <mat-progress-bar mode="indeterminate" [color]="color" class="mb-1"></mat-progress-bar>
</div> </div>
<br> --> <br> -->
<div *ngIf="!noRecordFound" class="filter-container mat-elevation-z8"> <div *ngIf="!noRecordFound" class="filter-container mat-elevation-z8">
<div class="filter-header"> <!-- <div class="filter-header">
<mat-form-field> <mat-form-field>
<input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter"> <input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter">
</mat-form-field> </mat-form-field>
</div> </div>
-->
<div fxLayout="row" fxLayoutAlign="start center" class="filter-header">
<div class="ml-xs mr-xs" style="width: 90%;">
<mat-form-field dividerColor="primary" class="ml-xs mr-xs" style="width: 30%;">
<input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter">
</mat-form-field>
</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>
<mat-table [dataSource]="dataSource" matSort > <mat-table [dataSource]="dataSource" matSort >
@ -345,3 +356,4 @@
</div> --> </div> -->
</mat-card-content> </mat-card-content>
<notifier-container></notifier-container>

View File

@ -4,7 +4,7 @@ fxLayout="row"
fxLayoutAlign="center"> fxLayoutAlign="center">
<h2 mat-dialog-title style="width: 70%;"> Question Category &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> <h2 mat-dialog-title style="width: 70%;"> Question Category &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;"> <div style="width: 30%;text-align:right;">
<button mat-raised-button mat-icon-button class="mr-1 mb-1" color='warn' matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button> <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>
</div> </div>
@ -22,11 +22,11 @@ fxLayoutAlign="center">
<div class="row" style="text-align:right;"> <div class="row" style="text-align:right;">
<button *ngIf="isEmptyObject(_questionCategoryForm.controls['question_categroy_id']);else editreset;" mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' matTooltip="ADD Reset" matTooltipPosition="above" type="reset" ><mat-icon>settings_backup_restore</mat-icon></button> <button *ngIf="isEmptyObject(_questionCategoryForm.controls['question_categroy_id']);else editreset;" mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="ADD Reset" matTooltipPosition="above" type="reset" ><mat-icon>settings_backup_restore</mat-icon></button>
<ng-template #editreset> <ng-template #editreset>
<button mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' matTooltip="Reset" matTooltipPosition="above" type="button" (click)="onResetedited()" ><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)="onResetedited()" ><mat-icon>settings_backup_restore</mat-icon></button>
</ng-template> </ng-template>
<button mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' matTooltip="Save" matTooltipPosition="above" type="submit" [disabled]="!_questionCategoryForm.valid"><mat-icon>save</mat-icon></button> <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Save" matTooltipPosition="above" type="submit" [disabled]="!_questionCategoryForm.valid"><mat-icon>save</mat-icon></button>
</div> </div>
</mat-dialog-content> </mat-dialog-content>

View File

@ -10,6 +10,7 @@ import { FormBuilder,
MAT_DIALOG_DATA } from '@angular/material'; MAT_DIALOG_DATA } from '@angular/material';
/** Service */ /** Service */
import { MastersService } from '../../../../service/masters/masters.service'; import { MastersService } from '../../../../service/masters/masters.service';
import { NotifierService } from 'angular-notifier';
@Component({ @Component({
selector: 'app-question-category-dialog', selector: 'app-question-category-dialog',
@ -19,11 +20,12 @@ import { FormBuilder,
export class QuestionCategoryDialogComponent implements OnInit { export class QuestionCategoryDialogComponent implements OnInit {
public _questionCategoryForm: FormGroup; public _questionCategoryForm: FormGroup;
private notifier: NotifierService;
color = 'primary'; color = 'primary';
constructor(private _formBuilder: FormBuilder, constructor(private _formBuilder: FormBuilder,notifier: NotifierService,
private dialogRef: MatDialogRef<QuestionCategoryDialogComponent>, private dialogRef: MatDialogRef<QuestionCategoryDialogComponent>,
private _MastersService: MastersService, private _MastersService: MastersService,
@Inject(MAT_DIALOG_DATA) public data: any) { } @Inject(MAT_DIALOG_DATA) public data: any) { this.notifier = notifier; }
ngOnInit() { this.formfunction(); } ngOnInit() { this.formfunction(); }
@ -52,10 +54,12 @@ export class QuestionCategoryDialogComponent implements OnInit {
//After Saving the data then popup close //After Saving the data then popup close
this.dialogRef.close(); this.dialogRef.close();
//Need To Dispaly saving Datas //Need To Dispaly saving Datas
alert("Data Saved Successfully"); //alert("Data Saved Successfully");
this.notifier.notify('success', 'Record Saved Successfully.!');
} }
else{ else{
alert("SomeThing Wents Wrong Try Again !"); // alert("SomeThing Wents Wrong Try Again !");
this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !');
} }
}); });
@ -66,10 +70,12 @@ export class QuestionCategoryDialogComponent implements OnInit {
//After Editing the data then popup close //After Editing the data then popup close
this.dialogRef.close(); this.dialogRef.close();
//Need To Display saving Datas //Need To Display saving Datas
alert("Data Edited Successfully"); //alert("Data Edited Successfully");
this.notifier.notify('success', 'Record Edited Successfully.!');
} }
else{ else{
alert("SomeThing Wents Wrong Try Again !"); // alert("SomeThing Wents Wrong Try Again !");
this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !');
} }
}); });
} }

View File

@ -1,21 +1,32 @@
<div style="text-align: right;"> <!--<div style="text-align: right;">
<!-- <button mat-stroked-button [color]="color" (click)="addQuestionCategory()" > + Add Question Category</button> --> <!-- <button mat-stroked-button [color]="color" (click)="addQuestionCategory()" > + Add Question Category</button> ->
<button mat-fab class="mr-1 mb-1" [color]="color" (click)="addQuestionCategory()" matTooltip="Add Question Category" matTooltipPosition="above"><mat-icon>add</mat-icon></button>
</div> </div>-->
<mat-card-content> <mat-card-content>
<!-- <div *ngIf="loader"> <!-- <div *ngIf="loader">
<mat-progress-bar mode="indeterminate" [color]="color" class="mb-1"></mat-progress-bar> <mat-progress-bar mode="indeterminate" [color]="color" class="mb-1"></mat-progress-bar>
</div> </div>
<br> --> <br> -->
<br>
<div *ngIf="!noRecordFound" class="filter-container mat-elevation-z8"> <div *ngIf="!noRecordFound" class="filter-container mat-elevation-z8">
<div class="filter-header"> <!-- <div class="filter-header">
<mat-form-field> <mat-form-field>
<input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter"> <input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter">
</mat-form-field> </mat-form-field>
</div> </div>
-->
<div fxLayout="row" fxLayoutAlign="start center" class="filter-header">
<div class="ml-xs mr-xs" style="width: 90%;">
<mat-form-field dividerColor="primary" class="ml-xs mr-xs" style="width: 30%;">
<input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter">
</mat-form-field>
</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)="addQuestionCategory()" matTooltip="Add Question Category" matTooltipPosition="above"><mat-icon>add</mat-icon></button>
</div>
</div>
<mat-table [dataSource]="dataSource" matSort > <mat-table [dataSource]="dataSource" matSort >
<ng-container matColumnDef="serialno"> <ng-container matColumnDef="serialno">
@ -68,3 +79,4 @@
</mat-card-content> </mat-card-content>
<notifier-container></notifier-container>

View File

@ -1,6 +1,6 @@
<!-- <div class="ml-xs mr-xs"> <!-- <div class="ml-xs mr-xs">
<h2 mat-dialog-title>Region &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;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <h2 mat-dialog-title>Region &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;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<button mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button> <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" [color]='color' matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button>
</h2> </h2>
</div> </div>
<div class="container" <div class="container"
@ -10,7 +10,7 @@
fxLayoutGap="35px" fxLayoutGap="35px"
fxLayoutGap.xs="0"> fxLayoutGap.xs="0">
<div class="mat-dialog-title" fxFlex fxFlexOrder="1">Region</div> <div class="mat-dialog-title" fxFlex fxFlexOrder="1">Region</div>
<div fxFlex="20px" fxFlexOrder="3" style="text-align:right;"><button mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button></div> <div fxFlex="20px" fxFlexOrder="3" style="text-align:right;"><button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" [color]='color' matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button></div>
<div fxFlex="15px" fxFlexOrder="2"></div> <div fxFlex="15px" fxFlexOrder="2"></div>
</div>--> </div>-->
<div class="ml-xs mr-xs" style="width: 100%;" <div class="ml-xs mr-xs" style="width: 100%;"
@ -19,7 +19,7 @@ fxLayoutAlign="center">
<h2 mat-dialog-title style="width: 35%;"> Region &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;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</h2> <h2 mat-dialog-title style="width: 35%;"> Region &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;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</h2>
<div style="width: 32%;"></div> <div style="width: 32%;"></div>
<div style="width: 33%;text-align:right;"> <div style="width: 33%;text-align:right;">
<button mat-raised-button mat-icon-button class="mr-1 mb-1" color='warn' matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button> <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>
</div> </div>
@ -41,12 +41,12 @@ fxLayoutAlign="center">
<div class="row" style="text-align:right;"> <div class="row" style="text-align:right;">
<!-- <button mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' 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" [color]='color' matTooltip="Reset" matTooltipPosition="above" type="reset" ><mat-icon>settings_backup_restore</mat-icon></button> -->
<button *ngIf="isEmptyObject(_regionsForm.controls['region_id']);else editreset;" mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' matTooltip="Reset" matTooltipPosition="above" type="reset" ><mat-icon>settings_backup_restore</mat-icon></button> <button *ngIf="isEmptyObject(_regionsForm.controls['region_id']);else editreset;" 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>
<ng-template #editreset> <ng-template #editreset>
<button mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' 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="Reset" matTooltipPosition="above" type="button" (click)="onResetForEdit()" ><mat-icon>settings_backup_restore</mat-icon></button>
</ng-template> </ng-template>
<button mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' matTooltip="Save" matTooltipPosition="above" type="submit" [disabled]="!_regionsForm.valid"><mat-icon>save</mat-icon></button> <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Save" matTooltipPosition="above" type="submit" [disabled]="!_regionsForm.valid"><mat-icon>save</mat-icon></button>
<!-- <button mat-button >RESET</button> --> <!-- <button mat-button >RESET</button> -->
</div> </div>

View File

@ -10,6 +10,7 @@ import { MatDialog,
MAT_DIALOG_DATA } from '@angular/material'; MAT_DIALOG_DATA } from '@angular/material';
/** Service */ /** Service */
import { MastersService } from '../../../../service/masters/masters.service'; import { MastersService } from '../../../../service/masters/masters.service';
import { NotifierService } from 'angular-notifier';
@Component({ @Component({
@ -20,11 +21,12 @@ import { MastersService } from '../../../../service/masters/masters.service';
export class RegionsDialogComponent implements OnInit { export class RegionsDialogComponent implements OnInit {
public _regionsForm: FormGroup; public _regionsForm: FormGroup;
private notifier: NotifierService;
color = 'primary'; color = 'primary';
constructor(private _formBuilder: FormBuilder, constructor(private _formBuilder: FormBuilder,notifier: NotifierService,
private dialogRef: MatDialogRef<RegionsDialogComponent>, private dialogRef: MatDialogRef<RegionsDialogComponent>,
private _regionsService: MastersService, private _regionsService: MastersService,
@Inject(MAT_DIALOG_DATA) public data: any) { } @Inject(MAT_DIALOG_DATA) public data: any) { this.notifier = notifier; }
ngOnInit() { ngOnInit() {
@ -66,10 +68,12 @@ onNoClick(): void {
//After Saving the data then popup close //After Saving the data then popup close
this.dialogRef.close(); this.dialogRef.close();
//Need To Dispaly saving Datas //Need To Dispaly saving Datas
alert("Data Saved Successfully"); //alert("Data Saved Successfully");
this.notifier.notify('success', 'Record Saved Successfully.!');
} }
else{ else{
alert("SomeThing Wents Wrong Try Again !"); //alert("SomeThing Wents Wrong Try Again !");
this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !');
} }
}); });
@ -81,10 +85,12 @@ onNoClick(): void {
//After Editing the data then popup close //After Editing the data then popup close
this.dialogRef.close(); this.dialogRef.close();
//Need To Display saving Datas //Need To Display saving Datas
alert("Data Edited Successfully"); //alert("Data Edited Successfully");
this.notifier.notify('success', 'Record Edited Successfully.!');
} }
else{ else{
alert("SomeThing Wents Wrong Try Again !"); //alert("SomeThing Wents Wrong Try Again !");
this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !');
} }
}); });
} }

View File

@ -1,8 +1,8 @@
<div style="text-align: right;"> <!-- <div style="text-align: right;">
<!-- <button mat-stroked-button [color]="color" > + Add regions</button> --> <!-- <button mat-stroked-button [color]="color" > + Add regions</button> --
<button mat-fab class="mr-1 mb-1" [color]="color" (click)="addregions()" matTooltip="Add Region" matTooltipPosition="above"><mat-icon>add</mat-icon></button>
</div> </div> -->
<mat-card-content> <mat-card-content>
<!-- <div *ngIf="loader"> <!-- <div *ngIf="loader">
<mat-progress-bar mode="indeterminate" [color]="color" class="mb-1"></mat-progress-bar> <mat-progress-bar mode="indeterminate" [color]="color" class="mb-1"></mat-progress-bar>
@ -67,10 +67,21 @@
<br>--> <br>-->
<div *ngIf="!noRecordFound" class="filter-container mat-elevation-z8"> <div *ngIf="!noRecordFound" class="filter-container mat-elevation-z8">
<div class="filter-header"> <!-- <div class="filter-header">
<mat-form-field> <mat-form-field>
<input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter"> <input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter">
</mat-form-field> </mat-form-field>
</div> -->
<div fxLayout="row" fxLayoutAlign="start center" class="filter-header">
<div class="ml-xs mr-xs" style="width: 90%;">
<mat-form-field dividerColor="primary" class="ml-xs mr-xs" style="width: 30%;">
<input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter">
</mat-form-field>
</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)="addregions()" matTooltip="Add Region" matTooltipPosition="above"><mat-icon>add</mat-icon></button>
</div>
</div> </div>
@ -130,3 +141,4 @@
<div *ngIf="noRecordFound" class="nocontent">No records found</div> <div *ngIf="noRecordFound" class="nocontent">No records found</div>
</mat-card-content> </mat-card-content>
<notifier-container></notifier-container>

View File

@ -1,6 +1,6 @@
<!-- <div class="ml-xs mr-xs"> <!-- <div class="ml-xs mr-xs">
<h2 mat-dialog-title>Relation Ship &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;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <h2 mat-dialog-title>Relation Ship &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;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<button mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button> <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" [color]='color' matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button>
</h2> </h2>
</div> </div>
<div class="container" <div class="container"
@ -10,7 +10,7 @@
fxLayoutGap="35px" fxLayoutGap="35px"
fxLayoutGap.xs="0"> fxLayoutGap.xs="0">
<div class="mat-dialog-title" fxFlex fxFlexOrder="1">Relation Ship</div> <div class="mat-dialog-title" fxFlex fxFlexOrder="1">Relation Ship</div>
<div fxFlex="20px" fxFlexOrder="3" style="text-align:right;"><button mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button></div> <div fxFlex="20px" fxFlexOrder="3" style="text-align:right;"><button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" [color]='color' matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button></div>
<div fxFlex="2px" fxFlexOrder="2"></div> <div fxFlex="2px" fxFlexOrder="2"></div>
</div> --> </div> -->
<div class="ml-xs mr-xs" style="width: 100%;" <div class="ml-xs mr-xs" style="width: 100%;"
@ -19,7 +19,7 @@ fxLayoutAlign="center">
<h2 mat-dialog-title style="width: 54%;"> Relation Ship &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;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</h2> <h2 mat-dialog-title style="width: 54%;"> Relation Ship &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;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</h2>
<div style="width: 46%;text-align:right;"> <div style="width: 46%;text-align:right;">
<button mat-raised-button mat-icon-button class="mr-1 mb-1" color='warn' matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button> <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>
</div> </div>
@ -40,12 +40,12 @@ fxLayoutAlign="center">
</div> </div>
<br> <br>
<div class="row" style="text-align:right;"> <div class="row" style="text-align:right;">
<!-- <button mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' 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" [color]='color' matTooltip="Reset" matTooltipPosition="above" type="reset" ><mat-icon>settings_backup_restore</mat-icon></button> -->
<button *ngIf="isEmptyObject(_relationShipForm.controls['relationship_id']);else editreset;" mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' matTooltip="Reset" matTooltipPosition="above" type="reset" ><mat-icon>settings_backup_restore</mat-icon></button> <button *ngIf="isEmptyObject(_relationShipForm.controls['relationship_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>
<ng-template #editreset> <ng-template #editreset>
<button mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' 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="Reset" matTooltipPosition="above" type="button" (click)="onResetForEdit()" ><mat-icon>settings_backup_restore</mat-icon></button>
</ng-template> </ng-template>
<button mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' matTooltip="Save" matTooltipPosition="above" type="submit" [disabled]="!_relationShipForm.valid"><mat-icon>save</mat-icon></button> <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Save" matTooltipPosition="above" type="submit" [disabled]="!_relationShipForm.valid"><mat-icon>save</mat-icon></button>
<!-- <button mat-button >RESET</button> --> <!-- <button mat-button >RESET</button> -->
</div> </div>

View File

@ -10,6 +10,7 @@ import { MatDialog,
MAT_DIALOG_DATA } from '@angular/material'; MAT_DIALOG_DATA } from '@angular/material';
/** Service */ /** Service */
import { MastersService } from '../../../../service/masters/masters.service'; import { MastersService } from '../../../../service/masters/masters.service';
import { NotifierService } from 'angular-notifier';
@ -22,11 +23,12 @@ export class RelationShipDialogComponent implements OnInit {
public _relationShipForm: FormGroup; public _relationShipForm: FormGroup;
private notifier: NotifierService;
color = 'primary'; color = 'primary';
constructor(private _formBuilder: FormBuilder, constructor(private _formBuilder: FormBuilder,notifier: NotifierService,
private dialogRef: MatDialogRef< RelationShipDialogComponent>, private dialogRef: MatDialogRef< RelationShipDialogComponent>,
private _MastersService: MastersService, private _MastersService: MastersService,
@Inject(MAT_DIALOG_DATA) public data: any) { } @Inject(MAT_DIALOG_DATA) public data: any) { this.notifier = notifier; }
ngOnInit() { ngOnInit() {
@ -68,10 +70,12 @@ onNoClick(): void {
//After Saving the data then popup close //After Saving the data then popup close
this.dialogRef.close(); this.dialogRef.close();
//Need To Dispaly saving Datas //Need To Dispaly saving Datas
alert("Data Saved Successfully"); //alert("Data Saved Successfully");
this.notifier.notify('success', 'Record Saved Successfully.!');
} }
else{ else{
alert("SomeThing Wents Wrong Try Again !"); //alert("SomeThing Wents Wrong Try Again !");
this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !');
} }
}); });
@ -83,10 +87,12 @@ onNoClick(): void {
//After Editing the data then popup close //After Editing the data then popup close
this.dialogRef.close(); this.dialogRef.close();
//Need To Display saving Datas //Need To Display saving Datas
alert("Data Edited Successfully"); //alert("Data Edited Successfully");
this.notifier.notify('success', 'Record Edited Successfully.!');
} }
else{ else{
alert("SomeThing Wents Wrong Try Again !"); //alert("SomeThing Wents Wrong Try Again !");
this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !');
} }
}); });
} }

View File

@ -1,9 +1,9 @@
<mat-card-content> <mat-card-content>
<div style="text-align: right;"> <!-- <div style="text-align: right;">
<!-- <button mat-stroked-button [color]="color" (click)="addRelationShip()" > + Add Relation ship</button> --> <!-- <button mat-stroked-button [color]="color" (click)="addRelationShip()" > + Add Relation ship</button> ->
<button mat-fab class="mr-1 mb-1" [color]="color" (click)="addRelationShip()" matTooltip="Add Relation ship" matTooltipPosition="above"><mat-icon>add</mat-icon></button>
</div> </div>
<br> <br> -->
<!-- <div *ngIf="loader"> <!-- <div *ngIf="loader">
<mat-progress-bar mode="indeterminate" [color]="color" class="mb-1"></mat-progress-bar> <mat-progress-bar mode="indeterminate" [color]="color" class="mb-1"></mat-progress-bar>
</div> </div>
@ -83,10 +83,22 @@
<br>--> <br>-->
<div *ngIf="!noRecordFound" class="filter-container mat-elevation-z8"> <div *ngIf="!noRecordFound" class="filter-container mat-elevation-z8">
<div class="filter-header"> <!-- <div class="filter-header">
<mat-form-field> <mat-form-field>
<input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter"> <input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter">
</mat-form-field> </mat-form-field>
</div> -->
<div fxLayout="row" fxLayoutAlign="start center" class="filter-header">
<div class="ml-xs mr-xs" style="width: 90%;">
<mat-form-field dividerColor="primary" class="ml-xs mr-xs" style="width: 30%;">
<input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter">
</mat-form-field>
</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)="addRelationShip()" matTooltip="Add Relation ship" matTooltipPosition="above"><mat-icon>add</mat-icon></button>
</div>
</div> </div>
@ -146,3 +158,4 @@
<div *ngIf="noRecordFound" class="nocontent">No records found</div> <div *ngIf="noRecordFound" class="nocontent">No records found</div>
</mat-card-content> </mat-card-content>
<notifier-container></notifier-container>

View File

@ -1,6 +1,6 @@
<!-- <div class="ml-xs mr-xs"> <!-- <div class="ml-xs mr-xs">
<h2 mat-dialog-title>State &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;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <h2 mat-dialog-title>State &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;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<button mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button> <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" [color]='color' matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button>
</h2> </h2>
</div> </div>
<div class="container" <div class="container"
@ -10,7 +10,7 @@
fxLayoutGap="35px" fxLayoutGap="35px"
fxLayoutGap.xs="0"> fxLayoutGap.xs="0">
<div class="mat-dialog-title" fxFlex fxFlexOrder="1">State</div> <div class="mat-dialog-title" fxFlex fxFlexOrder="1">State</div>
<div fxFlex="20px" fxFlexOrder="3" style="text-align:right;"><button mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button></div> <div fxFlex="20px" fxFlexOrder="3" style="text-align:right;"><button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" [color]='color' matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button></div>
<div fxFlex="15px" fxFlexOrder="2"></div> <div fxFlex="15px" fxFlexOrder="2"></div>
</div> --> </div> -->
<div class="ml-xs mr-xs" style="width: 100%;" <div class="ml-xs mr-xs" style="width: 100%;"
@ -19,7 +19,7 @@ fxLayoutAlign="center">
<h2 mat-dialog-title style="width: 30%;"> State &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;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</h2> <h2 mat-dialog-title style="width: 30%;"> State &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;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</h2>
<div style="width: 40%;"></div> <div style="width: 40%;"></div>
<div style="width: 30%;text-align:right;"> <div style="width: 30%;text-align:right;">
<button mat-raised-button mat-icon-button class="mr-1 mb-1" color='warn' matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button> <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>
</div> </div>
@ -65,12 +65,12 @@ fxLayoutAlign="center">
<br> <br>
<div class="row" style="text-align:right;"> <div class="row" style="text-align:right;">
<!-- <button mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' 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" [color]='color' matTooltip="Reset" matTooltipPosition="above" type="reset" ><mat-icon>settings_backup_restore</mat-icon></button> -->
<button *ngIf="isEmptyObject(_statesForm.controls['state_id']);else editreset;" mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' matTooltip="Reset" matTooltipPosition="above" type="reset" ><mat-icon>settings_backup_restore</mat-icon></button> <button *ngIf="isEmptyObject(_statesForm.controls['state_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>
<ng-template #editreset> <ng-template #editreset>
<button mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' 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="Reset" matTooltipPosition="above" type="button" (click)="onResetForEdit()" ><mat-icon>settings_backup_restore</mat-icon></button>
</ng-template> </ng-template>
<button mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' matTooltip="Save" matTooltipPosition="above" type="submit" [disabled]="!_statesForm.valid"><mat-icon>save</mat-icon></button> <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Save" matTooltipPosition="above" type="submit" [disabled]="!_statesForm.valid"><mat-icon>save</mat-icon></button>
<!-- <button mat-button >RESET</button> --> <!-- <button mat-button >RESET</button> -->
</div> </div>

View File

@ -10,6 +10,7 @@ import { MatDialog,
MAT_DIALOG_DATA } from '@angular/material'; MAT_DIALOG_DATA } from '@angular/material';
/** Service */ /** Service */
import { MastersService } from '../../../../service/masters/masters.service'; import { MastersService } from '../../../../service/masters/masters.service';
import { NotifierService } from 'angular-notifier';
import { States } from '../../../model/states'; import { States } from '../../../model/states';
@Component({ @Component({
@ -20,15 +21,16 @@ import { States } from '../../../model/states';
export class StatesDialogComponent implements OnInit { export class StatesDialogComponent implements OnInit {
public _statesForm: FormGroup; public _statesForm: FormGroup;
private notifier: NotifierService;
color = 'primary'; color = 'primary';
regionDatas : any[]; regionDatas : any[];
foundBooks: any; foundBooks: any;
errorMessage:string; errorMessage:string;
constructor(private _formBuilder: FormBuilder, constructor(private _formBuilder: FormBuilder,notifier: NotifierService,
private dialogRef: MatDialogRef<StatesDialogComponent>, private dialogRef: MatDialogRef<StatesDialogComponent>,
private _MastersService: MastersService, private _MastersService: MastersService,
@Inject(MAT_DIALOG_DATA) public data: any) { } @Inject(MAT_DIALOG_DATA) public data: any) { this.notifier = notifier; }
@ -89,10 +91,12 @@ export class StatesDialogComponent implements OnInit {
//After Saving the data then popup close //After Saving the data then popup close
this.dialogRef.close(); this.dialogRef.close();
//Need To Dispaly saving Datas //Need To Dispaly saving Datas
alert("Data Saved Successfully"); //alert("Data Saved Successfully");
this.notifier.notify('success', 'Record Saved Successfully.!');
} }
else{ else{
alert("SomeThing Wents Wrong Try Again !"); //alert("SomeThing Wents Wrong Try Again !");
this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !');
} }
}); });
@ -104,10 +108,12 @@ export class StatesDialogComponent implements OnInit {
//After Editing the data then popup close //After Editing the data then popup close
this.dialogRef.close(); this.dialogRef.close();
//Need To Display saving Datas //Need To Display saving Datas
alert("Data Edited Successfully"); //alert("Data Edited Successfully");
this.notifier.notify('success', 'Record Edited Successfully.!');
} }
else{ else{
alert("SomeThing Wents Wrong Try Again !"); //alert("SomeThing Wents Wrong Try Again !");
this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !');
} }
}); });
} }

View File

@ -1,9 +1,9 @@
<mat-card-content> <mat-card-content>
<div style="text-align: right;"> <!-- <div style="text-align: right;">
<!-- <button mat-stroked-button color="primary" (click)="addState()" > + Add State</button> --> <!-- <button mat-stroked-button color="primary" (click)="addState()" > + Add State</button> ->
<button mat-fab class="mr-1 mb-1" [color]="color" (click)="addState()" matTooltip="Add State" matTooltipPosition="above"><mat-icon>add</mat-icon></button>
</div> </div>
<br> <br> -->
<!-- <div *ngIf="loader"> <!-- <div *ngIf="loader">
<mat-progress-bar mode="indeterminate" [color]="color" class="mb-1"></mat-progress-bar> <mat-progress-bar mode="indeterminate" [color]="color" class="mb-1"></mat-progress-bar>
</div> </div>
@ -103,10 +103,21 @@
<br>--> <br>-->
<div *ngIf="!noRecordFound" class="filter-container mat-elevation-z8"> <div *ngIf="!noRecordFound" class="filter-container mat-elevation-z8">
<div class="filter-header"> <!-- <div class="filter-header">
<mat-form-field> <mat-form-field>
<input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter"> <input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter">
</mat-form-field> </mat-form-field>
</div> -->
<div fxLayout="row" fxLayoutAlign="start center" class="filter-header">
<div class="ml-xs mr-xs" style="width: 90%;">
<mat-form-field dividerColor="primary" class="ml-xs mr-xs" style="width: 30%;">
<input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter">
</mat-form-field>
</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)="addState()" matTooltip="Add State" matTooltipPosition="above"><mat-icon>add</mat-icon></button>
</div>
</div> </div>
@ -170,3 +181,4 @@
<div *ngIf="noRecordFound" class="nocontent">No records found</div> <div *ngIf="noRecordFound" class="nocontent">No records found</div>
</mat-card-content> </mat-card-content>
<notifier-container></notifier-container>

View File

@ -11,7 +11,7 @@
fxLayoutGap="35px" fxLayoutGap="35px"
fxLayoutGap.xs="0"> fxLayoutGap.xs="0">
<div class="mat-dialog-title" fxFlex fxFlexOrder="1">Sub Product Details</div> <div class="mat-dialog-title" fxFlex fxFlexOrder="1">Sub Product Details</div>
<div fxFlex="20px" fxFlexOrder="3" style="text-align:right;"><button mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button></div> <div fxFlex="20px" fxFlexOrder="3" style="text-align:right;"><button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" [color]='color' matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button></div>
<div fxFlex="15px" fxFlexOrder="2"></div> <div fxFlex="15px" fxFlexOrder="2"></div>
</div> --> </div> -->
<div class="ml-xs mr-xs" style="width: 100%;" <div class="ml-xs mr-xs" style="width: 100%;"
@ -19,7 +19,7 @@ fxLayout="row"
fxLayoutAlign="center"> fxLayoutAlign="center">
<h2 mat-dialog-title style="width: 80%;"> Sub Product 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;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</h2> <h2 mat-dialog-title style="width: 80%;"> Sub Product 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;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</h2>
<div style="width: 20%;text-align:right;"> <div style="width: 20%;text-align:right;">
<button mat-raised-button mat-icon-button class="mr-1 mb-1" color='warn' matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button> <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>
</div> </div>
@ -72,12 +72,12 @@ fxLayoutAlign="center">
<br> <br>
<div class="row" style="text-align:right;"> <div class="row" style="text-align:right;">
<!-- <button mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' 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" [color]='color' matTooltip="Reset" matTooltipPosition="above" type="reset" ><mat-icon>settings_backup_restore</mat-icon></button> -->
<button *ngIf="isEmptyObject(_subProductMasterForm.controls['subproduct_id']);else editreset;" mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' matTooltip="Reset" matTooltipPosition="above" type="reset" ><mat-icon>settings_backup_restore</mat-icon></button> <button *ngIf="isEmptyObject(_subProductMasterForm.controls['subproduct_id']);else editreset;" 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>
<ng-template #editreset> <ng-template #editreset>
<button mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' 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="Reset" matTooltipPosition="above" type="button" (click)="onResetForEdit()" ><mat-icon>settings_backup_restore</mat-icon></button>
</ng-template> </ng-template>
<button mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' matTooltip="Save" matTooltipPosition="above" type="submit" [disabled]="!_subProductMasterForm.valid"><mat-icon>save</mat-icon></button> <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Save" matTooltipPosition="above" type="submit" [disabled]="!_subProductMasterForm.valid"><mat-icon>save</mat-icon></button>
</div> </div>
</mat-dialog-content> </mat-dialog-content>

View File

@ -13,6 +13,7 @@ import { MatDialog,
/** Service */ /** Service */
import { MastersService } from '../../../../service/masters/masters.service'; import { MastersService } from '../../../../service/masters/masters.service';
import { NotifierService } from 'angular-notifier';
@Component({ @Component({
selector: 'app-jazz-dialog', selector: 'app-jazz-dialog',
@ -22,14 +23,15 @@ import { MastersService } from '../../../../service/masters/masters.service';
export class SubProductDialogComponent implements OnInit { export class SubProductDialogComponent implements OnInit {
public _subProductMasterForm: FormGroup; public _subProductMasterForm: FormGroup;
private notifier: NotifierService;
productDatas : any[]; productDatas : any[];
errorMessage:string; errorMessage:string;
color = 'primary'; color = 'primary';
constructor(private _formBuilder: FormBuilder, constructor(private _formBuilder: FormBuilder,notifier: NotifierService,
private dialogRef: MatDialogRef<SubProductDialogComponent>, private dialogRef: MatDialogRef<SubProductDialogComponent>,
private _MastersService: MastersService, private _MastersService: MastersService,
@Inject(MAT_DIALOG_DATA) public data: any) { } @Inject(MAT_DIALOG_DATA) public data: any) { this.notifier = notifier; }
ngOnInit() { ngOnInit() {
this.subProductFormDatas(); this.subProductFormDatas();
@ -83,10 +85,12 @@ export class SubProductDialogComponent implements OnInit {
//After Saving the data then popup close //After Saving the data then popup close
this.dialogRef.close(); this.dialogRef.close();
//Need To Dispaly saving Datas //Need To Dispaly saving Datas
alert("Data Saved Successfully"); //alert("Data Saved Successfully");
this.notifier.notify('success', 'Record Saved Successfully.!');
} }
else{ else{
alert("SomeThing Wents Wrong Try Again !"); //alert("SomeThing Wents Wrong Try Again !");
this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !');
} }
}); });
@ -98,10 +102,12 @@ export class SubProductDialogComponent implements OnInit {
//After Editing the data then popup close //After Editing the data then popup close
this.dialogRef.close(); this.dialogRef.close();
//Need To Display saving Datas //Need To Display saving Datas
alert("Data Edited Successfully"); //alert("Data Edited Successfully");
this.notifier.notify('success', 'Record Edited Successfully.!');
} }
else{ else{
alert("SomeThing Wents Wrong Try Again !"); //alert("SomeThing Wents Wrong Try Again !");
this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !');
} }
}); });
} }

View File

@ -1,7 +1,7 @@
<mat-card-content> <mat-card-content>
<div style="text-align: right;"> <div style="text-align: right;">
<!-- <button mat-stroked-button [color]="color" (click)="addSubProductMaster()" > + Add Sub Product</button> --> <!-- <button mat-stroked-button [color]="color" (click)="addSubProductMaster()" > + Add Sub Product</button> -->
<button mat-fab class="mr-1 mb-1" [color]="color" (click)="addSubProductMaster()" matTooltip="Add Sub Product" matTooltipPosition="above"><mat-icon>add</mat-icon></button>
</div> </div>
<br> <br>
<!-- <div *ngIf="loader"> <!-- <div *ngIf="loader">
@ -93,10 +93,21 @@
<br> <br>
<div *ngIf="!noRecordFound" class="filter-container mat-elevation-z8"> <div *ngIf="!noRecordFound" class="filter-container mat-elevation-z8">
<div class="filter-header"> <!-- <div class="filter-header">
<mat-form-field> <mat-form-field>
<input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter"> <input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter">
</mat-form-field> </mat-form-field>
</div> -->
<div fxLayout="row" fxLayoutAlign="start center" class="filter-header">
<div class="ml-xs mr-xs" style="width: 90%;">
<mat-form-field dividerColor="primary" class="ml-xs mr-xs" style="width: 30%;">
<input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter">
</mat-form-field>
</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> </div>
@ -160,3 +171,4 @@
<div *ngIf="noRecordFound" class="nocontent">No records found</div> <div *ngIf="noRecordFound" class="nocontent">No records found</div>
</mat-card-content> </mat-card-content>
<notifier-container></notifier-container>

View File

@ -1,6 +1,6 @@
<!-- <div class="ml-xs mr-xs"> <!-- <div class="ml-xs mr-xs">
<h2 mat-dialog-title>Title &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;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <h2 mat-dialog-title>Title &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;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<button mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button> <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" [color]='color' matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button>
</h2> </h2>
</div> </div>
<div class="container" <div class="container"
@ -10,7 +10,7 @@
fxLayoutGap="35px" fxLayoutGap="35px"
fxLayoutGap.xs="0"> fxLayoutGap.xs="0">
<div class="mat-dialog-title" fxFlex fxFlexOrder="1">Title</div> <div class="mat-dialog-title" fxFlex fxFlexOrder="1">Title</div>
<div fxFlex="20px" fxFlexOrder="3" style="text-align:right;"><button mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button></div> <div fxFlex="20px" fxFlexOrder="3" style="text-align:right;"><button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" [color]='color' matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button></div>
<div fxFlex="15px" fxFlexOrder="2"></div> <div fxFlex="15px" fxFlexOrder="2"></div>
</div>--> </div>-->
<div class="ml-xs mr-xs" style="width: 100%;" <div class="ml-xs mr-xs" style="width: 100%;"
@ -19,7 +19,7 @@ fxLayoutAlign="center">
<h2 mat-dialog-title style="width: 33%;">Title &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;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</h2> <h2 mat-dialog-title style="width: 33%;">Title &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;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</h2>
<div style="width: 35%;"></div> <div style="width: 35%;"></div>
<div style="width: 32%;text-align:right;"> <div style="width: 32%;text-align:right;">
<button mat-raised-button mat-icon-button class="mr-1 mb-1" color='warn' matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button> <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>
</div> </div>
@ -40,11 +40,11 @@ fxLayoutAlign="center">
</div> </div>
<br> <br>
<div class="row" style="text-align:right;"> <div class="row" style="text-align:right;">
<button *ngIf="isEmptyObject(_titleForm.controls['title_id']);else editreset;" mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' matTooltip="Reset" matTooltipPosition="above" type="reset" ><mat-icon>settings_backup_restore</mat-icon></button> <button *ngIf="isEmptyObject(_titleForm.controls['title_id']);else editreset;" 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>
<ng-template #editreset> <ng-template #editreset>
<button mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' 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="Reset" matTooltipPosition="above" type="button" (click)="onResetForEdit()" ><mat-icon>settings_backup_restore</mat-icon></button>
</ng-template> </ng-template>
<button mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' matTooltip="Save" matTooltipPosition="above" type="submit" [disabled]="!_titleForm.valid"><mat-icon>save</mat-icon></button> <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Save" matTooltipPosition="above" type="submit" [disabled]="!_titleForm.valid"><mat-icon>save</mat-icon></button>
<!-- <button mat-button >RESET</button> --> <!-- <button mat-button >RESET</button> -->
</div> </div>

View File

@ -12,6 +12,7 @@ import { MatDialog,
MAT_DIALOG_DATA } from '@angular/material'; MAT_DIALOG_DATA } from '@angular/material';
/** Service */ /** Service */
import { MastersService } from '../../../../service/masters/masters.service'; import { MastersService } from '../../../../service/masters/masters.service';
import { NotifierService } from 'angular-notifier';
@Component({ @Component({
selector: 'app-jazz-dialog', selector: 'app-jazz-dialog',
@ -22,11 +23,12 @@ export class TitleDialogComponent implements OnInit {
public _titleForm: FormGroup; public _titleForm: FormGroup;
private notifier: NotifierService;
color = 'primary'; color = 'primary';
constructor(private _formBuilder: FormBuilder, constructor(private _formBuilder: FormBuilder,notifier: NotifierService,
private dialogRef: MatDialogRef<TitleDialogComponent>, private dialogRef: MatDialogRef<TitleDialogComponent>,
private _MastersService: MastersService, private _MastersService: MastersService,
@Inject(MAT_DIALOG_DATA) public data: any) { } @Inject(MAT_DIALOG_DATA) public data: any) { this.notifier = notifier; }
ngOnInit() { ngOnInit() {
@ -70,10 +72,12 @@ export class TitleDialogComponent implements OnInit {
//After Saving the data then popup close //After Saving the data then popup close
this.dialogRef.close(); this.dialogRef.close();
//Need To Dispaly saving Datas //Need To Dispaly saving Datas
alert("Data Saved Successfully"); //alert("Data Saved Successfully");
this.notifier.notify('success', 'Record Saved Successfully.!');
} }
else{ else{
alert("SomeThing Wents Wrong Try Again !"); //alert("SomeThing Wents Wrong Try Again !");
this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !');
} }
}); });
@ -84,10 +88,12 @@ export class TitleDialogComponent implements OnInit {
//After Editing the data then popup close //After Editing the data then popup close
this.dialogRef.close(); this.dialogRef.close();
//Need To Display saving Datas //Need To Display saving Datas
alert("Data Edited Successfully"); //alert("Data Edited Successfully");
this.notifier.notify('success', 'Record Edited Successfully.!');
} }
else{ else{
alert("SomeThing Wents Wrong Try Again !"); //alert("SomeThing Wents Wrong Try Again !");
this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !');
} }
}); });
} }

View File

@ -1,8 +1,5 @@
<div style="text-align: right;">
<!-- <button mat-stroked-button [color]="color" (click)="addTitle()" > + Add Title</button> -->
<button mat-fab class="mr-1 mb-1" [color]="color" (click)="addTitle()" matTooltip="Add Title" matTooltipPosition="above"><mat-icon>add</mat-icon></button>
</div>
<mat-card-content> <mat-card-content>
<!-- <div *ngIf="loader"> <!-- <div *ngIf="loader">
<mat-progress-bar mode="indeterminate" [color]="color" class="mb-1"></mat-progress-bar> <mat-progress-bar mode="indeterminate" [color]="color" class="mb-1"></mat-progress-bar>
@ -83,10 +80,22 @@
<br> <br>
<div *ngIf="!noRecordFound" class="filter-container mat-elevation-z8"> <div *ngIf="!noRecordFound" class="filter-container mat-elevation-z8">
<div class="filter-header"> <!-- <div class="filter-header">
<mat-form-field> <mat-form-field>
<input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter"> <input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter">
</mat-form-field> </mat-form-field>
</div> -->
<div fxLayout="row" fxLayoutAlign="start center" class="filter-header">
<div class="ml-xs mr-xs" style="width: 90%;">
<mat-form-field dividerColor="primary" class="ml-xs mr-xs" style="width: 30%;">
<input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter">
</mat-form-field>
</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)="addTitle()" matTooltip="Add Title" matTooltipPosition="above"><mat-icon>add</mat-icon></button>
</div>
</div> </div>
@ -145,3 +154,4 @@
<div *ngIf="noRecordFound" class="nocontent">No records found</div> <div *ngIf="noRecordFound" class="nocontent">No records found</div>
</mat-card-content> </mat-card-content>
<notifier-container></notifier-container>

View File

@ -1,6 +1,6 @@
<!-- <div class="mb-1"> <!-- <div class="mb-1">
<h2 mat-dialog-title> Type of activity &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;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <h2 mat-dialog-title> Type of activity &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;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<button mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button> <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" [color]='color' matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button>
</h2> </h2>
</div> --> </div> -->
@ -11,7 +11,7 @@
fxLayoutGap="35px" fxLayoutGap="35px"
fxLayoutGap.xs="0"> fxLayoutGap.xs="0">
<div class="mat-dialog-title" fxFlex fxFlexOrder="1">Type of activity</div> <div class="mat-dialog-title" fxFlex fxFlexOrder="1">Type of activity</div>
<div fxFlex="20px" fxFlexOrder="3" style="text-align:right;"><button mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button></div> <div fxFlex="20px" fxFlexOrder="3" style="text-align:right;"><button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" [color]='color' matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button></div>
<div fxFlex="15px" fxFlexOrder="2"></div> --> <div fxFlex="15px" fxFlexOrder="2"></div> -->
<div class="ml-xs mr-xs" style="width: 100%;" <div class="ml-xs mr-xs" style="width: 100%;"
@ -20,7 +20,7 @@ fxLayoutAlign="center">
<h2 mat-dialog-title style="width: 80%;"> Type of activity &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> <h2 mat-dialog-title style="width: 80%;"> Type of activity &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: 20%;text-align:right;"> <div style="width: 20%;text-align:right;">
<button mat-raised-button mat-icon-button class="mr-1 mb-1" color="warn" matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button> <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>
</div> </div>
@ -40,12 +40,12 @@ fxLayoutAlign="center">
</div> </div>
<br> <br>
<div class="row" style="text-align:right;"> <div class="row" style="text-align:right;">
<!-- <button mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' 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" [color]='color' matTooltip="Reset" matTooltipPosition="above" type="reset" ><mat-icon>settings_backup_restore</mat-icon></button> -->
<button *ngIf="isEmptyObject(_activityMasterForm.controls['type_of_activity_id']);else editreset;" mat-raised-button mat-icon-button class="mr-1 mb-1" [color]="color" matTooltip="Reset" matTooltipPosition="above" type="reset" ><mat-icon>settings_backup_restore</mat-icon></button> <button *ngIf="isEmptyObject(_activityMasterForm.controls['type_of_activity_id']);else editreset;" 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>
<ng-template #editreset> <ng-template #editreset>
<button mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' 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="Reset" matTooltipPosition="above" type="button" (click)="onResetForEdit()" ><mat-icon>settings_backup_restore</mat-icon></button>
</ng-template> </ng-template>
<button mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' matTooltip="Save" matTooltipPosition="above" type="submit" [disabled]="!_activityMasterForm.valid"><mat-icon>save</mat-icon></button> <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Save" matTooltipPosition="above" type="submit" [disabled]="!_activityMasterForm.valid"><mat-icon>save</mat-icon></button>
<!-- <button mat-button >RESET</button> --> <!-- <button mat-button >RESET</button> -->
</div> </div>

View File

@ -12,6 +12,7 @@ import { MatDialog,
MAT_DIALOG_DATA } from '@angular/material'; MAT_DIALOG_DATA } from '@angular/material';
/** Service */ /** Service */
import { MastersService } from '../../../../service/masters/masters.service'; import { MastersService } from '../../../../service/masters/masters.service';
import { NotifierService } from 'angular-notifier';
@Component({ @Component({
@ -22,11 +23,12 @@ import { MastersService } from '../../../../service/masters/masters.service';
export class ActivityDialogComponent implements OnInit { export class ActivityDialogComponent implements OnInit {
public _activityMasterForm: FormGroup; public _activityMasterForm: FormGroup;
private notifier: NotifierService;
color = 'primary'; color = 'primary';
constructor(private _formBuilder: FormBuilder, constructor(private _formBuilder: FormBuilder,notifier: NotifierService,
private dialogRef: MatDialogRef<ActivityDialogComponent>, private dialogRef: MatDialogRef<ActivityDialogComponent>,
private _MastersService: MastersService, private _MastersService: MastersService,
@Inject(MAT_DIALOG_DATA) public data: any) { } @Inject(MAT_DIALOG_DATA) public data: any) { this.notifier = notifier; }
@ -61,10 +63,12 @@ onSubmit() {
//After Saving the data then popup close //After Saving the data then popup close
this.dialogRef.close(); this.dialogRef.close();
//Need To Dispaly saving Datas //Need To Dispaly saving Datas
alert("Data Saved Successfully"); //alert("Data Saved Successfully");
this.notifier.notify('success', 'Record Saved Successfully.!');
} }
else{ else{
alert("SomeThing Wents Wrong Try Again !"); //alert("SomeThing Wents Wrong Try Again !");
this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !');
} }
}); });
@ -76,10 +80,12 @@ onSubmit() {
//After Editing the data then popup close //After Editing the data then popup close
this.dialogRef.close(); this.dialogRef.close();
//Need To Display saving Datas //Need To Display saving Datas
alert("Data Edited Successfully"); //alert("Data Edited Successfully");
this.notifier.notify('success', 'Record Edited Successfully.!');
} }
else{ else{
alert("SomeThing Wents Wrong Try Again !"); //alert("SomeThing Wents Wrong Try Again !");
this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !');
} }
}); });
} }

View File

@ -1,8 +1,8 @@
<div style="text-align: right;"> <!-- <div style="text-align: right;"> -->
<!-- <button mat-stroked-button [color]="color" (click)="addActivity()" > + Add Activity()</button> --> <!-- <button mat-stroked-button [color]="color" (click)="addActivity()" > + Add Activity()</button> -->
<button mat-fab class="mr-1 mb-1" [color]="color" (click)="addActivity()" matTooltip="Add Activity()" matTooltipPosition="above"><mat-icon>add</mat-icon></button>
</div> <!-- </div> -->
<mat-card-content> <mat-card-content>
<!-- <div *ngIf="loader"> <!-- <div *ngIf="loader">
<mat-progress-bar mode="indeterminate" [color]="color" class="mb-1"></mat-progress-bar> <mat-progress-bar mode="indeterminate" [color]="color" class="mb-1"></mat-progress-bar>
@ -76,10 +76,20 @@
</mat-table> </mat-table>
</div>--> </div>-->
<div *ngIf="!noRecordFound" class="filter-container mat-elevation-z8"> <div *ngIf="!noRecordFound" class="filter-container mat-elevation-z8">
<div class="filter-header"> <!-- <div class="filter-header">
<mat-form-field> <mat-form-field>
<input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter"> <input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter">
</mat-form-field> </mat-form-field>
</div> -->
<div fxLayout="row" fxLayoutAlign="start center" class="filter-header">
<div class="ml-xs mr-xs" style="width: 90%;">
<mat-form-field dividerColor="primary" class="ml-xs mr-xs" style="width: 30%;">
<input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter">
</mat-form-field>
</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)="addActivity()" matTooltip="Add Activity()" matTooltipPosition="above"><mat-icon>add</mat-icon></button>
</div>
</div> </div>
@ -138,3 +148,4 @@
<div *ngIf="noRecordFound" class="nocontent">No records found</div> <div *ngIf="noRecordFound" class="nocontent">No records found</div>
</mat-card-content> </mat-card-content>
<notifier-container></notifier-container>

View File

@ -18,7 +18,7 @@ fxLayout="row"
fxLayoutAlign="center"> fxLayoutAlign="center">
<h2 mat-dialog-title style="width: 70%;"> Unit of Measurement &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</h2> <h2 mat-dialog-title style="width: 70%;"> Unit of Measurement &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</h2>
<div style="width: 30%;text-align:right;"> <div style="width: 30%;text-align:right;">
<button mat-raised-button mat-icon-button class="mr-1 mb-1" [color]="warn" matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button> <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>
</div> </div>
@ -39,11 +39,11 @@ fxLayoutAlign="center">
<br> <br>
<div class="row" style="text-align:right;"> <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 *ngIf="isEmptyObject(_uomForm.controls['uom_id']);else editreset;" mat-raised-button mat-icon-button class="mr-1 mb-1" matTooltip="Reset" matTooltipPosition="above" type="reset" [color]="color"><mat-icon>settings_backup_restore</mat-icon></button> <button *ngIf="isEmptyObject(_uomForm.controls['uom_id']);else editreset;" mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Reset" matTooltipPosition="above" type="reset" [color]="color"><mat-icon>settings_backup_restore</mat-icon></button>
<ng-template #editreset> <ng-template #editreset>
<button mat-raised-button mat-icon-button class="mr-1 mb-1" [color]="color" 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="Reset" matTooltipPosition="above" type="button" (click)="onResetForEdit()" ><mat-icon>settings_backup_restore</mat-icon></button>
</ng-template> </ng-template>
<button mat-raised-button mat-icon-button class="mr-1 mb-1" [color]="color" matTooltip="Save" matTooltipPosition="above" type="submit" [disabled]="!_uomForm.valid"><mat-icon>save</mat-icon></button> <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Save" matTooltipPosition="above" type="submit" [disabled]="!_uomForm.valid"><mat-icon>save</mat-icon></button>
<!-- <button mat-button >RESET</button> --> <!-- <button mat-button >RESET</button> -->
</div> </div>

View File

@ -12,6 +12,7 @@ import { MatDialog,
MAT_DIALOG_DATA } from '@angular/material'; MAT_DIALOG_DATA } from '@angular/material';
/** Service */ /** Service */
import { MastersService } from '../../../../service/masters/masters.service'; import { MastersService } from '../../../../service/masters/masters.service';
import { NotifierService } from 'angular-notifier';
@Component({ @Component({
selector: 'app-jazz-dialog', selector: 'app-jazz-dialog',
@ -22,11 +23,12 @@ export class UomDialogComponent implements OnInit {
public _uomForm: FormGroup; public _uomForm: FormGroup;
private notifier: NotifierService;
color = 'primary'; color = 'primary';
constructor(private _formBuilder: FormBuilder, constructor(private _formBuilder: FormBuilder,notifier: NotifierService,
private dialogRef: MatDialogRef<UomDialogComponent>, private dialogRef: MatDialogRef<UomDialogComponent>,
private _mastersService: MastersService, private _mastersService: MastersService,
@Inject(MAT_DIALOG_DATA) public data: any) { } @Inject(MAT_DIALOG_DATA) public data: any) { this.notifier = notifier; }
ngOnInit() { ngOnInit() {
@ -73,10 +75,12 @@ export class UomDialogComponent implements OnInit {
//After Saving the data then popup close //After Saving the data then popup close
this.dialogRef.close(); this.dialogRef.close();
//Need To Dispaly saving Datas //Need To Dispaly saving Datas
alert("Data Saved Successfully"); //alert("Data Saved Successfully");
this.notifier.notify('success', 'Record Saved Successfully.!');
} }
else{ else{
alert("SomeThing Wents Wrong Try Again !"); //alert("SomeThing Wents Wrong Try Again !");
this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !');
} }
}); });
@ -88,10 +92,12 @@ export class UomDialogComponent implements OnInit {
//After Editing the data then popup close //After Editing the data then popup close
this.dialogRef.close(); this.dialogRef.close();
//Need To Display saving Datas //Need To Display saving Datas
alert("Data Edited Successfully"); //alert("Data Edited Successfully");
this.notifier.notify('success', 'Record Edited Successfully.!');
} }
else{ else{
alert("SomeThing Wents Wrong Try Again !"); //alert("SomeThing Wents Wrong Try Again !");
this.notifier.notify('warning', 'SomeThing Wents Wrong Try Again !');
} }
}); });
} }

View File

@ -1,7 +1,7 @@
<div style="text-align: right;"> <!-- <div style="text-align: right;">
<!-- <button mat-stroked-button [color]="color" (click)="addUOM()" > + Add UOM</button> --> <!- <button mat-stroked-button [color]="color" (click)="addUOM()" > + Add UOM</button> ->
<button mat-fab class="mr-1 mb-1" [color]="color" (click)="addUOM()" matTooltip="Add UOM" matTooltipPosition="above"><mat-icon>add</mat-icon></button> <button mat-fab class="mr-1 mb-1" [color]="color" (click)="addUOM()" matTooltip="Add UOM" matTooltipPosition="above"><mat-icon>add</mat-icon></button>
</div> </div> -->
<mat-card-content> <mat-card-content>
<!-- <div *ngIf="loader"> <!-- <div *ngIf="loader">
@ -78,10 +78,21 @@
</mat-table> </mat-table>
</div>--> </div>-->
<div *ngIf="!noRecordFound" class="filter-container mat-elevation-z8"> <div *ngIf="!noRecordFound" class="filter-container mat-elevation-z8">
<div class="filter-header"> <!-- <div class="filter-header">
<mat-form-field> <mat-form-field>
<input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter"> <input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter">
</mat-form-field> </mat-form-field>
</div> -->
<div fxLayout="row" fxLayoutAlign="start center" class="filter-header">
<div class="ml-xs mr-xs" style="width: 90%;">
<mat-form-field dividerColor="primary" class="ml-xs mr-xs" style="width: 30%;">
<input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter">
</mat-form-field>
</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)="addUOM()" matTooltip="Add UOM" matTooltipPosition="above"><mat-icon>add</mat-icon></button>
</div>
</div> </div>
@ -140,3 +151,4 @@
<div *ngIf="noRecordFound" class="nocontent">No records found</div> <div *ngIf="noRecordFound" class="nocontent">No records found</div>
</mat-card-content> </mat-card-content>
<notifier-container></notifier-container>

View File

@ -20,7 +20,7 @@
<ng-container matColumnDef="SerialNo"> <ng-container matColumnDef="SerialNo">
<mat-header-cell *matHeaderCellDef mat-sort-header>Sl </mat-header-cell> <mat-header-cell *matHeaderCellDef mat-sort-header>Sl </mat-header-cell>
<mat-cell *matCellDef="let row; let i = index;"> {{i+1}} </mat-cell> <mat-cell *matCellDef="let us; let i = index;"> {{us.SerialNo}} </mat-cell>
</ng-container> </ng-container>
<ng-container matColumnDef="FullName"> <ng-container matColumnDef="FullName">

View File

@ -70,6 +70,12 @@ export class UserListComponent implements OnInit {
console.log(data.records.length); console.log(data.records.length);
this.dataLength = data.records.length; this.dataLength = data.records.length;
this.dataSource.data = this.userdata; this.dataSource.data = this.userdata;
if(data.records.length >= 1){
this.userdata = this.userdata.map((val, i)=>{
val['SerialNo'] = i + 1;
return val;
})
}
} }
}) })
} }

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 15 KiB