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

merge made with peter branch

Browse Source
This commit is contained in:
Eudes Inácio
2024-06-18 12:26:54 +01:00
parent 4cf2b5254d 869d403f4e
commit b3ff124cfb
33 changed files with 438 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/agenda/agenda.page.ts
+2 -3
View File
@@ -700,8 +700,6 @@ export class AgendaPage implements OnInit {
} catch (error) {}
console.log('selectedCalendarIds', selectedCalendarIds)
let load = 0;
for (const selectedCalendar of selectedCalendarIds) {
@@ -713,7 +711,7 @@ export class AgendaPage implements OnInit {
calendarOwnerName: selectedCalendar.wxFullName,
endDate: endTime.toISOString(),
startDate: startTime.toISOString(),
status: EEventFilterStatus.Approved
status: EEventFilterStatus.AllToCommunicate
}, tracing)
if(response.isOk()) {
@@ -748,6 +746,7 @@ export class AgendaPage implements OnInit {
if(!isHttpError(response.error)) {
this.toastService._badRequest('Pedimos desculpa mas não foi possível executar a acção. Por favor, contacte o apoio técnico. #1')
console.log(response.error)
}
tracing.setAttribute('outcome', 'failed')
src/app/pages/agenda/view-event/view-event.page.html
+1 -1
View File
@@ -96,7 +96,7 @@
<ion-label class="width-100 d-flex " (click)="docIndex(i);LoadDocumentDetails()">
<p class="flex-grow-1" >
<span class="attach-title-item d-block">{{attach.SourceName || attach.subject || attach.sourceName || 'Sem título'}}</span>
<span class="span-left d-block">{{attach.Stakeholders}}</span>
</p>
src/app/pages/agenda/view-event/view-event.page.ts
+43 -23
View File
@@ -20,6 +20,8 @@ import { HttpErrorHandle } from 'src/app/services/http-error-handle.service'
import { AttachmentsService } from 'src/app/services/attachments.service';
import { DateService } from 'src/app/services/date.service';
import { AgendaDataRepositoryService } from 'src/app/services/Repositorys/Agenda/agenda-data-repository.service';
import { TracingType, XTracerAsync } from 'src/app/services/monitoring/opentelemetry/tracer';
import { isHttpError } from 'src/app/services/http.service';
@Component({
selector: 'app-view-event',
@@ -189,33 +191,51 @@ export class ViewEventPage implements OnInit {
this.TimeZoneString = this.loadedEvent.TimeZone
}
async loadEvent() {
@XTracerAsync({name:'ViewEventPage/loadEvent', log: false, bugPrint: true})
async loadEvent(tracing?: TracingType) {
const loader = this.toastService.loading();
let res = await this.agendaDataRepository.getEventById(this.eventId)
let res = await this.agendaDataRepository.getEventById(this.eventId, tracing)
if (res.isOk()) {
tracing.setAttribute('outcome', 'success')
console.log('Loaded Event', res.value)
loader.remove()
/* let changeDate = this.dateService.fixDate(res.value as any) as any */
this.loadedEvent = res.value as any;
this.setTimeZone()
} else {
this.httpErrorHandle.httpStatusHandle(res.error)
loader.remove()
this.toastService.badRequest('Este evento já não existe na sua agenda')
tracing.setAttribute('eventId', this.eventId)
if(!isHttpError(res.error)) {
this.toastService._badRequest('Pedimos desculpa mas não foi possível executar a acção. Por favor, contacte o apoio técnico. #13')
console.log(res.error)
} else if (isHttpError(res.error)) {
if(res.error.status == 404) {
this.toastService._badRequest('Este evento já não existe')
} else {
this.httpErrorHandle.httpStatusHandle(res.error)
}
}
tracing.setAttribute('outcome', 'failed')
tracing.bugFlag()
// this.toastService.badRequest('Este evento já não existe na sua agenda')
this.RouteService.goBack();
}
loader.remove()
}
/* loadEvent1() {
if(this.sesseionStora.user.Profile == 'MDGPR' || this.sesseionStora.user.Profile == 'PR') {
this.eventsService.getEvent(this.eventId).subscribe(res => {
res = this.dateService.fixDate(res as any)
this.loadedEvent = res;
this.setTimeZone()
@@ -223,22 +243,22 @@ export class ViewEventPage implements OnInit {
}, (error) => {
});
} else {
if(this.CalendarId) {
this.eventsService.genericGetEvent(this.eventId, this.CalendarId).subscribe(res => {
res = this.dateService.fixDate(res as any)
this.loadedEvent = res;
this.setTimeZone()
}, (error) => {
});
}
}
} */
deleteYesOrNo() {
@@ -264,7 +284,7 @@ export class ViewEventPage implements OnInit {
} else {
this.deleteEvent(false);
}
}
},
{
@@ -299,7 +319,7 @@ export class ViewEventPage implements OnInit {
res.present();
});
}
}
deleteEvent(deleteAll) {
@@ -337,7 +357,7 @@ export class ViewEventPage implements OnInit {
header: 'Evento removido',
buttons: ['OK']
});
setTimeout(() => {
alert.dismiss();
}, 1500);
@@ -347,16 +367,16 @@ export class ViewEventPage implements OnInit {
() => {
loader.remove();
});
} else {
this.eventsService.genericDeleteEvent(this.loadedEvent.EventId, 0, this.loadedEvent.CalendarName, this.loadedEvent.CalendarId).subscribe(async () => {
const alert = await this.alertController.create({
cssClass: 'my-custom-class',
header: 'Evento removido',
buttons: ['OK']
});
setTimeout(() => {
alert.dismiss();
}, 1500);
@@ -368,8 +388,8 @@ export class ViewEventPage implements OnInit {
() => {
loader.remove();
});
} */
}
src/app/pages/events/events.page.ts
+3 -1
View File
@@ -16,6 +16,7 @@ import { ChangeProfileService } from 'src/app/services/change-profile.service';
import { SessionStore } from 'src/app/store/session.service';
import { TaskService } from 'src/app/services/task.service';
import { AgendaDataRepositoryService } from 'src/app/services/Repositorys/Agenda/agenda-data-repository.service';
import { EEventFilterStatus } from 'src/app/services/Repositorys/Agenda/model/enums';
@Component({
selector: 'app-events',
@@ -237,7 +238,8 @@ export class EventsPage implements OnInit {
userId: SessionStore.user.UserId,
calendarOwnerName: SessionStore.user.FullName,
startDate: date.toISOString(),
endDate: new Date(end).toISOString()
endDate: new Date(end).toISOString(),
status: EEventFilterStatus.AllToCommunicate
})
if(response.isOk()) {
src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts
+29 -6
View File
@@ -17,6 +17,9 @@ import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
import { TaskService } from 'src/app/services/task.service';
import { AttachmentsService } from 'src/app/services/attachments.service';
import { AgendaDataRepositoryService } from 'src/app/services/Repositorys/Agenda/agenda-data-repository.service';
import { TracingType, XTracerAsync } from 'src/app/services/monitoring/opentelemetry/tracer';
import { isHttpError } from 'src/app/services/http.service';
import { EventsService } from 'src/app/services/events.service';
@Component({
selector: 'app-approve-event',
@@ -59,7 +62,8 @@ export class ApproveEventPage implements OnInit {
private httpErrorHandle: HttpErrorHandle,
public TaskService: TaskService,
private attachmentsService: AttachmentsService,
public AgendaDataRepositoryService: AgendaDataRepositoryService
public AgendaDataRepositoryService: AgendaDataRepositoryService,
public EventsService: EventsService
) {
this.activatedRoute.paramMap.subscribe(params => {
//
@@ -95,19 +99,38 @@ export class ApproveEventPage implements OnInit {
}
async getTask() {
@XTracerAsync({name:'ApproveEventPage/getTask', log: false, bugPrint: true})
async getTask(tracing?: TracingType) {
const res = await this.AgendaDataRepositoryService.getEventToApproveById(this.serialNumber)
console.log(res)
const res = await this.AgendaDataRepositoryService.getEventToApproveById(this.serialNumber, tracing)
if (res.isOk()) {
this.loadedEvent = res.value;
this.today = new Date(res.value.workflowInstanceDataFields.StartDate);
//
this.customDate = this.days[this.today.getDay()] + ", " + this.today.getDate() + " de " + (this.months[this.today.getMonth()]);
this.loadedAttachments = res.value.Attachments
} else {
console.log(res.error.status)
tracing.setAttribute('outcome', 'success')
} else if(isHttpError(res.error)) {
tracing.setAttribute('eventId', this.serialNumber)
if(res.error.status == 404) {
this.toastService._badRequest('Este evento já não existe')
} else {
this.httpErrorHandle.httpStatusHandle(res.error)
}
tracing.setAttribute('outcome', 'failed')
tracing.bugFlag()
this.httpErrorHandle.httpStatusHandle(res.error)
} else if(!isHttpError(res.error)) {
tracing.setAttribute('outcome', 'failed')
tracing.bugFlag()
this.toastService._badRequest('Pedimos desculpa mas não foi possível executar a acção. Por favor, contacte o apoio técnico. #12')
}
}
src/app/pages/gabinete-digital/event-list/event-list.page.ts
+1 -1
View File
@@ -243,7 +243,7 @@ export class EventListPage implements OnInit {
let allEvents = await this.AgendaDataRepositoryService.eventToApproveList({
userId,
status: EEventFilterStatus.Pending
})
}, tracing)
if(allEvents.isOk()) {
tracing.setAttribute('outcome', 'success')