peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-21 13:55:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Peter Maquiran
2021-06-24 16:34:53 +01:00
parent 67e62cce30 3191e74bf3
commit bf45208180
9 changed files with 111 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/events/events.page.html
+1 -1
View File
@@ -56,7 +56,7 @@
<div class="schedule-details">
<div class="location">{{event.Location}}</div>
<div class="description">
{{event.Subject}}
<p>{{event.Subject}}</p>
</div>
</div>
</div>
src/app/pages/events/events.page.scss
+4 -3
View File
@@ -408,7 +408,7 @@ ion-toolbar{
display: flex;
flex-wrap: wrap;
align-items: center;
width: 100%;
width: 78%;
.location{
font-family: Roboto;
font-size: 13px;
@@ -417,12 +417,13 @@ ion-toolbar{
}
.description{
width: 275px;
width: 100%;
font-family: Roboto;
font-size: 15px;
font-weight: bold;
color: #0d89d1;
}
.description p{
white-space: nowrap;
overflow: hidden !important;
text-overflow: ellipsis !important;
src/app/pages/gabinete-digital/event-list/event-list.page.scss
+2 -1
View File
@@ -6,8 +6,9 @@
}
.content{
padding: 30px 20px 0 20px !important;
margin: 0;
margin: 0 auto;
float: left;
overflow: auto;
}
.header-content{
margin: 0 !important;
src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html
+2 -4
View File
@@ -92,8 +92,7 @@
[showSeconds]="showSeconds"
[stepHour]="stepHour" [stepMinute]="stepMinute"
[stepSecond]="stepSecond"
[touchUi]="touchUi"
[color]="color">
[touchUi]="touchUi">
</ngx-mat-datetime-picker>
</mat-form-field>
@@ -132,8 +131,7 @@
[showSeconds]="showSeconds"
[stepHour]="stepHour" [stepMinute]="stepMinute"
[stepSecond]="stepSecond"
[touchUi]="touchUi"
[color]="color">
[touchUi]="touchUi">
</ngx-mat-datetime-picker>
</mat-form-field>
</div>
src/app/pages/gabinete-digital/pendentes/pendentes.page.html
+17 -12
View File
@@ -30,33 +30,38 @@
<div class="width-100">
<div *ngIf="pendentesList">
<ion-list>
<ion-item
class="expediente ion-no-padding cursor-pointer"
<div
class="expediente ion-no-padding ion-no-margin cursor-pointer"
*ngFor = "let task of pendentesList"
(click)="viewTaskDetails(task.SerialNumber, task.WorkflowName)"
>
<!-- [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.WorkflowName}}</span>
<div class="subject">
<ion-label>{{ task.Folio }}</ion-label>
</div>
<div class="exp-icon">
<ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
<label>{{task.DocumentsQty}}</label>
</div>
</div>
<div class="exp-middle-detail">
<div class="exp-workflow">
<span class="label">{{task.WorkflowName}}</span>
</div>
<div class="exp-date">
<ion-label>{{ task.CreateDate | date: 'dd-MM-yy' }}</ion-label>
</div>
</div>
<div class="exp-bottom-detail">
<ion-label>{{ task.Folio }}</ion-label>
<div class="exp-remetente">
<ion-label>{{task.Senders}}</ion-label>
</div>
</div>
</div>
</ion-item>
</div>
</ion-list>
</div>
src/app/pages/gabinete-digital/pendentes/pendentes.page.scss
+79 -53
View File
@@ -50,14 +50,12 @@ ion-item{
--background: none;
}
.item {
//border-radius: 15px;
//box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07);
/* 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;
overflow: auto;
}
.div-content-expediente{
width: 100%;
@@ -98,7 +96,6 @@ ion-item{
margin: 0;
}
.span-left{
/* border: 1px solid red; */
float: left;
font-size: 12px;
padding-left: 18px;
@@ -113,7 +110,12 @@ ion-item{
/* New CSS */
.expediente{
padding-top: 10px;
border-radius: 15px;
box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07);
border:1px solid #e9e9e9 !important;
background-color: var(--white);
margin-bottom: 10px !important;
padding: 15px;
}
.exp-list-item{
//width: 368px;
@@ -121,61 +123,85 @@ ion-item{
/* border-bottom: 1px solid gray; */
margin: 10px auto;
}
.exp-top-detail{
.exp-middle-detail, .exp-bottom-detail{
margin-bottom: 5px;
}
.exp-middle-detail{
font-size: 12pt;
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-workflow{
float: left;
margin-left: 15px;
.label{
border-radius: 20px;
background: #ffb703;
font-size: 12px;
.exp-workflow{
float: left;
margin: 0 !important;
.label{
border-radius: 15px;
background: #ffb703;
/* font-size: 12px; */
float: right;
padding: 2.5px 13.5px 2.5px 13.5px;
color: #fff;
}
}
.exp-date{
width: auto;
font-family: Roboto;
font-size: 10pt;
font-weight: normal;
font-stretch: normal;
font-style: normal;
line-height: normal;
letter-spacing: normal;
color: #797979;
float: right;
padding: 2.5px 13.5px 2.5px 13.5px;
color: #fff;
}
}
}
.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{
.exp-top-detail{
width: 100%;
float: left;
font-family: Roboto;
font-size: 16px;
font-size: 12pt;
font-weight: 700;
color: #0d89d1;
.subject{
width: 84%;
float: left;
}
.exp-icon{
width: fit-content;
float: right;
/* font-size: 13px; */
margin: 0 !important;
padding: 0 !important;
ion-icon{
font-size: 12pt;
color: #42b9fe;
float: left;
}
label{
font-size: 10pt;
}
}
}
.exp-bottom-detail{
font-size: 8pt;
width: 100%;
overflow: auto;
.exp-remetente{
//width: 200px;
font-family: Roboto;
/* font-size: 13px; */
font-weight: normal;
color: #000000;
float: left;
/* border: 1px solid red; */
}
}
.div-top-header{
width: 400px;