diff --git a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts index 90fda08ac..32a3fb7c5 100644 --- a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts +++ b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts @@ -230,7 +230,7 @@ export class DocumentSetUpMeetingPage implements OnInit { this.docs.push({ ApplicationId: e.ApplicationId || e.ApplicationType, Source: 1, - SourceId: e.DocId || e.docID || e.docId || e.SourceId, + SourceId: e.DocId || e.docID || e.docId || e.SourceId || e.Id, SourceName: e.Assunto }) }) @@ -239,7 +239,7 @@ export class DocumentSetUpMeetingPage implements OnInit { this.docs.push({ ApplicationId: this.document.ApplicationId || this.document.ApplicationType, Source: 1, - SourceId: this.document.DocId || this.document.docID || this.document.docId || this.document.SourceId, + SourceId: this.document.DocId || this.document.docID || this.document.docId || this.document.SourceId || this.document.Id, SourceName: this.document.Assunto }) } @@ -249,7 +249,7 @@ export class DocumentSetUpMeetingPage implements OnInit { Subject: this.postData.Subject, Body: this.postData.Body.Text, Location: this.postData.Location, - CalendarId: this.postData.CalendarName, + CalendarId: this.selectedCalendarId(), CalendarName: this.postData.CalendarName, StartDate: this.postData.StartDate, EndDate: this.postData.EndDate, @@ -369,6 +369,7 @@ export class DocumentSetUpMeetingPage implements OnInit { modal.onDidDismiss().then((res)=> { if(res){ const data = res.data; + console.log('data', data) this.attachments.push(data.selected); } }); @@ -378,13 +379,27 @@ export class DocumentSetUpMeetingPage implements OnInit { this.attachments = this.attachments.filter( (e, i) => index != i); } - validateFormInputs(){ + validateFormInputs() { let formLocation = this.postData.Location.trim(); if(!this.postData.Location && formLocation.length <= 0){ this.formLocationSatus = true; } } + selectedCalendarId () { + + if (this._eventService.calendarNamesType[this.CalendarName]?.['Oficial'] && this.postData.CalendarName == 'Oficial') { + return this._eventService.calendarNamesType[this.CalendarName]['OficialId'] + + } else if (this._eventService.calendarNamesType[this.CalendarName]?.['Pessoal'] && this.postData.CalendarName == 'Pessoal') { + + return this._eventService.calendarNamesType[this.CalendarName]['PessoalId'] + + } else { + return '11:11' + } + } + dynamicSetIntervenient({taskParticipants, taskParticipantsCc}) { this.taskParticipants = taskParticipants; this.taskParticipantsCc = taskParticipantsCc; diff --git a/src/app/services/rules/event.service.ts b/src/app/services/rules/event.service.ts index a4f4e1be3..cb03b0a69 100644 --- a/src/app/services/rules/event.service.ts +++ b/src/app/services/rules/event.service.ts @@ -21,9 +21,14 @@ export class EventService { if(this.p.userRole(['PR'])) { + alert('pr') return this.eventService.postEventPr(body, calendar) - } else { + } else if(this.p.userRole(['MDGPR'])) { + alert('md') return this.eventService.postEventMd(body, calendar) + } else { + alert('other') + return this.eventService.postEventGeneric(body, calendar, body.CalendarId) } } diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.ts b/src/app/shared/gabinete-digital/expedients/expedients.page.ts index 7301ef71f..1f1b46bf3 100644 --- a/src/app/shared/gabinete-digital/expedients/expedients.page.ts +++ b/src/app/shared/gabinete-digital/expedients/expedients.page.ts @@ -65,7 +65,7 @@ export class ExpedientsPage implements OnInit { this.taskslist = []; this.skeletonLoader = false - let res = result.filter(data => data => data.workflowInstanceDataFields.Status == "" || data.workflowInstanceDataFields.Status == "Active"); + let res = result.filter(data => data.workflowInstanceDataFields.Status == "" || data.workflowInstanceDataFields.Status == "Active"); this.taskslist = res.map((e) => this.expedienteTaskPipe.transform(e)) this.taskslist = this.sortService.sortDate(this.taskslist, 'CreateDate') @@ -93,16 +93,16 @@ export class ExpedientsPage implements OnInit { }) } - doRefresh() { + doRefresh() { - setTimeout(() => { - this.LoadList(); - }, 1000) - - } - - goToExpediente(serialNumber: any) { - this.router.navigate(['/home/gabinete-digital/expediente', serialNumber, 'gabinete-digital']); - } + setTimeout(() => { + this.LoadList(); + }, 1000) + + } + + goToExpediente(serialNumber: any) { + this.router.navigate(['/home/gabinete-digital/expediente', serialNumber, 'gabinete-digital']); + } } diff --git a/src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.scss b/src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.scss index 5ece2929a..e69265ed8 100644 --- a/src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.scss +++ b/src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.scss @@ -30,28 +30,19 @@ margin-bottom: 5px !important; margin-top: 5px !important; } -@media only screen and (max-width: 800px) { - .btn-ok, .btn-cancel, .btn-delete{ - width: 100% !important; - } + +.arrow-right{ + display: flex; + justify-content: flex-end; } -@media only screen and (min-width: 1024px) { - .arrow-right{ - display: flex; - justify-content: flex-end; - } - .btn-cancel{ - width: 100% !important; - margin-bottom: 10px !important; - } - .btn-delete, .btn-ok{ - width: 100% !important; - margin-bottom: 10px !important; - margin-top: 10px !important; - } - /* .solid{ - display: block; - } */ +.btn-cancel{ + width: 100% !important; + margin-bottom: 10px !important; +} +.btn-delete, .btn-ok{ + width: 100% !important; + margin-bottom: 10px !important; + margin-top: 10px !important; } diff --git a/version/git-version.ts b/version/git-version.ts index f2f736bfc..ce861cefd 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "189ec6e91", - "SHA": "189ec6e917f05561bcd400252d24d5fbc8176fcb", + "shortSHA": "b5953c851", + "SHA": "b5953c8519022235a0489832b07145c61d5290b4", "branch": "no_bug_movemente1", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Wed Feb 1 11:08:41 2023 +0100'", - "lastCommitMessage": "remove diplomas para assinar", - "lastCommitNumber": "4702", + "lastCommitTime": "'Wed Feb 1 13:22:22 2023 +0100'", + "lastCommitMessage": "fix Expediente and break line", + "lastCommitNumber": "4703", "change": "", - "changeStatus": "On branch no_bug_movemente1\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/agenda/agenda.page.html\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/expediente/expediente.page.ts\n\tmodified: src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified: src/app/services/notifications.service.ts\n\tmodified: src/app/shared/agenda/view-event/view-event.page.html\n\tmodified: src/app/shared/agenda/view-event/view-event.page.ts\n\tmodified: src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts\n\tmodified: src/app/shared/gabinete-digital/expedients/expedients.page.ts\n\tmodified: src/global.scss", + "changeStatus": "On branch no_bug_movemente1\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts\n\tmodified: src/app/services/rules/event.service.ts\n\tmodified: src/app/shared/gabinete-digital/expedients/expedients.page.ts\n\tmodified: src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.scss", "changeAuthor": "peter.maquiran" } \ No newline at end of file