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 6c6c2f667..83b94fb5e 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 @@ -293,5 +293,10 @@ export class DespachosPrPage implements OnInit { docIndex(index: number) { this.dicIndex = index; } + + + goBack(){ + this.router.navigate(['/home/gabinete-digital']); + } } diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.module.ts b/src/app/pages/gabinete-digital/despachos/despacho/despacho.module.ts index 2ff098185..93d48f4f3 100644 --- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.module.ts +++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.module.ts @@ -17,6 +17,8 @@ import { SharedModule } from 'src/app/shared/shared.module'; SharedModule, DespachoPageRoutingModule ], - declarations: [DespachoPage] + declarations: [ + DespachoPage, + ] }) export class DespachoPageModule {} diff --git a/src/app/pages/gabinete-digital/despachos/despachos.module.ts b/src/app/pages/gabinete-digital/despachos/despachos.module.ts index 08100c869..62eeaf359 100644 --- a/src/app/pages/gabinete-digital/despachos/despachos.module.ts +++ b/src/app/pages/gabinete-digital/despachos/despachos.module.ts @@ -15,8 +15,10 @@ import { SharedModule } from 'src/app/shared/shared.module'; FormsModule, IonicModule, SharedModule, - DespachosPageRoutingModule + DespachosPageRoutingModule, ], - declarations: [DespachosPage] + declarations: [ + DespachosPage, + ] }) export class DespachosPageModule {} diff --git a/src/app/pages/gabinete-digital/despachos/despachos.page.html b/src/app/pages/gabinete-digital/despachos/despachos.page.html index c6b5dc001..f9cb09b27 100644 --- a/src/app/pages/gabinete-digital/despachos/despachos.page.html +++ b/src/app/pages/gabinete-digital/despachos/despachos.page.html @@ -1,5 +1,13 @@ + + + + + +
+ +
Despachos
- + +
+ - + pullingIcon="chevron-down-circle-outline" + pullingText="deslize para actualizar" + refreshingSpinner="circles" + refreshingText="A actualizar..."> + - -
-
- - - -
-
-
- {{ task.CreateDate | date: 'dd-MM-yy' }} -
-
- {{task.Senders}} -
-
- {{task.activityInstanceName}} -
-
- - - - +
+
+
+ {{ task.CreateDate | date: 'dd-MM-yy' }} +
+
+ {{task.Senders}} +
+
+ {{task.activityInstanceName}} +
+
- --> + + + +
+
+
+ {{ task.Folio }}
-
- {{ task.Folio }} -
-
- - + + +
+
+
+ + + + + + + +

+

+

+
+
+ + + + + +

+

+

+
+
+
-
- - - - - - - -

-

-

-
-
- - - - - -

-

-

-
-
-
-
+ diff --git a/src/app/pages/gabinete-digital/despachos/despachos.page.scss b/src/app/pages/gabinete-digital/despachos/despachos.page.scss index 7e13b0056..12e6ec912 100644 --- a/src/app/pages/gabinete-digital/despachos/despachos.page.scss +++ b/src/app/pages/gabinete-digital/despachos/despachos.page.scss @@ -1,9 +1,22 @@ @import '~src/function.scss'; /* CONTENT */ :host{ - padding: 30px 20px 0 20px !important; - margin: 0; + margin: 0; } + +.header-2 { + border-top-right-radius: 24px; + border-top-left-radius: 24px; +} + +ion-content, .header-2, .main-content{ + padding: 30px 20px 0 20px !important; + background-color: white; +} +.main-content { + padding-top: 0px !important; +} + .title{ font-family: Roboto; font-size: 25px; diff --git a/src/app/pages/gabinete-digital/despachos/despachos.page.ts b/src/app/pages/gabinete-digital/despachos/despachos.page.ts index 48bdb4792..dd1c414d5 100644 --- a/src/app/pages/gabinete-digital/despachos/despachos.page.ts +++ b/src/app/pages/gabinete-digital/despachos/despachos.page.ts @@ -64,10 +64,15 @@ export class DespachosPage implements OnInit { console.log(res); }); } + segmentChanged(ev: any) { this.LoadList(); } + goBack(){ + this.router.navigate(['/home/gabinete-digital']); + } + notImplemented(){ this.alertService.presentAlert('Funcionalidade em desenvolvimento'); } diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.page.html b/src/app/pages/gabinete-digital/pedidos/pedidos.page.html index daa331db5..86c1e8cdd 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedidos.page.html +++ b/src/app/pages/gabinete-digital/pedidos/pedidos.page.html @@ -1,5 +1,9 @@ - + + + + +
Pedidos
@@ -19,8 +23,11 @@ + - + +
+ -
-
- - - - - -
-
-
- {{ task.CreateDate | date: 'dd-MM-yy' }} -
-
- {{task.Remetente}} -
-
- - -
-
-
- {{ task.Folio }} -
-
-
-
- -
-
- - - - -
-
-
- {{ task.CreateDate | date: 'dd-MM-yy' }} -
-
- {{task.Remetente}} -
-
- {{task.WorkflowName}} -
-
- +
+
+ + + + + +
+
+
+ {{ task.CreateDate | date: 'dd-MM-yy' }} +
+
+ {{task.Remetente}} +
+
- + +
+
+
+ {{ task.Folio }}
-
- {{ task.Folio }} + + + +
+
+ + + + +
+
+
+ {{ task.CreateDate | date: 'dd-MM-yy' }} +
+
+ {{task.Remetente}} +
+
+ {{task.WorkflowName}} +
+
+ + + +
+
+
+ {{ task.Folio }} +
-
-
+ +
+
+
+
+ + + + + + + +

