diff --git a/src/app/modals/create-process/create-process.page.html b/src/app/modals/create-process/create-process.page.html index 6efadc2f5..9be13754e 100644 --- a/src/app/modals/create-process/create-process.page.html +++ b/src/app/modals/create-process/create-process.page.html @@ -70,7 +70,7 @@ appearance="fill" class="width-100 d-block" appearance="none"> - + {{type.Description}} diff --git a/src/app/pages/agenda/new-event/new-event.page.ts b/src/app/pages/agenda/new-event/new-event.page.ts index 75ec9c57b..546fb01f8 100644 --- a/src/app/pages/agenda/new-event/new-event.page.ts +++ b/src/app/pages/agenda/new-event/new-event.page.ts @@ -176,7 +176,7 @@ export class NewEventPage implements OnInit { } window.onresize = (event) => { - if( window.innerWidth >= 1024){ + if( window.innerWidth >= 1024) { this.modalController.dismiss(); } }; @@ -186,9 +186,9 @@ export class NewEventPage implements OnInit { } setDefaultTime() { - console.log(this.CalendarDate) this.postEvent.StartDate = this.roundTimeQuarterHour(this.CalendarDate); - this.postEvent.EndDate = this.postEvent.StartDate; + // this.postEvent.EndDate = this.postEvent.StartDate; + this.postEvent.EndDate = (new Date(this.postEvent.EndDate.getTime() + 15 * 60000)) } close() { @@ -446,7 +446,11 @@ export class NewEventPage implements OnInit { this.modalController.dismiss(data); } catch (error) { - this.toastService._badRequest() + if(error.status == 0) { + this.toastService._badRequest('Não é possível visualizar este processo no modo offline') + } else { + this.toastService._badRequest() + } } finally { loader.remove() } 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 174cfcd3e..92149a795 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 @@ -176,6 +176,7 @@ export class BookMeetingModalPage implements OnInit { this.getRecurrenceTypes(); } + getRecurrenceTypes() { this.calendarService.getRecurrenceTypes().subscribe(res=>{ @@ -208,8 +209,8 @@ export class BookMeetingModalPage implements OnInit { } setDefaultTime() { - this.postData.StartDate = new Date() - this.postData.EndDate = (new Date(new Date().getTime() + 15 * 60000)) + this.postData.StartDate = this.roundTimeQuarterHour(); + this.postData.EndDate = (new Date(this.postData.StartDate.getTime() + 15 * 60000)) } getAttachments() { @@ -351,6 +352,7 @@ export class BookMeetingModalPage implements OnInit { + selectedCalendarId () { if (this.calendarService.calendarNamesType[this.CalendarOwnerName]?.['Oficial'] && this.postData.CalendarName == 'Oficial') { @@ -501,8 +503,8 @@ export class BookMeetingModalPage implements OnInit { } - roundTimeQuarterHour() { - var timeToReturn = new Date(); + roundTimeQuarterHour(timeToReturn?) { + var timeToReturn = timeToReturn || new Date(); var minutes = timeToReturn.getMinutes(); var hours = timeToReturn.getHours(); @@ -515,14 +517,14 @@ export class BookMeetingModalPage implements OnInit { } timeToReturn.setHours(h); timeToReturn.setMinutes(m); - }else{ - if(minutes > m){ + } else { + if(minutes > m) { m = m + 15; timeToReturn.setHours(h); timeToReturn.setMinutes(m); - }else { + } else { timeToReturn.setHours(h); timeToReturn.setMinutes(m); } @@ -534,7 +536,7 @@ export class BookMeetingModalPage implements OnInit { return timeToReturn; } - setStartDate(){ + setStartDate() { this.postData.StartDate = this.roundTimeQuarterHour(); } diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html index 03a012339..06b039b26 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html @@ -109,7 +109,7 @@ appearance="fill" class="width-100 d-block" appearance="none"> - + {{type.Description}} diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts index bf2445956..ccbb5a596 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts @@ -320,7 +320,11 @@ export class ExpedientTaskModalPage implements OnInit { this.modalController.dismiss(action_despacho); } catch (error) { - await this.toastService._badRequest('Processo não efetuado') + if(error.status == 0) { + this.toastService._badRequest('Não é possível visualizar este processo no modo offline') + } else { + await this.toastService._badRequest('Processo não efetuado') + } } finally { loader.remove() } @@ -354,7 +358,11 @@ export class ExpedientTaskModalPage implements OnInit { this.modalController.dismiss(action_parecer); } catch (error) { - await this.toastService._badRequest('Processo não efetuado') + if(error.status == 0) { + this.toastService._badRequest('Não é possível visualizar este processo no modo offline') + } else { + await this.toastService._badRequest('Processo não efetuado') + } } finally { loader.remove() } @@ -385,7 +393,11 @@ export class ExpedientTaskModalPage implements OnInit { this.toastService._successMessage('Processo efetuado'); this.modalController.dismiss(action_deferimento); } catch (error) { - await this.toastService._badRequest('Processo não efetuado') + if(error.status == 0) { + this.toastService._badRequest('Não é possível visualizar este processo no modo offline') + } else { + await this.toastService._badRequest('Processo não efetuado') + } } finally { loader.remove() } @@ -424,7 +436,11 @@ export class ExpedientTaskModalPage implements OnInit { this.modalController.dismiss(action_despacho_pr); } catch (error) { - await this.toastService._badRequest('Processo não efetuado') + if(error.status == 0) { + this.toastService._badRequest('Não é possível visualizar este processo no modo offline') + } else { + await this.toastService._badRequest('Processo não efetuado') + } } finally { //loader.remove() } @@ -461,8 +477,11 @@ export class ExpedientTaskModalPage implements OnInit { await this.toastService._successMessage('Pedido enviado'); this.modalController.dismiss(action_parecer_pr); } catch (error) { - - await this.toastService._badRequest('Processo não efetuado') + if(error.status == 0) { + this.toastService._badRequest('Não é possível visualizar este processo no modo offline') + } else { + await this.toastService._badRequest('Processo não efetuado') + } } finally { loader.remove() } diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html index 7b14d99c9..fb1087d1b 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html @@ -92,8 +92,8 @@
-
Enviar para o PR
- +
Enviar para o PR
+
Solicitar revisão
Outras opções
diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts index 7793b028d..fc796b8ba 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts @@ -90,6 +90,8 @@ export class ExpedienteDetailPage implements OnInit { private userAuth: AuthService, ) { this.loggeduser = SessionStore.user + console.log('SessionStore', SessionStore) + this.activatedRoute.paramMap.subscribe(params => { if (params["params"].SerialNumber) { this.serialNumber = params["params"].SerialNumber; diff --git a/src/app/shared/popover/opts-expediente/opts-expediente.page.html b/src/app/shared/popover/opts-expediente/opts-expediente.page.html index b3a5d77c1..71c28949f 100644 --- a/src/app/shared/popover/opts-expediente/opts-expediente.page.html +++ b/src/app/shared/popover/opts-expediente/opts-expediente.page.html @@ -8,8 +8,8 @@
- - + + diff --git a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts index 5a2262643..873f3e662 100644 --- a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts +++ b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts @@ -54,7 +54,7 @@ export class OptsExpedientePage implements OnInit { } ngOnInit() { - + console.log('SessionStore', SessionStore) } async openNewGroupPage(){ diff --git a/src/app/shared/popover/searched-document-options/searched-document-options.page.html b/src/app/shared/popover/searched-document-options/searched-document-options.page.html index 75877851a..682b8b32b 100644 --- a/src/app/shared/popover/searched-document-options/searched-document-options.page.html +++ b/src/app/shared/popover/searched-document-options/searched-document-options.page.html @@ -1,9 +1,7 @@ - -
- -
- - - -
-
+
+ +
+ + + +
\ No newline at end of file diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index 53f31b337..38a854fa6 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -3,4 +3,4 @@ import { oaprProd } from './suport/oapr' import { doneITProd } from './suport/doneIt' -export const environment: Environment = oaprProd; \ No newline at end of file +export const environment: Environment = doneITProd; \ No newline at end of file diff --git a/version/git-version.ts b/version/git-version.ts index 486635cd0..00486ff44 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "ac23c085f", - "SHA": "ac23c085fb436db5698015e7627ec7c098cae72c", + "shortSHA": "0036ce6ab", + "SHA": "0036ce6ab20cb98b60cd6f86af434a2bffa15d13", "branch": "no_bug_movemente", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Wed Feb 1 18:04:01 2023 +0100'", - "lastCommitMessage": "merge", - "lastCommitNumber": "4708", + "lastCommitTime": "'Thu Feb 2 10:37:17 2023 +0100'", + "lastCommitMessage": "fix loader", + "lastCommitNumber": "4709", "change": "", - "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/modals/view-event/view-event.page.ts\n\tmodified: src/app/pages/events/events.page.html\n\tmodified: src/app/pages/events/events.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.html\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.html\n\tmodified: src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts\n\tmodified: src/app/shared/gabinete-digital/despachos/despachos.page.html\n\tmodified: src/app/shared/gabinete-digital/despachos/despachos.page.ts\n\tmodified: src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html\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.html\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.html\n\tmodified: src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.page.ts\n\tmodified: src/app/shared/gabinete-digital/diplomas/diplomas.page.html\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.html\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts\n\tmodified: src/app/shared/gabinete-digital/expedients/expedients.page.html\n\tmodified: src/app/shared/gabinete-digital/expedients/expedients.page.ts\n\tmodified: src/app/shared/gabinete-digital/pedidos/pedidos.page.html\n\tmodified: src/app/shared/gabinete-digital/pedidos/pedidos.page.ts\n\tmodified: src/app/shared/gabinete-digital/pendentes/pendentes.page.html\n\tmodified: src/app/shared/gabinete-digital/pendentes/pendentes.page.ts", + "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/modals/create-process/create-process.page.html\n\tmodified: src/app/pages/agenda/new-event/new-event.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html\n\tmodified: src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts\n\tmodified: src/app/shared/popover/opts-expediente/opts-expediente.page.html\n\tmodified: src/app/shared/popover/opts-expediente/opts-expediente.page.ts\n\tmodified: src/app/shared/popover/searched-document-options/searched-document-options.page.html\n\tmodified: src/environments/environment.prod.ts\n\tnew file: www.rar", "changeAuthor": "peter.maquiran" } \ No newline at end of file diff --git a/www.rar b/www.rar new file mode 100644 index 000000000..546192517 Binary files /dev/null and b/www.rar differ