Skip to content

Commit

Permalink
Update data models, layout, documentation (#8)
Browse files Browse the repository at this point in the history 
Former-commit-id: c299c7b
  • Loading branch information
@anorthall
anorthall committed Apr 27, 2024
1 parent 4e14a4a commit aa8add9
Show file tree
Hide file tree
Showing 33 changed files with 47 additions and 69 deletions.
11 changes: 11 additions & 0 deletions reportdb/core/utils.py
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
from typing import cast

from django.http import HttpRequest

from core.models import ACAUser


def get_authed_user(request: HttpRequest) -> ACAUser | None:
if request.user.is_authenticated:
return cast(ACAUser, request.user)
return None
2 changes: 1 addition & 1 deletion reportdb/db/admin.py.REMOVED.git-id
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
adb881e6aac2e3b170602740864cc10eca0a8616
717a0125e14ce98fe23db3fcedaa5797ca89d0b4
1 change: 1 addition & 0 deletions reportdb/db/choices.py.REMOVED.git-id
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1d559f9c0ff8ab92ebcba7de1ceaf8a029f8bcd8
9 changes: 1 addition & 8 deletions reportdb/db/context_managers.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,6 @@ def task_count(request):
return context

context["report_text_pending"] = Incident.objects.need_report_text().count()
context["analysis_pending"] = Incident.objects.need_analysis().count()
context["approval_pending"] = Incident.objects.pending().count()

context["total_tasks"] = (
context["report_text_pending"]
+ context["analysis_pending"]
+ context["approval_pending"]
)
context["total_tasks"] = context["report_text_pending"]

return context
2 changes: 1 addition & 1 deletion reportdb/db/forms.py.REMOVED.git-id
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9c14bf9dad1afeca33bff58b493a7472a7f0d158
6511f6a947f52a7ec921980594bc4f5692f785aa
2 changes: 1 addition & 1 deletion reportdb/db/management/commands/import_json.py.REMOVED.git-id
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ee07b25c275e67b0e1d98867bf9f3ec38bd8f3e8
cc658e2bf0867efac8a80599efd8937fc340bae3
1 change: 1 addition & 0 deletions ...e_squashed_0054_alter_incident_cave_alter_incident_self_rescue_and_more.py.REMOVED.git-id
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
c3f53d1bbce9d7cc421e2acc2be8d22c9e5eacb2
2 changes: 1 addition & 1 deletion reportdb/db/mixins.py.REMOVED.git-id
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
22460d81d36f2e7ea0ee7abaf611cbd994848871
690eba61d632d3f841ddc5560d50361d803472f4
2 changes: 1 addition & 1 deletion reportdb/db/models.py.REMOVED.git-id
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
e59c6534c380b8f9d5cf7e2fa0b74c4cee8a83f2
c2756e68d48237f93e0702e19b7708702c309a08
2 changes: 1 addition & 1 deletion reportdb/db/services.py.REMOVED.git-id
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4245c80bee96a23fe9ca093d726854d3956f21fe
ae13fcf60afaf76bd22ada1ac7d578526a9927de
2 changes: 1 addition & 1 deletion reportdb/db/templates/about.html.REMOVED.git-id
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
174422fc85d60a6502bbd2212d20cb0cbf6a2c58
8035585130a35fbafaad4d6ef69aabf7271d389f
2 changes: 1 addition & 1 deletion reportdb/db/templates/approval/includes/highlight_incomplete_js.html.REMOVED.git-id
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
f0e32708367a62f59af5d31e84ae951685bf0615
b10e64162e5d1890b7573c7254b3e8be6e28b0b6
2 changes: 1 addition & 1 deletion reportdb/db/templates/help.html.REMOVED.git-id
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
535d3270f401c1a58a11410a45236bb272ff6b5d
c99ad40b6ec97b36a86053f66aafeb68d705375f
2 changes: 1 addition & 1 deletion reportdb/db/templates/incident_add_report_text.html.REMOVED.git-id
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0fe76543ab2fb764bf66dc0a5aa6fbf486b11d51
107fb766ebd999cae0902d554c4bd849a1cbe381
2 changes: 1 addition & 1 deletion reportdb/db/templates/incident_detail.html.REMOVED.git-id
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ccdef8f1b60336dd3bdd2407071bcf4bc6f12724
db1a871244973580845ad387629676f8cf777db8
2 changes: 1 addition & 1 deletion reportdb/db/templates/incident_list.html.REMOVED.git-id
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
a975bdaa2e7c1d6544f5e1feff98838c4d59784e
beb1a3c4aa6108ab17faa2310b8dfd81c5ccb2c5
2 changes: 1 addition & 1 deletion reportdb/db/templates/incident_update.html.REMOVED.git-id
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8d240e5246b276a08a7de87dda443e72723fdff0
9fdbf37454bc3fbbe72fa65e719c2b4d3fcbb3c8
2 changes: 1 addition & 1 deletion reportdb/db/templates/includes/incident_display.html.REMOVED.git-id
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4a3be8ea1411b9c20975814b7926308cfd89fe6f
f2e766a3cd730de3163ce28fb3a1b26e8466d303
2 changes: 1 addition & 1 deletion reportdb/db/templates/includes/incident_flags.html.REMOVED.git-id
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
151fc928d73e681c1985edef251170df3b6a87a6
175f15570cef4e49ecf5cfe01892248ece0a4c14
13 changes: 0 additions & 13 deletions reportdb/db/templates/includes/incident_header.html
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,3 @@
<h1 class="page-header">
<span class="extra d-none d-sm-inline">{{ verb }} incident {% if incident.cave %}at</span> {{ incident.cave }}{% else %}on</span> {{ incident.date|date }}{% endif %}
{% if incident.approved %}
<span class="ms-sm-1 small text-success"
data-bs-toggle="tooltip"
data-bs-title="This incident has been checked and the data is complete and correct.">
<i class="bi bi-check-circle-fill"></i>
</span>
{% else %}
<span class="ms-sm-1 small text-danger"
data-bs-toggle="tooltip"
data-bs-title="Data entry for this incident is incomplete and may contain errors or omissions.">
<i class="bi bi-exclamation-triangle-fill"></i>
</span>
{% endif %}
</h1>
10 changes: 9 additions & 1 deletion reportdb/db/templates/includes/incident_last_updated.html
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
<small class="text-muted mt-3 d-block">
This record was last updated on {{ incident.updated|date:"jS M Y" }} at {{ incident.updated|time:"H:i e" }}.
{% if incident.created_at == incident.updated_at %}
This record was created on {{ incident.created_at|date:"jS M Y" }} at {{ incident.created_at|time:"H:i e" }}.
{% else %}
This record was last updated on {{ incident.updated_at|date:"jS M Y" }} at {{ incident.updated_at|time:"H:i e" }}.
{% endif %}

{% if incident.data_input_source == incident.DataInput.AI %}
The data was processed and input using AI.
{% endif %}
</small>
2 changes: 1 addition & 1 deletion reportdb/db/templates/includes/injured_cavers.html.REMOVED.git-id
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ec676509fc8af6cd18ab926ba022a2f11a3d403b
1e4eceb884b51591bf1fcb9105ca6a8de5e8c2eb
2 changes: 1 addition & 1 deletion reportdb/db/templates/index.html.REMOVED.git-id
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
c3adcc5e75a88f6f8dd3eeacc388ecda468ba0c2
0625bb13421d2a434e79e50f7bf3ca80a5ee07cc
Empty file removed reportdb/db/tests.py
View file
Empty file.
2 changes: 1 addition & 1 deletion reportdb/db/urls.py.REMOVED.git-id
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6c6465743cb1931b5d9b03fc673473608894921d
61328ae14b4d765580cf89d2dd7b9da837f6dc7d
2 changes: 1 addition & 1 deletion reportdb/db/views.py.REMOVED.git-id
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
b0f4b07be2170ef0e79244ce16794f2dc22d00be
a0a6787cd0a06949bd161cb87fd8914523dfea0d
2 changes: 1 addition & 1 deletion reportdb/reportdb/settings.py.REMOVED.git-id
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
305ced9b9baacb3974adfd4fb44786adecfbeaa7
3ae3e0c5ac6b02201e6aaab16893354e444bc599
2 changes: 1 addition & 1 deletion reportdb/static/css/core.css.REMOVED.git-id
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
a6d90f42fcade9eabd277a49a1908d1946f48673
de863281209f09f12ff81d95bc658a72ad6fd698
2 changes: 1 addition & 1 deletion reportdb/templates/_nav_links.html.REMOVED.git-id
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
352308654e0735771a0b653baa9b0b8400a69b78
ed2afe2d70919e9b90b64f5423944de3d21bbbbe
23 changes: 0 additions & 23 deletions reportdb/templates/navbar.html
View file

This file was deleted.

1 change: 1 addition & 0 deletions reportdb/templates/navbar.html.REMOVED.git-id
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
b61cc0e412dd64a98106c9b3ad78611e2bf90cfc
1 change: 0 additions & 1 deletion requirements.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ django-active-link
django-crispy-forms
django-debug-toolbar
django-htmx
django-import-export
django-reversion
django-storages[s3]
dj-database-url
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt.REMOVED.git-id
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
bf7e52ffb461185f5d9a4b5742666f88b0185324
16d742ff2d729b28157c246e022cb1bbaae64571

0 comments on commit aa8add9

Please sign in to comment.