mirror of
https://github.com/cisagov/manage.get.gov.git
synced 2025-05-17 18:09:25 +02:00
Merge branch 'za/2595-update-domain-request-view-only-pages' into za/2596-view-only-domain-request-page
This commit is contained in:
commit
2012ac0108
7 changed files with 248 additions and 42 deletions
|
@ -11,6 +11,7 @@ from registrar.models.federal_agency import FederalAgency
|
|||
from registrar.models.utility.generic_helper import CreateOrUpdateOrganizationTypeHelper
|
||||
from registrar.utility.errors import FSMDomainRequestError, FSMErrorCodes
|
||||
from registrar.utility.constants import BranchChoices
|
||||
from auditlog.models import LogEntry
|
||||
|
||||
from .utility.time_stamped_model import TimeStampedModel
|
||||
from ..utility.email import send_templated_email, EmailSendingError
|
||||
|
@ -576,11 +577,25 @@ class DomainRequest(TimeStampedModel):
|
|||
verbose_name="last updated on",
|
||||
help_text="Date of the last status update",
|
||||
)
|
||||
|
||||
notes = models.TextField(
|
||||
null=True,
|
||||
blank=True,
|
||||
)
|
||||
|
||||
def get_first_status_set_date(self, status):
|
||||
"""Returns the date when the domain request was first set to the given status."""
|
||||
log_entry = (
|
||||
LogEntry.objects.filter(content_type__model="domainrequest", object_pk=self.pk, changes__status__1=status)
|
||||
.order_by("-timestamp")
|
||||
.first()
|
||||
)
|
||||
return log_entry.timestamp.date() if log_entry else None
|
||||
|
||||
def get_first_status_started_date(self):
|
||||
"""Returns the date when the domain request was put into the status "started" for the first time"""
|
||||
return self.get_first_status_set_date(DomainRequest.DomainRequestStatus.STARTED)
|
||||
|
||||
@classmethod
|
||||
def get_statuses_that_send_emails(cls):
|
||||
"""Returns a list of statuses that send an email to the user"""
|
||||
|
@ -1138,6 +1153,11 @@ class DomainRequest(TimeStampedModel):
|
|||
data[field.name] = field.value_from_object(self)
|
||||
return data
|
||||
|
||||
def get_formatted_cisa_rep_name(self):
|
||||
"""Returns the cisa representatives name in Western order."""
|
||||
names = [n for n in [self.cisa_representative_first_name, self.cisa_representative_last_name] if n]
|
||||
return " ".join(names) if names else "Unknown"
|
||||
|
||||
def _is_federal_complete(self):
|
||||
# Federal -> "Federal government branch" page can't be empty + Federal Agency selection can't be None
|
||||
return not (self.federal_type is None or self.federal_agency is None)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue