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

merge changes

Browse Source
This commit is contained in:
gandhimathi 2018-10-06 20:45:04 +05:30
commit 5061330b8f
96 changed files with 699 additions and 509 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ng6-seed/src/app/AwsService/cognito.service.ts
View File

@ -11,7 +11,8 @@ import {
CognitoUserSession CognitoUserSession
} from "amazon-cognito-identity-js"; } from "amazon-cognito-identity-js";
import { environment } from '../../environments/environment'; import { environment } from '../../environments/environment';
import { BehaviorSubject } from 'rxjs';
import { BehaviorSubject,Observable,of } from 'rxjs';
const sineedge_poolData = { const sineedge_poolData = {
UserPoolId: "ap-south-1_y7dt3iEaX", //ap-south-1_qQ85yQZJO UserName :SPARQ_SINEEDGE_DEV UserPoolId: "ap-south-1_y7dt3iEaX", //ap-south-1_qQ85yQZJO UserName :SPARQ_SINEEDGE_DEV
ClientId: "291qt4smn5pql6o8cc2hi201lj" // ClientName: SINEEDGE_DEV_WEB ClientId: "291qt4smn5pql6o8cc2hi201lj" // ClientName: SINEEDGE_DEV_WEB
@ -122,7 +123,32 @@ isloggin:boolean = false;
// callback.callbackWithParam(null); // callback.callbackWithParam(null);
// } // }
// } // }
refresh() {
let tokenexp:boolean;
this.getCurrentUser().getSession(function (err, session) {
if (err) {
console.log("CognitoUtil: Can't set the credentials:" + err);
}
else {
if (session.isValid()) {
tokenexp = session.isValid();
of(tokenexp)
console.log("CognitoUtil: refreshed successfully");
} else {
tokenexp = session.isValid();
console.log("CognitoUtil: refreshed but session is still not valid");
}
}
return tokenexp;
});
}
getAccessToken(){ getAccessToken(){
this.refresh();
let jwttoken = ''; let jwttoken = '';
if (this.getCurrentUser() != null) { if (this.getCurrentUser() != null) {
//console.log(JSON.stringify(this.getCurrentUser())); //console.log(JSON.stringify(this.getCurrentUser()));

4
ng6-seed/src/app/_guard/auth.guard.ts
View File

@ -27,8 +27,10 @@ export class AuthGuard implements CanActivate, CanActivateChild {
return true; return true;
} else { } else {
// alert("else"); // alert("else");
this.router.navigate(['/login']); setTimeout(() => {
this.router.navigate(['authentication/login']);
return false; return false;
},1000);
} }
} }

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

@ -6,25 +6,25 @@
<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><i class="fa fa-superpowers" aria-hidden="true"></i> <span> {{userDep}} </span> <h2><img [src]="'https://download.zoho.com/webdownload?x-service=CLIQ&event-id=0e17e076835b478c3ae33ddb3d3408e239e7c1f79dd4c2a1b626222e2cc1f221a8d3a027733fc52e82bc85cc5b0111d594abef51a345b4a64531af51c8e8c5bd'" style="height: 50px;;"> <span> {{userDep}} </span>
</h2> </h2>
</div> </div>
<div class="main-nav"> <div class="main-nav">
<div class="user-pro-wrap"> <div class="user-pro-wrap">
<div class="user-profile-thumb text-center"> <div class="user-profile-thumb text-center">
<div class="user-i"> <div class="user-i">
<img src="assets/images/userpic.jpg" class="rad-full mb-1" width="100" height="100" alt=""> <img [src]="profileurl ||'https://upload.wikimedia.org/wikipedia/commons/thumb/a/ac/No_image_available.svg/1024px-No_image_available.svg.png'" class="rad-full mb-1" width="100" height="100" alt="">
<div> <span>{{fullName}}</span></div> <div> <span>{{fullName}}</span></div>
</div> </div>
</div> </div>
<div class="most-used text-center"> <div class="most-used text-center">
<a class="most-link" color="primary"> <a class="most-link" color="primary" (click)="menunav('HOME')">
<mat-icon>home</mat-icon> <mat-icon>home</mat-icon>
</a> </a>
<a class="most-link" color="primary"> <a class="most-link" color="primary" (click)="menunav('USERS')">
<mat-icon>person</mat-icon> <mat-icon>person</mat-icon>
</a> </a>
<a class="most-link" color="primary"> <a class="most-link" color="primary" (click)="menunav('SETTINGS')">
<mat-icon>settings</mat-icon> <mat-icon>settings</mat-icon>
</a> </a>
</div> </div>
@ -61,6 +61,23 @@
<a [routerLink]="['/', menuitem.state, childitem.state ]" class="relative" mat-ripple>{{ childitem.name | translate }}</a> <a [routerLink]="['/', menuitem.state, childitem.state ]" class="relative" mat-ripple>{{ childitem.name | translate }}</a>
</mat-list-item> </mat-list-item>
</mat-nav-list> </mat-nav-list>
<!-- Multi-->
<a appAccordionToggle class="relative" mat-ripple href="javascript:;" *ngIf="menuitem.type === 'multi'">
<mat-icon>{{ menuitem.icon }}</mat-icon>
<span>{{ menuitem.name | translate }}</span>
<span fxFlex></span>
<span class="menu-badge mat-{{ badge.type }}" *ngFor="let badge of menuitem.badge">{{ badge.value }}</span>
<mat-icon class="menu-caret">arrow_drop_down</mat-icon>
</a>
<div *ngFor="let multichild of menuitem.multichild" >
<mat-nav-list class="sub-menu" *ngIf="multichild.type === 'sub'">
<mat-list-item *ngFor="let childitem of multichild.children" routerLinkActive="open">
<a [routerLink]="['/', multichild.state, childitem.state ]" class="relative" mat-ripple>{{ childitem.name | translate }}</a>
</mat-list-item>
</mat-nav-list>
</div>
<!--End-->
</mat-list-item> </mat-list-item>
<mat-divider></mat-divider> <mat-divider></mat-divider>
<!-- <mat-list-item> <!-- <mat-list-item>
@ -124,11 +141,11 @@
Lorem ipsum dolor sit amet consectetur. Lorem ipsum dolor sit amet consectetur.
</button> </button>
</mat-menu> </mat-menu>
<button [mat-menu-trigger-for]="user1" mat-icon-button class="ml-xs overflow-visible"> <!-- <button [mat-menu-trigger-for]="user1" mat-icon-button class="ml-xs overflow-visible">
<mat-icon>reorder</mat-icon> <mat-icon>reorder</mat-icon>
<span class="notification-label">3</span> <span class="notification-label">3</span>
</button> </button> -->
<mat-menu #user1="matMenu" class="opt-menu" x-position="before"> <!-- <mat-menu #user1="matMenu" class="opt-menu" x-position="before">
<div mat-menu-item class="head-menu grad-blue"> <div mat-menu-item class="head-menu grad-blue">
User Menu User Menu
</div> </div>
@ -144,7 +161,7 @@
<mat-icon>web</mat-icon> <mat-icon>web</mat-icon>
Calendar Settings Calendar Settings
</button> </button>
</mat-menu> </mat-menu> -->
<button (click)="end.toggle()" mat-icon-button class="ml-xs overflow-visible"> <button (click)="end.toggle()" mat-icon-button class="ml-xs overflow-visible">
<mat-icon>notifications</mat-icon> <mat-icon>notifications</mat-icon>
<span class="notification-label">2</span> <span class="notification-label">2</span>
@ -214,7 +231,7 @@
Lorem ipsum dolor sit amet consectetur. Lorem ipsum dolor sit amet consectetur.
</button> </button>
</mat-menu> </mat-menu>
<button [mat-menu-trigger-for]="user1" mat-icon-button class="ml-xs overflow-visible"> <!-- <button [mat-menu-trigger-for]="user1" mat-icon-button class="ml-xs overflow-visible">
<mat-icon>reorder</mat-icon> <mat-icon>reorder</mat-icon>
<span class="notification-label">3</span> <span class="notification-label">3</span>
</button> </button>
@ -234,7 +251,7 @@
<mat-icon>web</mat-icon> <mat-icon>web</mat-icon>
Calendar Settings Calendar Settings
</button> </button>
</mat-menu> </mat-menu> -->
<button (click)="end.toggle()" mat-icon-button class="ml-xs overflow-visible"> <button (click)="end.toggle()" mat-icon-button class="ml-xs overflow-visible">
<mat-icon>notifications</mat-icon> <mat-icon>notifications</mat-icon>
<span class="notification-label">2</span> <span class="notification-label">2</span>
@ -287,6 +304,7 @@
</ul> </ul>
</li> </li>
</ul> </ul>
</li> </li>
</ul> </ul>
</nav> </nav>

36
ng6-seed/src/app/layouts/admin/admin-layout.component.ts
View File

@ -19,6 +19,7 @@ import { AwsService } from '../../AwsService/aws.service';
}) })
export class AdminLayoutComponent implements OnInit, OnDestroy { export class AdminLayoutComponent implements OnInit, OnDestroy {
profileurl: any;;
userDep: string; userDep: string;
fullName: any; fullName: any;
currentUser: any; currentUser: any;
@ -49,17 +50,31 @@ export class AdminLayoutComponent implements OnInit, OnDestroy {
this.users.getroles().subscribe(res=>{ this.users.getroles().subscribe(res=>{
this.currentUser = res; this.currentUser = res;
if(this.currentUser.dataStatus == true){ if(this.currentUser.dataStatus == true){
this.currentUser = this.currentUser.records[0]; this.currentUser = this.currentUser.records[0];
this.fullName = this.currentUser.user_first_name +' '+this.currentUser.user_last_name; this.fullName = this.currentUser.user_first_name +' '+this.currentUser.user_last_name;
//console.log(this.currentUser); //console.log(this.currentUser);
if(this.currentUser.fk_entity_id == 1 ){ if(this.currentUser.fk_entity_id == 1 ){
this.userDep = "SINEEGDE"; this.userDep = "SineEdge";
}else if(this.currentUser.fk_entity_id ==2){ }else if(this.currentUser.fk_entity_id ==2){
this.userDep = "LENDOR"; this.userDep = "Lender";
}else{ }else{
this.userDep = "VENDOR"; this.userDep = "Vendor";
} }
let users= {
'userid':this.currentUser.userid,
'entityid':this.currentUser.fk_entity_id,
'profilepic':this.currentUser.profilepic
}
this.users.getprofilepic(users).subscribe(res=>{
this.profileurl = res;
if(this.profileurl.dataStatus == true){
this.profileurl = this.profileurl.records;
}
})
} }
}); });
@ -74,6 +89,7 @@ export class AdminLayoutComponent implements OnInit, OnDestroy {
suppressScrollX: true suppressScrollX: true
}); });
} }
this._router = this.router.events.pipe(filter(event => event instanceof NavigationEnd)).subscribe((event: NavigationEnd) => { this._router = this.router.events.pipe(filter(event => event instanceof NavigationEnd)).subscribe((event: NavigationEnd) => {
this.url = event.url; this.url = event.url;
@ -86,7 +102,7 @@ export class AdminLayoutComponent implements OnInit, OnDestroy {
} }
}); });
} }
@HostListener('click', ['$event']) @HostListener('click', ['$event'])
onClick(e: any) { onClick(e: any) {
const elemSidebar = <HTMLElement>document.querySelector('.sidebar-container '); const elemSidebar = <HTMLElement>document.querySelector('.sidebar-container ');
@ -232,4 +248,16 @@ export class AdminLayoutComponent implements OnInit, OnDestroy {
this.router.navigate(['/authentication/login']); this.router.navigate(['/authentication/login']);
}) })
} }
menunav(active){
switch(active){
case 'HOME':
this.router.navigate(['/home']);
break;
case 'USERS':
this.router.navigate(['/setting/users/userprofile']);
break;
case 'SETTING':
break;
}
}
} }

47
ng6-seed/src/app/pd-triger/add-pd/add-pd.component.html
View File

