diff --git a/src/registrar/migrations/0056_domainapplication_submission_date.py b/src/registrar/migrations/0056_domainapplication_submission_date.py new file mode 100644 index 000000000..6cfdfbd4a --- /dev/null +++ b/src/registrar/migrations/0056_domainapplication_submission_date.py @@ -0,0 +1,17 @@ +# Generated by Django 4.2.7 on 2023-12-13 15:04 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + dependencies = [ + ("registrar", "0055_alter_domain_state_alter_domainapplication_status_and_more"), + ] + + operations = [ + migrations.AddField( + model_name="domainapplication", + name="submission_date", + field=models.DateField(blank=True, default=None, help_text="Date submitted", null=True), + ), + ] diff --git a/src/registrar/models/domain_application.py b/src/registrar/models/domain_application.py index 12eda4caf..25d6dfe9e 100644 --- a/src/registrar/models/domain_application.py +++ b/src/registrar/models/domain_application.py @@ -547,6 +547,14 @@ class DomainApplication(TimeStampedModel): help_text="Acknowledged .gov acceptable use policy", ) + # submission date records when application is submitted + submission_date = models.DateField( + null=True, + blank=True, + default=None, + help_text="Date submitted", + ) + def __str__(self): try: if self.requested_domain and self.requested_domain.name: diff --git a/src/registrar/templates/home.html b/src/registrar/templates/home.html index 756ed4378..1c31acf47 100644 --- a/src/registrar/templates/home.html +++ b/src/registrar/templates/home.html @@ -39,7 +39,7 @@ Domain name - Date created + Expires Status Action @@ -50,7 +50,7 @@ {{ domain.name }} - {{ domain.created_time|date }} + {{ domain.expiration_date|date }} {% if domain.state == "unknown" or domain.state == "dns needed"%} DNS needed @@ -99,7 +99,7 @@ Domain name - Date created + Date submitted Status Action @@ -110,7 +110,13 @@ {{ application.requested_domain.name|default:"New domain request" }} - {{ application.created_at|date }} + + {% if application.submission_date %} + {{ application.submission_date|date }} + {% else %} + Not submitted + {% endif %} + {{ application.get_status_display }} {% if application.status == "started" or application.status == "action needed" or application.status == "withdrawn" %}