From e310c2fa6f20dc2295990a4d5a7f5cb2a291edde Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Wed, 19 Jun 2024 15:56:39 +0100 Subject: [PATCH] fix apresentation labels --- .../agenda/edit-event/edit-event.page.html | 20 +++++----- .../agenda/edit-event/edit-event.page.ts | 5 ++- .../agenda/view-event/view-event.page.ts | 37 ++++++++----------- src/app/pages/search/search.page.html | 15 +++++--- src/app/pages/search/search.page.scss | 6 ++- .../agenda/edit-event/edit-event.page.html | 12 +++--- .../agenda/edit-event/edit-event.page.ts | 21 ++++++----- 7 files changed, 59 insertions(+), 57 deletions(-) diff --git a/src/app/pages/agenda/edit-event/edit-event.page.html b/src/app/pages/agenda/edit-event/edit-event.page.html index 05dee1b4e..5fe61edb5 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.html +++ b/src/app/pages/agenda/edit-event/edit-event.page.html @@ -150,7 +150,7 @@
- + @@ -171,19 +171,19 @@ - +
- +
- +
- + - +
@@ -228,7 +228,7 @@ [stepSecond]="stepSecond" [touchUi]="touchUi" [hideTime]="true"> - + @@ -462,9 +462,9 @@

- Correspondência - Acções Presidenciais - Arquivo Despacho Electrónico + Correspondência + Acções Presidenciais + Arquivo Despacho Electrónico

