diff --git a/src/app/pages/gabinete-digital/expediente-modal/expediente-modal.page.ts b/src/app/pages/gabinete-digital/expediente-modal/expediente-modal.page.ts index d7423ac0a..b97866bc3 100644 --- a/src/app/pages/gabinete-digital/expediente-modal/expediente-modal.page.ts +++ b/src/app/pages/gabinete-digital/expediente-modal/expediente-modal.page.ts @@ -1,5 +1,6 @@ import { Component, OnInit } from '@angular/core'; import { ModalController } from '@ionic/angular'; +import { LoadingService } from 'src/app/services/loading.service'; @Component({ selector: 'app-expediente-modal', @@ -17,9 +18,10 @@ export class ExpedienteModalPage implements OnInit { modalReady = false; - constructor(private modalCtrl: ModalController) { } + constructor(private modalCtrl: ModalController, private loadingService: LoadingService) { } ngOnInit() { + this.loading(); } ngAfterViewInit(): void { @@ -43,4 +45,7 @@ export class ExpedienteModalPage implements OnInit { close(){ this.modalCtrl.dismiss(); } + loading(){ + this.loadingService.simpleLoading("A carregar..."); + } } diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html index d8b2c8a81..36661b591 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html @@ -3,7 +3,7 @@ - Expediente + Detalhes do Documento @@ -11,26 +11,20 @@ Assunto - {{ task.Folio }} + {{ task.Folio }} Remetentes - - - {{ task.Senders }} - - + {{ task.Senders }} Data - {{ task.CreateDate }} + {{ task.CreateDate }} - - - - Ver documento - - + + + Ver documento + 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 1e03c67d9..5eeb63118 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,14 +1,8 @@ -.event-detail-buttons{ +ion-item-group{ + margin: 15px; +} +ion-button{ + display: block; width: 80%; - margin: 10px auto; -} -.event-detail-buttons ion-button{ - width: 40%; -} -.ion-button-left{ - float: left; - background: none; -} -.ion-button-right{ - float: right; + margin: 15px auto; } \ No newline at end of file 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 566e0a97c..277b1fd1f 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 @@ -4,6 +4,7 @@ import { InAppBrowser } from '@ionic-native/in-app-browser/ngx'; import { DailyWorkTask } from '../../../../models/dailyworktask.model'; import { ActivatedRoute } from '@angular/router'; import { formatDate } from '@angular/common'; +import { LoadingService } from 'src/app/services/loading.service'; @Component({ selector: 'app-expediente-detail', @@ -12,13 +13,17 @@ import { formatDate } from '@angular/common'; }) export class ExpedienteDetailPage implements OnInit { - constructor(private activateRoute: ActivatedRoute,private processes:ProcessesService,private iab: InAppBrowser) { } + constructor(private activateRoute: ActivatedRoute, + private processes:ProcessesService, + private iab: InAppBrowser, + private loadingService: LoadingService) { } task = new DailyWorkTask(); serialnumber:string; ngOnInit() { + this.loading(); this.activateRoute.paramMap.subscribe(paramMap => { if (!paramMap.has('SerialNumber')){ return; @@ -46,4 +51,7 @@ export class ExpedienteDetailPage implements OnInit { const browser = this.iab.create(this.task.DocumentURL); browser.show(); } + loading(){ + this.loadingService.simpleLoading("A carregar..."); + } } diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.html b/src/app/pages/gabinete-digital/expediente/expediente.page.html index 7ba3c0f54..c6f633438 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.page.html +++ b/src/app/pages/gabinete-digital/expediente/expediente.page.html @@ -5,9 +5,6 @@ Gabinete Digital - - - @@ -18,19 +15,29 @@ + + + + + + + +
- +
- - +

{{ task.Folio }}

-

{{ task.Senders }}{{ task.CreateDate }}

+

{{ task.Senders }}{{ task.CreateDate | date: 'dd-MM-yy' }}

@@ -52,10 +59,10 @@
- +
diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.scss b/src/app/pages/gabinete-digital/expediente/expediente.page.scss index 166336d17..c1e42c309 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.page.scss +++ b/src/app/pages/gabinete-digital/expediente/expediente.page.scss @@ -13,22 +13,28 @@ margin: 0; } //DIV +ion-item{ + --background: none; +} .div-content-expediente{ width: 100%; float: left; border-left: 3px solid #dae3f3; - padding: 0 0 0 5px; + padding:5px 5px 15px 5px; + margin: 10px 0 10px 0; + background: #dae3f3; + border-radius: 20px; } .div-content-pendentes{ width: 100%; float: left; border-left: 3px solid #d9d9d9; - padding: 0 0 0 5px; + padding: 5px; } .div-content-expediente h3, .div-content-pendentes h3{ margin: 0; padding: 0; - font-size: 16pt; + font-size: 14pt; width: 100%; } .div-icon{ @@ -51,13 +57,13 @@ .span-left{ /* border: 1px solid red; */ float: left; - font-size: 10px; + font-size: 12px; padding-left: 18px; } .span-right{ /* border: 1px solid blue; */ text-align: right; float: right; - font-size: 10px; + font-size: 12px; padding-right: 18px; } diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.ts b/src/app/pages/gabinete-digital/expediente/expediente.page.ts index c7a15fd71..8dfab3a97 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente.page.ts @@ -7,6 +7,7 @@ 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'; @Component({ selector: 'app-expediente', @@ -21,11 +22,15 @@ export class ExpedientePage implements OnInit { taskslist:DailyWorkTask[]; - constructor(private router: Router,private modalCtrl: ModalController, private processes:ProcessesService ) { } + constructor( + private router: Router,private modalCtrl: ModalController, + private processes:ProcessesService, + private loadingService:LoadingService) { } ngOnInit() { //Inicializar segment this.segment = "expediente"; + this.loading(); this.LoadList(); } @@ -58,5 +63,16 @@ export class ExpedientePage implements OnInit { }); } + loading(){ + this.loadingService.simpleLoading("A carregar..."); + } + doRefresh(event) { + this.LoadList(); + + setTimeout(() => { + event.target.complete(); + }, 2000); + } + } \ No newline at end of file diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.scss b/src/app/pages/gabinete-digital/gabinete-digital.page.scss index 412cf5d8d..18e7a5ec3 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.scss +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.scss @@ -3,9 +3,9 @@ text-align: center; } - ion-card{ background-color: #d4d5ca; + border-radius: 20px; } ion-item{ --ion-background-color:#dae3f3; diff --git a/src/app/services/loading.service.spec.ts b/src/app/services/loading.service.spec.ts new file mode 100644 index 000000000..dd3193cc1 --- /dev/null +++ b/src/app/services/loading.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { LoadingService } from './loading.service'; + +describe('LoadingService', () => { + let service: LoadingService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(LoadingService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/src/app/services/loading.service.ts b/src/app/services/loading.service.ts new file mode 100644 index 000000000..40e600392 --- /dev/null +++ b/src/app/services/loading.service.ts @@ -0,0 +1,38 @@ +import { Injectable } from '@angular/core'; +import { LoadingController } from '@ionic/angular'; + +@Injectable({ + providedIn: 'root' +}) +export class LoadingService { + + constructor(public loadingController: LoadingController) { } + + async simpleLoading(message:string) { + const loading = await this.loadingController.create({ + cssClass: 'my-custom-class', + message:message, + duration: 2000 + }); + await loading.present(); + + const { role, data } = await loading.onDidDismiss(); + console.log('Loading dismissed!'); + } + + async customizedLoading() { + const loading = await this.loadingController.create({ + cssClass: 'my-custom-class', + spinner: null, + duration: 5000, + message: 'Click the backdrop to dismiss early...', + translucent: true, + backdropDismiss: true + }); + await loading.present(); + + const { role, data } = await loading.onDidDismiss(); + console.log('Loading dismissed with role:', role); + } + +}