peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-18 20:47:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

pull made

Browse Source
This commit is contained in:
Eudes Inácio
2023-08-30 11:20:13 +01:00
parent bf1337f5db 8030e4e53f
commit 95e24aa1e4
9 changed files with 23 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/agenda/agenda.page.html
+3 -2
View File
@@ -44,7 +44,8 @@
<ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " slot="icon-only" src="assets/images/theme/{{ThemeService.currentTheme}}/icons-calendar-arrow-right.svg"></ion-icon> <ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " slot="icon-only" src="assets/images/theme/{{ThemeService.currentTheme}}/icons-calendar-arrow-right.svg"></ion-icon>
</div> </div>
<div *ngIf="SessionStore.user.RoleID !== 100000014" style="
<div style="
padding-bottom: 10px; padding-bottom: 10px;
padding-left: 10px; padding-left: 10px;
padding-right: 10px; padding-right: 10px;
@@ -198,7 +199,7 @@
</ion-row> </ion-row>
<div style="padding-right: 50px" class="font-16-em text-black align-center cursor-pointer" (click)="changeSegment('Combinado')" [class.active]="segment == 'Combinado' "> <div style="padding-right: 50px" class="font-16-em text-black align-center cursor-pointer" (click)="changeSegment('Combinado')" [class.active]="segment == 'Combinado' ">
Todos Todos...
</div> </div>
<div style="padding-right: 50px" class="font-16-em text-black align-center cursor-pointer" (click)="changeSegment('Pessoal')" [class.active]="segment == 'Pessoal' "> <div style="padding-right: 50px" class="font-16-em text-black align-center cursor-pointer" (click)="changeSegment('Pessoal')" [class.active]="segment == 'Pessoal' ">
Pessoais Pessoais
src/app/pages/agenda/agenda.page.ts
+5 -146
View File
@@ -181,8 +181,7 @@ export class AgendaPage implements OnInit {
private backgroundservice: BackgroundService, private backgroundservice: BackgroundService,
public ThemeService: ThemeService, public ThemeService: ThemeService,
public p: PermissionService, public p: PermissionService,
public RoleIdService: RoleIdService, public RoleIdService: RoleIdService
private ContactsService: ContactsService
) { ) {
this.dateAdapter.setLocale('es'); this.dateAdapter.setLocale('es');
@@ -239,7 +238,7 @@ export class AgendaPage implements OnInit {
this.reloadCalendar() this.reloadCalendar()
} }
this.weekToShow()
} }
tigerUpdate() { tigerUpdate() {
@@ -291,7 +290,7 @@ export class AgendaPage implements OnInit {
}, 1000) }, 1000)
} }
height = '75px' height = 'unset'
weekToShow() { weekToShow() {
@@ -323,7 +322,6 @@ export class AgendaPage implements OnInit {
}, 100) }, 100)
} }
}, 250) }, 250)
} }
setCalendarByDefault() { setCalendarByDefault() {
@@ -623,6 +621,7 @@ export class AgendaPage implements OnInit {
this.CalendarStore.pushEvent(eventsList, label); this.CalendarStore.pushEvent(eventsList, label);
this.listToPresent = this.CalendarStore.getEventsByCalendarIds(selectedCalendarIds) this.listToPresent = this.CalendarStore.getEventsByCalendarIds(selectedCalendarIds)
this.updateEventListBox()
this.showTimelinePR = true; 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() { updateEventListBox() {
const selectedCalendarIds = this.getSelectedAgendaCalendars(); const selectedCalendarIds = this.getSelectedAgendaCalendars();
@@ -863,6 +721,7 @@ export class AgendaPage implements OnInit {
} }
changeYear = (year) => { changeYear = (year) => {
const a = this.calendar.currentDate const a = this.calendar.currentDate
src/app/shared/gabinete-digital/all-processes/all-processes.page.scss
+1 -1
View File
@@ -140,7 +140,7 @@ ion-list{
float: right; float: right;
font-size: rem(12); font-size: rem(12);
padding: 2.5px 13.5px 2.5px 13.5px; padding: 2.5px 13.5px 2.5px 13.5px;
color: #fff; color: black;
} }
} }
.item-date{ .item-date{
src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.scss
+1 -1
View File
@@ -181,7 +181,7 @@ ion-item{
/* font-size: rem(12); */ /* font-size: rem(12); */
float: right; float: right;
padding: 2.5px 13.5px 2.5px 13.5px; padding: 2.5px 13.5px 2.5px 13.5px;
color: #fff; color: black;
} }
} }
.exp-date{ .exp-date{
src/app/shared/gabinete-digital/despachos/despachos.page.scss
+1 -1
View File
@@ -161,7 +161,7 @@ ion-item{
/* font-size: 12px; */ /* font-size: 12px; */
float: right; float: right;
padding: 2.5px 13.5px 2.5px 13.5px; padding: 2.5px 13.5px 2.5px 13.5px;
color: #fff; color: black;
} }
} }
.exp-date{ .exp-date{
src/app/shared/gabinete-digital/diplomas/diplomas.page.scss
+1 -1
View File
@@ -170,7 +170,7 @@ ion-item{
/* font-size: 12px; */ /* font-size: 12px; */
float: right; float: right;
padding: 2.5px 13.5px 2.5px 13.5px; padding: 2.5px 13.5px 2.5px 13.5px;
color: #fff; color: black;
} }
} }
.exp-date{ .exp-date{
src/app/shared/gabinete-digital/generic/task-list/task-list.page.scss
+1 -1
View File
@@ -66,7 +66,7 @@
/* font-size: rem(12); */ /* font-size: rem(12); */
float: right; float: right;
padding: 2.5px 13.5px 2.5px 13.5px; padding: 2.5px 13.5px 2.5px 13.5px;
color: #fff; color: black;
} }
} }
.exp-date{ .exp-date{
src/global.scss
+4 -4
View File
@@ -609,13 +609,13 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent-
tbody { tbody {
tr { tr {
td { td {
padding: em(8) !important; padding: rem(4) !important;
div { div {
width: 30px !important; width: rem(30) !important;
height: 30px; height: rem(30);
} }
div.number { div.number {
font-size: em(18) !important; font-size: rem(18) !important;
} }
} }
} }
version/git-version.ts
+6 -6
View File
@@ -1,12 +1,12 @@
export let versionData = { export let versionData = {
"shortSHA": "3d986e864", "shortSHA": "bf1337f5d",
"SHA": "3d986e864cc30706b5022aa59325cfe2b8c466ab", "SHA": "bf1337f5dbfbd28acef03ae1e02cf2086c126075",
"branch": "developer-prod", "branch": "developer-prod",
"lastCommitAuthor": "'Eudes Inácio'", "lastCommitAuthor": "'Eudes Inácio'",
"lastCommitTime": "'Tue Aug 29 16:05:32 2023 +0100'", "lastCommitTime": "'Wed Aug 30 11:17:17 2023 +0100'",
"lastCommitMessage": "profile picture done", "lastCommitMessage": "PR have the same actions that MD have on events to aprove",
"lastCommitNumber": "5230", "lastCommitNumber": "5231",
"change": "", "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 <file>...\" 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" "changeAuthor": "eudes.inacio"
} }