Merge branch 'feature/pendentes-count' into develop

This commit is contained in:
gilson.manuel
2022-06-30 17:03:36 +01:00
27 changed files with 59 additions and 52 deletions
@@ -71,7 +71,7 @@ export class ApproveEventPage implements OnInit {
this.processes.GetTask(this.serialNumber).subscribe(res => {
this.loadedEvent = res;
console.log(this.loadedEvent);
// console.log(this.loadedEvent);
this.today = new Date(res.workflowInstanceDataFields.StartDate);
//
this.customDate = this.days[this.today.getDay()]+ ", " + this.today.getDate() +" de " + ( this.months[this.today.getMonth()]);
@@ -233,7 +233,7 @@ export class EditEventPage implements OnInit {
}
calculetedLastOccurrence(type:number){
console.log(type);
// console.log(type);
var valor;
var opcao: boolean;
if (type == 0) {
@@ -377,7 +377,7 @@ export class NewEventPage implements OnInit {
}
calculetedLastOccurrence(type:number){
console.log(type);
// console.log(type);
var valor;
var opcao: boolean;
if (type == 0) {
@@ -53,7 +53,7 @@
<p>{{customDate}}</p>
<p *ngIf="toDateString(loadedEvent.StartDate) == toDateString(loadedEvent.EndDate)">das {{loadedEvent.StartDate | date: 'HH:mm'}} às {{loadedEvent.EndDate | date: 'HH:mm'}}</p>
<p *ngIf="toDateString(loadedEvent.StartDate) != toDateString(loadedEvent.EndDate)">{{loadedEvent.StartDate | date: 'd/M/yy' }} - {{ loadedEvent.StartDate | date: 'dd/M/yy'}} </p>
<p>
<p *ngIf="loadedEvent.EventRecurrence">
<span *ngIf="loadedEvent.EventRecurrence.Type == 0">Diário</span>
<span *ngIf="loadedEvent.EventRecurrence.Type == 1">Semanal</span>
<span *ngIf="loadedEvent.EventRecurrence.Type == 2">Mensal</span>
@@ -105,7 +105,7 @@ export class ViewEventPage implements OnInit {
this.eventsService.getEvent(this.eventId).subscribe(res => {
this.loadedEvent = res;
console.log(this.loadedEvent);
// console.log(this.loadedEvent);
this.today = new Date(res.StartDate);
this.customDate = this.days[this.today.getDay()]+ ", " + this.today.getDate() +" de " + ( this.months[this.today.getMonth()]);
}, (error)=> {
@@ -167,7 +167,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
ngOnInit() {
this.chatService.refreshtoken();
console.log(this.roomId)
// console.log(this.roomId)
this.loggedUser = this.loggedUserChat;
//setTimeout(() => {
this.getRoomInfo()
@@ -407,7 +407,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
async getRoomInfo() {
this.wsChatMethodsService.getGroupRoom(this.roomId).loadHistory({});
let room = await this.chatService.getRoomInfo(this.roomId).toPromise();
console.log('ROOM',room)
// console.log('ROOM',room)
this.room = room['room'];
if (this.room.name) {
this.roomName = this.room.name.split('-').join(' ');
@@ -85,8 +85,8 @@ export class EventsToApprovePage implements OnInit {
else if(this.segment == 'PR') {
let prEventsOficial = await this.processes.GetTasksList('Agenda Oficial PR', false).toPromise();
let prEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal PR', false).toPromise();
console.log(prEventsOficial)
console.log(prEventsPessoal)
// console.log(prEventsOficial)
// console.log(prEventsPessoal)
this.eventsPRList = prEventsOficial.concat(prEventsPessoal);
this.eventsPRList = this.sortService.sortArrayByDate(this.eventsPRList)
this.eventsPRList = (this.eventsPRList || []).filter(function(item) {
@@ -105,12 +105,12 @@ export class EventsToApprovePage implements OnInit {
getFromDB() {
this.storage.get('event-to-aproveMD').then((events = []) => {
this.eventsMDGPRList = events
console.log('DB',this.eventsMDGPRList)
// console.log('DB',this.eventsMDGPRList)
})
this.storage.get('event-to-aprovePR').then((events) => {
this.eventsPRList = events
console.log('DB',this.eventsPRList)
// console.log('DB',this.eventsPRList)
})
}
@@ -99,7 +99,7 @@ export class EditActionPage implements OnInit {
DateEnd: this.folder.DateEnd,
ActionType: this.folder.ActionType,
}
console.log(this.folder.DateEnd);
// dconsole.log(this.folder.DateEnd);
const loader = this.toastService.loading()