aminhashemi92/shafafiyat
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix until contracts step

Browse source
This commit is contained in:
aminhashemi92 2025-09-08 13:24:05 +03:30
parent 246a2c0759
commit af40e169ae
9 changed files with 180 additions and 128 deletions
Download patch file Download diff file Expand all files Collapse all files

3
processes/admin.py
View file

@ -50,6 +50,7 @@ class ProcessInstanceAdmin(SimpleHistoryAdmin):
verbose_name_plural = "درخواست‌ها"
list_display = [
'code',
'current_step',
'slug',
'well_display',
'representative',
@ -142,7 +143,7 @@ class ProcessInstanceAdmin(SimpleHistoryAdmin):
@admin.register(StepInstance)
class StepInstanceAdmin(SimpleHistoryAdmin):
list_display = ['process_instance', 'step', 'assigned_to', 'status_display', 'rejection_count', 'started_at', 'completed_at']
list_display = ['process_instance', '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']
readonly_fields = ['started_at', 'completed_at']

56
processes/migrations/0003_historicalstepinstance_edit_count_and_more.py Normal file
View file

@ -0,0 +1,56 @@
# Generated by Django 5.2.4 on 2025-09-08 08:18
import django.db.models.deletion
from django.conf import settings
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('processes', '0002_processinstance_broker'),
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
]
operations = [
migrations.AddField(
model_name='historicalstepinstance',
name='edit_count',
field=models.PositiveIntegerField(default=0, verbose_name='تعداد ویرایش پس از تکمیل'),
),
migrations.AddField(
model_name='historicalstepinstance',
name='edited_after_completion',
field=models.BooleanField(default=False, verbose_name='ویرایش پس از تکمیل'),
),
migrations.AddField(
model_name='historicalstepinstance',
name='last_edited_at',
field=models.DateTimeField(blank=True, null=True, verbose_name='آخرین زمان ویرایش پس از تکمیل'),
),
migrations.AddField(
model_name='historicalstepinstance',
name='last_edited_by',
field=models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to=settings.AUTH_USER_MODEL, verbose_name='ویرایش توسط'),
),
migrations.AddField(
model_name='stepinstance',
name='edit_count',
field=models.PositiveIntegerField(default=0, verbose_name='تعداد ویرایش پس از تکمیل'),
),
migrations.AddField(
model_name='stepinstance',
name='edited_after_completion',
field=models.BooleanField(default=False, verbose_name='ویرایش پس از تکمیل'),
),
migrations.AddField(
model_name='stepinstance',
name='last_edited_at',
field=models.DateTimeField(blank=True, null=True, verbose_name='آخرین زمان ویرایش پس از تکمیل'),
),
migrations.AddField(
model_name='stepinstance',
name='last_edited_by',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='step_instances_edited', to=settings.AUTH_USER_MODEL, verbose_name='ویرایش توسط'),
),
]

6
processes/models.py
View file

@ -327,6 +327,12 @@ class StepInstance(models.Model):
notes = models.TextField(verbose_name="یادداشت‌ها", blank=True)
started_at = models.DateTimeField(auto_now_add=True, verbose_name="تاریخ شروع")
completed_at = models.DateTimeField(null=True, blank=True, verbose_name="تاریخ تکمیل")
# Generic edit-tracking for post-completion modifications
edited_after_completion = models.BooleanField(default=False, verbose_name="ویرایش پس از تکمیل")
last_edited_at = models.DateTimeField(null=True, blank=True, verbose_name="آخرین زمان ویرایش پس از تکمیل")
last_edited_by = models.ForeignKey(User, on_delete=models.SET_NULL, null=True, blank=True, related_name='step_instances_edited', verbose_name="ویرایش توسط")
edit_count = models.PositiveIntegerField(default=0, verbose_name="تعداد ویرایش پس از تکمیل")
history = HistoricalRecords()
class Meta: