Merge branch 'enad-pre-live' of https://gitlab.com/haroon6138/mohemmionic5 into enad-pre-live

# Conflicts:
#	Mohem/package.json
enad-pre-live
enadhilal 4 years ago
commit fa94802708

@ -230,7 +230,7 @@ export class FileUploaderComponent implements OnInit {
}); });
}); });
} }
getImgContent(imgFile, data): SafeUrl { getImgContent(imgFile): SafeUrl {
console.log(imgFile); console.log(imgFile);
return this.sanitizer.bypassSecurityTrustUrl(imgFile); return this.sanitizer.bypassSecurityTrustUrl(imgFile);
} }

@ -141,7 +141,7 @@
<!-- <img slot="start" style=" height: 55px;"src="../assets/imgs/add-photo.svg"> --> <!-- <img slot="start" style=" height: 55px;"src="../assets/imgs/add-photo.svg"> -->
<!-- <input end class="upload" type="file" ng2FileSelect [uploader]="uploader" <!-- <input end class="upload" type="file" ng2FileSelect [uploader]="uploader"
(change)="onFileSelected($event)" (click)="onFileSelectedclick($event)" /> --> (change)="onFileSelected($event)" (click)="onFileSelectedclick($event)" /> -->
<file-uploader (fileSelected)="attachmentSelected($event)" [maxFileSize]="maxFileSize" <file-uploader (fileSelected)="attachmentSelected($event)"
[multiupload]="true" [selectedAttachment]="selectedPicture"> [multiupload]="true" [selectedAttachment]="selectedPicture">
</file-uploader> </file-uploader>
</div> </div>

@ -12,7 +12,7 @@
<div > <div >
<ion-card> <ion-card>
<ion-card-header> <ion-card-header>
<img *ngIf="!item.itemAttachments[0] || !item.itemAttachments[0].content" src="assets/imgs/no-images.png" /> <img *ngIf="!itemDetails.itemAttachments[0] || !itemDetails.itemAttachments[0].content" src="assets/imgs/no-images.png" />
<!-- <img *ngIf="itemDetails.itemAttachments[0]" [src]="item.itemAttachments[0]" /> <!-- <img *ngIf="itemDetails.itemAttachments[0]" [src]="item.itemAttachments[0]" />
<img *ngIf="!itemDetails.itemAttachments[0]" src="assets/imgs/no-images.png" /> --> <img *ngIf="!itemDetails.itemAttachments[0]" src="assets/imgs/no-images.png" /> -->
<ion-slides *ngIf="itemDetails.itemAttachments.length>0"> <ion-slides *ngIf="itemDetails.itemAttachments.length>0">

Binary file not shown.

After

Width:  |  Height:  |  Size: 914 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 914 B

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 888 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 888 B

After

Width:  |  Height:  |  Size: 1.3 KiB

Loading…
Cancel
Save