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

Last pull made

Browse Source
This commit is contained in:
Eudes Inácio
2023-06-19 05:36:24 +01:00
parent 20cf57fb07 f023501d9e
commit 2178ad88c2
11 changed files with 42 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html
-1
View File
@@ -77,7 +77,6 @@
</ion-list>
</div>
</div>
<div *ngIf="task" class="aside-right flex-column height-100 overflow-y-auto">
<div class="buttons" *ngIf="task.activityInstanceName == 'Revisar Diploma'">
<button (click)="openAddNoteModal('Solicitar assinatura')" class="btn-cancel" shape="round" >Solicitar assinatura do Presidente</button>
src/app/pages/gabinete-digital/event-list/event-list.page.html
+1 -1
View File
@@ -56,7 +56,7 @@
</mat-form-field>
</div>
<ion-toolbar>
<ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
<ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)" class="row-reverse">
<!-- <ion-segment-button value="MDGPR">
Minha agenda
</ion-segment-button> -->
src/app/pages/gabinete-digital/event-list/event-list.page.ts
+6
View File
@@ -69,6 +69,12 @@ export class EventListPage implements OnInit {
} else {
this.segment = this.eventService.calendarNamesAry[0].OwnerUserId
}
// select pr by default
// const pr = this.eventService.calendarNamesAry.find( e => e.Role == 'Presidente da República')
// if(pr) {
// this.segment = pr.OwnerUserId
// }
}
const location = window.location
src/app/pages/gabinete-digital/gabinete-digital.page.ts
+2 -2
View File
@@ -305,10 +305,10 @@ export class GabineteDigitalPage 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' ) {
this.router.navigate(['/home/gabinete-digital/diplomas', serialNumber, 'gabinete-digital']);
}
else if (activityName == 'Diploma Assinado') {
else if (activityName == 'Diploma Assinado' || activityName == 'Assinar Diploma') {
this.router.navigate(['/home/gabinete-digital/diplomas-assinar', serialNumber, 'gabinete-digital']);
} else {
src/app/shared/agenda/event-list/event-list.page.html
+2 -2
View File
@@ -8,8 +8,8 @@
</button>
</div>
</div>
<ion-toolbar>
<ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
<ion-toolbar >
<ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)" class="row-reverse">
<ion-segment-button *ngFor="let calendars of eventService.calendarNamesAryReverse; let i index" [value]="i === 'Meu calendario' ? 'Meu calendario' : i.OwnerUserId ">
<div *ngIf="calendars == 'Meu calendario'"> Minha agenda </div>
<div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Presidente da República'"> {{ environment.agendaPR}} </div>
src/app/shared/agenda/event-list/event-list.page.ts
+15 -6
View File
@@ -45,13 +45,22 @@ export class EventListPage implements OnInit {
) {
this.loggeduser = SessionStore.user;
if(!this.segment) {
if(this.eventService.calendarNamesAry.includes('Meu calendario')) {
this.segment = 'Meu calendario';
} else {
this.segment = this.eventService.calendarNamesAry[0].OwnerUserId
}
}
ngAfterViewInit(): void {
if(!this.segment) {
if(this.eventService.calendarNamesAry.includes('Meu calendario')) {
this.segment = 'Meu calendario';
} else {
this.segment = this.eventService.calendarNamesAry[0].OwnerUserId
}
// const pr = this.eventService.calendarNamesAry.find( e => e.Role == 'Presidente da República')
// if(pr) {
// this.segment = pr.OwnerUserId
// }
}
}
ngOnInit() {
src/app/shared/gabinete-digital/all-processes/all-processes.page.ts
+1 -2
View File
@@ -1,8 +1,7 @@
import { Component, OnInit } from '@angular/core';
import { ActivatedRoute, NavigationEnd, Router } from '@angular/router';
import { NavigationEnd, Router } from '@angular/router';
import { LoginUserRespose } from 'src/app/models/user.model';
import { ThemeService } from 'src/app/services/theme.service'
import { SessionStore } from 'src/app/store/session.service';
import { TaskService } from 'src/app/services/task.service'
/* import MiniSearch from 'minisearch' */
src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html
+1 -1
View File
@@ -86,7 +86,7 @@
</div>
<ion-toolbar>
<ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
<ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)" class="row-reverse">
<!-- <ion-segment-button value="MDGPR">
Minha agenda
</ion-segment-button> -->
src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
+5
View File
@@ -68,6 +68,11 @@ export class EventsToApprovePage implements OnInit {
} else {
this.segment = this.eventService.calendarNamesAry[0].OwnerUserId
}
// const pr = this.eventService.calendarNamesAry.find( e => e.Role == 'Presidente da República')
// if(pr) {
// this.segment = pr.OwnerUserId
// }
}
this.LoadToApproveEvents()
src/global.scss
+3
View File
@@ -1537,3 +1537,6 @@ ion-textarea.heigh-200 textarea {
width: 20px;
}
}
.row-reverse { display: flex; flex-direction: row-reverse; }
version/git-version.ts
+6 -6
View File
@@ -1,12 +1,12 @@
export let versionData = {
"shortSHA": "cbd54389b",
"SHA": "cbd54389b497e49658135ab02c3222b52b09cfa8",
"shortSHA": "20cf57fb0",
"SHA": "20cf57fb0761b5e49652f47cb54ce99962825fb9",
"branch": "feature/gabinete-search",
"lastCommitAuthor": "'Eudes Inácio'",
"lastCommitTime": "'Tue Jun 13 14:40:22 2023 +0100'",
"lastCommitMessage": "build",
"lastCommitNumber": "5019",
"lastCommitTime": "'Tue Jun 13 14:46:33 2023 +0100'",
"lastCommitMessage": "rollback da task",
"lastCommitNumber": "5021",
"change": "",
"changeStatus": "On branch feature/gabinete-search\nYour branch and 'origin/feature/gabinete-search' have diverged,\nand have 8 and 1 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: src/app/pages/agenda/agenda.page.ts\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.page.html\n\tmodified: src/app/shared/agenda/event-list/event-list.page.html\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html",
"changeStatus": "On branch feature/gabinete-search\nYour branch and 'origin/feature/gabinete-search' have diverged,\nand have 9 and 1 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.page.html\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.page.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified: src/app/shared/agenda/event-list/event-list.page.html\n\tmodified: src/app/shared/agenda/event-list/event-list.page.ts\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.ts\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts\n\tmodified: src/global.scss",
"changeAuthor": "eudes.inacio"
}