@ -105,18 +105,23 @@
<mat-form-field style="width: 100%;"> <mat-form-field style="width: 100%;">
<input matInput placeholder="Pincode" formControlName="pincode" required> <input matInput placeholder="Pincode" formControlName="pincode" required>
<mat-error *ngIf="pdMain.pincode.hasError('required')">Pincode is required.</mat-error> <mat-error *ngIf="pdMain.pincode.hasError('required')">Pincode is required.</mat-error>
</mat-form-field> </mat-form-field>
<mat-slide-toggle formControlName="allocation_type" <div class="ml-xs mr-xs" style="width: 100%;" fxLayout="row" >
class="example-margin" id="type" <h4 mat-dialog-title style="width: 14%;margin-top: 0%;">Allocation</h4>
[(ngModel)]="allocationTypeCheck" (change)="changeAllocationType(allocationTypeCheck)" <div style="width: 20%;"> <mat-slide-toggle formControlName="allocation_type"
checked="allocationTypeModel==1 ? false:allocationTypeModel==2 ? false:allocationTypeModel==3 ? true"> {{allocationLabel}} class="example-margin" id="type"
</mat-slide-toggle> [(ngModel)]="allocationTypeCheck" (change)="changeAllocationType(allocationTypeCheck)"
<mat-slide-toggle *ngIf="allocationTypeModel==1 || allocationTypeModel==2" formControlName="sub_allocation_type" checked="allocationTypeModel==1 ? false:allocationTypeModel==2 ? false:allocationTypeModel==3 ? true"> {{allocationLabel}}
class="example-margin" id="subType" </mat-slide-toggle> </div>
[(ngModel)]="subAllocationTypeCheck" (change)="changeSubAllocationType(subAllocationTypeCheck)" <div style="width: 20%;">
checked="allocationTypeModel==1 ? false:allocationTypeModel==2 ? true"> {{subAllocationLabel}} <mat-slide-toggle *ngIf="allocationTypeModel==1 || allocationTypeModel==2" formControlName="sub_allocation_type"
</mat-slide-toggle> class="example-margin" id="subType"
[(ngModel)]="subAllocationTypeCheck" (change)="changeSubAllocationType(subAllocationTypeCheck)"
checked="allocationTypeModel==1 ? false:allocationTypeModel==2 ? true"> {{subAllocationLabel}}
</mat-slide-toggle>
</div>
</div>
</div> </div>
</mat-card> </mat-card>
</div> </div>
@ -134,7 +139,7 @@
</mat-form-field> </mat-form-field>
<mat-form-field style="width: 100%"> <mat-form-field style="width: 100%">
<input matInput placeholder="Email" formControlName="email" type="email" required> <input matInput placeholder="Email" formControlName="email" type="email" required>
<mat-error *ngIf="pdMain.email.hasError('required')">Email is required.</mat-error> <mat-error *ngIf="pdMain.email.hasError('required')">Email number is required.</mat-error>
</mat-form-field> </mat-form-field>
@ -148,6 +153,7 @@
</div> </div>
</div> </div>
<div fxLayout="row" fxLayoutWrap="wrap" formArrayName="items" *ngFor="let coDetails of pdCoApplicant.controls; let i = index;"> <div fxLayout="row" fxLayoutWrap="wrap" formArrayName="items" *ngFor="let coDetails of pdCoApplicant.controls; let i = index;">
<div class="column" fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="100" fxFlex.lg="100" fxFlex.xl="100"> <div class="column" fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="100" fxFlex.lg="100" fxFlex.xl="100">
<mat-card class="p-2"> <mat-card class="p-2">
@ -170,11 +176,13 @@
</div> </div>
</div> </div>
<div fxLayout="row" fxLayoutWrap="wrap"> <div fxLayout="row" fxLayoutWrap="wrap">
<div class="column" fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="100" fxFlex.lg="100" fxFlex.xl="100"> <div class="column" fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="100" fxFlex.lg="100" fxFlex.xl="100">
<mat-card class="p-2" style="opacity: 0.5;"> <mat-card class="p-2" style="opacity: 0.5;">
<h5>Co-Applicant</h5>
<!-- <button _ngcontent-c29="" class="mr-1 mb-2 mat-fab1 mat-accent" mat-fab="" (click)="addCoApplicant(createWithLongContent)"><span class="mat-button-wrapper"><mat-icon _ngcontent-c29="" class="mat-icon material-icons" role="img" aria-hidden="true">add</mat-icon></span><div class="mat-button-ripple mat-ripple mat-button-ripple-round" matripple=""></div><div class="mat-button-focus-overlay"></div></button> --> <!-- <button _ngcontent-c29="" class="mr-1 mb-2 mat-fab1 mat-accent" mat-fab="" (click)="addCoApplicant(createWithLongContent)"><span class="mat-button-wrapper"><mat-icon _ngcontent-c29="" class="mat-icon material-icons" role="img" aria-hidden="true">add</mat-icon></span><div class="mat-button-ripple mat-ripple mat-button-ripple-round" matripple=""></div><div class="mat-button-focus-overlay"></div></button> -->
<button _ngcontent-c39="" class="mr-1 mb-1 mat-button" type="button"><span style="opacity: 0.5;" (click)="addCoApplicant()" class="mat-button-wrapper">Add More Co-Applicant</span><div class="mat-button-ripple mat-ripple" matripple=""></div><div class="mat-button-focus-overlay"></div></button> <!--<button mat-fab class="mr-1 mb-1" color="primary" (click)="addCoApplicant()"><mat-icon>add</mat-icon></button>-->
<button mat-fab class="mr-1 mb-1" color="primary" style="opacity: 0.5;" (click)="addCoApplicant()"><mat-icon>add</mat-icon><div class="mat-button-ripple mat-ripple" matripple=""></div><div class="mat-button-focus-overlay"></div></button>
<!-- <button mat-raised-button mat-button-sm color="primary" (click)="addCoApplicant()" type="button">Add More Co-Applicant</button> --> <!-- <button mat-raised-button mat-button-sm color="primary" (click)="addCoApplicant()" type="button">Add More Co-Applicant</button> -->
</mat-card> </mat-card>
@ -185,10 +193,11 @@
<div class="column" fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="100" fxFlex.lg="100" fxFlex.xl="100"> <div class="column" fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="100" fxFlex.lg="100" fxFlex.xl="100">
<mat-card class="p-2" formArrayName="documents"> <mat-card class="p-2" formArrayName="documents">
<h5>Document</h5>
<mat-list> <mat-list>
<mat-list-item> <mat-list-item>
<!-- <button mat-raised-button mat-button-sm color="primary" type="button">Add Document</button> --> <!-- <button mat-raised-button mat-button-sm color="primary" type="button">Add Document</button> -->
<button _ngcontent-c39="" class="mr-1 mb-1 mat-button" type="button"><span style="opacity: 0.5;" (click)="addMoreDocs()" class="mat-button-wrapper">Add Document</span><div class="mat-button-ripple mat-ripple" matripple=""></div><div class="mat-button-focus-overlay"></div></button> <button mat-fab class="mr-1 mb-1" color="primary" style="opacity: 0.5;" (click)="addMoreDocs()" class="mat-button-wrapper"><mat-icon>add</mat-icon><div class="mat-button-ripple mat-ripple" matripple=""></div><div class="mat-button-focus-overlay"></div></button>
</mat-list-item> </mat-list-item>
</mat-list> </mat-list>
@ -204,9 +213,7 @@
<input type="file" title="Browse Document" (change)="fileSelectionEvent($event,d)" formControlName="documentFile"> <input type="file" title="Browse Document" (change)="fileSelectionEvent($event,d)" formControlName="documentFile">
</mat-list-item> </mat-list-item>
<mat-list-item> <mat-list-item>
<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="removeItem(d)" <button mat-button color="accent" (click)="removeItem(d)" type="button">Remove</button>
(click)="loadPdListCompoent()"><mat-icon>delete</mat-icon></button>
<!-- <button mat-button color="accent" (click)="removeItem(d)" type="button">Remove</button> -->
</mat-list-item> </mat-list-item>
</mat-list> </mat-list>
</mat-card> </mat-card>
@ -227,4 +234,4 @@
</mat-card-actions> </mat-card-actions>
</form> </form>
</mat-card> </mat-card>
<notifier-container></notifier-container>

1
ng6-seed/src/app/pd-triger/edit-pd-applicant/edit-pd-applicant.component.html
View File

@ -70,5 +70,4 @@
</mat-card-actions> </mat-card-actions>
</form> </form>
</mat-card> </mat-card>
<notifier-container></notifier-container>

1
ng6-seed/src/app/pd-triger/edit-pd-master/edit-pd-master.component.html
View File

@ -115,4 +115,3 @@
</mat-card-actions> </mat-card-actions>
</form> </form>
</mat-card> </mat-card>
<notifier-container></notifier-container>

2
ng6-seed/src/app/pd-triger/edit-pd-master/edit-pd-master.component.ts
View File

