-
+
{{ task.CreateDate | date: 'dd-MM-yy' }}
@@ -54,7 +54,7 @@
-
+
diff --git a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.scss b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.scss index e624d0744..0a5f9d37c 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.scss +++ b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.scss @@ -1,14 +1,16 @@ @import '~src/function.scss'; /* CONTENT */ -:host{ +.main-content{ padding: 30px 20px 0 20px !important; margin: 0; } -.title{ +.main-header{ font-family: Roboto; font-size: 25px; color:#000; overflow: auto; + padding: 30px 20px 0 20px !important; + margin: 0; .thetitle{ width: fit-content; @@ -19,6 +21,21 @@ float: right; } } + .bottom-title{ + //width: 100%; + margin-left: 20px !important; + margin-right: 20px !important; + margin: 0 auto; + align-items: center; + justify-content: center; + border-bottom: 5px solid #42b9fe; + + .bottom-text{ + font-size: 15px !important; + font-family: Roboto !important; + color: #0d89d1 !important; + } + } .item-list-small{ font-size: 11px; overflow: hidden; diff --git a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts index c1c56bb06..6de08d3f0 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts +++ b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts @@ -4,7 +4,7 @@ import { CalendarComponent } from 'ionic2-calendar'; import { DailyWorkTask, tasksList } from '../../../models/dailyworktask.model'; 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 { ExpedienteDetailPage } from 'src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page'; import { AlertService } from 'src/app/services/alert.service'; @@ -22,12 +22,6 @@ import { DespachoPage } from 'src/app/pages/gabinete-digital/despachos/despacho/ }) export class DespachosPrPage implements OnInit { - - task: any; - attachments:any; - fulltask: any; - - @ViewChild(CalendarComponent) myCal: CalendarComponent; taskslist:DailyWorkTask[]; @@ -40,9 +34,10 @@ export class DespachosPrPage implements OnInit { serialNumber:string; totalDocs:any; - @Input() profile:string; + profile:string; segment:string; - @Output() openExpedientDetail:EventEmitter = new EventEmitter(); + + // @Output() openExpedientDetail:EventEmitter = new EventEmitter(); loadedAttachments:any; dicIndex = 0; @@ -53,8 +48,10 @@ export class DespachosPrPage implements OnInit { private modalController: ModalController, private alertService: AlertService, private authService: AuthService, + private navParams: NavParams ) { - this.profile = 'mdgpr'; + + this.profile = this.navParams.get('profile') || 'mdgpr'; } ngOnInit() { @@ -65,8 +62,9 @@ export class DespachosPrPage implements OnInit { console.log(res); }); } + segmentChanged(ev: any) { - this.LoadList(); + // this.LoadList(); } notImplemented(){ @@ -75,18 +73,16 @@ export class DespachosPrPage implements OnInit { openExpedientDetailPage(data){ console.log(data); - this.openExpedientDetail.emit(data); + // this.openExpedientDetail.emit(data); } async LoadList(){ + this.despachoList = new Array(); - - let result = await this.processes.GetTasksList("Despacho", false).toPromise(); + let result = await this.processes.GetTasksList("Despacho do PR", false).toPromise(); console.log(result); - this.despachoList = new Array(); - await result.forEach( (element, index) => { let task = { @@ -137,6 +133,13 @@ export class DespachosPrPage implements OnInit { async viewExpedientDetail(serialNumber:any) { console.log(this.profile); + let classs; + if( window.innerWidth <= 800){ + classs = 'modal modal-desktop' + } else { + classs = 'modal modal-desktop' + } + const modal = await this.modalController.create({ component: DespachoPage, componentProps:{ @@ -144,7 +147,7 @@ export class DespachosPrPage implements OnInit { serialNumber: serialNumber, profile: this.profile, }, - cssClass: 'modal modal-desktop', + cssClass: classs, }); await modal.present(); modal.onDidDismiss().then((res)=>{ @@ -166,15 +169,15 @@ export class DespachosPrPage implements OnInit { const doc = this.loadedAttachments[ this.dicIndex]; task = { - serialNumber: doc.SourceId, - taskStartDate: doc.CreateDate, - isEvent: true, - workflowInstanceDataFields: { - FsId: doc.ApplicationId, - FolderID: null, - DocId: doc.SourceId, - Subject: doc.SourceName - }, + serialNumber: doc.SourceId, + taskStartDate: doc.CreateDate, + isEvent: true, + workflowInstanceDataFields: { + FsId: doc.ApplicationId, + FolderID: null, + DocId: doc.SourceId, + Subject: doc.SourceName + }, } const modal = await this.modalController.create({ @@ -264,7 +267,7 @@ export class DespachosPrPage implements OnInit { } docIndex(index: number) { - this.dicIndex = index; + this.dicIndex = index; } } diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index b144853f9..f9942216e 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -10,7 +10,7 @@ import { PedidosPage } from './pedidos/pedidos.page'; import { PendentesPage } from './pendentes/pendentes.page'; import { AuthService } from 'src/app/services/auth.service'; import { User } from 'src/app/models/user.model'; - +import { DespachosPrPage } from 'src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page' @Component({ selector: 'app-gabinete-digital', templateUrl: './gabinete-digital.page.html', @@ -285,10 +285,10 @@ export class GabineteDigitalPage implements OnInit { } } - openDespachosPrPage(segment:string){ + openDespachosPrPage(segment:string) { this.closeAllDesktopComponents(); if( window.innerWidth <= 1024){ - this.openDespachoList(); + this.openDespachoListPr(); } else{ this.showDespachosPr = true; @@ -372,6 +372,21 @@ export class GabineteDigitalPage implements OnInit { console.log('show desktop modal') } + async openDespachoListPr(){ + + this.closeAllDesktopComponent(); + const modal = await this.modalController.create({ + component: DespachosPrPage, + componentProps:{ + profile: this.profile, + }, + cssClass: 'modal modal-desktop', + }); + await modal.present(); + modal.onDidDismiss(); + console.log('show desktop modal') + } + async openPedidoList(){ this.closeAllDesktopComponent(); const modal = await this.modalController.create({