Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion partials/mijn.html
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ <h3>Monitors</h3>
</thead>
<tbody>
<template x-for="m in monitors">
<tr><td x-text="m.type"></td><td x-text="m.description"></td>
<tr><td x-text="m.type"></td><td><a x-bind:href="m.href" x-text="m.description"></a></td>
<td><span x-text="m.cnt"></span></td>
<td>
<select x-model="m.interval" @change="updateInterval($data, m.id, m.interval)">
Expand Down
62 changes: 62 additions & 0 deletions scanmon.hh
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ struct ScannerHit
struct Scanner
{
virtual std::string describe(SQLiteWriter& sqlw) = 0;
virtual std::string getLink() = 0;
virtual std::string getType() = 0;
virtual std::vector<ScannerHit> get(SQLiteWriter& sqlw) = 0;
auto getRow(SQLiteWriter& sqlw, const std::string& id)
Expand Down Expand Up @@ -86,6 +87,12 @@ struct CommissieScanner : Scanner
}
return naam;
}

std::string getLink() override
{
return "commissie.html?id=" + d_commissieid;
}

std::string d_commissieid;
};

Expand Down Expand Up @@ -147,6 +154,12 @@ struct PersoonScanner : Scanner
}
return "Persoon " + naam;
}

std::string getLink() override
{
return "persoon.html?nummer=" + d_nummer;
}

std::string d_nummer;
};

Expand Down Expand Up @@ -181,6 +194,12 @@ struct ActiviteitScanner : Scanner
}
return "Activiteit " + d_nummer+": "+ onderwerp;
}

std::string getLink() override
{
return "activiteit.html?nummer=" + d_nummer;
}

std::string d_nummer;
};

Expand Down Expand Up @@ -228,6 +247,12 @@ struct ZaakScanner : Scanner
}
return "Zaak " + d_nummer+": "+ onderwerp;
}

std::string getLink() override
{
return "zaak.html?nummer=" + d_nummer;
}

std::string d_nummer;
};

Expand Down Expand Up @@ -263,6 +288,12 @@ struct KsdScanner : Scanner
}
return "Kamerstukdossier " + d_nummer+ " " +d_toevoeging+": "+ onderwerp;
}

std::string getLink() override
{
return "ksd.html?ksd=" + d_nummer + "&toevoeging=" + d_toevoeging;
}

std::string d_nummer, d_toevoeging;
};

Expand Down Expand Up @@ -317,6 +348,19 @@ struct ToezeggingenScanner : Scanner
else
return "???";
}

std::string getLink() override
{
if(d_fractie.empty() && d_voortouwAfkorting.empty())
return "toezeggingen.html";
else if(!d_fractie.empty())
return "toezeggingen.html?fractie="+d_fractie;
else if(!d_voortouwAfkorting.empty())
return "toezeggingen.html?commissie="+d_voortouwAfkorting;
else
return "toezeggingen.html";
}

std::string d_fractie, d_voortouwAfkorting;
};

Expand All @@ -342,6 +386,13 @@ struct OODocumentVerantwoordelijkeScanner : Scanner
{
return "Open.overheid.nl documenten van "+d_verantwoordelijke;
}

std::string getLink() override
{
// no way yet to link to specific verantwoordelijke
return "oods.html";
}

std::string d_verantwoordelijke;
};

Expand Down Expand Up @@ -371,6 +422,11 @@ struct GeschenkScanner : Scanner
{
return "Geschenken";
}

std::string getLink() override
{
return "geschenken.html";
}
};
#endif

Expand All @@ -385,6 +441,12 @@ struct ZoekScanner : Scanner
std::string describe(SQLiteWriter& sqlw) override;
std::string d_query;
std::string d_categorie;

std::string getLink() override
{
return "search.html?q=" + d_query;
}

};

extern std::map<std::string, decltype(&ZaakScanner::make)> g_scanmakers;
4 changes: 3 additions & 1 deletion users.cc
Original file line number Diff line number Diff line change
Expand Up @@ -317,8 +317,10 @@ void addTkUserManagement(SimpleWebSystem& sws, const std::string& mailserver,
for(auto& [id, sc] : scanners) {
auto& [ptr, count] = sc;
nlohmann::json jmon;
jmon["description"] = ptr->describe(cr.tp.getLease().get());
auto sqlw = cr.tp.getLease();
jmon["description"] = ptr->describe(sqlw.get());
jmon["type"] = ptr->getType();
jmon["href"] = ptr->getLink();
jmon["id"] = id;
jmon["cnt"] = count;
jmon["interval"] = ptr->d_interval;
Expand Down
Loading