This commit is contained in:
Peter Maquiran
2023-08-14 14:11:15 +01:00
parent 0f3416cc30
commit 4ae2e7cfa8
8 changed files with 30 additions and 35 deletions
+2 -1
View File
@@ -15,6 +15,7 @@ import { AskModalPage } from './ask-modal.page';
IonicModule,
AskModalPageRoutingModule
],
declarations: [AskModalPage]
declarations: [AskModalPage],
exports: [AskModalPage]
})
export class AskModalPageModule {}
+1 -1
View File
@@ -8,7 +8,7 @@ export class Publication{
Message: string;
DatePublication: Date | string;
OriginalFileName?: string;
FileBase64?:string;
FileBase64?:string = "";
FileExtension?: string;
OrganicEntityId?: number;
}
@@ -725,11 +725,6 @@
TaskService.pendentesstore.newList.length}} correspondência nova</span>
</p>
<p class="text-center exp-card-content">
<span class="number">{{TaskService.pendentesstore.count}} </span>
<span class="title1" *ngIf="TaskService.pendentesstore.count == 0">correspondência</span>
<span class="title1" *ngIf="TaskService.pendentesstore.count == 1">correspondência</span>
<span class="title1" *ngIf="TaskService.pendentesstore.count > 1">correspondências</span>
</div>
@@ -50,7 +50,7 @@
</div>
<div class="picture d-flex pb-5 hide-desktop" *ngIf="publication.FileBase64 && capturedImage ==''">
<div class="picture d-flex pb-5 hide-desktop" *ngIf="!( publication.FileBase64 == 'data:image/jpg;base64,null' || publication.FileBase64 == '' )">
<div class="post-img" *ngIf="publication.FileBase64">
<img src="{{publication.FileBase64}}" alt="image" >
</div>
@@ -28,25 +28,11 @@
</div>
</div>
{{ capturedImage }}
{{ publication | json }}
<div class="picture d-flex pb-5 hide-desktop" *ngIf="publication.FileBase64 != 'data:image/jpg;base64,null' ">
<div class="post-img">
<img src="{{publication.FileBase64}}" alt="image" >
</div>
<div class="d-flex flex-column pl-10">
<div class="picture-file-name">{{publication.OriginalFileName}}.{{publication.FileExtension}}</div>
<div class="size">75 Kb</div>
</div>
<div class="flex-grow-1 d-flex align-center justify-end">
<div style="color: red;">X</div>
</div>
</div>
<div *ngIf="capturedImage && capturedImageTitle" class="ion-item-container-no-border">
<!-- Captured -->
<div class="ion-item-container-no-border" *ngIf="capturedImage">
<ion-label class="attached-title">Fotografia Anexada</ion-label>
<ion-item lines="none" *ngIf="capturedImage">
<ion-item lines="none" >
<ion-thumbnail slot="start">
<ion-img [(ngModel)]="capturedImage" name="image" ngDefaultControl [src]="capturedImage"></ion-img>
</ion-thumbnail>
@@ -59,8 +45,23 @@
<ion-icon name="close"></ion-icon>
</button>
</ion-item>
</div>
<!-- current image -->
<div class="picture d-flex pb-5 hide-desktop" *ngIf="!( publication.FileBase64 == 'data:image/jpg;base64,null' || publication.FileBase64 == '' )" >
<div class="post-img">
<img src="{{publication.FileBase64}}" alt="image" >
</div>
<div class="d-flex flex-column pl-10">
<div class="picture-file-name">{{publication.OriginalFileName}}.{{publication.FileExtension}}</div>
<div class="size">75 Kb</div>
</div>
<div class="flex-grow-1 d-flex align-center justify-end">
<div style="color: red;">X</div>
</div>
</div>
<div class="ion-item-container-no-border hide-desktop">
<ion-label (click)="takePicture()">
@@ -42,7 +42,7 @@ export class NewPublicationPage implements OnInit {
guestPicture:any;
capturedImage:any = '';
capturedImageTitle:any;
capturedImageTitle:any = '';
photos: any[] = [];
constructor(
@@ -9,7 +9,6 @@ import { ViewMediaPage } from 'src/app/modals/view-media/view-media.page';
import { PermissionService } from 'src/app/services/permission.service';
import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
import { PublicationFolderService } from 'src/app/store/publication-folder.service';
import { AskModalPage } from 'src/app/modals/ask-modal/ask-modal.page'
@Component({
selector: 'app-publication-detail-shared',
templateUrl: './publication-detail.page.html',
@@ -34,7 +33,6 @@ export class PublicationDetailPage implements OnInit {
public p:PermissionService,
private httpErrorHandle: HttpErrorHandle,
public publicationFolderService: PublicationFolderService,
public AskModalPage: AskModalPage
) {
/* this.folderId = this.navParams.get('folderIdId'); */