This commit is contained in:
tiago.kayaya
2021-06-23 13:31:25 +01:00
parent d1ce8be9fd
commit d652632e2d
15 changed files with 37 additions and 30 deletions
@@ -31,7 +31,7 @@
</div> </div>
<ion-list *ngSwitchCase="'MDGPR'"> <ion-list *ngSwitchCase="'MDGPR'">
<div *ngIf="eventsMDGPRList"> <div *ngIf="eventsMDGPRList" class="overflow-y-auto height-100">
<ion-item-sliding> <ion-item-sliding>
<ion-item class="Rectangle cursor-pointer" lines="none" <ion-item class="Rectangle cursor-pointer" lines="none"
*ngFor="let event of eventsMDGPRList" (click)="goToEventToApproveDetail(event.serialNumber)"> *ngFor="let event of eventsMDGPRList" (click)="goToEventToApproveDetail(event.serialNumber)">
@@ -52,7 +52,7 @@
</div> </div>
</ion-list> </ion-list>
<ion-list *ngSwitchCase="'PR'"> <ion-list *ngSwitchCase="'PR'">
<div *ngIf="eventsPRList"> <div *ngIf="eventsPRList" class="overflow-y-auto height-100">
<ion-item-sliding> <ion-item-sliding>
<ion-item class="Rectangle cursor-pointer" lines="none" <ion-item class="Rectangle cursor-pointer" lines="none"
*ngFor="let event of eventsPRList" (click)="goToEventToApproveDetail(event.serialNumber)"> *ngFor="let event of eventsPRList" (click)="goToEventToApproveDetail(event.serialNumber)">
@@ -22,8 +22,7 @@
</ion-refresher-content> </ion-refresher-content>
</ion-refresher> </ion-refresher>
<div class="main-content width-100"> <div *ngIf="despachoList.length >= 1" class="main-container width-100 overflow-y-auto height-100">
<div *ngIf="despachoList">
<ion-list> <ion-list>
<ion-item <ion-item
class="expediente ion-no-padding cursor-pointer" class="expediente ion-no-padding cursor-pointer"
@@ -57,10 +56,8 @@
</div> </div>
</ion-item> </ion-item>
</ion-list> </ion-list>
</div>
</div> </div>
<div *ngIf="despachoList?.length < 1"> <div *ngIf="despachoList?.length < 1" class="overflow-y-auto height-100">
<ion-list> <ion-list>
<ion-item> <ion-item>
@@ -1,5 +1,5 @@
@import '~src/function.scss'; @import '~src/function.scss';
.main-content{ .main-container{
padding: 30px 20px 0 20px !important; padding: 30px 20px 0 20px !important;
margin: 0; margin: 0;
color:#000; color:#000;
@@ -18,9 +18,8 @@
</ion-refresher-content> </ion-refresher-content>
</ion-refresher> </ion-refresher>
<div class="width-100"> <div *ngIf="despachoList.length >= 1" class="overflow-y-auto height-100 width-100">
<div *ngIf="despachoList"> <ion-list part="divo">
<ion-list>
<ion-item <ion-item
class="expediente ion-no-padding cursor-pointer" class="expediente ion-no-padding cursor-pointer"
*ngFor = "let task of despachoList; let i = index" *ngFor = "let task of despachoList; let i = index"
@@ -53,10 +52,8 @@
</div> </div>
</ion-item> </ion-item>
</ion-list> </ion-list>
</div>
</div> </div>
<div *ngIf="despachoList?.length < 1"> <div *ngIf="despachoList.length < 1">
<ion-list> <ion-list>
<ion-item> <ion-item>
@@ -1,9 +1,10 @@
@import '~src/function.scss'; @import '~src/function.scss';
/* CONTENT */ /* CONTENT */
:host{ :host{
padding: 30px 20px 0 20px !important; padding: 30px 20px 0 20px !important;
margin: 0; margin: 0;
} }
.title{ .title{
font-family: Roboto; font-family: Roboto;
font-size: 25px; font-size: 25px;
@@ -19,8 +19,8 @@
</ion-refresher-content> </ion-refresher-content>
</ion-refresher> </ion-refresher>
<div class="width-100"> <div class="width-100 overflow-y-auto height-100">
<div *ngIf="diplomasList"> <div *ngIf="diplomasList.length >= 1">
<ion-list > <ion-list >
<!-- *ngFor = "let task of parecerList; let i = index" <!-- *ngFor = "let task of parecerList; let i = index"
(click)="viewExpedientDetail(task.SerialNumber)" --> (click)="viewExpedientDetail(task.SerialNumber)" -->
@@ -28,7 +28,7 @@
</ion-refresher-content> </ion-refresher-content>
</ion-refresher> </ion-refresher>
<div class="width-100" [ngSwitch]="segment"> <div class="width-100 overflow-y-auto height-100" [ngSwitch]="segment">
<div *ngIf="diplomasList"> <div *ngIf="diplomasList">
<ion-list *ngSwitchCase="'validar'"> <ion-list *ngSwitchCase="'validar'">
<ion-item <ion-item
@@ -1,4 +1,4 @@
<ion-content> <ion-header>
<div class="title width-100"> <div class="title width-100">
<div class="title-container d-flex justify-space-between"> <div class="title-container d-flex justify-space-between">
<span class="text-center mt-0 aside-title px-20"><label>Eventos para Aprovação</label></span> <span class="text-center mt-0 aside-title px-20"><label>Eventos para Aprovação</label></span>
@@ -17,12 +17,14 @@
</ion-segment> </ion-segment>
</ion-toolbar> </ion-toolbar>
</div> </div>
</ion-header>
<ion-content>
<ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh()"> <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh()">
<ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar> <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
<ion-refresher-content> <ion-refresher-content>
</ion-refresher-content> </ion-refresher-content>
</ion-refresher> </ion-refresher>
<div class="main-content" [ngSwitch]="segment" *ngIf="eventsMDGPRList"> <div class="main-content overflow-y-auto height-100" [ngSwitch]="segment" *ngIf="eventsMDGPRList.length >= 1">
<!-- <div class="header-content width-100"> --> <!-- <div class="header-content width-100"> -->
<!-- </div> --> <!-- </div> -->
@@ -15,7 +15,7 @@
</ion-refresher-content> </ion-refresher-content>
</ion-refresher> </ion-refresher>
<div class="width-100" *ngIf="taskslist"> <div class="width-100 overflow-y-auto height-100" *ngIf="taskslist.length >= 1">
<ion-list> <ion-list>
<ion-item <ion-item
class="expediente ion-no-padding cursor-pointer" class="expediente ion-no-padding cursor-pointer"
@@ -18,7 +18,7 @@
</ion-refresher-content> </ion-refresher-content>
</ion-refresher> </ion-refresher>
<div class="width-100" *ngIf="taskslist"> <div class="width-100 overflow-y-auto height-100" *ngIf="taskslist.length >= 1">
<ion-list> <ion-list>
<ion-item <ion-item
class="expediente ion-no-padding cursor-pointer" class="expediente ion-no-padding cursor-pointer"
@@ -29,7 +29,7 @@
</ion-refresher> </ion-refresher>
<div class="width-100" [ngSwitch]="segment"> <div class="width-100" [ngSwitch]="segment">
<div *ngIf="parecerList"> <div *ngIf="parecerList.length >= 1" class="overflow-y-auto height-100">
<ion-list *ngSwitchCase="'parecer'"> <ion-list *ngSwitchCase="'parecer'">
<!-- *ngFor = "let task of parecerList; let i = index" <!-- *ngFor = "let task of parecerList; let i = index"
(click)="viewExpedientDetail(task.SerialNumber)" --> (click)="viewExpedientDetail(task.SerialNumber)" -->
@@ -64,7 +64,7 @@
</ion-list> </ion-list>
</div> </div>
<div *ngIf="deferimentoList"> <div *ngIf="deferimentoList.length >= 1" class="overflow-y-auto height-100">
<ion-list *ngSwitchCase="'deferimento'"> <ion-list *ngSwitchCase="'deferimento'">
<ion-item <ion-item
class="expediente ion-no-padding cursor-pointer" class="expediente ion-no-padding cursor-pointer"
@@ -18,8 +18,7 @@
</ion-refresher-content> </ion-refresher-content>
</ion-refresher> </ion-refresher>
<div class="width-100"> <div *ngIf="pendentesList.length >= 1" class="width-100 overflow-y-auto height-100">
<div *ngIf="pendentesList">
<ion-list> <ion-list>
<ion-item <ion-item
class="expediente ion-no-padding cursor-pointer" class="expediente ion-no-padding cursor-pointer"
@@ -49,10 +48,8 @@
</div> </div>
</ion-item> </ion-item>
</ion-list> </ion-list>
</div>
</div> </div>
<div *ngIf="pendentesList?.length < 1 || pendentesList.length == 0"> <div *ngIf="pendentesList.length < 1">
<ion-list> <ion-list>
<ion-item> <ion-item>
+5
View File
@@ -693,6 +693,11 @@ app-header-no-search .ion-toolbar{
margin: 0px auto; margin: 0px auto;
} }
/* .main-content{
height: 100% !important;
overflow-y: auto !important;
} */
body, .blue-background{ background: #0782C9 !important;} body, .blue-background{ background: #0782C9 !important;}
+2
View File
@@ -420,6 +420,8 @@
border-bottom-right-radius: 25px; border-bottom-right-radius: 25px;
} }
// system spacing // system spacing
+6
View File
@@ -559,6 +559,12 @@ $app-theme: mat-light-theme((
} }
} }
/* .main-content{
width: 100%;
height: 100% !important;
overflow-y: auto;
} */
/* Importing Bootstrap SCSS file. */ /* Importing Bootstrap SCSS file. */