diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts index 52dac3fa0..49a84a8eb 100644 --- a/src/app/home/home.page.ts +++ b/src/app/home/home.page.ts @@ -194,7 +194,15 @@ export class HomePage implements OnInit { throw ('User has PRES permission but not roleId'); } if (!this.p.userPermission([this.p.permissionList.Gabinete.pr_tasks]) && SessionStore.user.RoleID == this.RoleIdService.PRES) { - throw ('User has PRES permission but not roleId'); + throw (`User doesn't have PRES permission but has roleId`); + } + + + if (this.p.userPermission([this.p.permissionList.Gabinete.md_tasks]) && SessionStore.user.RoleID != this.RoleIdService.PV) { + throw ('User has vice president permission but not roleId'); + } + if (!this.p.userPermission([this.p.permissionList.Gabinete.md_tasks]) && SessionStore.user.RoleID == this.RoleIdService.PV) { + throw (`User doesn't has vice president permission but has roleId`); } }, 1000) diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index f7d98a797..89276ce51 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -21,7 +21,7 @@
- + @@ -103,8 +103,10 @@ padding-left: 10px; padding-right: 10px; background: #f7f7f7; - border-radius: 5px;"> - + border-radius: 5px; + margin-right: 10px;" + class="select-calendar"> + - -
-
+
-
+
Hoje,  {{ timelineDate }}
-
+
{{ TimelineDay(events.key)}}
{{ viewTitle }}
-
+
diff --git a/src/app/pages/agenda/agenda.page.scss b/src/app/pages/agenda/agenda.page.scss index 28687b748..96fa9d584 100644 --- a/src/app/pages/agenda/agenda.page.scss +++ b/src/app/pages/agenda/agenda.page.scss @@ -357,6 +357,7 @@ td.monthview-primary-with-event { padding: 0px; margin: 0px; justify-content: space-around; + text-transform: capitalize; } .arrow{ @@ -916,6 +917,67 @@ $font-size: 11pt; font-weight: bold !important; } -.ss-timeline > :nth-child(3) .dayShow { +.ss-timeline > :nth-child(2) .dayShow { display: none; -} \ No newline at end of file +} + + +.ss-timeline > :nth-child(1) .dayShow { + margin-top: 0px !important; +} + + +.calendar-options { + position: relative; + float: right; + margin-left: -100%; + + button { + // top: -35px; + position: relative; + color: transparent; + background-color: transparent; + } + +} + +.float-button { + display: none; +} + +@media only screen and (max-width: 513px) { + .calendar-options { + display: none !important; + } + .first-row { + flex-grow: 1; + .float-button { + display: block !important; + position: absolute; + float: right; + right: 15px; + top: 1px; + background: transparent; + color: transparent; + + button { + background: transparent; + color: transparent; + + ion-icon { + border-radius: 50px; + -webkit-border-radius: 50px; + -moz-border-radius: 50px; + -ms-border-radius: 50px; + -o-border-radius: 50px; + box-shadow: 0px 0px 10px rgb(112, 112, 112); + margin: 0px; + padding: 0px; + } + } + } + } + .select-calendar { + flex-grow: 1; + } +} diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index b65b4f3f6..a808c5cc8 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -168,6 +168,8 @@ export class AgendaPage implements OnInit { SessionStore = SessionStore; environment = environment CalendarName = '' + hasEventToday = false + isSelectedDayHasEvent = true constructor( @Inject(LOCALE_ID) private locale: string, @@ -241,6 +243,10 @@ export class AgendaPage implements OnInit { console.log('SessionStore.user', SessionStore.user) + setTimeout(() =>{ + console.log(this.TimelineMDList); + }, 500) + } tigerUpdate() { @@ -439,11 +445,6 @@ export class AgendaPage implements OnInit { return this.viewDate.getDate() } - // for timeline - timelineIsCurrentDate(): Boolean { - return momentG(new Date(), 'dd MMMM yyyy', 'pt') == momentG(this.eventSelectedDate, 'dd MMMM yyyy', 'pt'); - } - momentG(date, formate, wgs) { return momentG(date, formate, wgs) } @@ -593,10 +594,6 @@ export class AgendaPage implements OnInit { this.listToPresent = this.CalendarStore.getEventsByCalendarIds(selectedCalendarIds) - this.TimelineMDList = this.listBoxService.list(this.listToPresent, label, this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate }) - - - this.showTimelinePR = true; }).finally(() => { @@ -818,6 +815,16 @@ export class AgendaPage implements OnInit { this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate }) + const selectedDay = momentG(this.eventSelectedDate, 'dd', 'pt'); + if(this.TimelineMDList[selectedDay]) { + this.hasEventToday = true + } else { + this.hasEventToday = false + } + + + this.isSelectedDayHasEvent = momentG(new Date(), 'dd MMMM yyyy', 'pt') == momentG(this.eventSelectedDate, 'dd MMMM yyyy', 'pt'); + } changeYear = (year) => { @@ -895,13 +902,13 @@ export class AgendaPage implements OnInit { if (this.profile == "mdgpr") { this.profile = "pr"; this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate); - this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate }) + // this.updateEventListBox() } else { this.profile = "mdgpr"; this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate); - this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate }) + // this.updateEventListBox() } } diff --git a/src/app/pages/gabinete-digital/despachos/despachos.page.scss b/src/app/pages/gabinete-digital/despachos/despachos.page.scss index 0de25249d..c61d396f9 100644 --- a/src/app/pages/gabinete-digital/despachos/despachos.page.scss +++ b/src/app/pages/gabinete-digital/despachos/despachos.page.scss @@ -233,4 +233,9 @@ ion-item{ font-size: 45px; float: right; margin-right: 10px; +} + + +.label-deadline { + } \ No newline at end of file diff --git a/src/app/pages/gabinete-digital/despachos/despachos.page.ts b/src/app/pages/gabinete-digital/despachos/despachos.page.ts index 2099aa24c..611889ceb 100644 --- a/src/app/pages/gabinete-digital/despachos/despachos.page.ts +++ b/src/app/pages/gabinete-digital/despachos/despachos.page.ts @@ -94,7 +94,8 @@ export class DespachosPage implements OnInit { "Senders": workflow.Sender, "SerialNumber": element.serialNumber, "Status": workflow.Status, - "WorkflowName": element.workflowDisplayName + "WorkflowName": element.workflowDisplayName, + "DeadlineType": workflow.DeadlineType, } listtopresent.push(task); diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.page.scss b/src/app/pages/gabinete-digital/pedidos/pedidos.page.scss index 76a3def57..7bb7d89f7 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedidos.page.scss +++ b/src/app/pages/gabinete-digital/pedidos/pedidos.page.scss @@ -240,3 +240,7 @@ ion-item{ left: 50%; margin: -35px 0 0 -35px; } + +.label-deadline{ + +} diff --git a/src/app/services/agenda/list-box.service.ts b/src/app/services/agenda/list-box.service.ts index 7bd92916c..6201dad59 100644 --- a/src/app/services/agenda/list-box.service.ts +++ b/src/app/services/agenda/list-box.service.ts @@ -56,10 +56,10 @@ export class ListBoxService { newStracture = this.encapsulation(eventSource); - return this.display(newStracture, profile, selectedDate) + return this.display(newStracture, selectedDate) } - display(list: CustomCalendarEvent[], profile, selectedDate) { + display(list: CustomCalendarEvent[], selectedDate) { let days = {}; list.forEach( (event:CustomCalendarEvent, index) => { diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html index 6320c1033..b1be95a66 100644 --- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html +++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html @@ -60,7 +60,8 @@
- {{task.activityInstanceName}} + Deadline + {{task.activityInstanceName}}
{{ task.CreateDate | date: 'dd-MM-yyyy HH:mm' }} @@ -98,7 +99,8 @@
- {{task.activityInstanceName}} + Deadline + {{task.activityInstanceName}}
{{ task.CreateDate | date: 'dd-MM-yyyy HH:mm' }} diff --git a/version/git-version.ts b/version/git-version.ts index 3a43ecafa..b9cf40d18 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "936878f6c", - "SHA": "936878f6cd961e9a3bd39c7aadaa304b8976b543", + "shortSHA": "b3356a197", + "SHA": "b3356a197cab868df99b19ca9432e03edbce62a1", "branch": "feature/agenda-layout", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Thu Mar 30 15:22:40 2023 +0100'", - "lastCommitMessage": "fix agenda", - "lastCommitNumber": "4887", + "lastCommitTime": "'Fri Mar 31 13:51:17 2023 +0100'", + "lastCommitMessage": "add drop down", + "lastCommitNumber": "4888", "change": "", - "changeStatus": "On branch feature/agenda-layout\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/agenda.page.scss", + "changeStatus": "On branch feature/agenda-layout\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/home/home.page.ts\n\tmodified: src/app/pages/agenda/agenda.page.html\n\tmodified: src/app/pages/agenda/agenda.page.scss\n\tmodified: src/app/pages/agenda/agenda.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos/despachos.page.scss\n\tmodified: src/app/pages/gabinete-digital/despachos/despachos.page.ts\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedidos.page.scss\n\tmodified: src/app/services/agenda/list-box.service.ts\n\tmodified: src/app/shared/gabinete-digital/pedidos/pedidos.page.html", "changeAuthor": "peter.maquiran" } \ No newline at end of file