hotswap/delphi-database-v2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed rolodex page

Browse Source
This commit is contained in:
HotSwapp
2025-10-07 23:09:15 -05:00
parent fdcff9fbb2
commit 2efbf14940
8 changed files with 104189 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/__pycache__/main.cpython-313.pyc
View File

Binary file not shown.

10
app/main.py
View File

@@ -2028,8 +2028,14 @@ async def rolodex_list(
# Use EXISTS over join to avoid duplicate rows
query = query.filter(Client.phones.any(Phone.phone_number.ilike(like_phone)))
# Order by last then first for stable display
query = query.order_by(Client.last_name.asc().nulls_last(), Client.first_name.asc().nulls_last())
# Order by last then first for stable display (SQLite-safe nulls last)
# SQLite does not support "NULLS LAST"; emulate by sorting non-nulls first, then value
query = query.order_by(
Client.last_name.is_(None),
Client.last_name.asc(),
Client.first_name.is_(None),
Client.first_name.asc(),
)
total: int = query.count()
total_pages: int = (total + page_size - 1) // page_size if total > 0 else 1

33
app/templates/partials/answer_table_macros.html
View File

@@ -1,35 +1,4 @@
{#
Reusable macros for answer-table pattern: summary, table with selection,
bulk actions bar, and pagination controls.
Usage in a page:
{% from "partials/answer_table_macros.html" import results_summary, pagination, answer_table, bulk_actions_bar %}
<div class="col-12 text-muted small">{{ results_summary(start_index, end_index, total) }}</div>
{% set headers = [
{ 'title': 'Name', 'width': '220px' },
{ 'title': 'Company' },
{ 'title': 'Address' },
{ 'title': 'City' },
{ 'title': 'State', 'width': '80px' },
{ 'title': 'ZIP', 'width': '110px' },
{ 'title': 'Phones', 'width': '200px' },
{ 'title': 'Actions', 'width': '140px', 'align': 'end' },
] %}
{% call(answer_table(headers, form_action='/reports/phone-book', select_name='client_ids', enable_bulk=enable_bulk)) %}
{# render <tr>...</tr> rows here #}
{% endcall %}
{% if enable_bulk %}
{% call(bulk_actions_bar()) %}
{# render bulk action buttons/links here #}
{% endcall %}
{% endif %}
{{ pagination('/rolodex', page, total_pages, page_size, {'q': q, 'phone': phone}) }}
#}
{# Jinja macros for reusable table patterns. #}
{% macro results_summary(start_index, end_index, total) -%}
{% if total and total > 0 %}

104
app/templates/rolodex.html
View File

@@ -48,60 +48,74 @@
{ 'title': 'Phones', 'width': '200px' },
{ 'title': 'Actions', 'width': '140px', 'align': 'end' },
] %}
{% call(answer_table(headers, form_action='/reports/phone-book', select_name='client_ids', enable_bulk=enable_bulk)) %}
{% if clients and clients|length > 0 %}
<form method="post" action="/reports/phone-book" class="js-answer-table">
<table class="table table-hover align-middle">
<thead class="table-light">
<tr>
{% if enable_bulk %}
<th style="width: 40px;"><input class="form-check-input js-select-all" type="checkbox"></th>
{% endif %}
{% for h in headers %}
<th{% if h.width %} style="width: {{ h.width }};"{% endif %}{% if h.align == 'end' %} class="text-end"{% endif %}>{{ h.title }}</th>
{% endfor %}
</tr>
</thead>
<tbody>
{% if clients and clients|length > 0 %}
{% for c in clients %}
<tr>
{% if enable_bulk %}
<td><input class="form-check-input" type="checkbox" name="client_ids" value="{{ c.id }}"></td>
{% if enable_bulk %}
<td><input class="form-check-input" type="checkbox" name="client_ids" value="{{ c.id }}"></td>
{% endif %}
<td><span class="fw-semibold">{{ c.last_name or '' }}, {{ c.first_name or '' }}</span></td>
<td>{{ c.company or '' }}</td>
<td>{{ c.address or '' }}</td>
<td>{{ c.city or '' }}</td>
<td>{{ c.state or '' }}</td>
<td>{{ c.zip_code or '' }}</td>
<td>
{% if c.phones and c.phones|length > 0 %}
{% for p in c.phones[:3] %}
<span class="badge bg-light text-dark me-1">{{ p.phone_number }}</span>
{% endfor %}
{% else %}
<span class="text-muted">—</span>
{% endif %}
<td><span class="fw-semibold">{{ c.last_name or '' }}, {{ c.first_name or '' }}</span></td>
<td>{{ c.company or '' }}</td>
<td>{{ c.address or '' }}</td>
<td>{{ c.city or '' }}</td>
<td>{{ c.state or '' }}</td>
<td>{{ c.zip_code or '' }}</td>
<td>
{% if c.phones and c.phones|length > 0 %}
{% for p in c.phones[:3] %}
<span class="badge bg-light text-dark me-1">{{ p.phone_number }}</span>
{% endfor %}
{% else %}
<span class="text-muted">—</span>
{% endif %}
</td>
<td class="text-end">
<a class="btn btn-sm btn-outline-primary" href="/rolodex/{{ c.id }}">
<i class="bi bi-person-lines-fill me-1"></i>View
</a>
</td>
</td>
<td class="text-end">
<a class="btn btn-sm btn-outline-primary" href="/rolodex/{{ c.id }}">
<i class="bi bi-person-lines-fill me-1"></i>View
</a>
</td>
</tr>
{% endfor %}
{% else %}
{% else %}
<tr>
<td colspan="8" class="text-center text-muted py-4">No clients found.</td>
<td colspan="8" class="text-center text-muted py-4">No clients found.</td>
</tr>
{% endif %}
{% endcall %}
{% endif %}
</tbody>
</table>
</form>
{% if enable_bulk %}
{% call(bulk_actions_bar()) %}
<button type="submit" class="btn btn-outline-secondary">
<i class="bi bi-journal-text me-1"></i>Phone Book (Selected)
</button>
<a class="btn btn-outline-secondary" href="/reports/phone-book?format=csv{% if q %}&q={{ q | urlencode }}{% endif %}">
<i class="bi bi-filetype-csv me-1"></i>Phone Book CSV (Current Filter)
</a>
<a class="btn btn-outline-secondary js-submit-to" data-action="/reports/phone-book-address" href="#">
<i class="bi bi-journal-text me-1"></i>Phone+Address (Selected)
</a>
<a class="btn btn-outline-secondary js-submit-to" data-action="/reports/envelope" href="#">
<i class="bi bi-envelope me-1"></i>Envelope (Selected)
</a>
<a class="btn btn-outline-secondary js-submit-to" data-action="/reports/rolodex-info" href="#">
<i class="bi bi-card-text me-1"></i>Rolodex Info (Selected)
</a>
{% endcall %}
<div class="d-flex gap-2 mb-2">
<button type="submit" class="btn btn-outline-secondary">
<i class="bi bi-journal-text me-1"></i>Phone Book (Selected)
</button>
<a class="btn btn-outline-secondary" href="/reports/phone-book?format=csv{% if q %}&q={{ q | urlencode }}{% endif %}">
<i class="bi bi-filetype-csv me-1"></i>Phone Book CSV (Current Filter)
</a>
<a class="btn btn-outline-secondary js-submit-to" data-action="/reports/phone-book-address" href="#">
<i class="bi bi-journal-text me-1"></i>Phone+Address (Selected)
</a>
<a class="btn btn-outline-secondary js-submit-to" data-action="/reports/envelope" href="#">
<i class="bi bi-envelope me-1"></i>Envelope (Selected)
</a>
<a class="btn btn-outline-secondary js-submit-to" data-action="/reports/rolodex-info" href="#">
<i class="bi bi-card-text me-1"></i>Rolodex Info (Selected)
</a>
</div>
{% endif %}
</div>
</div>

52060
data-import/b575ed85-1b50-469b-8d32-ed07a50cf16f.csv Normal file
View File

File diff suppressed because it is too large Load Diff

52060
data-import/client_c381cb33-f886-42c1-96ed-fbe5078c26ae.csv Normal file
View File

File diff suppressed because it is too large Load Diff

BIN
delphi.db
View File

Binary file not shown.

1
test_upload.csv Normal file
View File

@@ -0,0 +1 @@
id,name,email,phone
1 id name email phone