Gabinete Digital
-
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
index d3001864e..d0fc37eea 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
@@ -260,7 +260,7 @@ export class GabineteDigitalPage implements OnInit {
}
- doRefresh() {
+ doRefresh(event) {
this.closeAllDesktopComponents();
switch(this.loggeduser.Profile){
case 'MDGPR':
@@ -276,8 +276,7 @@ export class GabineteDigitalPage implements OnInit {
this.LoadCounts();
//this.refreshExpedientes();
- setTimeout(() => {
- }, 2000);
+ event.target.complete();
}
notImplemented(){
diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html
index 4802585c9..1874b81ce 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html
+++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html
@@ -107,6 +107,7 @@
Dar o meu Parecer
Marcar Reunião
+ Reencaminhar
Enviar para Pendentes
diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
index 89c5a6bd2..03f585cc5 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
+++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
@@ -3,7 +3,6 @@ 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, NavigationExtras, Router } from '@angular/router';
import { formatDate } from '@angular/common';
import { Event } from '../../../../models/event.model';
@@ -12,19 +11,17 @@ 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';
import { CreateProcessPage } from 'src/app/modals/create-process/create-process.page';
import { DelegarPage } from 'src/app/modals/delegar/delegar.page';
import { DarParecerPage } from 'src/app/modals/dar-parecer/dar-parecer.page';
import { AddNotePage } from 'src/app/modals/add-note/add-note.page';
-import { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-expediente.page';
import { RequestOptionsPage } from 'src/app/shared/popover/request-options/request-options.page';
import { AuthService } from 'src/app/services/auth.service';
import { User } from 'src/app/models/user.model';
import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page';
-import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page';
import { ToastService } from 'src/app/services/toast.service';
+import { ForwardPage } from 'src/app/modals/forward/forward.page';
@Component({
selector: 'app-pedido',
@@ -204,7 +201,6 @@ export class PedidoPage implements OnInit {
} catch (error) {
this.toastService.badRequest()
}
-
}
async arquivar(note:string, documents:any) {
@@ -225,7 +221,26 @@ export class PedidoPage implements OnInit {
} catch (error) {
this.toastService.badRequest()
}
+ }
+ async assignar(note:string, documents:any) {
+ let body = {
+ "serialNumber": this.serialnumber,
+ "action": "Reencaminhar",
+ "ActionTypeId": 98,
+ "dataFields": {
+ "ReviewUserComment": note,
+ },
+ "AttachmentList" :documents,
+ }
+
+ try {
+ await this.processes.CompleteTask(body).toPromise()
+ this.toastService.successMessage('Processo arquivado')
+ this.close();
+ } catch (error) {
+ this.toastService.badRequest()
+ }
}
sendExpedienteToPending(){
@@ -339,6 +354,27 @@ export class PedidoPage implements OnInit {
modal.onDidDismiss();
}
+ async openForwardModal(task: any) {
+ console.log(task);
+
+ 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: ForwardPage,
+ componentProps: {
+ task: this.task,
+ },
+ cssClass: classs,
+ backdropDismiss: false
+ });
+ await modal.present();
+ modal.onDidDismiss();
+ }
+
async openDarParecer(task: any) {
console.log(task);
@@ -399,19 +435,24 @@ export class PedidoPage implements OnInit {
else if(actionName == 'Arquivar'){
this.arquivar(res.data.note, docs);
}
+ else if(actionName == 'Assignar'){
+ this.assignar(res.data.note, docs);
+ }
}
});
}
goBack() {
-
- let navigationExtras: NavigationExtras = {
- queryParams: {
- "pedidos": true,
+ if (window.innerWidth <= 800) {
+ this.router.navigate(['/home/gabinete-digital/pedidos']);
+ } else {
+ let navigationExtras: NavigationExtras = {
+ queryParams: {
+ "pedidos": true,
+ }
}
+ this.router.navigate(['/home/gabinete-digital'], navigationExtras);
}
-
- this.router.navigate(['/home/gabinete-digital'], navigationExtras);
}
diff --git a/src/app/pages/publications/publications.page.html b/src/app/pages/publications/publications.page.html
index 9f39fd6a8..c071b0d24 100644
--- a/src/app/pages/publications/publications.page.html
+++ b/src/app/pages/publications/publications.page.html
@@ -3,7 +3,7 @@
-
+
@@ -24,7 +24,7 @@
-
+
diff --git a/src/app/pages/publications/publications.page.scss b/src/app/pages/publications/publications.page.scss
index 288b9aaaf..a446b55cb 100644
--- a/src/app/pages/publications/publications.page.scss
+++ b/src/app/pages/publications/publications.page.scss
@@ -90,7 +90,7 @@ ion-toolbar{
}
}
.item{
- padding: 0 0px 0 0px;
+ padding: 0 0px 0 0px !important;
margin: 0px auto;
border-bottom: 1px solid #ebebeb;
}
@@ -116,14 +116,20 @@ ion-toolbar{
.item-content-date{
color: #797979;
font-size: 13px;
+ margin: 0 !important;
+ padding: 0 !important;
}
.item-content-title{
color: #0d89d1;
font-size: 15px;
+ margin: 0 !important;
+ padding: 0 !important;
}
.item-content-detail{
color: #000000;
font-size: 13px;
+ margin: 0 !important;
+ padding: 0 !important;
}
diff --git a/src/app/pages/publications/publications.page.ts b/src/app/pages/publications/publications.page.ts
index 60b18bd50..4e9224928 100644
--- a/src/app/pages/publications/publications.page.ts
+++ b/src/app/pages/publications/publications.page.ts
@@ -68,13 +68,12 @@ export class PublicationsPage implements OnInit {
}
});
}
- doRefresh() {
- /* this.getActions(); */
+ doRefresh(event) {
+ this.getActions();
setTimeout(() => {
- this.getActions();
- /* event.target.complete(); */
- }, 2000);
+ event.target.complete();
+ }, 250);
}
get windowInnerWidth(): number {
@@ -125,7 +124,7 @@ export class PublicationsPage implements OnInit {
});
await modal.present();
modal.onDidDismiss().then(()=>{
- this.doRefresh();
+ this.getActions();
});
} else {
this.desktopComponent.showAddActions = true;
diff --git a/src/app/services/processes.service.ts b/src/app/services/processes.service.ts
index 6b4b28eaf..6a382fb71 100644
--- a/src/app/services/processes.service.ts
+++ b/src/app/services/processes.service.ts
@@ -139,6 +139,7 @@ export class ProcessesService {
};
return this.http.post
(`${geturl}`, body, options)
}
+
CompleteTask(body:any){
const geturl = environment.apiURL + 'Tasks/CompleteTask';
@@ -148,6 +149,15 @@ export class ProcessesService {
return this.http.post(`${geturl}`, body, options)
}
+ CompleteParecerPrTask(body:any){
+ const geturl = environment.apiURL + 'Tasks/CompleteTaskParecerPr';
+
+ let options = {
+ headers: this.headers,
+ };
+ return this.http.post(`${geturl}`, body, options)
+ }
+
UpdateTaskStatus(FolderId:string): Observable{
const geturl = environment.apiURL + 'Tasks/UpdateTaskStatus';
let params = new HttpParams();
diff --git a/src/app/shared/agenda/approve-event/approve-event.page.ts b/src/app/shared/agenda/approve-event/approve-event.page.ts
index 5d9909a2d..9742c71e6 100644
--- a/src/app/shared/agenda/approve-event/approve-event.page.ts
+++ b/src/app/shared/agenda/approve-event/approve-event.page.ts
@@ -127,10 +127,9 @@ export class ApproveEventPage implements OnInit {
try {
await this.processes.PostTaskAction(body).toPromise()
this.router.navigate(['/home/gabinete-digital/event-list']);
- this.modalController.dismiss(null);
this.toastService.successMessage('Evento rejeitado')
} catch (error) {
- this.toastService.badRequest('Evento não rejeitado')
+ this.toastService.badRequest('Processo não efectuado')
}
}
diff --git a/src/app/shared/agenda/new-event/new-event.page.html b/src/app/shared/agenda/new-event/new-event.page.html
index 68a15843a..9ae73cd11 100644
--- a/src/app/shared/agenda/new-event/new-event.page.html
+++ b/src/app/shared/agenda/new-event/new-event.page.html
@@ -13,22 +13,20 @@
+
-
-
-
-
-
+
+
diff --git a/src/app/shared/event/attendee-modal/attendee-modal.page.html b/src/app/shared/event/attendee-modal/attendee-modal.page.html
index 97b1d4b7b..d0f026983 100644
--- a/src/app/shared/event/attendee-modal/attendee-modal.page.html
+++ b/src/app/shared/event/attendee-modal/attendee-modal.page.html
@@ -1,7 +1,6 @@
Adicionar intervenientes
- Agenda Desktop
diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts
index 0ea46630d..c2f99bdbf 100644
--- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts
+++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts
@@ -251,7 +251,7 @@ export class EditEventToApproveComponent implements OnInit {
Message: this.eventProcess.workflowInstanceDataFields.Message,
ParticipantsList: this.eventProcess.workflowInstanceDataFields.ParticipantsList,
Private: false,
- ReviewerComments: ''
+ ReviewUserComments: ''
}
this.eventsService.postEventToApproveEdit(event).subscribe(()=>{
diff --git a/src/global.scss b/src/global.scss
index 12419ce96..ee1502f34 100644
--- a/src/global.scss
+++ b/src/global.scss
@@ -862,4 +862,8 @@ background: rgb(92, 92, 92);
tr:nth-child(n+6) {
display: none;
}
+}
+
+.modal {
+ display: flex !important;
}
\ No newline at end of file