mirror of
https://github.com/cisagov/manage.get.gov.git
synced 2025-08-05 09:21:54 +02:00
Merge pull request #2618 from cisagov/ms/2451-additional-domain-request-dates
Issue #2541 additional domain request dates [getgov-litterbox]
This commit is contained in:
commit
ec56f176de
24 changed files with 219 additions and 69 deletions
|
@ -46,7 +46,7 @@ def get_domain_requests_json(request):
|
|||
domain_requests_data = [
|
||||
{
|
||||
"requested_domain": domain_request.requested_domain.name if domain_request.requested_domain else None,
|
||||
"submission_date": domain_request.submission_date,
|
||||
"last_submitted_date": domain_request.last_submitted_date,
|
||||
"status": domain_request.get_status_display(),
|
||||
"created_at": format(domain_request.created_at, "c"), # Serialize to ISO 8601
|
||||
"id": domain_request.id,
|
||||
|
|
|
@ -26,7 +26,7 @@ class AnalyticsView(View):
|
|||
created_at__gt=thirty_days_ago, status=models.DomainRequest.DomainRequestStatus.APPROVED
|
||||
)
|
||||
avg_approval_time = last_30_days_approved_applications.annotate(
|
||||
approval_time=F("approved_domain__created_at") - F("submission_date")
|
||||
approval_time=F("approved_domain__created_at") - F("last_submitted_date")
|
||||
).aggregate(Avg("approval_time"))["approval_time__avg"]
|
||||
# Format the timedelta to display only days
|
||||
if avg_approval_time is not None:
|
||||
|
@ -104,11 +104,11 @@ class AnalyticsView(View):
|
|||
|
||||
filter_submitted_requests_start_date = {
|
||||
"status": models.DomainRequest.DomainRequestStatus.SUBMITTED,
|
||||
"submission_date__lte": start_date_formatted,
|
||||
"last_submitted_date__lte": start_date_formatted,
|
||||
}
|
||||
filter_submitted_requests_end_date = {
|
||||
"status": models.DomainRequest.DomainRequestStatus.SUBMITTED,
|
||||
"submission_date__lte": end_date_formatted,
|
||||
"last_submitted_date__lte": end_date_formatted,
|
||||
}
|
||||
submitted_requests_sliced_at_start_date = csv_export.DomainRequestExport.get_sliced_requests(
|
||||
filter_submitted_requests_start_date
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue