From ef2c48cc1e401ee9f461b3d7e5e7174e1a5032d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20G=C3=BCnther?= Date: Fri, 22 Jan 2016 11:12:47 +0100 Subject: [PATCH 01/13] Adapt version to corresponding OpenProject core version. --- lib/reporting_engine/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/reporting_engine/version.rb b/lib/reporting_engine/version.rb index 6bb4fd16d9..153eb7f07d 100644 --- a/lib/reporting_engine/version.rb +++ b/lib/reporting_engine/version.rb @@ -18,5 +18,5 @@ #++ module ReportingEngine - VERSION = '1.2.0' + VERSION = '5.0.10' end From d0405e85069c6071aea913213a730ac0bcf2f2bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20G=C3=BCnther?= Date: Fri, 22 Jan 2016 16:55:42 +0100 Subject: [PATCH 02/13] Bump VERSION to 5.0.11 --- lib/reporting_engine/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/reporting_engine/version.rb b/lib/reporting_engine/version.rb index 153eb7f07d..02e3a3552e 100644 --- a/lib/reporting_engine/version.rb +++ b/lib/reporting_engine/version.rb @@ -18,5 +18,5 @@ #++ module ReportingEngine - VERSION = '5.0.10' + VERSION = "5.0.11" end From 4fc4142b3c4308c9f2c82b9f0af3c3b619ead373 Mon Sep 17 00:00:00 2001 From: Jens Ulferts Date: Tue, 26 Jan 2016 16:13:39 +0100 Subject: [PATCH 03/13] Bump VERSION to 5.0.12 --- lib/reporting_engine/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/reporting_engine/version.rb b/lib/reporting_engine/version.rb index 02e3a3552e..977579e87b 100644 --- a/lib/reporting_engine/version.rb +++ b/lib/reporting_engine/version.rb @@ -18,5 +18,5 @@ #++ module ReportingEngine - VERSION = "5.0.11" + VERSION = "5.0.12" end From 3fb70e02e640283c2db11644e3a20506d3722611 Mon Sep 17 00:00:00 2001 From: Cyril Rohr Date: Fri, 29 Jan 2016 14:36:37 +0000 Subject: [PATCH 04/13] Bump VERSION to 5.0.13 --- lib/reporting_engine/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/reporting_engine/version.rb b/lib/reporting_engine/version.rb index 977579e87b..bb311fed66 100644 --- a/lib/reporting_engine/version.rb +++ b/lib/reporting_engine/version.rb @@ -18,5 +18,5 @@ #++ module ReportingEngine - VERSION = "5.0.12" + VERSION = "5.0.13" end From fbca34103c6c2523f02b54924b868cfd0be8c89d Mon Sep 17 00:00:00 2001 From: Cyril Rohr Date: Fri, 29 Jan 2016 16:06:11 +0000 Subject: [PATCH 05/13] Bump VERSION to 5.0.14 --- lib/reporting_engine/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/reporting_engine/version.rb b/lib/reporting_engine/version.rb index bb311fed66..de8ae11244 100644 --- a/lib/reporting_engine/version.rb +++ b/lib/reporting_engine/version.rb @@ -18,5 +18,5 @@ #++ module ReportingEngine - VERSION = "5.0.13" + VERSION = "5.0.14" end From 2fa1fc8a19c4aa92f76458ba9b17bbf65b863dce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20G=C3=BCnther?= Date: Fri, 5 Feb 2016 13:29:14 +0100 Subject: [PATCH 06/13] Bump VERSION to 5.0.15 --- lib/reporting_engine/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/reporting_engine/version.rb b/lib/reporting_engine/version.rb index de8ae11244..dda693c69d 100644 --- a/lib/reporting_engine/version.rb +++ b/lib/reporting_engine/version.rb @@ -18,5 +18,5 @@ #++ module ReportingEngine - VERSION = "5.0.14" + VERSION = "5.0.15" end From ab7b3f14874c093846bef2d09e540d0e7911286c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20G=C3=BCnther?= Date: Mon, 15 Feb 2016 11:36:41 +0100 Subject: [PATCH 07/13] Bump VERSION to 5.0.16 --- lib/reporting_engine/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/reporting_engine/version.rb b/lib/reporting_engine/version.rb index dda693c69d..b82a4d1ae7 100644 --- a/lib/reporting_engine/version.rb +++ b/lib/reporting_engine/version.rb @@ -18,5 +18,5 @@ #++ module ReportingEngine - VERSION = "5.0.15" + VERSION = "5.0.16" end From 23cc564122a9a683f160db8ecc73e0bbcee911a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20G=C3=BCnther?= Date: Mon, 7 Mar 2016 13:39:13 +0100 Subject: [PATCH 08/13] Fix inverted row/column wrapping In production, wrapping rows first will lead to the outmost layer being a column, which will cause the table widget rendered to skip rendering content, why the f*ck ever that is. --- lib/report/controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/report/controller.rb b/lib/report/controller.rb index 934122f6da..c8c24b21ff 100644 --- a/lib/report/controller.rb +++ b/lib/report/controller.rb @@ -286,8 +286,8 @@ module Report::Controller end end end - groups[:rows].try(:reverse_each) { |r| query.row(r) } groups[:columns].try(:reverse_each) { |c| query.column(c) } + groups[:rows].try(:reverse_each) { |r| query.row(r) } query end From b6747c210a45e4abe8f5391cdeb5ced36928e548 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20G=C3=BCnther?= Date: Tue, 8 Mar 2016 07:54:15 +0100 Subject: [PATCH 09/13] Bump VERSION to 5.0.17 --- lib/reporting_engine/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/reporting_engine/version.rb b/lib/reporting_engine/version.rb index b82a4d1ae7..cee8fd44ae 100644 --- a/lib/reporting_engine/version.rb +++ b/lib/reporting_engine/version.rb @@ -18,5 +18,5 @@ #++ module ReportingEngine - VERSION = "5.0.16" + VERSION = "5.0.17" end From 2d3615de6f6b562fee43f1658fc85be50a5bdca2 Mon Sep 17 00:00:00 2001 From: Henriette Dinger Date: Tue, 29 Mar 2016 14:58:12 +0200 Subject: [PATCH 10/13] Change class to correctly align the fields --- lib/widget/filters/multi_values.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/widget/filters/multi_values.rb b/lib/widget/filters/multi_values.rb index 8636bb1362..0ee89950a3 100644 --- a/lib/widget/filters/multi_values.rb +++ b/lib/widget/filters/multi_values.rb @@ -28,7 +28,7 @@ class Widget::Filters::MultiValues < Widget::Filters::Base name: "values[#{filter_class.underscore_name}][]", :"data-loading" => @options[:lazy] ? 'ajax' : '', id: "#{filter_class.underscore_name}_arg_1_val", - class: 'advanced-filters--select filter-value', + class: 'form--select filter-value', :"data-filter-name" => filter_class.underscore_name, multiple: 'multiple' } # multiple will be disabled/enabled later by JavaScript anyhow. From 52b6a30678520956b0ea62bc6d5f8234691215ae Mon Sep 17 00:00:00 2001 From: Henriette Dinger Date: Tue, 5 Apr 2016 15:24:30 +0200 Subject: [PATCH 11/13] Add helping text and set focus --- lib/assets/javascripts/reporting_engine/reporting/filters.js | 4 ++++ lib/widget/filters.rb | 3 +++ lib/widget/filters/operators.rb | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/assets/javascripts/reporting_engine/reporting/filters.js b/lib/assets/javascripts/reporting_engine/reporting/filters.js index 75c6c4ab0d..ab156b6fb0 100644 --- a/lib/assets/javascripts/reporting_engine/reporting/filters.js +++ b/lib/assets/javascripts/reporting_engine/reporting/filters.js @@ -497,7 +497,11 @@ Reporting.onload(function () { $("add_filter_select").observe("change", function () { if (!(Reporting.Filters.exists(this.value))) { Reporting.Filters.add_filter(this.value); + var new_filter = this.value; this.selectedIndex = 0; + setTimeout(function () { + $(document).getElementById('operators['+ new_filter +']').focus(); + }, 300); }; }); } diff --git a/lib/widget/filters.rb b/lib/widget/filters.rb index 0b85984cab..65efc59b7c 100644 --- a/lib/widget/filters.rb +++ b/lib/widget/filters.rb @@ -24,6 +24,9 @@ class Widget::Filters < Widget::Base add_filter = content_tag :li, id: 'add_filter_block', class: 'advanced-filters--add-filter' do add_filter_label = label_tag 'add_filter_select', l(:label_filter_add), class: 'advanced-filters--add-filter-label' + add_filter_label += label_tag 'add_filter_select', I18n.t('js.filter.description.text_open_filter') + ' ' + + I18n.t('js.filter.description.text_close_filter'), + class: 'hidden-for-sighted' add_filter_value = content_tag :div, class: 'advanced-filters--add-filter-value' do value = select_tag 'add_filter_select', diff --git a/lib/widget/filters/operators.rb b/lib/widget/filters/operators.rb index b58841bb41..658a63c95a 100644 --- a/lib/widget/filters/operators.rb +++ b/lib/widget/filters/operators.rb @@ -39,7 +39,7 @@ class Widget::Filters::Operators < Widget::Filters::Base end.join.html_safe end label1 = content_tag :label, - h(filter_class.label) + ' ' + l(:label_operator), + h(filter_class.label) + ' ' + l(:label_operator) + ' ' + I18n.t('js.filter.description.text_open_filter'), for: "operators[#{filter_class.underscore_name}]", class: 'hidden-for-sighted' label = content_tag :label do From bcd211f3b6f250751a3dc0c50c3e5a5c21b1154c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20G=C3=BCnther?= Date: Mon, 11 Apr 2016 09:43:24 +0200 Subject: [PATCH 12/13] Bump VERSION to 5.0.18 --- lib/reporting_engine/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/reporting_engine/version.rb b/lib/reporting_engine/version.rb index cee8fd44ae..eb31fe1b8b 100644 --- a/lib/reporting_engine/version.rb +++ b/lib/reporting_engine/version.rb @@ -18,5 +18,5 @@ #++ module ReportingEngine - VERSION = "5.0.17" + VERSION = "5.0.18" end From 42aca74cdbd63aea7592ac163ed3f5e48e50514f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20G=C3=BCnther?= Date: Fri, 27 May 2016 12:36:14 +0200 Subject: [PATCH 13/13] Bump VERSION to 5.0.19 --- lib/reporting_engine/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/reporting_engine/version.rb b/lib/reporting_engine/version.rb index eb31fe1b8b..8853566723 100644 --- a/lib/reporting_engine/version.rb +++ b/lib/reporting_engine/version.rb @@ -18,5 +18,5 @@ #++ module ReportingEngine - VERSION = "5.0.18" + VERSION = "5.0.19" end