mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-20 13:26:08 +00:00
fix publication
This commit is contained in:
@@ -193,6 +193,9 @@ export class HomePage implements OnInit {
|
||||
if (this.p.userPermission([this.p.permissionList.Gabinete.pr_tasks]) && SessionStore.user.RoleID != this.RoleIdService.PRES) {
|
||||
throw ('User has PRES permission but not roleId');
|
||||
}
|
||||
if (!this.p.userPermission([this.p.permissionList.Gabinete.pr_tasks]) && SessionStore.user.RoleID == this.RoleIdService.PRES) {
|
||||
throw ('User has PRES permission but not roleId');
|
||||
}
|
||||
}, 1000)
|
||||
|
||||
}
|
||||
|
||||
@@ -16,4 +16,12 @@
|
||||
background-repeat: no-repeat;
|
||||
background-position-x: center;
|
||||
background-position-y: center;
|
||||
}
|
||||
|
||||
|
||||
@media only screen and (max-width: 650px) {
|
||||
|
||||
.container-img {
|
||||
background-size: 25%;
|
||||
}
|
||||
}
|
||||
@@ -1333,7 +1333,7 @@ export class AgendaPage implements OnInit {
|
||||
async viewEventsToApprove() {
|
||||
await this.cloneAllmobileComponent();
|
||||
|
||||
if (window.innerWidth <= 801) {
|
||||
if (window.innerWidth <= 1023) {
|
||||
this.router.navigate(['/home/agenda/event-list']);
|
||||
} else {
|
||||
// hide all components
|
||||
|
||||
@@ -171,7 +171,7 @@ export class EventListPage implements OnInit {
|
||||
this.color = 'mdgpr'
|
||||
}
|
||||
|
||||
let genericEvents = await this.processes.GetTasksList('Agendar Evento', false).toPromise();
|
||||
let genericEvents = await this.processes.eventsToApprove(SessionStore.user.UserId,'mobile agenda').toPromise()
|
||||
try {
|
||||
this.eventsList = this.sortService.sortArrayByDate(genericEvents).reverse();
|
||||
} catch (error) {
|
||||
|
||||
@@ -83,10 +83,9 @@ export class PublicationsPage implements OnInit {
|
||||
this.router.events.forEach((event) => {
|
||||
if (event instanceof NavigationEnd && event.url == pathname) {
|
||||
this.getActions();
|
||||
|
||||
|
||||
}
|
||||
});
|
||||
|
||||
this.hideRefreshButton();
|
||||
this.getFromDB()
|
||||
|
||||
@@ -141,32 +140,29 @@ export class PublicationsPage implements OnInit {
|
||||
|
||||
|
||||
getActions() {
|
||||
if(this.showLoader == false) {
|
||||
this.showLoader = false
|
||||
|
||||
this.publications.GetPublicationFolderList().subscribe(async res => {
|
||||
this.showLoader = true;
|
||||
this.publications.GetPublicationFolderList().subscribe(async res => {
|
||||
const folders: PublicationFolder[] = this.getPublicationFolderMap(res)
|
||||
|
||||
const folders: PublicationFolder[] = this.getPublicationFolderMap(res)
|
||||
this.publicationsEventFolderList = folders.filter((e)=>e.ActionType == 'Evento')
|
||||
this.publicationsTravelFolderList = folders.filter((e)=>e.ActionType != 'Evento')
|
||||
|
||||
this.publicationsEventFolderList = folders.filter((e)=>e.ActionType == 'Evento')
|
||||
this.publicationsTravelFolderList = folders.filter((e)=>e.ActionType != 'Evento')
|
||||
|
||||
if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
|
||||
await this.storage.set('actionsEvents', this.publicationsEventFolderList);
|
||||
await this.storage.set('actionsViagens', this.publicationsTravelFolderList);
|
||||
} else {
|
||||
folders.forEach((folder)=> {
|
||||
this.addActionToDB(folder);
|
||||
})
|
||||
}
|
||||
|
||||
this.showLoader = false;
|
||||
|
||||
}, (error) => {
|
||||
this.showLoader = false;
|
||||
});
|
||||
}
|
||||
if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
|
||||
await this.storage.set('actionsEvents', this.publicationsEventFolderList);
|
||||
await this.storage.set('actionsViagens', this.publicationsTravelFolderList);
|
||||
} else {
|
||||
folders.forEach((folder)=> {
|
||||
this.addActionToDB(folder);
|
||||
})
|
||||
}
|
||||
|
||||
this.showLoader = false;
|
||||
|
||||
}, (error) => {
|
||||
this.showLoader = false;
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -91,7 +91,7 @@ export class EventListPage implements OnInit {
|
||||
this.color = 'mdgpr'
|
||||
}
|
||||
|
||||
let genericEvents = await this.processes.GetTasksList('Agendar Evento', false).toPromise();
|
||||
let genericEvents = await this.processes.eventsToApprove(SessionStore.user.UserId,'mobile agenda').toPromise()
|
||||
try {
|
||||
this.eventsList = this.sortService.sortArrayByDate(genericEvents).reverse();
|
||||
} catch (error) {
|
||||
|
||||
@@ -197,9 +197,7 @@ ion-content{
|
||||
left: 0 !important;
|
||||
bottom: 0 !important;
|
||||
right: 0 !important;
|
||||
top: calc(100% - 160px) !important;
|
||||
max-height: 160px;
|
||||
min-height: 160px;
|
||||
bottom: 0px !important;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -86,7 +86,7 @@ export class EventsToApprovePage implements OnInit {
|
||||
this.color = 'mdgpr'
|
||||
}
|
||||
|
||||
let genericEvents = await this.processes.GetTasksList('Agendar Evento', false).toPromise();
|
||||
let genericEvents = await this.processes.eventsToApprove(SessionStore.user.UserId,'mobile agenda').toPromise()
|
||||
try {
|
||||
this.eventsList = this.sortService.sortArrayByDate(genericEvents).reverse();
|
||||
} catch (error) {
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
<div class="buttons">
|
||||
<button class="btn-cancel" shape="round" >Adicionar</button>
|
||||
<button (click)="leaveGroup()" class="btn-cancel" shape="round" >Sair do Grupo</button>
|
||||
<button *ngIf="isAdmin" (click)="openChangeGroupName()" class="btn-cancel" shape="round" >Alterar nome do grupo</button>
|
||||
<button *ngIf="isAdmin" (click)="openChangeGroupName()" class="btn-cancel btn-cancel mt-10" shape="round" >Alterar nome do grupo</button>
|
||||
<div class="solid"></div>
|
||||
<button (click)="close('cancel')" full class="btn-cancel mobile-only" shape="round" >Cancelar</button>
|
||||
<button *ngIf="isAdmin" (click)="deleteGroup()" class="btn-delete" shape="round">Apagar grupo</button>
|
||||
|
||||
Reference in New Issue
Block a user