save

src/app/pages/agenda/view-event/view-event.page.ts

@@ -95,7 +95,12 @@ export class ViewEventPage implements OnInit {
 
   goBack() {
     this.activatedRoute.paramMap.subscribe(params => {
-      this.router.navigate(['/home',params["params"].caller]);
+      if(params["params"].caller == 'expediente'){
+        window.history.back();
+      }
+      else{
+        this.router.navigate(['/home',params["params"].caller]);
+      }
     });
 
     /* this.activatedRoute.queryParams.subscribe(params => {

src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html

@@ -72,29 +72,27 @@
         </div>
   
         <div *ngIf="eventsList">
-          <h3 class="h3-event-title">Eventos Associados</h3>
+          <h5 class="h3-event-title">Eventos Associados</h5>
           <ion-list>
-            <div *ngIf="eventsList">
-              <ion-item-sliding>
-                <ion-item 
-                  class="Rectangle" lines="none" 
-                  *ngFor="let event of eventsList"
-                  (click)="viewEventDetail(event.EventId)"
+            <div class="content-items width-100" *ngIf="eventsList">
+              <ion-list>
+                <ion-item class=" ion-no-padding width-100 cursor-pointer" 
+                lines="none" *ngFor="let event of eventsList"
+                (click)="goToEvent(event.EventId)"
                 >
-                    <!-- [routerLink]="['/home/events', event.EventId, 'events']" -->
-                    <div class="content-{{profile}}-{{event.CalendarName}} width-100 ">
-                      <div class="approve-event-time">
-                        <p>{{event.StartDate | date: 'hh:mm'}}</p>
-                        <p>{{event.EndDate | date: 'hh:mm'}}</p>
-                      </div>
-                      <div class="approve-event-detail">
-                        <p *ngIf="event.StartDate != event.EndDate">{{event.StartDate | date: 'd/M/yy' }} - {{ event.EndDate | date: 'dd/mm/yy'}}  |  {{event.Location}}</p>
-                        <p *ngIf="event.StartDate == event.EndDate">{{event.StartDate | date: 'd/M/yy' }}  |  {{event.Location}}</p>
-                        <h3>{{event.Subject}}</h3>
-                      </div>
-                    </div>
-                  </ion-item>
-              </ion-item-sliding>
+                <div class="d-flex  content-{{profile}}-{{event.CalendarName}}">
+                  <div class="schedule-time">
+                    <div class="time-start">{{event.StartDate | date: 'HH:mm'}}</div>
+                    <div class="time-end">{{event.EndDate | date: 'HH:mm'}}</div>
+                  </div>
+                  <div class="schedule-details">
+                    <div class="location">{{event.Location}}</div>
+                    <div class="description">{{event.Subject}}</div>
+                  </div>
+                </div>
+                </ion-item>
+    
+              </ion-list>
             </div>
           </ion-list>
         </div>

src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss

@@ -197,6 +197,86 @@ ion-button{
   }
 }
 
+
+.content-items{
+  .item-exp{
+    overflow: auto;
+    padding-top: 5px;
+    padding-bottom: 5px;
+  }
+  ion-list{
+    padding: 0px;
+    margin: 0px;
+    .d-flex{
+      width: 100%;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+    }
+    ion-item{
+      padding-bottom: 5px;
+      margin-top: 5px;
+      border-bottom: 1px solid #ebebeb;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      .schedule-time{
+        margin-right: 10px;
+        .time-start{
+          color: #797979 !important;
+          font-family: Roboto;
+          font-size: 13px;
+        }
+        .time-end{
+          color: #797979 !important;
+          font-family: Roboto;
+          font-size: 13px;
+        }
+      }
+      .schedule-date{
+        margin-right: 10px;
+        width: 22%;
+        color: #797979 !important;
+        font-size: 13px;
+      }
+      .schedule-details{
+        display: flex;
+        flex-wrap: wrap;
+        align-items: center;
+        width: 100%;
+        .location{
+          font-family: Roboto;
+          font-size: 13px;
+          color: black;
+          width: 100%;
+        
+        }
+        .description{
+          font-family: Roboto;
+          font-size: 15px;
+          font-weight: bold;
+          color: #0d89d1;
+        }
+      }
+      .color{
+        width: 5px;
+        height: 40px;
+        border-top-right-radius: 5px;
+        border-bottom-right-radius: 5px;
+        background-color: #f05d5e;
+      }
+    }
+    ion-item:last-child{
+      border-bottom: unset !important;
+      padding-bottom: unset !important;
+    }
+  }
+    
+}
+
+
+
+
 @media only screen and (max-width: 800px) {
   .content{
     width: 100% !important;

src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts

@@ -115,6 +115,7 @@ export class ExpedienteDetailPage implements OnInit {
             this.router.navigate(['/home/gabinete-digital'], navigationExtras);
           }
           break;
+        
       }
     });
   }
@@ -320,6 +321,10 @@ export class ExpedienteDetailPage implements OnInit {
     modal.onDidDismiss();
   }
 
+  goToEvent(eventId:any){
+    this.router.navigate(['/home/events', eventId, 'expediente']);
+  }
+
   async viewEventDetail(eventId: any) {
     console.log(this.profile);