Compare commits

...

2 Commits

@ -275,6 +275,9 @@ class Job(models.Model):
def get_stairs(self):
return Stair.objects.filter(submittal__job__number=self.number)
def get_stairs_qstring(self):
return ','.join([str(s.pk) for s in self.get_stairs()])
def stairs_in_design(self):
return list(filter(lambda s: s.in_design(), self.get_stairs()))

@ -72,8 +72,8 @@
{% endif %}
</ul>
</header>
<div class="container-fluid py-3 sticky-top"
style="height: 80px; background: inherit">
<div class="container-lg-fluid pt-2 sticky-top"
style="background: inherit">
{% block joblist %}{% endblock %}
</div>
<div id="maincontent" class="container">

@ -4,11 +4,6 @@
{% block title %}{{ job }} | {{ block.super }}{% endblock %}
{% block content %}
<div class="sticky-top" style="top: 80px; background: white">
<h2 class="pb-2">
{{ job }}
</h2>
</div>
<div class="d-flex g-1">
{% with button_class="btn btn-sm btn-primary me-1 mt-1 mb-auto" %}
{% if user.is_staff %}
@ -246,6 +241,12 @@
hx-swap="beforeend"
>Add transmittal</button>
</span>
<span>
|
<a href="{% url 'admin:jobs_task_add' %}?job={{job.pk}}&stairs={{job.get_stairs_qstring}}&stage=SUB{% if job.sub_detailers %}&detailer={{job.sub_detailers.0.pk}}{%endif%}""
>
Add submittal task</a>
</span>
{% else %}
{% include 'jobs/_hideshowbtn.html' with target='sub_calendar' %}
{% endif %}
@ -392,15 +393,22 @@
{% endblock %}
{% block joblist %}
<ul class="nav d-flex justify-content-center">
{% for j in jobs %}
<li class="nav-link p-1"
style="--bs-nav-link-margin-x: 3px">
<a class="btn btn-sm btn-outline-secondary {% if j == job %}active{% endif %}"
href="{% url 'jobs:job_detail' pk=j.pk %}">
{{ j.number }}
</a>
</li>
{% endfor %}
</ul>
<div>
<ul class="nav d-flex justify-content-center">
{% for j in jobs %}
<li class="nav-link p-1"
style="--bs-nav-link-margin-x: 3px">
<a class="btn btn-sm btn-outline-secondary {% if j == job %}active{% endif %}"
href="{% url 'jobs:job_detail' pk=j.pk %}">
{{ j.number }}
</a>
</li>
{% endfor %}
</ul>
<div class="container">
<h2>
{{ job }}
</h2>
</div>
</div>
{% endblock %}

Loading…
Cancel
Save