Merge pull request #294 from Reena-cell/develop

improve from/to date filed in API Metric
This commit is contained in:
Simon Redfern 2023-03-03 18:14:09 +01:00 committed by GitHub
commit 0586fed045
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -11,7 +11,7 @@ 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'
@ -21,15 +21,27 @@ TO_DATE = 'To Date'
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(settings.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(settings.API_DATE_FORMAT)),
required=False,
initial=str(datetime.now().strftime(API_MANAGER_DATE_FORMAT)),
)
limit = forms.IntegerField(
label=_('Limit'),