Skip to content
Snippets Groups Projects
Commit 9dc7a8a0 authored by Otto Visser's avatar Otto Visser
Browse files

Merge branch '601-stats-page-lab-name-does-not-have-date' into 'development'

Resolve "Stats page lab name does not have date"

Closes #601

See merge request !636
parents ddeee254 15343779
No related branches found
No related tags found
2 merge requests!642Release 2.1.1,!636Resolve "Stats page lab name does not have date"
......@@ -18,6 +18,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed
- Feedback y-axis no longer has labels on increments of 1 [@rwbackx](https://gitlab.ewi.tudelft.nl/rwbackx)
- Request Table Pagination is fixed. [@hpage](https://gitlab.ewi.tudelft.nl/hpage)
- Lab stats page now shows the lab dates [@rwbackx](https://gitlab.ewi.tudelft.nl/rwbackx)
### Deprecated
......
......@@ -84,13 +84,13 @@
<option disabled>Active</option>
<option th:each="lab : ${activeLabs}"
th:value="${lab.id}"
th:text="${lab.name}"
th:text="|${lab.name} - ${#temporals.format(lab.slot.opensAt, 'd MMMM')}|"
selected>
</option>
<option disabled>Old</option>
<option th:each="lab : ${inactiveLabs}"
th:value="${lab.id}"
th:text="${lab.name}"
th:text="|${lab.name} - ${#temporals.format(lab.slot.opensAt, 'd MMMM')}|"
selected>
</option>
</select>
......@@ -234,13 +234,13 @@
<option disabled>Active</option>
<option th:each="lab : ${activeLabs}"
th:value="${lab.id}"
th:text="${lab.name}"
th:text="|${lab.name} - ${#temporals.format(lab.slot.opensAt, 'd MMMM')}|"
selected>
</option>
<option disabled>Old</option>
<option th:each="lab : ${inactiveLabs}"
th:value="${lab.id}"
th:text="${lab.name}"
th:text="|${lab.name} - ${#temporals.format(lab.slot.opensAt, 'd MMMM')}|"
selected>
</option>
</select>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment