Skip to content

Commit 3c59db5

Browse files
cdebarroscdebarros
committed
corrections css
1 parent 39fc56b commit 3c59db5

File tree

6 files changed

+122
-94
lines changed

6 files changed

+122
-94
lines changed

‎lib/geopf-extensions-openlayers-1.0.0-beta.5-429.tgz‎

-2.16 MB
Binary file not shown.

‎lib/geopf-extensions-openlayers-1.0.0-beta.5-431.tgz‎

2.16 MB
Binary file not shown.

‎package-lock.json‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"dependencies": {
1313
"@edugouvfr/ngx-dsfr": "^1.12.6",
1414
"@gouvfr/dsfr": "^1.11.0",
15-
"geopf-extensions-openlayers": "./lib/geopf-extensions-openlayers-1.0.0-beta.5-429.tgz",
15+
"geopf-extensions-openlayers": "./lib/geopf-extensions-openlayers-1.0.0-beta.5-431.tgz",
1616
"geoportal-access-lib": "^3.4.4",
1717
"ol": "^10.3.1",
1818
"opening_hours": "^3.8.0"

‎src/app/rightpanel/content/service-public/service-public.component.html‎

Lines changed: 108 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -173,46 +173,53 @@ <h4 class="fr-h4 fr-h4-tab">Autre(s) permanence(s) hébergée(s) dans ce lieu</h
173173
<div class="info-content"> {{ entry.name || "Aucune information" }}</div>
174174
</div>
175175
}
176-
<button (click)="showTime($event)" value="opentimes-{{ idx }}" class="fr-link margin-link opentimes-btn">Voir les horaires ˅</button>
177-
<div id="opentimes-{{ idx }}" class="opentimes">
176+
178177
@if(entry.openinghours) {
179178
@if(entry.openinghours.weekstable == true){
180-
@for (entry of entry.openinghours.openingHours; track entry.day) {
179+
<div id="opentimes-{{ idx }}" class="opentimes">
180+
@for (entry of entry.openinghours.openingHours; track entry.day) {
181+
<div class="spopening">
182+
<div class="spopening-day">{{ entry.day }}</div>
183+
<div class="spopening-hours">
184+
@for (halfday of entry.time; track halfday) {
185+
<p>{{ halfday }}</p>
186+
} @empty {
187+
<p>Fermé</p>
188+
}
189+
</div>
190+
</div>
191+
}
192+
</div>
193+
<button name="hourtime" (click)="showTime($event)" value="opentimes-{{ idx }}" class="fr-link margin-link opentimes-btn">Voir les horaires ˅</button>
194+
}@else {
195+
<div id="opentimes-{{ idx }}" class="opentimes">
181196
<div class="spopening">
182-
<div class="spopening-day">{{ entry.day }}</div>
183-
<div class="spopening-hours">
184-
@for (halfday of entry.time; track halfday) {
185-
<p>{{ halfday }}</p>
186-
} @empty {
187-
<p>Fermé</p>
197+
<div class="spopening-day">Dates</div>
198+
<div class="spopening-date">
199+
@for (date of entry.openinghours.openingHours.dates; track date) {
200+
<p>{{ date }}</p>
188201
}
189202
</div>
190203
</div>
191-
}
192-
}@else {
193-
<div class="spopening">
194-
<div class="spopening-day">Dates</div>
195-
<div class="spopening-date">
196-
@for (date of entry.openinghours.openingHours.dates; track date) {
197-
<p>{{ date }}</p>
198-
}
199-
</div>
200-
</div>
201-
<div class="spopening">
202-
<div class="spopening-day">Horaires</div>
203-
<div class="spopening-date-hours">
204-
@for (halfday of entry.openinghours.openingHours.time; track halfday) {
205-
<p>{{ halfday }}</p>
206-
}
204+
<div class="spopening">
205+
<div class="spopening-day">Horaires</div>
206+
<div class="spopening-date-hours">
207+
@for (halfday of entry.openinghours.openingHours.time; track halfday) {
208+
<p>{{ halfday }}</p>
209+
}
210+
</div>
207211
</div>
208212
</div>
213+
<button name="daytime" (click)="showTime($event)" value="opentimes-{{ idx }}" class="fr-link margin-link opentimes-btn">Voir les dates ˅</button>
209214
}
210215
}@else{
211-
<div class="spopening">
212-
Information indisponible pour ce service
213-
</div>
216+
<div id="opentimes-{{ idx }}" class="opentimes">
217+
<div class="spopening">
218+
Information indisponible pour ce service
219+
</div>
220+
</div>
221+
<button name="nonetime" (click)="showTime($event)" value="opentimes-{{ idx }}" class="fr-link margin-link opentimes-btn">Voir les horaires ˅</button>
214222
}
215-
</div>
216223
}
217224
}
218225
</dsfr-tab>
@@ -242,46 +249,52 @@ <h4 class="fr-h4 fr-h4-tab title-gap">Circuit</h4>
242249
<div class="info-content"> {{ entry.name }}</div>
243250
</div>
244251
}
245-
<button (click)="showTime($event)" value="opentimes-{{ idx }}" class="fr-link margin-link opentimes-btn">Voir les dates ˅</button>
246-
<div id="opentimes-{{ idx }}" class="opentimes">
247252
@if(entry.openinghours) {
248253
@if(entry.openinghours.weekstable == true){
249-
@for (entry of entry.openinghours.openingHours; track entry.day) {
254+
<div id="opentimes-{{ idx }}" class="opentimes">
255+
@for (entry of entry.openinghours.openingHours; track entry.day) {
256+
<div class="spopening">
257+
<div class="spopening-day">{{ entry.day | titlecase}}</div>
258+
<div class="spopening-hours">
259+
@for (halfday of entry.time; track halfday) {
260+
<p>{{ halfday }}</p>
261+
} @empty {
262+
<p>Fermé</p>
263+
}
264+
</div>
265+
</div>
266+
}
267+
</div>
268+
<button name="hourtime" (click)="showTime($event)" value="opentimes-{{ idx }}" class="fr-link margin-link opentimes-btn">Voir les horaires ˅</button>
269+
}@else {
270+
<div id="opentimes-{{ idx }}" class="opentimes">
250271
<div class="spopening">
251-
<div class="spopening-day">{{ entry.day | titlecase}}</div>
252-
<div class="spopening-hours">
253-
@for (halfday of entry.time; track halfday) {
254-
<p>{{ halfday }}</p>
255-
} @empty {
256-
<p>Fermé</p>
272+
<div class="spopening-day">Dates</div>
273+
<div class="spopening-date">
274+
@for (date of entry.openinghours.openingHours.dates; track date) {
275+
<p>{{ date | titlecase}}</p>
257276
}
258277
</div>
259278
</div>
260-
}
261-
}@else {
262-
<div class="spopening">
263-
<div class="spopening-day">Dates</div>
264-
<div class="spopening-date">
265-
@for (date of entry.openinghours.openingHours.dates; track date) {
266-
<p>{{ date | titlecase}}</p>
267-
}
268-
</div>
269-
</div>
270-
<div class="spopening">
271-
<div class="spopening-day">Horaires</div>
272-
<div class="spopening-date-hours">
273-
@for (halfday of entry.openinghours.openingHours.time; track halfday) {
274-
<p>{{ halfday }}</p>
275-
}
279+
<div class="spopening">
280+
<div class="spopening-day">Horaires</div>
281+
<div class="spopening-date-hours">
282+
@for (halfday of entry.openinghours.openingHours.time; track halfday) {
283+
<p>{{ halfday }}</p>
284+
}
285+
</div>
276286
</div>
277287
</div>
288+
<button name="datetime" (click)="showTime($event)" value="opentimes-{{ idx }}" class="fr-link margin-link opentimes-btn">Voir les dates ˅</button>
278289
}
279290
}@else{
280-
<div class="spopening">
281-
Information indisponible pour ce service
282-
</div>
291+
<div id="opentimes-{{ idx }}" class="opentimes">
292+
<div class="spopening">
293+
Information indisponible pour ce service
294+
</div>
295+
</div>
296+
<button name="nonetime" (click)="showTime($event)" value="opentimes-{{ idx }}" class="fr-link margin-link opentimes-btn">Voir les horaires ˅</button>
283297
}
284-
</div>
285298
}
286299
</dsfr-tab>
287300
}
@@ -293,50 +306,57 @@ <h4 class="fr-h4 fr-h4-tab title-gap">Circuit</h4>
293306
>
294307
<h4 class="fr-h4 fr-h4-tab">Permanence(s) hébergée(s)</h4>
295308
@for (entry of responseList; track responseList; let idx = $index) {
296-
<div class="info-list">
309+
<div class="info-list title-gap">
297310
<span class="fr-icon-map-pin-2-fill fr-icon--md info-icon" aria-hidden="true"></span>
298311
<div class="info-content"> {{ entry.name || "Aucune information" }}</div>
299312
</div>
300-
<button (click)="showTime($event)" value="opentimes-{{ idx }}" class="fr-link margin-link opentimes-btn">Voir les horaires ˅</button>
301-
<div id="opentimes-{{ idx }}" class="opentimes">
313+
302314
@if(entry.openinghours) {
303315
@if(entry.openinghours.weekstable == true){
304-
@for (entry of entry.openinghours.openingHours; track entry.day) {
316+
<div id="opentimes-{{ idx }}" class="opentimes">
317+
@for (entry of entry.openinghours.openingHours; track entry.day) {
318+
<div class="spopening">
319+
<div class="spopening-day">{{ entry.day }}</div>
320+
<div class="spopening-hours">
321+
@for (halfday of entry.time; track halfday) {
322+
<p>{{ halfday }}</p>
323+
} @empty {
324+
<p>Fermé</p>
325+
}
326+
</div>
327+
</div>
328+
}
329+
</div>
330+
<button name="hourtime" (click)="showTime($event)" value="opentimes-{{ idx }}" class="fr-link margin-link opentimes-btn">Voir les horaires ˅</button>
331+
}@else {
332+
<div id="opentimes-{{ idx }}" class="opentimes">
305333
<div class="spopening">
306-
<div class="spopening-day">{{ entry.day }}</div>
307-
<div class="spopening-hours">
308-
@for (halfday of entry.time; track halfday) {
309-
<p>{{ halfday }}</p>
310-
} @empty {
311-
<p>Fermé</p>
334+
<div class="spopening-day">Dates</div>
335+
<div class="spopening-date">
336+
@for (date of entry.openinghours.openingHours.dates; track date) {
337+
<p>{{ date }}</p>
312338
}
313339
</div>
314340
</div>
315-
}
316-
}@else {
317-
<div class="spopening">
318-
<div class="spopening-day">Dates</div>
319-
<div class="spopening-date">
320-
@for (date of entry.openinghours.openingHours.dates; track date) {
321-
<p>{{ date }}</p>
322-
}
323-
</div>
324-
</div>
325-
<div class="spopening">
326-
<div class="spopening-day">Horaires</div>
327-
<div class="spopening-date-hours">
328-
@for (halfday of entry.openinghours.openingHours.time; track halfday) {
329-
<p>{{ halfday }}</p>
330-
}
341+
<div class="spopening">
342+
<div class="spopening-day">Horaires</div>
343+
<div class="spopening-date-hours">
344+
@for (halfday of entry.openinghours.openingHours.time; track halfday) {
345+
<p>{{ halfday }}</p>
346+
}
347+
</div>
331348
</div>
332349
</div>
350+
<button name="datetime" (click)="showTime($event)" value="opentimes-{{ idx }}" class="fr-link margin-link opentimes-btn">Voir les dates ˅</button>
333351
}
334352
}@else{
335-
<div class="spopening">
336-
Information indisponible pour ce service
337-
</div>
353+
<div id="opentimes-{{ idx }}" class="opentimes">
354+
<div class="spopening">
355+
Information indisponible pour ce service
356+
</div>
357+
</div>
358+
<button name="nonetime" (click)="showTime($event)" value="opentimes-{{ idx }}" class="fr-link margin-link opentimes-btn">Voir les horaires ˅</button>
338359
}
339-
</div>
340360
}
341361
</dsfr-tab>
342362
}

‎src/app/rightpanel/content/service-public/service-public.component.ts‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,10 +182,18 @@ export class ServicePublicComponent implements OnInit {
182182
if (element){
183183
if (element.style.display === "none" || element.style.display === "") {
184184
element.style.display = "inline-block";
185-
e.target.innerHTML = e.target.innerHTML.replace("˅", "˄");
185+
if(e.target.getAttribute("name") == "datetime") {
186+
e.target.innerHTML = e.target.innerHTML.replace("Voir les dates ˅", "Voirs moins ˄");
187+
} else {
188+
e.target.innerHTML = e.target.innerHTML.replace("Voir les horaires ˅", "Voirs moins ˄");
189+
}
186190
} else {
187191
element.style.display = "none";
188-
e.target.innerHTML = e.target.innerHTML.replace("˄", "˅");
192+
if(e.target.getAttribute("name") == "datetime") {
193+
e.target.innerHTML = e.target.innerHTML.replace("Voirs moins ˄", "Voir les dates ˅");
194+
} else {
195+
e.target.innerHTML = e.target.innerHTML.replace("Voirs moins ˄", "Voir les horaires ˅");
196+
}
189197
}
190198
}
191199
}

0 commit comments

Comments
 (0)