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

changes from peter

Browse Source
This commit is contained in:
Eudes Inácio
2023-06-09 13:55:32 +01:00
parent 9470de5307 3bf5bfa75b
commit 05265f2442
8 changed files with 55 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts
+3 -4
View File
@@ -47,8 +47,8 @@ export class EventActionsPopoverPage implements OnInit {
this.RouteService.goBack()
}
closePopover() {
this.popoverController.dismiss();
closePopover(message?) {
this.popoverController.dismiss(message);
}
async approveTask() {
@@ -171,8 +171,7 @@ export class EventActionsPopoverPage implements OnInit {
await modal.present();
modal.onDidDismiss().then(res => {
});
modal.onDidDismiss().then(res => {});
}
src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts
+2 -1
View File
@@ -1,6 +1,6 @@
import { Component, OnInit } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { AnimationController, MenuController, ModalController, NavParams, PopoverController } from '@ionic/angular';
import { MenuController, ModalController, PopoverController } from '@ionic/angular';
import { Event } from 'src/app/models/event.model';
import { AlertService } from 'src/app/services/alert.service';
import { AttachmentsService } from 'src/app/services/attachments.service';
@@ -104,6 +104,7 @@ export class ApproveEventModalPage implements OnInit {
try {
await this.processes.PostTaskAction(body).toPromise()
this.TaskService.loadEventosParaAprovacao();
this.httpErrorHandle.httpsSucessMessagge('Aprovar', ()=>{
this.router.navigate(['/home/gabinete-digital/event-list']);
src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts
+30 -3
View File
@@ -16,7 +16,6 @@ import { ThemeService } from 'src/app/services/theme.service'
import { OfflineManagerService } from 'src/app/services/offline-manager.service';
import { RouteService } from 'src/app/services/route.service';
import { Storage } from '@ionic/storage';
import config from 'capacitor.config';
import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
import { TaskService } from 'src/app/services/task.service'
@@ -76,6 +75,9 @@ export class ApproveEventPage implements OnInit {
}
});
window['approve-event-getTask'] = () => {
this.getTask1()
}
}
toDateString(e) {
@@ -115,7 +117,32 @@ export class ApproveEventPage implements OnInit {
}
async getTask() {
getTask1 = () => {
this.processes.GetTask(this.serialNumber).subscribe(async res => {
this.loadedEvent = res
console.log('1111=1=1=1=')
this.addProcessToDB(this.loadedEvent)
try {
this.today = new Date(this.loadedEvent.workflowInstanceDataFields.StartDate);
this.customDate = this.days[this.today.getDay()] + ", " + this.today.getDate() + " de " + (this.months[this.today.getMonth()]);
} catch(error) {
console.log(this.loadedEvent)
throw(error)
}
}, (error) => {
if(error.status == 0) {
this.getProcessFromDB();
} else {
this.httpErrorHandle.httpStatusHandle(error)
}
})
}
async getTask () {
this.processes.GetTask(this.serialNumber).subscribe(async res => {
this.loadedEvent = res
@@ -346,8 +373,8 @@ export class ApproveEventPage implements OnInit {
await modal.present();
modal.onDidDismiss().then(res => {
this.TaskService.loadEventosParaAprovacao();
this.getTask();
this.TaskService.loadEventosParaAprovacao();
});
}
src/app/pages/gabinete-digital/event-list/event-list.page.html
+4 -3
View File
@@ -8,7 +8,7 @@
</button>
</div>
<div class="header-title">
<label>Eventos para Aprovação</label>
<label>Eventos para Aprovação </label>
</div>
<div style="float:right" *ngIf="showFilter" class="d-flex align-center">
@@ -60,11 +60,12 @@
<!-- <ion-segment-button value="MDGPR">
Minha agenda
</ion-segment-button> -->
<ion-segment-button *ngFor="let calendars of eventService.calendarNamesAry; let i index" [value]="i === 'Meu calendario' ? 'Meu calendario' : i.OwnerUserId">
<ion-segment-button *ngFor="let calendars of eventService.calendarNamesAry; let i index" [value]="i === 'Meu calendario' ? 'Meu calendario' : i.OwnerUserId || calendars.OwnerUserId">
<div *ngIf="calendars == 'Meu calendario'"> 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>
<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>
</ion-segment-button>
</ion-segment>
</ion-toolbar>
src/app/pages/gabinete-digital/event-list/event-list.page.ts
+4 -2
View File
@@ -137,18 +137,20 @@ export class EventListPage implements OnInit {
try {
this.eventsList = this.sortService.sortArrayByDate(genericEvents).reverse();
} catch (error) {
this.skeletonLoader = false
this.eventsList = [];
}
this.eventoaprovacaostore.save(segment, this.eventsList)
} else {
} else if(segment) {
this.color = 'pr'
let allEvents = await this.processes.eventsToApprove(segment.OwnerUserId,'mobile agenda').toPromise()
let allEvents = await this.processes.eventsToApprove(segment,'mobile agenda').toPromise()
try {
this.eventsList = this.sortService.sortArrayByDate(allEvents).reverse();
} catch(error) {
this.skeletonLoader = false
this.eventsList = []
}
src/app/shared/agenda/event-list/event-list.page.ts
+4 -1
View File
@@ -100,11 +100,13 @@ export class EventListPage implements OnInit {
this.eventsList = this.sortService.sortArrayByDate(genericEvents).reverse();
} catch (error) {
this.eventsList = [];
this.showLoader = false;
}
this.eventoaprovacaostore.save(segment, this.eventsList)
} else {
} else if(segment) {
console.log('segment', segment)
this.color = 'pr'
let allEvents = await this.processes.eventsToApprove(segment,'agenda desktop').toPromise()
@@ -112,6 +114,7 @@ export class EventListPage implements OnInit {
this.eventsList = this.sortService.sortArrayByDate(allEvents).reverse();
} catch(error) {
this.eventsList = []
this.showLoader = false;
}
this.eventsList = this.eventsList
src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts
+2 -20
View File
@@ -241,27 +241,10 @@ export class EditEventToApproveComponent implements OnInit {
}
}
goBack() {
let navigationExtras: NavigationExtras = {
queryParams: {
"eventos": true,
}
};
if( window.innerWidth < 801) {
this.router.navigate(['/home/gabinete-digital/event-list']);
} else {
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
}
}
close() {
this.modalController.dismiss();
}
save() {
@@ -313,6 +296,7 @@ export class EditEventToApproveComponent implements OnInit {
this.eventsService.postEventToApproveEdit(event).subscribe(()=>{
this.httpErroHalde.httpsSucessMessagge('Editar evento')
window['approve-event-getTask']()
}, error =>{
this.httpErroHalde.httpStatusHandle(error)
})
@@ -347,9 +331,7 @@ export class EditEventToApproveComponent implements OnInit {
})
this.modalController.dismiss();
this.goBack();
this.close();
}
async openAttendees() {
version/git-version.ts
+6 -6
View File
@@ -1,12 +1,12 @@
export let versionData = {
"shortSHA": "2e88ed290",
"SHA": "2e88ed2902f0acd0958bc1075bddc28ef60b2edd",
"shortSHA": "9470de530",
"SHA": "9470de5307453466d052581c315d4283d921d3be",
"branch": "feature/gabinete-search",
"lastCommitAuthor": "'Eudes Inácio'",
"lastCommitTime": "'Wed Jun 7 16:18:36 2023 +0100'",
"lastCommitMessage": "envirement change to oapr",
"lastCommitNumber": "4960",
"lastCommitTime": "'Thu Jun 8 16:04:00 2023 +0100'",
"lastCommitMessage": "chnages and changes",
"lastCommitNumber": "4963",
"change": "",
"changeStatus": "On branch feature/gabinete-search\nYour branch and 'origin/feature/gabinete-search' have diverged,\nand have 9 and 2 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: .gitignore\n\tnew file: cypress.config.js\n\tnew file: cypress/.gitignore\n\tnew file: cypress/fixtures/example.json\n\tnew file: cypress/support/commands.js\n\tnew file: cypress/support/e2e.js\n\tmodified: jest.config.js\n\tmodified: package-lock.json\n\tmodified: package.json\n\tmodified: src/app/services/toast.service.ts\n\tmodified: src/environments/environment.ts\n\tmodified: src/environments/suport/dev.ts\n\tmodified: src/environments/suport/doneIt.ts",
"changeStatus": "On branch feature/gabinete-search\nYour branch and 'origin/feature/gabinete-search' have diverged,\nand have 10 and 4 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/event-actions-popover/event-actions-popover.page.ts\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts\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/shared/agenda/event-list/event-list.page.ts\n\tmodified: src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts",
"changeAuthor": "eudes.inacio"
}