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 add task from event attachment

Browse Source
This commit is contained in:
Peter Maquiran
2021-04-27 09:56:14 +01:00
parent 983f5bf385
commit 12dff45a9c
3 changed files with 88 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/gabinete-digital/gabinete-digital.page.scss
+35 -2
View File
@@ -339,9 +339,42 @@ ion-content{
.active {
color: white !important;
fill: white !important;
background: #42b9fe !important;
box-sizing: border-box;
.exp-card-title {
color: white !important;
color: rgb(255, 255, 255) !important;
}
}
svg path::part(native) {
color: white !important;
fill: white !important;
}
svg path::part(button):hover {
color: white !important;
fill: rgb(255, 255, 255) !important;
}
svg{
path{
fill: rgb(255, 255, 255) !important
}
}
}
.active ion-icon::part(button) {
color: white !important;
fill: rgb(255, 255, 255) !important;
}
.active ion-icon::part(native) {
color: white !important;
fill: rgb(255, 255, 255) !important;
}
.active ion-icon{
color: white !important;
fill: red !important;
}
src/app/shared/agenda/view-event/view-event.page.html
+22 -23
View File
@@ -6,34 +6,26 @@
</ion-header>
<ion-content>
<ion-list>
<ion-item *ngIf="loadedAttachments.length >=1" (click)="openExpedientActionsModal('0',fulltask)">
<ion-item (click)="openExpedientActionsModal('0',fulltask)">
<ion-icon name="documents" slot="start"></ion-icon>
<ion-label>Efectuar Despacho</ion-label>
</ion-item>
<ion-item *ngIf="loadedAttachments.length >=1" (click)="openExpedientActionsModal('1',fulltask)">
<ion-item (click)="openExpedientActionsModal('1',fulltask)">
<ion-icon name="arrow-undo" slot="start"></ion-icon>
<ion-label>Pedido de Parecer</ion-label>
</ion-item>
<ion-item *ngIf="loadedAttachments.length >=1" (click)="openExpedientActionsModal('2',fulltask)">
<ion-item (click)="openExpedientActionsModal('2',fulltask)">
<ion-icon name="arrow-redo" slot="start"></ion-icon>
<ion-label>Pedido de Deferimento</ion-label>
</ion-item>
<ion-item *ngIf="loadedAttachments.length >=1" (click)="openBookMeetingModal(task)">
<ion-item (click)="openBookMeetingModal(task)">
<ion-icon name="calendar" slot="start"></ion-icon>
<ion-label>Marcar reunião</ion-label>
</ion-item>
<ion-item (click)="deleteEvent()">
<!-- <ion-item (click)="deleteEvent()">
<ion-icon name="trash" slot="start"></ion-icon>
<ion-label>Descartar</ion-label>
</ion-item>
<ion-item (click)="editEvent()">
<ion-icon name="create-outline" slot="start"></ion-icon>
<ion-label>Editar</ion-label>
</ion-item>
<ion-item *ngIf="loadedAttachments.lenght >=1" hidden disabled>
<ion-icon name="paper-plane" slot="start"></ion-icon>
<ion-label>Enviar para pendentes</ion-label>
</ion-item>
</ion-item> -->
</ion-list>
</ion-content>
</ion-menu>
@@ -54,7 +46,7 @@
<ion-label class="title">{{loadedEvent.Subject}}</ion-label>
</div>
<div class="div-icon d-none">
<div class="div-icon">
<button class="btn-no-color" (click)="editEvent()">
<ion-icon class="edit" slot="end" src="assets/images/icons-edit.svg" ></ion-icon>
</button>
@@ -64,10 +56,6 @@
</div>
<ion-menu-button style="width: 35px; height: 41px;" autoHide="false">
<ion-icon name="ellipsis-vertical-outline"></ion-icon>
</ion-menu-button>
</div>
</div>
</ion-toolbar>
@@ -112,10 +100,21 @@
<div *ngIf="loadedAttachments" class="bottom-content width-100">
<h5>Documentos Anexados</h5>
<ion-list class="width-100">
<ion-item *ngFor="let attach of loadedAttachments" class="width-100" lines="none" class="ion-no-margin ion-no-padding">
<ion-label class="width-100" (click)="viewDocument(attach.SourceId)">
<p class="attach-title-item">{{attach.SourceName}}</p>
<p><span class="span-left">{{attach.Stakeholders}}</span><span class="span-right">{{ attach.CreateDate | date: 'dd-MM-yy' }}</span></p>
<ion-item *ngFor="let attach of loadedAttachments; let i = index" class="width-100" lines="none" class="ion-no-margin ion-no-padding">
<ion-label class="width-100 d-flex " >
<div class="flex-grow-1" (click)="viewDocument(attach.SourceId)">
<p class="attach-title-item">{{attach.SourceName}}</p>
<span class="span-left">{{attach.Stakeholders}}</span>
</div>
<div class="d-flex align-end">
<span class="span-right">{{ attach.CreateDate | date: 'dd-MM-yy' }}</span>
</div>
<ion-menu-button (click)="docIndex(i)" style="width: 35px; height: 41px;" autoHide="false">
<ion-icon name="ellipsis-vertical-outline"></ion-icon>
</ion-menu-button>
</ion-label>
</ion-item>
</ion-list>
src/app/shared/agenda/view-event/view-event.page.ts
+31 -27
View File
@@ -35,6 +35,7 @@ export class ViewEventPage implements OnInit {
days = ["Domingo", "Segunda-feira", "Terça-feira", "Quarta-feira", "Quinta-feira", "Sexta-feira", "Sábado"];
documents: Attachment[] = [];
dicIndex = 0;
@Input() profile:string;
@Input() eventId: string;
@@ -68,6 +69,10 @@ export class ViewEventPage implements OnInit {
this.loadEvent();
}
docIndex(index: number) {
this.dicIndex = index;
}
close(){
console.log(this.isEventEdited);
@@ -135,19 +140,19 @@ export class ViewEventPage implements OnInit {
classs = 'modal modal-desktop showAsideOptions'
}
this.loadedAttachments.forEach((attachment)=>{
task = {
serialNumber: attachment.SourceId,
taskStartDate: attachment.CreateDate,
isEvent: true,
workflowInstanceDataFields: {
FsId: attachment.ApplicationId,
FolderID: null,
DocId: attachment.SourceId,
Subject: attachment.SourceName
},
}
});
const doc = this.loadedAttachments[ this.dicIndex];
task = {
serialNumber: doc.SourceId,
taskStartDate: doc.CreateDate,
isEvent: true,
workflowInstanceDataFields: {
FsId: doc.ApplicationId,
FolderID: null,
DocId: doc.SourceId,
Subject: doc.SourceName
},
}
const modal = await this.modalController.create({
component: ExpedientTaskModalPage,
@@ -171,22 +176,21 @@ export class ViewEventPage implements OnInit {
});
}
async openBookMeetingModal(task: any) {
this.loadedAttachments.forEach((attachment)=>{
task = {
serialNumber: attachment.SourceId,
taskStartDate: attachment.CreateDate,
isEvent: true,
workflowInstanceDataFields: {
FsId: attachment.ApplicationId,
FolderID: null,
DocId: attachment.SourceId,
Subject: attachment.SourceName
},
}
});
const doc = this.loadedAttachments[ this.dicIndex];
task = {
serialNumber: doc.SourceId,
taskStartDate: doc.CreateDate,
isEvent: true,
workflowInstanceDataFields: {
FsId: doc.ApplicationId,
FolderID: null,
DocId: doc.SourceId,
Subject: doc.SourceName
},
}
let classs;
if( window.innerWidth <= 800){