From 6c7a007812f6a5daf104743803cbe71982463742 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eudes=20In=C3=A1cio?= Date: Thu, 9 Mar 2023 09:09:10 +0100 Subject: [PATCH 1/3] Bugs reported solved --- src/app/modals/add-note/add-note.page.html | 6 ++--- .../group-messages/group-messages.page.ts | 3 +++ .../diploma-assinar/diploma-assinar.page.ts | 5 ++-- .../diplomas/diploma/diploma.page.html | 4 ++-- .../expediente-detail.page.ts | 11 ++++++++- .../expediente/expediente.page.ts | 14 +++++++++-- src/app/pages/login/login.page.ts | 6 +++-- src/app/services/auth.service.ts | 6 +++-- .../expedients/expedients.page.ts | 10 +++++++- .../chat-popover/chat-popover.page.html | 2 +- .../popover/chat-popover/chat-popover.page.ts | 24 +++++++++++++++++++ .../deploma-options/deploma-options.page.html | 6 +++-- .../opts-expediente/opts-expediente.page.ts | 9 ++----- src/environments/environment.prod.ts | 2 +- src/environments/environment.ts | 2 +- version/git-version.ts | 12 +++++----- 16 files changed, 88 insertions(+), 34 deletions(-) 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/pages/chat/group-messages/group-messages.page.ts b/src/app/pages/chat/group-messages/group-messages.page.ts index da629f705..f7add7fe6 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/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/diploma/diploma.page.html b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html index 59b5d0667..103c90875 100644 --- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html +++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html @@ -79,10 +79,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/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/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/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.html b/src/app/shared/popover/chat-popover/chat-popover.page.html index 3ae9c4475..3b9dc4fff 100644 --- a/src/app/shared/popover/chat-popover/chat-popover.page.html +++ b/src/app/shared/popover/chat-popover/chat-popover.page.html @@ -6,7 +6,7 @@
- +
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 633eb6cbe..59dae2430 100644 --- a/src/app/shared/popover/chat-popover/chat-popover.page.ts +++ b/src/app/shared/popover/chat-popover/chat-popover.page.ts @@ -7,6 +7,7 @@ import { SetRoomOwnerPage } from 'src/app/modals/set-room-owner/set-room-owner.p 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({ @@ -19,6 +20,7 @@ export class ChatPopoverPage implements OnInit { room: any; members:any; isAdmin = false; + isGroupCreated: boolean; constructor( private popoverController: PopoverController, @@ -138,4 +140,26 @@ export class ChatPopoverPage implements OnInit { } } + async addContacts() { + + + const modal = await this.modalController.create({ + component: GroupContactsPage, + componentProps: { + isCreated: this.isGroupCreated, + room: this.room, + members: this.members, + name: this.room.name, + }, + cssClass: 'contacts', + backdropDismiss: false + }); + + await modal.present(); + + modal.onDidDismiss().then(() => { + /* this.getRoomInfo(); */ + }); + } + } 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/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/src/environments/environment.ts b/src/environments/environment.ts index 10909d23b..aaefbfe6d 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -3,4 +3,4 @@ import { oaprDev } from './suport/oapr' import { doneITDev } from './suport/doneIt' -export const environment: Environment = oaprDev; \ No newline at end of file +export const environment: Environment = doneITDev; \ No newline at end of file diff --git a/version/git-version.ts b/version/git-version.ts index 95493f536..acb8395d1 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "c037078ca", - "SHA": "c037078ca77a5a2eb316af91a9ec76493f0b908e", + "shortSHA": "7c6bd9c0a", + "SHA": "7c6bd9c0a4253974d796326c6506491c97e9915c", "branch": "no_bug_movemente", "lastCommitAuthor": "'Eudes Inácio'", - "lastCommitTime": "'Mon Feb 27 22:16:15 2023 +0100'", - "lastCommitMessage": "Saidas testastas", - "lastCommitNumber": "4841", + "lastCommitTime": "'Mon Feb 27 22:52:33 2023 +0100'", + "lastCommitMessage": "pr eftu...\" to unstage)\n\tmodified: src/app/modals/add-note/add-note.page.html\n\tmodified: src/app/pages/chat/group-messages/group-messages.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts\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/login/login.page.ts\n\tmodified: src/app/services/auth.service.ts\n\tmodified: src/app/shared/gabinete-digital/expedients/expedients.page.ts\n\tmodified: src/app/shared/popover/chat-popover/chat-popover.page.html\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/environments/environment.prod.ts\n\tmodified: src/environments/environment.ts", "changeAuthor": "eudes.inacio" } \ No newline at end of file From 89303d12afcb9f7150aeddac3efaaade78a2b46a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eudes=20In=C3=A1cio?= Date: Thu, 9 Mar 2023 16:55:31 +0100 Subject: [PATCH 2/3] aprove event edit button description changed fom Enviar to Gravar and publication picture quality reduce to 50 --- .../new-publication/new-publication.page.ts | 4 ++-- .../edit-event-to-approve.page.html | 2 +- version/git-version.ts | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) 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/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/version/git-version.ts b/version/git-version.ts index acb8395d1..42dbc38d7 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "7c6bd9c0a", - "SHA": "7c6bd9c0a4253974d796326c6506491c97e9915c", + "shortSHA": "6c7a00781", + "SHA": "6c7a007812f6a5daf104743803cbe71982463742", "branch": "no_bug_movemente", "lastCommitAuthor": "'Eudes Inácio'", - "lastCommitTime": "'Mon Feb 27 22:52:33 2023 +0100'", - "lastCommitMessage": "pr eftu...\" to unstage)\n\tmodified: src/app/modals/add-note/add-note.page.html\n\tmodified: src/app/pages/chat/group-messages/group-messages.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts\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/login/login.page.ts\n\tmodified: src/app/services/auth.service.ts\n\tmodified: src/app/shared/gabinete-digital/expedients/expedients.page.ts\n\tmodified: src/app/shared/popover/chat-popover/chat-popover.page.html\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/environments/environment.prod.ts\n\tmodified: src/environments/environment.ts", + "changeStatus": "On branch no_bug_movemente\nYour branch and 'origin/no_bug_movemente' have diverged,\nand have 1 and 9 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/publications/new-publication/new-publication.page.ts\n\tmodified: src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html", "changeAuthor": "eudes.inacio" } \ No newline at end of file From 889e3829055600bad6938f6a4826a58ebfb7bfa7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eudes=20In=C3=A1cio?= Date: Fri, 10 Mar 2023 09:05:33 +0100 Subject: [PATCH 3/3] commit after resolve merge conflit --- src/app/models/beast-orm.ts | 4 ++-- .../despachos-pr/despachos-pr.page.html | 2 +- .../gabinete-digital/despachos/despachos.page.html | 2 +- .../diploma-assinar/diploma-assinar.page.html | 2 +- .../diplomas-assinar/diplomas-assinar.page.html | 2 +- .../diplomas-gerar/diplomas-gerar.page.html | 2 +- .../diplomas-gerar/diplomas-gerar.page.html | 2 +- .../expediente-pr/expediente-pr.page.html | 2 +- .../expedientes-pr/expedientes-pr.page.html | 2 +- .../pages/gabinete-digital/pedidos/pedidos.page.html | 2 +- .../gabinete-digital/pendentes/pendentes.page.html | 2 +- .../shared/popover/chat-popover/chat-popover.page.ts | 3 --- .../view-publications/view-publications.page.ts | 2 +- version/git-version.ts | 12 ++++++------ 14 files changed, 19 insertions(+), 22 deletions(-) diff --git a/src/app/models/beast-orm.ts b/src/app/models/beast-orm.ts index 90923db19..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 'beast-orm' +/* import { models } from 'src/plugin/src' */ import { environment } from 'src/environments/environment' const { ArrayField, JsonField} = models.indexedDB.fields 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 6e6b13f03..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,5 +1,5 @@ - + diff --git a/src/app/pages/gabinete-digital/despachos/despachos.page.html b/src/app/pages/gabinete-digital/despachos/despachos.page.html index 03f7b9bf1..d6bb91322 100644 --- a/src/app/pages/gabinete-digital/despachos/despachos.page.html +++ b/src/app/pages/gabinete-digital/despachos/despachos.page.html @@ -1,5 +1,5 @@ - + 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 80c3ef457..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,5 +1,5 @@ - + 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 a8cf57be2..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,5 +1,5 @@ - + 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 385269545..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,5 +1,5 @@ - + 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 b0e5484f0..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,5 +1,5 @@ - + 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 bc027cf33..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,5 +1,5 @@ - +
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 07c372c1a..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,5 +1,5 @@ - + diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.page.html b/src/app/pages/gabinete-digital/pedidos/pedidos.page.html index 4fbdd39be..1ed83a187 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedidos.page.html +++ b/src/app/pages/gabinete-digital/pedidos/pedidos.page.html @@ -1,5 +1,5 @@ - + diff --git a/src/app/pages/gabinete-digital/pendentes/pendentes.page.html b/src/app/pages/gabinete-digital/pendentes/pendentes.page.html index c5d7b43d7..8f6ca44df 100644 --- a/src/app/pages/gabinete-digital/pendentes/pendentes.page.html +++ b/src/app/pages/gabinete-digital/pendentes/pendentes.page.html @@ -1,5 +1,5 @@ - + 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 1fa12cbe1..5fe21929b 100644 --- a/src/app/shared/popover/chat-popover/chat-popover.page.ts +++ b/src/app/shared/popover/chat-popover/chat-popover.page.ts @@ -5,12 +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'; -<<<<<<< HEAD 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'; -======= ->>>>>>> b8a1734abbbe321eedb202ddde21592f161acf12 @Component({ 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 319b1001e..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/version/git-version.ts b/version/git-version.ts index 5b1c5348f..9a000494b 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "89303d12a", - "SHA": "89303d12afcb9f7150aeddac3efaaade78a2b46a", + "shortSHA": "05d8bf424", + "SHA": "05d8bf424e3dc35c826b24d1a374e65ab21b55d3", "branch": "no_bug_movemente", "lastCommitAuthor": "'Eudes Inácio'", - "lastCommitTime": "'Thu Mar 9 16:55:31 2023 +0100'", - "lastCommitMessage": "aprove event edit button description changed fom Enviar to Gravar and publication picture quality reduce to 50", - "lastCommitNumber": "4849", + "lastCommitTime": "'Thu Mar 9 16:58:34 2023 +0100'", + "lastCommitMessage": "git pull made and peter chnages recived", + "lastCommitNumber": "4859", "change": "", - "changeStatus": "On branch no_bug_movemente\nYour branch and 'origin/no_bug_movemente' have diverged,\nand have 2 and 9 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/home/home.module.ts\n\tmodified: src/app/home/home.page.html\n\tmodified: src/app/index/index.module.ts\n\tmodified: src/app/index/index.page.html\n\tmodified: src/app/models/beast-orm.ts\n\tmodified: src/app/models/publication.ts\n\tmodified: src/app/pages/agenda/agenda.module.ts\n\tmodified: src/app/pages/agenda/agenda.page.html\n\tmodified: src/app/pages/agenda/new-event/new-event.page.ts\n\tmodified: src/app/pages/agenda/view-event/view-event.module.ts\n\tmodified: src/app/pages/agenda/view-event/view-event.page.html\n\tmodified: src/app/pages/chat/chat.module.ts\n\tmodified: src/app/pages/chat/chat.page.html\n\tmodified: src/app/pages/chat/group-messages/group-messages.page.ts\n\tmodified: src/app/pages/events/events.module.ts\n\tmodified: src/app/pages/events/events.page.html\n\tmodified: src/app/pages/events/events.page.scss\n\tmodified: src/app/pages/events/events.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.module.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/despachos-pr.module.ts\n\tmodified: src/app/pages/gabinete-digital/despachos/despacho/despacho.module.ts\n\tmodified: src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html\n\tmodified: src/app/pages/gabinete-digital/despachos/despachos.module.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.module.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.module.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.module.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.module.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas/diploma/diploma.module.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html\n\tmodified: src/app/pages/gabinete-digital/diplomas/diplomas.module.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas/diplomas.page.html\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.module.ts\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event/approve-event.module.ts\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.module.ts\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.page.html\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.module.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente.module.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente.page.html\n\tmodified: src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.module.ts\n\tmodified: src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.module.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.module.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedido/pedido.module.ts\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedidos.module.ts\n\tmodified: src/app/pages/gabinete-digital/pendentes/pendentes.module.ts\n\tmodified: src/app/pages/publications/publication-detail/publication-detail.page.ts\n\tmodified: src/app/pages/publications/publications.module.ts\n\tmodified: src/app/pages/publications/publications.page.html\n\tmodified: src/app/pages/publications/publications.page.ts\n\tmodified: src/app/pages/publications/view-publications/publication-detail/publication-detail.module.ts\n\tmodified: src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts\n\tmodified: src/app/pages/publications/view-publications/view-publications.module.ts\n\tmodified: src/app/pages/publications/view-publications/view-publications.page.html\n\tmodified: src/app/pages/publications/view-publications/view-publications.page.ts\n\tmodified: src/app/pages/search/search.module.ts\n\tmodified: src/app/pages/search/search.page.html\n\tmodified: src/app/pages/search/search.page.ts\n\tmodified: src/app/services/events/events.module.ts\n\tmodified: src/app/services/events/events.page.html\n\tmodified: src/app/services/publications.service.ts\n\tmodified: src/app/shared/chat/group-messages/group-messages.page.ts\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.ts\n\tmodified: src/app/shared/header/header.page.ts\n\tmodified: src/app/shared/popover/chat-popover/chat-popover.page.html\n\tmodified: src/app/shared/popover/chat-popover/chat-popover.page.ts\n\tmodified: src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts\n\tmodified: src/app/shared/publication/view-publications/view-publications.page.html\n\tmodified: src/app/shared/publication/view-publications/view-publications.page.ts", + "changeStatus": "On branch no_bug_movemente\nYour branch and 'origin/no_bug_movemente' have diverged,\nand have 3 and 2 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/models/beast-orm.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/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/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/shared/popover/chat-popover/chat-popover.page.ts\n\tmodified: src/app/shared/publication/view-publications/view-publications.page.ts", "changeAuthor": "eudes.inacio" } \ No newline at end of file