Imporve pages

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']);
+  }
    
 }

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 {}

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 {}

src/app/pages/gabinete-digital/despachos/despachos.page.html

@@ -1,5 +1,13 @@
 <ion-header class="ion-no-border">
+  <app-header > </app-header>
+</ion-header>
+
+<ion-header class="ion-no-border header-2">
+  
+  
   <div class="title">
+    <app-btn-modal-dismiss (click)="goBack()" ></app-btn-modal-dismiss>
+
     <div class="thetitle"><ion-label >Despachos</ion-label></div>
     <div class="theicon">
       <button class="btn-no-color" (click)="doRefresh($event)">
@@ -9,77 +17,81 @@
   </div>
 </ion-header>
 <ion-content>
-  <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
+
+  <div class="main-content">
+    <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
       <ion-refresher-content
-        pullingIcon="chevron-down-circle-outline"
-        pullingText="deslize para actualizar"
-        refreshingSpinner="circles"
-        refreshingText="A actualizar...">
-      </ion-refresher-content>
+          pullingIcon="chevron-down-circle-outline"
+          pullingText="deslize para actualizar"
+          refreshingSpinner="circles"
+          refreshingText="A actualizar...">
+        </ion-refresher-content>
     </ion-refresher>
-  
-  <div class="width-100">
-    <div *ngIf="despachoList">
-      <ion-list>
-        <ion-item 
-            class="expediente ion-no-padding cursor-pointer"  
-            *ngFor = "let task of despachoList; let i = index"
-            (click)="viewExpedientDetail(task.SerialNumber)"
-            >
-            <!--  [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
-              <div class="item width-100">
-                <div class="exp-top-detail">
-                  <div class="exp-date">
-                    <ion-label>{{ task.CreateDate | date: 'dd-MM-yy' }}</ion-label>
-                  </div>
-                  <div class="exp-remetente">
-                    <ion-label>{{task.Senders}}</ion-label>
-                  </div>
-                  <div class="exp-workflow">
-                    <span class="label">{{task.activityInstanceName}}</span>
-                  </div>
-                  <div class="exp-icon d-flex align-center">
-                    <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
-                    <label>{{task.DocumentsQty}}</label>
-
-                    <!-- <ion-menu-button (click)="docIndex(i)" style="width: 35px; height: 41px;" autoHide="false">
+    
+    <div class="width-100">
+      <div *ngIf="despachoList">
+        <ion-list>
+          <ion-item 
+              class="expediente ion-no-padding cursor-pointer"  
+              *ngFor = "let task of despachoList; let i = index"
+              (click)="viewExpedientDetail(task.SerialNumber)"
+              >
+              <!--  [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
+                <div class="item width-100">
+                  <div class="exp-top-detail">
+                    <div class="exp-date">
+                      <ion-label>{{ task.CreateDate | date: 'dd-MM-yy' }}</ion-label>
+                    </div>
+                    <div class="exp-remetente">
+                      <ion-label>{{task.Senders}}</ion-label>
+                    </div>
+                    <div class="exp-workflow">
+                      <span class="label">{{task.activityInstanceName}}</span>
+                    </div>
+                    <div class="exp-icon d-flex align-center">
                       <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
-                    </ion-menu-button> -->
+                      <label>{{task.DocumentsQty}}</label>
+
+                      <!-- <ion-menu-button (click)="docIndex(i)" style="width: 35px; height: 41px;" autoHide="false">
+                        <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                      </ion-menu-button> -->
+                    </div>
+                  </div>
+                  <div class="exp-bottom-detail">
+                    <ion-label>{{ task.Folio }}</ion-label>
                   </div>
                 </div>
-                <div class="exp-bottom-detail">
-                  <ion-label>{{ task.Folio }}</ion-label>
-                </div>
-              </div>
-            </ion-item>
-      </ion-list>
+              </ion-item>
+        </ion-list>
 
+      </div>
+    </div>
+    <div *ngIf="despachoList.length < 1">
+    
+      <ion-list>
+        <ion-item>
+          <ion-thumbnail slot="end">
+            <ion-skeleton-text animated></ion-skeleton-text>
+          </ion-thumbnail>
+          <ion-label>
+            <h3><ion-skeleton-text animated style="width: 50%"></ion-skeleton-text></h3>
+            <p><ion-skeleton-text animated style="width: 80%"></ion-skeleton-text></p>
+            <p><ion-skeleton-text animated style="width: 60%"></ion-skeleton-text></p>
+          </ion-label>
+        </ion-item>
+        <ion-item>
+          <ion-thumbnail slot="end">
+            <ion-skeleton-text animated></ion-skeleton-text>
+          </ion-thumbnail>
+          <ion-label>
+            <h3><ion-skeleton-text animated style="width: 50%"></ion-skeleton-text></h3>
+            <p><ion-skeleton-text animated style="width: 80%"></ion-skeleton-text></p>
+            <p><ion-skeleton-text animated style="width: 60%"></ion-skeleton-text></p>
+          </ion-label>
+        </ion-item>
+      </ion-list>
     </div>
   </div>
-  <div *ngIf="despachoList.length < 1">
-  
-    <ion-list>
-      <ion-item>
-        <ion-thumbnail slot="end">
-          <ion-skeleton-text animated></ion-skeleton-text>
-        </ion-thumbnail>
-        <ion-label>
-          <h3><ion-skeleton-text animated style="width: 50%"></ion-skeleton-text></h3>
-          <p><ion-skeleton-text animated style="width: 80%"></ion-skeleton-text></p>
-          <p><ion-skeleton-text animated style="width: 60%"></ion-skeleton-text></p>
-        </ion-label>
-      </ion-item>
-      <ion-item>
-        <ion-thumbnail slot="end">
-          <ion-skeleton-text animated></ion-skeleton-text>
-        </ion-thumbnail>
-        <ion-label>
-          <h3><ion-skeleton-text animated style="width: 50%"></ion-skeleton-text></h3>
-          <p><ion-skeleton-text animated style="width: 80%"></ion-skeleton-text></p>
-          <p><ion-skeleton-text animated style="width: 60%"></ion-skeleton-text></p>
-        </ion-label>
-      </ion-item>
-    </ion-list>
-  </div>
+
 </ion-content>
 

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;

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');
   }

src/app/pages/gabinete-digital/pedidos/pedidos.page.html

@@ -1,5 +1,9 @@
 <ion-header class="ion-no-border">
-  <app-btn-modal-dismiss></app-btn-modal-dismiss>
+  <app-header > </app-header>
+</ion-header>
+
+<ion-header class="ion-no-border header-2">
+  <app-btn-modal-dismiss (click)="goBack()"></app-btn-modal-dismiss>
   <div class="title">
     <div class="thetitle"><ion-label >Pedidos</ion-label></div>
     <div class="theicon">
@@ -19,8 +23,11 @@
     </ion-segment>
   </ion-toolbar>
 </ion-header>
+
 <ion-content>
-  <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
+
+  <div class="main-content">
+    <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
       <ion-refresher-content
         pullingIcon="chevron-down-circle-outline"
         pullingText="deslize para actualizar"
@@ -29,97 +36,100 @@
       </ion-refresher-content>
     </ion-refresher>
   
-  <div class="width-100" [ngSwitch]="segment">
-    <div *ngIf="parecerList">
-      <ion-list *ngSwitchCase="'parecer'">
-        <!-- *ngFor = "let task of parecerList; let i = index"
-        (click)="viewExpedientDetail(task.SerialNumber)" -->
-        <ion-item 
-            class="expediente ion-no-padding"  
-            *ngFor = "let task of parecerList"
-            (click)="goToPedido(task.SerialNumber)"
-            >
-            <!-- (click)="viewExpedientDetail(task.SerialNumber)" -->
-            <!--  [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
-              <div class="item width-100">
-                <div class="exp-top-detail">
-                  <div class="exp-date">
-                    <ion-label>{{ task.CreateDate | date: 'dd-MM-yy' }}</ion-label>
-                  </div>
-                  <div class="exp-remetente">
-                    <ion-label>{{task.Remetente}}</ion-label>
-                  </div>
-                  <div class="exp-icon">
-                    <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
-                    <label></label>
-                  </div>
-                </div>
-                <div class="exp-bottom-detail">
-                  <ion-label>{{ task.Folio }}</ion-label>
-                </div>
-              </div>
-            </ion-item>
-      </ion-list>
-
-    </div>
-    <div *ngIf="deferimentoList">
-      <ion-list *ngSwitchCase="'deferimento'">
-        <ion-item 
-            class="expediente ion-no-padding"  
-            *ngFor = "let task of deferimentoList"
-            (click)="viewPedidoDetail(task.SerialNumber)"
-            >
-            <!-- (click)="viewExpedientDetail(task.SerialNumber)" -->
-            <!--  [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
-              <div class="item width-100">
-                <div class="exp-top-detail">
-                  <div class="exp-date">
-                    <ion-label>{{ task.CreateDate | date: 'dd-MM-yy' }}</ion-label>
-                  </div>
-                  <div class="exp-remetente">
-                    <ion-label>{{task.Remetente}}</ion-label>
-                  </div>
-                  <div class="exp-workflow">
-                    <span class="label">{{task.WorkflowName}}</span>
-                  </div>
-                  <div class="exp-icon">
-                    <ion-menu-button style="width: 35px; height: 41px;" autoHide="false">
+    <div class="width-100" [ngSwitch]="segment">
+      <div *ngIf="parecerList">
+        <ion-list *ngSwitchCase="'parecer'">
+          <!-- *ngFor = "let task of parecerList; let i = index"
+          (click)="viewExpedientDetail(task.SerialNumber)" -->
+          <ion-item 
+              class="expediente ion-no-padding"  
+              *ngFor = "let task of parecerList"
+              (click)="goToPedido(task.SerialNumber)"
+              >
+              <!-- (click)="viewExpedientDetail(task.SerialNumber)" -->
+              <!--  [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
+                <div class="item width-100">
+                  <div class="exp-top-detail">
+                    <div class="exp-date">
+                      <ion-label>{{ task.CreateDate | date: 'dd-MM-yy' }}</ion-label>
+                    </div>
+                    <div class="exp-remetente">
+                      <ion-label>{{task.Remetente}}</ion-label>
+                    </div>
+                    <div class="exp-icon">
                       <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
-                    </ion-menu-button> 
+                      <label></label>
+                    </div>
+                  </div>
+                  <div class="exp-bottom-detail">
+                    <ion-label>{{ task.Folio }}</ion-label>
                   </div>
                 </div>
-                <div class="exp-bottom-detail">
-                  <ion-label>{{ task.Folio }}</ion-label>
+              </ion-item>
+        </ion-list>
+  
+      </div>
+      <div *ngIf="deferimentoList">
+        <ion-list *ngSwitchCase="'deferimento'">
+          <ion-item 
+              class="expediente ion-no-padding"  
+              *ngFor = "let task of deferimentoList"
+              (click)="viewPedidoDetail(task.SerialNumber)"
+              >
+              <!-- (click)="viewExpedientDetail(task.SerialNumber)" -->
+              <!--  [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
+                <div class="item width-100">
+                  <div class="exp-top-detail">
+                    <div class="exp-date">
+                      <ion-label>{{ task.CreateDate | date: 'dd-MM-yy' }}</ion-label>
+                    </div>
+                    <div class="exp-remetente">
+                      <ion-label>{{task.Remetente}}</ion-label>
+                    </div>
+                    <div class="exp-workflow">
+                      <span class="label">{{task.WorkflowName}}</span>
+                    </div>
+                    <div class="exp-icon">
+                      <ion-menu-button style="width: 35px; height: 41px;" autoHide="false">
+                        <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                      </ion-menu-button> 
+                    </div>
+                  </div>
+                  <div class="exp-bottom-detail">
+                    <ion-label>{{ task.Folio }}</ion-label>
+                  </div>
                 </div>
-              </div>
-            </ion-item>
+              </ion-item>
+        </ion-list>
+      </div>
+    </div>
+    <div *ngIf="!parecerList && !deferimentoList">
+    
+      <ion-list>
+        <ion-item>
+          <ion-thumbnail slot="end">
+            <ion-skeleton-text animated></ion-skeleton-text>
+          </ion-thumbnail>
+          <ion-label>
+            <h3><ion-skeleton-text animated style="width: 50%"></ion-skeleton-text></h3>
+            <p><ion-skeleton-text animated style="width: 80%"></ion-skeleton-text></p>
+            <p><ion-skeleton-text animated style="width: 60%"></ion-skeleton-text></p>
+          </ion-label>
+        </ion-item>
+        <ion-item>
+          <ion-thumbnail slot="end">
+            <ion-skeleton-text animated></ion-skeleton-text>
+          </ion-thumbnail>
+          <ion-label>
+            <h3><ion-skeleton-text animated style="width: 50%"></ion-skeleton-text></h3>
+            <p><ion-skeleton-text animated style="width: 80%"></ion-skeleton-text></p>
+            <p><ion-skeleton-text animated style="width: 60%"></ion-skeleton-text></p>
+          </ion-label>
+        </ion-item>
       </ion-list>
     </div>
   </div>
-  <div *ngIf="!parecerList && !deferimentoList">
-  
-    <ion-list>
-      <ion-item>
-        <ion-thumbnail slot="end">
-          <ion-skeleton-text animated></ion-skeleton-text>
-        </ion-thumbnail>
-        <ion-label>
-          <h3><ion-skeleton-text animated style="width: 50%"></ion-skeleton-text></h3>
-          <p><ion-skeleton-text animated style="width: 80%"></ion-skeleton-text></p>
-          <p><ion-skeleton-text animated style="width: 60%"></ion-skeleton-text></p>
-        </ion-label>
-      </ion-item>
-      <ion-item>
-        <ion-thumbnail slot="end">
-          <ion-skeleton-text animated></ion-skeleton-text>
-        </ion-thumbnail>
-        <ion-label>
-          <h3><ion-skeleton-text animated style="width: 50%"></ion-skeleton-text></h3>
-          <p><ion-skeleton-text animated style="width: 80%"></ion-skeleton-text></p>
-          <p><ion-skeleton-text animated style="width: 60%"></ion-skeleton-text></p>
-        </ion-label>
-      </ion-item>
-    </ion-list>
-  </div>
+
+
 </ion-content>
 

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;

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();
   }

src/app/pages/gabinete-digital/pendentes/pendentes.page.html

@@ -1,5 +1,10 @@
 <ion-header class="ion-no-border">
-  <app-btn-modal-dismiss></app-btn-modal-dismiss>
+  <app-header > </app-header>
+</ion-header>
+
+
+<ion-header class="ion-no-border header-2">
+  <app-btn-modal-dismiss (click)="goBack()" ></app-btn-modal-dismiss>
   <div class="title">
     <div class="thetitle"><ion-label >Pendentes</ion-label></div>
     <div class="theicon">
@@ -9,8 +14,11 @@
     </div>
   </div>
 </ion-header>
+
 <ion-content>
-  <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
+
+  <div class="main-content">
+    <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
       <ion-refresher-content
         pullingIcon="chevron-down-circle-outline"
         pullingText="deslize para actualizar"
@@ -53,30 +61,32 @@
   
       </div>
     </div>
-  <div *ngIf="!pendentesList">
-  
-    <ion-list>
-      <ion-item>
-        <ion-thumbnail slot="end">
-          <ion-skeleton-text animated></ion-skeleton-text>
-        </ion-thumbnail>
-        <ion-label>
-          <h3><ion-skeleton-text animated style="width: 50%"></ion-skeleton-text></h3>
-          <p><ion-skeleton-text animated style="width: 80%"></ion-skeleton-text></p>
-          <p><ion-skeleton-text animated style="width: 60%"></ion-skeleton-text></p>
-        </ion-label>
-      </ion-item>
-      <ion-item>
-        <ion-thumbnail slot="end">
-          <ion-skeleton-text animated></ion-skeleton-text>
-        </ion-thumbnail>
-        <ion-label>
-          <h3><ion-skeleton-text animated style="width: 50%"></ion-skeleton-text></h3>
-          <p><ion-skeleton-text animated style="width: 80%"></ion-skeleton-text></p>
-          <p><ion-skeleton-text animated style="width: 60%"></ion-skeleton-text></p>
-        </ion-label>
-      </ion-item>
-    </ion-list>
+    <div *ngIf="!pendentesList">
+    
+      <ion-list>
+        <ion-item>
+          <ion-thumbnail slot="end">
+            <ion-skeleton-text animated></ion-skeleton-text>
+          </ion-thumbnail>
+          <ion-label>
+            <h3><ion-skeleton-text animated style="width: 50%"></ion-skeleton-text></h3>
+            <p><ion-skeleton-text animated style="width: 80%"></ion-skeleton-text></p>
+            <p><ion-skeleton-text animated style="width: 60%"></ion-skeleton-text></p>
+          </ion-label>
+        </ion-item>
+        <ion-item>
+          <ion-thumbnail slot="end">
+            <ion-skeleton-text animated></ion-skeleton-text>
+          </ion-thumbnail>
+          <ion-label>
+            <h3><ion-skeleton-text animated style="width: 50%"></ion-skeleton-text></h3>
+            <p><ion-skeleton-text animated style="width: 80%"></ion-skeleton-text></p>
+            <p><ion-skeleton-text animated style="width: 60%"></ion-skeleton-text></p>
+          </ion-label>
+        </ion-item>
+      </ion-list>
+    </div>
   </div>
+
 </ion-content>
 

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;

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');