diff --git a/src/app/pages/events/event-detail/event-detail.page.html b/src/app/pages/events/event-detail/event-detail.page.html index f5858bb17..1c82a98d6 100644 --- a/src/app/pages/events/event-detail/event-detail.page.html +++ b/src/app/pages/events/event-detail/event-detail.page.html @@ -4,14 +4,19 @@ Visualizar Evento + + + +
Assunto - @@ -22,11 +27,6 @@ Localização - Calendário @@ -43,12 +43,6 @@ Data Fim -
@@ -76,10 +70,75 @@
+
+ +
+
+ + + + + +
+ + + + + + + + + + + + +

+ +

+

+ +

+

+ +

+ + + + + + + +

+ +

+

+ +

+

+ +

+ + + + + +

+ +

+

+ +

+

+ +

+ + + +
- Apagar + Gravar
diff --git a/src/app/pages/events/event-detail/event-detail.page.scss b/src/app/pages/events/event-detail/event-detail.page.scss index 44af0f57a..6914a454a 100644 --- a/src/app/pages/events/event-detail/event-detail.page.scss +++ b/src/app/pages/events/event-detail/event-detail.page.scss @@ -73,4 +73,10 @@ ion-card{ } .ion-button-right{ float: right; +} +.ion-icon-delete{ + font-size: 22px; + color: red; + background-color: white; + padding-right: 5px; } \ No newline at end of file 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 36661b591..c36849339 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 @@ -8,6 +8,8 @@ +
+ Assunto @@ -26,5 +28,69 @@ Ver documento +
+
+
+ + + + + +
+ + + + + + + + + + + + +

+ +

+

+ +

+

+ +

+ + + + + + + +

+ +

+

+ +

+

+ +

+ + + + + +

+ +

+

+ +

+

+ +

+ + + +
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 f4204f1e3..ae8c912e8 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 @@ -19,12 +19,11 @@ export class ExpedienteDetailPage implements OnInit { private iab: InAppBrowser, private loadingService: LoadingService) { } - task = new DailyWorkTask(); + task: DailyWorkTask; serialnumber:string; ngOnInit() { - this.loading(); this.activateRoute.paramMap.subscribe(paramMap => { if (!paramMap.has('SerialNumber')){ return; @@ -52,7 +51,4 @@ export class ExpedienteDetailPage implements OnInit { const browser = this.iab.create(this.task.DocumentURL,"_blank"); 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 c6f633438..7af5442da 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.page.html +++ b/src/app/pages/gabinete-digital/expediente/expediente.page.html @@ -27,7 +27,7 @@ -
+
@@ -46,23 +46,72 @@ -
- +
+
+ + + + + +
+ + + + + + + + + + + + +

+ +

+

+ +

+

+ +

+ + + + + + + +

+ +

+

+ +

+

+ +

+ + + + + +

+ +

+

+ +

+

+ +

+ + + +
diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.ts b/src/app/pages/gabinete-digital/expediente/expediente.page.ts index 8dfab3a97..4e8e8e922 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente.page.ts @@ -30,7 +30,6 @@ export class ExpedientePage implements OnInit { ngOnInit() { //Inicializar segment this.segment = "expediente"; - this.loading(); this.LoadList(); } @@ -63,9 +62,6 @@ export class ExpedientePage implements OnInit { }); } - loading(){ - this.loadingService.simpleLoading("A carregar..."); - } doRefresh(event) { this.LoadList(); diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index 3a9050b3b..0856d4d9a 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -3,8 +3,16 @@ Gabinete Digital - + + + + + Expediente diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 4085fb253..bdd7beea3 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -9,6 +9,7 @@ import { ProcessesService } from 'src/app/services/processes.service'; export class GabineteDigitalPage implements OnInit { segment:string; + showLoader: boolean; constructor(private processesbackend:ProcessesService) { } @@ -24,7 +25,9 @@ export class GabineteDigitalPage implements OnInit { } LoadCounts() { + this.showLoader = true; this.processesbackend.GetTasksList("Expediente", true).subscribe(result =>{ + this.showLoader = false; this.count_exp_dailywork = result; }); @@ -35,4 +38,12 @@ export class GabineteDigitalPage implements OnInit { this.count_de_pr = "-"; } + doRefresh(event) { + this.LoadCounts(); + + setTimeout(() => { + event.target.complete(); + }, 2000); + } + }