fix final step
This commit is contained in:
parent
9592c00565
commit
394546dc67
9 changed files with 137 additions and 82 deletions
|
@ -143,9 +143,9 @@ class ProcessInstanceAdmin(SimpleHistoryAdmin):
|
|||
|
||||
@admin.register(StepInstance)
|
||||
class StepInstanceAdmin(SimpleHistoryAdmin):
|
||||
list_display = ['process_instance', 'step', 'assigned_to', 'status_display', 'rejection_count', 'edit_count', 'started_at', 'completed_at']
|
||||
list_display = ['process_instance', 'process_instance__code', 'step', 'assigned_to', 'status_display', 'rejection_count', 'edit_count', 'started_at', 'completed_at']
|
||||
list_filter = ['status', 'step__process', 'started_at']
|
||||
search_fields = ['process_instance__name', 'step__name', 'assigned_to__username']
|
||||
search_fields = ['process_instance__name', 'process_instance__code', 'step__name', 'assigned_to__username']
|
||||
readonly_fields = ['started_at', 'completed_at']
|
||||
ordering = ['process_instance', 'step__order']
|
||||
|
||||
|
|
|
@ -1,7 +1,8 @@
|
|||
{% extends '_base.html' %}
|
||||
{% extends '_base.html' %}
|
||||
{% load static %}
|
||||
{% load humanize %}
|
||||
{% load common_tags %}
|
||||
{% load processes_tags %}
|
||||
|
||||
{% block sidebar %}
|
||||
{% include 'sidebars/admin.html' %}
|
||||
|
@ -15,23 +16,34 @@
|
|||
|
||||
{% block content %}
|
||||
{% include '_toasts.html' %}
|
||||
|
||||
<!-- Instance Info Modal -->
|
||||
{% instance_info_modal instance %}
|
||||
|
||||
|
||||
<div class="container-xxl flex-grow-1 container-p-y">
|
||||
<div class="row">
|
||||
<div class="col-12 mb-4">
|
||||
<div class="d-flex align-items-center justify-content-between mb-3">
|
||||
<div>
|
||||
<h4 class="mb-1">گزارش نهایی درخواست {{ instance.code }}</h4>
|
||||
<small class="text-muted d-block">
|
||||
اشتراک آب: {{ instance.well.water_subscription_number|default:"-" }}
|
||||
| نماینده: {{ instance.representative.profile.national_code|default:"-" }}
|
||||
<small class="text-muted d-block">
|
||||
{% instance_info instance %}
|
||||
</small>
|
||||
</div>
|
||||
<div class="d-flex gap-2">
|
||||
{% if invoice %}
|
||||
<a href="{% url 'invoices:final_invoice_print' instance.id %}" target="_blank" class="btn btn-outline-secondary"><i class="bx bx-printer"></i> پرینت فاکتور</a>
|
||||
<a href="{% url 'invoices:final_invoice_print' instance.id %}" target="_blank" class="btn btn-outline-secondary">
|
||||
<i class="bx bx-printer me-2"></i> پرینت فاکتور
|
||||
</a>
|
||||
{% endif %}
|
||||
<a href="{% url 'certificates:certificate_print' instance.id %}" target="_blank" class="btn btn-outline-secondary"><i class="bx bx-printer"></i> پرینت گواهی</a>
|
||||
<a href="{% url 'processes:request_list' %}" class="btn btn-outline-secondary">بازگشت</a>
|
||||
<a href="{% url 'certificates:certificate_print' instance.id %}" target="_blank" class="btn btn-outline-secondary">
|
||||
<i class="bx bx-printer me-2"></i> پرینت گواهی
|
||||
</a>
|
||||
<a href="{% url 'processes:request_list' %}" class="btn btn-outline-secondary">
|
||||
<i class="bx bx-chevron-right bx-sm ms-sm-n2"></i>
|
||||
بازگشت
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue