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

Some improvements in metric

Browse Source
This commit is contained in:
Reena-cell 2023-02-01 11:57:13 +01:00
parent 983d2e9248
commit 1ef3fdbb0d
13 changed files with 28 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apimanager/base/templates/base.html
View File

@ -68,7 +68,7 @@
<li {% if accounts_list_url in request.path %} class="active" {% endif %}><a href="{{ accounts_list_url }}">{% trans "Account List" %}</a></li>
<li {% if customers_create_url in request.path %} class="active" {% endif %}><a href="{{ customers_create_url }}">{% trans "Customer Create" %}</a></li>
<li {% if customer_list_url in request.path %} class="active" {% endif %}><a href="{{ customer_list_url }}">{% trans "Customer List" %}</a></li>
<li {% if branches_list_url in request.path %} class="active" {% endif %}><a href="{{ branches_list_url }}">{% trans "Branches" %}</a></li>
<li {% if branches_list_url in request.path %} class="active" {% endif %}><a href="{{ branches_list_url }}">{% trans "Branche Create" %}</a></li>
<li {% if atms_create_url in request.path %} class="active" {% endif %}><a href="{{ atms_create_url }}">{% trans "ATM Create" %}</a></li>
<li {% if atm_list_url in request.path %} class="active" {% endif %}><a href="{{ atm_list_url }}">{% trans "ATM List" %}</a></li>
<li {% if product_create_url in request.path %} class="active" {% endif %}><a href="{{ product_create_url }}">{% trans "Product Create" %}</a></li>

29
apimanager/metrics/forms.py
View File

