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, IonicModule,
AskModalPageRoutingModule AskModalPageRoutingModule
], ],
declarations: [AskModalPage] declarations: [AskModalPage],
exports: [AskModalPage]
}) })
export class AskModalPageModule {} export class AskModalPageModule {}
+1 -1
View File
@@ -8,7 +8,7 @@ export class Publication{
Message: string; Message: string;
DatePublication: Date | string; DatePublication: Date | string;
OriginalFileName?: string; OriginalFileName?: string;
FileBase64?:string; FileBase64?:string = "";
FileExtension?: string; FileExtension?: string;
OrganicEntityId?: number; OrganicEntityId?: number;
} }
@@ -725,11 +725,6 @@
TaskService.pendentesstore.newList.length}} correspondência nova</span> TaskService.pendentesstore.newList.length}} correspondência nova</span>
</p> </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> </div>
@@ -50,7 +50,7 @@
</div> </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"> <div class="post-img" *ngIf="publication.FileBase64">
<img src="{{publication.FileBase64}}" alt="image" > <img src="{{publication.FileBase64}}" alt="image" >
</div> </div>
@@ -28,25 +28,11 @@
</div> </div>
</div> </div>
{{ capturedImage }}
{{ publication | json }}
<div class="picture d-flex pb-5 hide-desktop" *ngIf="publication.FileBase64 != 'data:image/jpg;base64,null' "> <!-- Captured -->
<div class="post-img"> <div class="ion-item-container-no-border" *ngIf="capturedImage">
<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">
<ion-label class="attached-title">Fotografia Anexada</ion-label> <ion-label class="attached-title">Fotografia Anexada</ion-label>
<ion-item lines="none" *ngIf="capturedImage"> <ion-item lines="none" >
<ion-thumbnail slot="start"> <ion-thumbnail slot="start">
<ion-img [(ngModel)]="capturedImage" name="image" ngDefaultControl [src]="capturedImage"></ion-img> <ion-img [(ngModel)]="capturedImage" name="image" ngDefaultControl [src]="capturedImage"></ion-img>
</ion-thumbnail> </ion-thumbnail>
@@ -59,8 +45,23 @@
<ion-icon name="close"></ion-icon> <ion-icon name="close"></ion-icon>
</button> </button>
</ion-item> </ion-item>
</div> </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"> <div class="ion-item-container-no-border hide-desktop">
<ion-label (click)="takePicture()"> <ion-label (click)="takePicture()">
@@ -42,7 +42,7 @@ export class NewPublicationPage implements OnInit {
guestPicture:any; guestPicture:any;
capturedImage:any = ''; capturedImage:any = '';
capturedImageTitle:any; capturedImageTitle:any = '';
photos: any[] = []; photos: any[] = [];
constructor( 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 { PermissionService } from 'src/app/services/permission.service';
import { HttpErrorHandle } from 'src/app/services/http-error-handle.service'; import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
import { PublicationFolderService } from 'src/app/store/publication-folder.service'; import { PublicationFolderService } from 'src/app/store/publication-folder.service';
import { AskModalPage } from 'src/app/modals/ask-modal/ask-modal.page'
@Component({ @Component({
selector: 'app-publication-detail-shared', selector: 'app-publication-detail-shared',
templateUrl: './publication-detail.page.html', templateUrl: './publication-detail.page.html',
@@ -34,7 +33,6 @@ export class PublicationDetailPage implements OnInit {
public p:PermissionService, public p:PermissionService,
private httpErrorHandle: HttpErrorHandle, private httpErrorHandle: HttpErrorHandle,
public publicationFolderService: PublicationFolderService, public publicationFolderService: PublicationFolderService,
public AskModalPage: AskModalPage
) { ) {
/* this.folderId = this.navParams.get('folderIdId'); */ /* this.folderId = this.navParams.get('folderIdId'); */
+6 -6
View File
@@ -1,12 +1,12 @@
export let versionData = { export let versionData = {
"shortSHA": "fa6450f32", "shortSHA": "0f3416cc3",
"SHA": "fa6450f3285f9d28851e8debc4cf9e05bcdf6c4e", "SHA": "0f3416cc3031874f4cd6d4738068d07696ab3190",
"branch": "developer", "branch": "developer",
"lastCommitAuthor": "'Peter Maquiran'", "lastCommitAuthor": "'Peter Maquiran'",
"lastCommitTime": "'Mon Aug 14 11:00:35 2023 +0100'", "lastCommitTime": "'Mon Aug 14 12:15:18 2023 +0100'",
"lastCommitMessage": "changes", "lastCommitMessage": "fix",
"lastCommitNumber": "5152", "lastCommitNumber": "5153",
"change": "", "change": "",
"changeStatus": "On branch developer\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/pages/chat/chat.page.html\n\tmodified: src/app/pages/chat/chat.page.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/services/chat/chat-system.service.ts\n\tmodified: src/app/services/task.service.ts\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.html", "changeStatus": "On branch developer\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/modals/ask-modal/ask-modal.module.ts\n\tmodified: src/app/models/publication.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/pages/publications/new-publication/new-publication.page.html\n\tmodified: src/app/shared/publication/new-publication/new-publication.page.html\n\tmodified: src/app/shared/publication/new-publication/new-publication.page.ts\n\tmodified: src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts",
"changeAuthor": "peter.maquiran" "changeAuthor": "peter.maquiran"
} }