dorsale 3.7.4 → 3.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0894fffed18b6a992d19d31f7e07b37a15988cf
-  data.tar.gz: 6469c9e20f4f12edc13f070e4f3f599f6f44aedb
+  metadata.gz: ad479d894fe508bd2db24dbcb03d17c986fd482b
+  data.tar.gz: 1122ddf76aabb70beab2c05c4807051b12d35e33
 SHA512:
-  metadata.gz: 81e5992cd8182154c49b12e1c0f14f9d9985871b1509ae1d0fd9180e1f59515640a0bb1cb7fb02d2cfaa4ff123fb86a2e853ee24fe010742c79cb9f18e68e34f
-  data.tar.gz: cf161f045d9c3db79530b6babc7a52f3185045461668913173c2754ac947625278299010bbe589c57e17b7a6ffec5e52bcab52510574611d2465cbba2322e4c1
+  metadata.gz: 215f9de605cb95f630c71f709c514e617c8c942bcd22af69411a295900efdfb818b1ef7ae1a392dc5c5d13697c5756d13f1bd064e0ef6ef999e9fa1f59f9c3de
+  data.tar.gz: 45b40e12c35892c1a2741a70210195746737105bd673bb08543332e237a3ea3b48387c6a00ec9409f81f8c460f93f0ebdfad6299c4d758954d00e6ba95901b6f

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Next version
 
+## 3.7.5
+
+- Task improvements
+
 ## 3.7.4
 
 - Change nilify_blanks config

data/app/assets/stylesheets/dorsale/engines/flyboy.sass

@@ -9,7 +9,7 @@
     th
       text-align: left
 
-  .finished td, .context-body.finished
+  .done td, .context-body.done
     background: $state-success-bg !important
 
   .onwarning td, .context-body.onwarning
@@ -61,13 +61,17 @@
 
   .task_reminder_fields,
   .task_term_fields,
-    display: flex
-
-    > div
-      margin-right: 15px
+    height: 34px
 
     label
-      line-height: 2.5em
+      padding-left: 0
+
+    .form-sub-group-container
+      display: flex
+
+      > div
+        margin-right: 15px
+
 
     input, select
       width: auto

data/app/controllers/dorsale/flyboy/task_comments_controller.rb

@@ -10,6 +10,7 @@ class Dorsale::Flyboy::TaskCommentsController < ::Dorsale::Flyboy::ApplicationCo
     if @task_comment.save
       redirect_to @task
     else
+      @task_comments = @task.comments
       render "dorsale/flyboy/tasks/show"
     end
   end

data/app/controllers/dorsale/flyboy/tasks_controller.rb

@@ -60,19 +60,10 @@ class Dorsale::Flyboy::TasksController < ::Dorsale::Flyboy::ApplicationControlle
 
   def show
     authorize @task, :read?
-    @task_comments = @task.comments
 
