Add despachos-pr modal

This commit is contained in:
Peter Maquiran
2021-05-13 14:09:06 +01:00
parent 5e0c0173d6
commit a8e7b95a3f
4 changed files with 75 additions and 40 deletions
@@ -1,13 +1,13 @@
<ion-header class="ion-no-border"> <ion-header class="ion-no-border1">
<app-btn-modal-dismiss></app-btn-modal-dismiss> <div class="main-header">
<div class="title"> <div class="thetitle"><ion-label >Despachos Presidenciais</ion-label></div>
<div class="thetitle"><ion-label >Despachos</ion-label></div>
<div class="theicon"> <div class="theicon">
<button class="btn-no-color" (click)="doRefresh($event)"> <button class="btn-no-color" (click)="doRefresh($event)">
<ion-icon slot="end" class="title-icon" name="reload-circle"></ion-icon> <ion-icon slot="end" class="title-icon" name="reload-circle"></ion-icon>
</button> </button>
</div> </div>
</div> </div>
<div class="bottom-title d-flex"><h3 class="bottom-text">Presidente da República</h3></div>
</ion-header> </ion-header>
<ion-content> <ion-content>
<ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)"> <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
@@ -19,11 +19,11 @@
</ion-refresher-content> </ion-refresher-content>
</ion-refresher> </ion-refresher>
<div class="width-100"> <div class="main-content width-100">
<div *ngIf="despachoList"> <div *ngIf="despachoList">
<ion-list> <ion-list>
<ion-item <ion-item
class="expediente ion-no-padding" class="expediente ion-no-padding cursor-pointer"
*ngFor = "let task of despachoList; let i = index" *ngFor = "let task of despachoList; let i = index"
(click)="viewExpedientDetail(task.SerialNumber)" (click)="viewExpedientDetail(task.SerialNumber)"
> >
@@ -54,7 +54,7 @@
</div> </div>
</div> </div>
<div *ngIf="!despachoList"> <div *ngIf="despachoList.length < 1">
<ion-list> <ion-list>
<ion-item> <ion-item>
@@ -1,14 +1,16 @@
@import '~src/function.scss'; @import '~src/function.scss';
/* CONTENT */ /* CONTENT */
:host{ .main-content{
padding: 30px 20px 0 20px !important; padding: 30px 20px 0 20px !important;
margin: 0; margin: 0;
} }
.title{ .main-header{
font-family: Roboto; font-family: Roboto;
font-size: 25px; font-size: 25px;
color:#000; color:#000;
overflow: auto; overflow: auto;
padding: 30px 20px 0 20px !important;
margin: 0;
.thetitle{ .thetitle{
width: fit-content; width: fit-content;
@@ -19,6 +21,21 @@
float: right; 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{ .item-list-small{
font-size: 11px; font-size: 11px;
overflow: hidden; overflow: hidden;
@@ -4,7 +4,7 @@ import { CalendarComponent } from 'ionic2-calendar';
import { DailyWorkTask, tasksList } from '../../../models/dailyworktask.model'; import { DailyWorkTask, tasksList } 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 { 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 { ExpedienteDetailPage } from 'src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page';
import { AlertService } from 'src/app/services/alert.service'; 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 { export class DespachosPrPage implements OnInit {
task: any;
attachments:any;
fulltask: any;
@ViewChild(CalendarComponent) myCal: CalendarComponent; @ViewChild(CalendarComponent) myCal: CalendarComponent;
taskslist:DailyWorkTask[]; taskslist:DailyWorkTask[];
@@ -40,9 +34,10 @@ export class DespachosPrPage implements OnInit {
serialNumber:string; serialNumber:string;
totalDocs:any; totalDocs:any;
@Input() profile:string; profile:string;
segment:string; segment:string;
@Output() openExpedientDetail:EventEmitter<any> = new EventEmitter<any>();
// @Output() openExpedientDetail:EventEmitter<any> = new EventEmitter<any>();
loadedAttachments:any; loadedAttachments:any;
dicIndex = 0; dicIndex = 0;
@@ -53,8 +48,10 @@ export class DespachosPrPage implements OnInit {
private modalController: ModalController, private modalController: ModalController,
private alertService: AlertService, private alertService: AlertService,
private authService: AuthService, private authService: AuthService,
private navParams: NavParams
) { ) {
this.profile = 'mdgpr';
this.profile = this.navParams.get('profile') || 'mdgpr';
} }
ngOnInit() { ngOnInit() {
@@ -65,8 +62,9 @@ export class DespachosPrPage implements OnInit {
console.log(res); console.log(res);
}); });
} }
segmentChanged(ev: any) { segmentChanged(ev: any) {
this.LoadList(); // this.LoadList();
} }
notImplemented(){ notImplemented(){
@@ -75,18 +73,16 @@ export class DespachosPrPage implements OnInit {
openExpedientDetailPage(data){ openExpedientDetailPage(data){
console.log(data); console.log(data);
this.openExpedientDetail.emit(data); // this.openExpedientDetail.emit(data);
} }
async LoadList(){ async LoadList(){
this.despachoList = new Array();
let result = await this.processes.GetTasksList("Despacho do PR", false).toPromise();
let result = await this.processes.GetTasksList("Despacho", false).toPromise();
console.log(result); console.log(result);
this.despachoList = new Array();
await result.forEach( (element, index) => { await result.forEach( (element, index) => {
let task = { let task = {
@@ -137,6 +133,13 @@ export class DespachosPrPage implements OnInit {
async viewExpedientDetail(serialNumber:any) { async viewExpedientDetail(serialNumber:any) {
console.log(this.profile); 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({ const modal = await this.modalController.create({
component: DespachoPage, component: DespachoPage,
componentProps:{ componentProps:{
@@ -144,7 +147,7 @@ export class DespachosPrPage implements OnInit {
serialNumber: serialNumber, serialNumber: serialNumber,
profile: this.profile, profile: this.profile,
}, },
cssClass: 'modal modal-desktop', cssClass: classs,
}); });
await modal.present(); await modal.present();
modal.onDidDismiss().then((res)=>{ modal.onDidDismiss().then((res)=>{
@@ -10,7 +10,7 @@ import { PedidosPage } from './pedidos/pedidos.page';
import { PendentesPage } from './pendentes/pendentes.page'; import { PendentesPage } from './pendentes/pendentes.page';
import { AuthService } from 'src/app/services/auth.service'; import { AuthService } from 'src/app/services/auth.service';
import { User } from 'src/app/models/user.model'; import { User } from 'src/app/models/user.model';
import { DespachosPrPage } from 'src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page'
@Component({ @Component({
selector: 'app-gabinete-digital', selector: 'app-gabinete-digital',
templateUrl: './gabinete-digital.page.html', templateUrl: './gabinete-digital.page.html',
@@ -288,7 +288,7 @@ export class GabineteDigitalPage implements OnInit {
openDespachosPrPage(segment:string) { openDespachosPrPage(segment:string) {
this.closeAllDesktopComponents(); this.closeAllDesktopComponents();
if( window.innerWidth <= 1024){ if( window.innerWidth <= 1024){
this.openDespachoList(); this.openDespachoListPr();
} }
else{ else{
this.showDespachosPr = true; this.showDespachosPr = true;
@@ -372,6 +372,21 @@ export class GabineteDigitalPage implements OnInit {
console.log('show desktop modal') 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(){ async openPedidoList(){
this.closeAllDesktopComponent(); this.closeAllDesktopComponent();
const modal = await this.modalController.create({ const modal = await this.modalController.create({