Appointment/appointments_frontend
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add skills issue fix

Browse Source
This commit is contained in:
Surendiran 2023-05-27 12:29:33 +05:30
parent fe910c9c99
commit 57e8e4b5f7
18 changed files with 88 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
ng-seed/Appointment_Frontend_Build.zip
View File

Binary file not shown.

4
ng-seed/src/app/appoinment/appoinments/appoinments-list/appoinments-list.component.html
View File

@ -14,10 +14,10 @@
</mat-option>
</mat-select>
</mat-form-field>
<mat-button-toggle-group name="fontStyle" aria-label="Font Style">
<!-- <mat-button-toggle-group name="fontStyle" aria-label="Font Style">
<mat-button-toggle value="List">List</mat-button-toggle>
<mat-button-toggle value="Calender" (click)="onClickCalender()">Calender</mat-button-toggle>
</mat-button-toggle-group>
</mat-button-toggle-group> -->
<!-- <a><i style="font-size:24px" class="fa" (click)="onClickCalender()">&#xf073;</i></a> -->
<button mat-button (click)="openDialog('Add',{})" class="button">Add Appointment</button>

7
ng-seed/src/app/appoinment/appoinments/dialog-box/dialog-box.component.html
View File

@ -80,7 +80,7 @@
<input matInput placeholder="Select Time" name="week" formControlName="appoinmentTime" readonly>
</mat-form-field>
<mat-card class="cardDesign">
<mat-card class="cardDesign" *ngIf="form.controls.service.value">
<div class="innerdivs navStyle" fxLayoutAlign="center center">
<button type="button" mat-raised-button (click)="goToSlotBooking2()" style="background-color: #7fffd400;box-shadow: none;color:#fff" ><mat-icon style="cursor: pointer;">keyboard_arrow_left</mat-icon></button><span style="width: 150px;text-align: center;">{{check(days) | date:'longDate'}}</span><button mat-raised-button type="button" (click)="goToSlotBooking()" *ngIf="clicks < advanced_slot_days" style="background-color: #7fffd400;box-shadow: none;color:#fff" ><mat-icon style="cursor: pointer;">keyboard_arrow_right</mat-icon></button>
</div>
@ -147,7 +147,10 @@
</div>
<div mat-dialog-actions>
<button mat-button type="submit" class="mat-green" mat-raised-button >{{action}}</button>
<button mat-button type="submit" [disabled]="isSubmitting" class="mat-green" mat-raised-button >
<span *ngIf="!isSubmitting">{{action}}</span>
<span *ngIf="isSubmitting">Loading...</span>
</button>
<button mat-button type="button" (click)="closeDialog()" >Cancel</button>
</div>
</ng-scrollbar>

6
ng-seed/src/app/appoinment/appoinments/dialog-box/dialog-box.component.scss
View File

@ -271,4 +271,10 @@ $tem-color : #217e69;
width: auto;
border: 1px solid brown;
cursor: pointer;
}
.mat-green:disabled {
/* Styles for the button when it's disabled */
background-color: gray !important; /* Change the background color to gray */
color: white !important; /* Change the text color to white */
/* Add any other styling as desired */
}

5
ng-seed/src/app/appoinment/appoinments/dialog-box/dialog-box.component.ts
View File

@ -109,6 +109,7 @@ export class DialogBoxComponent implements OnInit {
findSlotIndex: any;
frontDeskChoosedPractiID: any;
practiId: any;
isSubmitting: boolean = false;
constructor(private notifierService: NotifierService,private router: Router,private formBuilder: FormBuilder, public _cus:CustomersService,
public dialogRef: MatDialogRef<DialogBoxComponent>,public _api:ConsultantService, public _con:ConsultantService,
@Inject(MAT_DIALOG_DATA) public data: UsersData,public _app:AppointmentsService,public end_user:EndUserService) {
@ -434,6 +435,8 @@ export class DialogBoxComponent implements OnInit {
if (!this.form.valid) {
return;
}
this.isSubmitting = true;
console.log(this.form.value,this.slotsResult,this.days[this.clicks]);
let userId
if(this.user_role != 'FRONTDESK'){
@ -481,11 +484,13 @@ export class DialogBoxComponent implements OnInit {
}
let param = {data:0,response:res}
this.dialogRef.close(param);
this.isSubmitting = false;
}
})
}
})
}
}

