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

fix

Browse Source
This commit is contained in:
Peter Maquiran
2023-07-26 13:06:42 +01:00
parent 9e8bb92b96
commit a08bb5d4f4
18 changed files with 90 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/shared/agenda/event-list/event-list.page.html
+6 -1
View File
@@ -12,7 +12,12 @@
<ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
<ion-segment-button *ngFor="let calendars of eventService.calendarNamesAryPR; let i index" [value]="i === 'Meu calendario' ? 'Meu calendario' : i.OwnerUserId ">
<div *ngIf="calendars == 'Meu calendario'"> Minha agenda</div>
<div *ngIf="calendars == 'Meu calendario'">
<!-- <span *ngIf="SessionStore.user.Profile == 'PR' ">PR</span>
<span *ngIf="SessionStore.user.Profile == 'MDGPR' ">MDGPR</span>
<span *ngIf="SessionStore.user.Profile != 'MDGPR' && SessionStore.user.Profile != 'PR' ">Minha agenda</span> -->
Minha agenda
</div>
<div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Presidente da República'"> {{ environment.agendaPR}}</div>
<div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Ministro e Director do Gabinete do PR'"> {{ environment.agendaVP}}</div>
<div *ngIf="calendars != 'Meu calendario' && calendars.Role != 'Ministro e Director do Gabinete do PR' && calendars.Role != 'Presidente da República'"> Agenda do {{calendars.Fullname}}</div>
src/app/shared/agenda/event-list/event-list.page.ts
+1
View File
@@ -30,6 +30,7 @@ export class EventListPage implements OnInit {
eventoaprovacaostore = EventoAprovacaoStore;
environment = environment
color: 'pr' | 'mdgpr'
SessionStore = SessionStore;
@Input() profile:string;
@Input() showComponent:string;
src/app/shared/gabinete-digital/all-processes/all-processes.page.ts
+2 -3
View File
@@ -148,10 +148,9 @@ export class AllProcessesPage implements OnInit {
if (activityName == 'Tarefa de Despacho' || activityName == 'Concluir Despacho') {
this.router.navigate(['/home/gabinete-digital/despachos-pr', serialNumber, 'gabinete-digital']);
}
else if (activityName == 'Revisar Diploma' || activityName == 'Assinar Diploma') {
else if (activityName == 'Revisar Diploma' || activityName == 'Diploma Assinado') {
this.router.navigate(['/home/gabinete-digital/diplomas', serialNumber, 'gabinete-digital']);
}
else if (activityName == 'Diploma Assinado') {
} else if ( activityName == 'Assinar Diploma') {
this.router.navigate(['/home/gabinete-digital/diplomas-assinar', serialNumber, 'gabinete-digital']);
} else {
throw('Bug!');
src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html
+6 -1
View File
@@ -58,7 +58,12 @@
Minha agenda
</ion-segment-button> -->
<ion-segment-button *ngFor="let calendars of eventService.calendarNamesAryPR; let i index" [value]="i === 'Meu calendario' ? 'Meu calendario' : i.OwnerUserId ">
<div *ngIf="calendars == 'Meu calendario'"> Minha agenda </div>
<div *ngIf="calendars == 'Meu calendario'">
<!-- <span *ngIf="SessionStore.user.Profile == 'PR' ">PR</span>
<span *ngIf="SessionStore.user.Profile == 'MDGPR' ">MDGPR</span>
<span *ngIf="SessionStore.user.Profile != 'MDGPR' && SessionStore.user.Profile != 'PR' ">Minha agenda</span> -->
Minha agenda
</div>
<div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Presidente da República'"> {{ environment.agendaPR}} </div>
<div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Ministro e Director do Gabinete do PR'"> {{ environment.agendaVP}} </div>
<div *ngIf="calendars != 'Meu calendario' && calendars.Role != 'Ministro e Director do Gabinete do PR' && calendars.Role != 'Presidente da República'"> Agenda do {{calendars.Fullname}} </div>
src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
+1
View File
@@ -45,6 +45,7 @@ export class EventsToApprovePage implements OnInit {
delete(): void;
}
routerSubscription;
SessionStore = SessionStore;
constructor(
src/app/shared/publication/new-publication/convertBlobToBase64.worker.js
+15
View File
@@ -0,0 +1,15 @@
convertBlobToBase64 = (blob) => new Promise((resolve, reject) => {
const reader = new FileReader;
reader.onerror = reject;
reader.onload = () => {
resolve(reader.result);
};
reader.readAsDataURL(blob);
}).catch ((error) => {
console.error(error);
});;
onmessage = async function(oEvent) {
const result = await convertBlobToBase64(oEvent.data);
postMessage(result);
};
src/app/shared/publication/new-publication/new-publication.page.ts
+1 -1
View File
@@ -86,7 +86,7 @@ export class NewPublicationPage implements OnInit {
async takePicture() {
const capturedImage = await Camera.getPhoto({
quality: 90,
quality: 50,
// allowEditing: true,
resultType: CameraResultType.Base64,
source: CameraSource.Camera