From 57e1bba8da4084de37d0b75f78ccd31fbeaf2910 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Mon, 1 Feb 2021 13:21:41 +0100 Subject: [PATCH] multiples improvements --- .../agenda/view-event/view-event.page.html | 3 +- .../agenda/view-event/view-event.page.ts | 7 ++ src/app/pages/events/events.page.html | 4 +- src/app/pages/events/events.page.ts | 5 +- .../book-meeting-modal.page.html | 2 +- .../expediente-detail.module.ts | 2 + .../expediente-detail.page.html | 43 +++++----- .../expediente-detail.page.scss | 79 +++++++++++++++++++ .../expediente-detail.page.ts | 42 ++++++++-- .../expediente/expediente.module.ts | 2 + .../expediente/expediente.page.html | 36 ++++----- .../expediente/expediente.page.scss | 79 +++++++++++++++++++ .../expediente/expediente.page.ts | 29 ++++++- .../gabinete-digital.page.html | 4 +- .../gabinete-digital/gabinete-digital.page.ts | 17 ++++ 15 files changed, 298 insertions(+), 56 deletions(-) diff --git a/src/app/pages/agenda/view-event/view-event.page.html b/src/app/pages/agenda/view-event/view-event.page.html index a863a43e3..3561e1e0e 100644 --- a/src/app/pages/agenda/view-event/view-event.page.html +++ b/src/app/pages/agenda/view-event/view-event.page.html @@ -58,7 +58,8 @@

Documentos Anexados

- +

{{attach.SourceName}}

