some changes

This commit is contained in:
Eudes Inácio
2023-11-10 15:37:12 +01:00
parent d864c70b9f
commit 28432cc874
10 changed files with 382 additions and 240 deletions
@@ -36,13 +36,21 @@
<!-- Captured -->
<div class="ion-item-container-no-border" *ngIf="capturedImage">
<div class="ion-item-container-no-border" *ngIf="captureContent">
<ion-label class="attached-title pb-10">Fotografia Anexada</ion-label>
<div class="d-flex justify-content-between">
<div class="d-flex">
<ion-thumbnail slot="start">
<ion-img [(ngModel)]="capturedImage" name="image" ngDefaultControl [src]="capturedImage"></ion-img>
<ion-thumbnail *ngIf="fileType == 'image'" slot="start">
<ion-img [(ngModel)]="captureContent" name="image" ngDefaultControl [src]="captureContent"></ion-img>
</ion-thumbnail>
<ion-thumbnail slot="start">
<video *ngIf="fileType == 'video'" width="70" height="70" controls="controls" preload="metadata" autoplay="autoplay" webkit-playsinline="webkit-playsinline">
<source type="video/mp4" [src]="captureContent">
</video>
</ion-thumbnail>
<ion-label class="pl-10">
<p>{{capturedImageTitle}}</p>
@@ -57,28 +65,31 @@
<!-- Current -->
<div class="ion-item-container-no-border mb-20" *ngIf="publication && !( publication.FileBase64 == 'data:image/jpg;base64,null' || publication.FileBase64 == '' ) && !capturedImage">
<!-- <ion-label class="attached-title pb-10">Fotografia Anexada</ion-label> -->
<div class="d-flex justify-content-between">
<div class="d-flex">
<ion-thumbnail slot="start">
<ion-img [(ngModel)]="publication.FileBase64" name="image" ngDefaultControl [src]="publication.FileBase64"></ion-img>
</ion-thumbnail>
<ion-label class="pl-10">
<p>{{publication.OriginalFileName}}.{{publication.FileExtension}}</p>
<p hidden>size</p>
</ion-label>
<div *ngIf="!captureContent">
<div class="ion-item-container-no-border mb-20" *ngIf="publication && !( publication.FileBase64 == 'data:image/jpg;base64,null' || publication.FileBase64 == '' ) && !capturedImage">
<!-- <ion-label class="attached-title pb-10">Fotografia Anexada</ion-label> -->
<div class="d-flex justify-content-between">
<div class="d-flex">
<ion-thumbnail slot="start">
<ion-img [(ngModel)]="publication.FileBase64" name="image" ngDefaultControl [src]="publication.FileBase64"></ion-img>
</ion-thumbnail>
<ion-label class="pl-10">
<p>{{publication.OriginalFileName}}.{{publication.FileExtension}}</p>
<p hidden>size</p>
</ion-label>
</div>
<button class="btn-no-color" (click)="deletePublicationImage()" >
<ion-icon name="close"></ion-icon>
</button>
</div>
<button class="btn-no-color" (click)="deletePublicationImage()" >
<ion-icon name="close"></ion-icon>
</button>
</div>
</div>
<div class="ion-item-container-no-border hide-desktop">
<ion-label (click)="takePicture()">
<ion-label (click)="loadVideo()">
<div class="attach-icon">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-add-photo.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-add-photo.svg"></ion-icon>
@@ -90,7 +101,7 @@
</div>
<div class="ion-item-container-no-border">
<ion-label (click)="laodPicture()" class="cursor-pointer">
<ion-label (click)="loadVideo()" class="cursor-pointer">
<div class="attach-icon">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-add-photos.svg"></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " src="assets/images/theme/gov/icons-add-photos.svg"></ion-icon>
File diff suppressed because one or more lines are too long
@@ -34,8 +34,9 @@
<div class="post-item px-20">
<div (click)="openPreview(publication)" class="post-img">
<img *ngIf="publication.FileExtension == 'jpeg'" src="{{publication.FileBase64}}" alt="image" tappable>
<video *ngIf="publication.FileExtension == 'mp4'" controls>
<source type="video/mp4" src="data:video/mp4;{{publication.FileBase64}}">
<video *ngIf="publication.FileExtension == 'mp4'" controls="controls" preload="metadata" autoplay="autoplay" webkit-playsinline="webkit-playsinline">
<source type="video/mp4" [src]="publication.FileBase64">
</video>
</div>
<div *ngIf="publication.FileBase64.length < 30" class="post-img">
@@ -39,9 +39,17 @@
<ion-card *ngFor="let publication of publicationFolderService.publicationList[folderId] let i = index">
<ion-card-content>
<div class="post-img cursor-pointer" (click)="viewPublicationDetail(publication.DocumentId, publication.ProcessId)">
<div *ngIf="publication.FileExtension != 'mp4'" class="post-img cursor-pointer" (click)="viewPublicationDetail(publication.DocumentId, publication.ProcessId)">
<img [lazyLoad]="publication.FileBase64">
</div>
<div *ngIf="publication.FileExtension == 'mp4'" class="post-img cursor-pointer" (click)="viewPublicationDetail(publication.DocumentId, publication.ProcessId)">
<video controls="controls" preload="metadata" webkit-playsinline="webkit-playsinline" class="videoPlayer">
<source [src]="publication.FileBase64" type="video/mp4" />
</video>
</div>
<div class="post-content">
<div class="post-title-time">
<div class="post-title">
@@ -47,6 +47,19 @@
.div-logo img{
width: 100%;
}
.video-container {
width: 100%;
height: 100%;
position: relative;
overflow: hidden;
}
video {
width: 100%;
height: 100%;
object-fit: cover;
}
.div-profile{
font-size: rem(45);
float: right;