service assigned Fix

This commit is contained in:
surendar.m@watermelon.us 2023-03-30 12:09:30 +05:30
parent cc5e7d55bd
commit bd082f2fde
6 changed files with 52 additions and 49 deletions

View File

@ -343,23 +343,37 @@
<!-- <mat-error *ngIf="myError('businessselect', 'required')">role is required</mat-error> --> <!-- <mat-error *ngIf="myError('businessselect', 'required')">role is required</mat-error> -->
</mat-form-field> </mat-form-field>
</div> </div>
<mat-card class="p-1" *ngFor="let details of servicesList_array;let i = index"> <div *ngIf="servicesList_array.length != 0">
<div fxLayout="row" class="flexCard"> <ng-scrollbar class="scrollHV">
<div fxFlex.xs="10" fxFlex.sm="10" fxFlex.md="10" fxFlex.lg="10" fxFlex.xl="10"> <mat-card class="p-1" *ngFor="let details of servicesList_array;let i = index">
<img mat-list-avatar src="https://prodaphstorage.blob.core.windows.net/specialties/bdf0cf0d-754e-4254-aaf7-fdc7aedd7c35.jpg" width="50" height="50" > <div fxLayout="row" class="flexCard">
</div> <div fxFlex.xs="10" fxFlex.sm="10" fxFlex.md="10" fxFlex.lg="10" fxFlex.xl="10">
<div fxFlex.xs="70" fxFlex.sm="70" fxFlex.md="70" fxFlex.lg="70" fxFlex.xl="70"> <img mat-list-avatar src="https://prodaphstorage.blob.core.windows.net/specialties/bdf0cf0d-754e-4254-aaf7-fdc7aedd7c35.jpg" width="50" height="50" >
<div class="service-info">{{details.servicesName}}</div> </div>
<div class="service-info2">{{servicesList_data[i].duration.length>0 ? servicesList_data[i].duration[0].durationNew : details.duration}} Mins | <span class="indianSymbol">{{servicesList_data[i].duration.length>0 ? servicesList_data[i].duration[0].fees : 0}}</span></div> <div fxFlex.xs="70" fxFlex.sm="70" fxFlex.md="70" fxFlex.lg="70" fxFlex.xl="70">
<div class="info" (click)="asignService(details,i)">+ Customize the price and duration of a service.</div> <div class="service-info">{{details.servicesName}}</div>
</div> <div class="service-info2">{{servicesList_data[i].duration.length>0 ? servicesList_data[i].duration[0].durationNew : details.duration}} Mins | <span class="indianSymbol">{{servicesList_data[i].duration.length>0 ? servicesList_data[i].duration[0].fees : 0}}</span></div>
<div fxFlex.xs="15" fxFlex.sm="15" fxFlex.md="15" fxFlex.lg="15" fxFlex.xl="15" fxLayoutAlign="center center"> <div class="info" (click)="asignService(details,i)">+ Customize the price and duration of a service.</div>
<span style="color: green;">Active</span> </div>
</div> <div fxFlex.xs="15" fxFlex.sm="15" fxFlex.md="15" fxFlex.lg="15" fxFlex.xl="15" fxLayoutAlign="center center">
</div> <span style="color: green;">Active</span>
</div>
</div>
</mat-card> </mat-card>
</ng-scrollbar>
</div>
<div *ngIf="servicesList_array.length == 0">
<div fxLayout="row" class="flexCard">
<div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="100" fxFlex.lg="100" fxFlex.xl="100" fxLayoutAlign="center center">
<div><img src="assets/images/service.png" width="300" height="300"></div>
</div>
</div>
<div fxLayout="row" class="flexCard">
<div fxFlex.xs="100" fxFlex.sm="100" fxFlex.md="100" fxFlex.lg="100" fxFlex.xl="100" fxLayoutAlign="center center">
<p class="noAssignedService">No Service Assigned</p>
</div>
</div>
</div>
</mat-tab> </mat-tab>
<mat-tab> <mat-tab>

View File

@ -408,3 +408,10 @@ margin-bottom: 10rem;
display: contents !important; display: contents !important;
} }
} }
.noAssignedService{
font-size: large;
color: #847a7a;
margin: 0;
text-align: center;
}

View File

@ -118,6 +118,7 @@ workingDialog(action,obj) {
} }
} ); } );
} }
getAssignedList(busId) { getAssignedList(busId) {
this._api.getAssignedDetails(busId).subscribe(res => { this._api.getAssignedDetails(busId).subscribe(res => {
console.log(res) console.log(res)
@ -142,10 +143,9 @@ workingDialog(action,obj) {
}); });
}); });
console.log(this.servicesList_array) console.log(this.servicesList_array)
this.getAssignedList(this.usersList.busId)
} }
} ); this.getAssignedList(this.usersList.busId)
});
// this.assignService = this.checkedArray // this.assignService = this.checkedArray
} }
@ -178,22 +178,7 @@ workingDialog(action,obj) {
// }); // });
} }
workingDialog(action,obj) {
obj.action = action;
const dialogRef = this.dialog.open(ExtraWorkingHoursComponent, {
width: '48%',
height: '100%',
// maxWidth: '38vw',
position: { right: '0' },
data:obj
});
// dialogRef.afterClosed().subscribe(result => {
// if(result != undefined){
// console.log(result)
// this.formAddUpdateAndDelete(result,result.data)
// }
// });
}
asignService(param,index){ asignService(param,index){
console.log(param) console.log(param)

View File

@ -3,8 +3,7 @@
<div class="popup-header"> <div class="popup-header">
<h5> <h5>
Edit Working Hours Edit Working Hours
<button mat-icon-button type="button" matTooltip="Close" class="button" matTooltipPosition="above" (click)="close()" <button mat-icon-button type="button" matTooltip="Close" class="button" matTooltipPosition="above" (click)="close()">
>
<mat-icon>close</mat-icon> <mat-icon>close</mat-icon>
</button> </button>
</h5> </h5>
@ -14,13 +13,7 @@
<div *ngFor="let filter of filtersFormArray.controls; let i = index;"> <div *ngFor="let filter of filtersFormArray.controls; let i = index;">
<div [formGroupName]="i" class="container"> <div [formGroupName]="i" class="container">
<div class="dis-flexs"> <div class="dis-flexs">
<div class="label-name" formControlName="day"> <mat-checkbox class="example-margin mt-2" formControlName="day" (change)="showOptions($event)">Sunday</mat-checkbox>
<input id="color-toggle" type="checkbox" *ngIf="i == 0">
<span class="labelname checkbox-default-blue checked"
[value]="day">
<label *ngIf="i == 0">Sunday</label>
</span>
</div>
<mat-form-field appearance="outline"> <mat-form-field appearance="outline">
<mat-select <mat-select
placeholder="Select Time" placeholder="Select Time"

View File

@ -1,5 +1,6 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { FormArray, FormBuilder, FormGroup } from '@angular/forms'; import { FormArray, FormBuilder, FormGroup } from '@angular/forms';
import { MatCheckboxChange } from '@angular/material/checkbox';
import { MatDialogRef } from '@angular/material/dialog'; import { MatDialogRef } from '@angular/material/dialog';
@Component({ @Component({
@ -301,6 +302,9 @@ getFilterGroupAtIndex(index) {
onSubmit() { onSubmit() {
console.log(this.datainputForm.value); console.log(this.datainputForm.value);
} }
showOptions(event:any): void { showOptions(event:MatCheckboxChange): void {
console.log(event.checked);} console.log(event.checked);
// this.form['value'].admin_checked = event.checked
// console.log(this.form['value'].admin_checked)
}
} }

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB