artin/API-Manager
1
0
Fork 0
mirror of https://github.com/OpenBankProject/API-Manager.git synced 2026-02-06 17:26:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

bugfix/fixed metrics endpoints wrong parameters

Browse Source 
start_date--> from_date and end_date --> to_date
This commit is contained in:
Hongwei 2020-11-25 15:12:24 +01:00
parent 7917b45869
commit fbd241252c
3 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
apimanager/metrics/forms.py
View File

@ -13,8 +13,8 @@ from bootstrap_datepicker_plus import DatePickerInput, DateTimePickerInput
class MetricsForm(forms.Form):
start_date = forms.DateTimeField(
label='Start Date',
from_date = forms.DateTimeField(
label='From Date',
input_formats=[settings.API_DATEFORMAT],
widget=forms.DateTimeInput(
attrs={
@ -22,11 +22,11 @@ class MetricsForm(forms.Form):
'class': 'form-control',
}
),
initial='1900-01-01T00:00:00.000Z',
initial='2020-01-01T00:00:00.000Z',
required=False,
)
end_date = forms.DateTimeField(
label='End Date',
to_date = forms.DateTimeField(
label='To Date',
input_formats=[settings.API_DATEFORMAT],
widget=forms.DateTimeInput(
attrs={
@ -168,9 +168,9 @@ class APIMetricsForm(MetricsForm):
class ConnectorMetricsForm(MetricsForm):
# override start_date until API returns values without given date
start_date = forms.DateTimeField(
label='Start Date',
# override from_date until API returns values without given date
from_date = forms.DateTimeField(
label='From Date',
input_formats=[settings.API_DATEFORMAT],
widget=forms.DateTimeInput(
attrs={
@ -178,7 +178,7 @@ class ConnectorMetricsForm(MetricsForm):
'class': 'form-control',
}
),
initial='1900-01-01T00:00:00.000Z',
initial='2020-01-01T00:00:00.000Z',
required=True,
)
connector_name = forms.CharField(

12
apimanager/metrics/templates/metrics/api.html
View File

@ -18,17 +18,17 @@
<div class="row">
<div class="col-xs-6 col-sm-3">
{% if form.start_date.errors %}<div class="alert alert-danger">{{ form.start_date.errors }}</div>{% endif %}
{% if form.from_date.errors %}<div class="alert alert-danger">{{ form.from_date.errors }}</div>{% endif %}
<div class="form-group">
{{ form.start_date.label_tag }}
{{ form.start_date }}
{{ form.from_date.label_tag }}
{{ form.from_date }}
</div>
</div>
<div class="col-xs-6 col-sm-3">
{% if form.end_date.errors %}<div class="alert alert-danger">{{ form.end_date.errors }}</div>{% endif %}
{% if form.to_date.errors %}<div class="alert alert-danger">{{ form.to_date.errors }}</div>{% endif %}
<div class="form-group">
{{ form.end_date.label_tag }}
{{ form.end_date }}
{{ form.to_date.label_tag }}
{{ form.to_date }}
</div>
</div>
<div class="col-xs-6 col-sm-3">

12
apimanager/metrics/templates/metrics/connector.html
View File

@ -18,17 +18,17 @@
<div class="row">
<div class="col-xs-6 col-sm-3">
{% if form.start_date.errors %}<div class="alert alert-danger">{{ form.start_date.errors }}</div>{% endif %}
{% if form.from_date.errors %}<div class="alert alert-danger">{{ form.from_date.errors }}</div>{% endif %}
<div class="form-group">
{{ form.start_date.label_tag }}
{{ form.start_date }}
{{ form.from_date.label_tag }}
{{ form.from_date }}
</div>
</div>
<div class="col-xs-6 col-sm-3">
{% if form.end_date.errors %}<div class="alert alert-danger">{{ form.end_date.errors }}</div>{% endif %}
{% if form.to_date.errors %}<div class="alert alert-danger">{{ form.to_date.errors }}</div>{% endif %}
<div class="form-group">
{{ form.end_date.label_tag }}
{{ form.end_date }}
{{ form.to_date.label_tag }}
{{ form.to_date }}
</div>
</div>
<div class="col-xs-6 col-sm-3">