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

Fixe merge

Browse Source
This commit is contained in:
Peter Maquiran
2021-04-28 11:43:42 +01:00
parent a7277f0f90 32109edb8a
commit ed8aac110f
52 changed files with 1211 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/models/dailyworktask.model.ts
+1
View File
@@ -5,6 +5,7 @@ export class DailyWorkTask{
CreateDate: string;
DocumentURL: string;
Remetente:string;
DocumentsQty:any;
}
export class tasksList{
src/app/models/folder.model.ts
+1
View File
@@ -5,4 +5,5 @@ export class Folder{
SourceSecFsId:string;
SouceType:string;
SourceId:string;
DeadlineType: string;
}
src/app/pages/agenda/approve-event-modal/approve-event-modal.page.html
+2 -2
View File
@@ -14,7 +14,7 @@
<ion-menu autoHide="false" side="end" content-id="main-content">
<ion-header>
<ion-toolbar translucent>
<ion-title>Ações</ion-title>
<ion-title>Acções</ion-title>
</ion-toolbar>
</ion-header>
<ion-content>
@@ -25,7 +25,7 @@
</ion-item>
<ion-item (click)="emendTask(loadedEvent.serialNumber)">
<ion-icon name="create-outline"></ion-icon>
<ion-label>Emendar</ion-label>
<ion-label>Adicionar Nota</ion-label>
</ion-item>
<ion-item (click)="rejectTask(loadedEvent.serialNumber)">
<ion-icon name="close-sharp"></ion-icon>
src/app/pages/agenda/approve-event-modal/approve-event-modal.page.ts
-3
View File
@@ -72,7 +72,6 @@ export class ApproveEventModalPage implements OnInit {
approveTask(serialNumber:string){
let body = { "serialNumber": serialNumber, "action": "Aprovar" }
this.processes.PostTaskAction(body);
this.alertService.presentAlert('Operação realizada com sucesso!');
this.router.navigate(['/home/gabinete-digital/event-list']);
this.modalController.dismiss(null);
}
@@ -87,7 +86,6 @@ export class ApproveEventModalPage implements OnInit {
let body = { "serialNumber": serialNumber, "action": "Rejeitar" }
this.processes.PostTaskAction(body);
this.alertService.presentAlert('Operação realizada com sucesso!');
this.router.navigate(['/home/gabinete-digital/event-list']);
this.modalController.dismiss(null);
}
@@ -132,7 +130,6 @@ export class ApproveEventModalPage implements OnInit {
}
this.processes.PostTaskAction(body);
this.router.navigate(['/home/gabinete-digital/event-list']);
this.alertService.presentAlert('Operação realizada com sucesso!');
}
else{
//this.alertService.presentAlert('Operação cancelada!');
src/app/pages/agenda/emend-message-modal/emend-message-modal.page.html
+1 -1
View File
@@ -13,7 +13,7 @@
<ion-content>
<ion-item lines="none">
<ion-textarea [(ngModel)]="emendMessage" rows="4" cols="20" placeholder="Digite o seu comentário..."></ion-textarea>
<ion-textarea [(ngModel)]="emendMessage" rows="4" cols="20" placeholder="Digite uma nota..."></ion-textarea>
</ion-item>
</ion-content>
<ion-footer>
src/app/pages/agenda/event-actions-popover/event-actions-popover.page.html
+1 -1
View File
@@ -1,7 +1,7 @@
<ion-list>
<ion-item>
<p>
<ion-button class="button-edit-event" shape="round" (click)="emendarTask()">Emendar</ion-button>
<ion-button class="button-edit-event" shape="round" (click)="emendarTask()">Adicionar Nota</ion-button>
</p>
<p>
<ion-button class="button-approve" shape="round" (click)="approveTask()">Aprovar</ion-button>
src/app/pages/agenda/view-event/view-event.page.ts
+4 -1
View File
@@ -100,7 +100,10 @@ export class ViewEventPage implements OnInit {
buttons: ['OK']
});
await alert.present();
setTimeout(()=>{
alert.dismiss();
}, 1500);
this.close();
});
}
src/app/pages/chat/group-messages/group-messages.page.html
+1 -1
View File
@@ -83,7 +83,7 @@
<ion-footer>
<div class="container width-100 d-flex">
<div>
<button class="btn-no-color" (click)="openOptions()">
<button class="btn-no-color" (click)="openChatOptions()">
<ion-icon class="chat-icon-options" src="assets/icon/icons-chat-options.svg"></ion-icon>
</button>
</div>
src/app/pages/chat/group-messages/group-messages.page.ts
+5 -10
View File
@@ -135,7 +135,7 @@ export class GroupMessagesPage implements OnInit {
async openOptions() {
console.log('OK');
const modal = await this.modalController.create({
const modal = await this.popoverController.create({
component: ChatPopoverPage,
cssClass: 'chat-popover',
componentProps: {
@@ -147,19 +147,14 @@ export class GroupMessagesPage implements OnInit {
if(res.data == 'leave'){
this.leaveStatus = this.loggedUser.me.name + ' saiu do grupo';
}
else if(res.data == 'cancel'){
console.log('cancel');
}
console.log('OK2');
console.log(res.data);
/* if(res.data ==){
this.roomName = res.data.name.split('-').join(' ');
console.log(this.roomName);
this.getRoomInfo();
//this.modalController.dismiss();
}; */
});
}
async openChatOptions(ev: any) {
const popover = await this.popoverController.create({
component: ChatOptionsPopoverPage,
src/app/pages/events/edit-event/edit-event.component.ts
+7 -3
View File
@@ -150,7 +150,9 @@ export class EventEditPage implements OnInit {
buttons: ['OK']
});
await alert.present();
setTimeout(()=>{
alert.dismiss();
}, 1500);
this.router.navigate(['/home/events']);
});
@@ -169,13 +171,15 @@ export class EventEditPage implements OnInit {
this.eventsService.editEvent(this.loadedEvent, 2, 3).subscribe(async () =>
{
const alert = await this.alertController.create({
const alert = await this.alertController.create({
cssClass: 'my-custom-class',
header: 'Evento actualizado',
buttons: ['OK']
});
await alert.present();
setTimeout(()=>{
alert.dismiss();
}, 1500);
});
}
}
src/app/pages/events/event-detail-modal/event-detail-modal.page.ts
+6 -2
View File
@@ -144,7 +144,9 @@ export class EventDetailModalPage implements OnInit {
buttons: ['OK']
});
await alert.present();
setTimeout(()=>{
alert.dismiss();
}, 1500);
this.router.navigate(['/home/events']);
});
@@ -163,7 +165,9 @@ export class EventDetailModalPage implements OnInit {
buttons: ['OK']
});
await alert.present();
setTimeout(()=>{
alert.dismiss();
}, 1500);
});
}
}
src/app/pages/events/event-detail/event-detail.page.ts
+5 -3
View File
@@ -144,13 +144,13 @@ export class EventDetailPage implements OnInit {
{
this.eventsService.deleteEvent(this.loadedEvent.EventId, 0).subscribe(async () =>
{
const alert = await this.alertController.create({
/* const alert = await this.alertController.create({
cssClass: 'my-custom-class',
header: 'Evento removido',
buttons: ['OK']
});
await alert.present();
await alert.present(); */
this.router.navigate(['/home/events']);
});
@@ -175,7 +175,9 @@ export class EventDetailPage implements OnInit {
buttons: ['OK']
});
await alert.present();
setTimeout(()=>{
alert.dismiss();
}, 1500);
});
}
}
src/app/pages/gabinete-digital/despachos/despacho/despacho-routing.module.ts
+17
View File
@@ -0,0 +1,17 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
import { DespachoPage } from './despacho.page';
const routes: Routes = [
{
path: '',
component: DespachoPage
}
];
@NgModule({
imports: [RouterModule.forChild(routes)],
exports: [RouterModule],
})
export class DespachoPageRoutingModule {}
src/app/pages/gabinete-digital/despachos/despacho/despacho.module.ts
+22
View File
@@ -0,0 +1,22 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import { IonicModule } from '@ionic/angular';
import { DespachoPageRoutingModule } from './despacho-routing.module';
import { DespachoPage } from './despacho.page';
import { SharedModule } from 'src/app/shared/shared.module';
@NgModule({
imports: [
CommonModule,
FormsModule,
IonicModule,
SharedModule,
DespachoPageRoutingModule
],
declarations: [DespachoPage]
})
export class DespachoPageModule {}
src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html
+159
View File
@@ -0,0 +1,159 @@
<ion-menu autoHide="false" side="end" content-id="main-content">
<ion-header>
<ion-toolbar translucent>
<ion-title>Menu</ion-title>
</ion-toolbar>
</ion-header>
<ion-content>
<ion-list>
<ion-item (click)="openExpedientActionsModal('0',fulltask)">
<ion-icon name="documents" slot="start"></ion-icon>
<ion-label>Efectuar Despacho</ion-label>
</ion-item>
<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 (click)="openExpedientActionsModal('2',fulltask)">
<ion-icon name="arrow-redo" slot="start"></ion-icon>
<ion-label>Pedido de Deferimento</ion-label>
</ion-item>
<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)="discartExpedient()">
<ion-icon name="trash" slot="start"></ion-icon>
<ion-label>Descartar</ion-label>
</ion-item>
<ion-item hidden disabled>
<ion-icon name="paper-plane" slot="start"></ion-icon>
<ion-label>Enviar para pendentes</ion-label>
</ion-item>
</ion-list>
</ion-content>
</ion-menu>
<div class="ion-page d-none" id="main-content">
<ion-menu-button></ion-menu-button>
</div>
<ion-content>
<div class="main-content d-flex height-100">
<div class="content d-flex flex-column" *ngIf="task">
<div class="main-header">
<div class="title-content">
<app-btn-modal-dismiss></app-btn-modal-dismiss>
<div class="middle">
<ion-label class="title">{{ task.Folio}}</ion-label>
</div>
<div class="div-icon">
<ion-menu-button autoHide="false">
<ion-icon name="ellipsis-vertical-outline"></ion-icon>
</ion-menu-button>
</div>
</div>
</div>
<div class="upper-content">
<div class="content-details">
<ion-label>
<p><span class="date">{{customDate}}</span><span class="label">{{ task.WorkflowName }}</span></p>
<p><span class="color-red">{{ task.DeadlineType }}</span></p>
</ion-label>
</div>
</div>
<div class="line"></div>
<div class="middle-content">
<h5 *ngIf="intervenientes">Intervenientes</h5>
<ion-item class="ion-no-margin ion-no-padding">
<ion-label>
<div *ngFor="let interveniente of intervenientes">
<p>{{interveniente.Name}}</p>
</div>
</ion-label>
</ion-item>
<div *ngIf="cc.length > 0">
<h5>Com conhecimento</h5>
<ion-item class="ion-no-margin ion-no-padding">
<ion-label>
<div *ngFor="let c of cc">
<p>{{c.Name}}</p>
</div>
</ion-label>
</ion-item>
</div>
<div *ngIf="task.Note">
<h5>Detalhes</h5>
<ion-item class="ion-no-margin ion-no-padding">
<p [innerHTML]="task.Note"></p>
</ion-item>
</div>
</div>
<div class="bottom-content width-100">
<ion-list>
<h5>Documentos Anexados</h5>
<ion-item *ngFor="let attachment of attachments" class="ion-no-margin ion-no-padding">
<ion-label
(click)="viewDocument(attachment.DocId)">
<p *ngIf="attachment.Assunto" class="attach-title-item">{{ attachment.Assunto }}<span class="span-right color-red btn-size"><ion-icon hidden name="close"></ion-icon></span></p>
<p *ngIf="!attachment.Assunto" class="attach-title-item">{{ attachment.DocNumber }}<span class="span-right color-red btn-size"><ion-icon hidden name="close"></ion-icon></span></p>
<p><span class="span-left">{{attachment.Sender}}</span><span class="span-right">{{ attachment.DocDate | date: 'dd/MM/yy' }}</span></p>
</ion-label>
</ion-item>
</ion-list>
</div>
</div>
<div *ngIf="task" class="aside-right flex-column height-100">
<div class="buttons">
<button (click)="executado()" class="btn-ok" shape="round" >Executado</button>
<button (click)="delegar()" class="btn-ok" shape="round" >Delegar</button>
<div class="solid"></div>
<button (click)="openExpedientActionsModal('0',fulltask)" class="btn-ok" shape="round" >Efectuar Despacho</button>
<button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
</div>
</div>
<div *ngIf="!task">
<ion-list>
<ion-list-header>
<ion-label>
<ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
</ion-label>
</ion-list-header>
<ion-item>
<ion-label>
<h3>
<ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
</h3>
<p>
<ion-skeleton-text animated style="width: 80%"></ion-skeleton-text>
</p>
</ion-label>
</ion-item>
<ion-item>
<ion-label>
<h3>
<ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
</h3>
<p><ion-skeleton-text animated style="width: 80%"></ion-skeleton-text></p>
</ion-label>
</ion-item>
<ion-item>
<ion-label>
<h3>
<ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
</h3>
<p>
<ion-skeleton-text animated style="width: 80%"></ion-skeleton-text>
</p>
</ion-label>
</ion-item>
<ion-button color="medium" shape="round" expand="block">
<!-- <ion-icon color="medium" name="attach" slot="start"></ion-icon> -->
<ion-skeleton-text animated style="width: 50%"></ion-skeleton-text>
</ion-button>
</ion-list>
</div>
</div>
</ion-content>
src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss
+236
View File
@@ -0,0 +1,236 @@
@import '~src/function.scss';
.content{
padding: 30px 20px 0 20px !important;
margin: 0;
float: left;
}
.color-red{
font-weight: 500;
color:#d30a0a !important;
}
.btn-size{
font-size: 18px !important;
}
.main-header{
font-family: Roboto;
border-top-left-radius: 25px;
border-top-right-radius: 25px;
background-color: #fff;
overflow:auto;
color:#000;
transform: translate3d(0, 1px, 0);
.header-top{
width: 360px;
margin: 0px auto;
overflow: auto;
padding: 0 !important;
background: #fff;
.middle{
padding: 0!important;
float: left;
width: 280px;
margin: 2.5px 0 0 5px;
display: flex;
align-items: center;
}
.right{
padding: 0!important;
float: right;
font-size: 25px;
color: #0782c9;
margin: 5px 0 0 0;
}
}
.header-bottom{
width: 310px;
overflow: auto;
margin: 0 auto;
.header-bottom-icon{
width: 30px;
font-size: 25px;
float: left;
padding: 2px;
}
.header-bottom-contacts{
width: 275px;
font-size: 15px;
color: #797979;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
float: left;
padding: 5px;
margin: 1px;
}
}
.title{
font-size: 25px;
overflow: auto;
float: left;
padding-top: 4px;
padding-left: 5px;
}
.div-icon{
width: 40px;
float: right;
font-size: 35px;
overflow: auto;
padding: 1px;
}
}
ion-item-group{
margin: 15px;
}
ion-button{
display: block;
width: 80%;
margin: 20px auto;
}
.upper-content{
font-family: Roboto;
margin-left: 41px;
overflow: auto;
font-size: 18px;
.label{
border-radius: 20px;
background: #ffb703;
float: right;
padding: 5px 13.5px 5px 13.5px;
color: #fff;
}
.button-calendar-type ion-button{
height: 25px;
}
.content-details{
font-size: 17px;
.date{
color: #797979;
}
}
}
.middle-conten{
.middle-content p{
font-size: 16px;
}
}
.bottom-content{
//width: 360px;
margin: 0 auto;
.bottom-content h3{
font-size: 16px;
margin: 0 0 0 10px;
}
.attach-document{
font-size: 15px;
color: #0d89d1;
margin: 5px 5px 5px 10px;
padding: 5px;
float: left;
}
.attach-icon{
width: 37px;
font-size: 35px;
float: left;
}
.attach-title-item{
font-size: 18px;
width: 100%;
color:#0d89d1;
padding-bottom: 5px;
}
/* SPAN */
.span-left{
float: left;
font-size: 15x;
}
.span-right{
text-align: right;
float: right;
font-size: 13px;
}
}
.aside-right{
padding: 30px 20px 0 20px !important;
.arrow-right{
display: flex;
justify-content: flex-end;
margin-bottom: 20px;
.arrow-right-icon{
width: 37px;
float: right;
font-size: 35px;
overflow: hidden;
}
}
.buttons{
display: flex;
flex-wrap: wrap;
justify-content: space-between;
.btn-ok, .btn-cancel, .btn-delete{
height: auto !important;
font-size: 16px !important;
font-weight: 600 !important;
width: 100% !important;
margin-bottom: 10px !important;
padding: 15px !important;
}
}
.solid {
display: block;
width: 90%;
border-top: 1px solid #ebebeb;
margin: 0 auto !important;
margin-bottom: 10px !important;
}
}
@media only screen and (max-width: 800px) {
.content{
width: 100% !important;
}
.aside-right{
display: none;
}
}
@media only screen and (min-width: 801px) {
.div-icon{
display: none;
}
.content{
width: 65%;
border-right: 1px solid #d8d8d8;
}
.aside-right{
width: 35%;
}
}
@media only screen and (min-width: 1024px){
.content{
width: 70%;
}
.aside-right{
width: 30%;
}
}
@media only screen and (min-width: 1140px){
.content{
width: 75%;
}
.aside-right{
width: 25%;
}
}
src/app/pages/gabinete-digital/despachos/despacho/despacho.page.spec.ts
+24
View File
@@ -0,0 +1,24 @@
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { IonicModule } from '@ionic/angular';
import { DespachoPage } from './despacho.page';
describe('DespachoPage', () => {
let component: DespachoPage;
let fixture: ComponentFixture<DespachoPage>;
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [ DespachoPage ],
imports: [IonicModule.forRoot()]
}).compileComponents();
fixture = TestBed.createComponent(DespachoPage);
component = fixture.componentInstance;
fixture.detectChanges();
}));
it('should create', () => {
expect(component).toBeTruthy();
});
});
src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
+279
View File
@@ -0,0 +1,279 @@
import { Component, OnInit } from '@angular/core';
import { ProcessesService } from 'src/app/services/processes.service';
import { AttachmentsService } from 'src/app/services/attachments.service';
import { EventsService } from 'src/app/services/events.service';
import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
import { DailyWorkTask } from '../../../../models/dailyworktask.model';
import { ActivatedRoute, Router } from '@angular/router';
import { formatDate } from '@angular/common';
import { Event } from '../../../../models/event.model';
import { MenuController, ModalController, NavParams } from '@ionic/angular';
import { AlertService } from 'src/app/services/alert.service';
import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page';
import { momentG } from 'src/plugin/momentG'
import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart-expedient-modal.page';
import { ExpedientTaskModalPage } from '../../expediente/expedient-task-modal/expedient-task-modal.page';
import { BookMeetingModalPage } from '../../expediente/book-meeting-modal/book-meeting-modal.page';
@Component({
selector: 'app-despacho',
templateUrl: './despacho.page.html',
styleUrls: ['./despacho.page.scss'],
})
export class DespachoPage implements OnInit {
months = ["Janeiro", "Fevereiro", "Março", "Abril", "Maio", "Junho", "Julho", "Agosto", "Setembro", "Outubro", "Novembro", "Dezembro"];
days = ["Domingo", "Segunda-feira", "Terça-feira", "Quarta-feira", "Quinta-feira", "Sexta-feira", "Sábado"];
customDate:any;
task: any;
attachments:any;
fulltask: any;
eventsList: Event[];
serialnumber: string;
profile: string;
intervenientes: any;
cc: any;
constructor(private activateRoute: ActivatedRoute,
private processes: ProcessesService,
private iab: InAppBrowser,
private attachmentsService: AttachmentsService,
private events: EventsService,
private menu: MenuController,
private router: Router,
private modalController: ModalController,
private navParams: NavParams,
private alertService: AlertService) {
this.serialnumber = this.navParams.get('serialNumber');
this.profile = this.navParams.get('profile');
}
ngOnInit() {
this.profile = "mdgpr";
console.log(this.serialnumber);
this.activateRoute.paramMap.subscribe(paramMap => {
if (!paramMap.has('SerialNumber')) {
return;
}
/* this.serialnumber = paramMap.get('SerialNumber'); */
this.LoadTaskDetail(this.serialnumber);
this.LoadRelatedEvents(this.serialnumber);
});
this.LoadTaskDetail(this.serialnumber);
this.LoadRelatedEvents(this.serialnumber);
}
close(){
this.modalController.dismiss();
}
async LoadTaskDetail(serial: string) {
this.processes.GetTask(serial).subscribe(res => {
this.task = {
"SerialNumber": res.serialNumber,
"Folio": res.workflowInstanceDataFields.Subject,
"Senders": res.originator.email,
"CreateDate": momentG(new Date(res.taskStartDate),'yyyy-MM-dd HH:mm:ss'),
"DocumentURL": res.workflowInstanceDataFields.ViewerRequest,
"Remetente": res.workflowInstanceDataFields.Sender,
"Note": res.workflowInstanceDataFields.Note,
"FolderId": res.workflowInstanceDataFields.FolderID,
"FsId": res.workflowInstanceDataFields.FsId,
"DocId": res.workflowInstanceDataFields.DocId,
"WorkflowName": res.workflowDisplayName,
"DeadlineType": res.workflowInstanceDataFields.DeadlineType,
}
this.fulltask = res;
console.log('GetTask', res);
let thedate = new Date(this.task.CreateDate);
this.customDate = this.days[thedate.getDay()]+ ", " + thedate.getDate() +" de " + ( this.months[thedate.getMonth()]);
this.processes.GetTaskParticipants(this.task.FolderId).subscribe(users=>{
this.intervenientes = users.filter(user=>{
return user.Type == 'I';
});
this.cc = users.filter(user=>{
return user.Type == 'CC';
});
console.log(users);
});
this.getDocumentDetails(this.task.FolderId, '361');
});
}
getDocumentDetails(forlderId:string, applicationId:string){
this.processes.GetDocumentDetails(forlderId,applicationId).subscribe(res=>{
this.attachments = res.Documents;
console.log(res['Documents']);
console.log(this.attachments);
})
}
async LoadRelatedEvents(serial: string) {
if (this.eventsList == null) {
this.attachmentsService.getAttachmentsBySerial(serial).subscribe(res => {
console.log(res);
res.forEach(att => {
if (this.eventsList == null) {
this.eventsList = new Array();
}
this.events.getEvent(att.ParentId).subscribe(event => {
this.eventsList.push(event);
console.log(this.eventsList);
});
});
});
}
}
viewDocument(docId:string){
this.processes.GetDocumentUrl(docId, '361').subscribe(res=>{
console.log(res);
const url: string = res.replace("webTRIX.Viewer","webTRIX.Viewer.Branch1");
const browser = this.iab.create(url,"_blank");
browser.show();
});
}
openMenu() {
this.menu.open();
this.modalController.dismiss();
}
executado(){
let body = {
"serialNumber": this.serialnumber,
"action": "Conhecimento",
"dataFields": {
"ReviewerComments": '',
}
}
this.processes.PostTaskAction(body);
}
delegar(){
}
async openExpedientActionsModal(taskAction: any, task: any) {
//this.modalController.dismiss();
let classs;
if( window.innerWidth <= 800){
classs = 'modal modal-desktop'
} else {
classs = 'modal modal-desktop showAsideOptions'
}
const modal = await this.modalController.create({
component: ExpedientTaskModalPage,
componentProps: {
taskAction: taskAction,
task: task,
profile: this.profile,
},
cssClass: classs,
});
await modal.present();
modal.onDidDismiss().then(res=>{
console.log(res['data']);
if(res['data']=='openDiscart'){
console.log('open discart');
this.distartExpedientModal();
}
});
}
discartExpedient() {
/* let body = { "serialNumber": this.serialnumber, "action": "Passivo" }
console.log(body);
this.processes.PostTaskAction(body);
this.router.navigate(['/home/gabinete-digital/expediente']); */
}
async distartExpedientModal2(task: any){
const modal = await this.modalController.create({
component: DiscartExpedientModalPage,
componentProps: {
serialNumber: task.serialNumber,
folderId: task.workflowInstanceDataFields.FolderID,
action: 'discart',
},
cssClass: 'discart-expedient-modal',
backdropDismiss: false
});
await modal.present();
modal.onDidDismiss();
}
async openBookMeetingModal(task: any) {
let classs;
if( window.innerWidth <= 800){
classs = 'book-meeting-modal modal modal-desktop'
} else {
classs = 'modal modal-desktop showAsideOptions'
}
const modal = await this.modalController.create({
component: BookMeetingModalPage,
componentProps: {
task: task,
},
cssClass: classs,
backdropDismiss: false
});
await modal.present();
modal.onDidDismiss();
}
async viewEventDetail(eventId: any) {
console.log(this.profile);
const modal = await this.modalController.create({
component: ViewEventPage,
componentProps: {
eventId: eventId,
profile: this.profile,
},
cssClass: 'modal modal-desktop',
backdropDismiss: false
});
await modal.present();
modal.onDidDismiss().then((res) => {
if (res) {
}
});
}
async distartExpedientModal(){
console.log(this.fulltask);
const modal = await this.modalController.create({
component: DiscartExpedientModalPage,
componentProps: {
serialNumber: this.fulltask.serialNumber,
folderId: this.fulltask.workflowInstanceDataFields.FolderID,
action: 'complete',
},
cssClass: 'discart-expedient-modal',
backdropDismiss: false
});
await modal.present();
modal.onDidDismiss().then(res=>{
if(res['data']=='close'){
this.close();
/* console.log('2Expedient Discard closed2');
this.close();
this.openMenu(); */
}
});
}
}
src/app/pages/gabinete-digital/despachos/despachos-routing.module.ts
+21
View File
@@ -0,0 +1,21 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
import { DespachosPage } from './despachos.page';
const routes: Routes = [
{
path: '',
component: DespachosPage
},
{
path: 'despacho',
loadChildren: () => import('./despacho/despacho.module').then( m => m.DespachoPageModule)
}
];
@NgModule({
imports: [RouterModule.forChild(routes)],
exports: [RouterModule],
})
export class DespachosPageRoutingModule {}
src/app/pages/gabinete-digital/despachos/despachos.module.ts
+20
View File
@@ -0,0 +1,20 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import { IonicModule } from '@ionic/angular';
import { DespachosPageRoutingModule } from './despachos-routing.module';
import { DespachosPage } from './despachos.page';
@NgModule({
imports: [
CommonModule,
FormsModule,
IonicModule,
DespachosPageRoutingModule
],
declarations: [DespachosPage]
})
export class DespachosPageModule {}
src/app/pages/gabinete-digital/despachos/despachos.page.html
+9
View File
@@ -0,0 +1,9 @@
<ion-header>
<ion-toolbar>
<ion-title>despachos</ion-title>
</ion-toolbar>
</ion-header>
<ion-content>
</ion-content>
src/app/pages/gabinete-digital/despachos/despachos.page.scss
View File
src/app/pages/gabinete-digital/despachos/despachos.page.spec.ts
+24
View File
@@ -0,0 +1,24 @@
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { IonicModule } from '@ionic/angular';
import { DespachosPage } from './despachos.page';
describe('DespachosPage', () => {
let component: DespachosPage;
let fixture: ComponentFixture<DespachosPage>;
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [ DespachosPage ],
imports: [IonicModule.forRoot()]
}).compileComponents();
fixture = TestBed.createComponent(DespachosPage);
component = fixture.componentInstance;
fixture.detectChanges();
}));
it('should create', () => {
expect(component).toBeTruthy();
});
});
src/app/pages/gabinete-digital/despachos/despachos.page.ts
+15
View File
@@ -0,0 +1,15 @@
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-despachos',
templateUrl: './despachos.page.html',
styleUrls: ['./despachos.page.scss'],
})
export class DespachosPage implements OnInit {
constructor() { }
ngOnInit() {
}
}
src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.html
+16 -16
View File
@@ -1,24 +1,24 @@
<ion-header class="ion-no-border">
<div class="header-content">
<div class="header-title">
<label>Deseja eliminar este expediente?</label>
</div>
<div class="header-icon-left">
<ion-icon (click)="close()" name="close-outline"></ion-icon>
<!-- <ion-icon (click)="close()" src="assets/images/icons-arrow-arrow-left.svg"></ion-icon> -->
</div>
</div>
</ion-header>
<ion-content>
<div class="header-content width-100">
<div class="header-title d-flex width-100">
<p>Deseja retirar este expediente da sua caixa de correspondência?</p>
</div>
</div>
<div class="header-body width-100">
<p>Nota: Ao efectuar esta operação, o tratamento deste expediente não poderá ser realizado a partir da caixa de correspondência</p>
</div>
</ion-content>
<ion-footer>
<ion-toolbar>
<div class="buttons">
<ion-item lines="none">
<ion-button class="button-reject" shape="round" (click)="close()">Não</ion-button>
<ion-button class="button-approve" shape="round" (click)="save()">Sim</ion-button>
</ion-item>
</div>
<ion-toolbar class="width-100 d-flex justify-space-between px-20">
<ion-buttons slot="start">
<button class="btn-delete" shape="round" (click)="close()">Não</button>
</ion-buttons>
<ion-title></ion-title>
<ion-buttons slot="end">
<button class="btn-ok" shape="round" (click)="save()">Sim</button>
</ion-buttons>
</ion-toolbar>
</ion-footer>
src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.scss
+15 -14
View File
@@ -1,25 +1,26 @@
ion-content{
--padding-top:15px;
--padding-start: 15px;
--padding-end: 15px;
}
.header-content{
width: 360px;
overflow: auto;
overflow: hidden;
margin: 0 auto;
padding: 25px;
}
.header-icon-left{
width: 36px;
font-size: 33px;
color: #42b9fe;
float: right;
align-items: center;
justify-content: center;
}
.header-title{
width: 264px;
font-family: Roboto;
font-size: 25px;
margin: 0 5px 0 5px;
font-size: 20px;
color:#000;
float: left;
margin: 0 5px 0 5px;
}
.header-body{
margin: 0 5px 0 5px;
}
.buttons{
width: 320px;
width: 100%;
margin: 0 auto;
padding: 5px 0 5px 0;
}
src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html
+2 -2
View File
@@ -27,7 +27,7 @@
</ion-item>
<ion-item (click)="emendTask(loadedEvent.serialNumber)">
<ion-icon name="create-outline"></ion-icon>
<ion-label>Emendar</ion-label>
<ion-label>Adicionar Nota</ion-label>
</ion-item>
<ion-item (click)="rejectTask(loadedEvent.serialNumber)">
<ion-icon name="close-sharp"></ion-icon>
@@ -108,7 +108,7 @@
</ion-toolbar> -->
<div class="buttons width-100">
<button class="btn-cancel" shape="round" (click)="emendTask(loadedEvent.serialNumber)">Emendar</button>
<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>
</div>
src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts
-3
View File
@@ -80,7 +80,6 @@ export class ApproveEventModalPage implements OnInit {
let body = { "serialNumber": serialNumber, "action": "Aprovar" }
console.log(body);
this.processes.PostTaskAction(body);
this.alertService.presentAlert('Operação realizada com sucesso!');
this.router.navigate(['/home/gabinete-digital/event-list']);
this.modalController.dismiss(null);
}
@@ -98,7 +97,6 @@ export class ApproveEventModalPage implements OnInit {
let body = { "serialNumber": serialNumber, "action": "Rejeitar" }
console.log(body);
this.processes.PostTaskAction(body);
this.alertService.presentAlert('Operação realizada com sucesso!');
this.router.navigate(['/home/gabinete-digital/event-list']);
this.modalController.dismiss(null);
}
@@ -145,7 +143,6 @@ export class ApproveEventModalPage implements OnInit {
console.log(body);
this.processes.PostTaskAction(body);
this.router.navigate(['/home/gabinete-digital/event-list']);
this.alertService.presentAlert('Operação realizada com sucesso!');
}
else{
//this.alertService.presentAlert('Operação cancelada!');
src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html
+1 -1
View File
@@ -25,7 +25,7 @@
</ion-item>
<ion-item (click)="emendTask(loadedEvent.serialNumber)">
<ion-icon name="create-outline"></ion-icon>
<ion-label>Emendar1</ion-label>
<ion-label>Adicionar Nota</ion-label>
</ion-item>
<ion-item (click)="rejectTask(loadedEvent.serialNumber)">
<ion-icon name="close-sharp"></ion-icon>
src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts
-3
View File
@@ -77,7 +77,6 @@ export class ApproveEventPage implements OnInit {
let body = { "serialNumber": serialNumber, "action": "Aprovar" }
console.log(body);
this.processes.PostTaskAction(body);
this.alertService.presentAlert('Operação realizada com sucesso!');
this.router.navigate(['/home/gabinete-digital/event-list']);
}
@@ -93,7 +92,6 @@ export class ApproveEventPage implements OnInit {
let body = { "serialNumber": serialNumber, "action": "Rejeitar" }
console.log(body);
this.processes.PostTaskAction(body);
this.alertService.presentAlert('Operação realizada com sucesso!');
this.router.navigate(['/home/gabinete-digital/event-list'])
this.close();
}
@@ -140,7 +138,6 @@ export class ApproveEventPage implements OnInit {
console.log(body);
this.processes.PostTaskAction(body);
this.router.navigate(['/home/gabinete-digital/event-list'])
this.alertService.presentAlert('Operação realizada com sucesso!');
}
else {
//this.alertService.presentAlert('Operação cancelada!');
src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html
+4 -4
View File
@@ -26,10 +26,10 @@
</div>
<div class="ion-input-class">
<ion-select placeholder="Prazo" [(ngModel)]="postData.Priority" interface="action-sheet" Cancel-text="Cancelar" required>
<ion-select-option value="99999861">Normal</ion-select-option>
<ion-select-option value="99999862">Urgente</ion-select-option>
<ion-select-option value="99999863">Muito Urgente</ion-select-option>
<ion-select-option value="99999864">Urgentíssimo</ion-select-option>
<ion-select-option value="99999861"><b>Normal</b> (4 dias para a execução da tarefa)</ion-select-option>
<ion-select-option value="99999862"><b>Urgente</b> (2 dias para a execução da tarefa)</ion-select-option>
<ion-select-option value="99999863"><b>Muito Urgente</b> (1 dia para a execução da tarefa)</ion-select-option>
<ion-select-option value="99999864"><b>Urgentíssimo</b> (8 horas para a execução da tarefa)</ion-select-option>
</ion-select>
</div>
</div>
src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts
+15 -1
View File
@@ -77,6 +77,7 @@ export class ExpedientTaskModalPage implements OnInit {
SourceSecFsId: this.task.workflowInstanceDataFields.FsId,
SouceType: 'DOC',
SourceId: this.task.workflowInstanceDataFields.DocId,
DeadlineType: '',
};
@@ -123,7 +124,20 @@ export class ExpedientTaskModalPage implements OnInit {
this.modalController.dismiss(null);
}
saveTask() {
saveTask(){
if(this.postData.Priority=='99999861'){
this.dispatchFolder.DeadlineType = 'Normal';
}
else if(this.postData.Priority=='99999862'){
this.dispatchFolder.DeadlineType = 'Urgente';
}
else if(this.postData.Priority=='99999863'){
this.dispatchFolder.DeadlineType = 'Muito Urgente';
}
else if(this.postData.Priority=='99999864'){
this.dispatchFolder.DeadlineType = 'Urgentíssimo';
}
let attendees = this.taskParticipants.concat(this.taskParticipantsCc);
attendees = attendees.map(function(val) {
src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
+1 -1
View File
@@ -154,7 +154,7 @@
<button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
<button (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
<button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
<button hidden class="btn-cancel" shape="round" >Enviar para Pendentes</button>
<button (click)="sendExpedienteToPending()" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
<div hidden class="solid"></div>
<button hidden class="btn-cancel" shape="round" >Delegar</button>
</div>
src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
+7
View File
@@ -70,6 +70,13 @@ export class ExpedienteDetailPage implements OnInit {
this.modalController.dismiss();
}
sendExpedienteToPending(){
this.processes.SetTaskToPending(this.serialnumber).subscribe(res=>{
console.log(res);
this.close();
});
}
async LoadTaskDetail(serial: string) {
this.processes.GetTask(serial).subscribe(res => {
src/app/pages/gabinete-digital/expediente/expediente.page.ts
+7 -2
View File
@@ -39,8 +39,10 @@ export class ExpedientePage implements OnInit {
}
LoadList(){
console.log('YEAHHH');
this.processes.GetTasksList("Expediente", false).subscribe(result => {
let tasksListReverse = result.reverse();
let tasksListReverse = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active");
this.taskslist = new Array();
tasksListReverse.forEach(element => {
let task: DailyWorkTask = {
@@ -49,10 +51,13 @@ export class ExpedientePage implements OnInit {
"Senders": element.originator.email,
"CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente
"Remetente": element.workflowInstanceDataFields.Remetente,
"DocumentsQty": 0,
}
this.taskslist.push(task);
});
console.log(this.taskslist);
});
}
src/app/pages/gabinete-digital/gabinete-digital-routing.module.ts
+4
View File
@@ -19,6 +19,10 @@ const routes: Routes = [
{
path: 'discart-expedient-modal',
loadChildren: () => import('./discart-expedient-modal/discart-expedient-modal.module').then( m => m.DiscartExpedientModalPageModule)
},
{
path: 'despachos',
loadChildren: () => import('./despachos/despachos.module').then( m => m.DespachosPageModule)
},
src/app/pages/gabinete-digital/gabinete-digital.page.html
+25 -13
View File
@@ -68,8 +68,13 @@
<p class="text-center exp-card-title ">Pedidos de Deferimento</p>
<p class="text-center exp-card-content">{{count_def_dailywork}} <span class="title1">Documentos</span></p>
</div>
<div [class.active]="selectedElement == '£££££££'" class="exp-card d-flex d-none flex-column justify-center" (click)="notImplemented()">
<div class="d-flex justify-center">
<ion-icon src="assets/images/icons-expediente-presidente.svg"></ion-icon>
</div>
<p class="text-center exp-card-title ">Expediente Presidente</p>
<p class="text-center exp-card-content"><span class="number">-</span> <span class="title1">Documentos</span></p>
</div>
<div [class.active]="selectedElement == '£££££££'" class="exp-card d-flex d-none flex-column justify-center" (click)="notImplemented()">
<div class="d-flex justify-center">
@@ -79,21 +84,28 @@
<p class="text-center exp-card-content"><span class="number">-</span> <span class="title1">Documentos</span> </p>
</div>
<div [class.active]="selectedElement == '£££££££'" class="exp-card d-flex flex-column justify-center" (click)="notImplemented()">
<div class="d-flex justify-center">
<ion-icon src="assets/images/icons-expediente-presidente.svg"></ion-icon>
<div [class.active]="selectedElement == '£££££££'" class="exp-card-long justify-center width-100" (click)="notImplemented()">
<div class="center-div">
<div class="exp-card-icon">
<ion-icon src="assets/images/icons-expediente-presidente.svg"></ion-icon>
</div>
<div class="exp-card-text">
<p class="exp-card-title ">Expediente Presidente</p>
<p class="exp-card-content"><span class="number">-</span> <span class="title1">Documentos</span> </p>
</div>
</div>
<p class="text-center exp-card-title ">Expediente Presidente</p>
<p class="text-center exp-card-content"><span class="number">-</span> <span class="title1">Documentos</span></p>
</div>
<div [class.active]="selectedElement == '£££££££'" class="exp-card d-flex flex-column justify-center" (click)="notImplemented()">
<div class="d-flex justify-center">
<ion-icon src="assets/images/icons-expediente-presidente.svg"></ion-icon>
<div [class.active]="selectedElement == '£££££££'" class="exp-card-long width-100" (click)="notImplemented()">
<div class="center-div">
<div class="exp-card-icon">
<ion-icon src="assets/images/icons-despachos-presidente.svg"></ion-icon>
</div>
<div class="exp-card-text">
<p class="text-center exp-card-title">Despacho do Presidente da República</p>
<p class="text-center exp-card-content"><span class="number">-</span> <span class="title1">Documentos</span> </p>
</div>
</div>
<p class="text-center exp-card-title ">Despacho do Presidente da República</p>
<p class="text-center exp-card-content"><span class="number">-</span> <span class="title1">Documentos</span></p>
</div>
<div [class.active]="selectedElement == '£££££££'" class="exp-card d-flex flex-column justify-center" (click)="notImplemented()">
src/app/services/auth.service.ts
+3 -1
View File
@@ -53,9 +53,11 @@ export class AuthService {
if (result)
{
this.ValidatedUser = user;
console.log(user);
//if(!environment.production){
localStorage.setItem('user', JSON.stringify(Object.assign(user, response) ) );
localStorage.setItem('user', JSON.stringify(Object.assign(user, response)));
//}
this.storageService.store(AuthConnstants.USER, response);
src/app/services/processes.service.ts
+12
View File
@@ -49,6 +49,18 @@ export class ProcessesService {
};
return this.http.get<any>(`${geturl}`, options);
}
SetTaskToPending(serialNumber:string): Observable<any>{
const geturl = environment.apiURL + 'Tasks/SetTaskPending';
let params = new HttpParams();
params = params.set("serialNumber", serialNumber);
let options = {
headers: this.headers,
params: params
};
return this.http.post<any>(`${geturl}`,'', options);
}
GetTaskParticipants(folderId:string): Observable<any>{
const geturl = environment.apiURL + 'Processes/GetUsersInDispash';
src/app/shared/agenda/approve-event/approve-event.component.html
+3 -3
View File
@@ -25,7 +25,7 @@
</ion-item>
<ion-item (click)="emendTask(loadedEvent.serialNumber)">
<ion-icon name="create-outline"></ion-icon>
<ion-label>Emendar</ion-label>
<ion-label>Adicionar Nota</ion-label>
</ion-item>
<ion-item (click)="rejectTask(loadedEvent.serialNumber)">
<ion-icon name="close-sharp"></ion-icon>
@@ -99,7 +99,7 @@
<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" >Emendar</button>
<button (click)="emendTask(loadedEvent.serialNumber)" class="btn-cancel" shape="round" >Adicionar Nota</button>
<div class="solid"></div>
<button (click)="rejectTask(loadedEvent.serialNumber)" full class="btn-delete" shape="round" >Rejeitar</button>
</div>
@@ -108,7 +108,7 @@
</ion-content>
<ion-footer class="display-none-{{showAside}}">
<div class="buttons">
<button class="btn-cancel" shape="round" (click)="emendTask(loadedEvent.serialNumber)">Emendar</button>
<button class="btn-cancel" shape="round" (click)="emendTask(loadedEvent.serialNumber)">Adicionar Nota</button>
<ion-menu-button (click)="openMenu()" autoHide="false">
<ion-icon name="ellipsis-vertical-outline"></ion-icon>
</ion-menu-button>
src/app/shared/agenda/approve-event/approve-event.component.ts
-3
View File
@@ -74,7 +74,6 @@ export class ApproveEventComponent implements OnInit {
let body = { "serialNumber": serialNumber, "action": "Aprovar" }
console.log(body);
this.processes.PostTaskAction(body);
this.alertService.presentAlert('Operação realizada com sucesso!');
this.modalController.dismiss(serialNumber);
/* this.approveEventDismiss.emit({
"serialNumber": serialNumber,
@@ -99,7 +98,6 @@ export class ApproveEventComponent implements OnInit {
let body = { "serialNumber": serialNumber, "action": "Rejeitar" }
console.log(body);
this.processes.PostTaskAction(body);
this.alertService.presentAlert('Operação realizada com sucesso!');
this.router.navigate(['/home/gabinete-digital/event-list']);
this.modalController.dismiss(null);
}
@@ -148,7 +146,6 @@ export class ApproveEventComponent implements OnInit {
console.log(body);
this.processes.PostTaskAction(body);
//this.router.navigate(['/home/gabinete-digital/event-list']);
this.alertService.presentAlert('Operação realizada com sucesso!');
this.goToEventsToApprove();
}
else{
src/app/shared/agenda/view-event/view-event.page.ts
+3 -1
View File
@@ -104,7 +104,9 @@ export class ViewEventPage implements OnInit {
buttons: ['OK']
});
await alert.present();
setTimeout(()=>{
alert.dismiss();
}, 1500);
this.close();
});
}
src/app/shared/gabinete-digital/despachos/despachos.page.html
+7 -6
View File
@@ -66,8 +66,8 @@
<ion-item
class="expediente ion-no-padding"
*ngFor = "let task of despachoList; let i = index"
(click)="viewExpedientDetail(task.SerialNumber)"
>
<!-- (click)="viewExpedientDetail(task.SerialNumber)" -->
<!-- [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
<div class="item width-100">
<div class="exp-top-detail">
@@ -75,14 +75,15 @@
<ion-label>{{ task.CreateDate | date: 'dd-MM-yy' }}</ion-label>
</div>
<div class="exp-remetente">
<ion-label>{{task.Remetente}}</ion-label>
<ion-label>{{task.Senders}}</ion-label>
</div>
<div class="exp-icon">
<ion-menu-button (click)="docIndex(i)" style="width: 35px; height: 41px;" autoHide="false">
<ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
<label>{{task.DocumentsQty}}</label>
<!-- <ion-menu-button (click)="docIndex(i)" style="width: 35px; height: 41px;" autoHide="false">
<ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
</ion-menu-button>
<label></label>
</ion-menu-button> -->
</div>
</div>
<div class="exp-bottom-detail">
src/app/shared/gabinete-digital/despachos/despachos.page.ts
+102 -64
View File
@@ -7,10 +7,14 @@ import { formatDate } from '@angular/common';
import { ModalController } from '@ionic/angular';
import { ExpedienteDetailPage } from 'src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page';
import { AlertService } from 'src/app/services/alert.service';
import { ExpedientTaskModalPage } from 'src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page';
import { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page';
import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page';
import { AuthService } from 'src/app/services/auth.service';
import { DespachoPage } from 'src/app/pages/gabinete-digital/despachos/despacho/despacho.page';
@Component({
selector: 'app-despachos',
templateUrl: './despachos.page.html',
@@ -29,6 +33,7 @@ export class DespachosPage implements OnInit {
taskType: string;
serialNumber:string;
totalDocs:any;
@Input() profile:string;
segment:string;
@@ -41,83 +46,116 @@ export class DespachosPage implements OnInit {
private processes:ProcessesService,
private modalController: ModalController,
private alertService: AlertService,
private authService: AuthService,
) {
this.profile = 'mdgpr';
}
ngOnInit() {
//Inicializar segment
this.segment = "despachos";
this.LoadList();
}
segmentChanged(ev: any) {
this.LoadList();
}
notImplemented(){
this.alertService.presentAlert('Funcionalidade em desenvolvimento');
}
openExpedientDetailPage(data) {
this.openExpedientDetail.emit(data);
}
LoadList(){
this.processes.GetTasksList("Despacho", false).subscribe(result => {
console.log('Despacho', result);
this.taskList = result;
this.despachoList = new Array();
let res = result.reverse();
res.forEach(element => {
let task: DailyWorkTask = {
"SerialNumber": element.serialNumber,
"Folio": element.workflowInstanceFolio,
"Senders": element.originator.email,
"CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente
}
this.despachoList.push(task);
});
//Inicializar segment
this.segment = "despachos";
this.LoadList();
this.authService.userData$.subscribe((res:any)=>{
console.log(res);
});
}
segmentChanged(ev: any) {
this.LoadList();
}
doRefresh(event) {
this.LoadList();
notImplemented(){
this.alertService.presentAlert('Funcionalidade em desenvolvimento');
}
setTimeout(() => {
event.target.complete();
}, 2000);
}
openExpedientDetailPage(data){
console.log(data);
this.openExpedientDetail.emit(data);
}
async viewExpedientDetail(serialNumber:any) {
console.log(this.profile);
LoadList(){
this.processes.GetTasksList("Despacho", false).subscribe(result => {
console.log(result);
this.despachoList = new Array();
let res = result.reverse();
res.forEach(element => {
let aplicationId = element.workflowInstanceDataFields.SourceSecFsID;
let DocId = element.workflowInstanceDataFields.FolderID;
let classs;
if( window.innerWidth <= 800){
classs = 'modal'
} else {
classs = 'modal modal-desktop'
}
this.processes.GetDocumentDetails(DocId, '361').subscribe(res=>{
this.totalDocs = res.DocumentsTotal;
console.log(res.DocumentsTotal);
console.log(element);
const modal = await this.modalController.create({
component: ExpedienteDetailPage,
componentProps:{
enterAnimation: "",
serialNumber: serialNumber,
profile: this.profile,
},
cssClass: classs,
});
await modal.present();
modal.onDidDismiss().then((res)=>{
console.log('refresh list');
this.LoadList();
});
}
let task: DailyWorkTask = {
"SerialNumber": element.serialNumber,
"Folio": element.workflowInstanceDataFields.Subject,
"Senders": element.workflowInstanceDataFields.Sender,
"CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente,
"DocumentsQty": this.totalDocs,
}
this.despachoList.push(task);
},
(error)=>{
let task: DailyWorkTask = {
"SerialNumber": element.serialNumber,
"Folio": element.workflowInstanceDataFields.Subject,
"Senders": element.workflowInstanceDataFields.Sender,
"CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente,
"DocumentsQty": 0,
}
this.despachoList.push(task);
});
});
//this
console.log(this.despachoList);
});
}
doRefresh(event) {
this.LoadList();
setTimeout(() => {
event.target.complete();
}, 2000);
}
async viewExpedientDetail(serialNumber:any) {
console.log(this.profile);
let classs;
if( window.innerWidth <= 800){
classs = 'modal'
} else {
classs = 'modal modal-desktop'
}
const modal = await this.modalController.create({
component: DespachoPage,
componentProps:{
enterAnimation: "",
serialNumber: serialNumber,
profile: this.profile,
},
cssClass: classs,
});
await modal.present();
modal.onDidDismiss().then((res)=>{
console.log('refresh list');
this.LoadList();
});
}
// old
async openExpedientActionsModal(taskAction: any, task: any) {
//this.modalController.dismiss();
let classs;
src/app/shared/gabinete-digital/expedients/expedients.page.html
+29 -9
View File
@@ -2,17 +2,17 @@
<div class="title">
<div class="thetitle"><ion-label >Correspondência</ion-label></div>
<div class="theicon">
<button class="btn-no-color" (click)="doRefresh($event)">
<button class="btn-no-color" (click)="doRefresh()">
<ion-icon slot="end" class="title-icon" name="reload-circle"></ion-icon>
</button>
</div>
</div>
<ion-toolbar>
<ion-segment [(ngModel)]="segment">
<ion-segment-button value="expediente">
<ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
<ion-segment-button value="expedientes">
Expediente
</ion-segment-button>
<ion-segment-button value="pendentes" (click)="notImplemented()">
<ion-segment-button value="pendentes">
Pendentes
</ion-segment-button>
</ion-segment>
@@ -29,7 +29,7 @@
</ion-refresher>
<div class="width-100" [ngSwitch]="segment" *ngIf="taskslist">
<ion-list *ngSwitchCase="'expediente'">
<ion-list *ngSwitchCase="'expedientes'">
<ion-item
class="expediente ion-no-padding"
*ngFor = "let task of taskslist"
@@ -56,10 +56,30 @@
</ion-item>
</ion-list>
<ion-list *ngSwitchCase="'pendentes'">
<ion-item-group>
<ion-item-sliding>
</ion-item-sliding>
</ion-item-group>
<ion-item
class="expediente ion-no-padding"
*ngFor = "let task of taskslist"
(click)="viewExpedientDetail(task.SerialNumber)"
>
<!-- [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
<div class="item width-100">
<div class="exp-top-detail">
<div class="exp-date">
<ion-label>{{ task.CreateDate | date: 'dd-MM-yy' }}</ion-label>
</div>
<div class="exp-remetente">
<ion-label>{{task.Remetente}}</ion-label>
</div>
<div class="exp-icon">
<ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
<label></label>
</div>
</div>
<div class="exp-bottom-detail">
<ion-label>{{ task.Folio }}</ion-label>
</div>
</div>
</ion-item>
</ion-list>
</div>
<div *ngIf="!taskslist">
src/app/shared/gabinete-digital/expedients/expedients.page.ts
+49 -17
View File
@@ -37,7 +37,13 @@ export class ExpedientsPage implements OnInit {
ngOnInit() {
//Inicializar segment
this.segment = "expediente";
this.segment = "expedientes";
this.LoadList();
}
segmentChanged(){
console.log(this.segment);
this.LoadList();
}
@@ -51,22 +57,48 @@ export class ExpedientsPage implements OnInit {
}
LoadList(){
this.processes.GetTasksList("Expediente", false).subscribe(result => {
console.log(result);
this.taskslist = new Array();
let res = result.reverse();
res.forEach(element => {
let task: DailyWorkTask = {
"SerialNumber": element.serialNumber,
"Folio": element.workflowInstanceDataFields.Subject,
"Senders": element.originator.email,
"CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente
}
this.taskslist.push(task);
});
});
switch(this.segment){
case "expedientes":
this.processes.GetTasksList("Expediente", false).subscribe(result => {
console.log(result);
this.taskslist = new Array();
let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active");
res.forEach(element => {
let task: DailyWorkTask = {
"SerialNumber": element.serialNumber,
"Folio": element.workflowInstanceDataFields.Subject,
"Senders": element.originator.email,
"CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente,
"DocumentsQty": 0,
}
this.taskslist.push(task);
});
console.log(this.taskslist);
});
break;
case "pendentes":
this.processes.GetTasksList("Expediente", false).subscribe(result => {
console.log(result);
this.taskslist = new Array();
let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Pending");
res.forEach(element => {
let task: DailyWorkTask = {
"SerialNumber": element.serialNumber,
"Folio": element.workflowInstanceDataFields.Subject,
"Senders": element.originator.email,
"CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente,
"DocumentsQty": 0,
}
this.taskslist.push(task);
});
console.log(this.taskslist);
});
break;
}
}
doRefresh(event) {
src/app/shared/gabinete-digital/pedidos/pedidos.page.html
+1
View File
@@ -69,6 +69,7 @@
<ion-item
class="expediente ion-no-padding"
*ngFor = "let task of parecerList; let i = index"
(click)="viewExpedientDetail(task.SerialNumber)"
>
<!-- (click)="viewExpedientDetail(task.SerialNumber)" -->
<!-- [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
+7 -8
View File
@@ -79,11 +79,12 @@ export class PedidosPage implements OnInit {
res.forEach(element => {
let task: DailyWorkTask = {
"SerialNumber": element.serialNumber,
"Folio": element.workflowInstanceFolio,
"Folio": element.workflowInstanceDataFields.Subject,
"Senders": element.originator.email,
"CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente
"Remetente": element.workflowInstanceDataFields.Remetente,
"DocumentsQty": 0,
}
this.parecerList.push(task);
});
@@ -103,11 +104,12 @@ export class PedidosPage implements OnInit {
res.forEach(element => {
let task: DailyWorkTask = {
"SerialNumber": element.serialNumber,
"Folio": element.workflowInstanceFolio,
"Folio": element.workflowInstanceDataFields.Subject,
"Senders": element.originator.email,
"CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
"DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
"Remetente": element.workflowInstanceDataFields.Remetente
"Remetente": element.workflowInstanceDataFields.Remetente,
"DocumentsQty": 0,
}
this.deferimentoList.push(task);
});
@@ -115,14 +117,11 @@ export class PedidosPage implements OnInit {
});
}
console.log(this.taskType);
console.log(this.taskType);
}
doRefresh(event) {
this.LoadList();
setTimeout(() => {
event.target.complete();
}, 2000);
src/app/shared/popover/chat-options-popover/chat-options-popover.page.html
+1 -1
View File
@@ -8,7 +8,7 @@
<button (click)="notImplemented()" full class="btn-ok" shape="round" >Tirar Fotografia</button>
<button (click)="notImplemented()" class="btn-ok" shape="round" >Digitalizar Documento</button>
<button (click)="notImplemented()" full class="btn-ok" shape="round" >Anexar Fotografia</button>
<button (click)="notImplemented()" class="btn-ok" shape="round" >Anexar Documento</button>
<button (click)="getDoc()" class="btn-ok" shape="round" >Anexar Documento</button>
<div class="solid"></div>
<button (click)="close()" full class="btn-cancel" shape="round" >Cancelar</button>
</div>
src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts
+28
View File
@@ -1,5 +1,7 @@
import { Component, OnInit } from '@angular/core';
import { ModalController, PopoverController } from '@ionic/angular';
import { SearchDocument } from 'src/app/models/search-document';
import { SearchPage } from 'src/app/pages/search/search.page';
import { AlertService } from 'src/app/services/alert.service';
@Component({
@@ -9,6 +11,8 @@ import { AlertService } from 'src/app/services/alert.service';
})
export class ChatOptionsPopoverPage implements OnInit {
documents:SearchDocument[] = [];
constructor(
private popoverController: PopoverController,
private modalController: ModalController,
@@ -31,4 +35,28 @@ export class ChatOptionsPopoverPage implements OnInit {
}
}
attachDocument(){
console.log('Anexar Documento');
}
async getDoc(){
const modal = await this.modalController.create({
component: SearchPage,
cssClass: 'group-messages modal-desktop search-modal search-modal-to-desktop',
componentProps: {
type: 'AccoesPresidenciais & ArquivoDespachoElect'
}
});
await modal.present();
modal.onDidDismiss().then((res)=>{
if(res){
const data = res.data;
this.documents.push(data.selected);
console.log(res.data);
}
});
}
}
src/app/shared/popover/chat-popover/chat-popover.page.scss
+3 -5
View File
@@ -20,10 +20,10 @@
justify-content: space-around;
}
.solid {
display: none;
display: block;
width: 90%;
border-top: 1px solid #bbb;
margin: 0 auto !important;
margin: 10px auto !important;
}
@media only screen and (min-width: 1024px) {
.arrow-right{
@@ -37,12 +37,10 @@
}
.btn-ok{
width: 100% !important;
margin-bottom: 10px !important;
}
}
.btn-delete{
width: 100% !important;
margin-bottom: 10px !important;
margin-top: 10px !important;
}
.solid{
display: block;
src/app/shared/popover/chat-popover/chat-popover.page.ts
+6 -2
View File
@@ -23,14 +23,15 @@ export class ChatPopoverPage implements OnInit {
ngOnInit() {
console.log(this.roomId);
}
close(){
if( window.innerWidth <= 1024){
//this.popoverController.dismiss();
this.popoverController.dismiss('cancel');
this.modalController.dismiss('cancel');
}
else{
this.popoverController.dismiss('cancel');
this.modalController.dismiss('cancel');
}
}
@@ -56,8 +57,10 @@ export class ChatPopoverPage implements OnInit {
});
}
});
this.popoverController.dismiss('leave');
this.modalController.dismiss('leave');
}
//Delete
deleteGroup(){
let body = { "roomId":this.roomId, }
@@ -75,6 +78,7 @@ export class ChatPopoverPage implements OnInit {
});
}
});
this.popoverController.dismiss('delete');
this.modalController.dismiss('delete');
}