#17

iRessources · Aug 14, 2012 · 5e201db · 5e201db
1 parent ba5a295
commit 5e201db
Show file tree

Hide file tree

Showing 7 changed files with 63 additions and 42 deletions.
diff --git a/app/controllers/adtasks_controller.rb b/app/controllers/adtasks_controller.rb
@@ -26,13 +26,17 @@ def list
 
     @plugin_path = File.join(Redmine::Utils.relative_url_root, 'plugin_assets', 'AgileDwarf')
 
-    # new + in progress + resolved
-    status_ids = [Setting.plugin_AgileDwarf[:stcolumn1].to_i, Setting.plugin_AgileDwarf[:stcolumn2].to_i, Setting.plugin_AgileDwarf[:stcolumn3].to_i]
+    status_ids = []
+    colcount = Setting.plugin_AgileDwarf[:stcolumncount].to_i
+    for i in 1 .. colcount
+      status_ids << Setting.plugin_AgileDwarf[('stcolumn' + i.to_s).to_sym].to_i
+    end
     @statuses = {}
     IssueStatus.find_all_by_id(status_ids).each {|x| @statuses[x.id] = x.name}
-    @columns = [{:tasks => SprintsTasks.get_tasks_by_status(@project, status_ids[0], sprint, user), :id => status_ids[0]},
-                {:tasks => SprintsTasks.get_tasks_by_status(@project, status_ids[1], sprint, user), :id => status_ids[1]},
-                {:tasks => SprintsTasks.get_tasks_by_status(@project, status_ids[2], sprint, user), :id => status_ids[2]}]
+    @columns = []
+    for i in 0 .. colcount - 1
+      @columns << {:tasks => SprintsTasks.get_tasks_by_status(@project, status_ids[i], sprint, user), :id => status_ids[i]}
+    end
   end
 
   private

diff --git a/app/views/adtasks/_column.html.erb b/app/views/adtasks/_column.html.erb
@@ -0,0 +1,8 @@
+<div class='task_panel' id="column.<%= column[:id] %>">
+  <h3><%=h @statuses[column[:id]] %></h3>
+  <div class="task_list">
+    <%= render :partial => "task", :collection => column[:tasks] %>
+  </div>
+  <div class="time_list fr">
+  </div>
+</div>
diff --git a/app/views/adtasks/list.html.erb b/app/views/adtasks/list.html.erb
@@ -61,30 +61,5 @@
 </div>
 
 <div id="tasks">
-    <div class='task_panel' id="column.<%= @columns[0][:id] %>">
-      <h3><%=h @statuses[@columns[0][:id]] %></h3>
-      <div class="task_list">
-        <%= render :partial => "task", :collection => @columns[0][:tasks] %>
-      </div>
-      <div class="time_list fr">
-      </div>
-    </div>
-
-    <div class='task_panel' id="column.<%= @columns[1][:id] %>">
-      <h3><%=h @statuses[@columns[1][:id]] %></h3>
-      <div class="task_list">
-        <%= render :partial => "task", :collection => @columns[1][:tasks] %>
-      </div>
-      <div class="time_list fr">
-      </div>
-    </div>
-
-    <div class='task_panel' id="column.<%= @columns[2][:id] %>">
-      <h3><%=h @statuses[@columns[2][:id]] %></h3>
-      <div class="task_list">
-        <%= render :partial => "task", :collection => @columns[2][:tasks] %>
-      </div>
-      <div class="time_list fr">
-      </div>
-    </div>
+  <%= render :partial => "column", :collection => @columns %>
 </div>
diff --git a/app/views/shared/_settings.html.erb b/app/views/shared/_settings.html.erb
@@ -1,3 +1,6 @@
+<%= javascript_include_tag 'libs/jquery-1.7.2.min.js', :plugin => 'AgileDwarf' %>
+<%= javascript_include_tag 'settings', :plugin => 'AgileDwarf' %>
+
 <p>
   <%= content_tag(:label, l(:label_settings_tracker)) %>
   <%= select_tag("settings[tracker]", options_from_collection_for_select(Tracker.all, :id, :name, Setting.plugin_AgileDwarf[:tracker].to_i)) %>