-    @order ||= sortable_column_order do |column, direction|
-    case column
-    when :description
-        %(LOWER(#{column}) #{direction})
-      when :progress
-        %(#{column} #{direction})
-      else
-        "date #{direction}"
-      end
-    end
-    @task_comments = @task_comments.reorder(@order)
+    @task_comments = @task.comments.preload(:author)
+
+    @task_comments = Dorsale::Flyboy::TaskCommentsSorter.(@task_comments, params[:sort] ||= "-date")
   end
 
   def new

data/app/filters/dorsale/flyboy/small_data/filter_for_tasks.rb

@@ -1,6 +1,6 @@
 class Dorsale::Flyboy::SmallData::FilterForTasks < ::Agilibox::SmallData::Filter
   STRATEGIES = {
-    "fb_status" => ::Dorsale::Flyboy::SmallData::FilterStrategyByDone.new,
+    "fb_state"  => ::Dorsale::Flyboy::SmallData::FilterStrategyByTaskState.new,
     "fb_owner"  => ::Agilibox::SmallData::FilterStrategyByKeyValue.new(:owner_id)
   }
 end

data/app/filters/dorsale/flyboy/small_data/filter_strategy_by_task_state.rb

@@ -0,0 +1,9 @@
+class Dorsale::Flyboy::SmallData::FilterStrategyByTaskState < ::Agilibox::SmallData::FilterStrategy
+  def apply(query, value)
+    if value.in?(Dorsale::Flyboy::Task::STATES)
+      query.send(value)
+    else
+      query
+    end
+  end
+end

data/app/helpers/dorsale/flyboy/application_helper.rb

@@ -25,20 +25,10 @@ module Dorsale::Flyboy::ApplicationHelper
     render "dorsale/flyboy/tasks/summary"
   end
 
-  def task_color(task)
-    return "finished"  if task.done
-    return "onalert"   if task.term < Time.zone.now.to_date
-    return "onwarning" if task.reminder_date && task.reminder_date < Time.zone.now.to_date
-    return "ontime"
-
-  end
-
   def flyboy_status_for_filters_select
-    {
-      Dorsale::Flyboy::Task.t("status.all")    => "",
-      Dorsale::Flyboy::Task.t("status.open")   => "open",
-      Dorsale::Flyboy::Task.t("status.closed") => "closed",
-    }
+    Dorsale::Flyboy::Task::STATES.map do |state|
+      [Dorsale::Flyboy::Task.t("state.#{state}"), state]
+    end
   end
 
   def flyboy_tasks_owners_for_filters_select

data/app/models/dorsale/flyboy/task.rb

@@ -15,6 +15,35 @@ class Dorsale::Flyboy::Task < ::Dorsale::ApplicationRecord
   polymorphic_id_for :taskable
   polymorphic_id_for :owner
 
+  STATES = %w(done undone ontime onwarning onalert)
+
+  def state
+    return "done"      if done
+    return "onalert"   if term          && term          <= Time.zone.now.to_date
+    return "onwarning" if reminder_date && reminder_date <= Time.zone.now.to_date
+    return "ontime"
+  end
+
+  scope :done,   -> { where(done: true)  }
+  scope :undone, -> { where(done: false) }
+
+  scope :ontime, -> {
+    undone
+      .where("term IS NULL OR term > ?", Time.zone.now.to_date)
+      .where("reminder_date IS NULL OR reminder_date > ?", Time.zone.now.to_date)
+  }
+
+  scope :onwarning, -> {
+    undone
+      .where("reminder_date <= ?", Time.zone.now.to_date)
+      .where("term IS NULL OR term > ?", Time.zone.now.to_date)
+  }
+
+  scope :onalert, -> {
+    undone
+      .where("term <= ?", Time.zone.now.to_date)
+  }
+
   scope :delayed,  -> { where(done: false).where("term < ?", Time.zone.now.to_date) }
   scope :today,    -> { where(done: false).where("term = ?", Time.zone.now.to_date) }
   scope :tomorrow, -> { where(done: false).where("term = ?", Date.tomorrow)         }

data/app/models/dorsale/flyboy/task_comment.rb

@@ -10,7 +10,7 @@ class Dorsale::Flyboy::TaskComment < ::Dorsale::ApplicationRecord
   validates :description, presence: true
   validates :progress,    inclusion: {in: 0..100}
 
-  default_scope -> { order("created_at DESC") }
+  default_scope -> { order(date: :desc) }
 
   def assign_default_values
     assign_default :date,     Time.zone.now

data/app/sorters/dorsale/flyboy/task_comments_sorter.rb

@@ -0,0 +1,12 @@
+class Dorsale::Flyboy::TaskCommentsSorter < Agilibox::Sorter
+  def sort
+    case column
+    when :date
+      %(#{column} #{direction})
+    when :description
+      %(LOWER(#{column}) #{direction})
+    else
+      "date DESC"
+    end
+  end
+end

data/app/views/dorsale/flyboy/_filters.html.slim

@@ -1,5 +1,5 @@
 = filters_form do |f|
-  = f.input :fb_status, collection: flyboy_status_for_filters_select, include_blank: false
+  = f.input :fb_state, collection: flyboy_status_for_filters_select, include_blank: Dorsale::Flyboy::Task.t("state.all")
 
   - if @filters.class::STRATEGIES.include?("fb_owner")
     = f.input :fb_owner, collection: flyboy_tasks_owners_for_filters_select, include_blank: t("filters.all_owners")

data/app/views/dorsale/flyboy/task_comments/_form.html.slim

@@ -0,0 +1,11 @@
+- if policy(@task).comment?
+  tr#new_task_comment_tr
+    td.task_comment-progress
+      = f.input :progress, label: false
+
+    td.task_comment-content
+      = f.hidden_field :task_id
+
+      .textarea-input-group
+        = f.text_area :description, rows: 3, class: "form-control"
+        input type="submit" value=t("actions.save")

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

@@ -3,36 +3,17 @@
     thead
       tr
         th.task_comment-progress
-          = sortable_column Dorsale::Flyboy::TaskComment.t(:progress), :progress
+          = sortable_column Dorsale::Flyboy::TaskComment.t(:progress), :date
 
         th.task_comment-description
           = sortable_column Dorsale::Flyboy::TaskComment.t(:description), :description
 
     tbody
-      - if policy(@task).comment?
-        tr#new_task_comment_tr
-          td.task_comment-progress
-            = f.input :progress, label: false
+      - if params[:sort] != "date"
+        = render "dorsale/flyboy/task_comments/form", f: f
 
-          td.task_comment-content
-            = f.hidden_field :task_id
+      - @task_comments.each do |task_comment|
+        = render "dorsale/flyboy/task_comments/task_comment", task_comment: task_comment
 
-            .textarea-input-group
-              = f.text_area :description, rows: 3, class: "form-control"
-              input type="submit" value=t("actions.save")
-
-
-      - @task_comments.each do |comment|
-        tr.task_comment
-          td.task_comment-progress
-            = progress_bar percentage: comment.progress, label: true
-
-          td.task_comment-content
-            p: small
-              span.task_comment-date = date(comment.date)
-              = " "
-              = comment.t(:written_by)
-              = " "
-              span.task_comment-author = comment.author
-
-            p.task_comment-description = text2html comment.description
+      - if params[:sort] == "date"
+        = render "dorsale/flyboy/task_comments/form", f: f

data/app/views/dorsale/flyboy/task_comments/_task_comment.html.slim

@@ -0,0 +1,13 @@
+tr.task_comment
+  td.task_comment-progress
+    = progress_bar percentage: task_comment.progress, label: true
+
+  td.task_comment-content
+    p: small
+      span.task_comment-date = date(task_comment.date)
+      = " "
+      = task_comment.t(:written_by)
+      = " "
+      span.task_comment-author = task_comment.author
+
+    p.task_comment-description = text2html task_comment.description

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

@@ -4,7 +4,7 @@
     = " "
     = task
 
-  .context-body class=task_color(task)
+  .context-body class=task.state
     = info task, :progress, progress_bar(percentage: task.progress, label: true)
     = info task, :owner
     = info task, :created_at

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

@@ -18,7 +18,7 @@ table#tasks-list
 
   tbody
     - tasks.each do |task|
-      tr.task class=task_color(task)
+      tr.task class=task.state
         td.task-status
           - if task.done?
             span.title-tooltip title=task.t(:done)

data/app/views/dorsale/flyboy/tasks/_reminder_fields.html.slim

@@ -1,18 +1,22 @@
-.task_reminder_fields
-  .form-sub-group.task_reminder_label
-    = f.label :reminder, class: "control-label"
+.form-group.task_reminder_fields class=("has-error" if f.object.errors.key?(:reminder_date))
+  = f.label :reminder, class: "control-label col-sm-3"
 
-  .form-sub-group.task_reminder_type
-    = f.input :reminder_type, collection: flyboy_reminder_types_for_select, include_blank: false, wrapper: :default, label: false, input_html: {class: "form-control"}
+  .col-sm-9
+    .form-sub-group-container
+      .form-sub-group.task_reminder_type
+        = f.select :reminder_type, flyboy_reminder_types_for_select, {include_blank: false}, {class: "form-control"}
 
-  .form-sub-group.task_reminder_duration
-    = f.input :reminder_duration, wrapper: :default, label: false, input_html: {class: "form-control"}
+      .form-sub-group.task_reminder_duration
+        = f.text_field :reminder_duration, class: "form-control"
 
-  .form-sub-group.task_reminder_unit
-    = f.input :reminder_unit, collection: flyboy_reminder_type_units_for_select, wrapper: :default, label: false, input_html: {class: "form-control"}
+      .form-sub-group.task_reminder_unit
+        = f.select :reminder_unit, flyboy_reminder_type_units_for_select, {include_blank: false}, {class: "form-control"}
 
-  .form-sub-group.task_reminder_date
-    = f.input :reminder_date, html5: true, wrapper: :default, label: false, input_html: {class: "form-control"}
+      .form-sub-group.task_reminder_date
+        = f.date_field :reminder_date, class: "form-control"
+
+    - if errors = f.object.errors[:reminder_date].join(", ").presence
+      span.help-block = errors
 
 coffee:
   $("#task_reminder_type")

data/app/views/dorsale/flyboy/tasks/_term_fields.html.slim

@@ -1,12 +1,16 @@
-.task_term_fields
-  .form-sub-group.task_term_label
-    = f.label :term, class: "control-label"
+.form-group.task_term_fields class=("has-error" if f.object.errors.key?(:term))
+  = f.label :term, class: "control-label col-sm-3"
 
-  .form-sub-group.task_term_type
-    = f.input :term, collection: task_term_values_for_select, include_blank: true, html5: true, wrapper: :default, label: false, input_html: {class: "form-control"}
+  .col-sm-9
+    .form-sub-group-container
+      .form-sub-group.task_term_type
+        = f.select :term, task_term_values_for_select, {include_blank: true}, {class: "form-control"}
 
-  .form-sub-group.task_term_custom
-    = f.input :term, html5: true, wrapper: :default, label: false, input_html: {class: "form-control", id: "task_term_custom"}
+      .form-sub-group.task_term_custom
+        = f.date_field :term, class: "form-control", id: "task_term_custom"
+
+    - if errors = f.object.errors[:term].join(", ").presence
+      span.help-block = errors
 
 coffee:
   $("#task_term")

data/config/locales/flyboy.en.yml

@@ -35,12 +35,6 @@ en:
         other: "Task Comments"
 
     attributes:
-      dorsale/flyboy/task/status:
-        all: "All status"
-        open: "Open"
-        closed: "Closed"
-        unknown: "Unknown"
-
       dorsale/flyboy/task:
         taskable: "Origin"
         taskable_type: "Origin type"
@@ -58,6 +52,14 @@ en:
         description: "Description"
         progress: "Progress"
 
+      dorsale/flyboy/task/state:
+        all: "All states"
+        done: "Finished"
+        undone: "Not finished"
+        ontime: "On time"
+        onwarning: "Reminder outdated"
+        onalert: "Term outdated"
+
       dorsale/flyboy/task_comment:
         progress: "Progress"
         description: "Description"

data/config/locales/flyboy.fr.yml

@@ -37,12 +37,6 @@ fr:
         other: "Commentaires de tâche"
 
     attributes:
-      dorsale/flyboy/task/status:
-        all: "Tous les status"
-        open: "Ouvert"
-        closed: "Fermé"
-        unknown: "Inconnu"
-
       dorsale/flyboy/task:
         taskable: "Origine"
         taskable_type: "Type origine"
@@ -60,6 +54,14 @@ fr:
         description: "Description"
         progress: "Progression"
 
+      dorsale/flyboy/task/state:
+        all: "Tous les états"
+        done: "Terminée"
+        undone: "Non terminée"
+        ontime: "À temps"
+        onwarning: "Rappel dépassé"
+        onalert: "Échéance dépassée"
+
       dorsale/flyboy/task_comment:
         progress: "Progression"
         description: "Description"

data/features/step_definitions/flyboy_tasks_steps.rb

@@ -93,12 +93,12 @@ When(/^I snooze this task$/) do
 end
 
 When(/^I filter tasks by done$/) do
-  select "Fermé"
+  select "Terminée"
   find(".filters [type=submit]:last-child").click
 end
 
 When(/^I filter tasks by undone$/) do
-  select "Ouvert"
+  select "Non terminé"
   find(".filters [type=submit]:last-child").click
 end
 

data/lib/dorsale/version.rb

@@ -1,3 +1,3 @@
 module Dorsale
-  VERSION = "3.7.4"
+  VERSION = "3.7.5"
 end

data/spec/controllers/dorsale/flyboy/tasks_controller_spec.rb

@@ -58,13 +58,13 @@ describe Dorsale::Flyboy::TasksController, type: :controller do
       end
 
       it 'should filter by status closed' do
-        cookies["filters"] = {'fb_status' => "closed"}.to_json
+        cookies["filters"] = {'fb_state' => "done"}.to_json
         get :index
         expect(assigns(:tasks).to_a).to eq [@task1]
       end
 
       it 'should filter by status opened' do
-        cookies["filters"] = {'fb_status' => "opened"}.to_json
+        cookies["filters"] = {'fb_state' => "undone"}.to_json
         get :index
         expect(assigns(:tasks).to_a).to eq [@task2]
       end

data/spec/models/dorsale/flyboy/task_spec.rb

@@ -89,7 +89,7 @@ describe Dorsale::Flyboy::Task do
   end # describe "reminders"
 
   describe "scopes" do
-    it "should return delayed unfinished tasks" do
+    it "should return delayed undone tasks" do
       task = create(:flyboy_task, owner: @user1, term: Time.zone.now.to_date+1)
       task_1 = create(:flyboy_task, owner: @user1, term: Time.zone.now.to_date-1, done: true)
       task_2 = create(:flyboy_task, owner: @user1, term: Time.zone.now.to_date-1, done: false)
@@ -99,7 +99,7 @@ describe Dorsale::Flyboy::Task do
       expect(tasks).to contain_exactly(task_2, task_4)
     end
 
-    it "should return today unfinished tasks" do
+    it "should return today undone tasks" do
       task = create(:flyboy_task, owner: @user1, term: Time.zone.now.to_date+1)
       task_1 = create(:flyboy_task, owner: @user1, term: Time.zone.now.to_date, done: true)
       task_2 = create(:flyboy_task, owner: @user1, term: Time.zone.now.to_date, done: false)
@@ -107,7 +107,7 @@ describe Dorsale::Flyboy::Task do
       expect(tasks).to contain_exactly(task_2)
     end
 
-    it "should return tomorrow unfinished tasks" do
+    it "should return tomorrow undone tasks" do
       task = create(:flyboy_task, owner: @user1, term: Time.zone.now.to_date)
       task_1 = create(:flyboy_task, owner: @user1, term: Date.tomorrow, done: true)
       task_2 = create(:flyboy_task, owner: @user1, term: Date.tomorrow, done: false)
@@ -115,7 +115,7 @@ describe Dorsale::Flyboy::Task do
       expect(tasks).to contain_exactly(task_2)
     end
 
-    it "should return this week unfinished tasks" do
+    it "should return this week undone tasks" do
       Timecop.freeze(2015, 5, 21, 12, 0, 0)
       task = create(:flyboy_task, owner: @user1, term: Time.zone.now.to_date-7, done: false)
       task_1 = create(:flyboy_task, owner: @user1, term: Time.zone.now.to_date+2, done: true)
@@ -126,7 +126,7 @@ describe Dorsale::Flyboy::Task do
       expect(tasks).to contain_exactly(task_2, task_3)
     end
 
-    it "should return next week unfinished tasks" do
+    it "should return next week undone tasks" do
       Timecop.freeze(2015, 5, 21)
       task = create(:flyboy_task, owner: @user1, term: Time.zone.now.to_date, done: false)
       task_1 = create(:flyboy_task, owner: @user1, term: Time.zone.now.to_date+7, done: true)
@@ -137,4 +137,67 @@ describe Dorsale::Flyboy::Task do
       expect(tasks).to contain_exactly(task_2, task_3)
     end
   end # describe "scopes"
+
+  describe "states" do
+    # L’affichage de la couleur de la tâche dépend de son achèvement:
+    # Si date jour < date relance alors noir
+    let(:task_ontime) {
+      create(:flyboy_task,
+        :reminder_type => "custom",
+        :reminder_date => Time.zone.now.to_date + 1.day,
+        :term          => Time.zone.now.to_date + 3.days,
+        :done          => false,
+      )
+    }
+
+    it "should return :ontime" do
+      expect(task_ontime.state).to eq "ontime"
+      expect(described_class.ontime).to eq [task_ontime]
+    end
+
+    # Si date relance <= date jour
+    let(:task_onwarning) {
+      create(:flyboy_task,
+        :reminder_type => "custom",
+        :reminder_date => Time.zone.now.to_date,
+        :term          => Time.zone.now.to_date + 3.days,
+        :done          => false,
+      )
+    }
+
+    it "should return :onwarning" do
+      expect(task_onwarning.state).to eq "onwarning"
+      expect(described_class.onwarning).to eq [task_onwarning]
+    end
+
+    # Si date butoir <= date jour alors rouge
+    let(:task_onalert) {
+      create(:flyboy_task,
+        :reminder_type => "custom",
+        :reminder_date => Time.zone.now.to_date - 3.days,
+        :term          => Time.zone.now.to_date,
+        :done          => false,
+      )
+    }
+
+    it "should return :onalert" do
+      expect(task_onalert.state).to eq "onalert"
+      expect(described_class.onalert).to eq [task_onalert]
+    end
+
+    # Si action faite alors vert
+    let(:task_done) {
+      create(:flyboy_task,
+        :reminder_type => "custom",
+        :reminder_date => Time.zone.now.to_date - 3.days,
+        :term          => Time.zone.now.to_date - 1.day,
+        :done          => true,
+      )
+    }
+
+    it "should return :done" do
+      expect(task_done.state).to eq "done"
+      expect(described_class.done).to eq [task_done]
+    end
+  end # describe "states"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dorsale
 version: !ruby/object:Gem::Version
-  version: 3.7.4
+  version: 3.7.5
 platform: ruby
 authors:
 - agilidée
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-15 00:00:00.000000000 Z
+date: 2017-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -558,7 +558,7 @@ files:
 - app/filters/dorsale/customer_vault/small_data/filter_strategy_by_activity_type.rb
 - app/filters/dorsale/expense_gun/small_data/filter_for_expenses.rb
 - app/filters/dorsale/flyboy/small_data/filter_for_tasks.rb
-- app/filters/dorsale/flyboy/small_data/filter_strategy_by_done.rb
+- app/filters/dorsale/flyboy/small_data/filter_strategy_by_task_state.rb
 - app/helpers/dh.rb
 - app/helpers/dorsale/alexandrie/attachments_helper.rb
 - app/helpers/dorsale/all_helpers.rb
@@ -642,6 +642,7 @@ files:
 - app/services/dorsale/flyboy/task/snoozer.rb
 - app/services/dorsale/service.rb
 - app/services/dorsale/tag_list_for_model.rb
+- app/sorters/dorsale/flyboy/task_comments_sorter.rb
 - app/uploaders/dorsale/alexandrie/file_uploader.rb
 - app/uploaders/dorsale/application_uploader.rb
 - app/uploaders/dorsale/avatar_uploader.rb
@@ -767,7 +768,9 @@ files:
 - app/views/dorsale/expense_gun/expenses/new.html.slim
 - app/views/dorsale/expense_gun/expenses/show.html.slim
 - app/views/dorsale/flyboy/_filters.html.slim
+- app/views/dorsale/flyboy/task_comments/_form.html.slim
 - app/views/dorsale/flyboy/task_comments/_list.html.slim
+- app/views/dorsale/flyboy/task_comments/_task_comment.html.slim
 - app/views/dorsale/flyboy/task_mailer/new_task.html.slim
 - app/views/dorsale/flyboy/task_mailer/term_email.html.slim
 - app/views/dorsale/flyboy/tasks/_context.html.slim
@@ -950,7 +953,6 @@ files:
 - spec/factories/flyboy_tasks.rb
 - spec/files/avatar.png
 - spec/files/pdf.pdf
-- spec/helpers/dorsale/flyboy/application_helper_spec.rb
 - spec/mailers/user_mailer.rb
 - spec/models/dorsale/address_spec.rb
 - spec/models/dorsale/alexandrie/attachment_spec.rb
@@ -1021,7 +1023,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Modular ERP made with Ruby on Rails
@@ -1058,7 +1060,6 @@ test_files:
 - spec/factories/flyboy_tasks.rb
 - spec/files/avatar.png
 - spec/files/pdf.pdf
-- spec/helpers/dorsale/flyboy/application_helper_spec.rb
 - spec/mailers/user_mailer.rb
 - spec/models/dorsale/address_spec.rb
 - spec/models/dorsale/alexandrie/attachment_spec.rb

data/app/filters/dorsale/flyboy/small_data/filter_strategy_by_done.rb

@@ -1,6 +0,0 @@
-class Dorsale::Flyboy::SmallData::FilterStrategyByDone < ::Agilibox::SmallData::FilterStrategy
-  def apply(query, value)
-    value = (value == "closed")
-    query.where(done: value)
-  end
-end

data/spec/helpers/dorsale/flyboy/application_helper_spec.rb

@@ -1,27 +0,0 @@
-require 'rails_helper'
-
-describe Dorsale::Flyboy::ApplicationHelper, type: :helper do
-  describe '#task_color' do
-    # L’affichage de la couleur de la tâche dépend de son achèvement:
-    # Si date jour < date relance alors noir
-    it 'should return .ontime' do
-      task = create(:flyboy_task, reminder_type: "custom", reminder_date: Time.zone.now.to_date + 1.day, term: Time.zone.now.to_date + 3.days, done: false)
-      expect(task_color(task)).to eq('ontime')
-    end
-    # Si date relance < date jour < date butoir alors orange
-    it 'should return .onwarning' do
-      task = create(:flyboy_task, reminder_type: "custom", reminder_date: Time.zone.now.to_date - 1.day, term: Time.zone.now.to_date + 3.days, done: false)
-      expect(task_color(task)).to eq('onwarning')
-    end
-    # Si date butoir < date jour alors rouge
-    it 'should return .onalert' do
-      task = create(:flyboy_task, reminder_type: "custom", reminder_date: Time.zone.now.to_date - 3.days, term: Time.zone.now.to_date - 1.day, done: false)
-      expect(task_color(task)).to eq('onalert')
-    end
-    # Si action faite alors vert
-    it 'should return .finished' do
-      task = create(:flyboy_task, reminder_type: "custom", reminder_date: Time.zone.now.to_date - 3.days, term: Time.zone.now.to_date - 1.day, done: true )
-      expect(task_color(task)).to eq('finished')
-    end
-  end
-end