bug on diplomas option solved

src/app/modals/create-process/create-process.page.html

@@ -160,7 +160,7 @@
     </div>
 
 
-    <div *ngIf="postData" class="aside-right flex-column height-100">
+    <div *ngIf="postData && loggeduser.Profile != 'PR'" class="aside-right flex-column height-100">
       <app-empty-container
           [texto]="emptyTextDescription"
           *ngIf="!showAttendees"

src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html

@@ -333,7 +333,7 @@
       </div>
     </div>
 
-    <div class="aside-righ flex-grow-1">
+    <div *ngIf="loggeduser.Profile != 'PR'" class="aside-righ flex-grow-1">
       <app-empty-container
           [texto]="emptyTextDescription"
           *ngIf="!showAttendees"

src/app/pages/chat/messages/messages.page.ts

@@ -648,18 +648,20 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
 
     const roomId = this.roomId
 
-    const image = await this.CameraService.takePicture();
+    const file = await Camera.getPhoto({
-    await this.fileService.saveImage(image)
+      quality: 90,
-    const lastphoto: any = await this.fileService.loadFiles();
+      // allowEditing: true,
-    const { capturedImage, capturedImageTitle } = await this.fileService.loadFileData(lastphoto);
+      resultType: CameraResultType.Base64,
+      source: CameraSource.Camera
+    });
 
+    const blob = this.dataURItoBlob('data:image/jpeg;base64,' + file.base64String)
+    console.log('data:image/jpeg;base64,' + file.base64String)
 
-    const base64 = await fetch(capturedImage);
-    const blob = await base64.blob();
     const formData = new FormData();
     formData.append("blobFile", blob);
 
-    console.log(capturedImage);
+   //  console.log('capturedImage', capturedImage);
 
     this.ChatSystemService.getDmRoom(roomId).send({
       file: {
@@ -667,13 +669,38 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
         "guid": ''
       },
       attachments: [{
-        "title": capturedImageTitle,
+        "title": "file.jpg",
         "text": "description",
         "title_link_download": false,
       }],
       temporaryData: formData
     })
 