{{attach.Stakeholders}}{{ attach.CreateDate | date: 'dd-MM-yy' }}

 diff --git a/src/app/pages/agenda/view-event/view-event.page.ts b/src/app/pages/agenda/view-event/view-event.page.ts index 4dfe86bbf..d63990cdb 100644 --- a/src/app/pages/agenda/view-event/view-event.page.ts +++ b/src/app/pages/agenda/view-event/view-event.page.ts @@ -7,6 +7,7 @@ import { AttachmentsService } from 'src/app/services/attachments.service'; import { EventsService } from 'src/app/services/events.service'; import { Event } from '../../../models/event.model'; import { EditEventPage } from '../edit-event/edit-event.page'; +import { InAppBrowser } from '@ionic-native/in-app-browser/ngx'; @Component({ selector: 'app-view-event', @@ -39,6 +40,7 @@ export class ViewEventPage implements OnInit { private eventsService: EventsService, private attachmentsService: AttachmentsService, public alertController: AlertController, + private iab: InAppBrowser, ) { this.profile = this.navParams.get('profile'); @@ -118,6 +120,11 @@ export class ViewEventPage implements OnInit { } }); } + viewDocument(){ + const url: string = this.loadedAttachments.DocumentURL.replace("webTRIX.Viewer","webTRIX.Viewer.Branch1"); + const browser = this.iab.create(url,"_blank"); + browser.show(); + } diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html index 685291d3f..7feea9a13 100644 --- a/src/app/pages/events/events.page.html +++ b/src/app/pages/events/events.page.html @@ -75,7 +75,9 @@
  • + (click)="viewExpedientDetail(task.SerialNumber)"> + + >
    {{task.CreateDate | date: 'd/M/yy'}}
    diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts index 76a839975..acd02700d 100644 --- a/src/app/pages/events/events.page.ts +++ b/src/app/pages/events/events.page.ts @@ -16,6 +16,7 @@ import { ProcessesService } from '../../services/processes.service'; 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'; @Component({ selector: 'app-events', @@ -317,11 +318,11 @@ export class EventsPage implements OnInit { }); } - async viewExpedient(serialNumber:any) { + async viewExpedientDetail(serialNumber:any) { console.log(this.profile); const modal = await this.modalController.create({ - component: ExpedientePage, + component: ExpedienteDetailPage, componentProps:{ serialNumber: serialNumber, profile: this.profile, diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html index 0fdabeb78..5df27b85f 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html @@ -50,7 +50,7 @@ - -
    -
    - + + +
    +
    + +
    + Detalhes do Expediente +
    +
    + + + +
    +
    - -
    - -
    -
    - + + + @@ -80,7 +84,7 @@ Data {{ task.CreateDate | date: 'dd-MM-yy | hh:mm'}} - + Ver documento @@ -121,9 +125,12 @@
    - + +

    {{event.StartDate | date: 'hh:mm'}}

    diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss index 580bc51fe..b906a9f52 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss @@ -1,3 +1,82 @@ +@import '~src/function.scss'; +.header-toolbar{ + --background:transparent; + --opacity: 1; + + .main-header{ + width: 100%; /* 400px */ + height: 100%; + font-family: Roboto; + border-top-left-radius: 25px; + border-top-right-radius: 25px; + background-color: #fff; + overflow:hidden; + padding: 30px 20px 0px 20px; + color:#000; + transform: translate3d(0, 1px, 0); + + .header-top{ + width: 360px; + margin: 0px auto; + overflow: auto; + padding: 0 !important; + background: #fff; + .middle{ + padding: 0!important; + float: left; + width: 280px; + margin: 2.5px 0 0 5px; + display: flex; + align-items: center; + + } + .right{ + padding: 0!important; + float: right; + font-size: 25px; + color: #0782c9; + margin: 5px 0 0 0; + } + } + .header-bottom{ + width: 310px; + overflow: auto; + margin: 0 auto; + + .header-bottom-icon{ + width: 30px; + font-size: 25px; + float: left; + padding: 2px; + + } + .header-bottom-contacts{ + width: 275px; + font-size: 15px; + color: #797979; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + float: left; + padding: 5px; + margin: 1px; + } + } + + .title{ + font-size: 25px; + overflow: auto; + float: left; + } + .div-icon{ + width: 40px; + float: right; + font-size: 35px; + overflow: auto; + padding: 1px; + } + } + } ion-item-group{ margin: 15px; } diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts index ecc6680a0..1fca509aa 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts @@ -7,10 +7,11 @@ import { DailyWorkTask } from '../../../../models/dailyworktask.model'; import { ActivatedRoute, Router } from '@angular/router'; import { formatDate } from '@angular/common'; import { Event } from '../../../../models/event.model'; -import { MenuController, ModalController } from '@ionic/angular'; +import { MenuController, ModalController, NavParams } from '@ionic/angular'; import { AlertService } from 'src/app/services/alert.service'; import { ExpedientTaskModalPage } from '../expedient-task-modal/expedient-task-modal.page'; import { BookMeetingModalPage } from '../book-meeting-modal/book-meeting-modal.page'; +import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page'; @Component({ selector: 'app-expediente-detail', @@ -19,6 +20,12 @@ import { BookMeetingModalPage } from '../book-meeting-modal/book-meeting-modal.p }) export class ExpedienteDetailPage implements OnInit { + task: any; + fulltask:any; + eventsList: Event[]; + serialnumber:string; + profile: string; + constructor(private activateRoute: ActivatedRoute, private processes:ProcessesService, private iab: InAppBrowser, @@ -27,13 +34,11 @@ export class ExpedienteDetailPage implements OnInit { private menu: MenuController, private router:Router, private modalController: ModalController, - private alertService: AlertService) { } - - task: any; - fulltask:any; - eventsList: Event[]; - serialnumber:string; - profile: string; + private navParams: NavParams, + private alertService: AlertService) { + this,this.serialnumber = this.navParams.get('serialNumber'); + this,this.profile = this.navParams.get('profile'); + } ngOnInit() { this.profile = "mdgpr"; @@ -45,6 +50,8 @@ export class ExpedienteDetailPage implements OnInit { this.LoadTaskDetail(this.serialnumber); this.LoadRelatedEvents(this.serialnumber); }); + this.LoadTaskDetail(this.serialnumber); + this.LoadRelatedEvents(this.serialnumber); } @@ -127,4 +134,23 @@ export class ExpedienteDetailPage implements OnInit { await modal.present(); modal.onDidDismiss(); } + + async viewEventDetail(eventId:any) { + console.log(this.profile); + + const modal = await this.modalController.create({ + component: ViewEventPage, + componentProps:{ + eventId: eventId, + profile: this.profile, + }, + cssClass: 'modal', + backdropDismiss: false + }); + await modal.present(); + modal.onDidDismiss().then((res)=>{ + if(res){ + } + }); + } } diff --git a/src/app/pages/gabinete-digital/expediente/expediente.module.ts b/src/app/pages/gabinete-digital/expediente/expediente.module.ts index 8f7f442d7..960a04fd2 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.module.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente.module.ts @@ -7,12 +7,14 @@ import { IonicModule } from '@ionic/angular'; import { ExpedientePageRoutingModule } from './expediente-routing.module'; import { ExpedientePage } from './expediente.page'; +import { SharedModule } from 'src/app/shared/shared.module'; @NgModule({ imports: [ CommonModule, FormsModule, IonicModule, + SharedModule, ExpedientePageRoutingModule ], declarations: [ExpedientePage], diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.html b/src/app/pages/gabinete-digital/expediente/expediente.page.html index d655c4c36..91feec0b9 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.page.html +++ b/src/app/pages/gabinete-digital/expediente/expediente.page.html @@ -1,22 +1,13 @@ - - -
    -
    - + + +
    +
    + +
    + Gabinete Digital +
    +
    - -
    - -
    -
    - - - - - - Gabinete Digital @@ -55,8 +46,13 @@
    --> - + +
    diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.scss b/src/app/pages/gabinete-digital/expediente/expediente.page.scss index 71a0a03f8..467df29ea 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.page.scss +++ b/src/app/pages/gabinete-digital/expediente/expediente.page.scss @@ -1,3 +1,82 @@ +@import '~src/function.scss'; +.header-toolbar{ + --background:transparent; + --opacity: 1; + + .main-header{ + width: 100%; /* 400px */ + height: 100%; + font-family: Roboto; + border-top-left-radius: 25px; + border-top-right-radius: 25px; + background-color: #fff; + overflow:hidden; + padding: 30px 20px 0px 20px; + color:#000; + transform: translate3d(0, 1px, 0); + + .header-top{ + width: 360px; + margin: 0px auto; + overflow: auto; + padding: 0 !important; + background: #fff; + .middle{ + padding: 0!important; + float: left; + width: 280px; + margin: 2.5px 0 0 5px; + display: flex; + align-items: center; + + } + .right{ + padding: 0!important; + float: right; + font-size: 25px; + color: #0782c9; + margin: 5px 0 0 0; + } + } + .header-bottom{ + width: 310px; + overflow: auto; + margin: 0 auto; + + .header-bottom-icon{ + width: 30px; + font-size: 25px; + float: left; + padding: 2px; + + } + .header-bottom-contacts{ + width: 275px; + font-size: 15px; + color: #797979; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + float: left; + padding: 5px; + margin: 1px; + } + } + + .title{ + font-size: 25px; + overflow: auto; + float: left; + } + .div-icon{ + width: 40px; + float: right; + font-size: 35px; + overflow: auto; + padding: 1px; + } + } + } /* CONTENT */ .item-list-small{ font-size: 11px; diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.ts b/src/app/pages/gabinete-digital/expediente/expediente.page.ts index c11edd1fb..dd7735e71 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente.page.ts @@ -1,12 +1,13 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { Router } from '@angular/router'; -import { ModalController, NavParams } from '@ionic/angular'; import { CalendarComponent } from 'ionic2-calendar'; import { DailyWorkTask } from '../../../models/dailyworktask.model'; import { ProcessesService } from 'src/app/services/processes.service'; import { formatDate } from '@angular/common'; import { LoadingService } from 'src/app/services/loading.service'; +import { ModalController, NavParams } from '@ionic/angular'; +import { ExpedienteDetailPage } from './expediente-detail/expediente-detail.page'; @Component({ selector: 'app-expediente', @@ -16,6 +17,7 @@ import { LoadingService } from 'src/app/services/loading.service'; export class ExpedientePage implements OnInit { segment:string; + profile:string; @ViewChild(CalendarComponent) myCal: CalendarComponent; @@ -23,10 +25,11 @@ export class ExpedientePage implements OnInit { serialNumber:string; constructor( - private modalCtrl: ModalController, + private processes:ProcessesService, + private modalController: ModalController, private navParams: NavParams, - private processes:ProcessesService) { - this.serialNumber = this.navParams.get('serialNumber'); + ) { + this.profile = this.navParams.get('profile'); } ngOnInit() { @@ -61,5 +64,23 @@ export class ExpedientePage implements OnInit { }, 2000); } + async viewExpedientDetail(serialNumber:any) { + console.log(this.profile); + + const modal = await this.modalController.create({ + component: ExpedienteDetailPage, + componentProps:{ + serialNumber: serialNumber, + profile: this.profile, + }, + cssClass: 'modal', + backdropDismiss: false + }); + await modal.present(); + modal.onDidDismiss().then((res)=>{ + + }); + } + } \ No newline at end of file diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index e243f5c28..029286d0e 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -49,7 +49,9 @@

    {{count_ev_md+count_ev_pr}} Documentos

    -
    +
    diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index c2d17e3e9..7932e8caa 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -4,6 +4,7 @@ import { AlertService } from 'src/app/services/alert.service'; import { EventsService } from 'src/app/services/events.service'; import { ModalController } from '@ionic/angular'; import { EventListPage } from './event-list/event-list.page'; +import { ExpedientePage } from './expediente/expediente.page'; @Component({ selector: 'app-gabinete-digital', @@ -14,6 +15,7 @@ export class GabineteDigitalPage implements OnInit { segment:string; showLoader: boolean; + public profile:string; constructor( private processesbackend:ProcessesService, @@ -41,6 +43,8 @@ export class GabineteDigitalPage implements OnInit { count_ev_md=0; ngOnInit() { + //Initialize profile as mdgpr + this.profile = "mdgpr"; this.LoadCounts(); /* this.eventService.getAllMdEvents.subscribe(res=>{ console.log(res); @@ -100,4 +104,17 @@ this.processesbackend.GetActionsList().subscribe(res=>{ modal.onDidDismiss(); } + async openExpedientList(){ + const modal = await this.modalController.create({ + component: ExpedientePage, + componentProps:{ + profile: this.profile, + }, + cssClass: 'modal', + backdropDismiss: false + }); + await modal.present(); + modal.onDidDismiss(); + } + }