flyboy 1.0.6 → 1.0.7

data/app/controllers/flyboy/goals_controller.rb

@@ -34,6 +34,20 @@ module Flyboy
 
     def show
       authorize! :read, @goal
+
+      @order ||= sortable_column_order do |column, direction|
+        case column
+        when "title", "status"
+          %(LOWER(flyboy_tasks.#{column}) #{direction})
+        when "progress", "term"
+          %(flyboy_tasks.#{column} #{direction})
+        else
+          params["sort"] = "term"
+          "term ASC"
+        end
+      end
+
+      @tasks = @goal.tasks.order(@order)
     end
 
     def new

data/app/views/flyboy/goals/_list.html.slim

@@ -1,10 +1,14 @@
 table
   thead
     tr
-      th = sortable_column Flyboy::Goal.model_name.human, column: "title"
-      th = sortable_column Flyboy::Goal.human_attribute_name(:progress), column: "progress"
-      th = sortable_column Flyboy::Goal.human_attribute_name(:status), column: "status"
-      th = t ".actions", default: t("helpers.actions")
+      th
+        = sortable_column Flyboy::Goal.model_name.human, column: "title"
+      th.hidden-xs
+        = sortable_column Flyboy::Goal.human_attribute_name(:progress), column: "progress"
+      th.hidden-xs
+        = sortable_column Flyboy::Goal.human_attribute_name(:status), column: "status"
+      th
+        = t ".actions", default: t("helpers.actions")
 
   tbody
     - goals.each do |goal|
@@ -15,10 +19,10 @@ table
           - else
             = goal.title
 
-        td.goal_progress
+        td.goal_progress.hidden-xs
           = progress_bar percentage: goal.progress, label: true
 
-        td.status
+        td.status.hidden-xs
           = t("messages.goals.status.#{goal.status}")
 
         td.actions

data/app/views/flyboy/goals/index.html.slim

@@ -11,4 +11,4 @@
 
   = render "flyboy/filters"
   = render "flyboy/goals/list", goals: @goals
-  = paginate @goals, theme: "twitter-bootstrap-3"
+  = paginate @goals

data/app/views/flyboy/goals/show.html.slim

@@ -4,6 +4,6 @@
 
   - content_for :main do
     .tasks
-      = render "flyboy/tasks/list", tasks: @goal.tasks.order("term DESC"), nested: true
+      = render "flyboy/tasks/list", tasks: @tasks, nested: true
 
   = render_contextual

data/app/views/flyboy/tasks/_list.html.slim

@@ -1,15 +1,15 @@
 table
   thead
     tr
-      - if nested
-        th = Flyboy::Task.model_name.human
-        th = Flyboy::Task.human_attribute_name(:progress)
-        th = Flyboy::Task.human_attribute_name(:term)
-      - else
-        th = sortable_column Flyboy::Goal.model_name.human, column: "goal"
-        th = sortable_column Flyboy::Task.model_name.human, column: "title"
-        th = sortable_column Flyboy::Task.human_attribute_name(:progress), column: "progress"
-        th = sortable_column Flyboy::Task.human_attribute_name(:term),  column: "term"
+      - unless nested
+        th.hidden-xs
+          = sortable_column Flyboy::Goal.model_name.human, column: "goal"
+      th
+        = sortable_column Flyboy::Task.model_name.human, column: "title"
+      th.hidden-xs
+        = sortable_column Flyboy::Task.human_attribute_name(:progress), column: "progress"
+      th.hidden-xs
+        = sortable_column Flyboy::Task.human_attribute_name(:term),  column: "term"
 
       th = t("actions.label")
 
@@ -17,7 +17,7 @@ table
     - tasks.each do |task|
       tr.task id="task_#{task.id}" class=task_color(task)
         - unless nested
-          td.goal
+          td.goal.hidden-xs
             - if can?(:read, task.goal)
               = link_to task.goal.title, goal_path(task.goal)
             - else
@@ -29,10 +29,10 @@ table
           - else
             = task.title
 
-        td.task_progress
+        td.task_progress.hidden-xs
           = progress_bar percentage: task.progress, label: true
 
-        td.term
+        td.term.hidden-xs
           = l(task.term)
 
         td.actions

data/app/views/flyboy/tasks/index.html.slim

@@ -13,4 +13,4 @@
 
   = render "flyboy/filters"
   = render "flyboy/tasks/list", tasks: @tasks, nested: false
-  = paginate @tasks, theme: "twitter-bootstrap-3"
+  = paginate @tasks

data/lib/flyboy/version.rb

@@ -1,3 +1,3 @@
 module Flyboy
-  VERSION = "1.0.6"
+  VERSION = "1.0.7"
 end

data/spec/controllers/flyboy/goals_controller_spec.rb

@@ -75,6 +75,54 @@ describe Flyboy::GoalsController, type: :controller do
     end
   end
 
+  describe "#show" do
+    context "when sorting" do
+      before do
+        Flyboy::Goal.destroy_all
+        Flyboy::Task.destroy_all
+
+        @goal = FactoryGirl.create(:flyboy_goal)
+
+        @task1 = FactoryGirl.create(:flyboy_task,
+          goal: @goal, title: "Abc", progress: 100, term: "21/12/2012", reminder: "21/12/2012")
+        @task2 = FactoryGirl.create(:flyboy_task,
+          goal: @goal, title: "dEF", progress: 0,   term: "23/12/2012", reminder: "23/12/2012")
+        @task3 = FactoryGirl.create(:flyboy_task,
+          goal: @goal, title: "xyz", progress: 35,  term: "22/12/2012", reminder: "22/12/2012")
+      end
+
+      it "sorting by title asc" do
+        get :show, id: @goal, sort: "title"
+        expect(assigns(:tasks).to_a).to eq [@task1, @task2, @task3]
+      end
+
+      it "sorting by title desc" do
+        get :show, id: @goal, sort: "-title"
+        expect(assigns(:tasks).to_a).to eq [@task3, @task2, @task1]
+      end
+
+      it "sorting by progress asc" do
+        get :show, id: @goal, sort: "progress"
+        expect(assigns(:tasks).to_a).to eq [@task2, @task3, @task1]
+      end
+
+      it "sorting by progress desc" do
+        get :show, id: @goal, sort: "-progress"
+        expect(assigns(:tasks).to_a).to eq [@task1, @task3, @task2]
+      end
+
+      it "sorting by term asc" do
+        get :show, id: @goal, sort: "term"
+        expect(assigns(:tasks).to_a).to eq [@task1, @task3, @task2]
+      end
+
+      it "sorting by term desc" do
+        get :show, id: @goal, sort: "-term"
+        expect(assigns(:tasks).to_a).to eq [@task2, @task3, @task1]
+      end
+    end
+  end
+
   describe "#close" do
     before(:each) do
       @goal = FactoryGirl.create(:flyboy_goal, status: "open")

data/spec/controllers/flyboy/tasks_controller_spec.rb

@@ -46,7 +46,7 @@ describe Flyboy::TasksController, type: :controller do
   describe "GET index" do
     it "assigns all tasks as @tasks" do
       get :index, {}
-      expect(assigns(:tasks).to_a).to eq Flyboy::Task.all.to_a
+      expect(assigns(:tasks).sort).to eq Flyboy::Task.all.sort
     end
 
     context "when applying filter" do

data/spec/dummy/app/views/layouts/application.html.erb

@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+  <meta content="width=device-width, initial-scale=1" name="viewport">
   <title>Dummy</title>
   <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true %>
   <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>