mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-20 21:35:50 +00:00
Merge branch 'developer' of https://bitbucket.org/equilibriumito/gabinete-digital into developer
This commit is contained in:
@@ -95,7 +95,6 @@ export class CreateProcessPage implements OnInit {
|
|||||||
this.loggeduser = userAuth.ValidatedUser;
|
this.loggeduser = userAuth.ValidatedUser;
|
||||||
this.task = this.navParams.get('task');
|
this.task = this.navParams.get('task');
|
||||||
|
|
||||||
console.log('task', this.task)
|
|
||||||
|
|
||||||
this.taskType = this.navParams.get('taskAction');
|
this.taskType = this.navParams.get('taskAction');
|
||||||
|
|
||||||
@@ -135,7 +134,7 @@ export class CreateProcessPage implements OnInit {
|
|||||||
this.selectedTypes = ['99999850'];
|
this.selectedTypes = ['99999850'];
|
||||||
}, 500);
|
}, 500);
|
||||||
|
|
||||||
console.log(this.postData.DispatchFolder.SubjectTypes);
|
|
||||||
this.taskDate = new Date(this.task.taskStartDate);
|
this.taskDate = new Date(this.task.taskStartDate);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -157,7 +156,6 @@ export class CreateProcessPage implements OnInit {
|
|||||||
|
|
||||||
getSubjectType() {
|
getSubjectType() {
|
||||||
this.processes.GetSubjectType().subscribe(res=>{
|
this.processes.GetSubjectType().subscribe(res=>{
|
||||||
console.log(res);
|
|
||||||
this.subjectTypes = res;
|
this.subjectTypes = res;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -215,7 +213,6 @@ export class CreateProcessPage implements OnInit {
|
|||||||
}
|
}
|
||||||
|
|
||||||
let attendees = this.taskParticipants.concat(this.taskParticipantsCc);
|
let attendees = this.taskParticipants.concat(this.taskParticipantsCc);
|
||||||
console.log(attendees);
|
|
||||||
|
|
||||||
attendees = attendees.map(function(val) {
|
attendees = attendees.map(function(val) {
|
||||||
return {
|
return {
|
||||||
@@ -224,7 +221,6 @@ export class CreateProcessPage implements OnInit {
|
|||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
console.log(attendees);
|
|
||||||
|
|
||||||
const DocumentToSave = this.documents.map((e) => {
|
const DocumentToSave = this.documents.map((e) => {
|
||||||
return {
|
return {
|
||||||
|
|||||||
@@ -751,12 +751,9 @@ export class AgendaPage implements OnInit {
|
|||||||
|
|
||||||
updateEventListBox() {
|
updateEventListBox() {
|
||||||
|
|
||||||
console.log('list',JSON.stringify(this.calendarService.eventSource))
|
|
||||||
this.TimelinePRList = this.eventListBoxComponent.list(this.calendarService.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, 'date')
|
this.TimelinePRList = this.eventListBoxComponent.list(this.calendarService.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, 'date')
|
||||||
this.TimelineMDList = this.eventListBoxComponent.list(this.calendarService.eventSource, 'md', this.rangeStartDate, this.rangeEndDate, 'date')
|
this.TimelineMDList = this.eventListBoxComponent.list(this.calendarService.eventSource, 'md', this.rangeStartDate, this.rangeEndDate, 'date')
|
||||||
|
|
||||||
console.log('this.TimelineMDList', this.TimelineMDList)
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
eventListBox(list, nice?) {
|
eventListBox(list, nice?) {
|
||||||
@@ -786,17 +783,12 @@ export class AgendaPage implements OnInit {
|
|||||||
|
|
||||||
if (new Date(startDate).toLocaleDateString() != new Date(endDate).toLocaleDateString()) {
|
if (new Date(startDate).toLocaleDateString() != new Date(endDate).toLocaleDateString()) {
|
||||||
|
|
||||||
console.log(new Date(startDate).toLocaleDateString(),'!=' , new Date(endDate).toLocaleDateString())
|
|
||||||
console.log(startDate.toISOString(),'iso' , endDate.toISOString() )
|
|
||||||
console.log(new Date(startDate).toLocaleTimeString('pt'),'time' , new Date(endDate).toLocaleTimeString('pt'))
|
|
||||||
|
|
||||||
// difference
|
// difference
|
||||||
const diffTime = Math.abs(endDate - startDate);
|
const diffTime = Math.abs(endDate - startDate);
|
||||||
const diffDays = Math.ceil(diffTime / (1000 * 60 * 60 * 24));
|
const diffDays = Math.ceil(diffTime / (1000 * 60 * 60 * 24));
|
||||||
|
|
||||||
if (diffDays <= 150 && !event.event.IsAllDayEvent ) {
|
if (diffDays <= 150 && !event.event.IsAllDayEvent ) {
|
||||||
|
|
||||||
console.log(event)
|
|
||||||
|
|
||||||
if (diffDays >= 1) {
|
if (diffDays >= 1) {
|
||||||
|
|
||||||
@@ -1028,7 +1020,7 @@ export class AgendaPage implements OnInit {
|
|||||||
|
|
||||||
// open component
|
// open component
|
||||||
async viewEventDetail(eventId:any) {
|
async viewEventDetail(eventId:any) {
|
||||||
console.log('View event '+eventId)
|
|
||||||
this.router.navigate(['/home/agenda', eventId, 'agenda']);
|
this.router.navigate(['/home/agenda', eventId, 'agenda']);
|
||||||
/* console.log(this.profile);
|
/* console.log(this.profile);
|
||||||
|
|
||||||
|
|||||||
@@ -86,8 +86,6 @@ export class eventListBox {
|
|||||||
|
|
||||||
if (diffDays <= 150 && !event.event.IsAllDayEvent ) {
|
if (diffDays <= 150 && !event.event.IsAllDayEvent ) {
|
||||||
|
|
||||||
console.log(event)
|
|
||||||
|
|
||||||
if (diffDays >= 1) {
|
if (diffDays >= 1) {
|
||||||
|
|
||||||
const StartEvent = Object.assign({}, {
|
const StartEvent = Object.assign({}, {
|
||||||
|
|||||||
@@ -184,7 +184,6 @@ export class ExpedientePrPage implements OnInit {
|
|||||||
this.cc = users.filter(user=>{
|
this.cc = users.filter(user=>{
|
||||||
return user.Type == 'CC';
|
return user.Type == 'CC';
|
||||||
});
|
});
|
||||||
console.log(users);
|
|
||||||
|
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
|
|
||||||
<ion-header class="ion-no-border">
|
<ion-header class="ion-no-border">
|
||||||
|
<app-header > </app-header>
|
||||||
</ion-header>
|
</ion-header>
|
||||||
|
|
||||||
<ion-header class="ion-no-border">
|
<ion-header class="ion-no-border">
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ import { ActivatedRoute, Router } from '@angular/router';
|
|||||||
import { ModalController } from '@ionic/angular';
|
import { ModalController } from '@ionic/angular';
|
||||||
import { Publication } from 'src/app/models/publication';
|
import { Publication } from 'src/app/models/publication';
|
||||||
import { PublicationFolder } from 'src/app/models/publicationfolder';
|
import { PublicationFolder } from 'src/app/models/publicationfolder';
|
||||||
import { LoadingService } from 'src/app/services/loading.service';
|
|
||||||
import { PublicationsService } from 'src/app/services/publications.service';
|
import { PublicationsService } from 'src/app/services/publications.service';
|
||||||
import { PublicationEventFolderStorage } from 'src/app/store/publication-event-folder.service';
|
import { PublicationEventFolderStorage } from 'src/app/store/publication-event-folder.service';
|
||||||
import { PublicationListStorage } from 'src/app/store/publication-list.service';
|
import { PublicationListStorage } from 'src/app/store/publication-list.service';
|
||||||
@@ -30,7 +29,7 @@ export class ViewPublicationsPage implements OnInit {
|
|||||||
publicationEventFolderStorage = PublicationEventFolderStorage
|
publicationEventFolderStorage = PublicationEventFolderStorage
|
||||||
publicationTravelFolderService = PublicationTravelFolderStore
|
publicationTravelFolderService = PublicationTravelFolderStore
|
||||||
|
|
||||||
constructor( private loadingController: LoadingService,
|
constructor(
|
||||||
private modalController: ModalController,
|
private modalController: ModalController,
|
||||||
private publications: PublicationsService,
|
private publications: PublicationsService,
|
||||||
private activatedRoute: ActivatedRoute,
|
private activatedRoute: ActivatedRoute,
|
||||||
@@ -45,7 +44,7 @@ export class ViewPublicationsPage implements OnInit {
|
|||||||
this.folderId = params["params"].folderId;
|
this.folderId = params["params"].folderId;
|
||||||
console.log(params["params"]);
|
console.log(params["params"]);
|
||||||
}
|
}
|
||||||
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -60,7 +59,6 @@ export class ViewPublicationsPage implements OnInit {
|
|||||||
}
|
}
|
||||||
|
|
||||||
ngOnChanges() {
|
ngOnChanges() {
|
||||||
console.log(this.folderId)
|
|
||||||
|
|
||||||
if(typeof(this.folderId) == 'object') {
|
if(typeof(this.folderId) == 'object') {
|
||||||
this.folderId = this.folderId['ProcessId']
|
this.folderId = this.folderId['ProcessId']
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ export class ToDayEventStorageService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
get eventsList() {
|
get eventsList() {
|
||||||
return this._eventsList
|
return this._eventsList || []
|
||||||
}
|
}
|
||||||
get count() {
|
get count() {
|
||||||
return this._count
|
return this._count
|
||||||
|
|||||||
Reference in New Issue
Block a user