peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-19 21:06:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'developer' of https://bitbucket.org/equilibriumito/gabinete-digital into developer

Browse Source
This commit is contained in:
tiago.kayaya
2021-08-24 14:41:51 +01:00
parent 92a3f83a66 d3031515eb
commit 84f9b385c7
31 changed files with 329 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/publications/gallery/image-modal/image-modal.page.html
+20 -13
View File
@@ -1,14 +1,21 @@
<ion-content fullscreen>
<ion-item class="close" lines="none" text-center>
<button (click)="close()" fill="clear" >
<ion-icon name="close" slot="start">Fechar</ion-icon>
</button>
</ion-item>
<ion-slides>
<ion-slide>
<div class="swipper-zoom-container">
<img src="{{imageUrl}}">
</div>
</ion-slide>
</ion-slides>
<ion-content fullscreen class="d-flex flex-column">
<div class="main-content">
<div class="d-flex justify-end">
<button (click)="close()" fill="clear" >
<ion-icon name="close" slot="start">Fechar</ion-icon>
</button>
</div>
<div>
<ion-slides>
<ion-slide>
<div class="swipper-zoom-container">
<img src="{{imageUrl}}">
</div>
</ion-slide>
</ion-slides>
</div>
</div>
</ion-content>
src/app/pages/publications/new-publication/new-publication.page.html
+66 -66
View File
@@ -1,82 +1,82 @@
<ion-content>
<div class="content-container">
<div class="content-container d-flex flex-column">
<div class="title-content width-100">
<div class="div-title">
<ion-label class="title">{{publicationTitle}}</ion-label>
</div>
</div>
<div *ngIf="publicationType!='1'" class="ion-item-container" [class.input-error]="Form?.get('Subject')?.invalid && validateFrom ">
<ion-input [(ngModel)]="pub.Title" name="title" ngDefaultControl placeholder="Título" ></ion-input>
</div>
<div *ngIf="publicationType!='1'" class="container-div">
<div class="ion-item-class-2">
<div class="ion-icon-class">
<ion-icon slot="start" src="assets/images/icons-description.svg"></ion-icon>
<div class="overflow-y-auto">
<div *ngIf="publicationType!='1'" class="ion-item-container" [class.input-error]="Form?.get('Subject')?.invalid && validateFrom ">
<ion-input [(ngModel)]="pub.Title" name="title" ngDefaultControl placeholder="Título" ></ion-input>
</div>
<div class="ion-textarea-class" [class.input-error]="Form?.get('Message')?.invalid && validateFrom ">
<ion-textarea [(ngModel)]="pub.Message" name="description" ngDefaultControl rows="12" cols="20" placeholder="Corpo de texto..."></ion-textarea>
<div *ngIf="publicationType!='1'" class="container-div">
<div class="ion-item-class-2">
<div class="ion-icon-class">
<ion-icon slot="start" src="assets/images/icons-description.svg"></ion-icon>
</div>
<div class="ion-textarea-class" [class.input-error]="Form?.get('Message')?.invalid && validateFrom ">
<ion-textarea [(ngModel)]="pub.Message" name="description" ngDefaultControl rows="12" cols="20" placeholder="Corpo de texto..."></ion-textarea>
</div>
</div>
</div>
<div *ngIf="capturedImage != '' " class="ion-item-container-no-border">
<ion-label class="attached-title">Fotografia Anexada </ion-label>
<ion-item lines="none">
<ion-thumbnail slot="start">
<ion-img [(ngModel)]="capturedImage" name="image" ngDefaultControl [src]="capturedImage"></ion-img>
</ion-thumbnail>
<ion-label>
<p>{{capturedImageTitle}}</p>
<p hidden>size</p>
</ion-label>
<ion-icon (click)="clear()" name="close"></ion-icon>
</ion-item>
</div>
<div class="picture d-flex pb-5 hide-desktop" *ngIf="publication && capturedImage ==''">
<div class="post-img" *ngIf="publication.FileBase64">
<img src="{{publication.FileBase64}}" alt="image" >
</div>
<div class="d-flex flex-column pl-10" *ngIf="publication.FileBase64">
<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" *ngIf="publication.FileBase64">
<div style="color: red;">X</div>
</div>
</div>
<div class="ion-item-container-no-border">
<ion-label (click)="takePicture()">
<div class="attach-icon">
<ion-icon src="assets/images/icons-add-photo.svg"></ion-icon>
</div>
<div class="attach-document">
<ion-label>Tirar Fotografia</ion-label>
</div>
</ion-label>
</div>
<div class="ion-item-container-no-border">
<ion-label (click)="laodPicture()">
<div class="attach-icon">
<ion-icon src="assets/images/icons-add-photos.svg"></ion-icon>
</div>
<div class="attach-document">
<ion-label>Anexar Fotografia</ion-label>
</div>
</ion-label>
</div>
</div>
</div>
<div *ngIf="capturedImage != ''" class="ion-item-container-no-border">
<ion-label class="attached-title">Fotografia Anexada</ion-label>
<ion-item lines="none">
<ion-thumbnail slot="start">
<ion-img [(ngModel)]="capturedImage" name="image" ngDefaultControl [src]="'data:image/png;base64,'+capturedImage"></ion-img>
</ion-thumbnail>
<!-- <ion-thumbnail *ngIf="!publication" slot="start">
<ion-img [(ngModel)]="publication.imageUrl" [src]="guestPicture"></ion-img>
</ion-thumbnail> -->
<ion-label>
<p>{{capturedImageTitle}}</p>
<p hidden>size</p>
</ion-label>
<ion-icon (click)="clear()" name="close"></ion-icon>
</ion-item>
<!-- <ion-thumbnail>
<ion-img src="{{imgUrl}}"></ion-img>
</ion-thumbnail> -->
</div>
<div class="picture d-flex pb-5 hide-desktop" *ngIf="publication.FileBase64 && capturedImage ==''">
<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">
<ion-label (click)="takePicture()">
<div class="attach-icon">
<ion-icon src="assets/images/icons-add-photo.svg"></ion-icon>
</div>
<div class="attach-document">
<ion-label>Tirar Fotografia</ion-label>
</div>
</ion-label>
</div>
<!-- <div class="ion-item-container-no-border">
<ion-label (click)="laodPicture()">
<div class="attach-icon">
<ion-icon src="assets/images/icons-add-photos.svg"></ion-icon>
</div>
<div class="attach-document">
<ion-label>Anexar Fotografia</ion-label>
</div>
</ion-label>
</div> -->
</div>
</ion-content>
src/app/pages/publications/new-publication/new-publication.page.scss
-1
View File
@@ -58,7 +58,6 @@ ion-toolbar{
}
.title-content{
margin: 0px auto;
overflow: auto;
padding: 0 !important;
}
.div-title{
src/app/pages/publications/new-publication/new-publication.page.ts
+6 -3
View File
@@ -95,9 +95,10 @@ export class NewPublicationPage implements OnInit {
this.camera.getPicture(options).then((imageData) => {
// imageData is either a base64 encoded string or a file URI
// If it's base64 (DATA_URL):
let base64Image = 'data:image/jpeg;base64,' + imageData;
this.capturedImage = imageData;
// If it's base64 (DATA_URL): m
//let base64Image = 'data:image/jpeg;base64,' + imageData;
this.capturedImage = 'data:image/png;base64,'+imageData;
this.capturedImageTitle = new Date().getTime() + '.jpeg';
}, (err) => {
/* console.log(err); */
@@ -116,6 +117,8 @@ export class NewPublicationPage implements OnInit {
const imageData = await this.fileToBase64Service.convert(file)
this.capturedImage = imageData;
this.capturedImageTitle = file.name
console.log(this.capturedImage)
};
}
src/app/pages/publications/publication-detail/publication-detail.page.ts
+3 -2
View File
@@ -3,8 +3,6 @@ import { AnimationController, ModalController, NavParams } from '@ionic/angular'
import { Publication } from 'src/app/models/publication';
import { PublicationsService } from 'src/app/services/publications.service';
import { ToastService } from 'src/app/services/toast.service';
import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page';
import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page';
import { ImageModalPage } from '../gallery/image-modal/image-modal.page';
import { NewPublicationPage } from '../new-publication/new-publication.page';
@@ -27,6 +25,9 @@ export class PublicationDetailPage implements OnInit {
private animationController: AnimationController,
private toastService: ToastService
) {
alert('!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!')
this.publicationId = this.navParams.get('publicationId');
/* this.folderId = this.navParams.get('folderIdId'); */
this.publication = {
src/app/pages/publications/view-publications/publication-detail/publication-detail.page.html
+3 -2
View File
@@ -1,4 +1,4 @@
<ion-header class="ion-no-border d-md-none">
<ion-header class="ion-no-border">
<app-header></app-header>
</ion-header>
@@ -10,7 +10,7 @@
</ion-refresher>
<div class="content-container">
<div *ngIf="publication.Title != ''" class="d-flex flex-column">
<div *ngIf="publication.Title != ''" class="d-flex flex-column height-100">
<div class="title-content px-20 width-100 ">
<div class="back-icon cursor-pointer" (click)="goBack()">
<ion-icon slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
@@ -33,6 +33,7 @@
</div>
</div>
</div>
<div *ngIf="publication.Title == ''" class="d-flex flex-column">
<div class="title-content width-100">
<div class="back-icon cursor-pointer">
src/app/pages/publications/view-publications/publication-detail/publication-detail.page.scss
+1 -2
View File
@@ -57,9 +57,8 @@
padding: 25px 0px 0 0px;
overflow: auto;
}
.title-content{
.title-content {
margin: 0px auto;
overflow: auto;
}
.back-icon{
width: auto;
src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts
+1
View File
@@ -27,6 +27,7 @@ export class PublicationDetailPage implements OnInit {
private activatedRoute: ActivatedRoute,
private router: Router,
) {
this.activatedRoute.paramMap.subscribe(params => {
console.log(params);
if(params["params"]) {
src/app/pages/publications/view-publications/view-publications.page.html
+1 -1
View File
@@ -29,7 +29,7 @@
<ion-refresher-content>
</ion-refresher-content>
</ion-refresher>
<div class="main-container background-white">
<div class="main-container background-white height-100 overflow-y-auto">
<ion-list>
<!-- [routerLink]="['/home/publications/view-publications/publication-detail', publication.publicationId]" -->
<div class="post-item"