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

Merge pull request #118 from hongwei1/master

Browse Source 
bugfix/fixed metrics endpoints wrong parameters
This commit is contained in:
Simon Redfern 2021-01-07 13:18:23 +01:00 committed by GitHub
commit 5a045f8106
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apimanager/methodrouting/views.py
View File

@ -43,7 +43,7 @@ class IndexView(LoginRequiredMixin, FormView):
error_once_only(self.request, (Exception("Unknown Error. Details:" + str(err))))
else:
for i in range(len(method_routings)):
method_routings[i]['parameters'] = json.dumps(method_routings[i]['parameters'])
method_routings[i]['parameters'] = json.dumps(method_routings[i]['parameters'], sort_keys=False)
context.update({
'method_routings': method_routings,

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">

1
apimanager/metrics/views.py
View File

@ -5,6 +5,7 @@ Views of metrics app
import json
import hashlib
import operator
from datetime import datetime, timedelta
from enum import Enum