Skip to content

Commit

Permalink
Bugfix stats bundle (#52)
Browse files Browse the repository at this point in the history 
* TTK-26552: Correct operation of cleaning filters and restarting the pager

* TTK-26552: Reload to base url
  • Loading branch information
@albacodina
albacodina authored Aug 21, 2024
1 parent 4339ff9 commit 0b1b08c
Showing 1 changed file with 21 additions and 24 deletions.
45 changes: 21 additions & 24 deletions Resources/views/Stats/js.html.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,22 +54,17 @@
$('.btn-stats-calendar-remove').on('click', function(event){
event.preventDefault();
$('#form_daterangepicker').val(moment().startOf('year').format('YYYY-MM-DD') + ' - ' + moment().format('YYYY-MM-DD'));
window.initializeAjaxRequest();
window.location = window.location.href.split("?")[0];
});
$('.btn-stats-search-remove').on('click', function(event){
event.preventDefault();
$('#title').val('');
var data = window.prepareSearch();
window.getAjaxRequest(data);
window.location = window.location.href.split("?")[0];
});
$('.btn-reset-filter').on('click',function(event) {
event.preventDefault();
$('#title').val('');
$('#form_daterangepicker').val(moment().startOf('year').format('YYYY-MM-DD') + ' - ' + moment().format('YYYY-MM-DD'));
window.initializeAjaxRequest();
window.location = window.location.href.split("?")[0];
});
$('.ripple-wrapper').on('click', function(event) {
Expand Down Expand Up @@ -172,25 +167,25 @@
window.initializeAjaxRequest = function() {
{% if app.request.get('_route') == 'pumukit_stats_series_index' %}
window.most_viewed_series(null,null,page);
window.views(null, null,null,page, 'month');
window.most_viewed_series(null,null,null,0);
window.views(null, null,null,0, 'month');
{% endif %}
{% if app.request.get('_route') == 'pumukit_stats_mmobj_index' %}
window.most_viewed_mmobj(null,null,page);
window.views(null,null,null,page, 'month');
window.most_viewed_mmobj(null,null,null, 0);
window.views(null,null,null,0,'month');
{% endif %}
{% if app.request.get('_route') == 'pumukit_stats_series_index_id' %}
var series = "{{ app.request.attributes.get('_route_params')['id'] }}";
window.most_viewed_series_by_id(series,null, null, null, page);
window.views_series(series,null, null,null, page, 'month');
window.most_viewed_series_by_id(series,null, null, null, 0);
window.views_series(series,null, null,null, 0, 'month');
{% endif %}
{% if app.request.get('_route') == 'pumukit_stats_mmobj_index_id' %}
var mmobj = "{{ app.request.attributes.get('_route_params')['id'] }}";
window.most_viewed_mmobj_by_id(mmobj, null, null, null, page);
window.views_mmobj(mmobj,null, null, null, page, 'month');
window.most_viewed_mmobj_by_id(mmobj, null, null, null, 0);
window.views_mmobj(mmobj,null, null, null, 0, 'month');
{% endif %}
};
Expand Down Expand Up @@ -333,7 +328,7 @@
var data = window.defaultAjaxValues();
from_date = data['from_date'];
to_date = data['to_date'];
page = data['page'];
page = (page == 0) ? page : data['page'];
}
var url = "{{ path('pumukit_stats_api_mmobjmostviewed') }}";
Expand Down Expand Up @@ -404,7 +399,7 @@
var data = window.defaultAjaxValues();
from_date = data['from_date'];
to_date = data['to_date'];
page = data['page'];
page = (page == 0) ? page : data['page'];
}
var url = "{{ path('pumukit_schema_api_multimediaobjects') }}";
Expand Down Expand Up @@ -457,7 +452,7 @@
var data = window.defaultAjaxValues();
from_date = data['from_date'];
to_date = data['to_date'];
page = data['page'];
page = (page == 0) ? page : data['page'];
group_by = data['group_by'];
}
Expand All @@ -479,7 +474,7 @@
},
success: function(response) {
var objects = response.views;
var total = 1;
var total = 0;
$('.views-table-body').html('');
objects.forEach(function(data) {
total = total + data.numView;
Expand Down Expand Up @@ -527,7 +522,7 @@
},
success: function(response) {
var objects = response.views;
var total = 1;
var total = 0;
$('.views-table-body').html('');
objects.forEach(function(data) {
total = total + data.numView;
Expand All @@ -539,6 +534,7 @@
"</tr>"
);
});
$('.total-views-objects').html(total);
$('#foot-views').html(total);
Expand All @@ -553,13 +549,14 @@
var data = window.defaultAjaxValues();
from_date = data['from_date'];
to_date = data['to_date'];
page = data['page'];
page = (page == 0) ? page : data['page'];
}
var url = "{{ path('pumukit_stats_api_mmobjmostviewed') }}";
if(criteria != null && criteria !== '') {
url = url + "?criteria[$text][$search]=" + criteria;
}
$.ajax({
url: url,
type: 'GET',
Expand Down Expand Up @@ -623,7 +620,7 @@
var data = window.defaultAjaxValues();
from_date = data['from_date'];
to_date = data['to_date'];
page = data['page'];
page = (page == 0) ? page : data['page'];
group_by = data['group_by'];
}
Expand Down Expand Up @@ -749,7 +746,7 @@
window.createPager = function(data) {
var pages = Math.ceil(data.total / 10);
var active_page = parseInt("{{ app.request.get('page')|default(0) }}");
var active_page = data.page == 0 ? data.page : parseInt("{{ app.request.get('page')|default(0) }}");
var aPages = range(pages,active_page);
var disabled_previous = '';
var disabled_next = '';
Expand Down

0 comments on commit 0b1b08c

Please sign in to comment.