mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-21 05:45:50 +00:00
Merge branch 'developer' of https://bitbucket.org/equilibriumito/gabinete-digital into developer
This commit is contained in:
@@ -777,7 +777,6 @@ export class AgendaPage implements OnInit {
|
|||||||
this.eventService.getAllMdEvents( momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59') ).subscribe(
|
this.eventService.getAllMdEvents( momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59') ).subscribe(
|
||||||
response => {
|
response => {
|
||||||
|
|
||||||
this.TimelineMD = [];
|
|
||||||
|
|
||||||
if(this.segment == 'Oficial') {
|
if(this.segment == 'Oficial') {
|
||||||
this.eventsList = response.filter(data => data.CalendarName == "Oficial");
|
this.eventsList = response.filter(data => data.CalendarName == "Oficial");
|
||||||
@@ -803,6 +802,7 @@ export class AgendaPage implements OnInit {
|
|||||||
profile: 'md',
|
profile: 'md',
|
||||||
id: element.EventId,
|
id: element.EventId,
|
||||||
});
|
});
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
const MDEventList = this.timelineFilter(this.timelineFilterState, this.eventsList, 'md');
|
const MDEventList = this.timelineFilter(this.timelineFilterState, this.eventsList, 'md');
|
||||||
@@ -827,7 +827,6 @@ export class AgendaPage implements OnInit {
|
|||||||
this.eventService.getAllPrEvents(momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59')).subscribe(
|
this.eventService.getAllPrEvents(momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59')).subscribe(
|
||||||
response => {
|
response => {
|
||||||
|
|
||||||
this.TimelinePR = [];
|
|
||||||
|
|
||||||
if(this.segment == 'Oficial') {
|
if(this.segment == 'Oficial') {
|
||||||
this.eventsList = response.filter(data => data.CalendarName == "Oficial");
|
this.eventsList = response.filter(data => data.CalendarName == "Oficial");
|
||||||
@@ -891,8 +890,12 @@ export class AgendaPage implements OnInit {
|
|||||||
return e.startTime.toLocaleDateString('en-US') == this.eventSelectedDate.toLocaleDateString('en-US');
|
return e.startTime.toLocaleDateString('en-US') == this.eventSelectedDate.toLocaleDateString('en-US');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
console.log('Event -- ',filterDate[filterDate.length - 1]);
|
||||||
|
|
||||||
const firstEventStartHours = new Date(filterDate[filterDate.length - 1].startTime).getHours();
|
const firstEventStartHours = new Date(filterDate[filterDate.length - 1].startTime).getHours();
|
||||||
|
|
||||||
|
console.log('firstEventStartHours-- ', firstEventStartHours)
|
||||||
|
|
||||||
const scrollContainer = document.querySelector('.timeline-wrapper');
|
const scrollContainer = document.querySelector('.timeline-wrapper');
|
||||||
|
|
||||||
scrollContainer.scroll({
|
scrollContainer.scroll({
|
||||||
|
|||||||
@@ -44,7 +44,7 @@ export class ApproveEventModalPage implements OnInit {
|
|||||||
|
|
||||||
window.onresize = (event) => {
|
window.onresize = (event) => {
|
||||||
// if not mobile remove all component
|
// if not mobile remove all component
|
||||||
if( window.innerWidth >= 1024){
|
if( window.innerWidth >= 800){
|
||||||
this.modalController.dismiss(null);
|
this.modalController.dismiss(null);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -86,10 +86,10 @@ export class EditEventPage implements OnInit {
|
|||||||
|
|
||||||
window.onresize = (event) => {
|
window.onresize = (event) => {
|
||||||
// if not mobile remove all component
|
// if not mobile remove all component
|
||||||
if( window.innerWidth >= 800){
|
if( window.innerWidth >= 1024) {
|
||||||
this.modalController.dismiss();
|
this.modalController.dismiss();
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -107,6 +107,7 @@ export class NewEventPage implements OnInit {
|
|||||||
this.modalController.dismiss();
|
this.modalController.dismiss();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
close(){
|
close(){
|
||||||
this.modalController.dismiss();
|
this.modalController.dismiss();
|
||||||
|
|||||||
+1
@@ -196,6 +196,7 @@ export class ExpedientTaskModalPage implements OnInit {
|
|||||||
DispatchFolder: this.dispatchFolder,
|
DispatchFolder: this.dispatchFolder,
|
||||||
AttachmentList: docs
|
AttachmentList: docs
|
||||||
}
|
}
|
||||||
|
console.log(JSON.stringify(this.postData))
|
||||||
console.log('this.postData', this.postData, this.taskType);
|
console.log('this.postData', this.postData, this.taskType);
|
||||||
this.taskResult = await this.processes.postDespatcho(this.postData);
|
this.taskResult = await this.processes.postDespatcho(this.postData);
|
||||||
break;
|
break;
|
||||||
|
|||||||
Reference in New Issue
Block a user