diff --git a/hypha/apply/funds/migrations/0097_alter_applicationsubmission_submit_time.py b/hypha/apply/funds/migrations/0097_alter_applicationsubmission_submit_time.py new file mode 100644 index 0000000000000000000000000000000000000000..458c13d7cd25a9f05a2d228f4fc107101266c279 --- /dev/null +++ b/hypha/apply/funds/migrations/0097_alter_applicationsubmission_submit_time.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.13 on 2022-05-24 13:20 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('funds', '0096_only_active_users'), + ] + + operations = [ + migrations.AlterField( + model_name='applicationsubmission', + name='submit_time', + field=models.DateTimeField(verbose_name='submit time'), + ), + ] diff --git a/hypha/apply/funds/models/submissions.py b/hypha/apply/funds/models/submissions.py index 596841360cb4144c427146b796fc3773ba17fe73..4a5165099ee624a056bb3e43c6cfebc61734959f 100644 --- a/hypha/apply/funds/models/submissions.py +++ b/hypha/apply/funds/models/submissions.py @@ -27,7 +27,9 @@ from django.db.models.fields.json import KeyTextTransform from django.db.models.functions import Cast, Coalesce from django.dispatch import receiver from django.urls import reverse +from django.utils import timezone from django.utils.text import slugify +from django.utils.translation import gettext_lazy as _ from django_fsm import RETURN_VALUE, FSMField, can_proceed, transition from django_fsm.signals import post_transition from wagtail.contrib.forms.models import AbstractFormSubmission @@ -480,6 +482,8 @@ class ApplicationSubmission( blank=True ) + submit_time = models.DateTimeField(verbose_name=_('submit time'), auto_now_add=False) + is_draft = False live_revision = models.OneToOneField( @@ -667,6 +671,7 @@ class ApplicationSubmission( creating = not self.id if creating: + self.submit_time = timezone.now() # We are creating the object default to first stage self.workflow_name = self.get_from_parent('workflow_name') # Copy extra relevant information to the child diff --git a/hypha/apply/funds/views.py b/hypha/apply/funds/views.py index 3f6b24696804ebb17d5b28235f1e31f9ec66f97d..f0a229af50da8162d7bc7445bab1b9d3b3ce0486 100644 --- a/hypha/apply/funds/views.py +++ b/hypha/apply/funds/views.py @@ -1067,6 +1067,9 @@ class ApplicantSubmissionEditView(BaseSubmissionEditView): notify=not (revision or submitting_proposal) or self.object.status == DRAFT_STATE, # Use the other notification ) + self.object.submit_time = timezone.now() + self.object.save() + # Required for django-file-form: delete temporary files for the new files # uploaded while edit. form.delete_temporary_files()