peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-18 20:47:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix publication

Browse Source
This commit is contained in:
Peter Maquiran
2023-02-27 19:52:30 +01:00
parent 75e6a62695
commit d289f377b5
12 changed files with 44 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/home/home.page.ts
+3
View File
@@ -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)
}
src/app/modals/view-document/view-document.page.scss
+8
View File
@@ -17,3 +17,11 @@
background-position-x: center;
background-position-y: center;
}
@media only screen and (max-width: 650px) {
.container-img {
background-size: 25%;
}
}
src/app/pages/agenda/agenda.page.ts
+1 -1
View File
@@ -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
src/app/pages/gabinete-digital/event-list/event-list.page.ts
+1 -1
View File
@@ -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) {
src/app/pages/publications/publications.page.ts
+4 -8
View File
@@ -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,10 +140,10 @@ export class PublicationsPage implements OnInit {
getActions() {
if(this.showLoader == false) {
this.showLoader = true;
this.publications.GetPublicationFolderList().subscribe(async res => {
this.showLoader = false
this.publications.GetPublicationFolderList().subscribe(async res => {
this.showLoader = true;
const folders: PublicationFolder[] = this.getPublicationFolderMap(res)
this.publicationsEventFolderList = folders.filter((e)=>e.ActionType == 'Evento')
@@ -164,9 +163,6 @@ export class PublicationsPage implements OnInit {
}, (error) => {
this.showLoader = false;
});
}
}
src/app/shared/agenda/event-list/event-list.page.ts
+1 -1
View File
@@ -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) {
src/app/shared/agenda/view-event/view-event.page.scss
+1 -3
View File
@@ -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;
}
src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
+1 -1
View File
@@ -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) {
src/app/shared/popover/chat-popover/chat-popover.page.html
+1 -1
View File
@@ -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>
src/environments/environment.ts
+1 -1
View File
@@ -3,4 +3,4 @@ import { oaprDev } from './suport/oapr'
import { doneITDev } from './suport/doneIt'
export const environment: Environment = oaprDev;
export const environment: Environment = doneITDev;
src/global.scss
+1 -3
View File
@@ -843,9 +843,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;
}
version/git-version.ts
+6 -6
View File
@@ -1,12 +1,12 @@
export let versionData = {
"shortSHA": "79213a543",
"SHA": "79213a543b0b219f83c92199296d94304dde8c74",
"shortSHA": "75e6a6269",
"SHA": "75e6a62695abe44be50786e4cde227eec3b2a93c",
"branch": "no_bug_movemente",
"lastCommitAuthor": "'Peter Maquiran'",
"lastCommitTime": "'Mon Feb 27 18:34:42 2023 +0100'",
"lastCommitMessage": "remove console log",
"lastCommitNumber": "4839",
"lastCommitTime": "'Mon Feb 27 18:38:55 2023 +0100'",
"lastCommitMessage": "remove",
"lastCommitNumber": "4840",
"change": "",
"changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/services/auth.service.ts\n\tmodified: src/app/services/events.service.ts\n\tmodified: src/environments/environment.ts\n\tmodified: version/git-version.ts",
"changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/home/home.page.ts\n\tmodified: src/app/modals/view-document/view-document.page.scss\n\tmodified: src/app/pages/agenda/agenda.page.ts\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.page.ts\n\tmodified: src/app/pages/publications/publications.page.ts\n\tmodified: src/app/shared/agenda/event-list/event-list.page.ts\n\tmodified: src/app/shared/agenda/view-event/view-event.page.scss\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts\n\tmodified: src/app/shared/popover/chat-popover/chat-popover.page.html\n\tmodified: src/environments/environment.ts\n\tmodified: src/global.scss",
"changeAuthor": "peter.maquiran"
}