Merge branch 'master' of bitbucket.org:venbainformationtechnology/appointments_frontend

This commit is contained in:
Surendiran 2023-05-29 18:09:09 +05:30
commit e0d7a76f98
2 changed files with 17 additions and 4 deletions

View File

@ -687,14 +687,27 @@
<mat-error *ngIf="myErrorBusiness('currency', 'required')">currency is required</mat-error>
</mat-form-field>
</div>
<div fxLayout="row wrap">
<div class="form-group label-container">
<div fxFlex.xs="70" fxFlex.sm="70" fxFlex.md="70" fxFlex.lg="70" fxFlex.xl="70">
<label >Business Logo</label><br />
<img *ngIf="imageViewStatus != true" class="image mb-2" [src]="image_view(BusinessDetailsdata.logo)" height="150" width="150"/>
<img *ngIf="imageViewStatus == true" class="image mb-2" [src]="url" height="150" width="150"><br/>
<input *ngIf="isEditableBusiness == true" type='file' accept="image/*" data-max-size="2048" style="width: 50%;" (change)="onSelectFile($event)" formControlName="logo"><br>
<span *ngIf="imageViewStatus != true && isEditableBusiness == true" class="imgSizeValidation">Upload Below 2MB <br> Supported File (jpg,jpeg and png)</span>
</div>
</div>
<!-- <div fxLayout="row wrap">
<mat-label>Business Logo</mat-label>
<div fxFlex.xs="70" fxFlex.sm="70" fxFlex.md="70" fxFlex.lg="70" fxFlex.xl="70">
<img *ngIf="imageViewStatus != true" class="image mb-2" [src]="image_view(BusinessDetailsdata.logo)" height="150" width="150"/>
<img *ngIf="imageViewStatus == true" class="image mb-2" [src]="url" height="150" width="150"><br/>
<input *ngIf="isEditableBusiness == true" type='file' accept="image/*" data-max-size="2048" style="width: 50%;" (change)="onSelectFile($event)" formControlName="logo"><br>
<span *ngIf="imageViewStatus != true && isEditableBusiness == true" class="imgSizeValidation">Upload Below 2MB <br> Supported File (jpg,jpeg and png)</span>
</div>
</div>
</div> -->
<!--

View File

@ -276,8 +276,8 @@ if(this.getHours.length != 0){
const filteredTimes = this.slots.filter(time => new Date(time) >= firstSlt && new Date(time) <= lastSlt);
console.log(resultArray,filteredTimes);
let result = filteredTimes.pop();
console.log(result);
// let result = filteredTimes.pop();
//console.log(result);
this.slots.forEach(element => {
if(element <date2){
console.log(element);