-
+
@@ -88,7 +88,7 @@
-
+
@@ -98,7 +98,7 @@
-
+
@@ -107,7 +107,7 @@
@@ -107,7 +107,7 @@
-
-
+
+
diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
index e0d039108..5d967d6a3 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
+++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
@@ -212,7 +212,7 @@ export class PedidoPage implements OnInit {
this.goBack()
}
- alert(JSON.stringify(res)+' nada')
+ // alert(JSON.stringify(res)+' nada')
}))
}
diff --git a/src/app/pages/publications/new-publication/new-publication.page.html b/src/app/pages/publications/new-publication/new-publication.page.html
index 74e54add6..1a52f2db2 100644
--- a/src/app/pages/publications/new-publication/new-publication.page.html
+++ b/src/app/pages/publications/new-publication/new-publication.page.html
@@ -42,6 +42,20 @@
-->
+
+
+
+
+
+
{{publication.OriginalFileName}}.{{publication.FileExtension}}
+
75 Kb
+
+
+
+
+
-
+
diff --git a/src/app/pages/publications/new-publication/new-publication.page.scss b/src/app/pages/publications/new-publication/new-publication.page.scss
index c4a9f8a30..f4dbabc70 100644
--- a/src/app/pages/publications/new-publication/new-publication.page.scss
+++ b/src/app/pages/publications/new-publication/new-publication.page.scss
@@ -134,4 +134,32 @@ font-size: 25px;
line-height: normal;
letter-spacing: normal;
color: #000;
- }
\ No newline at end of file
+ }
+
+
+
+
+
+
+.picture{
+ .post-img{
+ width: 60px;
+ }
+ .picture-file-name{
+ font-size: 15px;
+ color: #0d89d1;
+ }
+ .size{
+ color: #cecece;
+ font-size: 13px;
+ }
+}
+
+.container-title{
+ font-size: 15px;
+ font-weight: bold;
+}
+.hide-desktop{
+ display: block;
+}
+
diff --git a/src/app/pages/publications/new-publication/new-publication.page.ts b/src/app/pages/publications/new-publication/new-publication.page.ts
index e80885009..aec77b737 100644
--- a/src/app/pages/publications/new-publication/new-publication.page.ts
+++ b/src/app/pages/publications/new-publication/new-publication.page.ts
@@ -15,6 +15,8 @@ import { ToastService } from 'src/app/services/toast.service';
import { FormControl, FormGroup, Validators } from '@angular/forms';
import { ThemePalette } from '@angular/material/core';
import { formatDate } from 'src/plugin/momentG.js'
+import { FileLoaderService } from 'src/app/services/file/file-loader.service';
+import { FileToBase64Service } from 'src/app/services/file/file-to-base64.service';
@Component({
selector: 'app-new-publication',
@@ -66,6 +68,8 @@ export class NewPublicationPage implements OnInit {
private publications: PublicationsService,
private camera: Camera,
private toastService: ToastService,
+ private fileLoaderService: FileLoaderService,
+ private fileToBase64Service: FileToBase64Service
) {
this.publicationType = this.navParams.get('publicationType');
@@ -100,6 +104,22 @@ export class NewPublicationPage implements OnInit {
});
}
+
+ laodPicture() {
+ const input = this.fileLoaderService.createInput({
+ accept: ['image/apng', 'image/jpeg', 'image/png']
+ })
+
+ input.onchange = async () => {
+ const file = this.fileLoaderService.getFirstFile(input)
+
+ const imageData = await this.fileToBase64Service.convert(file)
+ this.capturedImage = imageData;
+ this.capturedImageTitle = file.name
+ };
+
+ }
+
getPicture() {
const options: CameraOptions = {
quality: 90,
diff --git a/src/app/pages/publications/publications.page.ts b/src/app/pages/publications/publications.page.ts
index 55fe93adf..0c85a3de9 100644
--- a/src/app/pages/publications/publications.page.ts
+++ b/src/app/pages/publications/publications.page.ts
@@ -1,6 +1,6 @@
import { Component, OnInit } from '@angular/core';
import { Router, NavigationEnd } from '@angular/router';
-import { ModalController, PopoverController } from '@ionic/angular';
+import { ModalController } from '@ionic/angular';
import { PublicationFolder } from 'src/app/models/publicationfolder';
import { PublicationsService } from 'src/app/services/publications.service';
import { NewActionPage } from './new-action/new-action.page';
diff --git a/src/app/pages/publications/view-publications/view-publications.page.ts b/src/app/pages/publications/view-publications/view-publications.page.ts
index 36d7382f5..1888cb060 100644
--- a/src/app/pages/publications/view-publications/view-publications.page.ts
+++ b/src/app/pages/publications/view-publications/view-publications.page.ts
@@ -3,6 +3,7 @@ import { ActivatedRoute, Router } from '@angular/router';
import { ModalController } from '@ionic/angular';
import { Publication } from 'src/app/models/publication';
import { PublicationFolder } from 'src/app/models/publicationfolder';
+import { PublicationPipe } from 'src/app/pipes/publication.pipe';
import { PublicationsService } from 'src/app/services/publications.service';
import { PublicationEventFolderStorage } from 'src/app/store/publication-event-folder.service';
import { PublicationListStorage } from 'src/app/store/publication-list.service';
@@ -29,12 +30,13 @@ export class ViewPublicationsPage implements OnInit {
publicationEventFolderStorage = PublicationEventFolderStorage
publicationTravelFolderService = PublicationTravelFolderStore
+ publicationPipe = new PublicationPipe()
+
constructor(
private modalController: ModalController,
private publications: PublicationsService,
private activatedRoute: ActivatedRoute,
- private router: Router )
- {
+ private router: Router) {
this.item = new PublicationFolder();
this.activatedRoute.paramMap.subscribe(params => {
@@ -55,9 +57,10 @@ export class ViewPublicationsPage implements OnInit {
}
this.getPublicationDetail();
- setTimeout(() => {
- this.getPublications();
- }, 3000);
+ setTimeout(() => {
+ this.getPublications();
+ }, 3000);
+
}
ngOnChanges() {
@@ -101,35 +104,15 @@ export class ViewPublicationsPage implements OnInit {
this.showLoader = true;
const folderId = this.folderId
this.publications.GetPublications(this.folderId).subscribe(res=>{
- console.log(res);
- let data = [];
+ this.publicationList = new Array();
+
res.forEach(element => {
- let itemImage = {
- title: 'Title',
- url: "data:image/jpg;base64," + element.FileBase64,
- format: 'png'
- }
- let item: Publication = {
- "DateIndex": element.DateIndex,
- "DocumentId":element.DocumentId,
- "ProcessId":element.ProcessId,
- "Title":element.Title,
- "Message": element.Message,
- "DatePublication": element.DatePublication,
- /* image:itemImage, */
- "FileBase64": "data:image/jpg;base64," + element.FileBase64,
- "OriginalFileName": '',
- "FileExtension": '',
- }
+ let item: Publication = this.publicationPipe.itemList(element)
this.publicationList.push(item);
- data.push(item)
-
});
- console.log(folderId);
-
this.publicationListStorage.add(folderId, this.publicationList)
this.showLoader = false;
diff --git a/src/app/pipes/pipes.module.ts b/src/app/pipes/pipes.module.ts
index 11b36ec89..6d5416e45 100644
--- a/src/app/pipes/pipes.module.ts
+++ b/src/app/pipes/pipes.module.ts
@@ -3,10 +3,11 @@ import { FilterPipe } from './filter.pipe';
import { SearchDocumentPipe } from './search-document.pipe';
import { CustomTaskPipe } from './custom-task.pipe';
import { EventPipe } from './event.pipe';
+import { PublicationPipe } from './publication.pipe';
@NgModule({
- declarations: [FilterPipe, SearchDocumentPipe, CustomTaskPipe, EventPipe],
+ declarations: [FilterPipe, SearchDocumentPipe, CustomTaskPipe, EventPipe, PublicationPipe],
exports: [FilterPipe],
imports: []
})
diff --git a/src/app/pipes/publication.pipe.spec.ts b/src/app/pipes/publication.pipe.spec.ts
new file mode 100644
index 000000000..26fc30029
--- /dev/null
+++ b/src/app/pipes/publication.pipe.spec.ts
@@ -0,0 +1,8 @@
+import { PublicationPipe } from './publication.pipe';
+
+describe('PublicationPipe', () => {
+ it('create an instance', () => {
+ const pipe = new PublicationPipe();
+ expect(pipe).toBeTruthy();
+ });
+});
diff --git a/src/app/pipes/publication.pipe.ts b/src/app/pipes/publication.pipe.ts
new file mode 100644
index 000000000..6a52ba4cb
--- /dev/null
+++ b/src/app/pipes/publication.pipe.ts
@@ -0,0 +1,29 @@
+import { Pipe, PipeTransform } from '@angular/core';
+import { Publication } from 'src/app/models/publication';
+
+@Pipe({
+ name: 'publication'
+})
+export class PublicationPipe implements PipeTransform {
+
+ transform(value: unknown, ...args: unknown[]): unknown {
+ return null;
+ }
+
+ itemList(element ): Publication {
+ return {
+ "DateIndex": element.DateIndex,
+ "DocumentId":element.DocumentId,
+ "ProcessId":element.ProcessId,
+ "Title":element.Title,
+ "Message": element.Message,
+ "DatePublication": element.DatePublication,
+ /* image:itemImage, */
+ "FileBase64": "data:image/jpg;base64," + element.FileBase64,
+ "OriginalFileName": '',
+ "FileExtension": '',
+ "OrganicEntityId": element.OrganicEntityId
+ }
+ }
+
+}
diff --git a/src/app/services/file/file-loader.service.spec.ts b/src/app/services/file/file-loader.service.spec.ts
new file mode 100644
index 000000000..b3d2db03e
--- /dev/null
+++ b/src/app/services/file/file-loader.service.spec.ts
@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { FileLoaderService } from './file-loader.service';
+
+describe('FileLoaderService', () => {
+ let service: FileLoaderService;
+
+ beforeEach(() => {
+ TestBed.configureTestingModule({});
+ service = TestBed.inject(FileLoaderService);
+ });
+
+ it('should be created', () => {
+ expect(service).toBeTruthy();
+ });
+});
diff --git a/src/app/services/file/file-loader.service.ts b/src/app/services/file/file-loader.service.ts
new file mode 100644
index 000000000..ca3a0f897
--- /dev/null
+++ b/src/app/services/file/file-loader.service.ts
@@ -0,0 +1,43 @@
+import { Injectable } from '@angular/core';
+import { FileType } from 'src/app/models/fileType';
+
+
+interface createInput {
+ type?: string
+ accept: typeof FileType[]
+}
+
+@Injectable({
+ providedIn: 'root'
+})
+export class FileLoaderService {
+
+ nice : typeof FileType
+ constructor() { }
+
+
+ createInput(param:createInput): HTMLInputElement {
+
+ let input = document.createElement('input');
+ input.type = param.type || 'file';
+ input.accept = param.accept.join(', ')
+
+
+ // input.onchange = () => {
+ // // you can use this method to get file and perform respective operations
+ // let files = Array.from(input.files);
+ // console.log(files);
+ // };
+
+ input.click();
+
+ return input
+
+ }
+
+ getFirstFile(input: HTMLInputElement) {
+ let files = Array.from(input.files);
+ return files[0]
+ }
+
+}
diff --git a/src/app/services/file/file-to-base64.service.spec.ts b/src/app/services/file/file-to-base64.service.spec.ts
new file mode 100644
index 000000000..727e8e7c8
--- /dev/null
+++ b/src/app/services/file/file-to-base64.service.spec.ts
@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { FileToBase64Service } from './file-to-base64.service';
+
+describe('FileToBase64Service', () => {
+ let service: FileToBase64Service;
+
+ beforeEach(() => {
+ TestBed.configureTestingModule({});
+ service = TestBed.inject(FileToBase64Service);
+ });
+
+ it('should be created', () => {
+ expect(service).toBeTruthy();
+ });
+});
diff --git a/src/app/services/file/file-to-base64.service.ts b/src/app/services/file/file-to-base64.service.ts
new file mode 100644
index 000000000..53d7675b6
--- /dev/null
+++ b/src/app/services/file/file-to-base64.service.ts
@@ -0,0 +1,19 @@
+import { Injectable } from '@angular/core';
+
+@Injectable({
+ providedIn: 'root'
+})
+export class FileToBase64Service {
+
+ constructor() { }
+
+ convert(file) {
+ return new Promise((resolve, reject) => {
+ const reader = new FileReader();
+ reader.readAsDataURL(file);
+ reader.onload = () => resolve(reader.result);
+ reader.onerror = error => reject(error);
+ });
+
+ }
+}
diff --git a/src/app/services/network.service.spec.ts b/src/app/services/network.service.spec.ts
new file mode 100644
index 000000000..2c8c63926
--- /dev/null
+++ b/src/app/services/network.service.spec.ts
@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { NetworkService } from './network.service';
+
+describe('NavigationService', () => {
+ let service: NetworkService;
+
+ beforeEach(() => {
+ TestBed.configureTestingModule({});
+ service = TestBed.inject(NetworkService);
+ });
+
+ it('should be created', () => {
+ expect(service).toBeTruthy();
+ });
+});
\ No newline at end of file
diff --git a/src/app/services/network.service.ts b/src/app/services/network.service.ts
new file mode 100644
index 000000000..78b32ba50
--- /dev/null
+++ b/src/app/services/network.service.ts
@@ -0,0 +1,31 @@
+import { Injectable } from '@angular/core';
+import { Network } from '@ionic-native/network/ngx';
+import { Platform } from '@ionic/angular';
+import { fromEvent, merge, of, Observable } from 'rxjs';
+import { mapTo } from 'rxjs/operators';
+
+@Injectable({
+ providedIn: 'root'
+})
+export class NetworkService {
+
+ constructor(
+ private network: Network) { }
+
+ checkNetworkConnection(){
+ this.network.onConnect().subscribe((value) => {
+
+ document.body.style.setProperty(`--color`, "#0782C9");
+
+ console.log('network connected!',value);
+ });
+ }
+
+ checkNetworkDisconnection(){
+ this.network.onDisconnect().subscribe((value) => {
+ document.body.style.setProperty(`--color`, "#eeeb30");
+ console.log('network was disconnected :-('),value;
+
+ });
+ }
+}
\ No newline at end of file
diff --git a/src/app/services/publications.service.ts b/src/app/services/publications.service.ts
index f89044eaf..8ca9e4145 100644
--- a/src/app/services/publications.service.ts
+++ b/src/app/services/publications.service.ts
@@ -5,6 +5,7 @@ import { AuthService } from '../services/auth.service';
import { User } from '../models/user.model';
import { Observable, throwError } from 'rxjs';
import { catchError } from 'rxjs/operators'
+import { Publication } from '../models/publication';
@Injectable({
providedIn: 'root'
@@ -38,7 +39,7 @@ export class PublicationsService {
return this.http.get