diff --git a/src/app/pages/agenda/edit-event/edit-event.page.ts b/src/app/pages/agenda/edit-event/edit-event.page.ts index c08f6d023..8980dcc27 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.ts +++ b/src/app/pages/agenda/edit-event/edit-event.page.ts @@ -422,9 +422,12 @@ export class EditEventPage implements OnInit { this.postEvent.Attendees = this.taskParticipants.concat(this.taskParticipantsCc); try { + const events = [] this.agendaDataRepository.updateEvent(this.postEvent.EventId, this.postEvent, editAllEvent).subscribe((value) => { console.log(value) + this.goBack(); + this.httpErrorHandle.httpsSucessMessagge('Editar evento') }, ((error) => { console.log('edit event error: ', error) })); @@ -456,8 +459,6 @@ export class EditEventPage implements OnInit { this.isEventEdited = true; - this.goBack(); - this.httpErrorHandle.httpsSucessMessagge('Editar evento') } catch (error) { this.httpErrorHandle.httpStatusHandle(error) diff --git a/src/app/pages/agenda/view-event/view-event.page.ts b/src/app/pages/agenda/view-event/view-event.page.ts index ac652e865..921968af7 100644 --- a/src/app/pages/agenda/view-event/view-event.page.ts +++ b/src/app/pages/agenda/view-event/view-event.page.ts @@ -440,14 +440,22 @@ export class ViewEventPage implements OnInit { await modal.present(); modal.onDidDismiss().then((res) => { - if (res) { - setTimeout(() => { - this.loadEvent(); - /* this.loadEvent1() */ - }, 250); + + + if (res.data?.action == 'cancel') { + + console.log('res', res) + } else { + this.loadEvent() this.isEventEdited = true; - console.log('res', res, res.data?.action, 'cancel') + + if (res.data.Attendees?.length >= 1) { + this.loadedEvent.HasAttachments = true + this.getAttachments() + } + console.log('res', res) } + }); } @@ -475,24 +483,10 @@ export class ViewEventPage implements OnInit { if (res.data?.action == 'cancel') { - setTimeout(() => { - this.loadEvent(); - /* this.loadEvent1() */ - }, 250); - this.isEventEdited = true; - - if (res.data.Attendees?.length >= 1) { - this.loadedEvent.HasAttachments = true - this.getAttachments() - } console.log('res', res) } else { - setTimeout(() => { - /* this.loadEvent(); */ - this.loadEvent() - - }, 250); + this.loadEvent() this.isEventEdited = true; if (res.data.Attendees?.length >= 1) { @@ -502,7 +496,6 @@ export class ViewEventPage implements OnInit { console.log('res', res) } - this.getAttachments() }); await modal.present(); diff --git a/src/app/pages/search/search.page.html b/src/app/pages/search/search.page.html index 577289ce6..d6b4a887b 100644 --- a/src/app/pages/search/search.page.html +++ b/src/app/pages/search/search.page.html @@ -301,11 +301,16 @@
{{ searchDocument.subject || searchDocument.Assunto}} {{ - searchDocument.appName}} + *ngIf="itemIcons() == 'AccoesPresidenciais & ArquivoDespachoElect' || itemIcons() == 'Correspondencia' "> + + Correspondencia + AccoesPresidenciais + ArquivoDespachoElect + +
- {{ searchDocument.EntidadeOrganicaNome }} + {{ formateIsoDate(searchDocument.dateEntry || searchDocument.Data) }}
@@ -323,7 +328,7 @@
{{pageNumber + "/" + totalPage}}
- + @@ -331,4 +336,4 @@ - \ No newline at end of file + diff --git a/src/app/pages/search/search.page.scss b/src/app/pages/search/search.page.scss index 5264e045f..0925f9efe 100644 --- a/src/app/pages/search/search.page.scss +++ b/src/app/pages/search/search.page.scss @@ -201,7 +201,6 @@ ion-slide { background: var(--font-awesome); border-radius: 18px; text-align: center; - display: flex; align-items: center; padding: 0px 5px; color: white; @@ -212,6 +211,9 @@ ion-slide { -moz-border-radius: 18px; -ms-border-radius: 18px; -o-border-radius: 18px; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; } span.documente-date { } @@ -319,4 +321,4 @@ a:hover { .nextAndPreviewDiv { display:inline-flex -} \ No newline at end of file +} diff --git a/src/app/shared/agenda/edit-event/edit-event.page.html b/src/app/shared/agenda/edit-event/edit-event.page.html index 7b683cafd..ac1456ca1 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.html +++ b/src/app/shared/agenda/edit-event/edit-event.page.html @@ -132,7 +132,7 @@ - +
@@ -408,16 +408,16 @@

+ {{ document | json }} {{document.subject || document.sourceName || document.SourceName || 'Sem título'}} - Correspondencia - AccoesPresidenciais - ArquivoDespachoElect + Correspondencia + AccoesPresidenciais + ArquivoDespachoElect

-

{{document.Stakeholders}} {{document.dateEntry | - date: 'dd-MM-yyyy HH:mm'}}

+

{{document.Stakeholders}} {{ document.dateEntry }}

diff --git a/src/app/shared/agenda/edit-event/edit-event.page.ts b/src/app/shared/agenda/edit-event/edit-event.page.ts index b2f024d90..dbf890c3b 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.ts +++ b/src/app/shared/agenda/edit-event/edit-event.page.ts @@ -410,6 +410,13 @@ export class EditEventPage implements OnInit { this.agendaDataRepository.updateEvent(this._postEvent.EventId, this._postEvent, editAllEvent).subscribe((value) => { console.log(value) + + this.httpErrorHandle.httpsSucessMessagge('Editar evento') + this.clearPostEvent.emit(); + this.deleteTemporaryData(); + this.showLoader = false; + this.close(); + }, ((error) => { console.log('edit event error: ', error) })); @@ -442,14 +449,6 @@ export class EditEventPage implements OnInit { } - this.clearPostEvent.emit(); - this.deleteTemporaryData(); - this.showLoader = false; - this.close(); - - - this.httpErrorHandle.httpsSucessMessagge('Editar evento') - } catch (error) { this.httpErrorHandle.httpStatusHandle(error) console.log('edit: ', error) @@ -677,8 +676,9 @@ export class EditEventPage implements OnInit { SerialNumber: '', }*/ + console.log({data}) - let newDocObject: SearchList_v2 = { + let newDocObject: SearchList_v2 & {ApplicationId: any} = { docId: data.selected.docId, sourceName: data.selected.sourceName, description: data.selected.description, @@ -687,7 +687,8 @@ export class EditEventPage implements OnInit { dateEntry: data.selected.dateEntry, docNumber: data.selected.docNumber, subject: data.selected.subject, - userId: data.selected.userId + userId: data.selected.userId, + ApplicationId: data.selected.applicationId }