+
![]()
-
+
+
diff --git a/ng-seed/src/app/appoinment/business/dialog-box/dialog-box.component.ts b/ng-seed/src/app/appoinment/business/dialog-box/dialog-box.component.ts
index 72a4b54..41294c8 100644
--- a/ng-seed/src/app/appoinment/business/dialog-box/dialog-box.component.ts
+++ b/ng-seed/src/app/appoinment/business/dialog-box/dialog-box.component.ts
@@ -1,5 +1,6 @@
import { Component, Inject, OnInit, Optional } from '@angular/core';
import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms';
+import { MatCheckboxChange } from '@angular/material/checkbox';
import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
import { Router } from '@angular/router';
export interface UsersData {
@@ -28,8 +29,10 @@ export class DialogBoxComponent implements OnInit {
get f(){
return this.form.controls;
}
- // doAction(){
-
+ // showOptions(event:MatCheckboxChange): void {
+ // console.log(event.checked);
+ // this.form['value'].admin_checked = event.checked
+ // console.log(this.form['value'].admin_checked)
// }
closeDialog(){
this.dialogRef.close({event:'Cancel'});
@@ -47,8 +50,10 @@ export class DialogBoxComponent implements OnInit {
this.dialogRef.close();
}
ngOnInit() {
+ let userrole = localStorage.getItem('user_role')
this.form = new FormGroup({
- workingHrsJson: new FormControl('', [Validators.required]),
+ // admin_checked: new FormControl('', [Validators.required]),
+ // workingHrsJson: new FormControl('', [Validators.required]),
logo: new FormControl('', null),
busName: new FormControl('', [Validators.required, Validators.maxLength(20)]),
address: new FormControl('', [Validators.required, Validators.maxLength(50)]),
@@ -58,6 +63,7 @@ export class DialogBoxComponent implements OnInit {
'[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+.[a-zA-Z]{2,63}$',
),]),
contactNo: new FormControl('', [Validators.required, Validators.maxLength(10)]),
+ createdBy:new FormControl(userrole,[Validators.required]),
});
this.form.patchValue(this.local_data)
diff --git a/ng-seed/src/app/appoinment/user/user-dialog-box/user-dialog-box.component.html b/ng-seed/src/app/appoinment/user/user-dialog-box/user-dialog-box.component.html
index 012ad9c..929848b 100644
--- a/ng-seed/src/app/appoinment/user/user-dialog-box/user-dialog-box.component.html
+++ b/ng-seed/src/app/appoinment/user/user-dialog-box/user-dialog-box.component.html
@@ -5,19 +5,42 @@
diff --git a/ng-seed/src/app/appoinment/user/user-dialog-box/user-dialog-box.component.ts b/ng-seed/src/app/appoinment/user/user-dialog-box/user-dialog-box.component.ts
index 49cae94..ea882c0 100644
--- a/ng-seed/src/app/appoinment/user/user-dialog-box/user-dialog-box.component.ts
+++ b/ng-seed/src/app/appoinment/user/user-dialog-box/user-dialog-box.component.ts
@@ -2,6 +2,7 @@ import { Component, Inject, OnInit, Optional } from '@angular/core';
import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms';
import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
import { Router } from '@angular/router';
+import { BusinessService } from 'app/appoinment/business/business-service/business.service';
export interface UsersData {
userName: string;
id: number;
@@ -19,13 +20,33 @@ export class UserDialogBoxComponent implements OnInit {
action:string;
local_data:any;
url: string | ArrayBuffer;
+ businessList: any;
constructor(private router: Router,private formBuilder: FormBuilder,
public dialogRef: MatDialogRef,
- @Optional() @Inject(MAT_DIALOG_DATA) public data: UsersData) {
+ @Optional() @Inject(MAT_DIALOG_DATA) public data: UsersData,public _bus:BusinessService) {
console.log(data);
this.local_data = {...data};
this.action = this.local_data.action;
+ this.getBusinessList()
}
+
+ getBusinessList() {
+ //this._pd.getTabStatusPdDetails(this.tabStatus)
+ this._bus.getBusinessListDetails().subscribe(res => {
+ if (res.status == 200) {
+ let businessFilter = res['data'].filter(val => val.busName)
+ this.businessList = businessFilter;
+ console.log(this.businessList)
+ }
+ }
+ // , error => {this.errorMessage = error});
+ ,error => {
+ // this.errorMessage.push(error);
+ // this.notifier.notify('error', 'Something Went Wrong Try Again.! \t\"' + (error.error_type == 2 ? error.error_status + ' ( ' + error.error_text + ' ) ' : ' ( ' + error.error_text + ' ) ') +'\" Error Occur.!');
+ // alert(error.html_format);
+ })
+ }
+
get f(){
return this.form.controls;
}
@@ -47,16 +68,19 @@ export class UserDialogBoxComponent implements OnInit {
this.dialogRef.close();
}
ngOnInit() {
+ let userrole = localStorage.getItem('user_role')
this.form = new FormGroup({
- role: new FormControl('', [Validators.required, Validators.maxLength(20)]),
+ businessselect: new FormControl('',[Validators.required]),
+ role: new FormControl('BADMIN', [Validators.required, Validators.maxLength(20)]),
userName: new FormControl('', [Validators.required, Validators.maxLength(20)]),
- firstName: new FormControl('', [Validators.required, Validators.maxLength(20)]),
- lastName: new FormControl('', [Validators.required, Validators.maxLength(20)]),
+ contactNo: new FormControl('', [Validators.required, Validators.maxLength(20)]),
+ // lastName: new FormControl('', [Validators.required, Validators.maxLength(20)]),
email: new FormControl('', [Validators.required, Validators.email,Validators.pattern(
'[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+.[a-zA-Z]{2,63}$',
),]),
password: new FormControl('', [Validators.required, Validators.minLength(6)]),
// confirmPassword: new FormControl('', [Validators.required, Validators.minLength(6)]),
+ createdBy:new FormControl(userrole,[Validators.required]),
});
this.form.patchValue(this.local_data)
}
diff --git a/ng-seed/src/app/appoinment/user/user-list/user-list.component.ts b/ng-seed/src/app/appoinment/user/user-list/user-list.component.ts
index 9a4d3e6..54aa691 100644
--- a/ng-seed/src/app/appoinment/user/user-list/user-list.component.ts
+++ b/ng-seed/src/app/appoinment/user/user-list/user-list.component.ts
@@ -155,27 +155,29 @@ export class UserListComponent implements OnInit {
let formValue = []
if(result.event == 'Add'){
console.log('add')
- let addFormData = {
+ let addFormData = {
// logo: row_obj.logo,
- id: row_obj.id,
+ // id: row_obj.id,
+ busId:row_obj.businessselect,
userName: row_obj.userName,
+ contactNo: row_obj.contactNo,
password: row_obj.password,
- firstName: row_obj.firstName,
- lastName: row_obj.lastName,
email: row_obj.email,
- role: row_obj.role,
+ role: row_obj.role,
+ createdBy:row_obj.createdBy
};
formValue.push(addFormData);
}else if(result.event == 'Update'){
console.log('Update')
let updatevalue = {
id: row_obj.id,
+ busId:row_obj.businessselect,
userName: row_obj.userName,
+ contactNo: row_obj.contactNo,
password: row_obj.password,
- firstName: row_obj.firstName,
- lastName: row_obj.lastName,
email: row_obj.email,
- role: row_obj.role,
+ role: row_obj.role,
+ createdBy:row_obj.createdBy
}
formValue.push(updatevalue);
}
diff --git a/ng-seed/src/app/layouts/role-menu-items.pipe.ts b/ng-seed/src/app/layouts/role-menu-items.pipe.ts
index 2a0434e..75ef17c 100644
--- a/ng-seed/src/app/layouts/role-menu-items.pipe.ts
+++ b/ng-seed/src/app/layouts/role-menu-items.pipe.ts
@@ -11,7 +11,7 @@ export class RoleMenuItemsPipe implements PipeTransform {
// if(type=="1"){
switch(localStorage.getItem('user_role')){
case 'SADMIN': return value.filter(val=>val.state!="appoinments" && val.state!="customers" && val.state!="consultants" && val.state != "services" && val.state != "consultant-setting");
- case 'ADMIN': return value.filter(val=>val.state !="business" && val.state!="appoinments" && val.state!="customers");
+ case 'BADMIN': return value.filter(val=>val.state !="business" && val.state!="appoinments" && val.state!="consultants" && val.state != "users");
// case 'CONSULT':
// case '3': return value.filter(val=>val.state!="settings");
// case '4': return value.filter(val=>val.state!="settings" && val.state!="quality_check_discussion" && val.state!="reports" && val.state!="sales-pd-list");