diff --git a/src/app/members/visits/shared/adapters.ts b/src/app/members/visits/shared/adapters.ts index dbad8426cea443ec316b5758a61d6adeb14e9c13..e8ef955cb2dfc43df196e3f06b338f78746d1546 100644 --- a/src/app/members/visits/shared/adapters.ts +++ b/src/app/members/visits/shared/adapters.ts @@ -111,6 +111,7 @@ export class VisitAdapter implements IAdapter<Visit> { registrationsOpen: data.registrations_open, image: data.image, factSheet: data.fact_sheet, + contextSheet: data.context_sheet, permissionSheet: data.permission, participants: participants, organizers: organizers, diff --git a/src/app/members/visits/shared/models.ts b/src/app/members/visits/shared/models.ts index 12ac07539825eb47ecf8d0f6ab9f43a0d4e50784..eeba2c3952d62700161c645ededc2431906b1318 100644 --- a/src/app/members/visits/shared/models.ts +++ b/src/app/members/visits/shared/models.ts @@ -36,6 +36,7 @@ export class Visit { registrationsOpen: boolean; image: string; factSheet: string; + contextSheet: string; permissionSheet: string; participants: Participant[]; organizers: Organizer[]; @@ -55,6 +56,7 @@ export class Visit { registrationsOpen: boolean, image: string; factSheet?: string; + contextSheet?: string; permissionSheet?: string; participants?: Participant[]; organizers?: Organizer[], @@ -73,6 +75,7 @@ export class Visit { this.registrationsOpen = opts.registrationsOpen; this.image = opts.image; this.factSheet = opts.factSheet; + this.contextSheet = opts.contextSheet; this.permissionSheet = opts.permissionSheet; this.participants = opts.participants || []; this.organizers = opts.organizers || []; diff --git a/src/app/members/visits/visit-detail/visit-detail.component.html b/src/app/members/visits/visit-detail/visit-detail.component.html index 21cfd6af38a246655d5380c541901e84b78acb70..69a6aafa28607a322ed246b4cbd61923b4422787 100644 --- a/src/app/members/visits/visit-detail/visit-detail.component.html +++ b/src/app/members/visits/visit-detail/visit-detail.component.html @@ -1,12 +1,15 @@ <div id="visit"> - <app-register-form [visible]="registerFormActive" (closed)="registerFormActive = false" [userId]="userId" [visit]="visit" (participate)="onParticipate($event)"></app-register-form> + <app-register-form [visible]="registerFormActive" (closed)="registerFormActive = false" [userId]="userId" + [visit]="visit" (participate)="onParticipate($event)"></app-register-form> - <app-leave-form [visible]="leaveFormActive" (closed)="leaveFormActive = false" [visit]="visit" [userId]="userId" (left)="participant = null"></app-leave-form> + <app-leave-form [visible]="leaveFormActive" (closed)="leaveFormActive = false" [visit]="visit" [userId]="userId" + (left)="participant = null"></app-leave-form> <div class="text-center"> <h1>{{ visit.title }}</h1> <p> - <strong>{{ visit.date | date:"EEEE d MMMM" }} – {{ visit.startTime | date:"shortTime"}}</strong> – {{ visit.place.name }} + <strong>{{ visit.date | date:"EEEE d MMMM" }} – {{ visit.startTime | date:"shortTime"}}</strong> – {{ + visit.place.name }} </p> <p *ngIf="visit.summary" class="text-muted"> @@ -15,24 +18,19 @@ <!-- Metadata badges --> <div> - <app-registration-badge - [title]="visit.title" - [open]="visit.registrationsOpen" - [passed]="visit.passed" + <app-registration-badge [title]="visit.title" [open]="visit.registrationsOpen" [passed]="visit.passed" [deadline]="visit.deadline"></app-registration-badge> - <app-participant-number-badge - [number]="acceptedParticipants"></app-participant-number-badge> + <app-participant-number-badge [number]="acceptedParticipants"></app-participant-number-badge> <span *ngIf="participant"> - <app-participation-badge - [accepted]="participant.accepted" - [passed]="visit.passed"></app-participation-badge> + <app-participation-badge [accepted]="participant.accepted" [passed]="visit.passed"></app-participation-badge> </span> </div> <!-- Show register button if user does not participate --> <div *ngIf="visit.registrationsOpen && !participant" class="text-center"> - <button id="participate-btn" type="button" name="button" class="btn-success" (click)="registerFormActive = true">Je m'inscris</button> + <button id="participate-btn" type="button" name="button" class="btn-success" + (click)="registerFormActive = true">Je m'inscris</button> </div> <div *ngIf="participant && !visit.passed"> @@ -47,10 +45,17 @@ <!-- Related documents --> <p class="alert alert-info" *ngIf="visit.permissionSheet"> - <i class="fa fa-exclamation-triangle"></i>Avant de te rendre à la sortie, télécharge <a [href]="visit.permissionSheet">l'autorisation de sortie</a>. Fais-la remplir par tes parents et remets-la aux tuteurs le jour de la sortie. + <i class="fa fa-exclamation-triangle"></i>Avant de te rendre à la sortie, télécharge <a + [href]="visit.permissionSheet">l'autorisation de sortie</a>. Fais-la remplir par tes parents et remets-la aux + tuteurs le jour de la sortie. </p> <p class="alert alert-default" *ngIf="visit.factSheet"> - <i class="fa fa-file-text"></i> Les organisateurs ont rédigé une <a [href]="visit.factSheet">fiche sortie</a>. N'hésite pas à en prendre connaissance avant de te rendre à la sortie ! + <i class="fa fa-file-text"></i> Les organisateurs ont rédigé une <a [href]="visit.factSheet">fiche sortie</a>. + N'hésite pas à en prendre connaissance avant de te rendre à la sortie ! + </p> + <p class="alert alert-default" *ngIf="visit.contextSheet"> + <i class="fa fa-file-text"></i> Les organisateurs ont rédigé une <a [href]="visit.contextSheet">fiche de + contexte</a> sur la sortie. N'hésite pas à en prendre connaissance avant de te rendre à la sortie ! </p> </div> @@ -71,9 +76,7 @@ <app-useful-information [visit]="visit"></app-useful-information> <h2>Se rendre à cette sortie</h2> - <app-visit-location-map - [geocoder]="geocoder" - [address]="visit.address"></app-visit-location-map> + <app-visit-location-map [geocoder]="geocoder" [address]="visit.address"></app-visit-location-map> <div *ngIf="visit.organizers.length > 0"> <h2>Tuteurs organisateurs</h2> @@ -83,4 +86,4 @@ </div> </div> -</div> +</div> \ No newline at end of file