This commit is contained in:
Peter Maquiran
2023-08-10 16:46:55 +01:00
parent 8b3989de3b
commit 19ddb18148
33 changed files with 257 additions and 222 deletions
@@ -161,7 +161,7 @@ export class EditEventPage implements OnInit {
}
ngOnChanges(changes: any): void {
this.loadedEventAttachments = this._postEvent.Attachments
this.loadedEventAttachments = this._postEvent?.Attachments
}
close() {
@@ -336,7 +336,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
this.chatService.getAllUsers().subscribe(res => {
//
this.allUsers = res['users'].filter(data => data.username != SessionStore.user.UserName);
this.allUsers = res['users']
//
});
}
@@ -33,6 +33,8 @@ export class AttendeePage implements OnInit {
@Input() footer: boolean;
@Input() selectLogUser: boolean = true;
@ViewChild('Searchbar') searchbar: Searchbar;
LtaskParticipants: EventPerson[] = [];
@@ -180,12 +180,12 @@
</ion-item-sliding>
</div>
<div *ngIf="!TaskService.showLoader && AllProcess.length == 0"
<div *ngIf="!TaskService.showLoaderNum != 0 && AllProcess.length == 0"
class="empty-list d-flex height-100 align-center justify-content-center">
<span>Lista vazia</span>
</div>
<div *ngIf="TaskService.showLoader && AllProcess.length == 0">
<div *ngIf="TaskService.showLoaderNum != 0 && AllProcess.length == 0">
<ion-list>
<ion-item>
@@ -140,7 +140,7 @@ export class AllProcessesPage implements OnInit {
if (workflowName == 'Despacho') {
if (activityName == 'Tarefa de Despacho' || activityName == 'Concluir Despacho') {
if (activityName == 'Tarefa de Despacho' || activityName == 'Concluir Despacho' || activityName == 'Reexecutar Despacho') {
this.router.navigate(['/home/gabinete-digital/despachos', serialNumber, 'gabinete-digital']);
}
}
@@ -1,6 +1,6 @@
import { Component, OnInit } from '@angular/core';
import { customTask } from '../../../models/dailyworktask.model';
import { NavigationEnd, NavigationStart, Router } from '@angular/router';
import { NavigationStart, Router } from '@angular/router';
import { DespachoService } from 'src/app/Rules/despacho.service';
import { TaskService } from 'src/app/services/task.service';
import { ThemeService } from 'src/app/services/theme.service'
@@ -73,7 +73,7 @@
}
.container-div{
margin-bottom: rem(15);
overflow: auto;
overflow: hidden;
}
.ion-item-container{
margin: rem(15) auto;
@@ -79,6 +79,9 @@ export class PublicationDetailPage implements OnInit {
}
this.showLoader = false;
},(error) => {
if(window['_deletePublication']) {
window['_deletePublication'](this.folderId, this.publicationId)
}
this.goBack();
this.httpErrorHandle.httpStatusHandle(error)
});
@@ -95,6 +98,15 @@ export class PublicationDetailPage implements OnInit {
try {
await this.publications.DeletePublication(this.folderId, this.publicationId).toPromise();
this.httpErrorHandle.httpsSucessMessagge('Eliminar publicação')
if(window['_deletePublication']) {
window['_deletePublication'](this.folderId, this.publicationId)
}
if(window['app-view-publications-page-doRefresh']) {
window['app-view-publications-page-doRefresh']()
}
this.goBackToViewPublications.emit();
} catch (error) {
this.httpErrorHandle.httpStatusHandle(error)
@@ -25,8 +25,8 @@ export class ViewPublicationsPage implements OnInit {
publicationList: {[key: string]: Publication[] } = {};
publicationItem: {[key: string]: PublicationFolder } = {};
getpublication = [];
error: any;
oldpublicationIds = []
@Input() folderId: any;
@Output() addNewPublication = new EventEmitter<any>();
@@ -59,6 +59,9 @@ export class ViewPublicationsPage implements OnInit {
this.createPublicationList()
window['app-view-publications-page-doRefresh'] = this.doRefresh
window['_deletePublication'] = (a, b) => {
this._deletePublication(a, b)
}
this.getFromDB();
}
@@ -121,9 +124,10 @@ export class ViewPublicationsPage implements OnInit {
this.showLoader = true;
const folderId = this.folderId
try {
const publicationIds = await this.publications.GetPublicationsList(folderId).toPromise();
this.publicationList[folderId] = []
this.createPublicationList(folderId)
let loadLater = []
@@ -144,13 +148,22 @@ export class ViewPublicationsPage implements OnInit {
this.showLoader = false;
this.storage.set(folderId, this.publicationList[folderId]);
this.getpublication = this.publicationList[folderId];
this.oldpublicationIds = publicationIds
} catch(error) {
this.showLoader = false;
}
}
_deletePublication = (folderId, publicationId) => {
this.publicationList[folderId] = this.publicationList[folderId].filter( e => e.DocumentId != publicationId)
console.log('this.publicationList[folderId]', this.publicationList[folderId].length)
}
publicationIsPresent(publicationId, folderId) {
return this.publicationList[folderId].find( e => e.DocumentId == publicationId )
}