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

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/home/home.page.ts
+25 -9
View File
@@ -11,22 +11,38 @@ import { ProcessesService } from '../services/processes.service';
})
export class HomePage implements OnInit {
eventsList: Event[];
prEventList: Event[];
mdEventList: Event[];
totalEvent=0;
totalExpediente=0;
profile:string;
constructor(private eventService: EventsService, private processesbackend:ProcessesService) { }
ngOnInit() {
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.eventsList = response;
this.totalEvent = this.eventsList.length;
}
);
this.processesbackend.GetTasksList("Expediente", true).subscribe(result =>{
this.totalExpediente = result;
//Initialize profile as mdgpr
this.profile = "mdgpr";
if(this.profile == "mdgpr"){
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.totalEvent = this.eventsList.length;
});
}
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.totalEvent = this.eventsList.length;
});
});
}
this.processesbackend.GetTasksList("Expediente", true).subscribe(result =>{
this.totalExpediente = result;
});
}
src/app/pages/agenda/agenda.page.html
+6 -5
View File
@@ -3,12 +3,13 @@
<ion-toolbar>
<ion-buttons slot="end">
<!-- customized TOGGLE button -->
<label class="switch"><input type="checkbox" id="togBtn">
<div (click)="showAlert()">
<div class="slider round">
<!--ADDED HTML --><span class="mdgpr">MDGPR</span></div><span class="pr">PR</span><!--END-->
<div class="toggleBox">
<div (click)="changeProfile()" class="toggle">
<input type="checkbox">
<label for="" class="onbtn">PR</label>
<label for="" class="ofbtn">MDGPR</label>
</div>
</div>
</label>
</ion-buttons>
<ion-title>Agenda</ion-title>
</ion-toolbar>
src/app/pages/agenda/agenda.page.scss
+64
View File
@@ -143,4 +143,68 @@ input:checked + .slider .mdgpr
Calendar
*/
/* NEW CSS FOR TOGGLE BUTTON */
.toggleBox{
margin:20px 20px 0 0;
}
input[type="checkbox"]{
position: relative;
width: 96px;
height: 34px;
background: #ffffff;
-webkit-appearance: none;
border-radius: 20px;
outline: none;
transition: .4s;
/* box-shadow: inset 0 0 5px rgba(0,0,0,0.2); */
cursor: pointer;
border:1px solid #e16817;
}
input:checked[type="checkbox"]{
background: #e16817;
}
input[type="checkbox"]::before{
z-index: 2;
position: absolute;
content: "";
left: 0;
width: 30px;
height: 30px;
background: #fff;
border-radius: 50%;
/* transform: scale(1.1); */
box-shadow: inset 0 2px 5px rgba(0,0,0,0.2);
border:1px solid #e16817;
}
input:checked[type="checkbox"]::before{
left: 65px;
}
.toggle{
position: relative;
display: inline;
font-family: 'Montserrat', sans-serif;
display: grid;
text-align: center;
}
label{
position: absolute;
color: #fff;
font-weight: 600;
font-size: 12px;
pointer-events: none;
}
.onbtn{
top:10px;
bottom: 15px;
left: 15px;
/* padding-top: 10px;
border: 1px solid red; */
}
.ofbtn{
top:10px;
bottom: 15px;
right: 14px;
color: #e16817;
}
src/app/pages/agenda/agenda.page.ts
+129 -44
View File
@@ -35,10 +35,15 @@ export class AgendaPage implements OnInit {
@ViewChild(CalendarComponent) myCal: CalendarComponent;
segment:string;
profile:string;
eventsList: Event[];
eventsListPessoal: Event[];
eventsListOficial: Event[];
prEventList: Event[];
mdEventList: Event[];
showLoader: boolean;
startTime: Date;
@@ -56,6 +61,7 @@ export class AgendaPage implements OnInit {
) {}
ngOnInit() {
this.profile = "mdgpr";
//Inicializar segment
/* localStorage.setItem('test', this.eventSelectedDate.toString()); */
@@ -147,67 +153,134 @@ export class AgendaPage implements OnInit {
case "Combinada":
//Inicializa o array eventSource
this.eventSource=[];
this.eventService.getAllEvents(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,
startTime: new Date(element.StartDate),
endTime: new Date(element.EndDate),
allDay: false,
event: element
if(this.profile == "mdgpr"){
this.eventService.getAllMdEvents(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,
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(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.eventsList.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;
}
);
break;
case "Pessoal":
//Inicializa o array eventSource
this.eventSource=[];
this.eventService.getEvents(this.segment, formatDate(startTime, 'yyyy-MM-dd HH:mm:ss', 'pt'), formatDate(endTime, 'yyyy-MM-dd HH:mm:ss', 'pt')).subscribe(
response => {
this.eventsListPessoal = response;
this.eventsListPessoal.forEach(element => {
this.eventSource.push({
title: element.Subject,
startTime: new Date(element.StartDate),
endTime: new Date(element.EndDate),
allDay: false,
event: element
if(this.profile == "mdgpr"){
this.eventService.getAllMdEvents(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;
}
);
}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;
});
this.myCal.update();
this.myCal.loadEvents();
this.showLoader = false;
}
);
});
}
break;
case "Oficial":
//Inicializa o array eventSource
this.eventSource=[];
this.eventService.getEvents(this.segment, formatDate(startTime, 'yyyy-MM-dd HH:mm:ss', 'pt'), formatDate(endTime, 'yyyy-MM-dd HH:mm:ss', 'pt')).subscribe(
response => {
this.eventsListOficial = response;
this.eventsListOficial.forEach(element => {
this.eventSource.push({
title: element.Subject,
startTime: new Date(element.StartDate),
endTime: new Date(element.EndDate),
allDay: false,
event: element
if(this.profile == "mdgpr"){
this.eventService.getAllMdEvents(formatDate(startTime, 'yyyy-MM-dd HH:mm:ss', 'pt'), formatDate(endTime, 'yyyy-MM-dd HH:mm:ss', 'pt')).subscribe(res => {
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;
}
);
}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.myCal.update();
this.myCal.loadEvents();
this.showLoader = false;
});
this.myCal.update();
this.myCal.loadEvents();
this.showLoader = false;
}
);
});
}
break;
}
}
@@ -222,6 +295,18 @@ export class AgendaPage implements OnInit {
showAlert(){
this.alertCrontroller.presentAlert("Funcionalidade em desenvolvimento.");
}
changeProfile(){
if(this.profile == "mdgpr"){
console.log('pr');
this.profile ="pr";
this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate);
}
else{
console.log('mdgpr');
this.profile ="mdgpr";
this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate);
}
}
}
src/app/pages/cal-modal/cal-modal.page.ts
+2 -1
View File
@@ -104,6 +104,7 @@ export class CalModalPage implements OnInit {
HasAttachments: false,
};
}
this.ionicForm = this.formBuilder.group({
subject: ['', [Validators.required]],
agenda: ['', [Validators.required]],
@@ -128,7 +129,7 @@ export class CalModalPage implements OnInit {
save(){
if (this.ionicForm.valid)
{
this.eventService.postEvent(this.postEvent, this.postEvent.CalendarName).subscribe();
this.eventService.postEvent(this.postEvent, this.postEvent.CalendarName, "md").subscribe();
this.modalCtrl.dismiss(this.postEvent);
}
else{
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;
src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
+1 -1
View File
@@ -87,7 +87,7 @@ export class BookMeetingModalPage implements OnInit {
this.processes.FindTaskDocId(this.task.SerialNumber).subscribe(res =>{
if(res){
/* this.calendarService.postExpedientEvent(res, this.postData); */
this.calendarService.postExpedientEvent(res, this.postData, "md");
}
});
this.distartExpedientModal();
src/environments/environment.ts
+1 -1
View File
@@ -7,7 +7,7 @@ export const environment = {
apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V3/api/',
apiChatUrl: 'http://192.168.100.111:3000/api/v1/',
domain: 'gabinetedigital.local',
defaultuser: 'agenda.mdgpr',
defaultuser: '',
defaultuserpwd: 'tabteste@006'
};