flyboy 1.0.4 → 1.0.5

data/app/assets/stylesheets/flyboy/all.sass

@@ -1,4 +1,8 @@
 .flyboy
+  table
+    @extend .table
+    @extend .table-bordered
+
   .onwarning
     background: $state-warning-bg !important
 
@@ -8,7 +12,7 @@
   .onalert
     background: $state-danger-bg !important
 
-  .btn
+  .btn, form.search
     margin: 5px
 
   .context div.infos

data/app/controllers/flyboy/goals_controller.rb

@@ -14,8 +14,10 @@ module Flyboy
 
       @order ||= sortable_column_order do |column, direction|
         case column
-        when "title"
+        when "title", "status"
           %(LOWER(flyboy_goals.#{column}) #{direction})
+        when "progress"
+          %(flyboy_goals.#{column} #{direction})
         else
           params["sort"] = "status"
           "status ASC"
@@ -25,7 +27,9 @@ module Flyboy
       @filters ||= SmallData::FilterForGoals.new(cookies)
 
       @goals = @goals.order(@order)
-      @goals = @filters.apply @goals
+      @goals = @filters.apply(@goals)
+      @goals = @goals.search(params[:q])
+      @goals = @goals.page(params[:page])
     end
 
     def show

data/app/controllers/flyboy/tasks_controller.rb

@@ -14,7 +14,10 @@ module Flyboy
         case column
         when "title", "status"
           %(LOWER(flyboy_tasks.#{column}) #{direction})
+        when "progress", "term"
+          %(flyboy_tasks.#{column} #{direction})
         when "goal"
+          @tasks = @tasks.joins(:goal)
           %(LOWER(flyboy_goals.title) #{direction})
         else
           params["sort"] = "term"
@@ -25,7 +28,9 @@ module Flyboy
       @filters ||= SmallData::FilterForTasks.new(cookies)
 
       @tasks = @tasks.order(@order)
-      @tasks = @filters.apply @tasks
+      @tasks = @filters.apply(@tasks)
+      @tasks = @tasks.search(params[:q])
+      @tasks = @tasks.page(params[:page])
 
       respond_to do |format|
         format.html

data/app/models/flyboy/goal.rb

@@ -1,6 +1,11 @@
+require "dorsale/search"
+
 module Flyboy
   class Goal < ActiveRecord::Base
     include AASM
+    include Dorsale::Search
+
+    paginates_per 50
 
     aasm(column: "status", whiny_transitions: false) do
       state :open, initial: true
@@ -22,13 +27,13 @@ module Flyboy
       in: proc { Flyboy::Goal.aasm.states.map(&:to_s) }
     }
 
-    def no_undone_tasks?
-      tasks.where(done: false).count == 0
+    def initialize(*args)
+      super
+      self.progress = 0 if progress.nil?
     end
 
-    def progress
-      return 0 if tasks.count.zero?
-      tasks.sum(:progress) / tasks.count
+    def no_undone_tasks?
+      tasks.where(done: false).count == 0
     end
 
     def revision
@@ -48,5 +53,19 @@ module Flyboy
       self.version = 0 if self.version.nil?
       self.version = self.version + 1
     end
+
+    def update_progress
+      if tasks.count.zero?
+        self.progress = 0
+      else
+        self.progress = tasks.sum(:progress) / tasks.count
+      end
+    end
+
+    def update_progress!
+      update_progress
+      save
+    end
+
   end
 end

data/app/models/flyboy/task.rb

@@ -1,7 +1,12 @@
 #encoding: utf-8
+require "dorsale/search"
 
 module Flyboy
   class Task < ActiveRecord::Base
+    include Dorsale::Search
+
+    paginates_per 50
+
     belongs_to :goal
     has_many :comments, class_name: Flyboy::TaskComment, inverse_of: :task, dependent: :destroy
 
@@ -19,13 +24,19 @@ module Flyboy
       end
     end
 
-    default_scope -> { order("term ASC") }
-
     def initialize(*args)
       super
       self.done = false                                    if done.nil?
       self.reminder = Date.today + snooze_default_reminder if reminder.nil?
       self.term     = Date.today + snooze_default_term     if term.nil?
+      self.progress = 0                                    if progress.nil?
+    end
+
+    after_save    :update_goal_progress!
+    after_destroy :update_goal_progress!
+
+    def update_goal_progress!
+      goal.update_progress!
     end
 
     def snooze

data/app/models/flyboy/task_comment.rb

@@ -2,15 +2,21 @@ module Flyboy
   class TaskComment < ActiveRecord::Base
     belongs_to :task
 
-    validates :task, presence: true
-    validates :date, presence: true
+    validates :task,        presence: true
+    validates :date,        presence: true
+    validates :description, presence: true
     validates :progress, inclusion: {in: 0..100}
 
     default_scope -> { order("created_at DESC") }
 
     def initialize(*args)
       super
-      self.date = Time.now if date.nil?
+
+      self.date     = Time.now if date.nil?
+
+      if progress.nil?
+        self.progress = task ? task.progress : 0
+      end
     end
 
     after_create :update_task_progress

data/app/views/flyboy/_searchbar.html.slim

@@ -0,0 +1,6 @@
+form.search
+  p.input-group
+    input.form-control name="q" placeholder=t("actions.search") size=25 value=params[:q]
+    span.input-group-addon
+      button.nostyle type="submit"
+        = icon :search

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

@@ -1,15 +1,15 @@
 .actions
-  - if flyboy.goal_path(@goal) != request.path
-    = read_button goal_path(@goal)
+  - if flyboy.goal_path(goal) != request.path
+    = read_button goal_path(goal)
 
-  - if can?(:create, @goal.tasks.new)
-    = create_button new_goal_task_path(@goal), text: t("actions.goals.new_task")
+  - if can?(:create, goal.tasks.new)
+    = create_button new_goal_task_path(goal), text: t("actions.goals.new_task")
 
-  - if can?(:update, @goal)
-    = update_button edit_goal_path(@goal)
+  - if can?(:update, goal)
+    = update_button edit_goal_path(goal)
 
-  - if can?(:close, @goal)
-    = lock_button close_goal_path(@goal), text: t("actions.close")
+  - if can?(:close, goal)
+    = lock_button close_goal_path(goal), text: t("actions.close")
 
-  - if can?(:open, @goal)
-    = unlock_button open_goal_path(@goal), text: t("actions.open")
+  - if can?(:open, goal)
+    = unlock_button open_goal_path(goal), text: t("actions.open")

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

@@ -1,7 +1,7 @@
 .goal-context: .context
   = context_icon :tasks
   = context_title goal.title
-  = render "flyboy/goals/actions"
+  = render "flyboy/goals/actions", goal: goal
 
   .infos
     strong
@@ -11,4 +11,6 @@
 
   = context_info Flyboy::Goal.human_attribute_name(:revision), goal.revision
   = context_info Flyboy::Goal.human_attribute_name(:status), t("messages.goals.status.#{goal.status}")
-  = context_info Flyboy::Goal.human_attribute_name(:description), goal.description
+
+  - if params[:controller] == "flyboy/goals" && params[:action] == "show"
+    = context_info Flyboy::Goal.human_attribute_name(:description), text2html("\n" +goal.description)

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

@@ -0,0 +1,26 @@
+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")
+
+  tbody
+    - goals.each do |goal|
+      tr.goal class=goal_color(goal)
+        td.title
+          - if can? :read, goal
+            = link_to goal.title, goal_path(goal)
+          - else
+            = goal.title
+
+        td.goal_progress
+          = progress_bar percentage: goal.progress, label: true
+
+        td.status
+          = t("messages.goals.status.#{goal.status}")
+
+        td.actions
+          - if can? :create, Flyboy::Task.new(goal: goal)
+            = create_button flyboy.new_goal_task_path(goal), text: t("actions.goals.new_task")

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

@@ -1,37 +1,14 @@
 .flyboy
   .row
-    .col-md-6
+    .col-md-4
       h1 Dossiers en cours
 
-    .col-md-6.right
+    .col-md-4.right
       .actions
         = create_button new_goal_path, class: "btn btn-success"
+    .col-md-4
+      = render "flyboy/searchbar"
 
   = render "flyboy/filters"
-
-  table.default
-    thead
-      tr
-        th = sortable_column Flyboy::Goal.model_name.human, column: "title"
-        th = Flyboy::Goal.human_attribute_name(:progress)
-        th = sortable_column Flyboy::Goal.human_attribute_name(:status), column: "status"
-        th = t ".actions", default: t("helpers.actions")
-
-    tbody
-      - @goals.each do |goal|
-        tr.goal class=goal_color(goal)
-          td.title
-            - if can? :read, goal
-              = link_to goal.title, goal_path(goal)
-            - else
-              = goal.title
-
-          td.goal_progress
-            = progress_bar percentage: goal.progress, label: true
-
-          td.status
-            = t("messages.goals.status.#{goal.status}")
-
-          td.actions
-            - if can? :create, Flyboy::Task.new(goal: goal)
-              = create_button flyboy.new_goal_task_path(goal), text: t("actions.goals.new_task")
+  = render "flyboy/goals/list", goals: @goals
+  = paginate @goals, theme: "twitter-bootstrap-3"

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

@@ -1,5 +1,5 @@
 = simple_form_for [@task, (@task_comment || @task.comments.new)] do |f|
-  table.default
+  table
     thead
       tr
         th = Flyboy::TaskComment.human_attribute_name(:progress)

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

@@ -1,9 +1,9 @@
 .actions
-  - if can?(:update, @task)
-    = update_button edit_task_path(@task)
+  - if can?(:update, task)
+    = update_button edit_task_path(task)
 
-  - if can?(:snooze, @task)
-    = snooze_button snooze_task_path(@task)
+  - if can?(:snooze, task)
+    = snooze_button snooze_task_path(task)
 
-  - if can?(:complete, @task)
-    = complete_button complete_task_path(@task)
+  - if can?(:complete, task)
+    = complete_button complete_task_path(task)

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

@@ -1,7 +1,7 @@
 .task-context: .context
   = context_icon :check_square_o
   = context_title task.title
-  = render "flyboy/tasks/actions"
+  = render "flyboy/tasks/actions", task: task
 
   .infos
     strong

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

@@ -1,4 +1,4 @@
-table.default
+table
   thead
     tr
       - if nested
@@ -8,7 +8,7 @@ table.default
       - else
         th = sortable_column Flyboy::Goal.model_name.human, column: "goal"
         th = sortable_column Flyboy::Task.model_name.human, column: "title"
-        th = Flyboy::Task.human_attribute_name(:progress)
+        th = sortable_column Flyboy::Task.human_attribute_name(:progress), column: "progress"
         th = sortable_column Flyboy::Task.human_attribute_name(:term),  column: "term"
 
       th = t("actions.label")
@@ -36,11 +36,8 @@ table.default
           = l task.term
 
         td.actions
-          - if can?(:update, task)
-            = update_button edit_task_path(task)
-
-            - if can?(:snooze, task)
-              = snooze_button snooze_task_path(task)
+          - if can?(:snooze, task)
+            = snooze_button snooze_task_path(task)
 
           - if can?(:complete, task)
             = complete_button complete_task_path(task)

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

@@ -1,15 +1,16 @@
 .flyboy
   .row
-    .col-md-6
+    .col-md-4
       h1 Feuille de route
 
-    .col-md-6.right
+    .col-md-4.right
       .actions
         = link_to "Export csv",   url_for(format: :csv), class: "btn"
         = link_to "Export excel", url_for(format: :xls), class: "btn"
         = link_to "Export pdf",   url_for(format: :pdf), class: "btn"
+    .col-md-4
+      = render "flyboy/searchbar"
 
   = render "flyboy/filters"
-
   = render "flyboy/tasks/list", tasks: @tasks, nested: false
-
+  = paginate @tasks, theme: "twitter-bootstrap-3"

data/config/locales/fr.yml

@@ -27,6 +27,7 @@ fr:
   actions:
     complete: "Fait"
     label: "Actions"
+    search: "Rechercher"
 
     goals:
       new_task: "Nouvelle Tâche"

data/db/migrate/20150415130939_add_progress_to_goals.rb

@@ -0,0 +1,6 @@
+class AddProgressToGoals < ActiveRecord::Migration
+  def change
+    add_column :flyboy_goals, :progress, :integer
+    Flyboy::Goal.all.map(&:update_progress!)
+  end
+end

data/lib/flyboy/version.rb

@@ -1,3 +1,3 @@
 module Flyboy
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
 end

data/spec/controllers/flyboy/goals_controller_spec.rb

@@ -34,6 +34,45 @@ describe Flyboy::GoalsController, type: :controller do
        assigns(:goals).should eq [@goal1]
       end
     end
+
+    context "when sorting" do
+      before do
+        Flyboy::Goal.destroy_all
+        @goal1 = FactoryGirl.create(:flyboy_goal, title: "Abc", progress: 100, status: "open")
+        @goal2 = FactoryGirl.create(:flyboy_goal, title: "dEF", progress: 0,   status: "closed")
+        @goal3 = FactoryGirl.create(:flyboy_goal, title: "xyz", progress: 35,  status: "closed")
+      end
+
+      it "sorting by title asc" do
+        get :index, sort: "title"
+        expect(assigns(:goals).to_a).to eq [@goal1, @goal2, @goal3]
+      end
+
+      it "sorting by title desc" do
+        get :index, sort: "-title"
+        expect(assigns(:goals).to_a).to eq [@goal3, @goal2, @goal1]
+      end
+
+      it "sorting by progress asc" do
+        get :index, sort: "progress"
+        expect(assigns(:goals).to_a).to eq [@goal2, @goal3, @goal1]
+      end
+
+      it "sorting by progress desc" do
+        get :index, sort: "-progress"
+        expect(assigns(:goals).to_a).to eq [@goal1, @goal3, @goal2]
+      end
+
+      it "sorting by status asc" do
+        get :index, sort: "status"
+        expect(assigns(:goals).to_a).to eq [@goal2, @goal3, @goal1]
+      end
+
+      it "sorting by status desc" do
+        get :index, sort: "-status"
+        expect(assigns(:goals).to_a).to eq [@goal1, @goal2, @goal3]
+      end
+    end
   end
 
   describe "#close" do

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 eq Flyboy::Task.all
+      expect(assigns(:tasks).to_a).to eq Flyboy::Task.all.to_a
     end
 
     context "when applying filter" do
@@ -73,6 +73,60 @@ describe Flyboy::TasksController, type: :controller do
         assigns(:tasks).should eq [@task2]
       end
     end
+
+    context "when sorting" do
+      before do
+        Flyboy::Goal.destroy_all
+        Flyboy::Task.destroy_all
+        @goal1 = FactoryGirl.create(:flyboy_goal, title: "Abc")
+        @goal2 = FactoryGirl.create(:flyboy_goal, title: "dEF")
+        @goal3 = FactoryGirl.create(:flyboy_goal, title: "xyz")
+
+        @task1 = FactoryGirl.create(:flyboy_task, goal: @goal1, title: "Abc", progress: 100, term: "21/12/2012", reminder: "21/12/2012")
+        @task2 = FactoryGirl.create(:flyboy_task, goal: @goal2, title: "dEF", progress: 0,   term: "23/12/2012", reminder: "23/12/2012")
+        @task3 = FactoryGirl.create(:flyboy_task, goal: @goal3, title: "xyz", progress: 35,  term: "22/12/2012", reminder: "22/12/2012")
+      end
+
+      it "sorting by goal asc" do
+        get :index, sort: "goal"
+        expect(assigns(:tasks).to_a).to eq [@task1, @task2, @task3]
+      end
+
+      it "sorting by goal desc" do
+        get :index, sort: "-goal"
+        expect(assigns(:tasks).to_a).to eq [@task3, @task2, @task1]
+      end
+
+      it "sorting by title asc" do
+        get :index, sort: "title"
+        expect(assigns(:tasks).to_a).to eq [@task1, @task2, @task3]
+      end
+
+      it "sorting by title desc" do
+        get :index, sort: "-title"
+        expect(assigns(:tasks).to_a).to eq [@task3, @task2, @task1]
+      end
+
+      it "sorting by progress asc" do
+        get :index, sort: "progress"
+        expect(assigns(:tasks).to_a).to eq [@task2, @task3, @task1]
+      end
+
+      it "sorting by progress desc" do
+        get :index, sort: "-progress"
+        expect(assigns(:tasks).to_a).to eq [@task1, @task3, @task2]
+      end
+
+      it "sorting by term asc" do
+        get :index, sort: "term"
+        expect(assigns(:tasks).to_a).to eq [@task1, @task3, @task2]
+      end
+
+      it "sorting by term desc" do
+        get :index, sort: "-term"
+        expect(assigns(:tasks).to_a).to eq [@task2, @task3, @task1]
+      end
+    end
   end
 
   describe "GET show" do

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150409081956) do
+ActiveRecord::Schema.define(version: 20150415130939) do
 
   create_table "flyboy_goals", force: :cascade do |t|
     t.string   "title"
@@ -21,6 +21,7 @@ ActiveRecord::Schema.define(version: 20150409081956) do
     t.integer  "version"
     t.datetime "created_at",  null: false
     t.datetime "updated_at",  null: false
+    t.integer  "progress"
   end
 
   create_table "flyboy_task_comments", force: :cascade do |t|