peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-20 13:26:08 +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-14 12:09:16 +01:00
parent 5f280283c8 8eeac8ca56
commit 9f598ac157
6 changed files with 146 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/agenda/view-event/view-event.page.html
+3 -3
View File
@@ -12,10 +12,10 @@
<ion-icon slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
</button>
</div>
<div class="middle d-flex align-center flex-grow-1">
<ion-label class="title">{{loadedEvent.Subject}}</ion-label>
<div class="middle">
<p class="title"><span>{{loadedEvent.Subject}}</span></p>
</div>
<div class="menu-options d-flex align-base">
<div class="menu-options d-flex">
<button class="btn-no-color" (click)="editEvent()">
<ion-icon class="edit" slot="end" src="assets/images/icons-edit.svg" ></ion-icon>
</button>
src/app/pages/agenda/view-event/view-event.page.scss
+33 -8
View File
@@ -5,6 +5,7 @@ ion-content{
--padding-start: 20px;
--padding-end: 20px;
font-size: 18px; */
overflow: auto;
}
ion-menu{
--height: 225px;
@@ -14,15 +15,18 @@ ion-menu{
--opacity: 1;
}
.main-header{
width: 100%; /* 400px */
font-family: Roboto;
background-color: #fff;
color:#000;
transform: translate3d(0, 1px, 0);
.title-content{
width: 100% !important;
margin: 0px auto;
overflow: auto;
padding: 0 !important;
background: #fff;
overflow: auto;
.left{
width: 37px;
@@ -30,19 +34,29 @@ ion-menu{
font-size: 35px;
}
.middle{
//width: 230px;
padding: 0!important;
float: left;
//margin: 2.5px 0 0 0;
width: calc(100% - 138.5px) !important;
padding: 0 !important;
float: left;
margin: 0 !important;
overflow: auto;
p{
margin: 0 !important;
}
}
.header-icon-right{
width: 45px;
font-size: 45px;
float: right;
}
.menu-options{
width: fit-content;
height: fit-content;
align-items: flex-start;
justify-content: flex-start;
float: right;
padding: 1px;
margin-left: 15px;
}
.menu-options .edit{
font-size: 35px;
@@ -64,6 +78,7 @@ ion-menu{
}
.main-content{
width: 100%;
font-family: Roboto;
background-color: #fff !important;
border-top-left-radius: 25px;
@@ -77,15 +92,21 @@ ion-menu{
}
.upper-content{
margin-left: 50px;
overflow: auto;
font-size: 18px;
width: calc(100%-50px);
margin-left: 50px;
overflow: auto;
font-size: 18px;
.content-location{
width: 100%;
margin: 0 auto;
padding: 0;
overflow: auto;
.date{
width: calc(100% - 105px);
float: left;
}
.label{
border-radius: 20px;
@@ -149,10 +170,14 @@ ion-menu{
}
}
.line{
width: 100% !important;
margin-top: 15px;
border-top: 1px solid #d8d8d8;
}
.middle-conten{
width: 100% !important;
overflow: auto;
.middle-content h3, .middle-content p{
font-size: 16px;
}
src/app/pages/agenda/view-event/view-event.page.ts
+6 -1
View File
@@ -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
+19 -21
View File
@@ -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
+80
View File
@@ -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
+5
View File
@@ -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);