From 5ce94214d5e1e1c3dfbaa54586dd405ca1b5d77a Mon Sep 17 00:00:00 2001 From: aminhashemi92 Date: Sun, 7 Sep 2025 12:00:34 +0330 Subject: [PATCH] Add progress to req_list --- db.sqlite3 | Bin 2375680 -> 2375680 bytes .../installation_report_step.html | 18 +- processes/models.py | 2 +- .../templates/processes/request_list.html | 46 +- processes/views.py | 20 +- static/assets/vendor/css/rtl/core-dark.css | 29202 +++++++++++++++- 6 files changed, 29261 insertions(+), 27 deletions(-) diff --git a/db.sqlite3 b/db.sqlite3 index 7df1dd891c21a42e79a7d576dac37fa6b6c9013d..e02ec79f8053a52023164c01f0a8ef2f18a109be 100644 GIT binary patch delta 6194 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 diff --git a/installations/templates/installations/installation_report_step.html b/installations/templates/installations/installation_report_step.html index 16b1eb6..6044f53 100644 --- a/installations/templates/installations/installation_report_step.html +++ b/installations/templates/installations/installation_report_step.html @@ -20,6 +20,18 @@ + + {% endblock %} {% block content %} @@ -51,10 +63,6 @@ {% else %} {% endif %} - {% if user_can_approve %} - - - {% endif %}
@@ -276,7 +284,7 @@ {% for qi in quote_items %} - + diff --git a/processes/models.py b/processes/models.py index 0a119db..a8a5494 100644 --- a/processes/models.py +++ b/processes/models.py @@ -245,7 +245,7 @@ class ProcessInstance(SluggedModel): 'cancelled': 'warning', } color = status_colors.get(self.status, 'secondary') - return '{}'.format(color, self.get_status_display()) + return '{}'.format(color, self.get_status_display()) def get_priority_display_with_color(self): """نمایش اولویت با رنگ""" diff --git a/processes/templates/processes/request_list.html b/processes/templates/processes/request_list.html index 346f7c0..dfcf4bc 100644 --- a/processes/templates/processes/request_list.html +++ b/processes/templates/processes/request_list.html @@ -144,31 +144,41 @@ نماینده استان امور + پیشرفت وضعیت تاریخ ایجاد عملیات - {% for inst in instances %} + {% for item in instances_with_progress %} - {{ inst.code }} - {{ inst.process.name }} + {{ item.instance.code }} + {{ item.instance.process.name }} - {% if inst.status == 'completed' %} - {{ inst.current_step.name|default:"--" }} - {% elif inst.current_step %} - {{ inst.current_step.name }} + {% if item.instance.status == 'completed' %} + {{ item.instance.current_step.name|default:"--" }} + {% elif item.instance.current_step %} + {{ item.instance.current_step.name }} {% else %} -- {% endif %} - {{ inst.well.water_subscription_number }} - {% if inst.representative %}{{ inst.representative.get_full_name }}{% else %}-{% endif %} - {% if inst.well and inst.well.county %}{{ inst.well.county }}{% else %}-{% endif %} - {% if inst.well and inst.well.affairs %}{{ inst.well.affairs }}{% else %}-{% endif %} - {{ inst.get_status_display_with_color|safe }} - {{ inst.jcreated }} + {{ item.instance.well.water_subscription_number }} + {% if item.instance.representative %}{{ item.instance.representative.get_full_name }}{% else %}-{% endif %} + {% if item.instance.well and item.instance.well.county %}{{ item.instance.well.county }}{% else %}-{% endif %} + {% if item.instance.well and item.instance.well.affairs %}{{ item.instance.well.affairs }}{% else %}-{% endif %} + +
+
+
+
+
+ {{ item.progress_percentage }}% +
+ + {{ item.instance.get_status_display_with_color|safe }} + {{ item.instance.jcreated }}
@@ -176,19 +186,19 @@