feature: improve admin directory and crawl progress
This commit is contained in:
Anton
@@ -11,6 +11,7 @@
|
||||
<h1 class="admin__brand">MIEM Employees</h1>
|
||||
<nav class="admin__nav">
|
||||
<a class="admin__link" href="/admin">Dashboard</a>
|
||||
<a class="admin__link" href="/admin/directory">Directory</a>
|
||||
<a class="admin__link" href="/admin/employees">Employees</a>
|
||||
<a class="admin__link" href="/admin/runs">Runs</a>
|
||||
<form method="post" action="/admin/logout">
|
||||
@@ -24,5 +25,6 @@
|
||||
<footer class="admin__footer">
|
||||
Backend {{ backend_version }} · Frontend {{ frontend_version }}
|
||||
</footer>
|
||||
{% block scripts %}{% endblock %}
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@@ -2,10 +2,48 @@
|
||||
{% block title %}Dashboard · MIEM Employees{% endblock %}
|
||||
{% block content %}
|
||||
<section class="admin__grid">
|
||||
<div class="metric"><div class="metric__label">Total</div><div class="metric__value">{{ counts.total }}</div></div>
|
||||
<div class="metric"><div class="metric__label">Active</div><div class="metric__value">{{ counts.active }}</div></div>
|
||||
<div class="metric"><div class="metric__label">New in last run</div><div class="metric__value">{{ counts.new_in_last_run }}</div></div>
|
||||
<div class="metric"><div class="metric__label">Dismissed</div><div class="metric__value">{{ counts.dismissed }}</div></div>
|
||||
<div class="metric"><div class="metric__label">Runs</div><div class="metric__value">{{ counts.runs }}</div></div>
|
||||
<div class="metric"><div class="metric__label">Errors</div><div class="metric__value">{{ counts.errors }}</div></div>
|
||||
</section>
|
||||
<section class="stats-strip">
|
||||
<div class="stats-strip__item">
|
||||
<span class="stats-strip__label">Latest added</span>
|
||||
{% if counts.latest_added %}
|
||||
<a class="stats-strip__value" href="/admin/employees/{{ counts.latest_added.id }}">{{ counts.latest_added.full_name or counts.latest_added.canonical_url }}</a>
|
||||
{% else %}
|
||||
<span class="stats-strip__value">No employees yet</span>
|
||||
{% endif %}
|
||||
</div>
|
||||
<div class="stats-strip__item">
|
||||
<span class="stats-strip__label">Runs</span>
|
||||
<span class="stats-strip__value">{{ counts.runs }}</span>
|
||||
</div>
|
||||
<div class="stats-strip__item">
|
||||
<span class="stats-strip__label">Errors</span>
|
||||
<span class="stats-strip__value">{{ counts.errors }}</span>
|
||||
</div>
|
||||
</section>
|
||||
<section class="panel progress-panel" data-progress-panel>
|
||||
<div class="progress-panel__header">
|
||||
<h2 class="panel__title">Parsing progress</h2>
|
||||
<form method="post" action="/admin/crawl-now">
|
||||
<button class="button" type="submit">Start crawl now</button>
|
||||
</form>
|
||||
</div>
|
||||
{% set run = counts.current_running_run or latest_run %}
|
||||
<div class="progress-panel__body" data-progress-body>
|
||||
<div class="progress-panel__meta">
|
||||
<span data-progress-status>{{ run.status if run else "idle" }}</span>
|
||||
<span><span data-progress-processed>{{ run.processed_count if run else 0 }}</span> / <span data-progress-found>{{ run.found_count if run else 0 }}</span> processed</span>
|
||||
<span><span data-progress-errors>{{ run.error_count if run else 0 }}</span> errors</span>
|
||||
</div>
|
||||
<div class="progress-bar" aria-label="Parsing progress">
|
||||
<div class="progress-bar__fill" data-progress-fill style="width: {{ run.progress_percent if run else 0 }}%"></div>
|
||||
</div>
|
||||
<div class="progress-panel__percent"><span data-progress-percent>{{ run.progress_percent if run else 0 }}</span>%</div>
|
||||
</div>
|
||||
</section>
|
||||
<section class="panel">
|
||||
<h2 class="panel__title">Latest runs</h2>
|
||||
@@ -19,3 +57,6 @@
|
||||
</table>
|
||||
</section>
|
||||
{% endblock %}
|
||||
{% block scripts %}
|
||||
<script src="/static/admin.js"></script>
|
||||
{% endblock %}
|
||||
|
||||
112
app/templates/directory.html
Normal file
112
app/templates/directory.html
Normal file
@@ -0,0 +1,112 @@
|
||||
{% extends "base.html" %}
|
||||
{% block title %}Directory · MIEM Employees{% endblock %}
|
||||
{% block content %}
|
||||
<section class="directory">
|
||||
<div class="directory__header">
|
||||
<div>
|
||||
<h2 class="directory__title">Directory</h2>
|
||||
<p class="directory__summary">{{ page.total }} employees found</p>
|
||||
</div>
|
||||
<button class="button" type="button" data-columns-open>Columns</button>
|
||||
</div>
|
||||
|
||||
<form class="directory__filters" method="get" action="/admin/directory">
|
||||
<input class="directory__input" name="q" value="{{ filters.q }}" placeholder="Name or URL">
|
||||
<select class="directory__input" name="status">
|
||||
<option value="" {% if not filters.status %}selected{% endif %}>All statuses</option>
|
||||
<option value="active" {% if filters.status == "active" %}selected{% endif %}>Active</option>
|
||||
<option value="dismissed" {% if filters.status == "dismissed" %}selected{% endif %}>Dismissed</option>
|
||||
</select>
|
||||
<select class="directory__input" name="has_email">
|
||||
<option value="" {% if not filters.has_email %}selected{% endif %}>Any email</option>
|
||||
<option value="true" {% if filters.has_email == "true" %}selected{% endif %}>Has email</option>
|
||||
<option value="false" {% if filters.has_email == "false" %}selected{% endif %}>No email</option>
|
||||
</select>
|
||||
<input class="directory__input" type="date" name="started_from" value="{{ filters.started_from }}" aria-label="First seen from">
|
||||
<input class="directory__input" type="date" name="started_to" value="{{ filters.started_to }}" aria-label="First seen to">
|
||||
<select class="directory__input" name="sort">
|
||||
{% for value, label in [("full_name", "Name"), ("status", "Status"), ("hse_start_year", "HSE start"), ("first_seen_at", "First seen"), ("last_seen_at", "Last seen"), ("dismissed_at", "Dismissed")] %}
|
||||
<option value="{{ value }}" {% if filters.sort == value %}selected{% endif %}>Sort: {{ label }}</option>
|
||||
{% endfor %}
|
||||
</select>
|
||||
<select class="directory__input" name="direction">
|
||||
<option value="asc" {% if filters.direction == "asc" %}selected{% endif %}>Ascending</option>
|
||||
<option value="desc" {% if filters.direction == "desc" %}selected{% endif %}>Descending</option>
|
||||
</select>
|
||||
<button class="button" type="submit">Apply</button>
|
||||
</form>
|
||||
|
||||
<div class="directory__table-wrap">
|
||||
<table class="directory-table" data-directory-table>
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="directory-table__head" data-column="full_name">Name</th>
|
||||
<th class="directory-table__head" data-column="status">Status</th>
|
||||
<th class="directory-table__head" data-column="positions">Positions</th>
|
||||
<th class="directory-table__head" data-column="hse_start_year">HSE start</th>
|
||||
<th class="directory-table__head" data-column="email">Email</th>
|
||||
<th class="directory-table__head" data-column="phone">Phone</th>
|
||||
<th class="directory-table__head" data-column="address">Address</th>
|
||||
<th class="directory-table__head" data-column="publications_count">Publications</th>
|
||||
<th class="directory-table__head" data-column="courses_count">Courses</th>
|
||||
<th class="directory-table__head" data-column="first_seen_at">First seen</th>
|
||||
<th class="directory-table__head" data-column="last_seen_at">Last seen</th>
|
||||
<th class="directory-table__head" data-column="dismissed_at">Dismissed</th>
|
||||
<th class="directory-table__head" data-column="profile">Profile</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{% for employee in page.items %}
|
||||
<tr class="directory-table__row" data-row-href="/admin/employees/{{ employee.id }}">
|
||||
<td class="directory-table__cell" data-column="full_name">{{ employee.full_name or "No name" }}</td>
|
||||
<td class="directory-table__cell" data-column="status"><span class="badge {% if employee.status == "dismissed" %}badge--dismissed{% endif %}">{{ employee.status }}</span></td>
|
||||
<td class="directory-table__cell" data-column="positions">{{ employee.positions_text }}</td>
|
||||
<td class="directory-table__cell" data-column="hse_start_year">{{ employee.hse_start_year or "" }}</td>
|
||||
<td class="directory-table__cell" data-column="email">{{ employee.email_text }}</td>
|
||||
<td class="directory-table__cell" data-column="phone">{{ employee.phone_text }}</td>
|
||||
<td class="directory-table__cell" data-column="address">{{ employee.address or "" }}</td>
|
||||
<td class="directory-table__cell" data-column="publications_count">{{ employee.publications_count }}</td>
|
||||
<td class="directory-table__cell" data-column="courses_count">{{ employee.courses_count }}</td>
|
||||
<td class="directory-table__cell" data-column="first_seen_at">{{ employee.first_seen_at or "" }}</td>
|
||||
<td class="directory-table__cell" data-column="last_seen_at">{{ employee.last_seen_at or "" }}</td>
|
||||
<td class="directory-table__cell" data-column="dismissed_at">{{ employee.dismissed_at or "" }}</td>
|
||||
<td class="directory-table__cell" data-column="profile"><a class="admin__link" href="{{ employee.canonical_url }}">Open</a></td>
|
||||
</tr>
|
||||
{% else %}
|
||||
<tr><td class="directory-table__empty" colspan="13">No employees match these filters.</td></tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<div class="directory__pagination">
|
||||
{% set prev_offset = filters.offset - filters.limit %}
|
||||
{% set next_offset = filters.offset + filters.limit %}
|
||||
{% if filters.offset > 0 %}
|
||||
<a class="admin__link" href="{{ request.url.include_query_params(offset=prev_offset) }}">Previous</a>
|
||||
{% endif %}
|
||||
<span class="directory__page">Page {{ page.page }}{% if page.pages %} of {{ page.pages }}{% endif %}</span>
|
||||
{% if next_offset < page.total %}
|
||||
<a class="admin__link" href="{{ request.url.include_query_params(offset=next_offset) }}">Next</a>
|
||||
{% endif %}
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<div class="columns-modal" data-columns-modal hidden>
|
||||
<div class="columns-modal__backdrop" data-columns-close></div>
|
||||
<section class="columns-modal__panel" aria-label="Column settings">
|
||||
<div class="columns-modal__header">
|
||||
<h3 class="columns-modal__title">Visible columns</h3>
|
||||
<button class="button button--ghost" type="button" data-columns-close>Close</button>
|
||||
</div>
|
||||
<div class="columns-modal__grid">
|
||||
{% for key, label in [("full_name", "Name"), ("status", "Status"), ("positions", "Positions"), ("hse_start_year", "HSE start"), ("email", "Email"), ("phone", "Phone"), ("address", "Address"), ("publications_count", "Publications"), ("courses_count", "Courses"), ("first_seen_at", "First seen"), ("last_seen_at", "Last seen"), ("dismissed_at", "Dismissed"), ("profile", "Profile")] %}
|
||||
<label class="columns-modal__option"><input class="columns-modal__checkbox" type="checkbox" value="{{ key }}" data-column-toggle> {{ label }}</label>
|
||||
{% endfor %}
|
||||
</div>
|
||||
</section>
|
||||
</div>
|
||||
{% endblock %}
|
||||
{% block scripts %}
|
||||
<script src="/static/admin.js"></script>
|
||||
{% endblock %}
|
||||
@@ -2,13 +2,43 @@
|
||||
{% block title %}Runs · MIEM Employees{% endblock %}
|
||||
{% block content %}
|
||||
<section class="panel">
|
||||
<h2 class="panel__title">Crawl runs</h2>
|
||||
<form method="post" action="/admin/runs"><button class="button" type="submit">Start crawl</button></form>
|
||||
<div class="progress-panel__header">
|
||||
<h2 class="panel__title">Crawl runs</h2>
|
||||
<form method="post" action="/admin/runs"><button class="button" type="submit">Start crawl now</button></form>
|
||||
</div>
|
||||
{% set run = runs[0] if runs else none %}
|
||||
{% if run %}
|
||||
{% set processed = run.parsed_count + run.error_count %}
|
||||
{% set percent = ((processed / run.found_count) * 100) | round(1) if run.found_count else 0 %}
|
||||
<div class="progress-panel" data-progress-panel>
|
||||
<div class="progress-panel__meta">
|
||||
<span data-progress-status>{{ run.status }}</span>
|
||||
<span><span data-progress-processed>{{ processed }}</span> / <span data-progress-found>{{ run.found_count }}</span> processed</span>
|
||||
<span><span data-progress-errors>{{ run.error_count }}</span> errors</span>
|
||||
</div>
|
||||
<div class="progress-bar" aria-label="Parsing progress">
|
||||
<div class="progress-bar__fill" data-progress-fill style="width: {{ percent }}%"></div>
|
||||
</div>
|
||||
<div class="progress-panel__percent"><span data-progress-percent>{{ percent }}</span>%</div>
|
||||
</div>
|
||||
{% else %}
|
||||
<div class="progress-panel" data-progress-panel>
|
||||
<div class="progress-panel__meta">
|
||||
<span data-progress-status>idle</span>
|
||||
<span><span data-progress-processed>0</span> / <span data-progress-found>0</span> processed</span>
|
||||
<span><span data-progress-errors>0</span> errors</span>
|
||||
</div>
|
||||
<div class="progress-bar" aria-label="Parsing progress">
|
||||
<div class="progress-bar__fill" data-progress-fill style="width: 0%"></div>
|
||||
</div>
|
||||
<div class="progress-panel__percent"><span data-progress-percent>0</span>%</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
<table class="table">
|
||||
<thead><tr><th class="table__head">ID</th><th class="table__head">Status</th><th class="table__head">Found</th><th class="table__head">Parsed</th><th class="table__head">Errors</th><th class="table__head">Dismissed</th></tr></thead>
|
||||
<thead><tr><th class="table__head">ID</th><th class="table__head">Status</th><th class="table__head">Found</th><th class="table__head">Parsed</th><th class="table__head">New</th><th class="table__head">Errors</th><th class="table__head">Dismissed</th></tr></thead>
|
||||
<tbody>
|
||||
{% for run in runs %}
|
||||
<tr><td class="table__cell">{{ run.id }}</td><td class="table__cell">{{ run.status }}</td><td class="table__cell">{{ run.found_count }}</td><td class="table__cell">{{ run.parsed_count }}</td><td class="table__cell">{{ run.error_count }}</td><td class="table__cell">{{ run.dismissed_count }}</td></tr>
|
||||
<tr><td class="table__cell">{{ run.id }}</td><td class="table__cell">{{ run.status }}</td><td class="table__cell">{{ run.found_count }}</td><td class="table__cell">{{ run.parsed_count }}</td><td class="table__cell">{{ run.new_count }}</td><td class="table__cell">{{ run.error_count }}</td><td class="table__cell">{{ run.dismissed_count }}</td></tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
@@ -25,3 +55,6 @@
|
||||
</table>
|
||||
</section>
|
||||
{% endblock %}
|
||||
{% block scripts %}
|
||||
<script src="/static/admin.js"></script>
|
||||
{% endblock %}
|
||||
|
||||
Reference in New Issue
Block a user