mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-18 20:47:54 +00:00
View documents of event to aprove
This commit is contained in:
Peter Maquiran
@@ -149,7 +149,7 @@
|
||||
</ion-list>
|
||||
</ion-item>
|
||||
</div>
|
||||
<div class="add-people" (click)="addParticipants();showAttendees=true">
|
||||
<div class="add-people cursor-pointer" (click)="addParticipants();showAttendees=true">
|
||||
<ion-icon slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
|
||||
</div>
|
||||
</div>
|
||||
@@ -170,14 +170,14 @@
|
||||
</ion-list>
|
||||
</ion-item>
|
||||
</div>
|
||||
<div class="add-people" (click)="addParticipantsCC();showAttendees=true">
|
||||
<div class="add-people cursor-pointer" (click)="addParticipantsCC();showAttendees=true">
|
||||
<ion-icon slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div (click)="getDoc()" class="d-flex container-div width-100 ion-item-container-no-border" >
|
||||
<div (click)="getDoc()" class="cursor-pointer d-flex container-div width-100 ion-item-container-no-border" >
|
||||
<ion-label>
|
||||
<div class="attach-icon">
|
||||
<ion-icon src="assets/images/icons-attach-doc.svg"></ion-icon>
|
||||
@@ -230,7 +230,7 @@
|
||||
|
||||
<ion-footer class="background-whit">
|
||||
<div class="buttons">
|
||||
<button class="btn-cancel" shape="round" (click)="close()">Cancelar</button>
|
||||
<button class="btn-ok" shape="round" (click)="save()">Gravar</button>
|
||||
<button class="btn-cancel cursor-pointer" shape="round" (click)="close()">Cancelar</button>
|
||||
<button class="btn-ok cursor-pointer" shape="round" (click)="save()">Gravar</button>
|
||||
</div>
|
||||
</ion-footer>
|
||||
@@ -1,7 +1,7 @@
|
||||
<ion-header class="ion-no-border">
|
||||
<div class="header-content">
|
||||
<div class="header-icon-left">
|
||||
<button class="btn-no-color" (click)="close()">
|
||||
<button class="btn-no-color cursor-pointer" (click)="close()">
|
||||
<ion-icon src="assets/images/icons-arrow-arrow-left.svg"></ion-icon>
|
||||
</button>
|
||||
</div>
|
||||
@@ -18,7 +18,7 @@
|
||||
</ion-content>
|
||||
<ion-footer>
|
||||
<div class="buttons width-100">
|
||||
<button class="btn-delete" shape="round" (click)="close()">Cancelar</button>
|
||||
<button class="btn-ok" shape="round" (click)="save()">Gravar</button>
|
||||
<button class="btn-delete cursor-pointer" shape="round" (click)="close()">Cancelar</button>
|
||||
<button class="btn-ok cursor-pointer" shape="round" (click)="save()">Gravar</button>
|
||||
</div>
|
||||
</ion-footer>
|
||||
|
||||
@@ -1,15 +1,15 @@
|
||||
<ion-list>
|
||||
<ion-item>
|
||||
<p>
|
||||
<ion-button class="button-edit-event" shape="round" (click)="emendarTask()">Adicionar Nota</ion-button>
|
||||
<ion-button class="button-edit-event cursor-pointer" shape="round" (click)="emendarTask()">Adicionar Nota</ion-button>
|
||||
</p>
|
||||
<p>
|
||||
<ion-button class="button-approve" shape="round" (click)="approveTask()">Aprovar</ion-button>
|
||||
<ion-button class="button-approve cursor-pointer" shape="round" (click)="approveTask()">Aprovar</ion-button>
|
||||
</p>
|
||||
</ion-item>
|
||||
<ion-item lines="none">
|
||||
<p>
|
||||
<ion-button class="button-discart-event" shape="round" (click)="deleteTask()">Rejeitar</ion-button>
|
||||
<ion-button class="button-discart-event cursor-pointer" shape="round" (click)="deleteTask()">Rejeitar</ion-button>
|
||||
</p>
|
||||
</ion-item>
|
||||
</ion-list>
|
||||
|
||||
@@ -144,7 +144,7 @@
|
||||
</ion-list>
|
||||
</ion-item>
|
||||
</div>
|
||||
<div (click)="addParticipants()" class="add-people">
|
||||
<div (click)="addParticipants()" class="add-people cursor-pointer">
|
||||
<ion-icon slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
|
||||
</div>
|
||||
</div>
|
||||
@@ -174,7 +174,7 @@
|
||||
</ion-list>
|
||||
</ion-item>
|
||||
</div>
|
||||
<div (click)="addParticipantsCC()" class="add-people">
|
||||
<div (click)="addParticipantsCC()" class="add-people cursor-pointer">
|
||||
<ion-icon slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
|
||||
</div>
|
||||
</div>
|
||||
@@ -194,7 +194,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="ion-item-container-no-border" (click)="getDoc()">
|
||||
<div class="ion-item-container-no-border cursor-pointer" (click)="getDoc()">
|
||||
<ion-label>
|
||||
<div class="attach-icon">
|
||||
<ion-icon src="assets/images/icons-attach-doc.svg"></ion-icon>
|
||||
@@ -212,7 +212,7 @@
|
||||
<p class="d-flex ion-justify-content-between">
|
||||
<span class="attach-title-item">{{document.Assunto}}</span>
|
||||
<span class="app-name">{{document.appName}}</span>
|
||||
<span class="close-button text-black" (click)="removeAttachment(i)" >
|
||||
<span class="close-button text-black cursor-pointer" (click)="removeAttachment(i)" >
|
||||
<ion-icon class="font-20" src="assets/images/icons-delete-25.svg"></ion-icon>
|
||||
</span>
|
||||
</p>
|
||||
@@ -226,13 +226,13 @@
|
||||
<ion-footer class="ion-no-border d-flex justify-center px-20">
|
||||
<ion-toolbar class=" ">
|
||||
<ion-buttons slot="start">
|
||||
<ion-button class="btn-cancel" fill="clear" color="#061b52" (click)="close()">
|
||||
<ion-button class="btn-cancel cursor-pointer" fill="clear" color="#061b52" (click)="close()">
|
||||
<ion-label>Cancelar</ion-label>
|
||||
</ion-button>
|
||||
</ion-buttons>
|
||||
<ion-title></ion-title>
|
||||
<ion-buttons slot="end">
|
||||
<ion-button class="btn-ok" fill="clear" color="#fff" (click)="save()">
|
||||
<ion-button class="btn-ok cursor-pointer" fill="clear" color="#fff" (click)="save()">
|
||||
<ion-label>Gravar</ion-label>
|
||||
</ion-button>
|
||||
</ion-buttons>
|
||||
|
||||
@@ -99,7 +99,7 @@
|
||||
*ngFor="let attach of loadedAttachments"
|
||||
(click)="viewDocument(attach.SourceId)">
|
||||
<ion-label>
|
||||
<p class="attach-title-item d-block">{{attach.SourceName}}</p>
|
||||
<p class="attach-title-item d">{{attach.SourceName}}</p>
|
||||
<p><span class="span-left">{{attach.Stakeholders}}</span><span class="span-right">{{ attach.CreateDate | date: 'dd-MM-yy' }}</span></p>
|
||||
</ion-label>
|
||||
</ion-item>
|
||||
|
||||
@@ -56,7 +56,7 @@
|
||||
</div>
|
||||
<div class="content">
|
||||
<ion-list>
|
||||
<ion-item lines="none" *ngFor="let event of eventsList"
|
||||
<ion-item class="cursor-pointer" lines="none" *ngFor="let event of eventsList"
|
||||
(click)="viewEventDetail(event.EventId)"
|
||||
>
|
||||
<div class="d-flex content-{{profile}}-{{event.CalendarName}}">
|
||||
@@ -90,13 +90,13 @@
|
||||
<ion-icon class="icon" slot="end" src="assets/images/icons-correspondencias.svg"></ion-icon>
|
||||
<div class="text">Correspondência por ler</div>
|
||||
</div>
|
||||
<button class="btn-no-color" (click)="viewExpedientListPage()">
|
||||
<button class="btn-no-color cursor-pointer" (click)="viewExpedientListPage()">
|
||||
<ion-icon class="icon-next" slot="end" src="assets/images/icons-arrow-circle-arrow-right.svg"></ion-icon>
|
||||
</button>
|
||||
</div>
|
||||
<div class="content">
|
||||
<ion-list>
|
||||
<ion-item lines="none" *ngFor = "let task of expedientList"
|
||||
<ion-item class="cursor-pointer" lines="none" *ngFor = "let task of expedientList"
|
||||
(click)="viewExpedientDetail(task.serialNumber)">
|
||||
<div class="item-exp d-flex">
|
||||
<div class="schedule-date">
|
||||
|
||||
@@ -112,7 +112,7 @@ export class DespachoPage implements OnInit {
|
||||
});
|
||||
}
|
||||
|
||||
getDocumentDetails(forlderId:string, applicationId:string){
|
||||
getDocumentDetails(forlderId:string, applicationId:string) {
|
||||
this.processes.GetDocumentDetails(forlderId,applicationId).subscribe(res=>{
|
||||
this.attachments = res.Documents;
|
||||
console.log(res['Documents']);
|
||||
|
||||
+6
-6
@@ -1,14 +1,14 @@
|
||||
<ion-header class="ion-no-border">
|
||||
<div class="header-content mx-20 d-flex justify-between">
|
||||
<div class="header-icon-left">
|
||||
<button class="btn-no-color" (click)="close()">
|
||||
<button class="btn-no-color cursor-pointer" (click)="close()">
|
||||
<ion-icon src="assets/images/icons-arrow-arrow-left.svg"></ion-icon>
|
||||
</button>
|
||||
</div>
|
||||
<div class="header-title flex-grow-1">
|
||||
<label>{{loadedEvent.workflowInstanceDataFields.Subject}}</label>
|
||||
</div>
|
||||
<div class="header-icon-right">
|
||||
<div class="header-icon-right cursor-pointer">
|
||||
<ion-icon (click)="notImplemented()" src="assets/images/icons-edit.svg"></ion-icon>
|
||||
</div>
|
||||
</div>
|
||||
@@ -20,7 +20,7 @@
|
||||
</ion-toolbar>
|
||||
</ion-header>
|
||||
<ion-content>
|
||||
<ion-list>
|
||||
<ion-list class="cursor-pointer">
|
||||
<ion-item (click)="approveTask(loadedEvent.serialNumber)">
|
||||
<ion-icon name="checkmark-sharp"></ion-icon>
|
||||
<ion-label>Aprovar</ion-label>
|
||||
@@ -109,8 +109,8 @@
|
||||
</ion-toolbar> -->
|
||||
|
||||
<div class="buttons width-100">
|
||||
<button class="btn-cancel" shape="round" (click)="emendTask(loadedEvent.serialNumber)">Adicionar Nota</button>
|
||||
<button class="btn-no-color" shape="round" (click)="openMenu()"> <ion-icon name="ellipsis-vertical-outline"></ion-icon></button>
|
||||
<button class="btn-ok" shape="round" (click)="approveTask(loadedEvent.serialNumber)">Aprovar</button>
|
||||
<button class="btn-cancel cursor-pointer" shape="round" (click)="emendTask(loadedEvent.serialNumber)">Adicionar Nota</button>
|
||||
<button class="btn-no-color cursor-pointer" shape="round" (click)="openMenu()"> <ion-icon name="ellipsis-vertical-outline"></ion-icon></button>
|
||||
<button class="btn-ok cursor-pointer" shape="round" (click)="approveTask(loadedEvent.serialNumber)">Aprovar</button>
|
||||
</div>
|
||||
</ion-footer>
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
<ion-header class="ion-no-border">
|
||||
<div *ngIf="loadedEvent" class="header-content d-flex justify-between">
|
||||
<div class="header-icon-left">
|
||||
<div class="header-icon-left cursor-pointer">
|
||||
<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">
|
||||
<div class="header-icon-right cursor-pointer">
|
||||
<ion-icon (click)="notImplemented()" src="assets/images/icons-edit.svg"></ion-icon>
|
||||
</div>
|
||||
</div>
|
||||
@@ -18,7 +18,7 @@
|
||||
</ion-toolbar>
|
||||
</ion-header>
|
||||
<ion-content>
|
||||
<ion-list>
|
||||
<ion-list class="cursor-pointer">
|
||||
<ion-item (click)="approveTask(loadedEvent.serialNumber)">
|
||||
<ion-icon name="checkmark-sharp"></ion-icon>
|
||||
<ion-label>Aprovar</ion-label>
|
||||
@@ -81,7 +81,7 @@
|
||||
</div> -->
|
||||
</ion-content>
|
||||
<ion-footer>
|
||||
<ion-toolbar>
|
||||
<ion-toolbar class="cursor-pointer">
|
||||
<div class="buttons">
|
||||
<ion-item lines="none">
|
||||
<p>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<ion-header class="ion-no-border">
|
||||
<div class="header-content">
|
||||
<div class="header-icon-left">
|
||||
<button class="btn-no-color" (click)="close()">
|
||||
<button class="btn-no-color cursor-pointer" (click)="close()">
|
||||
<ion-icon src="assets/images/icons-arrow-arrow-left.svg"></ion-icon>
|
||||
</button>
|
||||
</div>
|
||||
@@ -32,7 +32,7 @@
|
||||
<div *ngIf="eventsMDGPRList">
|
||||
<ion-list>
|
||||
<ion-item-sliding>
|
||||
<ion-item class="Rectangle" lines="none"
|
||||
<ion-item class="Rectangle cursor-pointer" lines="none"
|
||||
*ngFor="let event of eventsMDGPRList" (click)="openApproveModal(event.serialNumber)">
|
||||
|
||||
<div class="content-mdgpr-{{event.workflowInstanceDataFields.Agenda}} width-100">
|
||||
@@ -54,7 +54,7 @@
|
||||
<ion-list *ngSwitchCase="'PR'">
|
||||
<div *ngIf="eventsPRList">
|
||||
<ion-item-sliding>
|
||||
<ion-item class="Rectangle" lines="none"
|
||||
<ion-item class="Rectangle cursor-pointer" lines="none"
|
||||
*ngFor="let event of eventsPRList" (click)="openApproveModal(event.serialNumber)">
|
||||
<div class="content-pr-{{event.workflowInstanceDataFields.Agenda}} width-100">
|
||||
<div class="approve-event-time">
|
||||
|
||||
@@ -99,6 +99,8 @@ ion-content{
|
||||
justify-content: center;
|
||||
|
||||
.exp-card{
|
||||
cursor: pointer;
|
||||
user-select: none;
|
||||
width: 173px;
|
||||
height: 200px;
|
||||
margin: 7px;
|
||||
@@ -115,6 +117,8 @@ ion-content{
|
||||
//justify-content: center;
|
||||
}
|
||||
.exp-card-long{
|
||||
cursor: pointer;
|
||||
user-select: none;
|
||||
background: white;
|
||||
box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07);
|
||||
background: white;
|
||||
@@ -251,6 +255,8 @@ ion-content{
|
||||
.exp-card-long{
|
||||
display: none !important;
|
||||
width: 100% !important;
|
||||
cursor: pointer;
|
||||
user-select: none;
|
||||
background: white;
|
||||
box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07);
|
||||
background: white;
|
||||
|
||||
@@ -84,17 +84,20 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div *ngIf="loadedAttachments" class="bottom-content">
|
||||
<div *ngIf="loadedAttachments" class="bottom-content width-100">
|
||||
<ion-list>
|
||||
<h3>Documentos Anexados</h3>
|
||||
<ion-item class="ion-no-margin ion-no-padding">
|
||||
<h5>Documentos Anexados</h5>
|
||||
<ion-item class="ion-no-margin ion-no-padding"
|
||||
*ngFor="let attach of loadedAttachments"
|
||||
(click)="viewDocument(attach.SourceId)">
|
||||
<ion-label>
|
||||
<p class="attach-title-item">Receita por Natureza</p>
|
||||
<p><span class="span-left">{{loadedAttachments.Remetente}}</span><span class="span-right">{{loadedAttachments.CreateDate}}<!-- {{ task.CreateDate | date: 'dd-MM-yy' }} --></span></p>
|
||||
<p class="attach-title-item d-block">{{attach.SourceName}}</p>
|
||||
<p><span class="span-left">{{attach.Stakeholders}}</span><span class="span-right">{{ attach.CreateDate | date: 'dd-MM-yy' }}</span></p>
|
||||
</ion-label>
|
||||
</ion-item>
|
||||
</ion-list>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="overflow-y-auto">
|
||||
|
||||
@@ -81,7 +81,6 @@
|
||||
}
|
||||
|
||||
.bottom-content{
|
||||
width: 360px;
|
||||
margin: 0 auto;
|
||||
|
||||
.bottom-content h3{
|
||||
|
||||
@@ -7,6 +7,7 @@ import { AttachmentsService } from 'src/app/services/attachments.service';
|
||||
import { ProcessesService } from 'src/app/services/processes.service';
|
||||
import { EmendMessageModalPage } from 'src/app/pages/agenda/emend-message-modal/emend-message-modal.page';
|
||||
import { EventActionsPopoverPage } from 'src/app/pages/agenda/event-actions-popover/event-actions-popover.page';
|
||||
import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
|
||||
|
||||
|
||||
@Component({
|
||||
@@ -27,6 +28,7 @@ export class ApproveEventComponent implements OnInit {
|
||||
days = ["Domingo", "Segunda-feira", "Terça-feira", "Quarta-feira", "Quinta-feira", "Sexta-feira", "Sábado"];
|
||||
|
||||
@Input() serialNumber:string;
|
||||
@Input() InstanceId:string;
|
||||
@Input() showAside:boolean;
|
||||
|
||||
@Output() approveEventDismiss = new EventEmitter<any>();
|
||||
@@ -40,8 +42,11 @@ export class ApproveEventComponent implements OnInit {
|
||||
private attachmentsService: AttachmentsService,
|
||||
private popoverController: PopoverController,
|
||||
private menu: MenuController,
|
||||
private alertService: AlertService
|
||||
) { }
|
||||
private alertService: AlertService,
|
||||
private iab: InAppBrowser
|
||||
) {
|
||||
// $$$
|
||||
}
|
||||
|
||||
ngOnInit() {
|
||||
this.getTask();
|
||||
@@ -102,10 +107,20 @@ export class ApproveEventComponent implements OnInit {
|
||||
this.modalController.dismiss(null);
|
||||
}
|
||||
|
||||
getAttachments(){
|
||||
this.attachmentsService.getAttachmentsBySerial(this.serialNumber).subscribe(res=>{
|
||||
this.loadedAttachments = res;
|
||||
console.log(res);
|
||||
async getAttachments(){
|
||||
console.log('load attachment')
|
||||
this.loadedAttachments = await this.attachmentsService.getAttachmentsById(this.InstanceId).toPromise();
|
||||
|
||||
console.log('this.loadedAttachments', this.loadedAttachments)
|
||||
}
|
||||
|
||||
viewDocument(sourceId){
|
||||
this.processes.GetDocumentUrl(sourceId, '8').subscribe(res=>{
|
||||
/* console.log(res); */
|
||||
const url: string = res.replace("webTRIX.Viewer","webTRIX.Viewer.Branch1");
|
||||
const browser = this.iab.create(url,"_blank");
|
||||
browser.show();
|
||||
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
<ion-item
|
||||
class="item ion-no-padding width-100"
|
||||
*ngFor="let event of eventsMDGPRList"
|
||||
(click)="openApproveModal(event.serialNumber)">
|
||||
(click)="openApproveModal(event)">
|
||||
<div class="event-mdgpr-{{event.workflowInstanceDataFields.Agenda}} width-100">
|
||||
<div class="approve-event-time">
|
||||
<p>{{event.workflowInstanceDataFields.StartDate | date: 'hh:mm'}}</p>
|
||||
|
||||
@@ -31,7 +31,7 @@ export class EventsToApprovePage implements OnInit {
|
||||
private router: Router,
|
||||
//private navParams: NavParams,
|
||||
) { }
|
||||
S
|
||||
|
||||
ngOnInit() {
|
||||
//this.segment = this.navParams.get('segment');
|
||||
/* console.log(this.navParams.get('md')); */
|
||||
@@ -53,29 +53,46 @@ S
|
||||
|
||||
}
|
||||
|
||||
LoadToApproveEvents(){
|
||||
LoadToApproveEvents() {
|
||||
this.showLoader = true;
|
||||
|
||||
this.processes.GetToApprovedEvents('PR','false').subscribe(res=>{
|
||||
this.showLoader = false;
|
||||
this.eventsPRList = res;
|
||||
|
||||
console.log('this.eventsPRList', this.eventsPRList)
|
||||
});
|
||||
this.processes.GetToApprovedEvents('MDGPR','false').subscribe(res=>{
|
||||
this.showLoader = false;
|
||||
this.eventsMDGPRList = res;
|
||||
|
||||
console.log('this.eventsMDGPRList', this.eventsMDGPRList)
|
||||
});
|
||||
}
|
||||
async openApproveModal(eventSerialNumber){
|
||||
|
||||
async openApproveModal(eventToAprove) {
|
||||
let classs;
|
||||
if( window.innerWidth <= 800){
|
||||
classs = 'modal modal-desktop'
|
||||
} else {
|
||||
classs = 'modal modal-desktop showAsideOptions'
|
||||
}
|
||||
|
||||
let InstanceId;
|
||||
|
||||
console.log(eventToAprove)
|
||||
|
||||
if(!eventToAprove.workflowInstanceDataFields.hasOwnProperty('InstanceId')){
|
||||
InstanceId = ''
|
||||
} else {
|
||||
InstanceId =eventToAprove.workflowInstanceDataFields.InstanceId
|
||||
}
|
||||
|
||||
const modal = await this.modalController.create({
|
||||
component: ApproveEventComponent,
|
||||
componentProps:{
|
||||
serialNumber: eventSerialNumber,
|
||||
serialNumber: eventToAprove.serialNumber,
|
||||
InstanceId: InstanceId ,
|
||||
showAside: true,
|
||||
},
|
||||
cssClass: classs,
|
||||
|
||||
@@ -40,6 +40,8 @@
|
||||
|
||||
.tab{
|
||||
height: 65px;
|
||||
cursor: pointer;
|
||||
user-select: none;
|
||||
}
|
||||
|
||||
.active{
|
||||
|
||||
@@ -33,7 +33,7 @@
|
||||
<span>Ínicio</span>
|
||||
</div>
|
||||
|
||||
<div class="tab mr-20 d-flex align-center" (click)="changeRoute('/home/agenda')" [class.active]="locationPathname() == '/home/agenda'">
|
||||
<div class="tab mr-20 d-flex align-center " (click)="changeRoute('/home/agenda')" [class.active]="locationPathname() == '/home/agenda'">
|
||||
<ion-icon class="font-40" src='assets/images/icons-nav-agenda-inactive.svg'></ion-icon>
|
||||
<span>Agenda</span>
|
||||
</div>
|
||||
|
||||
@@ -36,6 +36,8 @@
|
||||
|
||||
.tab{
|
||||
height: 65px;
|
||||
cursor: pointer;
|
||||
user-select: none;
|
||||
}
|
||||
|
||||
.active{
|
||||
|
||||
Reference in New Issue
Block a user