peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-20 05:16:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/home' into feature/chat

Browse Source
This commit is contained in:
tiago.kayaya
2021-01-05 14:24:03 +01:00
parent 4f5375d625 e6bb234221
commit 23ee5d8862
6 changed files with 109 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/events/events.page.html
+10 -5
View File
@@ -9,19 +9,19 @@
<p class="time ion-text-center">{{customDate}}</p>
</ion-label>
<ion-label>
<p class="event-number p-small ion-text-center"> <bold>{{totalEvent}}</bold> eventos agendados para hoje</p>
<p class="event-number p-small ion-text-center"> <strong>{{totalEvent}}</strong> eventos agendados para hoje</p>
</ion-label>
<div class="next-meeting">
<div class="meeting-time">{{hoursMinutes}}</div>
<div class="meeting-description">Reunião de Conselho de Ministros no Palácio Presidencial</div>
<div class="meeting-description"> "{{currentEvent}}"</div>
</div>
<div class="conteiner-box">
<div class="schedule">
<div class="schedule-header">
<div class="title">
<ion-icon class="icon" slot="end" src="assets/images/icons-nav-agenda-active.svg" ></ion-icon>
<ion-icon class="icon" slot="end" src="assets/images/icons-default-agenda.svg" ></ion-icon>
<div class="text">A sua Agenda</div>
</div>
<ion-icon class="icon-next" slot="end" src="assets/images/icons-arrow-circle-arrow-right.svg" ></ion-icon>
@@ -59,7 +59,7 @@
<div class="schedule">
<div class="schedule-header">
<div class="title">
<ion-icon class="icon" slot="end" src="assets/images/icons-nav-agenda-bag.svg"></ion-icon>
<ion-icon class="icon" slot="end" src="assets/images/icons-correspondencias.svg"></ion-icon>
<div class="text">Correspondência por ler</div>
</div>
<ion-icon class="icon-next" slot="end" src="assets/images/icons-arrow-circle-arrow-right.svg" ></ion-icon>
@@ -69,11 +69,16 @@
<ul>
<li *ngFor = "let task of taskslist"
[routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]">
<div class="d-flex">
<div class="schedule-date">
<div class="time-end">{{task.CreateDate | date: 'd/M/yy'}}</div>
<div class="time-start">{{task.CreateDate | date: 'hh:mm'}}</div>
</div>
<div class="schedule-details pointer">
<div class="description">{{ task.Remetente }}</div>
<div class="location">{{ task.Folio }}</div>
</div>
</div>
</li>
</ul>
src/app/pages/events/events.page.scss
+8 -2
View File
@@ -367,6 +367,7 @@ ion-toolbar{
padding: 0px;
margin: 0px;
.d-flex{
width: 100%;
height: 40px;
display: flex;
justify-content: space-between;
@@ -392,6 +393,11 @@ ion-toolbar{
font-size: 13px;
}
}
.schedule-date{
width: 22%;
color: #797979 !important;
font-size: 13px;
}
.schedule-details{
display: flex;
flex-wrap: wrap;
@@ -420,8 +426,8 @@ ion-toolbar{
}
}
li:last-child{
//border-bottom: unset !important;
//padding-bottom: unset !important;
border-bottom: unset !important;
padding-bottom: unset !important;
}
}
src/app/pages/events/events.page.ts
+11 -5
View File
@@ -37,6 +37,7 @@ export class EventsPage implements OnInit {
/* Set segment variable */
segment:string;
public profile:string;
currentEvent: any;
eventsList: Event[];
officialeventsList: Event[];
@@ -83,19 +84,20 @@ export class EventsPage implements OnInit {
console.log(this.profile);
// set event list
if(this.profile == "mdgpr"){
this.eventService.getAllMdEvents(formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 00:00:00', formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => {
/* if(this.profile == "mdgpr"){
this.eventService.getAllMdEvents(formatDate(new Date(), 'yyyy-MM-dd HH:mm:ss', 'pt'), formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => {
this.eventsList = res;
console.log(this.eventsList);
this.totalEvent = this.eventsList.length;
});
}
else{
this.eventService.getAllPrEvents(formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 00:00:00', formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => {
this.eventService.getAllPrEvents(formatDate(new Date(), 'yyyy-MM-dd HH:mm:ss', 'pt'), formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => {
this.eventsList = res;
this.totalEvent = this.eventsList.length;
});
}
} */
this.showGreeting();
@@ -127,14 +129,18 @@ export class EventsPage implements OnInit {
{
case "Combinada":
if(this.profile == "mdgpr"){
this.eventService.getAllMdEvents(formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 00:00:00', formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => {
this.eventService.getAllMdEvents(formatDate(new Date(), 'yyyy-MM-dd HH:mm:ss', 'pt') /* + ' 00:00:00' */, formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => {
this.eventsList = res;
this.currentEvent = res[0].Subject;
this.totalEvent = this.eventsList.length;
this.showLoader = false;
});
}else{
this.eventService.getAllPrEvents(formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 00:00:00', formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => {
this.eventsList = res;
console.log(this.eventsList);
this.currentEvent = res[0].Subject;
this.totalEvent = this.eventsList.length;
this.showLoader = false;
});
}