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

improve

Browse Source
This commit is contained in:
Peter Maquiran
2022-06-03 16:53:50 +01:00
parent 7430bf7fe1
commit ee370f7e2e
29 changed files with 175 additions and 404 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/shared/agenda/approve-event/approve-event.page.html
+10 -26
View File
@@ -1,20 +1,5 @@
<!-- <ion-header hidden class="ion-no-border px-20">
<div class="header-content d-flex justify-space-between">
<div class="header-icon-left">
<ion-icon (click)="close()" src="assets/images/icons-arrow-arrow-left.svg"></ion-icon>
</div>
<div class="header-title flex-grow-1">
<label>{{loadedEvent.workflowInstanceDataFields.Subject}}</label>
</div>
<div class="header-icon-right display-none-{{showAside}}">
<ion-icon (click)="notImplemented()" src="assets/images/icons-edit.svg"></ion-icon>
</div>
</div>
</ion-header> -->
<ion-content id="main-content">
<div class="main-content d-flex flex-column height-100" *ngIf="loadedEvent">
<div class="pl-20 pr-20 text-center d-flex justify-center align-center" style="width:100%; height: 30px; background-color: var(--Event-approve-header-color); border-top-right-radius: 25px;">
@@ -121,30 +106,29 @@
</ion-item>
</ion-list>
</div>
</div>
</div>
<div *ngIf="showAside" class="aside-right flex-column height-100 cursor-pointer">
<div class="aside-buttons">
<button hidden full class="btn-ok" shape="round" >Editar evento</button>
<button (click)="approveTask(loadedEvent.serialNumber)" full class="btn-ok" shape="round" >Aprovar</button>
<button (click)="emendTask(loadedEvent.serialNumber)" class="btn-cancel" shape="round" >Rever</button>
<button full class="btn-ok" shape="round" >Editar evento</button>
<button (click)="approveTask(loadedEvent.serialNumber)" full class="btn-ok" shape="round" >Aprovar</button>
<button (click)="emendTask(loadedEvent.serialNumber)" class="btn-cancel" shape="round" >Rever</button>
<div class="solid"></div>
<button full class="btn-cancel" shape="round" (click)="editar(loadedEvent.serialNumber)" >Editar</button>
<button (click)="rejectTask(loadedEvent.serialNumber)" full class="btn-delete" shape="round" >Rejeitar</button>
<button full class="btn-cancel" shape="round" (click)="editar(loadedEvent.serialNumber)" >Editar</button>
<button (click)="rejectTask(loadedEvent.serialNumber)" full class="btn-delete" shape="round" >Rejeitar</button>
</div>
</div>
</div>
</div>
</ion-content>
<ion-footer class="display-none-{{showAside}} ion-no-border">
<div class="buttons">
<button class="btn-cancel" shape="round" (click)="emendTask(loadedEvent.serialNumber)">Rever</button>
<button class="btn-ok" shape="round" (click)="approveTask(loadedEvent.serialNumber)">Aprovar</button>
<button *ngIf="loadedEvent.activityInstanceName != 'Editar Evento'" class="btn-cancel" shape="round" (click)="emendTask(loadedEvent.serialNumber)">Rever</button>
<button *ngIf="loadedEvent.activityInstanceName != 'Editar Evento'" class="btn-ok" shape="round" (click)="approveTask(loadedEvent.serialNumber)">Aprovar</button>
<button *ngIf="loadedEvent.activityInstanceName == 'Editar Evento'" full class="btn-cancel" shape="round" (click)="editar(loadedEvent.serialNumber)" >Editar</button>
<button *ngIf="loadedEvent.activityInstanceName == 'Editar Evento'" full class="btn-delete" shape="round" (click)="rejectTask(loadedEvent.serialNumber)" >Rejeitar</button>
</div>
</ion-footer>
src/app/shared/agenda/approve-event/approve-event.page.ts
+9 -34
View File
@@ -40,9 +40,9 @@ export class ApproveEventPage implements OnInit {
@Output() EditApproveEventDismiss = new EventEmitter<any>();
constructor(
private router:Router,
private router: Router,
private modalController: ModalController,
private processes:ProcessesService,
private processes: ProcessesService,
private attachmentsService: AttachmentsService,
private popoverController: PopoverController,
private toastService: ToastService,
@@ -61,24 +61,8 @@ export class ApproveEventPage implements OnInit {
this.getAttachments();
}
/* ngOnChanges() {
this.getTask();
this.getAttachments();
setTimeout(()=>{
this.getTask();
this.getAttachments();
}, 6000)
setTimeout(()=>{
this.getTask();
this.getAttachments();
}, 10000)
} */
close() {
/* this.router.navigate(['/home/gabinete-digital/event-list']); */
this.closeEventToApprove.emit();
this.modalController.dismiss();
}
@@ -105,20 +89,11 @@ export class ApproveEventPage implements OnInit {
this.toastService.successMessage()
} catch (error) {
this.toastService.badRequest()
} finally {
} finally {
this.close()
loader.remove()
}
/* this.approveEventDismiss.emit({
"serialNumber": serialNumber,
"action": "Aprovar",
"saveData": {
loadedEvent: this.loadedEvent,
today: this.today,
customDate: this.customDate
}
}); */
}
async rejectTask(serialNumber:string) {
@@ -171,6 +146,9 @@ export class ApproveEventPage implements OnInit {
async openOptions(ev:any) {
const popover = await this.popoverController.create({
component: EventActionsPopoverPage,
componentProps: {
activityInstanceName: this.loadedEvent.activityInstanceName
},
cssClass: 'event-actions-popover',
event: ev,
translucent: true
@@ -180,7 +158,6 @@ export class ApproveEventPage implements OnInit {
async emendTask(serialNumber:string) {
const modal = await this.modalController.create({
component: EmendMessageModalPage,
componentProps:{
@@ -195,7 +172,7 @@ export class ApproveEventPage implements OnInit {
.then( async (res) => {
if(res.data !== ''){
if(res.data !== '') {
let body = { "serialNumber": serialNumber,
"action": "Emendar",
"dataFields": {
@@ -203,7 +180,7 @@ export class ApproveEventPage implements OnInit {
}
}
const loader = this.toastService.loading()
const loader = this.toastService.loading();
try {
await this.processes.PostTaskAction(body).toPromise();
@@ -216,12 +193,10 @@ export class ApproveEventPage implements OnInit {
}
}
else{
//this.alertService.presentAlert('Operação cancelada!');
}
});
//this.openEmendMessageModal(serialNumber);
//this.goBack();
}
goToEventsToApprove() {
src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html
+1
View File
@@ -1,6 +1,7 @@
<ion-content>
<!-- Edit event for Inicio -->
<div class="main-content height-100 d-flex">
<div class="content d-flex flex-column width-md-100 height-100">
src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts
+16 -9
View File
@@ -14,6 +14,7 @@ import { NgxMatDateFormats } from '@angular-material-components/datetime-picker'
import { removeDuplicate } from 'src/plugin/removeDuplicate.js'
import { EventToApproveEdit } from 'src/app/models/event.model';
import { ThemeService } from 'src/app/services/theme.service'
import { Router } from '@angular/router';
const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
@@ -115,6 +116,7 @@ export class EditEventToApprovePage implements OnInit {
@Output() setIntervenientCC = new EventEmitter<any>();
@Output() closeComponent = new EventEmitter<any>();
@Output() closeEventToApprove = new EventEmitter<any>();
@Output() approveEventDismiss = new EventEmitter<any>();
@Input() saveData: any;
@Input() serialNumber: string
@@ -128,7 +130,8 @@ export class EditEventToApprovePage implements OnInit {
private attachmentsService: AttachmentsService,
private processes:ProcessesService,
private toastService: ToastService,
public ThemeService: ThemeService
public ThemeService: ThemeService,
private router: Router,
) {
this.isEventEdited = false;
}
@@ -175,12 +178,12 @@ export class EditEventToApprovePage implements OnInit {
});
}
onSelectedRecurringChanged(ev:any){
if(ev.length > 1){
onSelectedRecurringChanged(ev:any) {
if(ev.length > 1) {
this.eventProcess.workflowInstanceDataFields.OccurrenceType = ev.filter(data => data != '-1');
}
if(ev.length == 0){
if(ev.length == 0) {
this.eventProcess.workflowInstanceDataFields.OccurrenceType = "-1";
}
}
@@ -213,17 +216,21 @@ export class EditEventToApprovePage implements OnInit {
close() {
window['temp.path:/shared/agenda/edit-event-to-approve.ts'] = {}
// this.closeComponent.emit();
window['temp.path:/shared/agenda/edit-event-to-approve.ts'] = {};
this.closeEventToApprove.emit();
this.setIntervenient.emit([]);
this.setIntervenientCC.emit([]);
this.clearContact.emit();
//this.deleteTemporaryData();
this.approveEventDismiss.emit({
"serialNumber": this.eventProcess.serialNumber,
"action": "Aprovar",
"saveData": this.eventProcess
});
}
src/app/shared/agenda/event-list/event-list.page.html
+6 -1
View File
@@ -29,7 +29,6 @@
</ion-refresher>
<div class="main-content overflow-y-auto height-100" [ngSwitch]="segment" *ngIf="eventsMDGPRList">
<!-- <div class="header-content width-100"> -->
<!-- </div> -->
<ion-list class="width-100" *ngSwitchCase="'MDGPR'" >
<div
@@ -46,6 +45,9 @@
<p *ngIf="toDateString(event.workflowInstanceDataFields.StartDate) != toDateString(event.workflowInstanceDataFields.EndDate)">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}} | {{event.workflowInstanceDataFields.Location}}</p>
<p *ngIf="toDateString(event.workflowInstanceDataFields.StartDate) == toDateString(event.workflowInstanceDataFields.EndDate)">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} | {{event.workflowInstanceDataFields.Location}}</p>
<h3>{{event.workflowInstanceDataFields.Subject}}</h3>
<div *ngIf="event.activityInstanceName">
<div class="label-event-type"> {{ event.activityInstanceName }} </div>
</div>
</div>
</div>
</div>
@@ -66,6 +68,9 @@
<p *ngIf="toDateString(event.workflowInstanceDataFields.StartDate) != toDateString(event.workflowInstanceDataFields.EndDate)">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}} | {{event.workflowInstanceDataFields.Location}}</p>
<p *ngIf="toDateString(event.workflowInstanceDataFields.StartDate) == toDateString(event.workflowInstanceDataFields.EndDate)">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} | {{event.workflowInstanceDataFields.Location}}</p>
<h3>{{event.workflowInstanceDataFields.Subject}}</h3>
<div *ngIf="event.activityInstanceName">
<div class="label-event-type"> {{ event.activityInstanceName }} </div>
</div>
</div>
</div>
</div>
src/app/shared/agenda/event-list/event-list.page.scss
+10
View File
@@ -103,3 +103,13 @@
padding: 0;
}
}
.label-event-type {
padding: 1px 7px;
display: inline-block;
background: #f05d5e;
border-radius: 17px;
color: white;
font-size: 10pt;
}
src/app/shared/agenda/event-list/event-list.page.ts
+3 -3
View File
@@ -73,7 +73,7 @@ export class EventListPage implements OnInit {
let mdEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal MDGPR', false).toPromise();
let allEvents = mdEventsOficial.concat(mdEventsPessoal);
if(allEvents.length > 0){
if(allEvents.length > 0) {
this.eventsMDGPRList = this.sortService.sortArrayByDate(allEvents).reverse();
}
this.showLoader = false;
@@ -83,7 +83,7 @@ export class EventListPage implements OnInit {
let prEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal PR', false).toPromise();
let allEvents = prEventsOficial.concat(prEventsPessoal);
if(allEvents.length > 0){
if(allEvents.length > 0) {
this.eventsPRList = this.sortService.sortArrayByDate(allEvents).reverse();
}
this.showLoader = false;
@@ -93,7 +93,7 @@ export class EventListPage implements OnInit {
async openApproveModal(eventSerialNumber, data) {
let a = this.eventsMDGPRList.filter((elem)=>{
let a = this.eventsMDGPRList.filter((elem) => {
//
return eventSerialNumber == elem.serialNumber
});
src/app/shared/chat/messages/messages.page.ts
+2 -17
View File
@@ -428,7 +428,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
deleteMessage(msgId: string, msg: MessageService) {
this.wsChatMethodsService.getDmRoom(this.roomId).sendDeleteRequest(msgId)
if (msg.file.type == "application/webtrix") {
this.openViewDocumentModal(msg.file);
// this.openViewDocumentModal(msg.file);
}
else {
@@ -436,17 +436,12 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
str = str.substring(1, ((str.length) - 1));
const encodedData = btoa(str);
/* let fullUrl;
fullUrl = "https://gabinetedigitalchat.dyndns.info" + url;
//fullUrl = "http://www.africau.edu/images/default/sample.pdf";
this.frameUrl = fullUrl; */
let file = this.base64toBlob(encodedData, 'application/pdf')
let fileURL = URL.createObjectURL(file)
window.open(fileURL);
// this.chatService.getDocumentDetails(fullUrl);
}
}
@@ -630,9 +625,6 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
resultType: CameraResultType.Base64,
source: CameraSource.Camera
});
//const imageData = await this.fileToBase64Service.convert(file)
//
const response = await fetch('data:image/jpeg;base64,' + file.base64String!);
const blob = await response.blob();
@@ -780,13 +772,6 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
const roomId = this.roomId
const file: any = await this.fileService.getFileFromDevice(types);
//if (file.type == "application/pdf") {
/* const imageData = await this.fileToBase64Service.convert(file).then((filee) => {
}) */
if (file.type != "application/img" && file.type != "image/png" && file.type != "image/jpeg" && file.type != "image/gif") {
src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html
+1 -1
View File
@@ -8,7 +8,7 @@
<ion-header>
<div class="title-content">
<div class="middle">
<ion-label class="title">Editar evento por aprovar</ion-label>
<ion-label class="title">Editar evento por aprovar ,.,.,.,.,..,.,</ion-label>
</div>
</div>
</ion-header>
src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts
+1
View File
@@ -217,6 +217,7 @@ export class EditEventToApproveComponent implements OnInit {
close() {
this.modalController.dismiss();
}
src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
-32
View File
@@ -123,38 +123,6 @@ export class EventsToApprovePage implements OnInit {
this.router.navigate(['/home/gabinete-digital/event-list/approve-event',event.serialNumber, 'gabinete-digital'])
}
/* async openApproveModal(eventToAprove) {
let classs;
if( window.innerWidth <= 800){
classs = 'modal modal-desktop'
} else {
classs = 'modal modal-desktop showAsideOptions'
}
let InstanceId;
if(!eventToAprove.workflowInstanceDataFields.hasOwnProperty('InstanceId')){
InstanceId = ''
} else {
InstanceId =eventToAprove.workflowInstanceDataFields.InstanceId
}
const modal = await this.modalController.create({
component: ApproveEventPage,
componentProps:{
serialNumber: eventToAprove.serialNumber,
InstanceId: InstanceId ,
showAside: true,
},
cssClass: classs,
});
await modal.present();
modal.onDidDismiss().then((res) => {
this.LoadToApproveEvents();
});
} */
doRefresh() {