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 50ffbaa64..a773b5cf9 100644 --- a/src/app/pages/publications/new-publication/new-publication.page.ts +++ b/src/app/pages/publications/new-publication/new-publication.page.ts @@ -18,8 +18,6 @@ import { Camera, CameraResultType, CameraSource, Photo } from '@capacitor/camera import { Filesystem, Directory } from '@capacitor/filesystem'; import { NgxImageCompressService } from "ngx-image-compress"; -import { readAndCompressImage } from 'browser-image-resizer'; -import { environment } from 'src/environments/environment'; const IMAGE_DIR = 'stored-images'; @@ -110,7 +108,7 @@ export class NewPublicationPage implements OnInit { } async takePicture() { - alert('take') + const capturedImage = await Camera.getPhoto({ quality: 90, // allowEditing: true, @@ -121,30 +119,11 @@ export class NewPublicationPage implements OnInit { const response = await fetch(capturedImage.webPath!); const blob = await response.blob(); - const config = { - quality: 0.5, - maxWidth: 800, - debug: true - }; - - var file = new File([blob], "camera.jpg"); - - // Note: A single file comes from event.target.files on - readAndCompressImage(file, config) - .then(resizedImage => { - console.log('resizedImage', resizedImage); - - this.convertBlobToBase64Worker.postMessage(resizedImage); - this.convertBlobToBase64Worker.onmessage = async (oEvent)=> { - this.capturedImage = oEvent.data - - } - }) - .then(result => { - // TODO: Handle the result - console.log('result', result); - }); + this.convertBlobToBase64Worker.postMessage(blob); + this.convertBlobToBase64Worker.onmessage = async (oEvent)=> { + this.capturedImage = oEvent.data + } } imageSize(image) { @@ -200,35 +179,12 @@ export class NewPublicationPage implements OnInit { const response = await fetch(capturedImage.webPath!); const blob = await response.blob(); - - - const config = { - quality: 0.9, - maxWidth: 800, - debug: !environment.production - }; - - var file = new File([blob], "camera.jpg"); - - // Note: A single file comes from event.target.files on - readAndCompressImage(file, config) - .then(resizedImage => { - console.log('resizedImage', resizedImage); - - this.convertBlobToBase64Worker.postMessage(resizedImage); - this.convertBlobToBase64Worker.onmessage = async (oEvent)=> { - this.capturedImage = oEvent.data - - } - }) - .then(result => { - // TODO: Handle the result - // console.log('result', result); - }); - - + this.convertBlobToBase64Worker.postMessage(blob); + this.convertBlobToBase64Worker.onmessage = async (oEvent)=> { + this.capturedImage = oEvent.data + } } @@ -242,7 +198,7 @@ export class NewPublicationPage implements OnInit { this.Form = new FormGroup({ Subject: new FormControl(this.pub.Title, [ - Validators.required, + //Validators.required, // Validators.minLength(4) ]), capturedImage: new FormControl(this.capturedImage, [ @@ -285,11 +241,11 @@ export class NewPublicationPage implements OnInit { try { await this.publications.UpdatePublication(this.publication.ProcessId, this.publication).toPromise() - this.toastService.successMessage("Publicação editada") + this.toastService._successMessage("Publicação editada") this.close(); } catch (error) { - this.toastService.badRequest("Publicação não editada") + this.toastService._badRequest("Publicação não editada") } finally { loader.remove() } diff --git a/version/git-version.ts b/version/git-version.ts index a9d2e66cf..fc80d7b13 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "07b958651", - "SHA": "07b958651a574b627e9d04fce33427260960525b", + "shortSHA": "d933df5b3", + "SHA": "d933df5b31737aaf00a0113b669227b73c6e354a", "branch": "no_bug_movemente", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Thu Feb 9 15:26:14 2023 +0100'", - "lastCommitMessage": "fix take picture immage to big", - "lastCommitNumber": "4760", + "lastCommitTime": "'Thu Feb 9 16:05:36 2023 +0100'", + "lastCommitMessage": "feature", + "lastCommitNumber": "4761", "change": "", - "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/chat/chat.page.ts\n\tmodified: src/app/pages/events/edit-event/edit-event.page.ts\n\tmodified: src/app/pages/events/event-detail-modal/event-detail-modal.page.ts\n\tmodified: src/app/pages/events/event-detail/event-detail.page.ts\n\tmodified: src/app/pages/events/events.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos/despachos.page.ts\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente.page.ts\n\tmodified: src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedidos.page.ts\n\tmodified: src/app/pages/gabinete-digital/pendentes/pendentes.page.ts\n\tmodified: src/app/pages/publications/publication-detail/publication-detail.page.ts\n\tmodified: src/app/pages/publications/publications.page.ts\n\tmodified: src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts\n\tmodified: src/app/pages/publications/view-publications/view-publications.page.ts\n\tmodified: src/app/services/chat/chat-system.service.ts\n\tmodified: src/app/services/events/edit-event/edit-event.page.ts\n\tmodified: src/app/services/events/event-detail-modal/event-detail-modal.page.ts\n\tmodified: src/app/services/events/event-detail/event-detail.page.ts\n\tmodified: src/app/services/events/events.page.ts\n\tmodified: src/app/shared/agenda/event-list/event-list.page.ts\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.ts\n\tmodified: src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts\n\tmodified: src/app/shared/gabinete-digital/despachos/despachos.page.ts\n\tmodified: src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts\n\tmodified: src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts\n\tmodified: src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.page.ts\n\tmodified: src/app/shared/gabinete-digital/diplomas/diplomas.page.ts\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts\n\tmodified: src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts\n\tmodified: src/app/shared/gabinete-digital/expedients/expedients.page.ts\n\tmodified: src/app/shared/gabinete-digital/pedidos/pedidos.page.ts\n\tmodified: src/app/shared/gabinete-digital/pendentes/pendentes.page.ts\n\tmodified: src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts", + "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/publications/new-publication/new-publication.page.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file