- Todos
+ Todos...
Pessoais
diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts
index faefffa88..28b94df19 100644
--- a/src/app/pages/agenda/agenda.page.ts
+++ b/src/app/pages/agenda/agenda.page.ts
@@ -181,8 +181,7 @@ export class AgendaPage implements OnInit {
private backgroundservice: BackgroundService,
public ThemeService: ThemeService,
public p: PermissionService,
- public RoleIdService: RoleIdService,
- private ContactsService: ContactsService
+ public RoleIdService: RoleIdService
) {
this.dateAdapter.setLocale('es');
@@ -239,7 +238,7 @@ export class AgendaPage implements OnInit {
this.reloadCalendar()
}
-
+ this.weekToShow()
}
tigerUpdate() {
@@ -291,7 +290,7 @@ export class AgendaPage implements OnInit {
}, 1000)
}
- height = '75px'
+ height = 'unset'
weekToShow() {
@@ -323,7 +322,6 @@ export class AgendaPage implements OnInit {
}, 100)
}
}, 250)
-
}
setCalendarByDefault() {
@@ -623,6 +621,7 @@ export class AgendaPage implements OnInit {
this.CalendarStore.pushEvent(eventsList, label);
this.listToPresent = this.CalendarStore.getEventsByCalendarIds(selectedCalendarIds)
+ this.updateEventListBox()
this.showTimelinePR = true;
@@ -703,147 +702,6 @@ export class AgendaPage implements OnInit {
}
- // trasnformData(response, profile) {
-
- // response.forEach(element => {
- // let event = {
- // startTime: new Date(element.StartDate),
- // endTime: new Date(element.EndDate),
- // allDay: false,
- // event: element,
- // calendarName: element.CalendarName,
- // profile: profile,
- // id: element.EventId,
- // }
- // this.array.push(event)
- // });
- // this.listToPresent = this.array;
-
- // }
-
- // //Deve ser removido para ficar só um method transform
- // trasnformDataDB(response) {
-
- // if(response) {
-
- // response.forEach(element => {
- // let event = {
- // startTime: new Date(element.StartDate),
- // endTime: new Date(element.EndDate),
- // allDay: false,
- // event: element,
- // calendarName: element.CalendarName,
- // profile: element.Profile,
- // id: element.EventId,
- // }
- // this.array.push(event)
- // });
- // this.listToPresent = this.array;
-
- // }
-
- // }
-
- // addEventToDB(response, profile) {
- // if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
- // let responseArray = [];
- // response.forEach(element => {
- // let event = {
- // CalendarId: element.CalendarId,
- // CalendarName: element.CalendarName,
- // EndDate: element.EndDate,
- // EventId: element.EventId,
- // HasAttachments: element.HasAttachments,
- // HumanDate: element.HumanDate,
- // IsAllDayEvent: element.IsAllDayEvent,
- // Location: element.Location,
- // StartDate: element.StartDate,
- // Subject: element.Subject,
- // Profile: profile
- // }
- // responseArray.push(event)
-
- // });
-
- // this.storage.set('agendaResponse',responseArray).then(() => {
-
- // })
- // } else {
- // if (response.length > 0) {
-
- // response.forEach(element => {
- // let event = {
- // CalendarId: element.CalendarId,
- // CalendarName: element.CalendarName,
- // EndDate: element.EndDate,
- // EventId: element.EventId,
- // HasAttachments: element.HasAttachments,
- // HumanDate: element.HumanDate,
- // IsAllDayEvent: element.IsAllDayEvent,
- // Location: element.Location,
- // StartDate: element.StartDate,
- // Subject: element.Subject,
- // Profile: profile
- // }
- // this.sqliteservice.addEvent(event)
-
- // });
- // }
- // }
- // }
-
- // getFromDB() {
-
- // if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
- // this.storage.get('agendaResponse').then((events) => {
- // this.trasnformDataDB(events)
- // this.updateEventListBox()
-
- // this.myCal.update();
- // this.myCal.loadEvents();
-
- // this.showLoader = false;
- // this.showTimeline = true;
- // })
- // } else {
- // this.sqliteservice.getAllEvents().then((events: any[] = []) => {
-
- // let eventArray = [];
-
- // this.trasnformDataDB(events)
- // this.updateEventListBox()
-
- // this.myCal.update();
- // this.myCal.loadEvents();
-
- // this.showLoader = false;
- // this.showTimeline = true;
-
-
- // })
- // }
-
- // }
-
-
- // getEventsFromDB () {
-
- // new Promise((resolve, reject) => {
- // if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
- // this.storage.get('agendaResponse').then((events) => {
- // resolve(events)
- // })
- // } else {
- // this.sqliteservice.getAllEvents().then((events: any[] = []) => {
- // resolve(events)
- // })
- // }
- // }).catch ((error) => {
- // console.error(error);
- // });
-
- // }
-
updateEventListBox() {
const selectedCalendarIds = this.getSelectedAgendaCalendars();
@@ -863,6 +721,7 @@ export class AgendaPage implements OnInit {
}
+
changeYear = (year) => {
const a = this.calendar.currentDate
diff --git a/src/app/shared/gabinete-digital/all-processes/all-processes.page.scss b/src/app/shared/gabinete-digital/all-processes/all-processes.page.scss
index 4740129d2..891363122 100644
--- a/src/app/shared/gabinete-digital/all-processes/all-processes.page.scss
+++ b/src/app/shared/gabinete-digital/all-processes/all-processes.page.scss
@@ -140,7 +140,7 @@ ion-list{
float: right;
font-size: rem(12);
padding: 2.5px 13.5px 2.5px 13.5px;
- color: #fff;
+ color: black;
}
}
.item-date{
diff --git a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.scss b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.scss
index befa8575b..594cabec7 100644
--- a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.scss
+++ b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.scss
@@ -181,7 +181,7 @@ ion-item{
/* font-size: rem(12); */
float: right;
padding: 2.5px 13.5px 2.5px 13.5px;
- color: #fff;
+ color: black;
}
}
.exp-date{
diff --git a/src/app/shared/gabinete-digital/despachos/despachos.page.scss b/src/app/shared/gabinete-digital/despachos/despachos.page.scss
index 0a5b354a8..93d422843 100644
--- a/src/app/shared/gabinete-digital/despachos/despachos.page.scss
+++ b/src/app/shared/gabinete-digital/despachos/despachos.page.scss
@@ -161,7 +161,7 @@ ion-item{
/* font-size: 12px; */
float: right;
padding: 2.5px 13.5px 2.5px 13.5px;
- color: #fff;
+ color: black;
}
}
.exp-date{
diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.scss b/src/app/shared/gabinete-digital/diplomas/diplomas.page.scss
index 3f911c5ce..4dbc4f087 100644
--- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.scss
+++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.scss
@@ -170,7 +170,7 @@ ion-item{
/* font-size: 12px; */
float: right;
padding: 2.5px 13.5px 2.5px 13.5px;
- color: #fff;
+ color: black;
}
}
.exp-date{
diff --git a/src/app/shared/gabinete-digital/generic/task-list/task-list.page.scss b/src/app/shared/gabinete-digital/generic/task-list/task-list.page.scss
index ee3d4cb19..91bfc7dd1 100644
--- a/src/app/shared/gabinete-digital/generic/task-list/task-list.page.scss
+++ b/src/app/shared/gabinete-digital/generic/task-list/task-list.page.scss
@@ -66,7 +66,7 @@
/* font-size: rem(12); */
float: right;
padding: 2.5px 13.5px 2.5px 13.5px;
- color: #fff;
+ color: black;
}
}
.exp-date{
diff --git a/src/global.scss b/src/global.scss
index a3ff1b1a5..a9859e333 100644
--- a/src/global.scss
+++ b/src/global.scss
@@ -609,13 +609,13 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent-
tbody {
tr {
td {
- padding: em(8) !important;
+ padding: rem(4) !important;
div {
- width: 30px !important;
- height: 30px;
+ width: rem(30) !important;
+ height: rem(30);
}
div.number {
- font-size: em(18) !important;
+ font-size: rem(18) !important;
}
}
}
diff --git a/version/git-version.ts b/version/git-version.ts
index 1239062c1..611d2d3be 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
export let versionData = {
- "shortSHA": "3d986e864",
- "SHA": "3d986e864cc30706b5022aa59325cfe2b8c466ab",
+ "shortSHA": "bf1337f5d",
+ "SHA": "bf1337f5dbfbd28acef03ae1e02cf2086c126075",
"branch": "developer-prod",
"lastCommitAuthor": "'Eudes Inácio'",
- "lastCommitTime": "'Tue Aug 29 16:05:32 2023 +0100'",
- "lastCommitMessage": "profile picture done",
- "lastCommitNumber": "5230",
+ "lastCommitTime": "'Wed Aug 30 11:17:17 2023 +0100'",
+ "lastCommitMessage": "PR have the same actions that MD have on events to aprove",
+ "lastCommitNumber": "5231",
"change": "",
- "changeStatus": "On branch developer-prod\nYour branch is behind 'origin/developer-prod' by 4 commits, and can be fast-forwarded.\n (use \"git pull\" to update your local branch)\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/services/notifications.service.ts\n\tmodified: src/app/services/task.service.ts\n\tmodified: src/app/shared/agenda/event-list/event-list.page.ts\n\tmodified: src/app/shared/header/header.page.ts",
+ "changeStatus": "On branch developer-prod\nYour branch and 'origin/developer-prod' have diverged,\nand have 1 and 4 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/pages/agenda/agenda.page.html\n\tmodified: src/app/pages/agenda/agenda.page.ts\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.scss\n\tmodified: src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.scss\n\tmodified: src/app/shared/gabinete-digital/despachos/despachos.page.scss\n\tmodified: src/app/shared/gabinete-digital/diplomas/diplomas.page.scss\n\tmodified: src/app/shared/gabinete-digital/generic/task-list/task-list.page.scss\n\tmodified: src/global.scss",
"changeAuthor": "eudes.inacio"
}
\ No newline at end of file