pull made

.husky/pre-commit

@@ -1,4 +1,4 @@
 #!/usr/bin/env sh
 . "$(dirname -- "$0")/_/husky.sh"
 
-npm run build:version && git add .
+npm run build:version && git add version/git-version.ts

src/app/modals/view-document/view-document.page.ts

@@ -6,7 +6,6 @@ import { ExpedientTaskModalPage } from 'src/app/pages/gabinete-digital/expedient
 import { ProcessesService } from 'src/app/services/processes.service';
 import { EventDetailsDocumentsOptionsPage } from 'src/app/shared/popover/event-details-documents-options/event-details-documents-options.page';
 import { DocumentSetUpMeetingPage } from '../document-set-up-meeting/document-set-up-meeting.page';
-import { AlertService } from 'src/app/services/alert.service';
 import { AlertController, ModalController } from '@ionic/angular';
 @Component({
   selector: 'app-view-document',

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

@@ -108,7 +108,6 @@ export class BookMeetingModalPage implements OnInit {
   emptyTextDescription = "Sem intervenientes selecionados";
 
   CalendarName
-  CalendarOwnerName = ''
 
   sessionStore = SessionStore;
 
@@ -352,12 +351,12 @@ export class BookMeetingModalPage implements OnInit {
   
   selectedCalendarId () {
 
-    if (this.calendarService.calendarNamesType[this.CalendarOwnerName]?.['Oficial'] && this.postData.CalendarName == 'Oficial') {
-      return this.calendarService.calendarNamesType[this.CalendarOwnerName]['OficialId']
+    if (this.calendarService.calendarNamesType[this.CalendarName]?.['Oficial'] && this.postData.CalendarName == 'Oficial') {
+      return this.calendarService.calendarNamesType[this.CalendarName]['OficialId']
 
-    } else if (this.calendarService.calendarNamesType[this.CalendarOwnerName]?.['Pessoal'] && this.postData.CalendarName == 'Pessoal') {
+    } else if (this.calendarService.calendarNamesType[this.CalendarName]?.['Pessoal'] && this.postData.CalendarName == 'Pessoal') {
 
-      return this.calendarService.calendarNamesType[this.CalendarOwnerName]['PessoalId']
+      return this.calendarService.calendarNamesType[this.CalendarName]['PessoalId']
 
     } else {
       return '11:11'

src/app/shared/agenda/view-event/view-event.page.ts

@@ -182,7 +182,7 @@ export class ViewEventPage implements OnInit {
 
       if(this.sesseionStora.user.Profile == 'MDGPR' || this.sesseionStora.user.Profile == 'PR') { 
         this.eventsService.deleteEvent(this.loadedEvent.EventId, 0, this.loadedEvent.CalendarName).subscribe(async () => {
-          this.toastService.successMessage('Evento apagado');
+          this.toastService._successMessage('Evento eliminado');
           this.close();
         },()=>{},
         ()=>{
@@ -192,7 +192,7 @@ export class ViewEventPage implements OnInit {
 
         if(this.CalendarId) {
           this.eventsService.genericDeleteEvent(this.loadedEvent.EventId, 0, this.loadedEvent.CalendarName, this.CalendarId).subscribe(async () => {
-            this.toastService.successMessage('Evento apagado');
+            this.toastService._successMessage('Evento eliminado');
             this.close();
           },()=>{},
           ()=>{
@@ -208,7 +208,7 @@ export class ViewEventPage implements OnInit {
       
       if(this.sesseionStora.user.Profile == 'MDGPR' || this.sesseionStora.user.Profile == 'PR') { 
         this.eventsService.deleteEvent(this.loadedEvent.EventId, 0, this.loadedEvent.CalendarName).subscribe(async () => {
-          this.toastService.successMessage('Evento apagado');
+          this.toastService._successMessage('Evento eliminado');
           this.close();
         },()=>{},
         ()=>{
@@ -216,7 +216,7 @@ export class ViewEventPage implements OnInit {
         });
       } else {
         this.eventsService.genericDeleteEvent(this.loadedEvent.EventId, 0, this.loadedEvent.CalendarName, this.CalendarId).subscribe(async () => {
-          this.toastService.successMessage('Evento apagado');
+          this.toastService._successMessage('Evento eliminado');
           this.close();
         },()=>{},
         ()=>{

src/assets/www/pdfjs/web/viewer.html

@@ -298,6 +298,9 @@
         </menu>
 
         <div id="viewerContainer" tabindex="0">
+          <div id="loader" style="color: white;font-size: 16px;margin-bottom: -100%;top: 50px;position: relative;/* display: none; */margin-bottom: -18px;/* left: 50px; *//* text-align: center; */height: calc(100% - 0px);justify-content: center;align-items: center;display: flex;position: absolute;top: 0px;left: 0px;width: 100%;z-index: 1111111;text-align: center;">
+            Estamos a preparar a visualização do documento.<br> Por favor aguarde.
+          </div>
           <div id="viewer" class="pdfViewer"></div>
         </div>
 
@@ -407,5 +410,23 @@
     </div> <!-- outerContainer -->
     <div id="printContainer"></div>
   </body>
+  <script>
+    function loader() {
+
+      let viewerContext = document.getElementById("viewer").innerHTML
+      viewerContext = viewerContext.replace(" ", "")
+      if(!viewerContext) {
+        setTimeout(() => {
+          loader()
+        }, 500)
+      } else {
+        document.getElementById("loader").remove()
+      }
+    }
+
+    setTimeout(() => {
+      loader()
+    }, 1000)
+  </script>
 </html>
 

version/git-version.ts

@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "d0db49cdb",
-  "SHA": "d0db49cdbaaa4a6a011e36b4b4fd910e9c4464af",
+  "shortSHA": "c0029364c",
+  "SHA": "c0029364c8429dc183fd6b9743f8f78ab81532f5",
   "branch": "no_bug_movemente",
   "lastCommitAuthor": "'Eudes Inácio'",
-  "lastCommitTime": "'Wed Feb 15 16:26:34 2023 +0100'",
-  "lastCommitMessage": "added new fecture for presatation day",
-  "lastCommitNumber": "4788",
+  "lastCommitTime": "'Wed Feb 15 18:47:55 2023 +0100'",
+  "lastCommitMessage": "dates on publications solved",
+  "lastCommitNumber": "4789",
   "change": "",
-  "changeStatus": "On branch no_bug_movemente\nYour branch is ahead of 'origin/no_bug_movemente' by 4 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/agenda/new-event/new-event.page.scss\n\tmodified:   src/app/pages/publications/view-publications/view-publications.page.html\n\tmodified:   src/app/shared/publication/view-publications/view-publications.page.html",
+  "changeStatus": "On branch no_bug_movemente\nYour branch and 'origin/no_bug_movemente' have diverged,\nand have 5 and 5 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:   .husky/pre-commit\n\tmodified:   src/app/modals/view-document/view-document.page.ts\n\tmodified:   src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts\n\tmodified:   src/app/shared/agenda/view-event/view-event.page.ts\n\tmodified:   src/assets/www/pdfjs/web/viewer.html\n\tmodified:   version/git-version.ts",
   "changeAuthor": "eudes.inacio"
 }