diff --git a/src/app/models/beast-orm.ts b/src/app/models/beast-orm.ts index 8ed7fd819..176f8aa43 100644 --- a/src/app/models/beast-orm.ts +++ b/src/app/models/beast-orm.ts @@ -48,12 +48,6 @@ models.register({ }) -window['MessageModel'] = MessageModel - - - - - export class ActionModel extends models.Model{ ProcessId = models.IntegerField({unique: true}) Description = models.CharField() diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html index 26390d855..44ffe0897 100644 --- a/src/app/pages/events/events.page.html +++ b/src/app/pages/events/events.page.html @@ -32,25 +32,25 @@
-

Correspondência com prazo para hoje

+

Correspondências com prazo para hoje

{{ TaskService.deadline }}
-

Correspondência em atraso

+

Correspondências em atraso

{{ TaskService.overdueTasks }}
-

Novas Correspondência

+

Novas Correspondências

{{ TaskService.new }}
-

Correspondência não lida

+

Correspondências não lidas

{{ TaskService.unread }}
diff --git a/src/app/pages/search/search.page.scss b/src/app/pages/search/search.page.scss index bac058200..6a0ea05b6 100644 --- a/src/app/pages/search/search.page.scss +++ b/src/app/pages/search/search.page.scss @@ -69,6 +69,7 @@ ion-slide{ // search result type .options{ + max-width: 900px; margin-top: 10px; .container{ .d-flex{ diff --git a/src/app/pages/search/search.page.ts b/src/app/pages/search/search.page.ts index 53281b4fd..18fd87fb3 100644 --- a/src/app/pages/search/search.page.ts +++ b/src/app/pages/search/search.page.ts @@ -328,8 +328,8 @@ export class SearchPage implements OnInit { searchDocumentDate; - if(this.searchSubject == '') { - this.searchSubject = undefined + if(this.searchSubject == undefined || this.searchSubject == null) { + this.searchSubject = "" } if(this.type == "Agenda" ) { diff --git a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts index 5020fd780..399027b8b 100644 --- a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts +++ b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts @@ -15,6 +15,7 @@ import { removeDuplicate } from 'src/plugin/removeDuplicate.js' import { EventToApproveEdit } from 'src/app/models/event.model'; import { ThemeService } from 'src/app/services/theme.service' import { Router } from '@angular/router'; +import { HttpErrorHandle } from 'src/app/services/http-error-handle.service'; const CUSTOM_DATE_FORMATS: NgxMatDateFormats = { @@ -131,6 +132,7 @@ export class EditEventToApprovePage implements OnInit { private processes:ProcessesService, private toastService: ToastService, public ThemeService: ThemeService, + public httpErrorHandler: HttpErrorHandle ) { this.isEventEdited = false; } @@ -362,9 +364,10 @@ export class EditEventToApprovePage implements OnInit { this.close() - this.toastService._successMessage('Evento editado'); + this.httpErrorHandler.httpsSucessMessagge('Editar evento'); } catch(e) { + this.httpErrorHandler.httpStatusHandle(e); this.toastService._badRequest('Evento não editado'); } diff --git a/version/git-version.ts b/version/git-version.ts index 4355fd83a..bae9d5fba 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "d56c38aac", - "SHA": "d56c38aac1f66aa95eef0ad6dd1875d93d6f4467", + "shortSHA": "6b8e4a600", + "SHA": "6b8e4a600bb9d03d98cde3b611a4698dd2be69c7", "branch": "feature/gabinete-search", "lastCommitAuthor": "'Eudes Inácio'", - "lastCommitTime": "'Sat Jun 10 10:00:02 2023 +0100'", - "lastCommitMessage": "add interveninter button text change and text on agrupadores on inicio module", - "lastCommitNumber": "4969", + "lastCommitTime": "'Sat Jun 10 10:55:30 2023 +0100'", + "lastCommitMessage": "Pesquisa avançada fixed", + "lastCommitNumber": "4972", "change": "", - "changeStatus": "On branch feature/gabinete-search\nYour branch and 'origin/feature/gabinete-search' have diverged,\nand have 12 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/pages/agenda/edit-event/edit-event.page.html\n\tmodified: src/app/pages/agenda/edit-event/edit-event.page.ts\n\tmodified: src/app/pages/agenda/new-event/new-event.page.ts\n\tmodified: src/app/pages/agenda/view-event/view-event.page.html\n\tmodified: src/app/pages/agenda/view-event/view-event.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts\n\tmodified: src/app/pages/search/search.page.ts\n\tmodified: src/app/services/http-error-handle.service.ts\n\tmodified: src/app/shared/agenda/edit-event/edit-event.page.html\n\tmodified: src/app/shared/agenda/edit-event/edit-event.page.ts", + "changeStatus": "On branch feature/gabinete-search\nYour branch and 'origin/feature/gabinete-search' have diverged,\nand have 13 and 6 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/models/beast-orm.ts\n\tmodified: src/app/pages/events/events.page.html\n\tmodified: src/app/pages/search/search.page.scss\n\tmodified: src/app/pages/search/search.page.ts\n\tmodified: src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts", "changeAuthor": "eudes.inacio" } \ No newline at end of file