improvements

src/app/shared/gabinete-digital/despachos/despachos-routing.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { DespachosPage } from './despachos.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: DespachosPage
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class DespachosPageRoutingModule {}

src/app/shared/gabinete-digital/despachos/despachos.module.ts

@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+
+import { IonicModule } from '@ionic/angular';
+
+import { DespachosPageRoutingModule } from './despachos-routing.module';
+
+import { DespachosPage } from './despachos.page';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    FormsModule,
+    IonicModule,
+    DespachosPageRoutingModule
+  ],
+  declarations: [DespachosPage]
+})
+export class DespachosPageModule {}

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

@@ -0,0 +1,85 @@
+<ion-header class="ion-no-border">
+  <div class="title">
+    <div class="thetitle"><ion-label >Despacho</ion-label></div>
+    <div class="theicon">
+      <button class="btn-no-color" (click)="doRefresh($event)">
+        <ion-icon slot="end" class="title-icon" name="reload-circle"></ion-icon>
+      </button>
+    </div>
+  </div>
+  <ion-toolbar>
+    <ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
+      <ion-segment-button value="despachos">
+        Lista de despachos
+      </ion-segment-button>
+    </ion-segment>
+  </ion-toolbar>
+</ion-header>
+<ion-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>
+    </ion-refresher>
+  
+  <div class="width-100" [ngSwitch]="segment">
+    <div *ngIf="despachoList">
+      <ion-list *ngSwitchCase="'despachos'">
+        <ion-item 
+            class="expediente ion-no-padding"  
+            *ngFor = "let task of despachoList"
+            >
+            <!-- (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>
+  <div *ngIf="!despachoList">
+  
+    <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/shared/gabinete-digital/despachos/despachos.page.scss

@@ -0,0 +1,177 @@
+@import '~src/function.scss';
+/* CONTENT */
+:host{
+    padding: 30px 20px 0 20px !important;
+    margin: 0;
+}
+.title{
+    font-family: Roboto;
+    font-size: 25px;
+    color:#000;
+    overflow: auto;
+
+    .thetitle{
+      width: fit-content;
+      float: left;
+    }
+    .theicon{
+      width: fit-content;
+      float: right;
+    }
+  }
+.item-list-small{
+    font-size: 11px;
+    overflow: hidden;
+  }
+  .ion-item-class{
+    padding: 0;
+  
+  }
+  .label-text{
+    width: 100%;
+    padding: 0;
+    margin: 0;
+  }
+//DIV
+ion-item{
+  --background: none;
+}
+.item {
+    //border-radius: 15px;
+    //box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07);
+    //Sborder: solid 1px #e9e9e9;
+    background-color: var(--white);
+    margin: 0 auto;
+    //padding: 10px;
+    margin-bottom: 10px;
+    overflow: hidden;
+  }
+.div-content-expediente{
+  width: 100%;
+  float: left;
+  border-left: 3px solid #dae3f3;
+  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: 5px;
+}
+  .div-content-expediente h3, .div-content-pendentes h3{
+    margin: 0;
+    padding: 0;
+    font-size: 14pt;
+    width: 100%;
+  }
+  .div-icon{
+    width: 10%;
+    font-size: 20px;
+    float: left;
+    color: #808080;
+  }
+  .div-icon ion-icon{
+    display: block;
+    margin: 0 auto;
+  
+  }
+  .div-content-expediente p, .div-content-pendentes p{
+    font-size: 14pt;
+    color: rgb(94, 92, 92);
+    padding: 0;
+    margin: 0;
+  }
+  .span-left{
+      /* border: 1px solid red; */
+      float: left;
+      font-size: 12px;
+      padding-left: 18px;
+  }
+  .span-right{
+    /* border: 1px solid blue; */
+    text-align: right;
+    float: right;
+    font-size: 12px;
+    padding-right: 18px;
+}
+
+/* New CSS */
+.expediente{
+  padding-top: 10px;
+}
+.exp-list-item{
+  //width: 368px;
+  overflow: auto;
+  /* border-bottom: 1px solid gray; */
+  margin: 10px auto;
+}
+.exp-top-detail{
+  width: 100%;
+  overflow: auto;
+}
+.exp-date{
+  width: auto;
+  font-family: Roboto;
+  font-size: 13px;
+  font-weight: normal;
+  font-stretch: normal;
+  font-style: normal;
+  line-height: normal;
+  letter-spacing: normal;
+  color: #797979;
+  float: left;
+}
+.exp-remetente{
+  //width: 200px;
+  font-family: Roboto;
+  font-size: 13px;
+  font-weight: normal;
+  color: #000000;
+  float: left;
+  margin-left: 16px;
+
+}
+.exp-icon{
+  width: 45px;
+  float: right;
+  font-size: 13px;
+}
+.exp-icon ion-icon{
+  font-size: 25px;
+  color: #42b9fe;
+}
+.exp-bottom-detail{
+  float: left;
+  font-family: Roboto;
+  font-size: 16px;
+  font-weight: 700;
+  color: #0d89d1;
+}
+.div-top-header{
+  width: 400px;
+  margin: 6px auto;
+  background-color: #0782c9;
+  overflow: auto;
+}
+.div-search{
+  font-size: 45px;
+  float: left;
+  margin: 0 0 0 10px
+}
+.div-logo{
+  background: transparent;
+  width: 150px;
+  margin: 2.5px 0 2.5px 71px;
+  float: left;
+}
+.div-logo img{
+  width: 100%;
+}
+.div-profile{
+  font-size: 45px;
+  float: right;
+  margin-right: 10px;
+}

src/app/shared/gabinete-digital/despachos/despachos.page.spec.ts

@@ -0,0 +1,24 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { DespachosPage } from './despachos.page';
+
+describe('DespachosPage', () => {
+  let component: DespachosPage;
+  let fixture: ComponentFixture<DespachosPage>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ DespachosPage ],
+      imports: [IonicModule.forRoot()]
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(DespachosPage);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/shared/gabinete-digital/despachos/despachos.page.ts

@@ -0,0 +1,115 @@
+import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
+import { Router } from '@angular/router';
+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 'src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page';
+import { AlertService } from 'src/app/services/alert.service';
+
+@Component({
+  selector: 'app-despachos',
+  templateUrl: './despachos.page.html',
+  styleUrls: ['./despachos.page.scss'],
+})
+export class DespachosPage implements OnInit {
+ //profile:string;
+
+ @ViewChild(CalendarComponent) myCal: CalendarComponent;
+
+ taskslist:DailyWorkTask[];
+ despachoList:DailyWorkTask[];
+ deferimentoList:DailyWorkTask[];
+ taskType: string;
+ serialNumber:string;
+
+ @Input() profile:string;
+ segment:string;
+ @Output() openExpedientDetail:EventEmitter<any> = new EventEmitter<any>();
+
+ constructor(
+   private processes:ProcessesService,
+   private modalController: ModalController,
+   private alertService: AlertService,
+   ) { 
+     this.profile = 'mdgpr';
+   }
+
+ ngOnInit() {
+   //Inicializar segment
+   this.segment = "despachos";
+   this.LoadList();
+ }
+ segmentChanged(ev: any) {
+   this.LoadList();
+ }
+
+ notImplemented(){
+   this.alertService.presentAlert('Funcionalidade em desenvolvimento');
+ }
+
+ openExpedientDetailPage(data){
+   console.log(data);
+   this.openExpedientDetail.emit(data);
+ }
+
+ LoadList(){
+     this.processes.GetTasksList("Despacho", false).subscribe(result => {
+       console.log(result);
+       
+       this.despachoList = new Array();
+       let res = result.reverse();
+       res.forEach(element => {
+         let task: DailyWorkTask = {
+           "SerialNumber": element.serialNumber,
+           "Folio": element.workflowInstanceFolio,
+           "Senders": element.originator.email,
+           "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
+           "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
+           "Remetente": element.workflowInstanceDataFields.Remetente
+         }
+         this.despachoList.push(task);
+       });
+       console.log(this.despachoList);
+     });
+ }
+
+ doRefresh(event) {
+   this.LoadList();
+
+   setTimeout(() => {
+     event.target.complete();
+   }, 2000);
+ }
+
+ async viewExpedientDetail(serialNumber:any) {
+   console.log(this.profile);
+
+   let classs;
+   if( window.innerWidth <= 800){
+     classs = 'modal'
+   } else  {
+     classs = 'modal modal-desktop'
+   }
+
+   const modal = await this.modalController.create({
+     component: ExpedienteDetailPage,
+     componentProps:{
+       enterAnimation: "",
+       serialNumber: serialNumber,
+       profile: this.profile,
+     },
+     cssClass: classs,
+   });
+   await modal.present();
+   modal.onDidDismiss().then((res)=>{
+     console.log('refresh list');
+     this.LoadList();
+   });
+ }
+
+}
+ 

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

@@ -8,11 +8,11 @@
     </div>
   </div>
   <ion-toolbar>
-    <ion-segment [(ngModel)]="segment">
+    <ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
       <ion-segment-button value="parecer">
         Pedidos de Parecer
       </ion-segment-button>
-      <ion-segment-button value="deferimento" (click)="notImplemented()">
+      <ion-segment-button value="deferimento">
         Pedidos de Defereimento
       </ion-segment-button>
     </ion-segment>
@@ -28,41 +28,66 @@
       </ion-refresher-content>
     </ion-refresher>
   
-  <div class="width-100" [ngSwitch]="segment" *ngIf="taskslist">
-    <ion-list *ngSwitchCase="'parecer'">
-      <ion-item 
-          class="expediente ion-no-padding"  
-          *ngFor = "let task of taskslist"
-          (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 class="width-100" [ngSwitch]="segment">
+    <div *ngIf="parecerList">
+      <ion-list *ngSwitchCase="'parecer'">
+        <ion-item 
+            class="expediente ion-no-padding"  
+            *ngFor = "let task of parecerList"
+            >
+            <!-- (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-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 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)="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>
-            </div>
-          </ion-item>
-    </ion-list>
-    <ion-list *ngSwitchCase="'deferimento'">
-      <ion-item-group>
-        <ion-item-sliding>
-        </ion-item-sliding>
-      </ion-item-group>
-    </ion-list>
+            </ion-item>
+      </ion-list>
+    </div>
   </div>
-  <div *ngIf="!taskslist">
+  <div *ngIf="!parecerList && !deferimentoList">
   
     <ion-list>
       <ion-item>

src/app/shared/gabinete-digital/pedidos/pedidos.page.scss

@@ -21,7 +21,7 @@
   }
 .item-list-small{
     font-size: 11px;
-    overflow: auto;
+    overflow: hidden;
   }
   .ion-item-class{
     padding: 0;
@@ -44,7 +44,7 @@ ion-item{
     margin: 0 auto;
     //padding: 10px;
     margin-bottom: 10px;
-    overflow: auto;
+    overflow: hidden;
   }
 .div-content-expediente{
   width: 100%;

src/app/shared/gabinete-digital/pedidos/pedidos.page.ts

@@ -22,6 +22,9 @@ export class PedidosPage implements OnInit {
   @ViewChild(CalendarComponent) myCal: CalendarComponent;
 
   taskslist:DailyWorkTask[];
+  parecerList:DailyWorkTask[];
+  deferimentoList:DailyWorkTask[];
+  taskType: string;
   serialNumber:string;
 
   @Input() profile:string;
@@ -40,6 +43,9 @@ export class PedidosPage implements OnInit {
     //Inicializar segment
     this.LoadList();
   }
+  segmentChanged(ev: any) {
+    this.LoadList();
+  }
 
   notImplemented(){
     this.alertService.presentAlert('Funcionalidade em desenvolvimento');
@@ -51,25 +57,53 @@ export class PedidosPage implements OnInit {
   }
 
   LoadList(){
-    this.processes.GetTasksList("Pedido de Deferimento", false).subscribe(result => {
-      console.log(result);
-      
-      this.taskslist = new Array();
-      let res = result.reverse();
-      res.forEach(element => {
-        let task: DailyWorkTask = {
-          "SerialNumber": element.serialNumber,
-          "Folio": element.workflowInstanceDataFields.Subject,
-          "Senders": element.originator.email,
-          "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
-          "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
-          "Remetente": element.workflowInstanceDataFields.Remetente
-        }
-        this.taskslist.push(task);
+    if(this.segment == 'parecer'){
+      this.taskType = "Pedido de Parecer";
+      this.processes.GetTasksList("Pedido de Parecer", false).subscribe(result => {
+        console.log(result);
+        
+        this.parecerList = new Array();
+        let res = result.reverse();
+        res.forEach(element => {
+          let task: DailyWorkTask = {
+            "SerialNumber": element.serialNumber,
+            "Folio": element.workflowInstanceFolio,
+            "Senders": element.originator.email,
+            "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
+            "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
+            "Remetente": element.workflowInstanceDataFields.Remetente
+          }
+          this.parecerList.push(task);
+        });
+        console.log(this.parecerList);
+        
       });
-      console.log(this.taskslist);
-      
-    });
+    }
+    else if(this.segment == 'deferimento'){
+      this.taskType = "Pedido de Deferimento";
+      this.processes.GetTasksList("Pedido de Deferimento", false).subscribe(result => {
+        console.log(result);
+        
+        this.deferimentoList = new Array();
+        let res = result.reverse();
+        res.forEach(element => {
+          let task: DailyWorkTask = {
+            "SerialNumber": element.serialNumber,
+            "Folio": element.workflowInstanceFolio,
+            "Senders": element.originator.email,
+            "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
+            "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
+            "Remetente": element.workflowInstanceDataFields.Remetente
+          }
+          this.deferimentoList.push(task);
+        });
+        console.log(this.deferimentoList);
+        
+      });
+    }
+    console.log(this.taskType);
+    
+    
   }
 
   doRefresh(event) {