6
ng-seed/src/app/appoinment/business/add-business/add-business.component.html
View File

@ -120,7 +120,11 @@
<div mat-dialog-actions>
<button mat-button type="submit" class="mat-green" mat-raised-button >{{action}}</button>
<button mat-button type="submit" [disabled]="isSubmitting" class="mat-green" mat-raised-button >
<span *ngIf="!isSubmitting">{{action}}</span>
<span *ngIf="isSubmitting">Loading...</span>
</button>
<!-- <button mat-button type="submit" class="mat-green" mat-raised-button >{{action}}</button> -->
<button mat-button type="button" (click)="close()" >Cancel</button>
</div>
</ng-scrollbar>

8
ng-seed/src/app/appoinment/business/add-business/add-business.component.scss
View File

@ -83,4 +83,10 @@ input[type=file]::file-selector-button {
.imgSizeValidation{
color: red;
font-family: Didact Gothic, sans serif;
}
}
.mat-green:disabled {
/* Styles for the button when it's disabled */
background-color: gray !important; /* Change the background color to gray */
color: white !important; /* Change the text color to white */
/* Add any other styling as desired */
}

3
ng-seed/src/app/appoinment/business/add-business/add-business.component.ts
View File

@ -42,6 +42,7 @@ export class AddBusinessComponent implements OnInit {
selectedFiles: any;
currentFileUpload: any;
countryevent:any=[];
isSubmitting: boolean = false;
private apiUrl = environment.apiEndpoint;
constructor(private http: HttpClient,private notifierService: NotifierService,private router: Router,private formBuilder: FormBuilder,
public dialogRef: MatDialogRef<AddBusinessComponent>,
@ -253,6 +254,7 @@ export class AddBusinessComponent implements OnInit {
console.log("check")
return;
}
this.isSubmitting = true
// this.formData.append('image', this.currentFileUpload);
// console.log(this.formData.getAll('image'));
if(this.action == 'Update'){
@ -271,6 +273,7 @@ export class AddBusinessComponent implements OnInit {
this.formData.append('currency',tmp.currency)
console.log(this.formData)
this.dialogRef.close({event:this.action,data:this.formData,admincheck:tmp.admin_checked});
this.isSubmitting = false
// console.log(this.form.value);
// console.log(this.action,this.local_data)
}

12
ng-seed/src/app/appoinment/consultant-setting/consultant-setting/consultant-setting.component.html
View File

@ -109,20 +109,24 @@
<mat-tab>
<ng-template mat-tab-label>
<i class="material-icons icons-info">&#xe7fd;</i>
My Profile
<div fxLayout="row wrap">
<div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="100" fxFlex.lg="100" fxFlex.xl="100" class="p-gap" fxLayoutAlign="start center">
<span><i class="material-icons icons-info">&#xe7fd;</i>My Profile </span>
</div>
</div>
</ng-template>
<div class="staff">
<span class="staff-title">
Profile <span *ngIf="userRole == 'FRONTDESK'">- ({{usersList.userName}})</span>
</span>
<button mat-icon-button matTooltip="Edit" style="padding: 4px 20px !;" *ngIf="isEditable == false" (click)="edit_table(isEditable)" fileName="customers"><mat-icon >edit</mat-icon></button>
<button mat-icon-button matTooltip="Edit" style="padding: 4px 20px;" *ngIf="isEditable == false" (click)="edit_table(isEditable)" fileName="customers"><mat-icon >edit</mat-icon></button>
<!-- <button mat-icon-button *ngIf="table[0].statement == statement_item && table[0].statement != 'Cash Flow Statement'" color="accent" matTooltip="Edit" matTooltipPosition="right" (click)="editandcancel(true,table[0].section)" ><mat-icon>edit</mat-icon></button> -->
<button mat-icon-button color="accent" *ngIf="isEditable == true" (click)="edit_table(isEditable)" matTooltip="Cancel" matTooltipPosition="right" ><mat-icon>cancel_presentation</mat-icon></button>
<button mat-icon-button color="accent" *ngIf="isEditable == true" (click)="save()" matTooltip="Submit" matTooltipPosition="right" ><mat-icon>done</mat-icon></button>
</div>
<div mat-dialog-content class="my-table" style="margin-top: 15px;">
<div mat-dialog-content class="my-table" style="margin-top: 15px;margin-left: 10px;">
<ng-scrollbar class="scrollHVtab1">
<!-- <form [formGroup]="registerForm" (ngSubmit)="onSubmit()"> -->
<div class="form-group label-container">

10
ng-seed/src/app/appoinment/consultant-setting/consultant-setting/consultant-setting.component.ts
View File

@ -529,10 +529,16 @@ unavailability(action,obj) {
});
dialogRef.afterClosed().subscribe(result => {
console.log(result)
let skillsFilterRemove = result
// skillsFilterRemove.forEach(element => {
// console.log(element)
let filteredArray = skillsFilterRemove.skills.filter(value => value !== null);
console.log(filteredArray)
// });
console.log(this.skills)
if(result != undefined){
this.skills = result.skills
this.skills = filteredArray
console.log(this.skills)
this.notifierService.notify('success', 'Skills Added Successfully');
}

12
ng-seed/src/app/appoinment/service-list-details/add-service/add-service.component.html
View File

@ -39,15 +39,19 @@
</mat-form-field>
<mat-form-field appearance="outline" *ngIf="action != 'Delete'; else elseTemplate" class="mat-pane">
<mat-label>Description</mat-label>
<textarea row="5" cols="7" matInput placeholder="Description" formControlName="description"></textarea>
<textarea row="10" cols="10" matInput placeholder="Description" formControlName="description"></textarea>
<mat-error *ngIf="myError('description', 'required')">Description is required</mat-error>
</mat-form-field>
<ng-template #elseTemplate>
Sure to delete <b>{{local_data.servicesName}}</b>?
</ng-template>
</div>
<div mat-dialog-actions>
<button mat-button type="submit" class="mat-green" mat-raised-button >{{action}}</button>
<div mat-dialog-actions>
<button mat-button type="submit" [disabled]="isSubmitting" class="mat-green" mat-raised-button >
<span *ngIf="!isSubmitting">{{action}}</span>
<span *ngIf="isSubmitting">Loading...</span>
</button>
<!-- <button mat-button type="submit" class="mat-green" mat-raised-button >{{action}}</button> -->
<button mat-button type="button" (click)="closeDialog()" >Cancel</button>
</div>
</div>
</form>

7
ng-seed/src/app/appoinment/service-list-details/add-service/add-service.component.scss
View File

@ -8,4 +8,11 @@
}
.mat-pane{
width: 20rem;
}
.mat-green:disabled {
/* Styles for the button when it's disabled */
background-color: gray !important; /* Change the background color to gray */
color: white !important; /* Change the text color to white */
/* Add any other styling as desired */
}

3
ng-seed/src/app/appoinment/service-list-details/add-service/add-service.component.ts
View File

@ -19,6 +19,7 @@ export class AddServiceComponent implements OnInit {
action:string;
public durationTime = [{'time':'15'},{'time':'30'},{'time':'45'},{'time':'60'},{'time':'75'},{'time':'90'},{'time':'105'},{'time':'120'},{'time':'135'},{'time':'150'},{'time':'165'},{'time':'180'}]
currencySymbol: any;
isSubmitting: boolean = false;
constructor(private router: Router,private formBuilder: FormBuilder,
public dialogRef: MatDialogRef<AddServiceComponent>,
@Optional() @Inject(MAT_DIALOG_DATA) public data: UsersData) {
@ -63,7 +64,9 @@ ngOnInit() {
console.log("check")
return;
}
this.isSubmitting = true
this.dialogRef.close({event:this.action,data:tmp});
this.isSubmitting = false
console.log(this.form.value);
console.log(this.action,this.local_data)
}

6
ng-seed/src/app/appoinment/user/add-user/add-user.component.html
View File

@ -102,7 +102,11 @@
</mat-form-field> -->
<div mat-dialog-actions>
<button mat-button type="submit" class="mat-green" mat-raised-button >{{action}}</button>
<button mat-button type="submit" [disabled]="isSubmitting" class="mat-green" mat-raised-button >
<span *ngIf="!isSubmitting">{{action}}</span>
<span *ngIf="isSubmitting">Loading...</span>
</button>
<!-- <button mat-button type="submit" class="mat-green" mat-raised-button >{{action}}</button> -->
<button mat-button type="button" (click)="close()" >Cancel</button>
</div>
</ng-scrollbar>

9
ng-seed/src/app/appoinment/user/add-user/add-user.component.scss
View File

@ -67,4 +67,11 @@ input[type=file]::file-selector-button {
width: 100%;
overflow: hidden;
}
}
}
.mat-green:disabled {
/* Styles for the button when it's disabled */
background-color: gray !important; /* Change the background color to gray */
color: white !important; /* Change the text color to white */
/* Add any other styling as desired */
}

5
ng-seed/src/app/appoinment/user/add-user/add-user.component.ts
View File

@ -40,6 +40,7 @@ export class AddUserComponent implements OnInit {
serviceCheckedData: any = [];
assignedServiceValue: any = [];
userList: any = [];
isSubmitting: boolean = false;
constructor(private http: HttpClient,private notifierService: NotifierService,private router: Router,private formBuilder: FormBuilder,
public dialogRef: MatDialogRef<AddUserComponent>,
@Optional() @Inject(MAT_DIALOG_DATA) public data: UsersData,public _bus:BusinessService,public _ser:ApiServiceService) {
@ -78,7 +79,7 @@ export class AddUserComponent implements OnInit {
),],valData),
// password: new FormControl('', [Validators.required, Validators.minLength(6)]),
password: new FormControl('', [Validators.required,Validators.pattern(
'^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[!@#$%^&*_=+-]).{16,}$'
'^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[!@#$%^&*_=+-]).{8,16}$'
)]),
logo: new FormControl('', null),
// confirmPassword: new FormControl('', [Validators.required, Validators.minLength(6)]),
@ -220,6 +221,7 @@ export class AddUserComponent implements OnInit {
if (!this.form.valid) {
return;
}
this.isSubmitting = true
let tmp = this.form.value
tmp.id = this.local_data.id
console.log(tmp,this.formData.getAll('image'));
@ -243,6 +245,7 @@ export class AddUserComponent implements OnInit {
// this.formData.append('confirmPassword', tmp.password);
// tmp.confirmPassword = this.local_data.confirmPassword
this.dialogRef.close({event:this.action,data: this.formData,role:this.form.value.role});
this.isSubmitting = false
console.log(this.formData,this.form.value);
console.log(this.action,this.local_data)
}

4
ng-seed/src/app/session/reset-password/reset-password.component.ts
View File

@ -31,10 +31,10 @@ export class ResetPasswordComponent implements OnInit {
this.form = new FormGroup({
password: new FormControl('', [Validators.required,Validators.pattern(
'^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[!@#$%^&*_=+-]).{16,}$'
'^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[!@#$%^&*_=+-]).{8,16}$'
)]),
password2: new FormControl('', [Validators.required,Validators.pattern(
'^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[!@#$%^&*_=+-]).{16,}$'
'^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[!@#$%^&*_=+-]).{8,16}$'
)]),
});
}

4
ng-seed/src/environments/environment.ts
View File

@ -10,9 +10,9 @@ export const environment = {
// apiEndpoint:'http://192.168.1.19:8080/api/',
// apiEndpoint:'https://api.venbait.in/api/',
// apiEndpoint:'http://venbainfotech.com:5000/api/',
// apiEndpoint:'http://192.168.1.10:8080/api/',
apiEndpoint:'http://192.168.1.10:8080/api/',
apiEndpoint:'https://api.venbait.in/api/',
// apiEndpoint:'https://api.venbait.in/api/',
//EndUser URL
endUserUrl: window.location.origin+'/#/customer/',