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

Add parecer and deferimento integration

Browse Source 
Create models
Update methods in processes
This commit is contained in:
Tiago Kayaya
2020-11-17 14:59:33 +01:00
parent 3ee87a0845
commit 52908b509d
10 changed files with 161 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/models/despacho.model.ts
+10
View File
@@ -0,0 +1,10 @@
import { Participant } from './participant.model';
import { Folder } from './folder.model';
export class Despacho{
distributionType: string;
deadline: Date;
userEmail: string;
participants: Participant;
dispatchFolder: Folder;
}
src/app/models/folder.model.ts
+7
View File
@@ -0,0 +1,7 @@
export class Folder{
nad:string;
message:string;
sourceSecFsId:string;
souceType:string;
sourceId:string;
}
src/app/models/participant.model.ts
+5
View File
@@ -0,0 +1,5 @@
export class Participant{
id: string;
type: string;
deadline: Date;
}
src/app/pages/agenda/approve-event-modal/approve-event-modal.page.ts
+4 -10
View File
@@ -34,17 +34,12 @@ export class ApproveEventModalPage implements OnInit {
)
{
this.serialNumber = this.navParams.get('serialNumber');
}
ngOnInit() {
this.getTask();
console.log(this.today);
this.getTask();
}
notImplemented(){
this.alertService.presentAlert('Funcionalidade em desenvolvimento');
}
@@ -77,8 +72,7 @@ export class ApproveEventModalPage implements OnInit {
console.log('Emendar');
this.menu.close();
this.openEmendMessageModal(serialNumber);
/* this.modalController.dismiss(null); */
this.modalController.dismiss(null);
}
rejectTask(serialNumber:string){
@@ -125,8 +119,8 @@ export class ApproveEventModalPage implements OnInit {
}
console.log(body);
this.processes.PostTaskAction(body);
this.alertService.presentAlert('Operação realizada com sucesso!');
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/book-meeting-modal/book-meeting-modal.page.html
+2 -8
View File
@@ -127,14 +127,8 @@
<ion-list>
<ion-item>
<ion-label>
<p class="attach-title-item">Receita por Natureza</p>
<p><span class="span-left">OAPR - GTI</span><span class="span-right">13/04/2020<!-- {{ task.CreateDate | date: 'dd-MM-yy' }} --></span></p>
</ion-label>
</ion-item>
<ion-item>
<ion-label>
<p class="attach-title-item">Receita por Natureza</p>
<p><span class="span-left">OAPR - GTI</span><span class="span-right">13/04/2020<!-- {{ task.CreateDate | date: 'dd-MM-yy' }} --></span></p>
<p class="attach-title-item">{{task.Folio}}</p>
<p><span class="span-left">OAPR - GTI</span><span class="span-right">{{ task.CreateDate| date: 'dd/MM/yyyy' }}</span></p>
</ion-label>
</ion-item>
</ion-list>
src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
+4 -1
View File
@@ -14,7 +14,10 @@ export class BookMeetingModalPage implements OnInit {
taskParticipants: any;
taskParticipantsCc: any;
constructor(private modalController: ModalController,
postEvent: Event;
constructor(
private modalController: ModalController,
private router:Router,
private navParams: NavParams,
) { }
src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html
+2 -8
View File
@@ -93,14 +93,8 @@
<ion-list>
<ion-item>
<ion-label>
<h4 class="attach-title-item">Receita por Natureza</h4>
<p><span class="span-left">OAPR - GTI</span><span class="span-right">13/04/2020<!-- {{ task.CreateDate | date: 'dd-MM-yy' }} --></span></p>
</ion-label>
</ion-item>
<ion-item>
<ion-label>
<p class="attach-title-item">Receita por Natureza</p>
<p><span class="span-left">OAPR - GTI</span><span class="span-right">13/04/2020<!-- {{ task.CreateDate | date: 'dd-MM-yy' }} --></span></p>
<h4 class="attach-title-item">{{taskSubject}}</h4>
<p><span class="span-left">OAPR - GTI</span><span class="span-right"> {{ taskDate | date: 'dd/MM/yyyy' }}</span></p>
</ion-label>
</ion-item>
</ion-list>
src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts
+103 -25
View File
@@ -1,7 +1,9 @@
import { Component, OnInit } from '@angular/core';
import { Router } from '@angular/router';
import { ModalController, NavParams } from '@ionic/angular';
import { Despacho } from 'src/app/models/despacho.model';
import { EventPerson } from 'src/app/models/eventperson.model';
import { Participant } from 'src/app/models/participant.model';
import { AuthService } from 'src/app/services/auth.service';
import { ProcessesService } from 'src/app/services/processes.service';
import { StorageService } from 'src/app/services/storage.service';
@@ -25,21 +27,27 @@ export class ExpedientTaskModalPage implements OnInit {
taskParticipants: any;
taskParticipantsCc: any;
taskSubject: string;
taskDate: Date;
taskDescription: string;
postData: Despacho;
constructor(
private modalController: ModalController,
private router:Router,
private processes:ProcessesService,
private navParams: NavParams,
private authService: AuthService,
) { }
) {
this.postData = new Despacho();
}
ngOnInit() {
this.taskType = this.navParams.get('taskAction');
this.task = this.navParams.get('task');
console.log(this.task);
this.taskSubject = this.task.workflowInstanceFolio;
this.taskDate = new Date(this.task.taskStartDate);
this.authService.userData$.subscribe((res:any)=>{
console.log(res);
@@ -58,32 +66,102 @@ export class ExpedientTaskModalPage implements OnInit {
this.modalController.dismiss(null);
}
saveTask(){
let body = {
"distributionType": "Paralelo",
"deadline": "2020-11-13T12:55:39.5281471+01:00",
"userEmail": "gilson.manuel@gabinetedigital.local",
"dispatchFolder": {
"Nad": 30,
"Subject": this.taskSubject,
"Message": this.taskDescription,
"SourceSecFsId": this.task.workflowInstanceDataFields.FsId,
"SourceType": "DOC",
"SourceId": this.task.workflowInstanceDataFields.DocId,
},
"usersSelected": [
{
"UserId": "GABINETEDIGITAL\\gilson.manuel",
"UserType": "CC",
"DeadLine": "2020-11-13T12:55:39.5381237+01:00"
},
{
"UserId": "GABINETEDIGITAL\\tiago.kayaya",
"UserType": "I",
"DeadLine": "2020-11-13T12:55:39.5381237+01:00"
switch (this.modalTitle[this.taskType])
{
case "Efectuar Despacho":
/* this.postData = {
distributionType: "Paralelo",
deadline: new Date ('2020-11-13T12:55:39.5281471+01:00'),
userEmail: "gilson.manuel@gabinetedigital.local",
usersSelected: Participant;
dispatchFolder: Folder;
} */
let body = {
"distributionType": "Paralelo",
"deadline": "2020-11-13T12:55:39.5281471+01:00",
"userEmail": "gilson.manuel@gabinetedigital.local",
"dispatchFolder": {
"Nad": 30,
"Subject": this.taskSubject,
"Message": this.taskDescription,
"SourceSecFsId": this.task.workflowInstanceDataFields.FsId,
"SourceType": "DOC",
"SourceId": this.task.workflowInstanceDataFields.DocId,
},
"usersSelected": [
{
"UserId": "GABINETEDIGITAL\\gilson.manuel",
"UserType": "CC",
"DeadLine": "2020-11-13T12:55:39.5381237+01:00"
},
{
"UserId": "GABINETEDIGITAL\\tiago.kayaya",
"UserType": "I",
"DeadLine": "2020-11-13T12:55:39.5381237+01:00"
}
]
}
]
this.processes.postDespatcho(body);
break;
case "Solicitar Parecer":
console.log('Parecer');
let bodyp = {
"distributionType": "Paralelo",
"deadline": "2020-11-13T12:55:39.5281471+01:00",
"userEmail": "gilson.manuel@gabinetedigital.local",
"dispatchFolder": {
"Nad": 30,
"Subject": this.taskSubject,
"Message": this.taskDescription,
"SourceSecFsId": this.task.workflowInstanceDataFields.FsId,
"SourceType": "DOC",
"SourceId": this.task.workflowInstanceDataFields.DocId,
},
"usersSelected": [
{
"UserId": "GABINETEDIGITAL\\gilson.manuel",
"UserType": "CC",
"DeadLine": "2020-11-13T12:55:39.5381237+01:00"
},
{
"UserId": "GABINETEDIGITAL\\tiago.kayaya",
"UserType": "I",
"DeadLine": "2020-11-13T12:55:39.5381237+01:00"
}
]
}
this.processes.postParecer(bodyp);
break;
case "Solicitar Deferimento":
console.log('Deferimento');
let bodyd = {
"distributionType": "Paralelo",
"deadline": "2020-11-13T12:55:39.5281471+01:00",
"userEmail": "gilson.manuel@gabinetedigital.local",
"dispatchFolder": {
"Nad": 30,
"Subject": this.taskSubject,
"Message": this.taskDescription,
"SourceSecFsId": this.task.workflowInstanceDataFields.FsId,
"SourceType": "DOC",
"SourceId": this.task.workflowInstanceDataFields.DocId,
},
"usersSelected": [
{
"UserId": "GABINETEDIGITAL\\gilson.manuel",
"UserType": "CC",
"DeadLine": "2020-11-13T12:55:39.5381237+01:00"
},
{
"UserId": "GABINETEDIGITAL\\tiago.kayaya",
"UserType": "I",
"DeadLine": "2020-11-13T12:55:39.5381237+01:00"
}
]
}
this.processes.postDeferimento(bodyd);
break;
}
this.processes.DispatchTask(body);
this.router.navigate(['/home/gabinete-digital/expediente']);
this.modalController.dismiss(null);
}
src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
-4
View File
@@ -89,10 +89,6 @@ export class ExpedienteDetailPage implements OnInit {
browser.show();
}
openFirst() {
this.menu.enable(true, 'first');
this.menu.open('first');
}
openMenu() {
this.menu.open();
}
src/app/services/processes.service.ts
+24 -1
View File
@@ -95,7 +95,7 @@ export class ProcessesService {
});
}
DispatchTask(body:any){
postDespatcho(body:any){
const geturl = environment.apiURL + 'Processes/CreateDispatch';
let options = {
headers: this.headers,
@@ -104,4 +104,27 @@ export class ProcessesService {
console.log(res);
});
}
postParecer(body:any){
const geturl = environment.apiURL + 'Processes/CreateParecer';
let options = {
headers: this.headers,
};
return this.http.post<any>(`${geturl}`, body, options).toPromise().then(res =>{
console.log(res);
});
}
postDeferimento(body:any){
const geturl = environment.apiURL + 'Processes/CreateDeferimento';
let options = {
headers: this.headers,
};
return this.http.post<any>(`${geturl}`, body, options).toPromise().then(res =>{
console.log(res);
});
}
}