From fc7eda166f33d2d176d7f8ad64565df5ce41862c Mon Sep 17 00:00:00 2001 From: Marius BALTEANU Date: Sun, 9 Dec 2018 19:02:20 +0000 Subject: [PATCH 5/6] Option to switch between table list and board list --- app/controllers/projects_controller.rb | 11 +++- app/helpers/projects_helper.rb | 9 +++ app/helpers/projects_queries_helper.rb | 61 +++++++++++++++++++++ app/helpers/queries_helper.rb | 8 +++ app/models/project_query.rb | 29 +++++++++- app/models/query.rb | 16 ++++++ app/views/projects/_board.html.erb | 3 + app/views/projects/_list.html.erb | 35 ++++++++++++ app/views/projects/index.html.erb | 7 +-- app/views/queries/_form.html.erb | 21 ++++++- app/views/queries/_query_form.html.erb | 25 ++++++++- config/locales/en.yml | 3 + public/stylesheets/application.css | 35 +++++------- test/functional/projects_controller_test.rb | 53 ++++++++++++++++++ test/unit/project_query_test.rb | 11 ++++ 15 files changed, 294 insertions(+), 33 deletions(-) create mode 100644 app/helpers/projects_queries_helper.rb create mode 100644 app/views/projects/_board.html.erb create mode 100644 app/views/projects/_list.html.erb diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index e7a79e495..b9bda6b43 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -34,6 +34,8 @@ class ProjectsController < ApplicationController helper :issues helper :queries include QueriesHelper + helper :projects_queries + include ProjectsQueriesHelper helper :repositories helper :members helper :trackers @@ -50,7 +52,9 @@ class ProjectsController < ApplicationController respond_to do |format| format.html { - @projects = scope.to_a + @entry_count = scope.count + @entry_pages = Paginator.new @entry_count, per_page_option, params['page'] + @entries = scope.offset(@entry_pages.offset).limit(@entry_pages.per_page).to_a } format.api { @offset, @limit = api_offset_and_limit @@ -61,6 +65,11 @@ class ProjectsController < ApplicationController projects = scope.reorder(:created_on => :desc).limit(Setting.feeds_limit.to_i).to_a render_feed(projects, :title => "#{Setting.app_title}: #{l(:label_project_latest)}") } + format.csv { + # Export all entries + @entries = scope.to_a + send_data(query_to_csv(@entries, @query, params), :type => 'text/csv; header=present', :filename => 'projects.csv') + } end end diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index bdb1ac44c..335db8b0b 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -158,4 +158,13 @@ module ProjectsHelper url = bookmark_project_url(project) link_to text, url, remote: true, method: method, class: css end + + def grouped_project_list(projects, query, &block) + ancestors = [] + grouped_query_results(projects, query) do |project, group_name, group_count, group_totals| + ancestors.pop while ancestors.any? && !project.is_descendant_of?(ancestors.last) + yield project, ancestors.size, group_name, group_count, group_totals + ancestors << project unless project.leaf? + end + end end diff --git a/app/helpers/projects_queries_helper.rb b/app/helpers/projects_queries_helper.rb new file mode 100644 index 000000000..b5de291c0 --- /dev/null +++ b/app/helpers/projects_queries_helper.rb @@ -0,0 +1,61 @@ +# frozen_string_literal: true + +# Redmine - project management software +# Copyright (C) 2006-2017 Jean-Philippe Lang +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +module ProjectsQueriesHelper + include ApplicationHelper + + def column_value(column, item, value) + if item.is_a?(Project) + case column.name + when :name + link_to_project(item) + (content_tag('span', '', :class => 'icon icon-user my-project', :title => l(:label_my_projects)) if User.current.member_of?(item)) + when :short_description + item.description? ? content_tag('div', textilizable(item, :short_description), :class => "wiki") : '' + when :homepage + item.homepage? ? content_tag('div', textilizable(item, :homepage), :class => "wiki") : '' + when :status + get_project_status_label[column.value_object(item)] + when :parent_id + link_to_project(item.parent) unless item.parent.nil? + else + super + end + end + end + + def csv_content(column, item) + if item.is_a?(Project) + case column.name + when :status + get_project_status_label[column.value_object(item)] + when :parent_id + return item.parent.name unless item.parent.nil? + end + end + super + end + + private + + def get_project_status_label + { + Project::STATUS_ACTIVE => l(:project_status_active), + Project::STATUS_CLOSED => l(:project_status_closed) + } + end +end diff --git a/app/helpers/queries_helper.rb b/app/helpers/queries_helper.rb index 55b7d5812..4ca2be07b 100644 --- a/app/helpers/queries_helper.rb +++ b/app/helpers/queries_helper.rb @@ -120,6 +120,14 @@ module QueriesHelper render :partial => 'queries/columns', :locals => {:query => query, :tag_name => tag_name} end + def available_display_types_tags(query) + available_display_types = [] + query.available_display_types.each do |t| + available_display_types << [l(:"label_display_type_#{t}"), t] + end + select_tag('display_type', options_for_select(available_display_types, @query.display_type), :id => 'display_type') + end + def grouped_query_results(items, query, &block) result_count_by_group = query.result_count_by_group previous_group, first = false, true diff --git a/app/models/project_query.rb b/app/models/project_query.rb index 2bc6b40e1..ecf3e687b 100644 --- a/app/models/project_query.rb +++ b/app/models/project_query.rb @@ -22,7 +22,16 @@ class ProjectQuery < Query self.queried_class = Project self.view_permission = :search_project - self.available_columns = [] + self.available_columns = [ + QueryColumn.new(:name, :sortable => "#{Project.table_name}.name"), + QueryColumn.new(:status, :sortable => "#{Project.table_name}.status"), + QueryColumn.new(:short_description, :sortable => "#{Project.table_name}.description", :caption => :field_description), + QueryColumn.new(:homepage, :sortable => "#{Project.table_name}.homepage"), + QueryColumn.new(:identifier, :sortable => "#{Project.table_name}.identifier"), + QueryColumn.new(:parent_id, :sortable => "#{Project.table_name}.lft ASC", :default_order => 'desc', :caption => :field_parent), + QueryColumn.new(:is_public, :sortable => "#{Project.table_name}.is_public", :groupable => true), + QueryColumn.new(:created_on, :sortable => "#{Project.table_name}.created_on", :default_order => 'desc') + ] def initialize(attributes=nil, *args) super attributes @@ -48,7 +57,23 @@ class ProjectQuery < Query end def available_columns - [] + return @available_columns if @available_columns + @available_columns = self.class.available_columns.dup + @available_columns += ProjectCustomField.visible. + map {|cf| QueryAssociationCustomFieldColumn.new(:project, cf) } + @available_columns + end + + def available_display_types + ['board', 'list'] + end + + def default_columns_names + @default_columns_names ||= [:name, :identifier, :short_description] + end + + def default_sort_criteria + [[]] end def base_scope diff --git a/app/models/query.rb b/app/models/query.rb index 2b06f8d13..395bcb340 100644 --- a/app/models/query.rb +++ b/app/models/query.rb @@ -408,6 +408,7 @@ class Query < ActiveRecord::Base self.column_names = params[:c] || query_params[:column_names] || self.column_names self.totalable_names = params[:t] || query_params[:totalable_names] || self.totalable_names self.sort_criteria = params[:sort] || query_params[:sort_criteria] || self.sort_criteria + self.display_type = params[:display_type] || query_params[:display_type] || self.display_type self end @@ -982,6 +983,21 @@ class Query < ActiveRecord::Base end end + def display_type + options[:display_type] || self.available_display_types.first + end + + def display_type=(type) + unless type || self.available_display_types.include?(type) + type = self.available_display_types.first + end + options[:display_type] = type + end + + def available_display_types + ['list'] + end + private def grouped_query(&block) diff --git a/app/views/projects/_board.html.erb b/app/views/projects/_board.html.erb new file mode 100644 index 000000000..7d63a533d --- /dev/null +++ b/app/views/projects/_board.html.erb @@ -0,0 +1,3 @@ +
+ <%= render_project_hierarchy(@entries) %> +
diff --git a/app/views/projects/_list.html.erb b/app/views/projects/_list.html.erb new file mode 100644 index 000000000..8a1efc204 --- /dev/null +++ b/app/views/projects/_list.html.erb @@ -0,0 +1,35 @@ +
+ + + + <% @query.inline_columns.each do |column| %> + <%= column_header(@query, column) %> + <% end %> + + + +<% grouped_project_list(entries, @query) do |entry, level, group_name, group_count, group_totals| -%> + <% if group_name %> + <% reset_cycle %> + + + + <% end %> + "> + <% @query.inline_columns.each do |column| %> + <%= content_tag('td', column_content(column, entry), :class => column.css_classes) %> + <% end %> + +<% end -%> + +
+   + <%= group_name %> + <% if group_count %> + <%= group_count %> + <% end %> + <%= group_totals %> + <%= link_to_function("#{l(:button_collapse_all)}/#{l(:button_expand_all)}", + "toggleAllRowGroups(this)", :class => 'toggle-all') %> +
+
diff --git a/app/views/projects/index.html.erb b/app/views/projects/index.html.erb index 3c2543b43..067c9bdee 100644 --- a/app/views/projects/index.html.erb +++ b/app/views/projects/index.html.erb @@ -11,12 +11,11 @@ <% end %> <% if @query.valid? %> - <% if @projects.empty? %> + <% if @entries.empty? %>

<%= l(:label_no_data) %>

<% else %> -
- <%= render_project_hierarchy(@projects) %> -
+ <%= render :partial => @query.display_type, :locals => { :entries => @entries }%> + <%= pagination_links_full @entry_pages, @entry_count %> <% end %> <% end %> diff --git a/app/views/queries/_form.html.erb b/app/views/queries/_form.html.erb index a2dd9f589..12a1d0202 100644 --- a/app/views/queries/_form.html.erb +++ b/app/views/queries/_form.html.erb @@ -29,12 +29,18 @@ <% end %>
<%= l(:label_options) %> -

+ <% if @query.available_display_types.size > 1 %> +

+ <%= available_display_types_tags(@query) %> +

+<% end %> + +

<%= check_box_tag 'default_columns', 1, @query.has_default_columns?, :id => 'query_default_columns', :data => {:disables => "#columns, .block_columns input"} %>

<% unless params[:gantt] %> -

+

<%= select 'query', 'group_by', @query.groupable_columns.collect {|c| [c.caption, c.name.to_s]}, :include_blank => true %>

<% unless @query.available_block_columns.empty? %> @@ -99,4 +105,15 @@ $(document).ready(function(){ $("input.disable-unless-private").attr('disabled', !private_checked); }).trigger('change'); }); + +$(function ($) { + $('#display_type').change(function (e) { + var option = $(e.target).val() + if (option == 'board') { + $('fieldset#columns, fieldset#sort, p#default_columns, p#group_by').hide(); + } else { + $('fieldset#columns, fieldset#sort, p#default_columns, p#group_by').show(); + } + }).change() +}); <% end %> diff --git a/app/views/queries/_query_form.html.erb b/app/views/queries/_query_form.html.erb index 65bcc3eb5..62d156684 100644 --- a/app/views/queries/_query_form.html.erb +++ b/app/views/queries/_query_form.html.erb @@ -14,8 +14,14 @@ <% if @query.available_columns.any? %>