@ -21,26 +21,15 @@ TO_DATE = 'To Date'
class MetricsForm(forms.Form):
from_date = forms.DateTimeField(
label=_(FROM_DATE),
input_formats=[settings.API_DATE_FORMAT],
widget=forms.DateTimeInput(
attrs={
'placeholder': API_DATE_FORMAT_PLACEHOLDER,
'class': FORM_CONTROL,
}
),
initial='2020-01-01T00:00:00.000Z',
widget=DatePickerInput(format=API_MANAGER_DATE_FORMAT),
required=False,
initial=(datetime.now() - timedelta(6)).strftime(API_MANAGER_DATE_FORMAT),
)
to_date = forms.DateTimeField(
label=_(TO_DATE),
input_formats=[settings.API_DATE_FORMAT],
widget=forms.DateTimeInput(
attrs={
'placeholder': API_DATE_FORMAT_PLACEHOLDER,
'class': FORM_CONTROL,
}
),
widget=DatePickerInput(format=API_MANAGER_DATE_FORMAT),
required=False,
initial=str(datetime.now().strftime(API_MANAGER_DATE_FORMAT)),
)
limit = forms.IntegerField(
label=_('Limit'),
@ -176,15 +165,9 @@ class ConnectorMetricsForm(MetricsForm):
# override from_date until API returns values without given date
from_date = forms.DateTimeField(
label=_(FROM_DATE),
input_formats=[settings.API_DATE_FORMAT],
widget=forms.DateTimeInput(
attrs={
'placeholder': API_DATE_FORMAT_PLACEHOLDER,
'class': FORM_CONTROL,
}
),
initial='2020-01-01T00:00:00.000Z',
widget=DatePickerInput(format=API_MANAGER_DATE_FORMAT),
required=True,
initial=(datetime.now() - timedelta(6)).strftime(API_MANAGER_DATE_FORMAT),
)
connector_name = forms.CharField(
label=_('Connector Name'),

2
apimanager/metrics/static/metrics/js/metrics.js
View File

@ -1,5 +1,5 @@
$(document).ready(function($) {
let barChart = Chart($("#barchart"), {
let barChart = new Chart($("#barchart"), {
type: 'horizontalBar',
data: {
labels: BarchartData['labels'],

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

@ -85,10 +85,10 @@
<div class="row">
<div class="col-xs-2">
{% if form.verb_selection.errors %}<div class="alert alert-danger">{{ form.verb_selection.errors }}</div>{% endif %}
{% if form.verb.errors %}<div class="alert alert-danger">{{ form.verb.errors }}</div>{% endif %}
<div class="form-group">
{{ form.verb_selection.label_tag }}
{{ form.verb_selection }}
{{ form.verb.label_tag }}
{{ form.verb }}
</div>
</div>

2
apimanager/metrics/templates/metrics/api_summary_partial_function.html
View File

@ -4,7 +4,7 @@
{% block nav_tabs %}
<a href="{% url 'api-metrics' %}?{{ request.GET.urlencode }}">{% trans "List" %}</a>
<a href="{% url 'api-metrics-summary-partial-function' %}?{{ request.GET.urlencode }}" class="active">{% trans "Summary by Partial Function" %}</a>
<li><ul class="active"></ul></li><a href="{% url 'api-metrics-summary-partial-function' %}?{{ request.GET.urlencode }}" class="active">{% trans "Summary by Partial Function" %}</a></ul></li>
{% endblock nav_tabs %}
{% block tab_content %}

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

@ -21,28 +21,28 @@
<div class="col-xs-6 col-sm-3">
{% if form.from_date.errors %}<div class="alert alert-danger">{{ form.from_date.errors }}</div>{% endif %}
<div class="form-group">
<strong>{% trans "from_date" %} </strong>
<strong>{% trans "From Date" %} </strong>
{{ form.from_date }}
</div>
</div>
<div class="col-xs-6 col-sm-3">
{% if form.to_date.errors %}<div class="alert alert-danger">{{ form.to_date.errors }}</div>{% endif %}
<div class="form-group">
<strong>{% trans "to_date" %} </strong>
<strong>{% trans "To Date" %} </strong>
{{ form.to_date }}
</div>
</div>
<div class="col-xs-6 col-sm-3">
{% if form.limit.errors %}<div class="alert alert-danger">{{ form.limit.errors }}</div>{% endif %}
<div class="form-group">
<strong>{% trans "limit" %} </strong>
<strong>{% trans "Limit" %} </strong>
{{ form.limit }}
</div>
</div>
<div class="col-xs-6 col-sm-3">
{% if form.offset.errors %}<div class="alert alert-danger">{{ form.offset.errors }}</div>{% endif %}
<div class="form-group">
<strong>{% trans "offset" %} </strong>
<strong>{% trans "Offset" %} </strong>
{{ form.offset }}
</div>
</div>
@ -52,27 +52,27 @@
<div class="col-xs-12 col-sm-4">
{% if form.connector_name.errors %}<div class="alert alert-danger">{{ form.connector_name.errors }}</div>{% endif %}
<div class="form-group">
<strong>{% trans "connector_name" %} </strong>
<strong>{% trans "Connector Name" %} </strong>
{{ form.connector_name }}
</div>
</div>
<div class="col-xs-12 col-sm-4">
{% if form.function_name.errors %}<div class="alert alert-danger">{{ form.function_name.errors }}</div>{% endif %}
<div class="form-group">
<strong>{% trans "function_name" %} </strong>
<strong>{% trans "Function Name" %} </strong>
{{ form.function_name }}
</div>
</div>
<div class="col-xs-12 col-sm-4">
{% if form.correlation_id.errors %}<div class="alert alert-danger">{{ form.correlation_id.errors }}</div>{% endif %}
<div class="form-group">
<strong>{% trans "correlation_id" %} </strong>
<strong>{% trans "Correlation Id" %} </strong>
{{ form.correlation_id }}
</div>
</div>
</div>
<button type="submit" class="btn btn-primary">{% trans "Update filter" %}</button>
<button type="submit" class="btn btn-primary">{% trans "Update Filter" %}</button>
</form>
</div>

2
apimanager/metrics/templates/metrics/custom_summary.html
View File

@ -63,7 +63,7 @@
</div>
</div>
</div>
<button type="submit" class="btn btn-primary">{% trans "Update filter" %}</button>
<button type="submit" class="btn btn-primary">{% trans "Update Filter" %}</button>
</form>
</div>
<div class="tab-content">

2
apimanager/metrics/templates/metrics/daily_summary.html
View File

@ -63,7 +63,7 @@
</div>
</div>
</div>
<button type="submit" class="btn btn-primary">{% trans "Update filter" %}</button>
<button type="submit" class="btn btn-primary">{% trans "Update Filter" %}</button>
</form>
</div>

2
apimanager/metrics/templates/metrics/hourly_summary.html
View File

@ -62,7 +62,7 @@
</div>
</div>
</div>
<button type="submit" class="btn btn-primary">{% trans "Update filter" %}</button>
<button type="submit" class="btn btn-primary">{% trans "Update Filter" %}</button>
</form>
</div>

2
apimanager/metrics/templates/metrics/monthly_summary.html
View File

@ -58,7 +58,7 @@
</div>
</div>
</div>
<button type="submit" class="btn btn-primary">{% trans "Update filter" %}</button>
<button type="submit" class="btn btn-primary">{% trans "Update Filter" %}</button>
</form>
</div>

2
apimanager/metrics/templates/metrics/quarterly_summary.html
View File

@ -62,7 +62,7 @@
</div>
</div>
</div>
<button type="submit" class="btn btn-primary">{% trans "Update filter" %}</button>
<button type="submit" class="btn btn-primary">{% trans "Update Filter" %}</button>
</form>
</div>

2
apimanager/metrics/templates/metrics/weekly_summary.html
View File

@ -64,7 +64,7 @@
</div>
</div>
</div>
<button type="submit" class="btn btn-primary">{% trans "Update filter" %}</button>
<button type="submit" class="btn btn-primary">{% trans "Update Filter" %}</button>
</form>
</div>
<div class="tab-content">

4
apimanager/metrics/templates/metrics/yearly_summary.html
View File

@ -64,7 +64,7 @@
</div>
</div>
</div>
<button type="submit" class="btn btn-primary" onclick="systemCalls()">{% trans "Update filter" %}</button>
<button type="submit" class="btn btn-primary" onclick="systemCalls()">{% trans "Update Filter" %}</button>
</form>
</div>
<div class="tab-content">
@ -112,7 +112,7 @@
<td>{{ number_of_apps_with_unique_app_name }}</td>
</tr>
<tr>
<td>{% trans "Apps with distinct developer email addresses:</td>
<td>{% trans "Apps with distinct developer email addresses:" %}</td>
<td>{{ number_of_apps_with_unique_developer_email }}</td>
</tr>