Skip to content

Date formatting #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wietseneven wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Date formatting #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da28253
Date formatting
wietseneven Nov 24, 2024
7e1b7a2
Merge branch 'main' into main
wietseneven Dec 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion html/custom.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,11 @@ tr,td {
font-size: 90%;
}
.interrumpant {
background-color: var(--pico-mark-background-color);
background-color: var(--pico-mark-background-color);
}

span.jarig::before { content: '🎈'; }

.whitespace-nowrap {
white-space: nowrap;
}
4 changes: 2 additions & 2 deletions partials/activiteit.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ <h4 x-text="activiteit['meta'].onderwerp"></h4>
<p><span x-text="activiteit['meta'].nummer"></span> <span x-html="makeBell($data, haveMonitor);"></span></p>
</hblock>

<h4><span x-text="activiteit['meta'].datum.replace('T', ' ')"></span> <span x-text="activiteit['zaal'].naam"></span></h4>
<h4><span x-text="new Date(activiteit['meta'].datum).toLocaleString('nl-NL', {dateStyle: 'medium', timeStyle: 'short'})"></span> <span x-text="activiteit['zaal'].naam"></span></h4>
<h4 x-text="activiteit['meta'].voortouwNaam"></h4>
<template x-if="activiteit['videourl'].length">
<div>
<a x-bind:href="activiteit['videourl']+'/video'">Link naar debat direct</a>
<div style="position: relative; width: 100%; max-width: 650px;"><div style="padding-top: 56.25%; width: 100%;"><iframe style="position: absolute; left: 0; top: 0; width: 100%; height: 100%" x-bind:src="activiteit['videourl']+'/embedded'" frameborder="0" allowfullscreen="true" webkitallowfullscreen="true" mozallowfullscreen="true"></iframe></div></div>
</div>
</template>
<template x-if="activiteit['meta'].noot.length > 0">
<template x-if="activiteit['meta']?.noot?.length > 0">
<div style="border-width:1px; border-style:solid; border-color:#222222; padding: 0.5em; max-width: 50em; ">
<h4>Noot</h4>
<div x-html="activiteit['meta'].noot"></div>
Expand Down
2 changes: 1 addition & 1 deletion partials/activiteiten.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ <h4>Recente en toekomstige activiteiten</h4>
<tbody>
{% for d in data %}
<tr>
<td> {{d.datum }}</td>
<td><time class="whitespace-nowrap" datetime="{{d.datum}}">{{formatDutchDateTime(d.datum)}}</time></td>
<td> {{d.naam}}</td>
<td> {{d.voortouwAfkorting}}</td>
<td><a href="activiteit.html?nummer={{d.nummer}}"> {{d.onderwerp}}</a></td>
Expand Down
10 changes: 5 additions & 5 deletions partials/besluiten.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ <h4>Recente en toekomstige besluiten</h4>
<tbody>
{% for d in besluiten %}
<tr>
<td>{{d.datum}}</td>
<td>{{d.aonderwerp}}</td>
<td><a href="zaak.html?nummer={{d.znummer}}"> {{d.zonderwerp}} </a></td>
<td>{{d.indiener}}</td>
<td>{{d.tekst}}</td>
<td><time class="whitespace-nowrap" datetime="{{d.datum}}">{{formatDutchDate(d.datum)}}</time></td>
<td>{{d.aonderwerp}}</td>
<td><a href="zaak.html?nummer={{d.znummer}}"> {{d.zonderwerp}} </a></td>
<td>{{d.indiener}}</td>
<td>{{d.tekst}}</td>
</tr>
{% endfor %}
</tbody>
Expand Down
2 changes: 1 addition & 1 deletion partials/commissies.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ <h5>Actief</h5>
<tr>
<td><a href="commissie.html?id={{c.commissieId}}">{{c.naam}}</a></td>
<td>{{c.afkorting}}</td>
<td>{{c.mdatum}}</td>
<td>{{formatDutchDate(c.mdatum)}}</td>
</tr>
{% endif %}
{% endfor %}
Expand Down
22 changes: 16 additions & 6 deletions partials/custom.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,21 @@
th {
font-size: 100%;
font-size: 100%;
}
tr,td {
vertical-align: top;
font-size: 90%;

tr,
td {
vertical-align: top;
font-size: 90%;
}

.interrumpant {
background-color: var(--pico-mark-background-color);
background-color: var(--pico-mark-background-color);
}

span.jarig::before {
content: "🎈";
}

.whitespace-nowrap {
white-space: nowrap;
}
span.jarig::before { content: '🎈'; }
12 changes: 6 additions & 6 deletions partials/geschenken.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@ <h4>Geschenken</h4>
<thead>
<tr>
<th>Datum</th>
<th>Bijgewerkt</th>
<th>Naam</th>
<th>Bijgewerkt</th>
<th>Naam</th>
<th>Omschrijving</th>
</tr>
</thead>
<tbody>
{% for d in data %}
<tr>
<td>{{d.datum}}</td>
<td>{{d.pgbijgewerkt}}</td>
<td><a href="persoon.html?nummer={{d.nummer}}">{{d.roepnaam}} {{d.tussenvoegsel}} {{d.achternaam}}</a></td>
<td>{{d.omschrijving}}</td>
<td><time class="whitespace-nowrap" datetime="{{d.datum}}">{{formatDutchDate(d.datum)}}</time></td>
<td><time class="whitespace-nowrap" datetime="{{d.pgbijgewerkt}}">{{formatDutchDate(d.pgbijgewerkt)}}</time></td>
<td><a href="persoon.html?nummer={{d.nummer}}">{{d.roepnaam}} {{d.tussenvoegsel}} {{d.achternaam}}</a></td>
<td>{{d.omschrijving}}</td>
</tr>
{% endfor %}
</tbody>
Expand Down
4 changes: 2 additions & 2 deletions partials/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
## for d in recentDocs
{% if d.nummer != "2024D36216" %}
<tr>
<td>{{ d.datum }}</td>
<td>{{ d.bijgewerkt }}</td>
<td><time class="whitespace-nowrap" datetime="{{ d.datum }}">{{ formatDutchDate(d.datum) }}</time></td>
<td><time datetime="{{ d.bijgewerkt }}">{{ formatDutchDateTime(d.bijgewerkt) }}</time></td>
<td>{{ d.afkorting }}</td>
{% if d.soort != "Verslag" %}
<td> {{ d.onderwerp }} (<a href="get/{{d.nummer}}">{{d.nummer}}</a>)</td>
Expand Down
8 changes: 4 additions & 4 deletions partials/kamerstukdossiers.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ <h4>Kamerstukdossiers</h4>
<tbody>
<template x-for="d in kamerstukdossiers">
<tr>
<td x-text="d.mdatum.substring(0,10)"></td>
<td x-text="d.nummer + '&nbsp;' + d.toevoeging"></td>
<td x-html="'<a href=ksd.html?ksd='+d.nummer+'&toevoeging='+d.toevoeging+'>' + d.titel +'</a>'"></td>
<td x-text="d.hoogsteVolgnummer"></td>
<td class="whitespace-nowrap" x-text="new Date(d.mdatum).toLocaleDateString('nl-NL', {dateStyle: 'medium'})"></td>
<td x-text="d.nummer + '&nbsp;' + d.toevoeging"></td>
<td x-html="'<a href=ksd.html?ksd='+d.nummer+'&toevoeging='+d.toevoeging+'>' + d.titel +'</a>'"></td>
<td x-text="d.hoogsteVolgnummer"></td>
</tr>
</template>
</tbody>
Expand Down
2 changes: 1 addition & 1 deletion partials/ongeplande-activiteiten.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ <h4>Nog ongeplande activiteiten ({{length(data)}})</h4>
<tbody>
{% for d in data %}
<tr>
<td> {{d.bijgewerkt}} </td>
<td><time class="whitespace-nowrap" datetime="{{d.bijgewerkt}}">{{formatDutchDateTime(d.bijgewerkt)}}</time></td>
<td> {{d.voortouwAfkorting}}</td>
<td><a href="activiteit.html?nummer={{d.nummer}}"> {{d.onderwerp}}</a></td>
<td> {{d.noot}} {{d.soort}}</td>
Expand Down
12 changes: 6 additions & 6 deletions partials/open-vragen.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<table class="striped">
<thead>
<tr>
<th>Datum</th>
<th>Datum</th>
<th>Onderwerp</th>
<th>1e Indiener</th>
<th>Aan</th>
Expand All @@ -22,11 +22,11 @@
<tbody>
{% for d in openVragen %}
<tr>
<td>{{d.gestartOp}}</td>
<td> <a href="get/{{d.docunummer}}"> {{d.onderwerp}} </a></td>
<td> <a href="persoon.html?nummer={{d.persoonnummer}}">{{d.indiener}} ({{d.fractie}})</a> </td>
<td> {{d.aan}} </td>
<td> {% if d.numuitstel > 0 %} Ja {% endif %} </td>
<td><time class="whitespace-nowrap" datetime="{{d.gestartOp}}">{{formatDutchDate(d.gestartOp)}}</time></td>
<td> <a href="get/{{d.docunummer}}"> {{d.onderwerp}} </a></td>
<td> <a href="persoon.html?nummer={{d.persoonnummer}}">{{d.indiener}} ({{d.fractie}})</a> </td>
<td> {{d.aan}} </td>
<td> {% if d.numuitstel > 0 %} Ja {% endif %} </td>
</tr>
{% endfor %}
</tbody>
Expand Down
2 changes: 1 addition & 1 deletion partials/stemmingen.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ <h4>Recente stemmingen</h4>
{% for d in stemmingen %}
<tbody>
<tr>
<td> {{d.datum}} </td>
<td><time class="whitespace-nowrap" datetime="{{d.datum}}">{{formatDutchDateTime(d.datum)}}</time></td>
<td><a href="zaak.html?nummer={{d.znummer}}">{{d.zonderwerp}}</a></td>
<td>{{d.indiener}} </td>
<td>{{d.besluittekst}}</td>
Expand Down
2 changes: 1 addition & 1 deletion partials/toezeggingen.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ <h3>Openstaande toezeggingen door kabinet ({{length(data)}})</h3>
<tbody>
{% for d in data %}
<tr>
<td>{{d.datum}}</td>
<td><time class="whitespace-nowrap" datetime="{{d.datum}}">{{formatDutchDate(d.datum)}}</time></td>
<td>{{d.status}}</td>
<td>{{d.voortouwAfkorting}}</td>
<td><a href="activiteit.html?nummer={{d.activiteitNummer}}">{{d.tekst}}</a></td>
Expand Down
12 changes: 6 additions & 6 deletions partials/verslagen.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ <h4>Verslagen</h4>
<tbody>
{% for d in recenteVerslagen %}
<tr>
<td>{{d.datum}}</td>
<td>{{d.aanvangstijd}}</td>
<td><a href="verslag.html?vergaderingid={{d.vergaderingId}}">{{d.titel}}</a></td>
<td>{{d.zaal}}</td>
<td>{{d.soort}}</td>
<td>{{d.status}}</td>
<td><time class="whitespace-nowrap" datetime="{{d.datum}}">{{formatDutchDate(d.datum)}}</time></td>
<td>{{d.aanvangstijd}}</td>
<td><a href="verslag.html?vergaderingid={{d.vergaderingId}}">{{d.titel}}</a></td>
<td>{{d.zaal}}</td>
<td>{{d.soort}}</td>
<td>{{d.status}}</td>
</tr>
{% endfor %}
</tbody>
Expand Down
2 changes: 1 addition & 1 deletion partials/zaak.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ <h3>{{zaak.onderwerp}}</h3>
<p>{{zaak.soort}}</p>
</hgroup>

<h4>Zaak {{zaak.nummer}}, gestart op {{zaak.gestartOp}} <span x-html="makeBell($data, haveMonitor);"></span></h4>
<h4>Zaak {{zaak.nummer}}, gestart op {{ormatDutchDate(zaak.gestartOp)}} <span x-html="makeBell($data, haveMonitor);"></span></h4>
{% if length(kamerstukdossier) > 0 %}
<p>
Onderdeel van kamerstukdossier <a href="ksd.html?ksd={{kamerstukdossier.0.nummer}}
Expand Down
Loading