@ -21,7 +21,7 @@ export class EditPdMasterComponent implements OnInit {
@Input() masterChild: any; @Input() masterChild: any;
@Output() loadPdView = new EventEmitter<string>(); @Output() loadPdView = new EventEmitter<string>();
public _EditPDtriggerForm:FormGroup; public _EditPDtriggerForm:FormGroup;
private notifier: NotifierService; public notifier: NotifierService;
constructor(private _fb: FormBuilder, constructor(private _fb: FormBuilder,
private _pd: PdTrigerService, notifier: NotifierService,) { private _pd: PdTrigerService, notifier: NotifierService,) {
this.notifier=notifier this.notifier=notifier

72
ng6-seed/src/app/pd-triger/list-pd/list-pd.component.html
View File

@ -1,19 +1,21 @@
<div align="right" *ngIf="showParentComponent"> <div align="right" *ngIf="showParentComponent">
<button mat-button (click)="addPdDetails()" color="primary">ADD PD</button> <button mat-fab class="mr-1 mb-1" color="primary" (click)="addPdDetails()"><mat-icon>add</mat-icon></button>
</div> </div>
<mat-card *ngIf="showParentComponent"> <mat-card *ngIf="showParentComponent">
<mat-tab-group> <mat-tab-group>
<mat-tab> <mat-tab>
<ng-template mat-tab-label>All PD Details</ng-template> <ng-template mat-tab-label>All</ng-template>
<mat-card-content>
<div class="card-comment-widget"> <div class="card-comment-widget">
<mat-list *ngIf="pdList.length > 0"> <mat-list *ngIf="pdList.length > 0">
<mat-list-item *ngFor="let details of dataSource.connect() | async"> <mat-list-item *ngFor="let details of dataSource.connect() | async">
<img mat-list-avatar src="assets/images/face3.jpg" alt=""> <img mat-list-avatar src="assets/images/lime.jpg" alt="">
<!-- {{details.applicat_details[0].applicant_name}} --> <!-- {{details.applicat_details[0].applicant_name}} -->
<p mat-line>{{details.applicat_details[0].applicant_name}} </p> <p mat-line>{{details.applicat_details[0].applicant_name}} </p>
<p mat-line>{{details.lender_full_name}} &nbsp;&nbsp;&nbsp;{{details.lender_applicant_id}} &nbsp;&nbsp;{{details.pd_date_of_initiation}}</p> <p mat-line><a style="padding-right: 7%;">{{details.lender_full_name}} </a><a style="padding-right: 7%">{{details.lender_applicant_id}}</a>{{details.pd_date_of_initiation}}</p>
<p mat-line>{{details.product_abbr}}/{{details.subproduct_abbr}}/{{details.customer_segment_abbr}}&nbsp;&nbsp;<span class="hover-icon"><i class="fa-1x fa fa-rupee">&nbsp;</i>{{details.loan_amount}}</span>&nbsp;&nbsp;<span class="hover-icon"><i class="fa-1x fa fa-map-marker"> </i> &nbsp;{{details.city_name}}/{{details.state_name}}-{{details.pincode}}</span></p> <p mat-line><a style="padding-right: 7%;">{{details.product_abbr}}/{{details.subproduct_abbr}}/{{details.customer_segment_abbr}}</a><a style="padding-right: 7%;"><span class="hover-icon"><i class="fa-1x fa fa-rupee">&nbsp;</i>{{details.loan_amount}}</span></a><span class="hover-icon"><i class="fa-1x fa fa-map-marker"> </i> &nbsp;{{details.city_name}}/{{details.state_name}}-{{details.pincode}}</span></p>
<!-- <span class="text-mat mat-text-muted">Chennai</span> --> <!-- <span class="text-mat mat-text-muted">Chennai</span> -->
<!-- <div class="comment-time"> <!-- <div class="comment-time">
@ -28,26 +30,26 @@
</div> </div>
<mat-divider></mat-divider>
</mat-list-item> </mat-list-item>
<hr>
</mat-list> </mat-list>
<mat-list *ngIf="recordStatus"> <mat-list *ngIf="recordStatus">
<mat-list-item> <mat-list-item>
<p mat-line>No Record Found ...</p> <p mat-line>No Record Found ...</p>
</mat-list-item> </mat-list-item>
</mat-list> </mat-list>
</div> </div>
</mat-card-content>
<mat-card-actions *ngIf="!recordStatus"> <mat-card-actions *ngIf="!recordStatus">
<mat-paginator #paginator [length]="pdList.length" [pageIndex]="pageIndex" [pageSize]="pageSize" <mat-paginator #paginator class="mat-elevation-z1" [length]="pdList.length" [pageIndex]="pageIndex" [pageSize]="pageSize"
[pageSizeOptions]="[5, 10, 25, 100]" (page)="pageEvent = $event; pageChange($event)"> [pageSizeOptions]="[5, 10, 25, 100]" (page)="pageEvent = $event; pageChange($event)">
</mat-paginator> </mat-paginator>
</mat-card-actions> </mat-card-actions>
</mat-tab> </mat-tab>
<!-- <mat-tab> <!-- <mat-tab>
<ng-template mat-tab-label>Confirmed PD Details</ng-template> <ng-template mat-tab-label>Confirmed PD Details</ng-template>
<mat-card-content> <mat-card-content>
<mat-grid-list cols="2" [rowHeight]="ratio" gutterSize="4px"> <mat-grid-list cols="2" [rowHeight]="ratio" gutterSize="4px">
@ -61,11 +63,11 @@
</mat-form-field> </mat-form-field>
</div> </div>
</mat-card-content> </mat-card-content>
</mat-tab> </mat-tab>-->
<mat-tab> <mat-tab>
<ng-template mat-tab-label>In Progress PD Details</ng-template> <ng-template mat-tab-label>In Progress </ng-template>
<mat-card-content> <mat-card-content>
<mat-grid-list cols="2" rowHeight="fit" [gutterSize]="ratioGutter" <!--<mat-grid-list cols="2" rowHeight="fit" [gutterSize]="ratioGutter"
[style.height]="fitListHeight"> [style.height]="fitListHeight">
<mat-grid-tile *ngFor="let tile of tiles" [style.background]="'#F1EBBA'"> <mat-grid-tile *ngFor="let tile of tiles" [style.background]="'#F1EBBA'">
{{tile.text}} {{tile.text}}
@ -78,9 +80,47 @@
<mat-form-field> <mat-form-field>
<input matInput placeholder="Change gutter" type="number" [(ngModel)]="ratioGutter"> <input matInput placeholder="Change gutter" type="number" [(ngModel)]="ratioGutter">
</mat-form-field> </mat-form-field>
</div> </div>-->
</mat-card-content> </mat-card-content>
</mat-tab> --> </mat-tab>
<mat-tab>
<ng-template mat-tab-label>Scheduled </ng-template>
<mat-card-content>
<!--<mat-grid-list cols="2" rowHeight="fit" [gutterSize]="ratioGutter"
[style.height]="fitListHeight">
<mat-grid-tile *ngFor="let tile of tiles" [style.background]="'#F1EBBA'">
{{tile.text}}
</mat-grid-tile>
</mat-grid-list>
<div fxLayout="row" fxLayoutAlign="start center" class="mt-2">
<mat-form-field>
<input matInput placeholder="Change list height" [(ngModel)]="fitListHeight">
</mat-form-field>
<mat-form-field>
<input matInput placeholder="Change gutter" type="number" [(ngModel)]="ratioGutter">
</mat-form-field>
</div>-->
</mat-card-content>
</mat-tab>
<mat-tab>
<ng-template mat-tab-label>Completed </ng-template>
<mat-card-content>
<!--<mat-grid-list cols="2" rowHeight="fit" [gutterSize]="ratioGutter"
[style.height]="fitListHeight">
<mat-grid-tile *ngFor="let tile of tiles" [style.background]="'#F1EBBA'">
{{tile.text}}
</mat-grid-tile>
</mat-grid-list>
<div fxLayout="row" fxLayoutAlign="start center" class="mt-2">
<mat-form-field>
<input matInput placeholder="Change list height" [(ngModel)]="fitListHeight">
</mat-form-field>
<mat-form-field>
<input matInput placeholder="Change gutter" type="number" [(ngModel)]="ratioGutter">
</mat-form-field>
</div>-->
</mat-card-content>
</mat-tab>
</mat-tab-group> </mat-tab-group>
</mat-card> </mat-card>

6
ng6-seed/src/app/pd-triger/list-pd/list-pd.component.ts
View File

@ -1,6 +1,6 @@
import { Component, ViewChild, OnInit, ViewEncapsulation, EventEmitter, Output } from '@angular/core'; import { Component, ViewChild, OnInit, ViewEncapsulation, EventEmitter, Output } from '@angular/core';
import { MatPaginator, MatSort, MatTableDataSource, PageEvent } from '@angular/material';
import { PdTrigerService } from '../pd-service/pd-triger.service'; import { PdTrigerService } from '../pd-service/pd-triger.service';
import { MatPaginator, MatSort, MatTableDataSource, PageEvent } from '@angular/material';
@Component({ @Component({
selector: 'app-list-pd', selector: 'app-list-pd',
@ -109,9 +109,6 @@ export class ListPdComponent implements OnInit {
} }
}, error => this.errorMessage = <any> error); }, error => this.errorMessage = <any> error);
} }
ngAfterViewInit() {
this.dataSource.paginator = this.paginator;
}
addPdDetails(){ addPdDetails(){
this.showParentComponent=false this.showParentComponent=false
this.showEditComponent=false this.showEditComponent=false
@ -152,7 +149,6 @@ export class ListPdComponent implements OnInit {
this.pdListData = data.records; this.pdListData = data.records;
this.dataLength = data.records.length; this.dataLength = data.records.length;
this.dataSource.data = this.pdListData; this.dataSource.data = this.pdListData;
this.recordStatus=false;
} }
else{ else{

25
ng6-seed/src/app/pd-triger/pd-allocation/pd-allocation.component.spec.ts
View File

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

15
ng6-seed/src/app/pd-triger/pd-service/pd-triger.service.ts
View File

@ -20,8 +20,13 @@ export interface Master {
export class PdTrigerService { export class PdTrigerService {
<<<<<<< HEAD
//private apiUrl = "http://ssa.sineedge.com/sparqapi/api/"; //private apiUrl = "http://ssa.sineedge.com/sparqapi/api/";
private apiUrl = "http://192.168.0.5:9999/AWSEC2/sparqapi/api/"; private apiUrl = "http://192.168.0.5:9999/AWSEC2/sparqapi/api/";
=======
private apiUrl = "http://ssa.sineedge.com/sparqapi/api/";
//private apiUrl = "http://192.168.0.17:9999/AWSEC2/sparqapi/api/";
>>>>>>> 4133406fb5c648cd6dc4e0fd326d6301cf87939f
@ -113,6 +118,7 @@ export class PdTrigerService {
updatePdApplicant(editData:any):Observable<any>{ updatePdApplicant(editData:any):Observable<any>{
// editData.fk_updatedby = this._aws.getlocale(); // editData.fk_updatedby = this._aws.getlocale();
// editData.updatedon = currentdate; // editData.updatedon = currentdate;
console.log(editData)
return this._http.post<any>(this.apiUrl+"updatePDApplicants",{"pd_applicant_details":editData}) return this._http.post<any>(this.apiUrl+"updatePDApplicants",{"pd_applicant_details":editData})
.pipe( .pipe(
@ -120,6 +126,7 @@ export class PdTrigerService {
) )
} }
<<<<<<< HEAD
// get pd allocation to details // get pd allocation to details
getPdOfficerList(pdID:string): Observable<any> { getPdOfficerList(pdID:string): Observable<any> {
return this._http.post<any>(this.apiUrl+"getListPDOfficers",{"pdid":pdID}) return this._http.post<any>(this.apiUrl+"getListPDOfficers",{"pdid":pdID})
@ -142,4 +149,12 @@ export class PdTrigerService {
return of(result as T); return of(result as T);
}; };
} }
=======
private handleError<T>(operation = 'operation', result?: T) {
return (error: any): Observable<T> => {
return of(result as T);
};
}
>>>>>>> 4133406fb5c648cd6dc4e0fd326d6301cf87939f
} }

12
ng6-seed/src/app/pd-triger/pd-triger.module.ts
View File

@ -19,8 +19,6 @@ import { MatTooltipModule } from '@angular/material/tooltip';
import { NgxMatSelectSearchModule } from 'ngx-mat-select-search'; import { NgxMatSelectSearchModule } from 'ngx-mat-select-search';
import { NotifierModule, NotifierOptions } from 'angular-notifier'; import { NotifierModule, NotifierOptions } from 'angular-notifier';
import {MatDatepickerModule} from '@angular/material/datepicker';
import 'hammerjs'; import 'hammerjs';
import { PdTrigerRoutes } from './pd-triger-routing.module'; import { PdTrigerRoutes } from './pd-triger-routing.module';
@ -31,11 +29,10 @@ import { EditPdComponent } from './edit-pd/edit-pd.component';
import { ViewPdComponent } from './view-pd/view-pd.component'; import { ViewPdComponent } from './view-pd/view-pd.component';
import { EditPdMasterComponent } from './edit-pd-master/edit-pd-master.component'; import { EditPdMasterComponent } from './edit-pd-master/edit-pd-master.component';
import { EditPdApplicantComponent } from './edit-pd-applicant/edit-pd-applicant.component'; import { EditPdApplicantComponent } from './edit-pd-applicant/edit-pd-applicant.component';
import { PdAllocationComponent } from './pd-allocation/pd-allocation.component';
/** /**
* Custom angular notifier options * Custom angular notifier options
*/ */
const customNotifierOptions: NotifierOptions = { const pdCustomNotifierOptions: NotifierOptions = {
position: { position: {
horizontal: { horizontal: {
position: 'right', position: 'right',
@ -79,7 +76,7 @@ const customNotifierOptions: NotifierOptions = {
imports: [ imports: [
CommonModule, CommonModule,
RouterModule.forChild(PdTrigerRoutes), RouterModule.forChild(PdTrigerRoutes),
NotifierModule.withConfig(customNotifierOptions), NotifierModule.withConfig(pdCustomNotifierOptions),
MatCardModule, MatCardModule,
MatIconModule, MatIconModule,
MatInputModule, MatInputModule,
@ -97,10 +94,9 @@ const customNotifierOptions: NotifierOptions = {
FileUploadModule, FileUploadModule,
TreeModule, TreeModule,
MatDialogModule,MatSortModule, MatDialogModule,MatSortModule,
NgxMatSelectSearchModule,MatTooltipModule, MatDatepickerModule, NgxMatSelectSearchModule,MatTooltipModule,
], ],
declarations: [AddPdComponent, ListPdComponent, EditPdComponent, ViewPdComponent, EditPdMasterComponent, EditPdApplicantComponent, PdAllocationComponent], declarations: [AddPdComponent, ListPdComponent, EditPdComponent, ViewPdComponent, EditPdMasterComponent, EditPdApplicantComponent],
entryComponents: [PdAllocationComponent],
providers: [PdTrigerService] providers: [PdTrigerService]
}) })
export class PdTrigerModule { } export class PdTrigerModule { }

43
ng6-seed/src/app/pd-triger/view-pd/view-pd.component.html
View File

@ -1,13 +1,14 @@
<div class="row" style="text-align:left;"> <!-- <pre>{{pdMasterData | json}}</pre>
<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="loadPdListCompoent()"><mat-icon>close</mat-icon></button> <pre>{{pdApplicantData | json}}</pre>
<pre>{{pdDocumentsData | json}}</pre>
<pre>{{pdLogsData | json}}</pre> -->
<!-- pd master card -->
<div class="row" style="text-align:right;">
<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="loadPdListCompoent()"><mat-icon>close</mat-icon></button>
</div> </div>
<div *ngIf="!showEditMasterComponent"> <div *ngIf="!showEditMasterComponent">
<mat-card *ngFor="let master of pdMasterData"> <mat-card *ngFor="let master of pdMasterData">
<div class="cardEdit"> <div class="cardEdit">
<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="pdAllocationTo(master)"><mat-icon>directions_run</mat-icon></button>
<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button"><mat-icon>schedule</mat-icon></button>
<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="editPdMaster(master)"><mat-icon>edit</mat-icon></button> <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="editPdMaster(master)"><mat-icon>edit</mat-icon></button>
</div> </div>
<mat-card-header> <mat-card-header>
@ -17,7 +18,6 @@
<mat-card-subtitle class="hover-icon"><i class="fa-1x fa fa-map-marker"> </i> &nbsp;<span>{{master.city_name}} / {{master.state_name}}-{{master.pincode}}</span></mat-card-subtitle> <mat-card-subtitle class="hover-icon"><i class="fa-1x fa fa-map-marker"> </i> &nbsp;<span>{{master.city_name}} / {{master.state_name}}-{{master.pincode}}</span></mat-card-subtitle>
</mat-card-header> </mat-card-header>
<mat-divider></mat-divider>
<mat-card-content> <mat-card-content>
<p>{{master.product_name}} / {{master.subproduct_name}}</p> <p>{{master.product_name}} / {{master.subproduct_name}}</p>
<p><span>{{master.pd_type_name}}&nbsp;&nbsp;&nbsp;{{master.pd_allocation_type_name}} &nbsp;&nbsp;&nbsp;{{master.pd_allocated_to}}</span></p> <p><span>{{master.pd_type_name}}&nbsp;&nbsp;&nbsp;{{master.pd_allocation_type_name}} &nbsp;&nbsp;&nbsp;{{master.pd_allocated_to}}</span></p>
@ -40,7 +40,7 @@
<mat-card-header> <mat-card-header>
<mat-card-title>Applicants</mat-card-title> <mat-card-title>Applicants</mat-card-title>
</mat-card-header> </mat-card-header>
<mat-divider></mat-divider> <mat-card-content>
<mat-list *ngFor="let applicant of pdApplicantData"> <mat-list *ngFor="let applicant of pdApplicantData">
<mat-list-item> <mat-list-item>
<p><span *ngIf="applicant.applicant_name!=null" class="mb-2 text-center hover-icon"> <p><span *ngIf="applicant.applicant_name!=null" class="mb-2 text-center hover-icon">
@ -53,31 +53,31 @@
</mat-list-item> </mat-list-item>
</mat-list> </mat-list>
</mat-card-content>
</mat-card> </mat-card>
<app-edit-pd-applicant *ngIf="showEditApplicantComponent" [applicantChild]="editApplicantData" (loadPdView)="updateViewComponent($event)"></app-edit-pd-applicant> <app-edit-pd-applicant *ngIf="showEditApplicantComponent" [applicantChild]="editApplicantData" (loadPdView)="updateViewComponent($event)"></app-edit-pd-applicant>
<!-- pd documents details --> <!-- pd documents details -->
<mat-card> <mat-card>
<!-- <div class="cardEdit"> <div class="cardEdit">
<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon"><mat-icon>edit</mat-icon></button> <button mat-raised-button mat-button-sm mat-icon-button class="mr-1 mb-1 hover-icon"><mat-icon>edit</mat-icon></button>
</div> --> </div>
<mat-card-header> <mat-card-header>
<mat-card-title>Documents</mat-card-title> <mat-card-title>Documents</mat-card-title>
<!-- <mat-card-subtitle><i class="fa-1x fa fa-map-marker"> </i> &nbsp;{{master.city_name}} / {{master.state_name}}-{{master.pincode}}</mat-card-subtitle> --> <!-- <mat-card-subtitle><i class="fa-1x fa fa-map-marker"> </i> &nbsp;{{master.city_name}} / {{master.state_name}}-{{master.pincode}}</mat-card-subtitle> -->
</mat-card-header> </mat-card-header>
<mat-divider></mat-divider> <mat-card-content>
<mat-list *ngFor="let documents of pdDocumentsData"> <mat-list *ngFor="let documents of pdDocumentsData">
<mat-list-item> <mat-list-item>
<p><span>
{{documents.pd_document_title}} </span> &nbsp;&nbsp;&nbsp;<span class="mb-2 text-center hover-icon">
<i class="fa-1x fa fa-file"></i>
&nbsp;{{documents.pd_document_name}} </span>
</p>
</mat-list-item> </mat-list-item>
</mat-list> </mat-list>
</mat-card>
</mat-card-content>
</mat-card>
<!-- pd logs card --> <!-- pd logs card -->
<mat-card> <mat-card>
<mat-card-header> <mat-card-header>
@ -86,11 +86,4 @@
<mat-card-content> <mat-card-content>
</mat-card-content> </mat-card-content>
</mat-card> </mat-card>
<!-- <mat-form-field>
<input matInput [matDatepicker]="picker" placeholder="Choose a date">
<mat-datepicker-toggle matSuffix [for]="picker"></mat-datepicker-toggle>
<mat-datepicker #picker></mat-datepicker>
</mat-form-field> -->

2
ng6-seed/src/app/pd-triger/view-pd/view-pd.component.scss
View File

@ -1,3 +1,3 @@
.cardEdit { .cardEdit {
display: inline;float:right; display: inline;float:right;padding-top:3%;
} }

9
ng6-seed/src/app/pd-triger/view-pd/view-pd.component.ts
View File

@ -1,9 +1,8 @@
import { Component, OnInit,ViewEncapsulation, EventEmitter, Input, Output } from '@angular/core'; import { Component, OnInit,ViewEncapsulation, EventEmitter, Input, Output } from '@angular/core';
import { MatDialog } from '@angular/material';
import { FormBuilder, FormGroup, Validators, FormControl, FormArray } from '@angular/forms'; import { FormBuilder, FormGroup, Validators, FormControl, FormArray } from '@angular/forms';
import { CustomValidators } from 'ng2-validation';
import { NotifierService } from 'angular-notifier'; import { NotifierService } from 'angular-notifier';
import { PdTrigerService } from '../pd-service/pd-triger.service'; import { PdTrigerService } from '../pd-service/pd-triger.service';
import { PdAllocationComponent } from '../pd-allocation/pd-allocation.component';
@Component({ @Component({
selector: 'app-view-pd', selector: 'app-view-pd',
templateUrl: './view-pd.component.html', templateUrl: './view-pd.component.html',
@ -26,7 +25,7 @@ export class ViewPdComponent implements OnInit {
@Output() loadParent = new EventEmitter<string>(); @Output() loadParent = new EventEmitter<string>();
public _EditPDtriggerForm:FormGroup; public _EditPDtriggerForm:FormGroup;
constructor(private _fb: FormBuilder, constructor(private _fb: FormBuilder,
private _pd: PdTrigerService, notifier:NotifierService, private dialog: MatDialog,) { private _pd: PdTrigerService, notifier:NotifierService) {
this.notifier=notifier this.notifier=notifier
} }
@ -43,7 +42,6 @@ export class ViewPdComponent implements OnInit {
if (data.status == 200) { if (data.status == 200) {
this.pdMasterData=data.records.pd_master_details; this.pdMasterData=data.records.pd_master_details;
this.pdApplicantData= data.records.applicants_details; this.pdApplicantData= data.records.applicants_details;
this.pdDocumentsData=data.records.pd_documnets;
this.pdLogsData=data.records.pd_logs; this.pdLogsData=data.records.pd_logs;
} }
}, error => this.errorMessage = <any> error); }, error => this.errorMessage = <any> error);
@ -61,6 +59,7 @@ export class ViewPdComponent implements OnInit {
this.editApplicantData=applicantData; this.editApplicantData=applicantData;
this.showEditApplicantComponent=!this.showEditApplicantComponent; this.showEditApplicantComponent=!this.showEditApplicantComponent;
} }
<<<<<<< HEAD
// pd allocation to // pd allocation to
// edit questions master details popup model // edit questions master details popup model
pdAllocationTo(pdID:any) { pdAllocationTo(pdID:any) {
@ -75,6 +74,8 @@ export class ViewPdComponent implements OnInit {
this.viewPdDetails(this.childData) this.viewPdDetails(this.childData)
}); });
} }
=======
>>>>>>> 4133406fb5c648cd6dc4e0fd326d6301cf87939f
updateViewComponent(editBack:string) { updateViewComponent(editBack:string) {
if(editBack=='1'){ if(editBack=='1'){

44
ng6-seed/src/app/settings/entity/entity-add/entity.add.component.html
View File

@ -1,13 +1,14 @@
<div style="max-height: 580px;"> <div style="max-height: 580px;">
<form [formGroup]="_addQuesFrom" (submit)="onSubmit()">
<mat-card style="padding: 6px;"> <mat-card style="padding: 6px;">
<div class="ml-xs mr-xs" style="width: 100%;" fxLayout="row" fxLayoutAlign="center"> <div class="ml-xs mr-xs" style="width: 100%;" fxLayout="row" fxLayoutAlign="center">
<h2 mat-dialog-title style="width: 50%;">{{pageTitle}}</h2> <h2 mat-dialog-title style="width: 50%;">{{pageTitle}}</h2>
<div style="width: 20%;"></div> <div style="width: 20%;"></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 color="primary" class="mr-1 mb-1 hover-icon" matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button>
</div> </div>
</div> </div>
<form [formGroup]="_addQuesFrom" (submit)="onSubmit()">
<!--<div class="form-group">--> <!--<div class="form-group">-->
<div fxLayout="row wrap" fxLayoutGap="32px" fxLayoutAlign="flex-start"> <div fxLayout="row wrap" fxLayoutGap="32px" fxLayoutAlign="flex-start">
@ -17,8 +18,7 @@
</mat-select> </mat-select>
<mat-error *ngIf="submitted && f.fk_entity_type_id.hasError('required')" class="mat-text-warn">You must Select Entity Type.</mat-error> <mat-error *ngIf="submitted && f.fk_entity_type_id.hasError('required')" class="mat-text-warn">You must Select Entity Type.</mat-error>
</mat-form-field> </mat-form-field>
</div> </div>
<hr>
<div fxLayout="row wrap" fxLayoutGap="32px" fxLayoutAlign="flex-start"> <div fxLayout="row wrap" fxLayoutGap="32px" fxLayoutAlign="flex-start">
<mat-form-field fxFlex="0 1 auto" class="ml-xs"> <mat-form-field fxFlex="0 1 auto" class="ml-xs">
@ -65,8 +65,16 @@
<div fxLayout="row wrap" fxLayoutGap="32px" fxLayoutAlign="flex-start"> <div fxLayout="row wrap" fxLayoutGap="32px" fxLayoutAlign="flex-start">
<mat-form-field fxFlex="0 1 auto" class="ml-xs"> <mat-form-field fxFlex="0 1 auto" class="ml-xs">
<input matInput placeholder="Address" formControlName="addressline1"> <input matInput placeholder="Address 1" formControlName="addressline1">
<mat-error *ngIf="submitted && f.addressline1.hasError('required')" class="mat-text-warn">You must Include Address.</mat-error> <mat-error *ngIf="submitted && f.addressline1.hasError('required')" class="mat-text-warn">You must Include Address.</mat-error>
</mat-form-field>
<mat-form-field fxFlex="0 1 auto" class="ml-xs">
<input matInput placeholder="Address 2" formControlName="addressline2">
<!--<mat-error *ngIf="submitted && f.addressline2.hasError('required')" class="mat-text-warn">You must Include Address.</mat-error>-->
</mat-form-field>
<mat-form-field fxFlex="0 1 auto" class="ml-xs">
<input matInput placeholder="Address 3" formControlName="addressline3">
<!-- <mat-error *ngIf="submitted && f.addressline3.hasError('required')" class="mat-text-warn">You must Include Address.</mat-error>-->
</mat-form-field> </mat-form-field>
<mat-form-field fxFlex="0 1 auto" class="ml-xs"> <mat-form-field fxFlex="0 1 auto" class="ml-xs">
<input matInput placeholder="Pincode" formControlName="pincode"> <input matInput placeholder="Pincode" formControlName="pincode">
@ -82,8 +90,8 @@
</mat-form-field> </mat-form-field>
<mat-form-field fxFlex="0 1 auto" class="ml-xs"> <mat-form-field fxFlex="0 1 auto" class="ml-xs">
<input matInput placeholder="Alternet Email" formControlName="alt_email"> <input matInput placeholder="Alternate Email" formControlName="alt_email">
<mat-error *ngIf="submitted && f.alt_email.hasError('required')" class="mat-text-warn">You must Select Alternet Email.</mat-error> <!-- <mat-error *ngIf="submitted && f.alt_email.hasError('required')" class="mat-text-warn">You must Select Alternet Email.</mat-error>-->
</mat-form-field> </mat-form-field>
<mat-form-field fxFlex="0 1 auto" class="ml-xs"> <mat-form-field fxFlex="0 1 auto" class="ml-xs">
@ -93,7 +101,7 @@
<mat-form-field fxFlex="0 1 auto" class="ml-xs"> <mat-form-field fxFlex="0 1 auto" class="ml-xs">
<input matInput placeholder="Mobile Number" formControlName="mobile_no"> <input matInput placeholder="Mobile Number" formControlName="mobile_no">
<mat-error *ngIf="submitted && f.mobile_no.hasError('required')" class="mat-text-warn">You must Include Mobile Number.</mat-error> <!-- <mat-error *ngIf="submitted && f.mobile_no.hasError('required')" class="mat-text-warn">You must Include Mobile Number.</mat-error>-->
</mat-form-field> </mat-form-field>
</div> </div>
@ -103,10 +111,12 @@
<mat-error *ngIf="submitted && f.remarks.hasError('required')" class="mat-text-warn">You must Include Remarks.</mat-error> <mat-error *ngIf="submitted && f.remarks.hasError('required')" class="mat-text-warn">You must Include Remarks.</mat-error>
</mat-form-field> </mat-form-field>
</div> </div>
<hr> </mat-card>
<mat-card style="padding: 6px;">
<h2 mat-dialog-title style="width: 50%;">{{subTitle1}}</h2>
<div fxLayout="row wrap" fxLayoutGap="32px" fxLayoutAlign="flex-start"> <div fxLayout="row wrap" fxLayoutGap="32px" fxLayoutAlign="flex-start">
<mat-form-field fxFlex="0 1 auto" class="ml-xs"> <mat-form-field fxFlex="0 1 auto" class="ml-xs">
<input matInput placeholder="Pan Number" formControlName="pan"> <input matInput placeholder="PAN Number" formControlName="pan">
<mat-error *ngIf="submitted && f.pan.hasError('required')" class="mat-text-warn">You must Include Pan Number.</mat-error> <mat-error *ngIf="submitted && f.pan.hasError('required')" class="mat-text-warn">You must Include Pan Number.</mat-error>
</mat-form-field> </mat-form-field>
@ -124,14 +134,16 @@
<mat-error *ngIf="submitted && f.tat.hasError('required')" class="mat-text-warn">You must Include TAT.</mat-error> <mat-error *ngIf="submitted && f.tat.hasError('required')" class="mat-text-warn">You must Include TAT.</mat-error>
</mat-form-field> </mat-form-field>
</div> </div>
<hr> </mat-card>
<mat-card style="padding: 6px;">
<div fxLayout="row wrap" fxLayoutAlign="start none"> <div fxLayout="row wrap" fxLayoutAlign="start none">
<h2 mat-dialog-title style="width: 50%;">{{subTitle2}}</h2>
<div formArrayName="entity_child" class="example-full-width"> <div formArrayName="entity_child" class="example-full-width">
<div *ngFor="let answ of _addQuesFrom.controls.entity_child['controls']; let i=index"> <div *ngFor="let answ of _addQuesFrom.controls.entity_child['controls']; let i=index">
<div [formGroupName]="i"> <div [formGroupName]="i">
<div fxLayout="row wrap" style="width: 100%"> <div fxLayout="row wrap" style="width: 100%">
<div style="width: 90%"> <div style="width: 90%">
<div fxLayout="row wrap" fxLayoutGap="32px" fxLayoutAlign="flex-start"> <div fxLayout="row wrap" fxLayoutGap="32px" fxLayoutAlign="flex-start">
<mat-form-field fxFlex="0 1 auto" class="ml-xs"> <mat-form-field fxFlex="0 1 auto" class="ml-xs">
<input matInput placeholder="Contact Person" formControlName="contact_person"> <input matInput placeholder="Contact Person" formControlName="contact_person">
@ -157,8 +169,9 @@
</div> </div>
</div> </div>
</div> </div>
<button mat-button color="primary" matTooltip="Add More Answer" matTooltipPosition="above" (click)="addLanguage($event); false">Add More</button> <!-- <button mat-button color="primary" matTooltip="Add More Answer" matTooltipPosition="above" (click)="addLanguage($event); false">Add More</button>-->
</div> <button mat-fab class="mr-1 mb-1" color="primary" matTooltip="Add More Contact Person" matTooltipPosition="above" (click)="addLanguage($event); false"><mat-icon>add</mat-icon></button>
</div>
</div> </div>
<!--Error List Shown Here--> <!--Error List Shown Here-->
@ -172,8 +185,9 @@
<button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Save" matTooltipPosition="above" type="submit"><mat-icon>save</mat-icon></button> <button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Save" matTooltipPosition="above" type="submit"><mat-icon>save</mat-icon></button>
</div> </div>
<!--</div>--> <!--</div>-->
</mat-card>
</form> </form>
</mat-card>
</div> </div>

10
ng6-seed/src/app/settings/entity/entity-add/entity.add.component.ts
View File

@ -36,7 +36,9 @@ import { EntityService } from './../../service/entity/entity.service';
}) })
export class EntityAddComponent implements OnInit { export class EntityAddComponent implements OnInit {
public pageTitle: string = "Add Entity Master Details"; public pageTitle: string = "Entity";
public subTitle1: string = "Tax Info";
public subTitle2: string = "Contacts";
public _addQuesFrom: FormGroup; public _addQuesFrom: FormGroup;
public submitted = false; public submitted = false;
public categories: any = []; public categories: any = [];
@ -72,10 +74,8 @@ export class EntityAddComponent implements OnInit {
fk_branch: [null, Validators.compose([Validators.required])], fk_branch: [null, Validators.compose([Validators.required])],
addressline1: [null, Validators.compose([Validators.required])], addressline1: [null, Validators.compose([Validators.required])],
pincode: [null, Validators.compose([Validators.required])], pincode: [null, Validators.compose([Validators.required])],
official_email: [null, Validators.compose([Validators.required, Validators.email])], official_email: [null, Validators.compose([Validators.required, Validators.email])],
alt_email: [null, Validators.compose([Validators.required, Validators.email])], phone_number: [null, Validators.compose([Validators.required])],
phone_number: [null, Validators.compose([Validators.required])],
mobile_no: [null, Validators.compose([Validators.required])],
remarks: [null, Validators.compose([Validators.required])], remarks: [null, Validators.compose([Validators.required])],
pan: [null, Validators.compose([Validators.required])], pan: [null, Validators.compose([Validators.required])],
gst_no: [null, Validators.compose([Validators.required])], gst_no: [null, Validators.compose([Validators.required])],

42
ng6-seed/src/app/settings/entity/entity-edit/entity.edit.component.html
View File

@ -1,13 +1,14 @@
<div style="max-height: 580px;"> <div style="max-height: 580px;">
<form [formGroup]="_addQuesFrom" (submit)="onSubmit()">
<mat-card style="padding: 6px;"> <mat-card style="padding: 6px;">
<div class="ml-xs mr-xs" style="width: 100%;" fxLayout="row" fxLayoutAlign="center"> <div class="ml-xs mr-xs" style="width: 100%;" fxLayout="row" fxLayoutAlign="center">
<h2 mat-dialog-title style="width: 50%;">{{pageTitle}}</h2> <h2 mat-dialog-title style="width: 50%;">{{pageTitle}}</h2>
<div style="width: 20%;"></div> <div style="width: 20%;"></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 color="primary" class="mr-1 mb-1 hover-icon" matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button>
</div> </div>
</div> </div>
<form [formGroup]="_addQuesFrom" (submit)="onSubmit()">
<!--<div class="form-group">--> <!--<div class="form-group">-->
<div fxLayout="row wrap" fxLayoutGap="32px" fxLayoutAlign="flex-start" style="padding: 6px 4px;"> <div fxLayout="row wrap" fxLayoutGap="32px" fxLayoutAlign="flex-start" style="padding: 6px 4px;">
@ -17,8 +18,7 @@
</mat-select> </mat-select>
<mat-error *ngIf="submitted && f.fk_entity_type_id.hasError('required')" class="mat-text-warn">You must Select Entity Type.</mat-error> <mat-error *ngIf="submitted && f.fk_entity_type_id.hasError('required')" class="mat-text-warn">You must Select Entity Type.</mat-error>
</mat-form-field> </mat-form-field>
</div> </div>
<hr>
<div fxLayout="row wrap" fxLayoutGap="32px" fxLayoutAlign="flex-start" style="padding: 6px 4px;"> <div fxLayout="row wrap" fxLayoutGap="32px" fxLayoutAlign="flex-start" style="padding: 6px 4px;">
<mat-form-field fxFlex="0 1 auto" class="ml-xs"> <mat-form-field fxFlex="0 1 auto" class="ml-xs">
@ -65,8 +65,16 @@
<div fxLayout="row wrap" fxLayoutGap="32px" fxLayoutAlign="flex-start" style="padding: 6px 4px;"> <div fxLayout="row wrap" fxLayoutGap="32px" fxLayoutAlign="flex-start" style="padding: 6px 4px;">
<mat-form-field fxFlex="0 1 auto" class="ml-xs"> <mat-form-field fxFlex="0 1 auto" class="ml-xs">
<input matInput placeholder="Address" formControlName="addressline1"> <input matInput placeholder="Address 1" formControlName="addressline1">
<mat-error *ngIf="submitted && f.addressline1.hasError('required')" class="mat-text-warn">You must Include Address.</mat-error> <mat-error *ngIf="submitted && f.addressline1.hasError('required')" class="mat-text-warn">You must Include Address.</mat-error>
</mat-form-field>
<mat-form-field fxFlex="0 1 auto" class="ml-xs">
<input matInput placeholder="Address 2" formControlName="addressline2">
<!--<mat-error *ngIf="submitted && f.addressline2.hasError('required')" class="mat-text-warn">You must Include Address.</mat-error>-->
</mat-form-field>
<mat-form-field fxFlex="0 1 auto" class="ml-xs">
<input matInput placeholder="Address 3" formControlName="addressline3">
<!--<mat-error *ngIf="submitted && f.addressline3.hasError('required')" class="mat-text-warn">You must Include Address.</mat-error>-->
</mat-form-field> </mat-form-field>
<mat-form-field fxFlex="0 1 auto" class="ml-xs"> <mat-form-field fxFlex="0 1 auto" class="ml-xs">
<input matInput placeholder="Pincode" formControlName="pincode"> <input matInput placeholder="Pincode" formControlName="pincode">
@ -82,8 +90,8 @@
</mat-form-field> </mat-form-field>
<mat-form-field fxFlex="0 1 auto" class="ml-xs"> <mat-form-field fxFlex="0 1 auto" class="ml-xs">
<input matInput placeholder="Alternet Email" formControlName="alt_email"> <input matInput placeholder="Alternate Email" formControlName="alt_email">
<mat-error *ngIf="submitted && f.alt_email.hasError('required')" class="mat-text-warn">You must Select Alternet Email.</mat-error> <!-- <mat-error *ngIf="submitted && f.alt_email.hasError('required')" class="mat-text-warn">You must Select Alternet Email.</mat-error>-->
</mat-form-field> </mat-form-field>
<mat-form-field fxFlex="0 1 auto" class="ml-xs"> <mat-form-field fxFlex="0 1 auto" class="ml-xs">
@ -93,7 +101,7 @@
<mat-form-field fxFlex="0 1 auto" class="ml-xs"> <mat-form-field fxFlex="0 1 auto" class="ml-xs">
<input matInput placeholder="Mobile Number" formControlName="mobile_no"> <input matInput placeholder="Mobile Number" formControlName="mobile_no">
<mat-error *ngIf="submitted && f.mobile_no.hasError('required')" class="mat-text-warn">You must Include Mobile Number.</mat-error> <!-- <mat-error *ngIf="submitted && f.mobile_no.hasError('required')" class="mat-text-warn">You must Include Mobile Number.</mat-error>-->
</mat-form-field> </mat-form-field>
</div> </div>
@ -103,10 +111,12 @@
<mat-error *ngIf="submitted && f.remarks.hasError('required')" class="mat-text-warn">You must Include Remarks.</mat-error> <mat-error *ngIf="submitted && f.remarks.hasError('required')" class="mat-text-warn">You must Include Remarks.</mat-error>
</mat-form-field> </mat-form-field>
</div> </div>
<hr> </mat-card>
<mat-card style="padding: 6px;">
<h2 mat-dialog-title style="width: 50%;">{{subTitle1}}</h2>
<div fxLayout="row wrap" fxLayoutGap="32px" fxLayoutAlign="flex-start" style="padding: 6px 4px;"> <div fxLayout="row wrap" fxLayoutGap="32px" fxLayoutAlign="flex-start" style="padding: 6px 4px;">
<mat-form-field fxFlex="0 1 auto" class="ml-xs"> <mat-form-field fxFlex="0 1 auto" class="ml-xs">
<input matInput placeholder="Pan Number" formControlName="pan"> <input matInput placeholder="PAN Number" formControlName="pan">
<mat-error *ngIf="submitted && f.pan.hasError('required')" class="mat-text-warn">You must Include Pan Number.</mat-error> <mat-error *ngIf="submitted && f.pan.hasError('required')" class="mat-text-warn">You must Include Pan Number.</mat-error>
</mat-form-field> </mat-form-field>
@ -124,7 +134,10 @@
<mat-error *ngIf="submitted && f.tat.hasError('required')" class="mat-text-warn">You must Include TAT.</mat-error> <mat-error *ngIf="submitted && f.tat.hasError('required')" class="mat-text-warn">You must Include TAT.</mat-error>
</mat-form-field> </mat-form-field>
</div> </div>
<hr> </mat-card>
<mat-card style="padding: 6px;">
<h2 mat-dialog-title style="width: 50%;">{{subTitle2}}</h2>
<div fxLayout="row wrap" fxLayoutAlign="start none" style="padding: 6px 4px;"> <div fxLayout="row wrap" fxLayoutAlign="start none" style="padding: 6px 4px;">
<div formArrayName="entity_child" class="example-full-width"> <div formArrayName="entity_child" class="example-full-width">
<div *ngFor="let answ of _addQuesFrom.controls.entity_child['controls']; let i=index"> <div *ngFor="let answ of _addQuesFrom.controls.entity_child['controls']; let i=index">
@ -160,8 +173,8 @@
</div> </div>
</div> </div>
</div> </div>
<button mat-button color="primary" matTooltip="Add More" matTooltipPosition="above" (click)="addLanguage(null, null, null, null, null, $event); false">Add More</button> <button mat-fab class="mr-1 mb-1" color="primary" matTooltip="Add More Answer" matTooltipPosition="above" (click)="addLanguage(null, null, null, null, null, $event); false"><mat-icon>add</mat-icon></button>
</div> </div>
</div> </div>
<!--Error List Shown Here--> <!--Error List Shown Here-->
@ -175,6 +188,7 @@
(click)="onReset()"><mat-icon>settings_backup_restore</mat-icon></button><button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Save" matTooltipPosition="above" type="submit"><mat-icon>save</mat-icon></button> (click)="onReset()"><mat-icon>settings_backup_restore</mat-icon></button><button mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" matTooltip="Save" matTooltipPosition="above" type="submit"><mat-icon>save</mat-icon></button>
</div> </div>
<!--</div>--> <!--</div>-->
</form>
</mat-card> </mat-card>
</form>
</div> </div>

12
ng6-seed/src/app/settings/entity/entity-edit/entity.edit.component.ts
View File

@ -33,7 +33,9 @@ export class EntityEditComponent implements OnInit{
@Input() public childMessage: any; @Input() public childMessage: any;
public pageTitle: string = "Edit Entity Master Details"; public pageTitle: string = "Entity";
public subTitle1: string = "Tax Info";
public subTitle2: string = "Contacts";
public _addQuesFrom: FormGroup; public _addQuesFrom: FormGroup;
public submitted = false; public submitted = false;
public categories: any = []; public categories: any = [];
@ -95,12 +97,10 @@ public pageTitle: string = "Edit Entity Master Details";
fk_state: [this.childMessage.fk_state, Validators.compose([Validators.required])], fk_state: [this.childMessage.fk_state, Validators.compose([Validators.required])],
fk_city: [this.childMessage.fk_city, Validators.compose([Validators.required])], fk_city: [this.childMessage.fk_city, Validators.compose([Validators.required])],
fk_branch: [this.childMessage.fk_branch, Validators.compose([Validators.required])], fk_branch: [this.childMessage.fk_branch, Validators.compose([Validators.required])],
addressline1: [this.childMessage.addressline1, Validators.compose([Validators.required])], addressline1: [this.childMessage.addressline1, Validators.compose([Validators.required])],
pincode: [this.childMessage.pincode, Validators.compose([Validators.required])], pincode: [this.childMessage.pincode, Validators.compose([Validators.required])],
official_email: [this.childMessage.official_email, Validators.compose([Validators.required, Validators.email])], official_email: [this.childMessage.official_email, Validators.compose([Validators.required, Validators.email])],
alt_email: [this.childMessage.alt_email, Validators.compose([Validators.required, Validators.email])], phone_number: [this.childMessage.phone_number, Validators.compose([Validators.required])],
phone_number: [this.childMessage.phone_number, Validators.compose([Validators.required])],
mobile_no: [this.childMessage.mobile_no, Validators.compose([Validators.required])],
remarks: [this.childMessage.remarks, Validators.compose([Validators.required])], remarks: [this.childMessage.remarks, Validators.compose([Validators.required])],
pan: [this.childMessage.pan, Validators.compose([Validators.required])], pan: [this.childMessage.pan, Validators.compose([Validators.required])],
gst_no: [this.childMessage.gst_no, Validators.compose([Validators.required])], gst_no: [this.childMessage.gst_no, Validators.compose([Validators.required])],

21
ng6-seed/src/app/settings/entity/entity-list/entity.list.component.html
View File

@ -1,12 +1,13 @@
<div *ngIf="listView"> <div *ngIf="listView">
<mat-card> <mat-card>
<mat-card class="mat-elevation-z1">
<div style="margin: 6px; padding: 4px;"> <div style="margin: 6px; padding: 4px;">
<div class="p_title" style="font-size: 16px; font-style: bold;">Entity Master</div> <div class="p_title" style="font-size: 26px; font-style: bold;">Entity Master</div>
<div class="sub_title" style="font-size: 11px;">List of Entity Master Details</div> <!--<div class="sub_title" style="font-size: 11px;">List of Entity Master Details</div>-->
<hr>
</div> </div>
<div fxLayout="row" fxLayout.xs="column" fxLayoutWrap fxLayoutAlign="center none"> <div fxLayout="row" fxLayout.xs="column" fxLayoutWrap fxLayoutAlign="center none" >
<div fxFlex="80%"> <div fxFlex="80%">
<!--<form [formGroup]="filterFormGroupCtrl"> <!--<form [formGroup]="filterFormGroupCtrl">
<div fxLayout="row" fxLayout.xs="column" fxLayoutWrap fxLayoutGap="0.5px" fxLayoutAlign="start none" style="padding: 6px;"> <div fxLayout="row" fxLayout.xs="column" fxLayoutWrap fxLayoutGap="0.5px" fxLayoutAlign="start none" style="padding: 6px;">
@ -21,14 +22,14 @@
</div> </div>
<div fxFlex="20%"> <div fxFlex="20%">
<!--<a [routerLink]="['/'+'setting/entity/add' ]">--> <!--<a [routerLink]="['/'+'setting/entity/add' ]">-->
<button mat-stroked-button color="primary" (click)="addNewQuestion()"> <!--<button mat-stroked-button color="primary" (click)="addNewQuestion()">Add New Entity</button>-->
Add New Entity</button> <button mat-fab class="mr-1 mb-1" color="primary" (click)="addNewQuestion()"><mat-icon>add</mat-icon></button>
<!--</a>--> <!--</a>-->
</div> </div>
</div> </div>
<!--</mat-card-content>--> <!--</mat-card-content>-->
</mat-card>
<!-- <!--
<mat-card class="mat-elevation-z1"> <mat-card class="mat-elevation-z1">
<div style="margin: 6px; padding: 4px;"> <div style="margin: 6px; padding: 4px;">
@ -39,13 +40,13 @@
<ng-container *ngIf="enityList.length > 0"> <ng-container *ngIf="enityList.length > 0">
<div style="padding: 0 12px;"> <div style="padding: 0 12px;">
<mat-card class="product-card" *ngFor="let product of dataSource.connect() | async"> <mat-card class="product-card" *ngFor="let product of dataSource.connect() | async">
<div fxLayout="row" fxLayoutAlign="start start" style="padding: 6px 2px;"> <div fxLayout="row" fxLayoutAlign="start start">
<div fxFlex="90%" style="padding: 12px 8px;"> <div fxFlex="90%" style="padding-top: 10px;">
<div fxLayout="row wrap" fxLayoutGap="32px" fxLayoutAlign="flex-start"> <div fxLayout="row wrap" fxLayoutGap="32px" fxLayoutAlign="flex-start">
<div fxFlex="0 1 auto" class="ml-xs" fxFlex="10%"> <div fxFlex="0 1 auto" class="ml-xs" fxFlex="10%">
{{ product.entity_name }} {{ product.entity_name }}
</div> </div>
<div fxFlex="0 1 auto" class="ml-xs" fxFlex="30%"> <div fxFlex="0 1 auto" class="ml-xs" fxFlex="40%">
<div><b>{{ product.full_name }} ({{product.short_name}})</b></div> <div><b>{{ product.full_name }} ({{product.short_name}})</b></div>
<div> {{ product.branch_name }} </div> <div> {{ product.branch_name }} </div>
<div> {{product.city_name}}, {{product.state_name}} </div> <div> {{product.city_name}}, {{product.state_name}} </div>

35
ng6-seed/src/app/settings/masters/component/branch/branch-dialog/branch-dialog.component.html
View File

@ -1,21 +1,15 @@
<!-- <div class="mb-1">
<h2 mat-dialog-title>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;
<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>
</h2>
</div> -->
<div class="ml-xs mr-xs" style="width: 100%;" <div class="ml-xs mr-xs" style="width: 100%;"
fxLayout="row" fxLayout="row"
fxLayoutAlign="center"> 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 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>
</div> </div>
</div> </div>
<!-- {{empresas|json}} -->
<form [formGroup]="_branchForm" (submit)="onSubmit()"> <form [formGroup]="_branchForm" (submit)="onSubmit()">
<div class="form-group"> <div class="form-group">
<mat-dialog-content> <mat-dialog-content>
@ -35,38 +29,21 @@ fxLayoutAlign="center">
<div class="ml-xs mr-xs"> <div class="ml-xs mr-xs">
<mat-form-field> <mat-form-field>
<input matInput type="text" placeholder="Branch Name" required [formControl]="_branchForm.controls['name']"> <input matInput type="text" placeholder="Branch Name" required [formControl]="_branchForm.controls['name']">
<mat-error *ngIf="!_branchForm.controls['name'].valid && _branchForm.controls['name'].touched">You must inculde a Name</mat-error> <mat-error *ngIf="!_branchForm.controls['name'].valid && _branchForm.controls['name'].touched">You must inculde a Branch Name</mat-error>
</mat-form-field> </mat-form-field>
<!-- <small *ngIf="!_branchForm.controls['name'].valid && _branchForm.controls['name'].touched" class="mat-text-warn">You must include a Name.</small> --> <!-- <small *ngIf="!_branchForm.controls['name'].valid && _branchForm.controls['name'].touched" class="mat-text-warn">You must include a Name.</small> -->
</div> </div>
<!-- <div class="mb-1">
<mat-form-field style="width: 100%">
tate_id: "1", fk_region_id: "1", name: "TamilNadu", code: "TN", createdon: "2018-08-07 15:10:00", …}
1
:
{state_id: "2", fk_region_id: "0", name: "one edited", code:
<input matInput type="text" placeholder="City Name" required [formControl]="_branchForm.controls['fk_city_id']">
</mat-form-field>
<small *ngIf="!_branchForm.controls['fk_city_id'].valid && _branchForm.controls['fk_city_id'].touched" class="mat-text-warn">You must include a City Name.</small>
</div> -->
<br> <br>
<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 hover-icon" matTooltip="Reset" matTooltipPosition="above" type="button" (click)="onResetForEdit()" ><mat-icon>settings_backup_restore</mat-icon></button> <button mat-raised-button mat-icon-button class="mr-1 mb-1" matTooltip="Reset" matTooltipPosition="above" [color]="color" 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]="!_branchForm.valid"><mat-icon>save</mat-icon></button> <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-button >RESET</button> -->
</div> </div>
</mat-dialog-content> </mat-dialog-content>
</div> </div>
</form> </form>
<!--
-->

1
ng6-seed/src/app/settings/masters/component/branch/branch-dialog/branch-dialog.component.ts
View File

@ -27,6 +27,7 @@ export class BranchDialogComponent implements OnInit {
citydatas: City[]; citydatas: City[];
errorMessage:string; errorMessage:string;
color = 'primary';
constructor(private _formBuilder: FormBuilder, constructor(private _formBuilder: FormBuilder,
private dialogRef: MatDialogRef<BranchDialogComponent>, private dialogRef: MatDialogRef<BranchDialogComponent>,

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

@ -1,12 +1,16 @@
<mat-card-content> <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-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> -->
</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>
<br> --> <br> -->
<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">
<mat-form-field> <mat-form-field>
@ -106,4 +110,6 @@
</mat-card-content> </mat-card-content>
<!-- <p *ngIf="dataSource.length === 0">No records found</p> --> <!-- <p *ngIf="dataSource.length === 0">No records found</p> -->
<notifier-container></notifier-container>

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

@ -6,6 +6,7 @@
min-width: 300px; min-width: 300px;
} }
.example-header { .example-header {
min-height: 56px; min-height: 56px;
max-height: 56px; max-height: 56px;
@ -116,7 +117,6 @@
.example-margin { .example-margin {
margin: 10px; margin: 10px;
} }
.mat-table { .mat-table {
display: table; display: table;

9
ng6-seed/src/app/settings/masters/component/city/city-dialog/city-dialog.component.html
View File

@ -19,7 +19,8 @@ fxLayoutAlign="center">
<h2 mat-dialog-title style="width: 30%;"> City &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&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%;"> City &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&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 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>
</div> </div>
</div> </div>
@ -53,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 hover-icon" matTooltip="Reset" matTooltipPosition="above" type="reset" ><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" 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 hover-icon" matTooltip="Reset" matTooltipPosition="above" type="button" (click)="onResetForEdit()" ><mat-icon>settings_backup_restore</mat-icon></button> <button mat-raised-button mat-icon-button class="mr-1 mb-1" matTooltip="Reset" matTooltipPosition="above" type="button" (click)="onResetForEdit()" [color]="color"><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]="!_cityForm.valid"><mat-icon>save</mat-icon></button> <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-button >RESET</button> --> <!-- <button mat-button >RESET</button> -->
</div> </div>

1
ng6-seed/src/app/settings/masters/component/city/city-dialog/city-dialog.component.ts
View File

@ -25,6 +25,7 @@ export class CityDialogComponent implements OnInit {
stateDatas: any[]; stateDatas: any[];
errorMessage:string; errorMessage:string;
color = 'primary';
constructor(private _formBuilder: FormBuilder, constructor(private _formBuilder: FormBuilder,
private dialogRef: MatDialogRef<CityDialogComponent>, private dialogRef: MatDialogRef<CityDialogComponent>,

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

@ -1,12 +1,8 @@
<mat-card-content>
<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>
</div> </div>
<br>
<div *ngIf="loader">
<mat-progress-bar mode="indeterminate" [color]="color" class="mb-1"></mat-progress-bar>
</div>
<br>
<!-- 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">
<table> <table>
@ -72,7 +68,7 @@
</div> </div>
<br>--> <br>-->
<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>

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

@ -18,7 +18,8 @@ fxLayout="row"
fxLayoutAlign="center"> 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>
</div> </div>
</div> </div>
@ -38,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 hover-icon" matTooltip="Reset" matTooltipPosition="above" type="reset" ><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" 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 hover-icon" matTooltip="Reset" matTooltipPosition="above" type="button" (click)="onResetForEdit()" ><mat-icon>settings_backup_restore</mat-icon></button> <button mat-raised-button mat-icon-button class="mr-1 mb-1" matTooltip="Reset" matTooltipPosition="above" type="button" (click)="onResetForEdit()" [color]="color" ><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]="!_CommentOnLocalityForm.valid"><mat-icon>save</mat-icon></button> <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-button >RESET</button> --> <!-- <button mat-button >RESET</button> -->
</div> </div>

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

@ -21,7 +21,7 @@ import { MastersService } from '../../../../service/masters/masters.service';
styleUrls: ['./comments-on-locality-dialog.component.scss'] styleUrls: ['./comments-on-locality-dialog.component.scss']
}) })
export class CommentsOnLocalityDialogComponent implements OnInit { export class CommentsOnLocalityDialogComponent implements OnInit {
color = 'primary';
public _CommentOnLocalityForm: FormGroup; public _CommentOnLocalityForm: FormGroup;

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

@ -1,8 +1,9 @@
<mat-card-content>
<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>
</div> </div>
<br> <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>

9
ng6-seed/src/app/settings/masters/component/customer-behaviour/customer-behaviour-dialog/customer-behaviour-dialog.component.html
View File

@ -18,7 +18,8 @@ fxLayout="row"
fxLayoutAlign="center"> 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>
</div> </div>
</div> </div>
@ -42,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 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>
<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()" ><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()" [color]="color"><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"><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" [color]="color"><mat-icon>save</mat-icon></button>
<!-- <button mat-button >RESET</button> --> <!-- <button mat-button >RESET</button> -->
</div> </div>

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

@ -19,7 +19,7 @@ import { MastersService } from '../../../../service/masters/masters.service';
styleUrls: ['./customer-behaviour-dialog.component.scss'] styleUrls: ['./customer-behaviour-dialog.component.scss']
}) })
export class CustomerBehaviourDialogComponent implements OnInit { export class CustomerBehaviourDialogComponent implements OnInit {
color = 'primary';
public _customerBehaviourForm: FormGroup; public _customerBehaviourForm: FormGroup;
constructor(private _formBuilder: FormBuilder, constructor(private _formBuilder: FormBuilder,

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

@ -1,8 +1,10 @@
<mat-card-content>
<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>
</div> </div>
<br> <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>

3
ng6-seed/src/app/settings/masters/component/customer-segment/customer-segment-dialog/customer-segment-dialog.component.html
View File

@ -18,7 +18,8 @@ fxLayout="row"
fxLayoutAlign="center"> 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>
</div> </div>
</div> </div>

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

@ -19,7 +19,7 @@ import { MastersService } from '../../../../service/masters/masters.service';
styleUrls: ['./customer-segment-dialog.component.scss'] styleUrls: ['./customer-segment-dialog.component.scss']
}) })
export class CustomerSegmentDialogComponent implements OnInit { export class CustomerSegmentDialogComponent implements OnInit {
color = 'primary';
public _customerSegmentForm: FormGroup; public _customerSegmentForm: FormGroup;
constructor(private _formBuilder: FormBuilder, constructor(private _formBuilder: FormBuilder,

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

@ -1,8 +1,9 @@
<mat-card-content>
<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>
<br> <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>

3
ng6-seed/src/app/settings/masters/component/designation/designation-dialog/designation-dialog.component.html
View File

@ -19,7 +19,8 @@ fxLayoutAlign="center">
<h2 mat-dialog-title style="width: 30%;"> Designation &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&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%;"> Designation &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&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 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>
</div> </div>
</div> </div>

1
ng6-seed/src/app/settings/masters/component/designation/designation-dialog/designation-dialog.component.ts
View File

@ -21,6 +21,7 @@ import { MastersService } from '../../../../service/masters/masters.service';
export class DesignationDialogComponent implements OnInit { export class DesignationDialogComponent implements OnInit {
public _designationForm: FormGroup; public _designationForm: FormGroup;
color="primary";
constructor(private _formBuilder: FormBuilder, constructor(private _formBuilder: FormBuilder,
private dialogRef: MatDialogRef<DesignationDialogComponent>, private dialogRef: MatDialogRef<DesignationDialogComponent>,

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

@ -1,6 +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)="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>
</div> </div>
<br> <br>
<!-- <div *ngIf="loader"> <!-- <div *ngIf="loader">

9
ng6-seed/src/app/settings/masters/component/frequency/frequency-dialog/frequency-dialog.component.html
View File

@ -19,7 +19,8 @@ fxLayoutAlign="center">
<h2 mat-dialog-title style="width: 30%;">Frequency &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&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%;">Frequency &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&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 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>
</div> </div>
</div> </div>
@ -40,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 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>
<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()" ><mat-icon>settings_backup_restore</mat-icon></button> <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>
</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]="!_frequencyForm.valid"><mat-icon>save</mat-icon></button> <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>
</div> </div>
</mat-dialog-content> </mat-dialog-content>

1
ng6-seed/src/app/settings/masters/component/frequency/frequency-dialog/frequency-dialog.component.ts
View File

@ -21,6 +21,7 @@ export class FrequencyDialogComponent implements OnInit {
public _frequencyForm: FormGroup; public _frequencyForm: FormGroup;
color = 'primary';
constructor(private _formBuilder: FormBuilder, constructor(private _formBuilder: FormBuilder,
private dialogRef: MatDialogRef<FrequencyDialogComponent>, private dialogRef: MatDialogRef<FrequencyDialogComponent>,

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

@ -1,8 +1,9 @@
<mat-card-content>
<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>
</div> </div>
<br> <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>

14
ng6-seed/src/app/settings/masters/component/industry_classification/industry_classification-dialog/industry_classification-dialog.component.html
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 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" [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 hover-icon" 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" [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 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" color='warn' 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 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" [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" 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>
<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()" ><mat-icon>settings_backup_restore</mat-icon></button> <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>
</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]="!_IndustryClassificationForm.valid"><mat-icon>save</mat-icon></button> <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>
</div> </div>

1
ng6-seed/src/app/settings/masters/component/industry_classification/industry_classification-dialog/industry_classification-dialog.component.ts
View File

@ -20,6 +20,7 @@ import { MastersService } from '../../../../service/masters/masters.service';
}) })
export class IndustryClassificationDialogComponent implements OnInit { export class IndustryClassificationDialogComponent implements OnInit {
color = 'primary';
public _IndustryClassificationForm: FormGroup; public _IndustryClassificationForm: FormGroup;
constructor(private _formBuilder: FormBuilder, constructor(private _formBuilder: FormBuilder,

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

@ -1,8 +1,9 @@
<mat-card-content>
<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>
<br> <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> -->

14
ng6-seed/src/app/settings/masters/component/lender-hierarchy/lender-hierarchy-dialog/lender-hierarchy-dialog.component.html
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 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" [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 hover-icon" 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" [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 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" color='warn' 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 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" [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" 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>
<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()" ><mat-icon>settings_backup_restore</mat-icon></button> <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>
</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]="!_lenderHierarchyForm.valid"><mat-icon>save</mat-icon></button> <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>
</div> </div>
</mat-dialog-content> </mat-dialog-content>

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

@ -17,7 +17,7 @@ import { MastersService } from '../../../../service/masters/masters.service';
styleUrls: ['./lender-hierarchy-dialog.component.scss'] styleUrls: ['./lender-hierarchy-dialog.component.scss']
}) })
export class LenderHierarchyDialogComponent implements OnInit { export class LenderHierarchyDialogComponent implements OnInit {
color = 'primary';
public _lenderHierarchyForm: FormGroup; public _lenderHierarchyForm: FormGroup;
constructor(private _formBuilder: FormBuilder, constructor(private _formBuilder: FormBuilder,

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

@ -1,8 +1,10 @@
<mat-card-content>
<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>
<br> <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> -->

14
ng6-seed/src/app/settings/masters/component/members-occupation/members-occupation-dialog/members-occupation-dialog.component.html
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 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" [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 hover-icon" 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" [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 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" color='warn' 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 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" [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" 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>
<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()" ><mat-icon>settings_backup_restore</mat-icon></button> <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>
</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]="!_occupationForm.valid"><mat-icon>save</mat-icon></button> <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-button >RESET</button> --> <!-- <button mat-button >RESET</button> -->
</div> </div>

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

@ -18,7 +18,7 @@ import { MastersService } from '../../../../service/masters/masters.service';
}) })
export class MembersOccupationDialogComponent implements OnInit { export class MembersOccupationDialogComponent implements OnInit {
color = 'primary';
public _occupationForm: FormGroup; public _occupationForm: FormGroup;
constructor(private _formBuilder: FormBuilder, constructor(private _formBuilder: FormBuilder,

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

@ -1,8 +1,9 @@
<mat-card-content>
<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>
<br> <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> -->

14
ng6-seed/src/app/settings/masters/component/pd-location-approach/pd-location-approach-dialog/pd-location-approach-dialog.component.html
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 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" [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 hover-icon" 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" [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 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" color='warn' 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 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" [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> <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>
<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()" ><mat-icon>settings_backup_restore</mat-icon></button> <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>
</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]="!_pdLocationApproachForm.valid"><mat-icon>save</mat-icon></button> <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-button >RESET</button> --> <!-- <button mat-button >RESET</button> -->
</div> </div>

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

@ -17,7 +17,7 @@ import { MastersService } from '../../../../service/masters/masters.service';
styleUrls: ['./pd-location-approach-dialog.component.scss'] styleUrls: ['./pd-location-approach-dialog.component.scss']
}) })
export class PdLocationApproachDialogComponent implements OnInit { export class PdLocationApproachDialogComponent implements OnInit {
color = 'primary';
public _pdLocationApproachForm: FormGroup; public _pdLocationApproachForm: FormGroup;
constructor(private _formBuilder: FormBuilder, constructor(private _formBuilder: FormBuilder,

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

@ -1,8 +1,9 @@
<mat-card-content>
<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>
<br> <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> -->

12
ng6-seed/src/app/settings/masters/component/pd-team/pd-team-dialog/pd-team-dialog.component.html
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 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" color='warn' 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 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" [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" 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="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 hover-icon" 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" [color]='color' 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 hover-icon" matTooltip="Reset" matTooltipPosition="above" type="button" (click)="onResetForEdit()" ><mat-icon>settings_backup_restore</mat-icon></button> <button mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' 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]="!_pdTeamForm.valid"><mat-icon>save</mat-icon></button> <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>
</div> </div>
</mat-dialog-content> </mat-dialog-content>

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

@ -22,6 +22,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;
color = 'primary';
citydatas: any[]; citydatas: any[];
lenderdatas: any[]; lenderdatas: any[];
errorMessage:string; errorMessage:string;
@ -261,6 +262,7 @@ Object.keys(pdTeamFormValues).forEach(
//this._memberService.addMasterDetails(OccupationFormValues,'OCCUPATIONMEMBERS').subscribe( //this._memberService.addMasterDetails(OccupationFormValues,'OCCUPATIONMEMBERS').subscribe(
this._pdTeamService.addPdTeamDetail(pdTeamFormValues).subscribe( this._pdTeamService.addPdTeamDetail(pdTeamFormValues).subscribe(
dataresult=>{ dataresult=>{
console.log(dataresult);
if (dataresult.dataStatus == true){ if (dataresult.dataStatus == true){
//After Saving the data then popup close //After Saving the data then popup close
this.dialogRef.close(); this.dialogRef.close();

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

@ -1,8 +1,9 @@
<mat-card-content>
<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>
<br> <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> -->

14
ng6-seed/src/app/settings/masters/component/pd-type/pd-type-dialog/pd-type-dialog.component.html
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 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" [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 hover-icon" 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" [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 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" color='warn' 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 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" [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> <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>
<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()" ><mat-icon>settings_backup_restore</mat-icon></button> <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>
</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]="!_pdTypeForm.valid"><mat-icon>save</mat-icon></button> <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-button >RESET</button> --> <!-- <button mat-button >RESET</button> -->
</div> </div>

1
ng6-seed/src/app/settings/masters/component/pd-type/pd-type-dialog/pd-type-dialog.component.ts
View File

@ -19,6 +19,7 @@ import { MastersService } from '../../../../service/masters/masters.service';
export class PdTypeDialogComponent implements OnInit { export class PdTypeDialogComponent implements OnInit {
public _pdTypeForm: FormGroup; public _pdTypeForm: FormGroup;
color = 'primary';
constructor(private _formBuilder: FormBuilder, constructor(private _formBuilder: FormBuilder,
private dialogRef: MatDialogRef<PdTypeDialogComponent>, private dialogRef: MatDialogRef<PdTypeDialogComponent>,

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

@ -1,8 +1,9 @@
<mat-card-content>
<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>
<br> <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> -->

14
ng6-seed/src/app/settings/masters/component/product/product-dialog/product-dialog.component.html
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 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" [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 hover-icon" 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" [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 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" color='warn' 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 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" [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" 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>
<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()" ><mat-icon>settings_backup_restore</mat-icon></button> <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>
</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]="!_productMasterForm.valid"><mat-icon>save</mat-icon></button> <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>
</div> </div>
</mat-dialog-content> </mat-dialog-content>

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

@ -20,7 +20,7 @@ import { MastersService } from '../../../../service/masters/masters.service';
export class ProductDialogComponent implements OnInit { export class ProductDialogComponent implements OnInit {
public _productMasterForm: FormGroup; public _productMasterForm: FormGroup;
color = 'primary';
constructor(private _formBuilder: FormBuilder, constructor(private _formBuilder: FormBuilder,
private dialogRef: MatDialogRef<ProductDialogComponent>, private dialogRef: MatDialogRef<ProductDialogComponent>,
private _MastersService: MastersService, private _MastersService: MastersService,

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

@ -1,8 +1,9 @@
<mat-card-content>
<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>
<br> <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>

8
ng6-seed/src/app/settings/masters/component/question-category/question-category-dialog/question-category-dialog.component.html
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 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" color='warn' 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 hover-icon" 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" [color]='color' 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 hover-icon" 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" [color]='color' 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 hover-icon" 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" [color]='color' matTooltip="Save" matTooltipPosition="above" type="submit" [disabled]="!_questionCategoryForm.valid"><mat-icon>save</mat-icon></button>
</div> </div>
</mat-dialog-content> </mat-dialog-content>

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

@ -19,7 +19,7 @@ import { FormBuilder,
export class QuestionCategoryDialogComponent implements OnInit { export class QuestionCategoryDialogComponent implements OnInit {
public _questionCategoryForm: FormGroup; public _questionCategoryForm: FormGroup;
color = 'primary';
constructor(private _formBuilder: FormBuilder, constructor(private _formBuilder: FormBuilder,
private dialogRef: MatDialogRef<QuestionCategoryDialogComponent>, private dialogRef: MatDialogRef<QuestionCategoryDialogComponent>,
private _MastersService: MastersService, private _MastersService: MastersService,

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

@ -1,8 +1,9 @@
<mat-card-content>
<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>
<br> <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>

14
ng6-seed/src/app/settings/masters/component/regions/regions-dialog/regions-dialog.component.html
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 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" [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 hover-icon" 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" [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 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" color='warn' 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 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" [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> <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>
<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()" ><mat-icon>settings_backup_restore</mat-icon></button> <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>
</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]="!_regionsForm.valid"><mat-icon>save</mat-icon></button> <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-button >RESET</button> --> <!-- <button mat-button >RESET</button> -->
</div> </div>

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

@ -20,7 +20,7 @@ import { MastersService } from '../../../../service/masters/masters.service';
export class RegionsDialogComponent implements OnInit { export class RegionsDialogComponent implements OnInit {
public _regionsForm: FormGroup; public _regionsForm: FormGroup;
color = 'primary';
constructor(private _formBuilder: FormBuilder, constructor(private _formBuilder: FormBuilder,
private dialogRef: MatDialogRef<RegionsDialogComponent>, private dialogRef: MatDialogRef<RegionsDialogComponent>,
private _regionsService: MastersService, private _regionsService: MastersService,

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

@ -1,8 +1,9 @@
<mat-card-content>
<div style="text-align: right;"> <div style="text-align: right;">
<button mat-stroked-button [color]="color" (click)="addregions()" > + 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>
<br> <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>

14
ng6-seed/src/app/settings/masters/component/relation-ship/relation-ship-dialog/relation-ship-dialog.component.html
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 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" [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 hover-icon" 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" [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 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" color='warn' 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 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" [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" 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>
<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()" ><mat-icon>settings_backup_restore</mat-icon></button> <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>
</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]="!_relationShipForm.valid"><mat-icon>save</mat-icon></button> <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-button >RESET</button> --> <!-- <button mat-button >RESET</button> -->
</div> </div>

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

@ -22,7 +22,7 @@ export class RelationShipDialogComponent implements OnInit {
public _relationShipForm: FormGroup; public _relationShipForm: FormGroup;
color = 'primary';
constructor(private _formBuilder: FormBuilder, constructor(private _formBuilder: FormBuilder,
private dialogRef: MatDialogRef< RelationShipDialogComponent>, private dialogRef: MatDialogRef< RelationShipDialogComponent>,
private _MastersService: MastersService, private _MastersService: MastersService,

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

@ -1,6 +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)="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">

14
ng6-seed/src/app/settings/masters/component/states/states-dialog/states-dialog.component.html
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 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" [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 hover-icon" 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" [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 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" color='warn' 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 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" [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" 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>
<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()" ><mat-icon>settings_backup_restore</mat-icon></button> <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>
</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]="!_statesForm.valid"><mat-icon>save</mat-icon></button> <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-button >RESET</button> --> <!-- <button mat-button >RESET</button> -->
</div> </div>

1
ng6-seed/src/app/settings/masters/component/states/states-dialog/states-dialog.component.ts
View File

@ -20,6 +20,7 @@ import { States } from '../../../model/states';
export class StatesDialogComponent implements OnInit { export class StatesDialogComponent implements OnInit {
public _statesForm: FormGroup; public _statesForm: FormGroup;
color = 'primary';
regionDatas : any[]; regionDatas : any[];
foundBooks: any; foundBooks: any;
errorMessage:string; errorMessage:string;

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

@ -1,6 +1,7 @@
<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">

14
ng6-seed/src/app/settings/masters/component/sub-product/sub-product-dialog/sub-product-dialog.component.html
View File

@ -1,7 +1,7 @@
<!-- <div class="ml-xs mr-xs"> <!-- <div class="ml-xs mr-xs">
<h2> 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;&nbsp;&nbsp; <h2> 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;&nbsp;&nbsp;
<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 " [color]='color' matTooltip="Close" matTooltipPosition="above" (click)="onNoClick()"><mat-icon>close</mat-icon></button>
</h2> </h2>
</div> </div>
<div class="container" <div class="container"
@ -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 hover-icon" 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" [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 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" color='warn' 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 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" [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> <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>
<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()" ><mat-icon>settings_backup_restore</mat-icon></button> <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>
</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]="!_subProductMasterForm.valid"><mat-icon>save</mat-icon></button> <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>
</div> </div>
</mat-dialog-content> </mat-dialog-content>

1
ng6-seed/src/app/settings/masters/component/sub-product/sub-product-dialog/sub-product-dialog.component.ts
View File

@ -24,6 +24,7 @@ export class SubProductDialogComponent implements OnInit {
public _subProductMasterForm: FormGroup; public _subProductMasterForm: FormGroup;
productDatas : any[]; productDatas : any[];
errorMessage:string; errorMessage:string;
color = 'primary';
constructor(private _formBuilder: FormBuilder, constructor(private _formBuilder: FormBuilder,
private dialogRef: MatDialogRef<SubProductDialogComponent>, private dialogRef: MatDialogRef<SubProductDialogComponent>,

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

@ -1,6 +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">

12
ng6-seed/src/app/settings/masters/component/title/title-dialog/title-dialog.component.html
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 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" [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 hover-icon" 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" [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 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" color='warn' 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 hover-icon" 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" [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 hover-icon" matTooltip="Reset" matTooltipPosition="above" type="button" (click)="onResetForEdit()" ><mat-icon>settings_backup_restore</mat-icon></button> <button mat-raised-button mat-icon-button class="mr-1 mb-1" [color]='color' 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]="!_titleForm.valid"><mat-icon>save</mat-icon></button> <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-button >RESET</button> --> <!-- <button mat-button >RESET</button> -->
</div> </div>

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

@ -22,7 +22,7 @@ export class TitleDialogComponent implements OnInit {
public _titleForm: FormGroup; public _titleForm: FormGroup;
color = 'primary';
constructor(private _formBuilder: FormBuilder, constructor(private _formBuilder: FormBuilder,
private dialogRef: MatDialogRef<TitleDialogComponent>, private dialogRef: MatDialogRef<TitleDialogComponent>,
private _MastersService: MastersService, private _MastersService: MastersService,

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

@ -1,8 +1,9 @@
<mat-card-content>
<div style="text-align: right;"> <div style="text-align: right;">
<button mat-stroked-button [color]="color" (click)="addTitle()" > + Add Title</button> <!-- <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> </div>
<br> <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>

14
ng6-seed/src/app/settings/masters/component/type-of-activity/activity-dialog/activity-dialog.component.html
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 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" [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 hover-icon" 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" [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 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" color="warn" 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 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" [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> <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>
<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()" ><mat-icon>settings_backup_restore</mat-icon></button> <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>
</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]="!_activityMasterForm.valid"><mat-icon>save</mat-icon></button> <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-button >RESET</button> --> <!-- <button mat-button >RESET</button> -->
</div> </div>

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

@ -22,7 +22,7 @@ import { MastersService } from '../../../../service/masters/masters.service';
export class ActivityDialogComponent implements OnInit { export class ActivityDialogComponent implements OnInit {
public _activityMasterForm: FormGroup; public _activityMasterForm: FormGroup;
color = 'primary';
constructor(private _formBuilder: FormBuilder, constructor(private _formBuilder: FormBuilder,
private dialogRef: MatDialogRef<ActivityDialogComponent>, private dialogRef: MatDialogRef<ActivityDialogComponent>,
private _MastersService: MastersService, private _MastersService: MastersService,

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

@ -1,8 +1,9 @@
<mat-card-content>
<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>
<br> <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>

8
ng6-seed/src/app/settings/masters/component/uom/uom-dialog/uom-dialog.component.html
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 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" [color]="warn" 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 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>
<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()" ><mat-icon>settings_backup_restore</mat-icon></button> <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>
</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]="!_uomForm.valid"><mat-icon>save</mat-icon></button> <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-button >RESET</button> --> <!-- <button mat-button >RESET</button> -->
</div> </div>

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

@ -22,7 +22,7 @@ export class UomDialogComponent implements OnInit {
public _uomForm: FormGroup; public _uomForm: FormGroup;
color = 'primary';
constructor(private _formBuilder: FormBuilder, constructor(private _formBuilder: FormBuilder,
private dialogRef: MatDialogRef<UomDialogComponent>, private dialogRef: MatDialogRef<UomDialogComponent>,
private _mastersService: MastersService, private _mastersService: MastersService,

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

@ -1,8 +1,9 @@
<mat-card-content>
<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>
</div> </div>
<br> <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>

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

@ -1,31 +1,21 @@
<mat-card> <mat-card>
<mat-card-title><span> Masters </span></mat-card-title> <div fxLayout="row" fxLayoutAlign="start center" class="mb-1">
<mat-card-subtitle> Pick up for Master</mat-card-subtitle>
<mat-card-content>
<div fxLayout="row" fxLayoutAlign="start center" class="mb-2">
<div class="ml-xs mr-xs" style="width: 30%;"> <div class="ml-xs mr-xs" style="width: 30%;">
<mat-card-title><span> Masters </span></mat-card-title>
</div> </div>
<div class="ml-xs mr-xs" style="width: 30%;"> <div class="ml-xs mr-xs" style="width: 30%;">
<br>
<mat-form-field> <mat-form-field>
<mat-select color="accent" placeholder="Select" #singleSelect required [formControl]="masterCtrl"> <mat-select color="accent" placeholder="Select" #singleSelect required [formControl]="masterCtrl">
<ngx-mat-select-search [formControl]="masterFilterCtrl" ></ngx-mat-select-search> <ngx-mat-select-search [formControl]="masterFilterCtrl" ></ngx-mat-select-search>
<mat-option *ngFor="let master of filteredMasters | async" [value]="master.id"> <mat-option *ngFor="let master of filteredMasters | async" [value]="master.id">
{{master.name}} {{master.name}}
</mat-option> </mat-option>
</mat-select> <mat-error *ngIf="masterCtrl.value ==''" class="mat-text-warn">You must Pickup Master Name.</mat-error>
</mat-select>
</mat-form-field> </mat-form-field>
</div> </div>
</div> </div>
</mat-card-content>
<hr>
<div *ngIf="masterCtrl.value =='master-1'" > <div *ngIf="masterCtrl.value =='master-1'" >
<app-industry_classification-list></app-industry_classification-list> <app-industry_classification-list></app-industry_classification-list>
</div> </div>

5
ng6-seed/src/app/settings/masters/masters.component.scss
View File

@ -1,3 +1,6 @@
mat-form-field{ mat-form-field{
width:100%; width:100%;
} }
.mat-card-title{
font-size: 25px !important;
}

45
ng6-seed/src/app/settings/masters/masters.module.ts
View File

@ -23,6 +23,7 @@ import { FileUploadModule } from 'ng2-file-upload/ng2-file-upload';
import { NgxMatSelectSearchModule } from 'ngx-mat-select-search'; import { NgxMatSelectSearchModule } from 'ngx-mat-select-search';
import { NgxDatatableModule } from '@swimlane/ngx-datatable'; import { NgxDatatableModule } from '@swimlane/ngx-datatable';
import { NotifierModule, NotifierOptions } from 'angular-notifier';
import { FlexLayoutModule } from '@angular/flex-layout'; import { FlexLayoutModule } from '@angular/flex-layout';
import 'hammerjs'; import 'hammerjs';
@ -91,6 +92,49 @@ import { MastersRoutes } from './masters.routing';
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';
/**
* Custom angular notifier options
*/
const customNotifierOptions: NotifierOptions = {
position: {
horizontal: {
position: 'right',
distance: 12
},
vertical: {
position: 'top',
distance: 32,
gap: 10
}
},
theme: 'material',
behaviour: {
autoHide: 5000,
onClick: 'hide',
onMouseover: 'pauseAutoHide',
showDismissButton: true,
stacking: 4
},
animations: {
enabled: true,
show: {
preset: 'slide',
speed: 300,
easing: 'ease'
},
hide: {
preset: 'fade',
speed: 300,
easing: 'ease',
offset: 50
},
shift: {
speed: 300,
easing: 'ease'
},
overlap: 150
}
};
@NgModule({ @NgModule({
imports: [ imports: [
@ -116,6 +160,7 @@ import { PdTeamService } from '../service/masters/pd-team.service';
MatSortModule, MatSortModule,
MatSlideToggleModule, MatSlideToggleModule,
MatTooltipModule, MatTooltipModule,
NotifierModule.withConfig(customNotifierOptions),
MatCheckboxModule MatCheckboxModule
], ],
declarations: [MastersComponent, declarations: [MastersComponent,

66
ng6-seed/src/app/settings/users/user-list/user-list.component.html
View File

@ -1,61 +1,21 @@
<!-- <div *ngIf="loader">
<mat-progress-bar mode="indeterminate" color="accent" class="mb-1"></mat-progress-bar>
</div>
<div style="text-align: right;">
<button mat-raised-button color="primary" (click)="add()">Add Register</button>
</div>
<mat-card>
<div datatable>
<table style="border-collapse: collapse">
<thead>
<th style="text-align: center;">No</th>
<th style="text-align: center;">FirstName</th>
<th style="text-align: center;">Email</th>
<th style="text-align: center;">Mobile No</th>
<th style="text-align: center;">Action</th>
<th style="text-align: center;">Isactive</th>
</thead>
<tbody>
<tr *ngFor="let us of userdata; let i=index;" >
<td style="text-align: center;">{{i+1}}</td>
<td style="text-align: center;">{{us.user_first_name}} {{us.user_last_name}}</td>
<td style="text-align: center;">{{us.email}}</td>
<td style="text-align: center;">{{us.mobile_no}}</td>
<td style="text-align: center;font-size: 20px"><a (click)="editUserDetails(us.userid,us.aws_name)"><mat-icon>edit</mat-icon></a></td>
<td *ngIf="us.isactive ==1" style="text-align: center;"><a class="active" (click)="isactive(us.userid,us.aws_name)"><mat-icon>done</mat-icon></a></td>
<td *ngIf="us.isactive ==0" style="text-align: center;"><a class="deactive" (click)="isactive(us.userid,us.aws_name)"><mat-icon>close</mat-icon></a></td>
</tr>
</tbody>
</table>
</div>
</mat-card> -->
<mat-card-content> <mat-card-content>
<div style="text-align: right;"> <div class="example-container mat-elevation-z8" style="margin-top:26px;">
<button mat-raised-button color="primary" (click)="add()"> + Add Register</button>
</div>
<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> </div>
<div class="example-header">
<div class="example-header"> <div style="font-size: 26px;">Users</div><hr/>
<mat-form-field> <div fxLayout="row" fxLayoutAlign="start center" class="mb-2" >
<input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter"> <mat-form-field dividerColor="primary" class="ml-xs mr-xs" style="width: 30%;">
</mat-form-field> <input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter">
</div> </mat-form-field>
<label style="text-align: right;margin-left:50%;" fxLayoutAlign="start center" fxFlexOffset="50px">
<div class="example-container mat-elevation-z8"> <button mat-fab class="mr-1 mb-1" style="margin-top: 7px;"color="primary" (click)="add()"><mat-icon>add</mat-icon></button>
</label>
</div>
</div>
<mat-table [dataSource]="dataSource" matSort > <mat-table [dataSource]="dataSource" matSort >
<ng-container matColumnDef="SerialNo"> <ng-container matColumnDef="SerialNo">
@ -101,6 +61,6 @@
<!-- <div *ngIf="dataSource.length === 0">No records found</div> --> <!-- <div *ngIf="dataSource.length === 0">No records found</div> -->
<mat-paginator [pageSizeOptions]="[5, 10, 25, 50, 100]"></mat-paginator> <mat-paginator [pageSizeOptions]="[5, 10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
</div> </div>
</mat-card-content> </mat-card-content>

45
ng6-seed/src/app/settings/users/user-list/user-list.component.scss
View File

@ -33,6 +33,7 @@ table {
.example-header { .example-header {
min-height: 64px; min-height: 64px;
padding: 8px 24px 0; padding: 8px 24px 0;
background: #fff;
} }
.mat-form-field { .mat-form-field {
@ -43,4 +44,48 @@ table {
.mat-table { .mat-table {
overflow: auto; overflow: auto;
max-height: 500px; max-height: 500px;
}
.mat-table {
display: table;
width: 100%;
overflow: auto;
max-height: 500px;
> .mat-header-row, > .mat-row {
display: table-row;
padding: 0;
border: none;
> .mat-header-cell, > .mat-cell {
display: table-cell;
height: 48px;
vertical-align: middle;
border-bottom: 1px solid rgba(0, 0, 0, 0.12);
}
}
}
/** Table CSS -nocontent */
.nocontent {
color: red;
font-size: 16px;
text-align: center;
}
/** Table CSS - Search(or)Filter Field */
.mat-form-field {
font-size: 14px;
width: 100%;
}
.filter-container {
display: flex;
flex-direction: column;
min-width: 300px;
}
.filter-header {
min-height: 64px;
padding: 8px 24px 0;
} }

86
ng6-seed/src/app/shared/menu-items/menu-items.ts
View File

@ -1,4 +1,5 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { state } from '@angular/animations';
export interface BadgeItem { export interface BadgeItem {
type: string; type: string;
@ -11,8 +12,8 @@ export interface ChildrenItems {
type?: string; type?: string;
} }
export interface Menu { export interface Multichild {
state: string; state: any;
name: string; name: string;
type: string; type: string;
icon: string; icon: string;
@ -20,62 +21,65 @@ export interface Menu {
children?: ChildrenItems[]; children?: ChildrenItems[];
} }
export interface Menu {
state: any;
name: string;
type: string;
icon: string;
badge?: BadgeItem[];
children?: ChildrenItems[];
multichild?:Multichild[];
}
const MENUITEMS : Menu[] = [ const MENUITEMS : Menu[] = [
// {
// state: 'home',
// name: 'HOME',
// type: 'link',
// icon: 'explore'
// },
{ {
state: 'home', state: '',
name: 'HOME', name: 'Manage',
type: 'link', type: 'multi',
icon: 'explore' icon: 'settings',
},{ multichild: [
state:'setting', {
state:'setting',
name:'Settings', name:'Settings',
type:'sub', type:'sub',
icon:'settings', icon:'settings',
children:[ children:[
{state:'users',name:'User List'}, {state:'users',name:'Users'},
{state:'mastermodule',name:'Master Details'}, {state:'mastermodule',name:'Master Details'},
{state:'entity',name:'Entity Details'} {state:'entity',name:'Entities'},
]
},
{ ],
state:'pdtrigger', },
name:'PD Trigger', {
type:'link', state: 'template',
icon:'bubble_chart',
// children:[
// {state:'pdtriggerlist',name:'Pd Trigger Listing'}
// ]
},{
state: 'template',
name: 'Template', name: 'Template',
type: 'sub', type: 'sub',
icon: 'art_track', icon: 'art_track',
children: [ children: [
{state: 'questions', name: 'Questions'} {state: 'questions', name: 'Questions'}
] ]
}, }
{
state: 'authentication',
name: 'AUTHENTICATION',
type: 'sub',
icon: 'security',
children: [
{state: 'login', name: 'LOGIN'},
{state: 'register', name: 'REGISTER'},
{state: 'forgot-password', name: 'FORGOT'},
{state: 'lockscreen', name: 'LOCKSCREEN'}
] ]
}, },
{ {
state: 'error', state:'pdtrigger',
name: 'ERROR', name:'Personal Discussion',
type: 'sub', type:'link',
icon: 'error_outline', icon:'forum',
children: [ // children:[
{state: '404', name: '404'}, // {state:'pdtriggerlist',name:'Pd Trigger Listing'}
{state: '503', name: '503'} // ]
]
} }
]; ];
@Injectable() @Injectable()

BIN
ng6-seed/src/assets/images/lime.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

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

@ -3,7 +3,8 @@
---------------*/ ---------------*/
@import '~@angular/material/theming'; @import '~@angular/material/theming';
$primary: mat-palette($mat-deep-purple); /**-- $primary: mat-palette($mat-deep-purple); --*/
$primary: mat-palette($mat-light-blue);
$accent: mat-palette($mat-amber, A200, A100, A400); $accent: mat-palette($mat-amber, A200, A100, A400);
$warn: mat-palette($mat-red); $warn: mat-palette($mat-red);
$theme: mat-light-theme($primary, $accent, $warn); $theme: mat-light-theme($primary, $accent, $warn);
@ -12,7 +13,8 @@ $foreground: map-get($theme, foreground);
@include mat-core(); @include mat-core();
$dark-primary: mat-palette($mat-blue-grey); /**-- $dark-primary: mat-palette($mat-blue-grey); --**/
$dark-primary: mat-palette($mat-light-blue);
$dark-accent: mat-palette($mat-amber, A200, A100, A400); $dark-accent: mat-palette($mat-amber, A200, A100, A400);
$dark-warn: mat-palette($mat-deep-orange); $dark-warn: mat-palette($mat-deep-orange);
$dark-theme: mat-dark-theme($dark-primary, $dark-accent, $dark-warn); $dark-theme: mat-dark-theme($dark-primary, $dark-accent, $dark-warn);