diff --git a/.husky/pre-commit b/.husky/pre-commit index 2a367c7cc..fe58ea54a 100644 --- a/.husky/pre-commit +++ b/.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 diff --git a/src/app/modals/view-document/view-document.page.ts b/src/app/modals/view-document/view-document.page.ts index 1e9910e26..5eaf5bec2 100644 --- a/src/app/modals/view-document/view-document.page.ts +++ b/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', diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts index b4a954c92..bd5a85f44 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts +++ b/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' diff --git a/src/app/shared/agenda/view-event/view-event.page.ts b/src/app/shared/agenda/view-event/view-event.page.ts index d0af86e44..d185a3522 100644 --- a/src/app/shared/agenda/view-event/view-event.page.ts +++ b/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(); },()=>{}, ()=>{ diff --git a/src/assets/www/pdfjs/web/viewer.html b/src/assets/www/pdfjs/web/viewer.html index 39cc77e10..795939d01 100644 --- a/src/assets/www/pdfjs/web/viewer.html +++ b/src/assets/www/pdfjs/web/viewer.html @@ -298,6 +298,9 @@