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

emended list of events for PR call

Browse Source
This commit is contained in:
Tiago Kayaya
2020-11-20 17:02:48 +01:00
parent da38d5199b
commit 4d841e765a
6 changed files with 64 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/agenda/agenda.page.ts
+31 -45
View File
@@ -169,15 +169,12 @@ export class AgendaPage implements OnInit {
this.myCal.update();
this.myCal.loadEvents();
this.showLoader = false;
}
);
});
}
else{
this.eventService.getAllPrEvents(formatDate(startTime, 'yyyy-MM-dd HH:mm:ss', 'pt'), formatDate(endTime, 'yyyy-MM-dd HH:mm:ss', 'pt')).subscribe(res => {
this.prEventList = res;
this.eventService.getAllMdEvents(formatDate(startTime, 'yyyy-MM-dd HH:mm:ss', 'pt'), formatDate(endTime, 'yyyy-MM-dd HH:mm:ss', 'pt')).subscribe(res => {
this.mdEventList = res;
this.eventsList = this.prEventList.concat(this.mdEventList);
this.eventService.getAllPrEvents(formatDate(startTime, 'yyyy-MM-dd HH:mm:ss', 'pt'), formatDate(endTime, 'yyyy-MM-dd HH:mm:ss', 'pt')).subscribe(
response => {
this.eventsList = response;
this.eventsList.forEach(element => {
this.eventSource.push({
title: element.Subject,
@@ -191,7 +188,6 @@ export class AgendaPage implements OnInit {
this.myCal.loadEvents();
this.showLoader = false;
});
});
}
break;
@@ -213,27 +209,22 @@ export class AgendaPage implements OnInit {
this.myCal.update();
this.myCal.loadEvents();
this.showLoader = false;
}
);
}else{
this.eventService.getAllPrEvents(formatDate(startTime, 'yyyy-MM-dd HH:mm:ss', 'pt'), formatDate(endTime, 'yyyy-MM-dd HH:mm:ss', 'pt')).subscribe(res => {
this.prEventList = res;
this.eventService.getAllMdEvents(formatDate(startTime, 'yyyy-MM-dd HH:mm:ss', 'pt'), formatDate(endTime, 'yyyy-MM-dd HH:mm:ss', 'pt')).subscribe(res => {
this.mdEventList = res;
this.eventsListPessoal = this.prEventList.concat(this.mdEventList).filter(data => data.CalendarName == "Pessoal");
this.eventsListPessoal.forEach(element => {
this.eventSource.push({
title: element.Subject,
startTime: new Date(element.StartDate),
endTime: new Date(element.EndDate),
allDay: false,
event: element
});
});
this.myCal.update();
this.myCal.loadEvents();
this.showLoader = false;
});
}else{
this.eventService.getAllPrEvents(formatDate(startTime, 'yyyy-MM-dd HH:mm:ss', 'pt'), formatDate(endTime, 'yyyy-MM-dd HH:mm:ss', 'pt')).subscribe(response => {
this.eventsListPessoal = response.filter(data => data.CalendarName == "Pessoal");;
this.eventsListPessoal.forEach(element => {
this.eventSource.push({
title: element.Subject,
startTime: new Date(element.StartDate),
endTime: new Date(element.EndDate),
allDay: false,
event: element
});
});
this.myCal.update();
this.myCal.loadEvents();
this.showLoader = false;
});
}
@@ -257,27 +248,22 @@ export class AgendaPage implements OnInit {
this.myCal.update();
this.myCal.loadEvents();
this.showLoader = false;
}
);
});
}else{
this.eventService.getAllPrEvents(formatDate(startTime, 'yyyy-MM-dd HH:mm:ss', 'pt'), formatDate(endTime, 'yyyy-MM-dd HH:mm:ss', 'pt')).subscribe(res => {
this.prEventList = res;
this.eventService.getAllMdEvents(formatDate(startTime, 'yyyy-MM-dd HH:mm:ss', 'pt'), formatDate(endTime, 'yyyy-MM-dd HH:mm:ss', 'pt')).subscribe(res => {
this.mdEventList = res;
this.eventsListOficial = this.prEventList.concat(this.mdEventList).filter(data => data.CalendarName == "Pessoal");
this.eventsListOficial.forEach(element => {
this.eventSource.push({
title: element.Subject,
startTime: new Date(element.StartDate),
endTime: new Date(element.EndDate),
allDay: false,
event: element
});
this.eventsListOficial = res.filter(data => data.CalendarName == "Oficial");
this.eventsListOficial.forEach(element => {
this.eventSource.push({
title: element.Subject,
startTime: new Date(element.StartDate),
endTime: new Date(element.EndDate),
allDay: false,
event: element
});
this.myCal.update();
this.myCal.loadEvents();
this.showLoader = false;
});
this.myCal.update();
this.myCal.loadEvents();
this.showLoader = false;
});
}
src/app/pages/events/events.page.ts
+8 -23
View File
@@ -88,17 +88,12 @@ export class EventsPage implements OnInit {
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.eventsList = this.prEventList.concat(this.mdEventList);
this.eventsList = res;
console.log(this.eventsList);
this.showLoader = false;
});
});
}
@@ -111,14 +106,9 @@ export class EventsPage implements OnInit {
});
}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.personaleventsList = this.prEventList.concat(this.mdEventList).filter(data => data.CalendarName == "Pessoal");
console.log(this.personaleventsList);
this.showLoader = false;
});
});
this.personaleventsList = res.filter(data => data.CalendarName == "Pessoal");
this.showLoader = false;
});
}
break;
@@ -130,14 +120,9 @@ export class EventsPage implements OnInit {
});
}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.officialeventsList = this.prEventList.concat(this.mdEventList).filter(data => data.CalendarName == "Oficial");
console.log(this.officialeventsList);
this.showLoader = false;
});
});
this.officialeventsList = res.filter(data => data.CalendarName == "Oficial");;
this.showLoader = false;
});
}
break;
}
src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html
+5
View File
@@ -20,6 +20,11 @@
<ion-input placeholder="Localização" [(ngModel)]="postData.Location"></ion-input>
</div>
</div>
<!-- Error messages -->
<span class="error ion-padding" *ngIf="formLocationSatus">
Campo obrigatório
</span>
</div>
<div class="container-div">
src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.scss
+11
View File
@@ -133,4 +133,15 @@ font-size: 13px;
margin: 0px 15px 15px 0px;
padding: 0 !important;
border-radius: 5px;
}
/* Error Messages */
.error{
color:red;
font-size: 12px;
font-weight: bold;
padding-bottom: 20px;
}
.span-color{
color:red;
}
src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
+8
View File
@@ -25,6 +25,8 @@ export class BookMeetingModalPage implements OnInit {
eventBody: EventBody;
eventAttendees: EventPerson[];
formLocationSatus: boolean = false;
constructor(
private modalController: ModalController,
private router:Router,
@@ -179,5 +181,11 @@ export class BookMeetingModalPage implements OnInit {
modal.onDidDismiss();
}
validateFormInputs(){
let formLocation = this.postData.Location.trim();
if(!this.postData.Location && formLocation.length <= 0){
this.formLocationSatus=true;
}
}
}