+  }
+
+    dataURItoBlob(dataURI) {
+    // convert base64 to raw binary data held in a string
+    // doesn't handle URLEncoded DataURIs - see SO answer #6850276 for code that does this
+    var byteString = atob(dataURI.split(',')[1]);
+  
+    // separate out the mime component
+    var mimeString = dataURI.split(',')[0].split(':')[1].split(';')[0]
+  
+    // write the bytes of the string to an ArrayBuffer
+    var ab = new ArrayBuffer(byteString.length);
+  
+    // create a view into the buffer
+    var ia = new Uint8Array(ab);
+  
+    // set the bytes of the buffer to the correct values
+    for (var i = 0; i < byteString.length; i++) {
+        ia[i] = byteString.charCodeAt(i);
+    }
+  
+    // write the ArrayBuffer to a blob, and you're done
+    var blob = new Blob([ab], {type: mimeString});
+    return blob;
+  
   }
 
   async addImageMobile() {

src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html

@@ -293,7 +293,7 @@
       </div>
     </div>
 
-    <div class="aside-righ flex-grow-1">
+    <div *ngIf="loggeduser.Profile != 'PR'" class="aside-righ flex-grow-1">
       <app-empty-container
           [texto]="emptyTextDescription"
           *ngIf="!showAttendees"

src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html

@@ -209,7 +209,7 @@
       </div>
     </div>
 
-    <div *ngIf="postData" class="aside-right flex-column height-100">
+    <div *ngIf="postData && loggeduser.Profile != 'PR'" class="aside-right flex-column height-100">
       <app-empty-container
           [texto]="emptyTextDescription"
           *ngIf="!showAttendees"

src/app/pages/publications/publications.page.ts

@@ -151,6 +151,8 @@ export class PublicationsPage implements OnInit {
       this.publicationsEventFolderList = folders.filter((e)=>e.ActionType == 'Evento')
       this.publicationsTravelFolderList = folders.filter((e)=>e.ActionType != 'Evento')
 
+      // ActionModel.create(folders)
+
       await this.storage.set('actionsEvents', this.publicationsEventFolderList);
       await this.storage.set('actionsViagens', this.publicationsTravelFolderList);
 

src/app/services/http-error-handle.service.ts

@@ -57,7 +57,7 @@ export class HttpErrorHandle {
         this.toastService._successMessage('Despacho executado!')
         break;
       case 'Gerar Diploma':
-        this.toastService._successMessage('Diploma gerado!')
+        this.toastService._successMessage('Enviado com sucesso!')
         break;
       case 'Efetuar Despacho':
         this.toastService._successMessage('Despacho efetuado!')

src/app/shared/popover/deploma-options/deploma-options.page.html

@@ -13,7 +13,6 @@
         <button (click)="openAddNoteModal('Solicitar assinatura')" class="btn-cancel" shape="round" >Solicitar assinatura do Presidente</button>
         <button (click)="openAddNoteModal('Solicitar alteração')" class="btn-cancel" shape="round" >Solicitar alteração</button>
         <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar despacho</button>
-        <button (click)="openAddNoteModal('Arquivo')" class="btn-cancel" shape="round" >Arquivar</button>
         <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
         
         
@@ -25,10 +24,10 @@
       <div class="buttons width-100" *ngIf="task.activityInstanceName == 'Assinar Diploma'">
         <button (click)="openAddNoteModal('Assinar Diploma')" class="btn-cancel" shape="round" >Assinado</button>
       </div>
-      <div class="buttons width-100" *ngIf="task.activityInstanceName == 'Assinar Diploma'">
+      <div class="buttons width-100">
-        <button (click)="openAddNoteModal('Arquivo')" class="btn-cancel" shape="round" >Arquivo</button>
+        <button (click)="openAddNoteModal('Arquivo')" class="btn-cancel" shape="round" >Arquivar</button>
       </div>
-      <div class="buttons width-100" *ngIf="task.activityInstanceName == 'Assinar Diploma'">
+      <div class="buttons width-100" *ngIf="task.activityInstanceName != 'Revisar Diploma'">
         <button (click)="openExpedientActionsModal('0',task)" class="btn-cancel" shape="round" >Efetuar despacho</button>
       </div>
     </div>

src/app/shared/publication/view-publications/view-publications.page.ts

@@ -167,6 +167,7 @@ export class ViewPublicationsPage implements OnInit {
     const found = this.publicationIsPresent(publicationId, folderId)
     if(!found) {
       this.publicationList[folderId].push(publicationDetails)
+      // PublicationModel.create(publicationDetails)
     } else {
       this.publicationList[folderId][findIndex] = publicationDetails
     }

version/git-version.ts

@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "08253646e",
+  "shortSHA": "c7d1a13eb",
-  "SHA": "08253646e6d133425af3b48b641a89b6bc437a0a",
+  "SHA": "c7d1a13eb7825833fecb60a6e3a43513bfb928c0",
   "branch": "no_bug_movemente",
   "lastCommitAuthor": "'Eudes Inácio'",
-  "lastCommitTime": "'Fri Mar 10 16:31:12 2023 +0100'",
+  "lastCommitTime": "'Tue Mar 14 09:53:39 2023 +0100'",
-  "lastCommitMessage": "pull made",
+  "lastCommitMessage": "Changes made on event to aprove and added to diploma",
-  "lastCommitNumber": "4871",
+  "lastCommitNumber": "4872",
   "change": "",
-  "changeStatus": "On branch no_bug_movemente\nYour branch is ahead of 'origin/no_bug_movemente' by 3 commits.\n  (use \"git push\" to publish your local commits)\n\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html\n\tmodified:   src/app/shared/agenda/approve-event/approve-event.page.ts\n\tmodified:   src/environments/environment.prod.ts\n\tmodified:   src/environments/environment.ts",
+  "changeStatus": "On branch no_bug_movemente\nYour branch and 'origin/no_bug_movemente' have diverged,\nand have 4 and 2 different commits each, respectively.\n  (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n  (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified:   src/app/modals/create-process/create-process.page.html\n\tmodified:   src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html\n\tmodified:   src/app/pages/chat/messages/messages.page.ts\n\tmodified:   src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html\n\tmodified:   src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html\n\tmodified:   src/app/pages/publications/publications.page.ts\n\tmodified:   src/app/services/http-error-handle.service.ts\n\tmodified:   src/app/shared/popover/deploma-options/deploma-options.page.html\n\tmodified:   src/app/shared/publication/view-publications/view-publications.page.ts",
   "changeAuthor": "eudes.inacio"
 }