@@ -14,16 +17,33 @@
 </p>
 
 <p>
-  <%= content_tag(:label, l(:label_settings_column1status)) %>
-  <%= select_tag("settings[stcolumn1]", options_from_collection_for_select(IssueStatus.all, :id, :name, Setting.plugin_AgileDwarf[:stcolumn1].to_i)) %>
+  <%= content_tag(:label, l(:label_settings_columncount)) %>
+  <%= select_tag("settings[stcolumncount]", options_for_select([2, 3, 4, 5], Setting.plugin_AgileDwarf[:stcolumncount].to_i)) %>
 </p>
 
-<p>
-  <%= content_tag(:label, l(:label_settings_column2status)) %>
-  <%= select_tag("settings[stcolumn2]", options_from_collection_for_select(IssueStatus.all, :id, :name, Setting.plugin_AgileDwarf[:stcolumn2].to_i)) %>
-</p>
+<div id="stcolumns">
+    <p>
+      <%= content_tag(:label, l(:label_settings_column1status)) %>
+      <%= select_tag("settings[stcolumn1]", options_from_collection_for_select(IssueStatus.all, :id, :name, Setting.plugin_AgileDwarf[:stcolumn1].to_i)) %>
+    </p>
 
-<p>
-  <%= content_tag(:label, l(:label_settings_column3status)) %>
-  <%= select_tag("settings[stcolumn3]", options_from_collection_for_select(IssueStatus.all, :id, :name, Setting.plugin_AgileDwarf[:stcolumn3].to_i)) %>
-</p>
+    <p>
+      <%= content_tag(:label, l(:label_settings_column2status)) %>
+      <%= select_tag("settings[stcolumn2]", options_from_collection_for_select(IssueStatus.all, :id, :name, Setting.plugin_AgileDwarf[:stcolumn2].to_i)) %>
+    </p>
+
+    <p>
+      <%= content_tag(:label, l(:label_settings_column3status)) %>
+      <%= select_tag("settings[stcolumn3]", options_from_collection_for_select(IssueStatus.all, :id, :name, Setting.plugin_AgileDwarf[:stcolumn3].to_i)) %>
+    </p>
+
+    <p>
+      <%= content_tag(:label, l(:label_settings_column4status)) %>
+      <%= select_tag("settings[stcolumn4]", options_from_collection_for_select(IssueStatus.all, :id, :name, Setting.plugin_AgileDwarf[:stcolumn4].to_i)) %>
+    </p>
+
+    <p>
+      <%= content_tag(:label, l(:label_settings_column5status)) %>
+      <%= select_tag("settings[stcolumn5]", options_from_collection_for_select(IssueStatus.all, :id, :name, Setting.plugin_AgileDwarf[:stcolumn5].to_i)) %>
+    </p>
+</div>
diff --git a/assets/javascripts/settings.js b/assets/javascripts/settings.js
@@ -0,0 +1,9 @@
+$(function ()
+{
+    $('#settings_stcolumncount').change(function ()
+    {
+        var count = $(this).val();
+        $('#stcolumns p:lt(' + count + ')').show();
+        $('#stcolumns p:gt(' + (count - 1) + ')').hide();
+    }).change();
+});
diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -38,4 +38,7 @@ en:
   label_settings_closedstatus: Status, that marks task as closed
   label_settings_column1status: Status for 1st column in Tasks
   label_settings_column2status: Status for 2nd column in Tasks
-  label_settings_column3status: Status for 3rd column in Tasks
+  label_settings_column3status: Status for 3rd column in Tasks
+  label_settings_column4status: Status for 4th column in Tasks
+  label_settings_column5status: Status for 5th column in Tasks
+  label_settings_columncount: Nubmer of columns
diff --git a/init.rb b/init.rb
@@ -16,6 +16,8 @@
       :stcolumn1 => 1,
       :stcolumn2 => 2,
       :stcolumn3 => 3,
+      :stcolumn4 => 1,
+      :stcolumn5 => 2,
   }, :partial => 'shared/settings'
 
   project_module :scrum do