Update
This commit is contained in:
Joshua Laymon
+140
-115
@@ -1,15 +1,16 @@
|
||||
|
||||
from django.shortcuts import render, redirect, get_object_or_404
|
||||
from django.contrib.auth import authenticate, login
|
||||
from django.contrib.auth.decorators import login_required, user_passes_test
|
||||
from django.http import HttpResponse, HttpResponseForbidden
|
||||
from django.http import HttpResponse, HttpResponseForbidden, HttpResponseRedirect
|
||||
from django.contrib import messages
|
||||
from django.db.models import Q
|
||||
import csv
|
||||
from django.db.models import Q, Count
|
||||
from django.utils.timezone import now
|
||||
from .forms import ImportForm
|
||||
from datetime import date, timedelta
|
||||
import csv, io
|
||||
|
||||
from .models import Entry
|
||||
from .utils import import_csv, SEARCHABLE_FIELDS, build_query
|
||||
from .forms import ImportForm, EntryForm
|
||||
from .utils import import_csv_bytes, wildcard_to_like, terms, month_buckets_last_12
|
||||
|
||||
def is_admin(user):
|
||||
return user.is_superuser or user.is_staff
|
||||
@@ -25,132 +26,125 @@ def login_view(request):
|
||||
if user:
|
||||
login(request, user)
|
||||
return redirect("search")
|
||||
ctx["error"] = "Invalid credentials"
|
||||
else:
|
||||
ctx["error"] = "Invalid credentials"
|
||||
return render(request, "login.html", ctx)
|
||||
|
||||
@login_required
|
||||
def redirect_to_search(request):
|
||||
return redirect("search")
|
||||
def search_page(request):
|
||||
# Defaults: Subject, Illustration, Application checked
|
||||
default_fields = {"subject": True, "illustration": True, "application": True,
|
||||
"scripture_raw": False, "source": False, "talk_title": False,
|
||||
"talk_number": False, "entry_code": False}
|
||||
if request.method == "GET":
|
||||
# read selection from query or use defaults
|
||||
selected = {k: (request.GET.get(k,"on" if v else "") != "") for k,v in default_fields.items()}
|
||||
q = request.GET.get("q","").strip()
|
||||
|
||||
@login_required
|
||||
def search_view(request):
|
||||
total = Entry.objects.count()
|
||||
query = request.GET.get("q", "").strip()
|
||||
selected = request.GET.getlist("fields") or list(SEARCHABLE_FIELDS.keys())
|
||||
entries = []
|
||||
results_count = 0
|
||||
current_id = None
|
||||
results = []
|
||||
count = 0
|
||||
idx = 0
|
||||
if q:
|
||||
like = wildcard_to_like(q)
|
||||
term_list = terms(q)
|
||||
# Build Q across selected fields, ANDing each term
|
||||
fields = [f for f,sel in selected.items() if sel]
|
||||
qs = Entry.objects.all()
|
||||
for t in term_list:
|
||||
pattern = wildcard_to_like(t)
|
||||
clause = Q()
|
||||
for f in fields:
|
||||
clause |= Q(**{f+"__icontains": t.replace("*","").replace("?","")})
|
||||
qs = qs.filter(clause)
|
||||
ids = list(qs.order_by("-date_added","-id").values_list("id", flat=True))
|
||||
request.session["result_ids"] = ids
|
||||
count = len(ids)
|
||||
if count:
|
||||
idx = 0
|
||||
entry = Entry.objects.get(pk=ids[idx])
|
||||
return render(request, "entry_view.html", {
|
||||
"entry": entry, "locked": True,
|
||||
"position": idx+1, "count": count, "from_search": True
|
||||
})
|
||||
|
||||
if query:
|
||||
q = build_query(selected, query)
|
||||
entries = list(Entry.objects.filter(q).order_by("-date_added","-id").values_list("id", flat=True))
|
||||
results_count = len(entries)
|
||||
request.session["search_ids"] = entries
|
||||
request.session["search_index"] = 0
|
||||
if entries:
|
||||
current_id = entries[0]
|
||||
return redirect("record_view", entry_id=current_id)
|
||||
# If no query or no results, render search page
|
||||
total = Entry.objects.count()
|
||||
return render(request, "search.html", {
|
||||
"q": q, "selected": selected, "total": total
|
||||
})
|
||||
|
||||
return render(request, "search.html", {
|
||||
"total": total,
|
||||
"q": query,
|
||||
"selected": selected,
|
||||
"fields": list(SEARCHABLE_FIELDS.keys()),
|
||||
"results_count": results_count,
|
||||
})
|
||||
|
||||
@login_required
|
||||
def record_view(request, entry_id):
|
||||
ids = request.session.get("search_ids", [])
|
||||
if entry_id in ids:
|
||||
request.session["search_index"] = ids.index(entry_id)
|
||||
idx = request.session.get("search_index", 0)
|
||||
total = Entry.objects.count()
|
||||
results_count = len(ids)
|
||||
pos = (idx+1) if ids else 1
|
||||
entry = get_object_or_404(Entry, id=entry_id)
|
||||
return render(request, "record.html", {
|
||||
"entry": entry,
|
||||
"locked": True,
|
||||
"total": total,
|
||||
"results_count": results_count,
|
||||
"position": pos,
|
||||
})
|
||||
|
||||
@login_required
|
||||
def nav_prev(request):
|
||||
ids = request.session.get("search_ids", [])
|
||||
idx = request.session.get("search_index", 0)
|
||||
if ids:
|
||||
idx = max(0, idx-1)
|
||||
request.session["search_index"] = idx
|
||||
return redirect("record_view", entry_id=ids[idx])
|
||||
messages.info(request, "No search results loaded.")
|
||||
return redirect("search")
|
||||
return render(request, "search.html", {"selected": default_fields})
|
||||
|
||||
@login_required
|
||||
def nav_next(request):
|
||||
ids = request.session.get("search_ids", [])
|
||||
idx = request.session.get("search_index", 0)
|
||||
if ids:
|
||||
idx = min(len(ids)-1, idx+1)
|
||||
request.session["search_index"] = idx
|
||||
return redirect("record_view", entry_id=ids[idx])
|
||||
messages.info(request, "No search results loaded.")
|
||||
return redirect("search")
|
||||
|
||||
@login_required
|
||||
def record_save(request, entry_id):
|
||||
if request.method != "POST":
|
||||
return redirect("record_view", entry_id=entry_id)
|
||||
e = get_object_or_404(Entry, id=entry_id)
|
||||
# Save edited fields
|
||||
e.subject = request.POST.get("subject","")
|
||||
e.illustration = request.POST.get("illustration","")
|
||||
e.application = request.POST.get("application","")
|
||||
e.scripture_raw = request.POST.get("scripture_raw","")
|
||||
e.source = request.POST.get("source","")
|
||||
e.talk_title = request.POST.get("talk_title","")
|
||||
tn = request.POST.get("talk_number","").strip()
|
||||
e.talk_number = int(tn) if tn.isdigit() else None
|
||||
e.entry_code = request.POST.get("entry_code","")
|
||||
e.date_added = request.POST.get("date_added") or None
|
||||
e.date_edited = request.POST.get("date_edited") or None
|
||||
e.save()
|
||||
messages.success(request, "Saved changes.")
|
||||
return redirect("record_view", entry_id=entry_id)
|
||||
|
||||
@login_required
|
||||
def record_delete(request, entry_id):
|
||||
if request.method == "POST":
|
||||
e = get_object_or_404(Entry, id=entry_id)
|
||||
e.delete()
|
||||
messages.success(request, "Entry deleted.")
|
||||
# After delete, move to previous or search page
|
||||
ids = request.session.get("search_ids", [])
|
||||
idx = request.session.get("search_index", 0)
|
||||
if ids:
|
||||
ids = [i for i in ids if i != entry_id]
|
||||
request.session["search_ids"] = ids
|
||||
if not ids:
|
||||
return redirect("search")
|
||||
idx = max(0, min(idx, len(ids)-1))
|
||||
request.session["search_index"] = idx
|
||||
return redirect("record_view", entry_id=ids[idx])
|
||||
ids = request.session.get("result_ids", [])
|
||||
if not ids:
|
||||
return redirect("search")
|
||||
return HttpResponseForbidden("Use POST to delete.")
|
||||
idx = int(request.GET.get("i","0"))
|
||||
idx = min(idx+1, len(ids)-1)
|
||||
entry = get_object_or_404(Entry, pk=ids[idx])
|
||||
return render(request, "entry_view.html", {"entry": entry, "locked": True, "position": idx+1, "count": len(ids)})
|
||||
|
||||
@login_required
|
||||
def nav_prev(request):
|
||||
ids = request.session.get("result_ids", [])
|
||||
if not ids:
|
||||
return redirect("search")
|
||||
idx = int(request.GET.get("i","0"))
|
||||
idx = max(idx-1, 0)
|
||||
entry = get_object_or_404(Entry, pk=ids[idx])
|
||||
return render(request, "entry_view.html", {"entry": entry, "locked": True, "position": idx+1, "count": len(ids)})
|
||||
|
||||
@login_required
|
||||
def entry_view(request, entry_id):
|
||||
entry = get_object_or_404(Entry, pk=entry_id)
|
||||
ids = request.session.get("result_ids", [])
|
||||
count = len(ids)
|
||||
position = ids.index(entry.id)+1 if entry.id in ids else 1
|
||||
return render(request, "entry_view.html", {"entry": entry, "locked": True, "position": position, "count": count})
|
||||
|
||||
@login_required
|
||||
def entry_edit(request, entry_id):
|
||||
entry = get_object_or_404(Entry, pk=entry_id)
|
||||
if request.method == "POST":
|
||||
form = EntryForm(request.POST)
|
||||
if form.is_valid():
|
||||
for k,v in form.cleaned_data.items():
|
||||
setattr(entry, k, v)
|
||||
entry.save()
|
||||
messages.success(request, "Entry saved.")
|
||||
return redirect("entry_view", entry_id=entry.id)
|
||||
else:
|
||||
initial = { "subject": entry.subject, "illustration": entry.illustration, "application": entry.application,
|
||||
"scripture_raw": entry.scripture_raw, "source": entry.source, "talk_number": entry.talk_number,
|
||||
"talk_title": entry.talk_title, "entry_code": entry.entry_code,
|
||||
"date_added": entry.date_added, "date_edited": entry.date_edited }
|
||||
form = EntryForm(initial=initial)
|
||||
ids = request.session.get("result_ids", [])
|
||||
count = len(ids)
|
||||
position = ids.index(entry.id)+1 if entry.id in ids else 1
|
||||
return render(request, "entry_edit.html", {"entry": entry, "form": form, "position": position, "count": count})
|
||||
|
||||
@login_required
|
||||
def entry_delete(request, entry_id):
|
||||
entry = get_object_or_404(Entry, pk=entry_id)
|
||||
if request.method == "POST":
|
||||
entry.delete()
|
||||
messages.success(request, "Entry deleted.")
|
||||
return redirect("search")
|
||||
return render(request, "entry_delete_confirm.html", {"entry": entry})
|
||||
|
||||
@login_required
|
||||
@user_passes_test(is_admin)
|
||||
def import_wizard(request):
|
||||
from .forms import ImportForm
|
||||
from .utils import import_csv_bytes
|
||||
if request.method == "POST":
|
||||
form = ImportForm(request.POST, request.FILES)
|
||||
if form.is_valid():
|
||||
fbytes = form.cleaned_data["file"].read()
|
||||
f = form.cleaned_data["file"].read()
|
||||
dry = form.cleaned_data["dry_run"]
|
||||
try:
|
||||
report = import_csv(fbytes, dry_run=dry)
|
||||
report = import_csv_bytes(f, dry_run=dry)
|
||||
return render(request, "import_result.html", {"report": report, "dry_run": dry})
|
||||
except Exception as e:
|
||||
messages.error(request, f"Import failed: {e}")
|
||||
@@ -165,12 +159,43 @@ def export_csv(request):
|
||||
ts = now().strftime("%Y-%m-%d_%H-%M-%S")
|
||||
response['Content-Disposition'] = f'attachment; filename="illustrations_backup_{ts}.csv"'
|
||||
writer = csv.writer(response)
|
||||
writer.writerow(["Subject","Illustration","Application","Scripture","Source","Talk Title","Talk Number","Code","Date","Date Edited"])
|
||||
writer.writerow(["Subject","Illustration","Application","Scripture","Source","Talk Number","Talk Title","Code","Date","Date Edited"])
|
||||
for e in Entry.objects.all().order_by("id"):
|
||||
writer.writerow([
|
||||
e.subject, e.illustration, e.application, e.scripture_raw, e.source,
|
||||
e.talk_title, e.talk_number if e.talk_number is not None else "", e.entry_code,
|
||||
e.talk_number if e.talk_number is not None else "",
|
||||
e.talk_title, e.entry_code,
|
||||
e.date_added.isoformat() if e.date_added else "",
|
||||
e.date_edited.isoformat() if e.date_edited else "",
|
||||
])
|
||||
return response
|
||||
|
||||
@login_required
|
||||
def stats_page(request):
|
||||
total = Entry.objects.count()
|
||||
today = date.today()
|
||||
last30 = Entry.objects.filter(date_added__gte=today - timedelta(days=30)).count()
|
||||
last365 = Entry.objects.filter(date_added__gte=today - timedelta(days=365)).count()
|
||||
|
||||
# Sparkline: counts per month for last 12 months (by date_added, blanks excluded)
|
||||
buckets = month_buckets_last_12(today)
|
||||
series = []
|
||||
for label, start, end in buckets:
|
||||
c = Entry.objects.filter(date_added__gte=start, date_added__lt=end).count()
|
||||
series.append((label, c))
|
||||
|
||||
# Top subjects (split by commas, case-insensitive)
|
||||
from collections import Counter
|
||||
counts = Counter()
|
||||
for subj in Entry.objects.exclude(subject="").values_list("subject", flat=True):
|
||||
for tag in [t.strip() for t in subj.split(",") if t.strip()]:
|
||||
counts[tag.lower()] += 1
|
||||
top_subjects = [{"name": n.title(), "count": c} for n,c in counts.most_common(10)]
|
||||
|
||||
return render(request, "stats.html", {
|
||||
"total": total,
|
||||
"last30": last30,
|
||||
"last365": last365,
|
||||
"series": series,
|
||||
"top_subjects": top_subjects
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user