Skip to content

Add "on this day" filter for activiteiten (limited date filter) #130

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
wandernauta wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Add "on this day" filter for activiteiten (limited date filter) #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4665c04
add "on this day" filter for activiteiten
wandernauta May 24, 2026
d8fc701
make automatic submission a bit less eager
wandernauta May 24, 2026
5a3cb38
flip elements around, remove javascript tricks
wandernauta May 24, 2026
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
43 changes: 36 additions & 7 deletions partials/activiteiten.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,43 @@
{% extends "base.html" %}

{% block main %}
<h4>Recente en toekomstige activiteiten
{%if meta.commissie != "" %}
van de {{ meta.commissienaam }}
{%endif%}
<h4>
{% if meta.datum != "" %}
Alle activiteiten op {{ meta.datum }}
{% else %}
Recente en toekomstige activiteiten
{% if meta.commissie != "" %}
van de {{ default(meta.commissienaam, "commissie") }}
{% endif %}
{% endif %}
</h4>
<p>
Activiteiten vanaf vier dagen geleden. Of <a href="#vandaag">spring ⏩ naar vandaag</a>.
</p>
<nav>
<ul>
<li>
{% if meta.datum == "" %}
Activiteiten vanaf vier dagen geleden.
{% else %}
Er zijn {{ length(data) }} resultaten gevonden voor de opgegeven datum.
{% endif %}
</li>
</ul>
<ul>
{% if meta.datum == "" %}
<li><a href="#vandaag">⏩ Spring naar vandaag</a></li>
<li><a href="./activiteiten.html?datum={{meta.vandaag}}">🗓️ Datum kiezen</a></li>
{% else %}
<li><a href="./activiteiten.html">⏩ Terug naar overzicht</a></li>
<li style="padding-top: 0; padding-bottom: 0;">
<form id="datum" style="display: inline">
<input style="display: inline; width: auto" type="date" name="datum" value="{{meta.datum}}">
<input style="display: inline; width: auto" type="submit" value="►">
</form>
</li>
{% endif %}
</ul>
</nav>
<center>
{% if meta.datum == "" %}
{%if meta.commissie != "" %}
<a href="./activiteiten.html">Alles</a>
{%else%}
Expand All @@ -21,6 +49,7 @@ <h4>Recente en toekomstige activiteiten
<abbr title="{{d.naam}}">{{ d.afko }}</abbr>
{% if d.afko != meta.commissie %}</a>{%else%}</b>{%endif%}
{% endfor %}
{% endif %}
</center>
<table class="striped">
<thead>
Expand Down
18 changes: 15 additions & 3 deletions tkserv.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1569,12 +1569,22 @@ int main(int argc, char** argv)
});

sws.d_svr.Get("/activiteiten.html", [&tp](const httplib::Request &req, httplib::Response &res) {
// from 4 days ago into the future
string dlim = getDateDBFormat(time(0)-4*86400);
string earliest, latest;
string dlim = req.get_param_value("datum");

if (dlim.empty()) {
// from 4 days ago into the future
earliest = getDateDBFormat(time(0)-4*86400);
latest = getDateDBFormat(time(0)+20*365*86400);
} else {
// only one day. don't offer wider ranges for now
earliest = getDateDBFormat(getDateTimestamp(dlim));
latest = getDateDBFormat(getDateTimestamp(dlim));
}

string today = getTodayDBFormat();

auto acts = packResultsJson(tp.getLease()->queryT("select Activiteit.datum datum, activiteit.bijgewerkt bijgewerkt, activiteit.nummer nummer, naam, noot, onderwerp, besloten, voortouwAfkorting, voortouwNaam from Activiteit left join Reservering on reservering.activiteitId=activiteit.id left join Zaal on zaal.id=reservering.zaalId where datum > ? order by datum asc", {dlim}));
auto acts = packResultsJson(tp.getLease()->queryT("select Activiteit.datum datum, activiteit.bijgewerkt bijgewerkt, activiteit.nummer nummer, naam, noot, onderwerp, besloten, voortouwAfkorting, voortouwNaam from Activiteit left join Reservering on reservering.activiteitId=activiteit.id left join Zaal on zaal.id=reservering.zaalId where Activiteit.datum between date(?) and date(?, '+1 day') order by datum asc", {earliest, latest}));

bool noMarkerYet = true;
struct Commie
Expand Down Expand Up @@ -1611,6 +1621,8 @@ int main(int argc, char** argv)
nlohmann::json data = nlohmann::json::object();
data["data"] = acts;
data["meta"]["commissie"] = commissie;
data["meta"]["datum"] = dlim.empty() ? "" : earliest;
data["meta"]["vandaag"] = today;
data["meta"]["commies"] = nlohmann::json::array();
for(const auto& c : commies) {
nlohmann::json commie = nlohmann::json::object();
Expand Down
Loading