Merge branch 'feature/home' into feature/chat

This commit is contained in:
tiago.kayaya
2021-01-05 10:17:44 +01:00
3 changed files with 40 additions and 30 deletions
+8 -23
View File
@@ -44,6 +44,7 @@
</li>
</ul>
<!--
<div class="resume">
<div class="title">
Resumo para Amnahã
@@ -51,6 +52,7 @@
<div class="event-num">4 eventos ageandados para amanhã</div>
<div class="first-event-time">08:30 "Reunião Staff" no Palácio Presidencial</div>
</div>
-->
</div>
</div>
@@ -65,32 +67,15 @@
</div>
<div class="content">
<ul>
<li>
<li *ngFor = "let task of taskslist"
[routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]">
<div class="schedule-details">
<div class="description">Reunião de Conselho de Ministros</div>
<div class="location">MINEC, MINFIN</div>
</div>
</li>
<li>
<div class="schedule-details">
<div class="description">Reunião de Conselho de Ministros</div>
<div class="location">MINEC, MINFIN</div>
</div>
</li>
<li>
<div class="schedule-details">
<div class="description">Reunião de Conselho de Ministros</div>
<div class="location">MINEC, MINFIN</div>
</div>
</li>
<li>
<div class="schedule-details">
<div class="description">Reunião de Conselho de Ministros</div>
<div class="location">MINEC, MINFIN</div>
<div class="schedule-details pointer">
<div class="description">{{ task.Remetente }}</div>
<div class="location">{{ task.Folio }}</div>
</div>
</li>
</ul>
</div>
</div>
+4
View File
@@ -450,6 +450,10 @@ ion-toolbar{
display: flex;
}
.pointer{
cursor: pointer;
}
@media only screen and (min-width: 804px) {
.schedule:first-child {
+28 -7
View File
@@ -13,6 +13,7 @@ import { ModalController } from '@ionic/angular';
import { EventDetailPage } from './event-detail/event-detail.page';
import { EventDetailModalPage } from './event-detail-modal/event-detail-modal.page';
import { ProcessesService } from '../../services/processes.service';
import { DailyWorkTask } from '../../models/dailyworktask.model';
@Component({
selector: 'app-events',
@@ -51,6 +52,8 @@ export class EventsPage implements OnInit {
currentHoursMinutes: String;
showLoader: boolean;
taskslist:DailyWorkTask[];
constructor(private eventService: EventsService,
private router: Router,
@@ -58,16 +61,17 @@ export class EventsPage implements OnInit {
public activatedRoute: ActivatedRoute,
private alertController: AlertService,
private modalController: ModalController,
private authService: AuthService) {
private authService: AuthService,
private processes:ProcessesService) {
this.prEventList = null;
// update hours and time
// update hours and minutes
setInterval(()=> {
let d = new Date();
let n = d.toLocaleTimeString();
this.currentHoursMinutes = n.slice(0,5);
this.currentHoursMinutes = formatDate(new Date(), 'HH:MM', 'pt');
}, 1000);
// list
this.LoadList();
}
@@ -229,7 +233,7 @@ export class EventsPage implements OnInit {
/**
* @returns time in format HH:MM:SS
* @returns time in format HH:MM
*/
get hoursMinutes():String {
@@ -237,5 +241,22 @@ export class EventsPage implements OnInit {
}
LoadList()
{
this.processes.GetTasksList("Expediente", false).subscribe(result => {
this.taskslist = new Array();
result.forEach(element => {
let task: DailyWorkTask = {
"SerialNumber": element.serialNumber,
"Folio": element.workflowInstanceFolio,
"Senders": element.originator.email,
"CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
"DocumentURL": element.formURL,
"Remetente": element.workflowInstanceDataFields.Remetente
}
this.taskslist.push(task);
});
});
}
}