Merge branch 'developer' of bitbucket.org:equilibriumito/gabinete-digital into developer

src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html

@@ -7,61 +7,21 @@
       </button>
     </div>
   </div>
-  <ion-toolbar *ngIf="loggeduser.Profile == 'MDGPR'">
-    <ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
-      <ion-segment-button value="expedientes">
-        Expediente
-      </ion-segment-button>
-      <ion-segment-button value="pendentes">
-        Pendente
-      </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>
+  <ion-refresher  name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
+    <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
+    <ion-refresher-content>
+    </ion-refresher-content>
+  </ion-refresher>
   
-  <div class="width-100" [ngSwitch]="segment" *ngIf="taskslist">
-    <ion-list *ngSwitchCase="'expedientes'">
+  <div class="width-100" *ngIf="taskslist">
+    <ion-list>
       <ion-item 
           class="expediente ion-no-padding cursor-pointer"  
           *ngFor = "let task of taskslist"
           (click)="goToExpediente(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>
-    <ion-list *ngSwitchCase="'pendentes'">
-      <ion-item 
-          class="expediente ion-no-padding cursor-pointer"  
-          *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">

src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts

@@ -18,17 +18,13 @@ import { AuthService } from 'src/app/services/auth.service';
   styleUrls: ['./expedientes-pr.page.scss'],
 })
 export class ExpedientesPrPage implements OnInit {
-  segment:string;
-  //profile:string;
-
   @ViewChild(CalendarComponent) myCal: CalendarComponent;
 
   taskslist:DailyWorkTask[];
   serialNumber:string;
+  showLoader:boolean;
 
   loggeduser: User;
-
-  @Input() profile:string;
   @Output() openExpedientDetail:EventEmitter<any> = new EventEmitter<any>();
 
   constructor(
@@ -38,19 +34,10 @@ export class ExpedientesPrPage implements OnInit {
     private authService: AuthService,
     private router: Router, 
     ) { 
-      this.profile = 'mdgpr';
       this.loggeduser = authService.ValidatedUser;
     }
 
   ngOnInit() {
-    //Inicializar segment
-    this.segment = "expedientes";
-    this.LoadList();
-  }
-
-  segmentChanged(){
-    console.log(this.segment);
-    
     this.LoadList();
   }
 
@@ -64,59 +51,68 @@ export class ExpedientesPrPage implements OnInit {
   }
 
   LoadList(){
-    switch(this.segment){
-      case "expedientes":
-        this.processes.GetTasksList("Expediente", false).subscribe(result => {
+    this.showLoader = true;
+    switch (this.loggeduser.Profile) {
+      case 'MDGPR':
+        this.processes.GetTasksList("Expediente do Presidente", false).subscribe(result => {
           console.log(result);
           this.taskslist = new Array();
           let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active");
           res.forEach(element => {
+            let date = new Date(element.taskStartDate);
+            date.setMonth(date.getMonth() + 1);
+            let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
             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'),
+              "CreateDate": taskDate,
               "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
               "Remetente": element.workflowInstanceDataFields.Remetente,
               "DocumentsQty": 0,
               "WorkflowName": element.workflowDisplayName,
               "activityInstanceName": element.activityInstanceName,
-            }
-            this.taskslist.push(task);
-          });
+              }
+              this.taskslist.push(task);
+            });
           console.log(this.taskslist);
+          this.showLoader = false;
         });
+        
         break;
-      case "pendentes":
-        this.processes.GetTasksList("Expediente", false).subscribe(result => {
-          console.log(result);
-          this.taskslist = new Array();
-          let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Pending");
-          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,
-              "DocumentsQty": 0,
-              "WorkflowName": element.workflowDisplayName,
-              "activityInstanceName": element.activityInstanceName,
-            }
-            this.taskslist.push(task);
+        case 'PR':
+          this.processes.GetTasksList("Expediente do Presidente", false).subscribe(result => {
+            console.log(result);
+            this.taskslist = new Array();
+            let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active");
+            res.forEach(element => {
+              let date = new Date(element.taskStartDate);
+              date.setMonth(date.getMonth() + 1);
+              let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
+              let task: DailyWorkTask = {
+                "SerialNumber": element.serialNumber,
+                "Folio": element.workflowInstanceDataFields.Subject,
+                "Senders": element.originator.email,
+                "CreateDate": taskDate,
+                "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
+                "Remetente": element.workflowInstanceDataFields.Remetente,
+                "DocumentsQty": 0,
+                "WorkflowName": element.workflowDisplayName,
+                "activityInstanceName": element.activityInstanceName,
+                }
+                this.taskslist.push(task);
+              });
+            console.log(this.taskslist);
+            this.showLoader = false;
           });
-          console.log(this.taskslist);
-        });
+        
         break;
     }
   }
 
-  doRefresh(event) {
+  doRefresh() {
     this.LoadList();
-
     setTimeout(() => {
-      event.target.complete();
     }, 2000);
   }
 
@@ -130,16 +126,12 @@ export class ExpedientesPrPage implements OnInit {
   }
 
   async viewExpedientDetail(serialNumber:any) {
-    console.log(this.profile);
-
-
-
     const modal = await this.modalController.create({
       component: ExpedienteDetailPage,
       componentProps:{
         enterAnimation: "",
         serialNumber: serialNumber,
-        profile: this.profile,
+        profile: this.loggeduser.Profile,
       },
       cssClass: 'modal modal-desktop',
     });