From cb70c42e0b80887ed6ad094348fc979b581674e3 Mon Sep 17 00:00:00 2001 From: Reena Aheer Date: Thu, 2 Mar 2023 15:04:57 +0100 Subject: [PATCH 1/3] improve date/time fields in API Metric --- apimanager/metrics/forms.py | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/apimanager/metrics/forms.py b/apimanager/metrics/forms.py index 0a428c6..656ef12 100644 --- a/apimanager/metrics/forms.py +++ b/apimanager/metrics/forms.py @@ -17,20 +17,34 @@ API_DATE_FORMAT_PLACEHOLDER = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'" FORM_CONTROL = 'form-control' FROM_DATE = 'From Date' TO_DATE = 'To Date' +API_DATE_FORMAT = '%Y-%m-%dT%H:%M:%S.%fZ' class MetricsForm(forms.Form): from_date = forms.DateTimeField( label=_(FROM_DATE), - widget=DatePickerInput(format=API_MANAGER_DATE_FORMAT), + input_formats=[settings.API_DATE_FORMAT], + widget=forms.DateTimeInput( + attrs={ + 'placeholder': API_DATE_FORMAT, + 'class': FORM_CONTROL, + } + ), + initial=(datetime.now() - timedelta(30)).strftime(API_DATE_FORMAT), required=False, - initial=(datetime.now() - timedelta(30)).strftime(API_MANAGER_DATE_FORMAT), ) to_date = forms.DateTimeField( label=_(TO_DATE), - widget=DatePickerInput(format=API_MANAGER_DATE_FORMAT), + input_formats=[settings.API_DATE_FORMAT], + widget=forms.DateTimeInput( + attrs={ + 'placeholder': API_DATE_FORMAT, + 'class': FORM_CONTROL, + } + ), + initial=str(datetime.now().strftime(API_DATE_FORMAT)), required=False, - initial=str(datetime.now().strftime(API_MANAGER_DATE_FORMAT)), ) + limit = forms.IntegerField( label=_('Limit'), widget=forms.NumberInput( From c60bdb3b86b2f1a28a76f2580b9cb6df45ce79f1 Mon Sep 17 00:00:00 2001 From: Reena Aheer Date: Fri, 3 Mar 2023 13:25:25 +0100 Subject: [PATCH 2/3] improve date/time fields in API Metric --- apimanager/metrics/forms.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/apimanager/metrics/forms.py b/apimanager/metrics/forms.py index 656ef12..8dac12c 100644 --- a/apimanager/metrics/forms.py +++ b/apimanager/metrics/forms.py @@ -11,13 +11,12 @@ from datetime import datetime, timedelta from django.utils.translation import ugettext_lazy as _ from bootstrap_datepicker_plus import DatePickerInput, DateTimePickerInput -from apimanager.settings import API_MANAGER_DATE_FORMAT +from apimanager.settings import API_MANAGER_DATE_FORMAT, API_DATE_FORMAT API_DATE_FORMAT_PLACEHOLDER = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'" FORM_CONTROL = 'form-control' FROM_DATE = 'From Date' TO_DATE = 'To Date' -API_DATE_FORMAT = '%Y-%m-%dT%H:%M:%S.%fZ' class MetricsForm(forms.Form): from_date = forms.DateTimeField( @@ -29,7 +28,7 @@ class MetricsForm(forms.Form): 'class': FORM_CONTROL, } ), - initial=(datetime.now() - timedelta(30)).strftime(API_DATE_FORMAT), + initial=(datetime.now() - timedelta(30)).strftime(settings.API_DATE_FORMAT), required=False, ) to_date = forms.DateTimeField( @@ -41,7 +40,7 @@ class MetricsForm(forms.Form): 'class': FORM_CONTROL, } ), - initial=str(datetime.now().strftime(API_DATE_FORMAT)), + initial=str(datetime.now().strftime(settings.API_DATE_FORMAT)), required=False, ) From b2610abf44a6953806600393a470f118546be1d8 Mon Sep 17 00:00:00 2001 From: Reena Aheer Date: Fri, 3 Mar 2023 13:27:21 +0100 Subject: [PATCH 3/3] improve date/time fields in API Metric --- apimanager/metrics/forms.py | 1 - 1 file changed, 1 deletion(-) diff --git a/apimanager/metrics/forms.py b/apimanager/metrics/forms.py index 8dac12c..e2ad226 100644 --- a/apimanager/metrics/forms.py +++ b/apimanager/metrics/forms.py @@ -43,7 +43,6 @@ class MetricsForm(forms.Form): initial=str(datetime.now().strftime(settings.API_DATE_FORMAT)), required=False, ) - limit = forms.IntegerField( label=_('Limit'), widget=forms.NumberInput(