This commit is contained in:
tiago.kayaya
2021-07-05 08:25:17 +01:00
parent 4485c40ba1
commit 87edd8a21f
8 changed files with 38 additions and 63 deletions
@@ -105,6 +105,7 @@
width: 100%; width: 100%;
font-size: 15px; font-size: 15px;
color:#0d89d1; color:#0d89d1;
} }
/* SPAN */ /* SPAN */
.span-left{ .span-left{
@@ -378,22 +378,6 @@ export class DespachoPage implements OnInit {
}); });
} }
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) { async openBookMeetingModal(task: any) {
let classs; let classs;
if( window.innerWidth <= 800){ if( window.innerWidth <= 800){
@@ -70,25 +70,16 @@ export class DespachosPage implements OnInit {
} }
notImplemented() {
this.alertService.presentAlert('Funcionalidade em desenvolvimento');
}
openExpedientDetailPage(data) { openExpedientDetailPage(data) {
this.openExpedientDetail.emit(data); this.openExpedientDetail.emit(data);
} }
async LoadList() { async LoadList() {
console.log('HERE');
let result = await this.processes.GetTasksList("Despacho", false).toPromise(); let result = await this.processes.GetTasksList("Despacho", false).toPromise();
//let despachos = result.reverse().filter(data => data.activityInstanceName == "Despacho (Paralelo)"); //let despachos = result.reverse().filter(data => data.activityInstanceName == "Despacho (Paralelo)");
this.despachoList = new Array(); this.despachoList = new Array();
console.log(result);
console.log('OI');
await result.forEach( (element, index) => { await result.forEach( (element, index) => {
@@ -113,13 +104,10 @@ export class DespachosPage implements OnInit {
}); });
console.log(this.despachoList);
this.despachoList = this.sortArrayISODate(this.despachoList).reverse() this.despachoList = this.sortArrayISODate(this.despachoList).reverse()
this.despachoList.forEach( (element, index) => { this.despachoList.forEach( (element, index) => {
console.log(element);
// let aplicationId = element.workflowInstanceDataFields.SourceSecFsID; // let aplicationId = element.workflowInstanceDataFields.SourceSecFsID;
let FolderID = element['FolderID']; let FolderID = element['FolderID'];
@@ -1,9 +1,8 @@
import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'; import { Component, Input, OnInit, } from '@angular/core';
import { ActivatedRoute, NavigationEnd, NavigationExtras, Router } from '@angular/router'; import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
import { DailyWorkTask, tasksList } from '../../../models/dailyworktask.model'; import { DailyWorkTask } from '../../../models/dailyworktask.model';
import { ProcessesService } from 'src/app/services/processes.service'; import { ProcessesService } from 'src/app/services/processes.service';
import { formatDate } from '@angular/common'; import { ModalController } from '@ionic/angular';
import { ModalController, NavParams } from '@ionic/angular';
import { AlertService } from 'src/app/services/alert.service'; import { AlertService } from 'src/app/services/alert.service';
import { DiplomaPage } from 'src/app/pages/gabinete-digital/diplomas/diploma/diploma.page'; import { DiplomaPage } from 'src/app/pages/gabinete-digital/diplomas/diploma/diploma.page';
@@ -28,6 +27,7 @@ constructor(
private alertService: AlertService, private alertService: AlertService,
private router: Router, private router: Router,
private activatedRoute: ActivatedRoute, private activatedRoute: ActivatedRoute,
private location: Location,
) { ) {
this.activatedRoute.queryParams.subscribe(params => { this.activatedRoute.queryParams.subscribe(params => {
console.log('Cria'); console.log('Cria');
@@ -37,23 +37,43 @@ constructor(
} else if (params['segment'] == 'assinados') { } else if (params['segment'] == 'assinados') {
this.segment = 'assinados'; this.segment = 'assinados';
} }
this.LoadList(); this.LoadList();
}); });
} }
ngOnInit() { ngOnInit() {
this.router.events.forEach((event) => { /* this.router.events.forEach((event) => {
if(event instanceof NavigationEnd && event.url == this.router.url) { if(event instanceof NavigationEnd && event.url == this.router.url) {
console.log('Atualiza'); console.log('Atualiza');
this.LoadList(); this.LoadList();
} }
}); }); */
console.log('Init');
//this.LoadList();
}
ngAfterContentInit(): void {
this.LoadList(); this.LoadList();
} }
ngOnChanges(changes: import("@angular/core").SimpleChanges): void {
console.log('HERE');
}
reloadCurrentPage() {
console.log('Reload');
window.location.reload();
}
refreshComponent(){
console.log('YEASS N');
this.router.navigate([this.router.url])
}
segmentChanged(ev: any) { segmentChanged(ev: any) {
let navigationExtras: NavigationExtras; let navigationExtras: NavigationExtras;
@@ -262,7 +262,7 @@ export class ExpedientePrPage implements OnInit {
async openAddNoteModal(actionName:string) { async openAddNoteModal(actionName:string) {
let classs; let classs;
if( window.innerWidth <= 800){ if( window.innerWidth < 801){
classs = 'modal modal-desktop' classs = 'modal modal-desktop'
} else { } else {
classs = 'modal modal-desktop' classs = 'modal modal-desktop'
@@ -91,15 +91,11 @@ export class DespachosPage implements OnInit {
} }
async LoadList(){ async LoadList(){
console.log('HERE DESK');
let result = await this.processes.GetTasksList("Despacho", false).toPromise(); let result = await this.processes.GetTasksList("Despacho", false).toPromise();
//let despachos = result.reverse().filter(data => data.activityInstanceName == "Despacho (Paralelo)"); //let despachos = result.reverse().filter(data => data.activityInstanceName == "Despacho (Paralelo)");
this.despachoList = new Array(); this.despachoList = new Array();
console.log(result);
await result.forEach( (element, index) => { await result.forEach( (element, index) => {
let date = new Date(element.taskStartDate); let date = new Date(element.taskStartDate);
@@ -127,7 +123,6 @@ export class DespachosPage implements OnInit {
this.despachoList = this.sortArrayISODate(this.despachoList).reverse() this.despachoList = this.sortArrayISODate(this.despachoList).reverse()
this.despachoList.forEach( (element, index) => { this.despachoList.forEach( (element, index) => {
console.log(element['FolderID']);
// let aplicationId = element.workflowInstanceDataFields.SourceSecFsID; // let aplicationId = element.workflowInstanceDataFields.SourceSecFsID;
let FolderID = element['FolderID']; let FolderID = element['FolderID'];
@@ -154,25 +149,6 @@ export class DespachosPage implements OnInit {
}, 2000); }, 2000);
} }
async viewExpedientDetail(serialNumber:any) {
console.log(this.profile);
const modal = await this.modalController.create({
component: DespachoPage,
componentProps:{
enterAnimation: "",
serialNumber: serialNumber,
profile: this.profile,
},
cssClass: 'modal modal-desktop',
});
await modal.present();
modal.onDidDismiss().then((res)=>{
console.log('refresh list');
this.LoadList();
});
}
// old // old
async openExpedientActionsModal(taskAction: any, task: any) { async openExpedientActionsModal(taskAction: any, task: any) {
//this.modalController.dismiss(); //this.modalController.dismiss();
@@ -63,6 +63,8 @@ export class DespachosOptionsPage implements OnInit {
} }
sendExpedienteToPending(){ sendExpedienteToPending(){
console.log(this.task.SerialNumber);
this.popoverController.dismiss(); this.popoverController.dismiss();
this.processes.SetTaskToPending(this.task.SerialNumber).subscribe(res=>{ this.processes.SetTaskToPending(this.task.SerialNumber).subscribe(res=>{
console.log(res); console.log(res);
+4
View File
@@ -287,6 +287,10 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent-
.btn-refresh{ .btn-refresh{
display: none; display: none;
} }
.attach-title-item{
width: 200px !important;
border: 1px solid red;
}
} }
.hideAsideOptions{ .hideAsideOptions{