diff --git a/src/app/home/home.page.html b/src/app/home/home.page.html
index 2129a6732..20699f0b9 100644
--- a/src/app/home/home.page.html
+++ b/src/app/home/home.page.html
@@ -4,7 +4,7 @@
{{totalEvent}}
- Iníci1o
+ Início
diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html
index bcf14acdb..6d32c9f3c 100644
--- a/src/app/pages/events/events.page.html
+++ b/src/app/pages/events/events.page.html
@@ -94,7 +94,7 @@
class="icon-next"
slot="end"
src="assets/images/icons-arrow-circle-arrow-right.svg"
- (click)="openExpedientList()"
+ (click)="viewExpedientListPage()"
>
diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts
index f4f69ea52..87e032c93 100644
--- a/src/app/pages/events/events.page.ts
+++ b/src/app/pages/events/events.page.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit, LOCALE_ID } from '@angular/core';
+import { Component, OnInit, LOCALE_ID, EventEmitter, Output } from '@angular/core';
import { Event } from '../../models/event.model';
import { EventsService } from 'src/app/services/events.service';
@@ -15,6 +15,7 @@ import { DailyWorkTask } from '../../models/dailyworktask.model';
import { ViewEventPage } from '../agenda/view-event/view-event.page';
import { ExpedientePage } from '../gabinete-digital/expediente/expediente.page';
import { ExpedienteDetailPage } from '../gabinete-digital/expediente/expediente-detail/expediente-detail.page';
+import { GabineteDigitalPage } from '../gabinete-digital/gabinete-digital.page';
@Component({
selector: 'app-events',
@@ -58,6 +59,8 @@ export class EventsPage implements OnInit {
taskslist:DailyWorkTask[];
expedientList:any;
+ @Output() openExpedientListPage:EventEmitter = new EventEmitter();
+
constructor(private eventService: EventsService,
private router: Router,
private storageService:StorageService,
@@ -65,6 +68,7 @@ export class EventsPage implements OnInit {
private alertController: AlertService,
private authService: AuthService,
private processes:ProcessesService,
+ private gabineteService: GabineteDigitalPage,
private modalController:ModalController) {
this.prEventList = null;
@@ -239,8 +243,7 @@ export class EventsPage implements OnInit {
return await modal.present();
}
- LoadList()
- {
+ LoadList(){
this.processes.GetTasksList("Expediente", false).subscribe(result => {
this.expedientList = result.reverse();
console.log(this.expedientList);
@@ -306,13 +309,30 @@ export class EventsPage implements OnInit {
});
}
+ viewExpedientListPage(){
+ if( window.innerWidth <= 1024){
+ this.openExpedientList();
+ }
+ else{
+ console.log('ttt');
+ this.router.navigate(['/home/gabinete-digital']);
+ this.gabineteService.openExpedientListPage();
+ }
+ }
+
async openExpedientList(){
+ let classs;
+ if( window.innerWidth <= 800){
+ classs = 'modal'
+ } else {
+ classs = 'modal modal-desktop'
+ }
const modal = await this.modalController.create({
component: ExpedientePage,
componentProps:{
profile: this.profile,
},
- cssClass: 'modal',
+ cssClass: classs,
backdropDismiss: false
});
await modal.present();
diff --git a/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.ts b/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.ts
index 089f8d110..6a0a44bb5 100644
--- a/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.ts
+++ b/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.ts
@@ -10,6 +10,7 @@ import { ProcessesService } from 'src/app/services/processes.service';
})
export class DiscartExpedientModalPage implements OnInit {
serialNumber:string;
+ folderId:string;
constructor(
private modalController: ModalController,
private processes:ProcessesService,
@@ -17,6 +18,7 @@ export class DiscartExpedientModalPage implements OnInit {
private navParams: NavParams,
) {
this.serialNumber = this.navParams.get('serialNumber');
+ this.folderId = this.navParams.get('folderId');
}
ngOnInit() {
@@ -24,13 +26,15 @@ export class DiscartExpedientModalPage implements OnInit {
}
close(){
+ /* let body = { "serialNumber": this.serialNumber, "action": "Tratado" } */
+ this.processes.UpdateTaskStatus(this.folderId);
this.modalController.dismiss();
}
/* notDelete(){
} */
save(){
- let body = { "serialNumber": this.serialNumber, "action": "Task Completed" }
+ let body = { "serialNumber": this.serialNumber, "action": "Tratado" }
console.log(body);
this.processes.PostTaskAction(body);
this.router.navigate(['/home/gabinete-digital/expediente']);
diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts
index 40de6e9e5..d32b3607a 100644
--- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts
@@ -224,6 +224,7 @@ export class ExpedientTaskModalPage implements OnInit {
component: DiscartExpedientModalPage,
componentProps: {
serialNumber: this.task.serialNumber,
+ folderId: this.task.workflowInstanceDataFields.FolderID,
},
cssClass: 'discart-expedient-modal',
backdropDismiss: false
diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.ts b/src/app/pages/gabinete-digital/expediente/expediente.page.ts
index 447317a76..a932f2776 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/expediente.page.ts
@@ -38,8 +38,7 @@ export class ExpedientePage implements OnInit {
this.LoadList();
}
- LoadList()
- {
+ LoadList(){
this.processes.GetTasksList("Expediente", false).subscribe(result => {
this.taskslist = new Array();
result.forEach(element => {
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
index c3ee3e6d9..8aad715eb 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
@@ -200,7 +200,6 @@ this.processesbackend.GetActionsList().subscribe(res=>{
async openExpedientList(){
this.closeAllDesktopComponent();
-
let classs;
if( window.innerWidth <= 1024){
classs = 'modal'
diff --git a/src/app/services/processes.service.ts b/src/app/services/processes.service.ts
index 186a5801b..7b595a04c 100644
--- a/src/app/services/processes.service.ts
+++ b/src/app/services/processes.service.ts
@@ -120,6 +120,20 @@ export class ProcessesService {
console.log(res);
});
}
+
+ UpdateTaskStatus(folderId: any){
+ const geturl = environment.apiURL + 'Tasks/UpdateTaskStatus';
+ let params = new HttpParams();
+ params = params.set("FolderId", folderId);
+ let options = {
+ headers: this.headers,
+ params: params,
+ };
+ return this.http.post(`${geturl}`, options).toPromise().then(res =>{
+ console.log(res);
+ });
+
+ }
postDespatcho(body:any){
const geturl = environment.apiURL + 'Processes/CreateDispatch';
diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.ts b/src/app/shared/gabinete-digital/expedients/expedients.page.ts
index b0e57a5ef..af076a0ba 100644
--- a/src/app/shared/gabinete-digital/expedients/expedients.page.ts
+++ b/src/app/shared/gabinete-digital/expedients/expedients.page.ts
@@ -41,12 +41,10 @@ export class ExpedientsPage implements OnInit {
openExpedientDetailPage(data){
console.log(data);
-
this.openExpedientDetail.emit(data);
}
- LoadList()
- {
+ LoadList(){
this.processes.GetTasksList("Expediente", false).subscribe(result => {
this.taskslist = new Array();
let res = result.reverse();