Changes on Intervenientes + New Event

This commit is contained in:
Tiago Kayaya
2020-09-04 01:25:32 +01:00
parent b9a70fecb8
commit d82271ae37
13 changed files with 181 additions and 126 deletions
@@ -1,14 +1,14 @@
<ion-header class="ion-no-border">
<ion-toolbar>
<ion-title>Intervenientes</ion-title>
<ion-title>Participantes</ion-title>
</ion-toolbar>
<ion-toolbar>
<ion-segment [(ngModel)]="segment">
<ion-segment-button value="true">
Necessários
Intervenientes
</ion-segment-button>
<ion-segment-button value="false">
Opcionais
Com Conhecimento
</ion-segment-button>
</ion-segment>
</ion-toolbar>
@@ -16,14 +16,14 @@
<ion-content>
<ion-item-group>
<ion-button shape="round" (click)="addAttendees()" expand="block">
<ion-label>Adicionar intervenientes</ion-label>
<ion-label>Adicionar participantes</ion-label>
</ion-button>
</ion-item-group>
<ion-item-group [ngSwitch]="segment" *ngFor="let attendee of eventAttendees">
<ion-list *ngSwitchCase="attendee.IsRequired.toString()">
<ion-item-sliding>
<ion-item-options side="end">
<ion-item-option color="danger" (click)="removeAttendee(attendee)">Delete</ion-item-option>
<ion-item-option color="danger" (click)="removeAttendee(attendee)">Apagar</ion-item-option>
</ion-item-options>
<ion-item lines="none">
<ion-icon slot="start" name="person"></ion-icon>
@@ -93,9 +93,9 @@
<ion-buttons slot="end" (click)="openAttendees()">
<ion-label color="secondary">Editar</ion-label>
</ion-buttons>
<ion-label class="attach-label">Intervenientes</ion-label>
<ion-label class="attach-label">Participantes</ion-label>
</ion-item>
<div *ngFor="let attendee of loadedEvent.Attendees; let i=index">
<div *ngFor="let attendee of loadedEvent.Attendees; let i=index">
<div *ngIf="i<2">
<ion-list >
<ion-item class="attendees" lines="none" >
@@ -104,8 +104,12 @@
</ion-item>
</ion-list>
</div>
<div *ngIf="i>1">
<ion-button class="see-more-button" fill="none" shape="round" (click)="openAttendees()">
<ion-label color="secondary">Ver mais...</ion-label>
</ion-button>
</div>
</div>
</div>
<div class="div-attach">
<ion-item>
@@ -114,22 +118,37 @@
</ion-buttons>
<ion-label class="attach-label">Anexos</ion-label>
</ion-item>
<ion-list *ngIf="loadedEvent.HasAttachments">
<ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
<ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
<ion-refresher-content>
</ion-refresher-content>
</ion-refresher>
<ion-item lines="none" *ngFor="let att of loadedEventAttachments">
<ion-icon name="attach" slot="start"></ion-icon>
<ion-label>
<p>{{ att.Description }}</p>
<p>{{ att.CreateDate }}</p>
</ion-label>
<!-- <ion-icon name="trash" slot="end"></ion-icon> -->
</ion-item>
</ion-list>
<div *ngFor="let att of loadedEventAttachments; let j=index">
<div *ngIf="j<2">
<ion-list *ngIf="loadedEvent.HasAttachments">
<ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
<ion-item lines="none">
<ion-icon name="attach" slot="start"></ion-icon>
<ion-label>
<p>{{ att.Description }}</p>
<p>{{ att.CreateDate }}</p>
</ion-label>
</ion-item>
</ion-list>
</div>
<div *ngIf="j>1">
<ion-button class="see-more-button" fill="none" shape="round" (click)="showAlert()">
<ion-label color="secondary">Ver mais...</ion-label>
</ion-button>
</div>
</div>
<!-- Skeleton Attachment -->
<ion-list *ngIf="!loadedEventAttachments">
<ion-item lines="none" >
<ion-icon name="attach" slot="start"></ion-icon>
<ion-label>
<p> <ion-skeleton-text animated></ion-skeleton-text></p>
<p> <ion-skeleton-text animated></ion-skeleton-text></p>
</ion-label>
</ion-item>
</ion-list>
<!-- No attachment message -->
<ion-list *ngIf="!loadedEvent.HasAttachments">
<ion-item lines="none" >
<ion-label>
@@ -88,3 +88,7 @@ ion-card{
.attendees-icon{
font-size: 14px;
}
.see-more-button{
text-transform: initial;
font-size: 16px;
}
@@ -175,11 +175,9 @@ export class EventDetailPage implements OnInit {
}
loadAttachments()
{
console.log(this.pageId);
{
this.attachamentsService.getEventAttachments(this.pageId).subscribe(attachments => {
this.loadedEventAttachments = attachments;
console.log(attachments);
});
}
-19
View File
@@ -9,11 +9,6 @@
<h2 class="header-large">GABINETE DIGITAL</h2>
</ion-label>
</ion-item>
<!-- <ion-buttons slot="start" class="logout-button" (click)="logout()">
<ion-icon slot="start" name="log-out-outline"></ion-icon>
<ion-label>Sair</ion-label>
</ion-buttons> -->
<!-- customized TOGGLE button -->
<ion-buttons slot="end">
<label class="switch">
<input type="checkbox" id="togBtn">
@@ -26,15 +21,6 @@
</ion-toolbar>
<ion-toolbar>
<ion-label>
<!-- <ion-item class="ion-text-header-top" lines="none">
<div class="div-logo">
<img src='assets/images/logo.png' alt='logo'>
</div>
<ion-label>
<h6 class="header-xsmall">Presidente da República</h6>
<h2 class="header-large">GABINETE DIGITAL</h2>
</ion-label>
</ion-item> -->
<ion-item class="ion-text-right" lines="none">
<ion-label class="ion-text-wrap">
<h3 class="header-medium"> {{greetting}} Excelência <br />
@@ -106,11 +92,6 @@
</ion-item-sliding>
</ion-item-group>
</ion-list>
<!-- <ion-list *ngIf="!officialeventsList">
<ion-item lines="none">
Sem eventos
</ion-item>
</ion-list> -->
<!-- OFICIAL -->
<ion-list *ngSwitchCase="'Oficial'">
<ion-item-group>