- {% if template.company.logo %}
-
-
-
diff --git a/contracts/views.py b/contracts/views.py
index f2d0deb..1949665 100644
--- a/contracts/views.py
+++ b/contracts/views.py
@@ -4,6 +4,7 @@ from django.urls import reverse
from django.utils import timezone
from django.template import Template, Context
from processes.models import ProcessInstance, StepInstance
+from common.consts import UserRoles
from .models import ContractTemplate, ContractInstance
from _helpers.utils import jalali_converter2
@@ -34,6 +35,20 @@ def contract_step(request, instance_id, step_id):
step = get_object_or_404(instance.process.steps, id=step_id)
previous_step = instance.process.steps.filter(order__lt=step.order).last()
next_step = instance.process.steps.filter(order__gt=step.order).first()
+ # Access control:
+ # - INSTALLER: can open step but cannot view contract body (show inline message)
+ # - Others: can view
+ # - Only BROKER can submit/complete this step
+ profile = getattr(request.user, 'profile', None)
+ is_broker = False
+ can_view_contract_body = True
+ try:
+ is_broker = bool(profile and profile.has_role(UserRoles.BROKER))
+ if profile and profile.has_role(UserRoles.INSTALLER):
+ can_view_contract_body = False
+ except Exception:
+ pass
+
template_obj = ContractTemplate.objects.first()
if not template_obj:
return render(request, 'contracts/contract_missing.html', {'instance': instance})
@@ -54,8 +69,11 @@ def contract_step(request, instance_id, step_id):
contract.rendered_body = rendered
contract.save()
- # If user submits to go next, mark this step completed and go to next
+ # If user submits to go next, only broker can complete and go to next
if request.method == 'POST':
+ if not is_broker:
+ from django.http import JsonResponse
+ return JsonResponse({'success': False, 'message': 'شما مجوز تایید این مرحله را ندارید'}, status=403)
StepInstance.objects.update_or_create(
process_instance=instance,
step=step,
@@ -74,6 +92,8 @@ def contract_step(request, instance_id, step_id):
'template': template_obj,
'previous_step': previous_step,
'next_step': next_step,
+ 'is_broker': is_broker,
+ 'can_view_contract_body': can_view_contract_body,
})
diff --git a/db.sqlite3 b/db.sqlite3
index 805325d..d816e90 100644
Binary files a/db.sqlite3 and b/db.sqlite3 differ
diff --git a/installations/migrations/0001_initial.py b/installations/migrations/0001_initial.py
index 05cedcd..41f02f5 100644
--- a/installations/migrations/0001_initial.py
+++ b/installations/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 5.2.4 on 2025-08-21 08:25
+# Generated by Django 5.2.4 on 2025-09-07 07:35
import django.db.models.deletion
from django.conf import settings
@@ -10,7 +10,7 @@ class Migration(migrations.Migration):
initial = True
dependencies = [
- ('invoices', '0002_historicalpayment_receipt_image_and_more'),
+ ('invoices', '0001_initial'),
('processes', '0001_initial'),
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
]
@@ -53,6 +53,8 @@ class Migration(migrations.Migration):
('utm_x', models.DecimalField(blank=True, decimal_places=6, max_digits=10, null=True, verbose_name='UTM X')),
('utm_y', models.DecimalField(blank=True, decimal_places=6, max_digits=10, null=True, verbose_name='UTM Y')),
('description', models.TextField(blank=True, verbose_name='توضیحات')),
+ ('approved', models.BooleanField(default=False, verbose_name='تایید شده')),
+ ('approved_at', models.DateTimeField(blank=True, null=True, verbose_name='تاریخ تایید')),
('assignment', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='reports', to='installations.installationassignment', verbose_name='اختصاص')),
('created_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL, verbose_name='ایجادکننده')),
],
diff --git a/installations/migrations/0002_installationreport_approved_and_more.py b/installations/migrations/0002_installationreport_approved_and_more.py
deleted file mode 100644
index d5df3c8..0000000
--- a/installations/migrations/0002_installationreport_approved_and_more.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# Generated by Django 5.2.4 on 2025-08-21 09:04
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('installations', '0001_initial'),
- ]
-
- operations = [
- migrations.AddField(
- model_name='installationreport',
- name='approved',
- field=models.BooleanField(default=False, verbose_name='تایید شده'),
- ),
- migrations.AddField(
- model_name='installationreport',
- name='approved_at',
- field=models.DateTimeField(blank=True, null=True, verbose_name='تاریخ تایید'),
- ),
- ]
diff --git a/installations/templates/installations/installation_assign_step.html b/installations/templates/installations/installation_assign_step.html
index c1d6c79..2bdbe4d 100644
--- a/installations/templates/installations/installation_assign_step.html
+++ b/installations/templates/installations/installation_assign_step.html
@@ -1,6 +1,7 @@
{% extends '_base.html' %}
{% load static %}
{% load processes_tags %}
+{% load common_tags %}
{% load humanize %}
{% block sidebar %}
@@ -41,12 +42,15 @@
- 
-
- {% endif %}
+ {% if can_view_contract_body %}
+ {% if template.company.logo %}
+ {{ contract.template.company.name }}
-{{ contract.template.name }}
-
+
+
+ {% endif %}
- {{ contract.template.company.name }}
+{{ contract.template.name }}
+تاریخ: {{ contract.jcreated }}
- -
{{ contract.rendered_body|safe }}
- -
-
-
- امضای مشترک
-
-
-
امضای شرکت
-
- {% if template.company.signature %}
- 
- {% endif %}
+
+
+
+ {% else %}
+ تاریخ: {{ contract.jcreated }}
+ +
{{ contract.rendered_body|safe }}
+ +
+
-
+
+ امضای مشترک
+
+
+
امضای شرکت
+
+ {% if template.company.signature %}
+
+ {% endif %}
+
شما دسترسی به مشاهده متن قرارداد را ندارید.
+ {% endif %}
+ {% if show_denied_msg %}
+
diff --git a/installations/templates/installations/installation_report_step.html b/installations/templates/installations/installation_report_step.html
index 275f7bc..16b1eb6 100644
--- a/installations/templates/installations/installation_report_step.html
+++ b/installations/templates/installations/installation_report_step.html
@@ -2,6 +2,7 @@
{% load static %}
{% load processes_tags %}
{% load common_tags %}
+{% load accounts_tags %}
{% load humanize %}
{% block sidebar %}
@@ -41,13 +42,31 @@
{% stepper_header instance step %}
شما اجازه تعیین نصاب را ندارید.
+ {% endif %}
-
{% if report and not edit_mode %}
-
- ویرایش گزارش نصب
+
+
+ {% if request.user|is_installer %}
+ ویرایش گزارش نصب
+ {% else %}
+
+ {% endif %}
+ {% if user_can_approve %}
+
+
+ {% endif %}
+
+ {% if step_instance and step_instance.status == 'rejected' and step_instance.get_latest_rejection %}
+
{% endif %}
+ {% if request.user|is_manager or request.user|is_admin %} +
+ {% endif %}
+ {% if approver_statuses %}
+
+
+
+ {% endif %}
+
+ این گزارش رد شده است.
+ علت رد: {{ step_instance.get_latest_rejection.reason }}
+ تاریخ مراجعه: {{ report.visited_date|to_jalali|default:'-' }}
@@ -67,6 +86,9 @@+ {% if request.user|is_manager or request.user|is_admin %} +
+ {% endif %}
عکس‌ها
{% for p in report.photos.all %}
@@ -115,6 +137,42 @@
+
+ {% endif %}
+
+ وضعیت تاییدها
+ {% if user_can_approve %} +
+
+
+
+ {% endif %}
+
+
+
+ {% for st in approver_statuses %}
+
+
+
+ {% endfor %}
+
+
+
+ {{ st.role.name }}
+ {% if st.status == 'approved' %}
+ تایید شد
+ {% elif st.status == 'rejected' %}
+ رد شد
+ {% else %}
+ در انتظار
+ {% endif %}
+
+ {% if st.status == 'rejected' and st.reason %}
+ علت: {{ st.reason }}
+ {% endif %}
+
{% if previous_step %}
@@ -127,6 +185,9 @@
{% endif %}
{% else %}
+ {% if not request.user|is_installer %}
+ شما مجوز ثبت/ویرایش گزارش نصب را ندارید. اطلاعات به صورت فقط خواندنی نمایش داده می‌شود.
+ {% endif %}