Merge branch '498-cmb-rearrange-columns' into '488-cmb-live'

Add JO ID and status to header to JO form. #498

See merge request jankstudio/resq!586
This commit is contained in:
Kendrick Chan 2020-09-18 06:41:59 +00:00
commit e0f41c57c1
2 changed files with 18 additions and 6 deletions

View file

@ -23,9 +23,15 @@
<span class="m-portlet__head-icon">
<i class="flaticon-transport"></i>
</span>
<h3 class="m-portlet__head-text">
One-step Job Order
</h3>
{% if mode == "onestep" %}
<h3 class="m-portlet__head-text">
One-step Job Order
</h3>
{% else %}
<h3 class="m-portlet__head-text">
One-step Job Order #{{ obj.getID }} - {{ obj.getStatusText }}
</h3>
{% endif %}
</div>
</div>
</div>

View file

@ -23,9 +23,15 @@
<span class="m-portlet__head-icon">
<i class="flaticon-transport"></i>
</span>
<h3 class="m-portlet__head-text">
Walk-in Job Order
</h3>
{% if mode == "walk-in" %}
<h3 class="m-portlet__head-text">
Walk-in Job Order
</h3>
{% else %}
<h3 class="m-portlet__head-text">
Walk-in Job Order #{{ obj.getID }} - {{ obj.getStatusText }}
</h3>
{% endif %}
</div>
</div>
</div>