peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-21 13:55:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added integration to show ever MD events despite the login used.

Browse Source
This commit is contained in:
Tiago Kayaya
2020-11-20 13:36:35 +01:00
parent 5c82f65725
commit da38d5199b
10 changed files with 250 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/events/event-detail/event-detail.page.ts
+5 -3
View File
@@ -69,6 +69,8 @@ export class EventDetailPage implements OnInit {
else{
this.pageId = paramMap.get('eventId');
eventid = paramMap.get('eventId');
console.log(eventid);
}
if (paramMap.has("caller")){
this.backURL = "/home/" + paramMap.get('caller');
@@ -155,7 +157,7 @@ export class EventDetailPage implements OnInit {
{
if (this.ionicForm.valid)
{
this.eventsService.putEvent(this.loadedEvent, 2, 3).subscribe(async () =>
this.eventsService.putEvent(this.loadedEvent, 2, 3, "md").subscribe(async () =>
{
const alert = await this.alertController.create({
cssClass: 'my-custom-class',
@@ -174,9 +176,9 @@ export class EventDetailPage implements OnInit {
loadAttachments()
{
this.attachamentsService.getEventAttachments(this.pageId).subscribe(attachments => {
/* this.attachamentsService.getEventAttachments(this.pageId).subscribe(attachments => {
this.loadedEventAttachments = attachments;
});
}); */
}
async viewDocument(documenturl:string)
{
src/app/pages/events/events.page.html
+1 -1
View File
@@ -65,7 +65,7 @@
<ion-item-group>
<ion-item-sliding>
<ion-item lines="none"
*ngFor="let event of combinedEvents"
*ngFor="let event of eventsList"
[routerLink]="['/home/events', event.EventId, 'events']">
<div class="div-item-{{event.CalendarName}}">
<div class="div-up">
src/app/pages/events/events.page.ts
+16 -25
View File
@@ -29,7 +29,7 @@ export class EventsPage implements OnInit {
timeDate = this.today.getHours() + ":" + this.today.getMinutes();
/* Set segment variable */
segment:string;
profile:string;
public profile:string;
eventsList: Event[];
officialeventsList: Event[];
@@ -71,9 +71,6 @@ export class EventsPage implements OnInit {
doRefresh(event) {
this.RefreshEvents();
event.target.complete();
// setTimeout(() => {
// event.target.complete();
// }, 2000);
}
onSegmentChange(){
@@ -87,20 +84,19 @@ export class EventsPage implements OnInit {
{
case "Combinada":
if(this.profile == "mdgpr"){
this.eventService.getAllEvents(formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 00:00:00', formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59')
.subscribe(response => {
this.combinedEvents = response;
/* this.eventsList = response; */
this.eventService.getAllMdEvents(formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 00:00:00', formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => {
this.eventsList = res;
this.showLoader = false;
}
);
});
}else{
this.eventService.getAllPrEvents(formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 00:00:00', formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => {
this.prEventList = res;
this.eventService.getAllMdEvents(formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 00:00:00', formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => {
this.mdEventList = res;
this.combinedEvents = this.prEventList.concat(this.mdEventList);
console.log(this.combinedEvents);
this.eventsList = this.prEventList.concat(this.mdEventList);
console.log(this.eventsList);
this.showLoader = false;
});
});
@@ -109,12 +105,10 @@ export class EventsPage implements OnInit {
break;
case "Pessoal":
if(this.profile == "mdgpr"){
this.eventService.getEvents(this.segment, formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 00:00:00', formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59')
.subscribe(response => {
this.personaleventsList = response;
this.showLoader = false;
}
);
this.eventService.getAllMdEvents(formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 00:00:00', formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => {
this.personaleventsList = res.filter(data => data.CalendarName == "Pessoal");
this.showLoader = false;
});
}else{
this.eventService.getAllPrEvents(formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 00:00:00', formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => {
this.prEventList = res;
@@ -125,18 +119,15 @@ export class EventsPage implements OnInit {
this.showLoader = false;
});
});
}
break;
case "Oficial":
if(this.profile == "mdgpr"){
this.eventService.getEvents(this.segment, formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 00:00:00', formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59')
.subscribe(response => {
this.officialeventsList = response;
this.showLoader = false;
}
);
this.eventService.getAllMdEvents(formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 00:00:00', formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => {
this.officialeventsList = res.filter(data => data.CalendarName == "Oficial");;
this.showLoader = false;
});
}else{
this.eventService.getAllPrEvents(formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 00:00:00', formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => {
this.prEventList = res;