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

UI inputs changes done

Browse Source
This commit is contained in:
Surendiran 2023-05-18 18:00:07 +05:30
parent d7820a45ad
commit 3bf39e2f44
43 changed files with 219 additions and 119 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.

BIN
ng-seed/Appointment_Frontend_Build_latest.zip
View File

Binary file not shown.

7
ng-seed/src/app/appoinment/appoinments/appoinments-list/appoinments-list.component.scss
View File

@ -13,6 +13,7 @@ th.mat-header-cell, td.mat-cell, td.mat-footer-cell {
padding: 6px;
border-bottom-width: 1px;
border-bottom-style: solid;
border: 1px solid #fff;
}
.mat-expansion-panel-header {
display: inline!important;
@ -44,13 +45,17 @@ img {
}
tr.mat-header-row {
height: 30px!important;
background-color: #6e6e6e !important;
}
.mat-header-cell{
color: #fff !important;
}
.font-color{
font-weight: 600;
font-size: 14px;
}
.edit-color{
color: #178a78;
color: #6e6e6e;
}
.edit-color2{
color: #e12929ba;

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

@ -51,10 +51,10 @@
id="country"
formControlName="country">
<mat-option [value]="null">Select Country</mat-option>
<mat-option *ngFor="let country of countries" (click)="countryname(country)" [value]="country.name"> {{ country.flag }}&nbsp;&nbsp;{{ country.name }}</mat-option>
<mat-option *ngFor="let country of countries" (click)="countryname(country)" [value]="country.name"> {{ country.flag }}&nbsp;&nbsp; {{ country.name }}</mat-option>
<mat-option value="invalid">Invalid option</mat-option>
</mat-select>
<mat-error *ngIf="myError('country', 'required')">Country is required</mat-error>
</mat-form-field>
<mat-form-field appearance="outline" class="mat-pane" *ngIf="action != 'Delete'; else elseTemplate" >
@ -67,7 +67,7 @@
<mat-option *ngFor="let state of states" (click)="statename(state)" [value]="state.name"> {{ state.name }}</mat-option>
<mat-option value="invalid">Invalid option</mat-option>
</mat-select>
<mat-error *ngIf="myError('state', 'required')">State is required</mat-error>
</mat-form-field>
<mat-form-field appearance="outline" class="mat-pane" *ngIf="action != 'Delete'; else elseTemplate" >
<mat-label>City</mat-label>
@ -79,7 +79,7 @@
<mat-option *ngFor="let city of cities" (click)="cityname(city)" [value]="city.name"> {{ city.name }}</mat-option>
<mat-option value="invalid">Invalid option</mat-option>
</mat-select>
<mat-error *ngIf="myError('city', 'required')">City is required</mat-error>
</mat-form-field>
<!-- <mat-form-field appearance="outline" *ngIf="action != 'Delete'; else elseTemplate" class="mat-pane">
<mat-label>State</mat-label>
@ -96,7 +96,7 @@
<mat-form-field appearance="outline" *ngIf="action != 'Delete'; else elseTemplate" class="mat-pane">
<mat-label>Type Of Currency</mat-label>
<input placeholder="Type Of Currency" matInput [(ngModel)]="local_data.currency" formControlName="currency">
<mat-error *ngIf="myError('currency', 'required')">City is required</mat-error>
<mat-error *ngIf="myError('currency', 'required')">currency is required</mat-error>
<!-- <mat-error *ngIf="myError('currency', 'maxlength')">Limit exceed</mat-error> -->
</mat-form-field>
<!-- <mat-form-field appearance="outline" *ngIf="action != 'Delete'; else elseTemplate" class="mat-pane">
@ -121,7 +121,7 @@
<div mat-dialog-actions>
<button mat-button type="submit" class="mat-green" mat-raised-button >{{action}}</button>
<button mat-button type="button" (click)="closeDialog()" >Cancel</button>
<button mat-button type="button" (click)="close()" >Cancel</button>
</div>
</ng-scrollbar>

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

@ -81,5 +81,5 @@ input[type=file]::file-selector-button {
}
.imgSizeValidation{
color: red;
font-family: ui-serif;
font-family: Didact Gothic, sans serif;
}

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

@ -163,12 +163,47 @@ export class AddBusinessComponent implements OnInit {
createdBy:new FormControl(userrole,[Validators.required]),
});
this.countryname(JSON.parse(this.local_data.country))
this.statename(JSON.parse(this.local_data.state))
console.log(this.local_data)
this.local_data.country = JSON.parse(this.local_data.country).name
this.local_data.state = JSON.parse(this.local_data.state).name
this.local_data.city = JSON.parse(this.local_data.city).name
if(this.local_data.hasOwnProperty('country')){
if(this.local_data.country instanceof Object){
this.local_data.country = this.local_data.country
this.countryevent = this.local_data.country
this.countryname(this.local_data.country)
this.local_data.country = this.local_data.country.name
}else{
this.local_data.country = JSON.parse(this.local_data.country)
this.countryevent = this.local_data.country
this.countryname(this.local_data.country)
this.local_data.country = this.local_data.country.name
}
}
if(this.local_data.hasOwnProperty('state')){
if(this.local_data.state instanceof Object){
this.local_data.state = this.local_data.state
this.selectedState = this.local_data.state
this.statename(this.local_data.state)
this.local_data.state = this.local_data.state.name
}else{
this.local_data.state = JSON.parse(this.local_data.state)
this.selectedState = this.local_data.state
this.statename(this.local_data.state)
this.local_data.state = this.local_data.state.name
}
}
if(this.local_data.hasOwnProperty('city')){
if(this.local_data.city instanceof Object){
this.local_data.city = this.local_data.city
this.selectedCity = this.local_data.city
this.local_data.city = this.local_data.city.name
}else{
this.local_data.city = JSON.parse(this.local_data.city)
this.selectedCity = this.local_data.city
this.local_data.city = this.local_data.city.name
}
}
console.log(this.local_data)
this.form.patchValue(this.local_data)
setTimeout(() => {
@ -191,13 +226,18 @@ export class AddBusinessComponent implements OnInit {
map((response:any) => {
console.log(response)
let response1 = response.data
let tmp=[];
if(response1 instanceof Array){
response.data.forEach(element => {
tmp.push(element.email)
});
console.log(tmp,`${control.value}`);
return !tmp.includes(`${control.value}`) ? null : { usernameTaken: true };
}else{
return null
}
})
);
}
@ -220,13 +260,13 @@ export class AddBusinessComponent implements OnInit {
}
this.formData.append('email', tmp.email);
this.formData.append('contactNo', tmp.contactNo);
this.formData.append('busName', tmp.busName);
this.formData.append('address', tmp.address);
this.formData.append('country', JSON.stringify(this.countryevent) );
this.formData.append('state', JSON.stringify(this.selectedState));
this.formData.append('city', JSON.stringify(this.selectedCity));
this.formData.append('email', tmp.email);
this.formData.append('contactNo', tmp.contactNo);
this.formData.append('busName', tmp.busName);
this.formData.append('address', tmp.address);
this.formData.append('currency',tmp.currency)
console.log(this.formData)
this.dialogRef.close({event:this.action,data:this.formData,admincheck:tmp.admin_checked});
@ -256,7 +296,7 @@ export class AddBusinessComponent implements OnInit {
this.cities = City.getCitiesOfState( this.countryevent.isoCode, state.isoCode)
console.log(this.cities)
this.selectedState = state;
this.selectedCity = null;
// this.selectedCity = null;
}
cityname(city){

2
ng-seed/src/app/appoinment/business/business-list/business-list.component.html
View File

@ -45,7 +45,7 @@
<ng-container matColumnDef="address">
<th mat-header-cell *matHeaderCellDef class="font-color"> Address </th>
<td mat-cell *matCellDef="let row" class="element-spc"> {{row.address}} </td>
<td mat-cell *matCellDef="let row" class="element-spc"> {{row.address}}, {{row.state.name}}, {{row.city.name}}</td>
</ng-container>
<ng-container matColumnDef="action">

10
ng-seed/src/app/appoinment/business/business-list/business-list.component.scss
View File

@ -13,6 +13,7 @@ th.mat-header-cell, td.mat-cell, td.mat-footer-cell {
padding: 6px;
border-bottom-width: 1px;
border-bottom-style: solid;
border: 1px solid #fff;
}
.mat-expansion-panel-header {
display: inline!important;
@ -44,13 +45,17 @@ img {
}
tr.mat-header-row {
height: 30px!important;
background-color: #6e6e6e !important;
}
.mat-header-cell{
color: #fff !important;
}
.font-color{
font-weight: 600;
font-size: 14px;
}
.edit-color{
color: #178a78;
color: #6e6e6e;
}
.edit-color2{
color: #e12929ba;
@ -126,4 +131,5 @@ img {
}
.mat-action{
width: 10%;
}
}

9
ng-seed/src/app/appoinment/business/business-list/business-list.component.ts
View File

@ -29,7 +29,7 @@ export class BusinessListComponent implements OnInit {
// pagination variable details
length = 5;
pageIndex = 0;
pageSize = 5;
pageSize = 10;
pageEvent: PageEvent;
businessList: any[] = [];
private apiUrl = environment.apiEndpoint;
@ -68,8 +68,13 @@ export class BusinessListComponent implements OnInit {
return b.id - a.id;
});
this.businessList.forEach((element, index) => {
element.index = index
element.index = index
element.state = JSON.parse(element.state)
console.log(element.state)
element.city = JSON.parse(element.city)
console.log(element.city)
});
console.log(this.businessList)
this.businessListSource['data'] = this.businessList;
console.log(this.businessListSource)
this.recordStatus=false;

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

@ -168,7 +168,7 @@
<input type="text" matInput placeholder="" [(ngModel)]="dob">
</mat-form-field>
</div> -->
<div class="form-group label-container" *ngIf="userRole != 'BADMIN'">
<div class="form-group label-container" *ngIf="userRole != 'BIZADMIN'">
<label>Languages <span style="margin-left: 4rem;">-</span></label>
<a style="padding: 10px;" *ngIf="isEditable == false">{{practitionerdetails.languages}}</a>
<mat-form-field class="example-full-width" *ngIf="isEditable == true">
@ -176,7 +176,7 @@
<input type="text" matInput placeholder="Languages" [(ngModel)]="languages">
</mat-form-field>
</div>
<div class="form-group label-container" *ngIf="userRole != 'BADMIN'">
<div class="form-group label-container" *ngIf="userRole != 'BIZADMIN'">
<label>Qualification <span style="margin-left: 4rem;">-</span></label>
<a style="padding: 10px;" *ngIf="isEditable == false">{{practitionerdetails.qualification}}</a>
<mat-form-field class="example-full-width" *ngIf="isEditable == true">
@ -184,7 +184,7 @@
<input type="text" matInput placeholder="Qualification" [(ngModel)]="qualification">
</mat-form-field>
</div>
<!-- <div class="form-group label-container" *ngIf="userRole != 'BADMIN'">
<!-- <div class="form-group label-container" *ngIf="userRole != 'BIZADMIN'">
<label>Designation <span style="margin-left: 3.7rem;">-</span></label>
<a style="padding: 10px;" *ngIf="isEditable == false">{{practitionerdetails.designtion}}</a>
<mat-form-field class="example-full-width" *ngIf="isEditable == true">
@ -192,7 +192,7 @@
<input type="text" matInput placeholder="Designation" [(ngModel)]="designtion">
</mat-form-field>
</div> -->
<div class="form-group label-container" *ngIf="userRole != 'BADMIN'">
<div class="form-group label-container" *ngIf="userRole != 'BIZADMIN'">
<label>Experience <span style="margin-left: 5rem;">-</span></label>
<a style="padding: 10px;" *ngIf="isEditable == false">{{practitionerdetails.exp}}</a>
<mat-form-field class="example-full-width" *ngIf="isEditable == true">
@ -200,7 +200,7 @@
<input type="text" matInput placeholder="Experience" [(ngModel)]="exp">
</mat-form-field>
</div>
<div class="form-group label-container" *ngIf="userRole != 'BADMIN'">
<div class="form-group label-container" *ngIf="userRole != 'BIZADMIN'">
<label>Advanced Booking Allowed Days <span style="margin-left: 2rem;">-</span></label>
<a style="padding: 10px;" *ngIf="isEditable == false">{{practitionerdetails.days}}</a>
<mat-form-field class="example-full-width" *ngIf="isEditable == true">
@ -208,7 +208,7 @@
<input type="text" matInput appMobileNumberPattern placeholder="Booking Allowed Days" [(ngModel)]="days">
</mat-form-field>
</div>
<div class="form-group label-container" *ngIf="userRole != 'BADMIN'">
<div class="form-group label-container" *ngIf="userRole != 'BIZADMIN'">
<label>Skills <span style="margin-left: 4rem;">-</span></label>
<mat-list>
<mat-list-item *ngFor="let skill of skills">{{skill ? "* "+skill:"" }}</mat-list-item>
@ -225,7 +225,7 @@
</mat-select>
</mat-form-field> -->
</div>
<div class="form-group label-container" *ngIf="userRole != 'BADMIN'">
<div class="form-group label-container" *ngIf="userRole != 'BIZADMIN'">
<label>Caption <span style="margin-left: 4rem;">-</span></label>
<a style="padding: 10px;" *ngIf="isEditable == false">{{practitionerdetails.caption}}</a>
<mat-form-field style="width: 60%;" *ngIf="isEditable == true">
@ -233,7 +233,7 @@
<textarea matInput rows="3" cols="30" placeholder="Caption" [(ngModel)]="caption"></textarea>
</mat-form-field>
</div>
<div class="form-group label-container" *ngIf="userRole != 'BADMIN'">
<div class="form-group label-container" *ngIf="userRole != 'BIZADMIN'">
<label>Description <span style="margin-left: 4rem;">-</span></label>
<a style="padding: 10px;" *ngIf="isEditable == false">{{practitionerdetails.description}}</a>
<mat-form-field style="width: 60%;" *ngIf="isEditable == true">
@ -292,7 +292,7 @@
</mat-tab>
<mat-tab *ngIf="userRole != 'BADMIN'">
<mat-tab *ngIf="userRole != 'BIZADMIN'">
<ng-template mat-tab-label>
<i class="material-icons icons-Hours">&#xe192;</i>
Working Hours
@ -507,7 +507,7 @@
</div>
</mat-tab>
<mat-tab *ngIf="userRole != 'BADMIN'">
<mat-tab *ngIf="userRole != 'BIZADMIN'">
<ng-template mat-tab-label>
<i class="material-icons icons">&#xe7fb;</i> Assigned Services
</ng-template>

6
ng-seed/src/app/appoinment/consultant-setting/consultant-setting/consultant-setting.component.scss
View File

@ -12,7 +12,7 @@ $black_60: rgba(0, 0, 0, 0.6);
}
.page-h{
color: #217e69;
font-family: sans-serif;
font-family: Didact Gothic, sans serif;
}
.form-field{
margin-left: -3rem;
@ -488,7 +488,7 @@ margin-top: 0;
}
.booking-url-input {
color: #567FC2;
font-family: zohopuvi-regular;
font-family: Didact Gothic, sans serif;
border: 0;
width: 100%;
background: #F9F9F9;
@ -538,7 +538,7 @@ line-height: 21px;
font-size: 15px;
text-decoration: underline;
margin-top: 13px;
font-family: zohopuvi-medium;
font-family: Didact Gothic, sans serif;
color: #666;
margin-right: 1rem;
}

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

@ -271,7 +271,7 @@ unavailability(action,obj) {
if(this.userRole == 'PRACTITIONER' || this.userRole == 'FRONTDESK'){
this.endUserURL = this.end_User_Url+'practitioner/'+this.usersList.randStr+"/details"
} else if (this.userRole == 'BADMIN'){
} else if (this.userRole == 'BIZADMIN'){
this.endUserURL = this.end_User_Url+'business/'+this.usersList['BusinessDetails'][0].randStr
}
@ -494,7 +494,7 @@ unavailability(action,obj) {
"practitionerId":userid
}
if(this.userRole == 'BADMIN'){
if(this.userRole == 'BIZADMIN'){
delete param.skills
}

7
ng-seed/src/app/appoinment/customers/customers-list/customers-list.component.scss
View File

@ -13,6 +13,7 @@ th.mat-header-cell, td.mat-cell, td.mat-footer-cell {
padding: 6px;
border-bottom-width: 1px;
border-bottom-style: solid;
border: 1px solid #fff;
}
.mat-expansion-panel-header {
display: inline!important;
@ -42,13 +43,17 @@ img {
}
tr.mat-header-row {
height: 30px!important;
background-color: #6e6e6e !important;
}
.mat-header-cell{
color: #fff !important;
}
.font-color{
font-weight: 600;
font-size: 14px;
}
.edit-color{
color: #178a78;
color: #6e6e6e;
}
.edit-color2{
color: #e12929ba;

2
ng-seed/src/app/appoinment/customers/customers-list/customers-list.component.ts
View File

@ -83,7 +83,7 @@ export class CustomersListComponent implements OnInit {
//this._pd.getTabStatusPdDetails(this.tabStatus)
this.recordStatus=false;
let user_role = localStorage.getItem('user_role');
if(user_role == 'PRACTITIONER' || user_role == 'BADMIN'){
if(user_role == 'PRACTITIONER' || user_role == 'BIZADMIN'){
let param ={"busId": localStorage.getItem('busId')}
this._app.getAppoinmentsListDetails(param).subscribe(res => {
if (res.status == 200) {

2
ng-seed/src/app/appoinment/front-desk/consultant-list/consultant-list.component.scss
View File

@ -17,7 +17,7 @@ h5{
}
.page-h{
color: #217e69;
font-family: sans-serif;
font-family: Didact Gothic, sans serif;
}
.scrollHV {
height: calc(100vh - 105px);

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

@ -13,6 +13,7 @@ th.mat-header-cell, td.mat-cell, td.mat-footer-cell {
padding: 6px;
border-bottom-width: 1px;
border-bottom-style: solid;
border: 1px solid #fff;
}
.mat-expansion-panel-header {
display: inline!important;
@ -44,13 +45,17 @@ img {
}
tr.mat-header-row {
height: 30px!important;
background-color: #6e6e6e !important;
}
.mat-header-cell{
color: #fff !important;
}
.font-color{
font-weight: 600;
font-size: 14px;
}
.edit-color{
color: #178a78;
color: #6e6e6e;
}
.edit-color2{
color: #e12929ba;

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

@ -12,7 +12,7 @@
<mat-error *ngIf="myError('businessselect', 'required')">Username is required</mat-error>
<mat-error *ngIf="myError('businessselect', 'maxlength')">Limit exceed</mat-error>
</mat-form-field> -->
<mat-form-field appearance="outline" class="mat-pane" *ngIf="userrole != 'BADMIN'">
<mat-form-field appearance="outline" class="mat-pane" *ngIf="userrole != 'BIZADMIN'">
<mat-label>Business</mat-label>
<mat-select placeholder="Select Business" formControlName="businessselect" required [disabled]="disableBus ==0">
<mat-option>--</mat-option>
@ -103,7 +103,7 @@
<div mat-dialog-actions>
<button mat-button type="submit" class="mat-green" mat-raised-button >{{action}}</button>
<button mat-button type="button" (click)="closeDialog()" >Cancel</button>
<button mat-button type="button" (click)="close()" >Cancel</button>
</div>
</ng-scrollbar>
</form>

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

@ -58,7 +58,7 @@ input[type=file]::file-selector-button {
}
.imgSizeValidation{
color: red;
font-family: ui-serif;
font-family: Didact Gothic, sans serif;
}
.user-mate{
::ng-deep .mat-form-field-subscript-wrapper {

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

@ -29,7 +29,7 @@ export class AddUserComponent implements OnInit {
local_data:any;
url: string | ArrayBuffer;
businessList: any;
public role = [{'name':'BADMIN'},{'name':'PRACTITIONER'},{'name':'FRONTDESK'}]
public role = [{'name':'BIZADMIN'},{'name':'PRACTITIONER'},{'name':'FRONTDESK'}]
imageViewStatus: boolean;
formData:any=[];
private apiUrl = environment.apiEndpoint;
@ -127,7 +127,7 @@ export class AddUserComponent implements OnInit {
validateUsernameAvailability(control: FormControl) {
let userRole = localStorage.getItem('user_role')
let param;
if(userRole == 'BADMIN'){
if(userRole == 'BIZADMIN'){
param ={"busId": localStorage.getItem('busId')}
}else {
param = {}
@ -137,13 +137,18 @@ export class AddUserComponent implements OnInit {
map((response:any) => {
console.log(response)
let response1 = response.data
let tmp=[];
if(response1 instanceof Array){
let tmp=[];
response.data.forEach(element => {
tmp.push(element.email)
});
console.log(tmp,`${control.value}`);
return !tmp.includes(`${control.value}`) ? null : { usernameTaken: true };
response.data.forEach(element => {
tmp.push(element.email)
});
console.log(tmp,`${control.value}`);
return !tmp.includes(`${control.value}`) ? null : { usernameTaken: true };
}else{
return null
}
})
);
}
@ -165,7 +170,7 @@ export class AddUserComponent implements OnInit {
this.form.controls['businessselect'].setValue(localStorage.getItem('busNameID'))
if(this.disableBus == 0){
this.form.controls['role'].setValue('BADMIN')
this.form.controls['role'].setValue('BIZADMIN')
}
// }
@ -203,7 +208,7 @@ export class AddUserComponent implements OnInit {
submit(){
console.log(this.form.value);
if(this.userrole == 'BADMIN'){
if(this.userrole == 'BIZADMIN'){
this.form.controls['businessselect'].clearValidators();
this.form.controls['businessselect'].updateValueAndValidity();
this.busId = localStorage.getItem('busId')

12
ng-seed/src/app/appoinment/user/user-list/user-list.component.html
View File

@ -21,7 +21,7 @@
<mat-option value="All" (click)="applyFilter(null)">All</mat-option>
<mat-option value="SADMIN" (click)="applyFilter('SADMIN')">SADMIN</mat-option>
<mat-option value="PRACTITIONER"(click)="applyFilter('PRACTITIONER')"> PRACTITIONER</mat-option>
<mat-option value="BADMIN" (click)="applyFilter('BADMIN')">BADMIN</mat-option>
<mat-option value="BIZADMIN" (click)="applyFilter('BIZADMIN')">BIZADMIN</mat-option>
</mat-select>
</mat-form-field> -->
<button mat-button (click)="openDialog('Add',{})" class="button">Add Users</button>
@ -31,7 +31,7 @@
<div class="main-content" fxLayout="row" fxLayoutAlign="center start">
<div fxFlex.gt-sm="90" fxFlex.gt-xs="95" fxFlex="100">
<div class="messages-list material fullscreen">
<mat-accordion >
<mat-accordion *ngIf="!recordStatus">
<!-- <mat-expansion-panel>
<mat-expansion-panel-header > -->
<!-- <div class="example-container mat-elevation-z8 "> -->
@ -118,10 +118,10 @@
</mat-expansion-panel> -->
</mat-accordion>
<mat-card-content *ngIf="recordStatus">
<h5 align="center" style="font-weight: bold;
color: brown;">No Data Available</h5>
</mat-card-content>
<mat-card-content *ngIf="recordStatus">
<h5 align="center" style="font-weight: bold;
color: brown;">No Data Available</h5>
</mat-card-content>
</div>
</div>
</div>

14
ng-seed/src/app/appoinment/user/user-list/user-list.component.scss
View File

@ -13,6 +13,7 @@ th.mat-header-cell, td.mat-cell, td.mat-footer-cell {
padding: 6px;
border-bottom-width: 1px;
border-bottom-style: solid;
border: 1px solid #fff;
}
.mat-expansion-panel-header {
display: inline!important;
@ -44,13 +45,17 @@ img {
}
tr.mat-header-row {
height: 30px!important;
background-color: #6e6e6e !important;
}
.mat-header-cell{
color: #fff !important;
}
.font-color{
font-weight: 600;
font-size: 14px;
}
.edit-color{
color: #178a78;
color: #6e6e6e;
}
.edit-color2{
color: #e12929ba;
@ -105,6 +110,7 @@ th.mat-header-cell, td.mat-cell, td.mat-footer-cell {
padding: 6px;
border-bottom-width: 1px;
border-bottom-style: solid;
border: 1px solid #fff;
}
.mat-expansion-panel-header {
display: inline!important;
@ -136,13 +142,17 @@ img {
}
tr.mat-header-row {
height: 30px!important;
background-color: #6e6e6e !important;
}
.mat-header-cell{
color: #fff !important;
}
.font-color{
font-weight: 600;
font-size: 14px;
}
.edit-color{
color: rgba(0, 0, 0, 0.54);
color: #6e6e6e;
}
.edit-color:hover {
color: #4caf50;

22
ng-seed/src/app/appoinment/user/user-list/user-list.component.ts
View File

@ -59,7 +59,7 @@ export class UserListComponent implements OnInit {
@ViewChild(MatPaginator) paginator: MatPaginator;
private apiUrl = environment.apiEndpoint;
recordStatus: boolean= true;
recordStatus: boolean;
usersListLength: any=5;
businessList: any;
isLoading = true
@ -73,6 +73,7 @@ export class UserListComponent implements OnInit {
}
ngOnInit(): void {
this.recordStatus=false;
// this.dataSource = new MatTableDataSource(ELEMENT_DATA)
this.getUsersList()
this.getBusinessList()
@ -97,8 +98,9 @@ export class UserListComponent implements OnInit {
}
getUsersList() {
let userRole = localStorage.getItem('user_role')
let userID = localStorage.getItem('user_id')
let param;
if(userRole == 'BADMIN'){
if(userRole == 'BIZADMIN'){
param ={"busId": localStorage.getItem('busId')}
}else {
param = {}
@ -110,14 +112,16 @@ export class UserListComponent implements OnInit {
usersList.sort((a: any, b: any) => {
return b.id - a.id;
});
usersList = usersList.filter((value,key)=>{
return value.id != userID
});
usersList.forEach((element, index) => {
element.index = index
element.index = index
});
this.usersList['data'] = usersList;
this.usersListLength = res.data.length;
this.usersListLength = usersList.length;
this.recordStatus=false;
}
else{
@ -151,10 +155,10 @@ export class UserListComponent implements OnInit {
// roleFilter(param){
// this.getUsersList()
// if(param == 'BADMIN'){
// if(param == 'BIZADMIN'){
// console.log(this.usersList['data'])
// let userList:any = this.usersList['data']
// this.usersList['data'] = userList.filter(val => val.role == 'BADMIN')
// this.usersList['data'] = userList.filter(val => val.role == 'BIZADMIN')
// console.log(this.usersList['data'])
// } else if(param == 'FRONTDESK'){
// console.log(this.usersList['data'])
@ -221,7 +225,7 @@ export class UserListComponent implements OnInit {
dialogRef.afterClosed().subscribe(result => {
localStorage.setItem('go_admin','1')
let user_role = localStorage.getItem('user_role')
if(user_role != 'BADMIN'){
if(user_role != 'BIZADMIN'){
localStorage.setItem('busNameID',null)
}
if(result != undefined){
@ -286,7 +290,7 @@ export class UserListComponent implements OnInit {
if (res.status == 200) {
localStorage.setItem('go_admin','1')
let user_role = localStorage.getItem('user_role')
if(user_role != 'BADMIN'){
if(user_role != 'BIZADMIN'){
localStorage.setItem('busNameID',null)
}

8
ng-seed/src/app/end-user/booking-summary/booking-summary.component.html
View File

@ -77,7 +77,7 @@
<span class="head">Booked On</span>
</div>
<div fxFlex.xs="75" fxFlex.sm="75" fxFlex.md="75" fxFlex.lg="75" fxFlex.xl="75">
<span>: {{bookingSummary.createdAt | date:'dd/MM/yyyy'}}</span>
<span>: {{bookingSummary.createdAt2 | date:'dd/MM/yyyy'}}</span>
</div>
</div>
<div fxLayout="row wrap" style="margin-bottom: 20px;">
@ -137,10 +137,10 @@
<!-- <div fxFlex.xs="25" fxFlex.sm="25" fxFlex.md="25" fxFlex.lg="25" fxFlex.xl="25">
<button mat-raised-button><mat-icon>add</mat-icon> Add To Calender</button>
</div> -->
<div fxFlex.xs="50" fxFlex.sm="50" fxFlex.md="50" fxFlex.lg="50" fxFlex.xl="50">
<button mat-raised-button (click)="download()"><mat-icon>download</mat-icon> Download as PDF</button>
<div fxFlex.xs="50" fxFlex.sm="50" fxFlex.md="50" fxFlex.lg="50" fxFlex.xl="50" style="margin-bottom: 2px;">
<button mat-raised-button (click)="download()"> Download as PDF</button>
</div>
<div fxFlex.xs="50" fxFlex.sm="50" fxFlex.md="50" fxFlex.lg="50" fxFlex.xl="50" fxLayoutAlign="end">
<div fxFlex.xs="50" fxFlex.sm="50" fxFlex.md="50" fxFlex.lg="50" fxFlex.xl="50" fxLayoutAlign="end center" style="margin-bottom: 2px;">
<button mat-raised-button (click)="addCalendarEvent()">Add To Google Calander</button>
</div>
</div>

2
ng-seed/src/app/end-user/business-centers/centers-list.component.scss
View File

@ -17,7 +17,7 @@ $black_60: rgba(0, 0, 0, 0.6);
}
.page-h{
color: #217e69;
font-family: sans-serif;
font-family: Didact Gothic, sans serif;
}
.consultant-list-card {
background: $white;

2
ng-seed/src/app/end-user/consultants/consultants-list.component.scss
View File

@ -29,7 +29,7 @@ h5{
}
.page-h{
color: #217e69;
font-family: sans-serif;
font-family: Didact Gothic, sans serif;
}
.scrollHV {
height: calc(100vh - 211px);

24
ng-seed/src/app/end-user/customer-info/customer-info.component.html
View File

@ -43,25 +43,23 @@
</div>
<div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="50" fxFlex.lg="50" fxFlex.xl="50" class="p-gap" fxLayoutAlign="center center">
<div fxLayout="row">
<div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="70" fxFlex.lg="70" fxFlex.xl="70">
<mat-form-field style="width: 86%;">
<mat-form-field style="width: 80%;">
<input matInput type="text" appMobileNumberPattern maxlength="10" minlength="10" placeholder="Phone No" name="phone" formControlName="phoneNo" [readonly]="noChangeNo == '1'" required>
<mat-error *ngIf="myError('phoneNo', 'required')">Contact No is required</mat-error>
<mat-error *ngIf="myError('phoneNo', 'pattern')">Invalid Contact No </mat-error>
<mat-error *ngIf="myError('phoneNo', 'minlength')"> Contact No must be at least 10 characters</mat-error>
<mat-error *ngIf="myError('phoneNo', 'maxlength')">Limit exceed</mat-error>
</mat-form-field>
</div>
<div class="flexAlign" fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="30" fxFlex.lg="30" fxFlex.xl="30">
<div *ngIf="verifyOTP != '1'">
<button mat-raised-button type="button" (click)="getOTP(1)" [disabled]="myError('phoneNo', 'minlength') || myError('phoneNo', 'required')" color="primary" class="mr-1 mb-1">Get OTP</button>
</div>
<span *ngIf="verifyOTP == '1'"><mat-icon style="color: #4CAF50;">verified</mat-icon></span>
</div>
<div matSuffix *ngIf="verifyOTP != '1'">
<button mat-raised-button type="button" (click)="getOTP(1)" [disabled]="myError('phoneNo', 'minlength') || myError('phoneNo', 'required')" color="primary" class="mr-1 mb-1">Get OTP</button>
</div>
<span matSuffix *ngIf="verifyOTP == '1'"><mat-icon style="color: #4CAF50;">verified</mat-icon></span>
</mat-form-field>
<div id="sign-in-button"></div>
</div>
</div>
</div>
<div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="50" fxFlex.lg="50" fxFlex.xl="50" class="p-gap" fxLayoutAlign="center center">
<mat-form-field style="width: 80%">
<input matInput placeholder="Address" type="text" name="address" formControlName="address_1">

4
ng-seed/src/app/end-user/customer-info/customer-info.component.scss
View File

@ -148,3 +148,7 @@ mat-toolbar{
.flexAlign{
display: contents !important;
}
.mat-dialog-container{
overflow: hidden !important;
padding: 32px !important;
}

2
ng-seed/src/app/end-user/customer-info/customer-info.component.ts
View File

@ -145,7 +145,7 @@ export class CustomerInfoComponent implements OnInit {
openOtp(event) {
const dialogRef = this.dialog.open(OptVerifyComponent, {
width: '40%',
// width: '40%',
// height: '100%',
// maxWidth: '38vw',
// position: { right: '0' },

2
ng-seed/src/app/end-user/customer-info/opt-verify/opt-verify.component.html
View File

@ -4,7 +4,7 @@
<!-- <mat-card class="login-session"> -->
<h2 class="base-border mat-text-warn mb-1">OTP</h2>
<div fxLayout="row">
<div fxFlex.xs="80" fxFlex.sm="80" fxFlex.md="80" fxFlex.lg="80" fxFlex.xl="80">
<div fxFlex.xs="70" fxFlex.sm="70" fxFlex.md="70" fxFlex.lg="70" fxFlex.xl="70">
<mat-form-field style="width: 80%;">
<input matInput placeholder="Enter OTP" [(ngModel)]="getOtpvalue" type="text" maxlength="6">
</mat-form-field>

2
ng-seed/src/app/end-user/doctor-profile/doctor-profile.component.html
View File

@ -168,4 +168,4 @@
</div>
</div>
</div> -->
<!-- <ngx-spinner bdColor = "rgba(0, 0, 0, 0.8)" size = "medium" color = "#178a78" type = "square-jelly-box" [fullScreen] = "true"><p style="color: white" > Please Wait...... </p></ngx-spinner> -->
<ngx-spinner bdColor = "rgba(0, 0, 0, 0.8)" size = "medium" color = "#178a78" type = "square-jelly-box" [fullScreen] = "true"><p style="color: white" > Please Wait...... </p></ngx-spinner>

2
ng-seed/src/app/end-user/doctor-profile/doctor-profile.component.scss
View File

@ -151,7 +151,7 @@
zoom: 90%;
}
.doctor-profile{
font-family: sans-serif;
font-family: Didact Gothic, sans serif;
padding: 2rem 2rem 2rem 2rem;
.padding-lt{

14
ng-seed/src/app/end-user/doctor-profile/doctor-profile.component.ts
View File

@ -23,7 +23,7 @@ export class DoctorProfileComponent implements OnInit {
logo: any;
currency:any=[];
constructor( private _location: Location,private router:Router,public end_user:EndUserService,private spinner:NgxSpinnerService) {
// this.spinner.show()
this.spinner.show()
let URL = this.router.url;
console.log(URL)
let URL_AS_LIST = URL.split('/');
@ -48,6 +48,8 @@ export class DoctorProfileComponent implements OnInit {
console.log('booked', res);
if(res.length>0){
localStorage.setItem('busName',res[0].business[0].busName)
localStorage.setItem('logo',res[0].business[0].logo)
this.bookedAppointment = res[0].user[0]
localStorage.setItem('user_id',res[0].user[0].id)
this.dp = this.apiUrl+'imageViewer?img_name='+ this.bookedAppointment.logo
@ -65,10 +67,10 @@ export class DoctorProfileComponent implements OnInit {
console.log(URL_AS_LIST);
// this.router.navigate(['customer/business/'+URL_AS_LIST[3]])
}
// setTimeout(() => {
// /** spinner ends after 5 seconds */
// this.spinner.hide();
// }, 1000);
setTimeout(() => {
/** spinner ends after 5 seconds */
this.spinner.hide();
}, 1000);
})
}
@ -146,7 +148,7 @@ export class DoctorProfileComponent implements OnInit {
[0].workingHours)
this.end_user.appointmentBooked.next(this.ServicesMapDetailsList)
this.bookedAppointment = this.ServicesMapDetailsList[0].user[0]
this.bookedAppointment = this.ServicesMapDetailsList[0].user[0]
this.dp = this.apiUrl+'imageViewer?img_name='+ this.bookedAppointment.logo
console.log(this.dp)
this.profileDetails = this.bookedAppointment.practitionerInfos[0]

6
ng-seed/src/app/end-user/search-category/search-category.component.scss
View File

@ -160,7 +160,7 @@ $black_60: rgba(0, 0, 0, 0.6);
}
.page-h{
color: #217e69;
font-family: sans-serif;
font-family: Didact Gothic, sans serif;
}
.consultant-thumb {
// position: absolute;
@ -227,7 +227,7 @@ $black_60: rgba(0, 0, 0, 0.6);
color: #ffff;
}
.edit-color{
color: white;
color: #6e6e6e;
}
.edit-color:hover {
color: #4caf50;
@ -255,7 +255,7 @@ $black_60: rgba(0, 0, 0, 0.6);
}
.page-h{
color: #217e69;
font-family: sans-serif;
font-family: Didact Gothic, sans serif;
}
.scrollHV {
height: calc(100vh - 390px);

4
ng-seed/src/app/end-user/service-list-details/service-list.component.scss
View File

@ -38,7 +38,7 @@ $main-color: #f44336;
}
.page-h{
color: #217e69;
font-family: sans-serif;
font-family: Didact Gothic, sans serif;
}
.consultant-thumb {
// position: absolute;
@ -108,7 +108,7 @@ $main-color: #f44336;
color: #ffff;
}
.edit-color{
color: white;
color: #6e6e6e;
}
.edit-color:hover {
color: #4caf50;

2
ng-seed/src/app/end-user/slot-booking/slot-booking-details.component.scss
View File

@ -252,7 +252,7 @@ h4{
// }
p {
font-family: Lato;
font-family: Didact Gothic, sans serif;
}
.main-part {
background-color: #fff;

4
ng-seed/src/app/layouts/admin/admin-layout.component.html
View File

@ -251,11 +251,11 @@
</button>
</mat-menu> -->
<button (click)="end.toggle()" mat-icon-button class="ml-xs overflow-visible">
<mat-icon>notifications</mat-icon>
<mat-icon style="color: #fff !important;">notifications</mat-icon>
<span class="notification-label">2</span>
</button>
<button [mat-menu-trigger-for]="user" mat-icon-button class="ml-xs">
<mat-icon>person</mat-icon>
<mat-icon style="color: #fff !important;">person</mat-icon>
</button>
<mat-menu #user="matMenu" class="opt-menu" x-position="before">
<!-- <div mat-menu-item class="head-menu grad-blue">

2
ng-seed/src/app/layouts/role-menu-items.pipe.ts
View File

@ -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 != "consultant-setting" && val.state!="consultants" && val.state!="services" && val.state!= "consultant-list" && val.state!= "mail-log");
case 'BADMIN': return value.filter(val=>val.state !="business" && val.state!="consultants" && val.state!="appoinments" && val.state!= "consultant-list");
case 'BIZADMIN': return value.filter(val=>val.state !="business" && val.state!="consultants" && val.state!="appoinments" && val.state!= "consultant-list");
case 'PRACTITIONER': return value.filter(val=>val.state !="business" && val.state!="consultants" && val.state!="users" && val.state!="services" && val.state!= "consultant-list" && val.state!= "mail-log");
case 'FRONTDESK': return value.filter(val=>val.state !="business" && val.state!="consultants" && val.state!="users" && val.state != "home" && val.state!="customers" && val.state!= "consultant-list" && val.state!= "mail-log");
// case 'PRACTITIONER':

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

@ -56,9 +56,9 @@ export class LoginComponent {
if(res.role == 'PRACTITIONER'){
localStorage.setItem('busNameID',res.busId)
this.getUserDetails()
}else if(user_role == 'BADMIN'){
}else if(user_role == 'BIZADMIN'){
this.router.navigate(['/services'])
}else if(user_role != 'BADMIN' && res.role != 'PRACTITIONER'){
}else if(user_role != 'BIZADMIN' && res.role != 'PRACTITIONER'){
this.router.navigate(['/home'])
}

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

@ -27,7 +27,7 @@ $main-content:#f2f4f8;
//header
$main-header-bg-color:#fff;
$main-header-bg-color:#3f4041;
$main-header-text-color:rgba(mat-color($foreground, base), 0.87);
$card-spacing:1.5rem;
$user-profile-name-color:#fff;

10
ng-seed/src/assets/styles/scss/core/_main-panel.scss
View File

@ -250,4 +250,12 @@ display: none !important;
left: -100%;
}
}
}
tr.mat-header-row {
height: 30px !important;
background-color: #6e6e6e !important;
}
.mat-header-cell{
color: #fff !important;
}

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

@ -480,7 +480,7 @@
.sidebar-green {
.sidebar-panel {
.bg-overlay {
background: rgba(0, 150, 136, 0.8)!important;
background: #3f4041 !important;
}
}
}

5
ng-seed/src/assets/styles/scss/core/_scaffolding.scss
View File

@ -1,11 +1,14 @@
/*---------------
1.1 Scaffolding
---------------*/
$mat-font-family: Roboto, 'Helvetica Neue', sans-serif;
$mat-font-family: Didact Gothic, sans serif;
html {
font-size: 16px;
}
*{
font-family: $mat-font-family;
}
html, body {
width: 100%;

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

@ -10,7 +10,7 @@ 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.17:8080/api/',
// apiEndpoint:'http://192.168.1.19:8080/api/',
apiEndpoint:'https://api.venbait.in/api/',