Skip to content

Commit 1db656b

Browse files
committed
feat(emerg): add printing page option to display warning
1 parent 4b22b52 commit 1db656b

3 files changed

Lines changed: 7 additions & 1 deletion

File tree

intranet/apps/announcements/models.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -315,6 +315,7 @@ class WarningAnnouncement(models.Model):
315315
("login", "Login Warning (displays on login page)"),
316316
("dashboard_login", "Dashboard and Login Warning (displays on dashboard and login pages)"),
317317
("global", "Global Warning (displays on all pages)"),
318+
("printing", "Printing Warning (displays on printing page)"),
318319
],
319320
default="dashboard",
320321
)

intranet/apps/printing/views.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
from sentry_sdk import add_breadcrumb, capture_exception
2121
from xhtml2pdf import pisa
2222

23+
from ...utils.helpers import get_warning_html
24+
from ..announcements.models import WarningAnnouncement
2325
from ..auth.decorators import deny_restricted
2426
from ..context_processors import _get_current_ip
2527
from .forms import PrintJobForm
@@ -548,7 +550,7 @@ def print_view(request):
548550
start_time = datetime.datetime.now() - datetime.timedelta(seconds=elapsed_seconds)
549551
context["updated_time"] = start_time.strftime("%-I:%M:%S %p")
550552

551-
if (printing_warning_objs := WarningAnnouncement.objects.filter(type="printing", active=True)):
553+
if printing_warning_objs := WarningAnnouncement.objects.filter(type="printing", active=True):
552554
context["printing_warning"] = get_warning_html(printing_warning_objs)
553555

554556
return render(request, "printing/print.html", context)

intranet/templates/printing/print.html

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,9 @@
6363

6464
{% block main %}
6565
<div class="primary-content">
66+
{% if printing_warning %}
67+
<div class="warning-announcement">{{ printing_warning|safe|linebreaks }}</div>
68+
{% endif %}
6669

6770
<h2>Printing</h2>
6871
<br>

0 commit comments

Comments
 (0)