flyboy 0.0.5 → 0.0.6

data/app/controllers/flyboy/application_controller.rb

@@ -6,9 +6,6 @@ module Flyboy
 
     layout "application"
 
-    helper Dorsale::FormHelper
-    helper Dorsale::ContextHelper
-    helper Dorsale::TextHelper
-    helper Dorsale::ButtonHelper
+    helper Dorsale::AllHelpers
   end
 end

data/app/controllers/flyboy/goals_controller.rb

@@ -82,7 +82,7 @@ module Flyboy
       if @goal.open!
         flash[:success] = t("messages.goals.open_ok")
       else
-      findlash[:danger] = t("messages.goals.open_error")
+        flash[:danger] = t("messages.goals.open_error")
       end
 
       redirect_to @goal

data/app/controllers/flyboy/task_comments_controller.rb

@@ -3,14 +3,12 @@
 module Flyboy
   class TaskCommentsController < ::Flyboy::ApplicationController
     def create
-      @task    ||= Task.find(params[:task_id])
-      @comment ||= @task.comments.new(task_comment_params)
-
-      @comment.date = DateTime.now # TODO : Export to model ?
+      @task         ||= Task.find(params[:task_id])
+      @task_comment ||= @task.comments.new(task_comment_params)
 
       authorize! :update, @task
 
-      if @comment.save
+      if @task_comment.save
         redirect_to @task
       else
         render "flyboy/tasks/show"

data/app/controllers/flyboy/tasks_controller.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Flyboy
   class TasksController < ::Flyboy::ApplicationController
     handles_sortable_columns
@@ -74,7 +72,8 @@ module Flyboy
       authorize! :create, @task
 
       if @task.save
-        redirect_to @task, notice: t("messages.tasks.create_ok")
+        flash[:success] = t("messages.tasks.create_ok")
+        redirect_to @task
       else
         render :new
       end
@@ -84,7 +83,8 @@ module Flyboy
       authorize! :update, @task
 
       if @task.update_attributes(task_params)
-        redirect_to @task, notice: t("messages.tasks.update_ok")
+        flash[:success] = t("messages.tasks.update_ok")
+        redirect_to @task
       else
         render :edit
       end
@@ -93,25 +93,42 @@ module Flyboy
     def destroy
       authorize! :delete, @task
 
-      @task.destroy
+      if @task.destroy
+        flash[:success] = t("messages.tasks.delete_ok")
+      else
+        flash[:danger] = t("messages.tasks.delete_error")
+      end
+
       redirect_to tasks_url
     end
 
     def complete
       authorize! :complete, @task
 
-      comment = @task.comments.create(
-        :progress     => 100,
-        :description  =>"Marquée comme terminée.",
-        :date         => DateTime.now
+      @task_comment ||= @task.comments.new(
+        :progress    => 100,
+        :description => t("messages.tasks.complete_ok"),
+        :date        => DateTime.now
       )
 
+      if @task_comment.save
+        flash[:success] = t("messages.tasks.complete_ok")
+      else
+        flash[:danger] = t("messages.tasks.complete_error")
+      end
+
       redirect_to request.referer
     end
 
     def snooze
       @task.snooze
-      @task.save
+
+      if @task.save
+        flash[:success] = t("messages.tasks.snooze_ok")
+      else
+        flash[:danger] = t("messages.tasks.snooze_error")
+      end
+
       redirect_to tasks_url
     end
 

data/app/models/flyboy/task_comment.rb

@@ -8,6 +8,11 @@ module Flyboy
 
     default_scope -> { order("created_at DESC") }
 
+    def initialize(*args)
+      super
+      self.date = Time.now if date.nil?
+    end
+
     after_create :update_task_progress
 
     def update_task_progress

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

@@ -10,7 +10,5 @@
         option value="open" selected=(@filters.get("status") == "open") = "Ouvert"
         option value="closed" selected=(@filters.get("status") == "closed") = "Fermé"
 
-
-    a#reset-filter href="#" class="btn" Mettre à zéro
-
-    button type="submit" class="btn"  id="apply-filter" Appliquer
+    = filter_reset_button
+    = filter_submit_button

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

@@ -1,4 +1,4 @@
-= simple_form_for [@task, (@comment || @task.comments.new)] do |f|
+= simple_form_for [@task, (@task_comment || @task.comments.new)] do |f|
   table.default
     thead
       tr
@@ -22,6 +22,9 @@
             = progress_bar percentage: comment.progress, label: true
 
           td.desription
-            = comment.description
+            p: small
+              span.date = comment.date
+
+            p = text2html comment.description
 
           td.actions

data/config/locales/fr.yml

@@ -17,22 +17,15 @@ fr:
     tasks:
       create_ok: "La tâche a bien été créée"
       update_ok: "La tâche a bien été modifiée"
+      delete_ok: "La tâche a bien été supprimée"
+      delete_eror: "Impossible de supprimer la tâche"
+      snooze_ok: "La tâche a bien été reportée"
+      snooze_eror: "Impossible de reporter la tâche"
+      complete_ok: "La tâche a été marquée comme terminée"
+      complete_eror: "Impossible de terminer la tâche"
+
   actions:
-    label: "Actions"
-    back: "Retour"
-    cancel: "Annuler"
-    confirm: "Etes vous certains ?"
-    delete: "Supprimer"
-    edit: "Modifier"
-    save: "Sauver"
-    new: "Nouveau"
-    create: "Créer"
-    update: "Modifier"
-    details: "Détails"
-    open: "Ouvrir"
-    close: "Fermer"
     complete: "Fait"
-    snooze: "Reporter"
 
     goals:
       new_task: "Nouvelle Tâche"

data/lib/flyboy/version.rb

@@ -1,3 +1,3 @@
 module Flyboy
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/controllers/flyboy/task_comments_controller_spec.rb

@@ -3,13 +3,13 @@ require "spec_helper"
 describe Flyboy::TaskCommentsController, type: :controller do
   routes { Flyboy::Engine.routes }
 
-  let(:task)     { FactoryGirl.create(:flyboy_task) }
-  let(:comment)  { FactoryGirl.create(:flyboy_task_comment, task: task) }
+  let(:task)         { FactoryGirl.create(:flyboy_task) }
+  let(:task_comment) { FactoryGirl.create(:flyboy_task_comment, task: task) }
 
-  describe '#create' do
-    it "should create the comment" do
-      post :create, task_id: task.id, task_comment: comment.attributes
-      expect(assigns(:comment).persisted?).to be true
+  describe "#create" do
+    it "should create the task_comment" do
+      post :create, task_id: task.id, task_comment: task_comment.attributes
+      expect(assigns(:task_comment).persisted?).to be true
     end
   end
 

data/spec/dummy/app/assets/javascripts/application.js

@@ -1,2 +1,3 @@
 //= require jquery
 //= require jquery_ujs
+//= require dorsale/all

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

@@ -8,6 +8,10 @@
 </head>
 <body>
 
+<div id="flash" class="container">
+  <%= render "dorsale/flash" %>
+</div>
+
 <div class="container">
   <%= yield %>
 </div>