diff --git a/db.sqlite3 b/db.sqlite3 index 7df1dd8..e02ec79 100644 Binary files a/db.sqlite3 and b/db.sqlite3 differ 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 @@