diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000000000000000000000000000000000000..f7d4a644f1a97947833a2b3002a059072ac15458
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+ "python.pythonPath": "C:\\Users\\feliv\\anaconda3\\python.exe"
+}
\ No newline at end of file
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 c3dfad97b52aa6c80b17b72ebcebe5edc6df1553..545335fe899ab70d3e2feffde188c3b75d4d09bc 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,18 +18,12 @@
<!-- 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>
@@ -34,7 +31,7 @@
<div *ngIf="visit.registrationsOpen && !participant" class="text-center">
<button id="participate-btn" type="button" name="button" class="btn-primary" [disabled]="!isValid" (click)="registerFormActive = true">
Je m'inscris</button>
-
+
</div>
<div class="text-muted-sm">{{errorMessageRegistration}}</div>
@@ -51,10 +48,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>
@@ -75,9 +79,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>
@@ -87,4 +89,4 @@
</div>
</div>
-</div>
+</div>
\ No newline at end of file
diff --git a/src/app/signup/core/index.ts b/src/app/signup/core/index.ts
index dbcc0f66bb1c8b7aaa99783d11c58cd70ec1a3e7..2698fcdcf41c5aa99c7d3113dce236ea6bb213e5 100644
--- a/src/app/signup/core/index.ts
+++ b/src/app/signup/core/index.ts
@@ -3,4 +3,4 @@ export * from './registration.service';
export * from './personnalData.model';
export * from './personnalData.service';
export * from './password.matcher';
-// commentaire
\ No newline at end of file
+// commentaire