+

+

+
+
+ + + + + +

+

+

+
+
-
- - - - - - - -

-

-

-
-
- - - - - -

-

-

-
-
-
-
+ + diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.page.scss b/src/app/pages/gabinete-digital/pedidos/pedidos.page.scss index e624d0744..bbfaf0b48 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedidos.page.scss +++ b/src/app/pages/gabinete-digital/pedidos/pedidos.page.scss @@ -1,9 +1,22 @@ @import '~src/function.scss'; /* CONTENT */ :host{ - padding: 30px 20px 0 20px !important; - margin: 0; + margin: 0; } + +.header-2 { + border-top-right-radius: 24px; + border-top-left-radius: 24px; +} + +ion-content, .header-2, .main-content{ + padding: 30px 20px 0 20px !important; + background-color: white; +} +.main-content { + padding-top: 0px !important; +} + .title{ font-family: Roboto; font-size: 25px; diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts b/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts index 91b522eed..8fe367137 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts @@ -52,6 +52,10 @@ export class PedidosPage implements OnInit { this.LoadList(); } + goBack(){ + this.router.navigate(['/home/gabinete-digital']); + } + segmentChanged(ev: any) { this.LoadList(); } diff --git a/src/app/pages/gabinete-digital/pendentes/pendentes.page.html b/src/app/pages/gabinete-digital/pendentes/pendentes.page.html index 04811f220..b1b9fa470 100644 --- a/src/app/pages/gabinete-digital/pendentes/pendentes.page.html +++ b/src/app/pages/gabinete-digital/pendentes/pendentes.page.html @@ -1,5 +1,10 @@ - + + + + + +
Pendentes
@@ -9,8 +14,11 @@
+ - + +
+
-
- - - - - - - -

-

-

-
-
- - - - - -

-

-

-
-
-
+
+ + + + + + + +

+

+

+
+
+ + + + + +

+

+

+
+
+
+
+
diff --git a/src/app/pages/gabinete-digital/pendentes/pendentes.page.scss b/src/app/pages/gabinete-digital/pendentes/pendentes.page.scss index b56456084..727b79ead 100644 --- a/src/app/pages/gabinete-digital/pendentes/pendentes.page.scss +++ b/src/app/pages/gabinete-digital/pendentes/pendentes.page.scss @@ -1,9 +1,22 @@ @import '~src/function.scss'; /* CONTENT */ :host{ - padding: 30px 20px 0 20px !important; - margin: 0; + margin: 0; } + +.header-2 { + border-top-right-radius: 24px; + border-top-left-radius: 24px; +} + +ion-content, .header-2, .main-content{ + padding: 30px 20px 0 20px !important; + background-color: white; +} +.main-content { + padding-top: 0px !important; +} + .title{ font-family: Roboto; font-size: 25px; diff --git a/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts b/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts index 95ac65ec2..0db36f8e3 100644 --- a/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts +++ b/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts @@ -51,6 +51,10 @@ export class PendentesPage implements OnInit { segmentChanged(ev: any) { this.LoadList(); } + + goBack() { + this.router.navigate(['/home/gabinete-digital']); + } notImplemented(){ this.alertService.presentAlert('Funcionalidade em desenvolvimento');