diff --git a/src/app/modals/add-note/add-note.page.html b/src/app/modals/add-note/add-note.page.html index 22b7e6ee2..eba4947eb 100644 --- a/src/app/modals/add-note/add-note.page.html +++ b/src/app/modals/add-note/add-note.page.html @@ -50,7 +50,7 @@
- + + diff --git a/src/app/models/beast-orm.ts b/src/app/models/beast-orm.ts index a22a6c857..8ed7fd819 100644 --- a/src/app/models/beast-orm.ts +++ b/src/app/models/beast-orm.ts @@ -1,5 +1,5 @@ import { models } from 'beast-orm' -// import { models } from 'src/plugin/src' +/* import { models } from 'src/plugin/src' */ import { environment } from 'src/environments/environment' const { ArrayField, JsonField} = models.indexedDB.fields diff --git a/src/app/pages/chat/group-messages/group-messages.page.ts b/src/app/pages/chat/group-messages/group-messages.page.ts index 4901d347a..106979ccf 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.ts +++ b/src/app/pages/chat/group-messages/group-messages.page.ts @@ -533,6 +533,9 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy { roomId: this.roomId, members: this.members, isAdmin: this.isAdmin, + isCreated: this.isGroupCreated, + room: this.room, + name: this.room.name, }, }); await modal.present(); diff --git a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html index 497bcf884..80853a56c 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html +++ b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html @@ -1,3 +1,7 @@ + + + +
diff --git a/src/app/pages/gabinete-digital/despachos/despachos.page.html b/src/app/pages/gabinete-digital/despachos/despachos.page.html index b49f5b2f9..d6bb91322 100644 --- a/src/app/pages/gabinete-digital/despachos/despachos.page.html +++ b/src/app/pages/gabinete-digital/despachos/despachos.page.html @@ -1,3 +1,7 @@ + + + +
diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html index 64bda2f46..7b13ce150 100644 --- a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html +++ b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html @@ -1,3 +1,7 @@ + + + +
diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts index 4d55545d8..6e0e8209b 100644 --- a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts +++ b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts @@ -179,9 +179,8 @@ export class DiplomaAssinarPage implements OnInit { try { await this.processes.CompleteTask(body).toPromise() - this.httpErroHandle.httpsSucessMessagge('Assinado',() => { - this.goBack(); - }) + this.httpErroHandle.httpsSucessMessagge('Assinado') + this.goBack(); } catch (error) { this.httpErroHandle.httpStatusHandle(error) } diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html index ee710a6bf..62867a05d 100644 --- a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html +++ b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html @@ -1,3 +1,8 @@ + + + + +
diff --git a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html index 0783f5577..a957bce62 100644 --- a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html +++ b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html @@ -1,3 +1,8 @@ + + + + +
diff --git a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.html b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.html index 7e9e3e2a8..53db81b72 100644 --- a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.html +++ b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.html @@ -1,3 +1,7 @@ + + + +
diff --git a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html index c43a18525..c609faa13 100644 --- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html +++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html @@ -75,10 +75,10 @@
- - + +
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 340dc083a..b36b2f88e 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 @@ -23,6 +23,7 @@ import { TaskService } from 'src/app/Rules/task.service'; import { PermissionService } from 'src/app/services/permission.service'; import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page'; import { ThemeService } from 'src/app/services/theme.service' +import { EventTrigger } from 'src/app/services/eventTrigger.service'; import { SqliteService } from 'src/app/services/sqlite.service'; @@ -89,7 +90,8 @@ export class ExpedienteDetailPage implements OnInit { private dataService: DataService, private storage: Storage, private userAuth: AuthService, - private httpErroHandle: HttpErrorHandle + private httpErroHandle: HttpErrorHandle, + private eventTriger: EventTrigger ) { this.loggeduser = SessionStore.user console.log('SessionStore', SessionStore) @@ -314,6 +316,8 @@ export class ExpedienteDetailPage implements OnInit { if (actionName == 'Aprovar') { this.approve(res.data.note, docs); + this.subscribeEventTrigger('update') + } else if (actionName == 'Revisão') { this.sendToReview(res.data.note, docs); @@ -323,6 +327,11 @@ export class ExpedienteDetailPage implements OnInit { }); } + subscribeEventTrigger(value) { + this.eventTriger.publishSomeData({ + expedienteDetail: value + }) + } goBack() { this.RouteService.goBack(); diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.ts b/src/app/pages/gabinete-digital/expediente/expediente.page.ts index 2ac6b4555..2fd8c68bd 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente.page.ts @@ -10,6 +10,7 @@ import { BackgroundService } from '../../../services/background.service'; import { ThemeService } from 'src/app/services/theme.service' import { SortService } from 'src/app/services/functions/sort.service'; import { Storage } from '@ionic/storage'; +import { EventTrigger } from 'src/app/services/eventTrigger.service'; @Component({ selector: 'app-expediente', @@ -41,8 +42,17 @@ export class ExpedientePage implements OnInit { private backgroundservice: BackgroundService, public ThemeService: ThemeService, private sortService: SortService, - private storage: Storage - ) { } + private storage: Storage, + private eventTriger: EventTrigger + ) { + + this.eventTriger.getObservable().subscribe((event) => { + if(event.notification == "recive") { + this.refreshing(); + } + console.log(event) + }) + } ngOnInit() { diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html index bc9df7dce..dae070f30 100644 --- a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html +++ b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html @@ -1,3 +1,6 @@ + + +
diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html index a51b8dbca..7ad6c6ecc 100644 --- a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html +++ b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html @@ -1,3 +1,7 @@ + + + + diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.page.html b/src/app/pages/gabinete-digital/pedidos/pedidos.page.html index ad8d26183..1ed83a187 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedidos.page.html +++ b/src/app/pages/gabinete-digital/pedidos/pedidos.page.html @@ -1,3 +1,7 @@ + + + +
diff --git a/src/app/pages/gabinete-digital/pendentes/pendentes.page.html b/src/app/pages/gabinete-digital/pendentes/pendentes.page.html index ee4459312..8f6ca44df 100644 --- a/src/app/pages/gabinete-digital/pendentes/pendentes.page.html +++ b/src/app/pages/gabinete-digital/pendentes/pendentes.page.html @@ -1,3 +1,8 @@ + + + + +
diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts index fa40f36f4..4aa4226b8 100644 --- a/src/app/pages/login/login.page.ts +++ b/src/app/pages/login/login.page.ts @@ -18,6 +18,7 @@ import { ChatService } from 'src/app/services/chat.service'; import { Platform } from '@ionic/angular'; import { FirstEnterService } from '../../services/first-enter.service'; import { Storage } from '@ionic/storage'; +import { HttpErrorHandle } from 'src/app/services/http-error-handle.service'; @Component({ selector: 'app-login', templateUrl: './login.page.html', @@ -54,6 +55,7 @@ export class LoginPage implements OnInit { private platform: Platform, private FirstEnterService: FirstEnterService, private storage:Storage, + private httpErrorHandle: HttpErrorHandle ) {} ngOnInit() {} @@ -176,10 +178,10 @@ export class LoginPage implements OnInit { } - } + }/* else{ this.toastService._badRequest('Ocorreu um problema por favor valide o username e password'); - } + } */ } else { this.toastService._badRequest('Por favor, insira a sua palavra-passe'); diff --git a/src/app/pages/publications/new-publication/new-publication.page.ts b/src/app/pages/publications/new-publication/new-publication.page.ts index 373e4bc84..6fd58511c 100644 --- a/src/app/pages/publications/new-publication/new-publication.page.ts +++ b/src/app/pages/publications/new-publication/new-publication.page.ts @@ -112,7 +112,7 @@ export class NewPublicationPage implements OnInit { async takePicture() { const capturedImage = await Camera.getPhoto({ - quality: 90, + quality: 50, // allowEditing: true, resultType: CameraResultType.Uri, source: CameraSource.Camera @@ -133,7 +133,7 @@ export class NewPublicationPage implements OnInit { var ctx = canvas.getContext('2d'); canvas.width = 100 canvas.height = 34 - ctx.drawImage(image, 0, 0, 100, 34); + ctx.drawImage(image, 0, 0); document.body.appendChild(canvas); } diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts index 8d9a019aa..9333cfd6d 100644 --- a/src/app/services/auth.service.ts +++ b/src/app/services/auth.service.ts @@ -18,6 +18,7 @@ import { Storage } from '@ionic/storage'; import { InitialsService } from './functions/initials.service'; import { PermissionService } from './permission.service'; import { ChatSystemService } from 'src/app/services/chat/chat-system.service'; +import { HttpErrorHandle } from 'src/app/services/http-error-handle.service'; @Injectable({ providedIn: 'root' }) @@ -42,7 +43,8 @@ export class AuthService { private storage: Storage, private initialsService: InitialsService, public p: PermissionService, - public ChatSystemService: ChatSystemService) { + public ChatSystemService: ChatSystemService, + private httpErroHandle: HttpErrorHandle) { if (SessionStore.exist) { if(this.p.userPermission(this.p.permissionList.Chat.access) == true ) { @@ -72,7 +74,7 @@ export class AuthService { this.SetSession(response, user) } } catch (error) { - + this.httpErroHandle.httpStatusHandle(error) } finally { return response } diff --git a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html index 73418d32c..a0d705299 100644 --- a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html +++ b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html @@ -371,6 +371,6 @@
- +
diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.ts b/src/app/shared/gabinete-digital/expedients/expedients.page.ts index 06f99cca3..8bc892d16 100644 --- a/src/app/shared/gabinete-digital/expedients/expedients.page.ts +++ b/src/app/shared/gabinete-digital/expedients/expedients.page.ts @@ -6,6 +6,7 @@ import { ExpedienteTaskPipe } from 'src/app/pipes/expediente-task.pipe'; import { ThemeService } from 'src/app/services/theme.service' import { SortService } from 'src/app/services/functions/sort.service'; import { Storage } from '@ionic/storage'; +import { EventTrigger } from 'src/app/services/eventTrigger.service'; @Component({ selector: 'app-expedients', @@ -29,9 +30,16 @@ export class ExpedientsPage implements OnInit { private router: Router, public ThemeService: ThemeService, private sortService: SortService, - private storage: Storage + private storage: Storage, + private eventTriger: EventTrigger ) { this.profile = 'mdgpr'; + this.eventTriger.getObservable().subscribe((event) => { + if(event.expedienteDetail == "update") { + this.LoadList(); + } + console.log(event) + }) } diff --git a/src/app/shared/popover/chat-popover/chat-popover.page.ts b/src/app/shared/popover/chat-popover/chat-popover.page.ts index 48c217b02..5eed1907a 100644 --- a/src/app/shared/popover/chat-popover/chat-popover.page.ts +++ b/src/app/shared/popover/chat-popover/chat-popover.page.ts @@ -5,6 +5,9 @@ import { ToastService } from 'src/app/services/toast.service'; import { ThemeService } from 'src/app/services/theme.service' import { SetRoomOwnerPage } from 'src/app/modals/set-room-owner/set-room-owner.page'; import { ChatSystemService } from 'src/app/services/chat/chat-system.service'; +import { HttpErrorResponse } from '@angular/common/http'; +import { SessionStore } from 'src/app/store/session.service'; +import { GroupContactsPage } from '../../chat/group-messages/group-contacts/group-contacts.page'; @Component({ @@ -17,6 +20,7 @@ export class ChatPopoverPage implements OnInit { room: any; members:any; isAdmin = false; + isGroupCreated: boolean; constructor( private popoverController: PopoverController, diff --git a/src/app/shared/popover/deploma-options/deploma-options.page.html b/src/app/shared/popover/deploma-options/deploma-options.page.html index ae3c653c4..c6de03aa0 100644 --- a/src/app/shared/popover/deploma-options/deploma-options.page.html +++ b/src/app/shared/popover/deploma-options/deploma-options.page.html @@ -12,9 +12,11 @@
- - + + + +
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 dca2d32bb..0dfaffa4f 100644 --- a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts +++ b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts @@ -294,14 +294,9 @@ export class OptsExpedientePage implements OnInit { try { await this.processes.CompleteTask(body).toPromise(); this.close(); - this.toastService._successMessage('Processo aprovado') + this.httpErrorHanlde.httpsSucessMessagge('Avaliação Superiror') } catch(error) { - if(error.status == 0) { - this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') - } else { - - this.toastService._badRequest('Processo não aprovado') - } + this.httpErrorHanlde.httpStatusHandle(error) } finally { loader.remove() } diff --git a/src/app/shared/publication/view-publications/view-publications.page.ts b/src/app/shared/publication/view-publications/view-publications.page.ts index 2bbf5e714..a26b3936d 100644 --- a/src/app/shared/publication/view-publications/view-publications.page.ts +++ b/src/app/shared/publication/view-publications/view-publications.page.ts @@ -126,7 +126,7 @@ export class ViewPublicationsPage implements OnInit { const found = this.publicationList[folderId].find( e => e.DocumentId == publicationId ) if(!found) { - // PublicationModel.create(publicationDetails) + /* PublicationModel.create(publicationDetails) */ this.publicationList[folderId].push(publicationDetails) } } 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 b1ffa625c..7d588a0d2 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "9c7281ce4", - "SHA": "9c7281ce48b7bd3b792db5b350d99dd7cf06f60e", + "shortSHA": "a25b8ba40", + "SHA": "a25b8ba40f25c50166eebfe285a91d8f00543a5d", "branch": "no_bug_movemente", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Thu Mar 9 17:14:42 2023 +0100'", - "lastCommitMessage": "fix", - "lastCommitNumber": "4858", + "lastCommitTime": "'Fri Mar 10 11:41:44 2023 +0100'", + "lastCommitMessage": "fix chat", + "lastCommitNumber": "4859", "change": "", - "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/chat/chat.page.ts\n\tmodified: src/app/pages/chat/group-messages/group-messages.page.ts\n\tmodified: src/app/shared/chat/group-messages/group-messages.page.ts\n\tmodified: src/app/shared/popover/chat-popover/chat-popover.page.ts\n\tmodified: src/theme/variables.scss\n\tmodified: version/git-version.ts", + "changeStatus": "On branch no_bug_movemente\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/add-note/add-note.page.html\n\tmodified: src/app/models/beast-orm.ts\n\tmodified: src/app/pages/chat/group-messages/group-messages.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html\n\tmodified: src/app/pages/gabinete-digital/despachos/despachos.page.html\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html\n\tmodified: src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html\n\tmodified: src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.html\n\tmodified: src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente.page.ts\n\tmodified: src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html\n\tmodified: src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedidos.page.html\n\tmodified: src/app/pages/gabinete-digital/pendentes/pendentes.page.html\n\tmodified: src/app/pages/login/login.page.ts\n\tmodified: src/app/pages/publications/new-publication/new-publication.page.ts\n\tmodified: src/app/services/auth.service.ts\n\tmodified: src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html\n\tmodified: src/app/shared/gabinete-digital/expedients/expedients.page.ts\n\tmodified: src/app/shared/popover/chat-popover/chat-popover.page.ts\n\tmodified: src/app/shared/popover/deploma-options/deploma-options.page.html\n\tmodified: src/app/shared/popover/opts-expediente/opts-expediente.page.ts\n\tmodified: src/app/shared/publication/view-publications/view-publications.page.ts\n\tmodified: src/environments/environment.prod.ts\n\tmodified: version/git-version.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file