flyboy 0.0.6 → 1.0.0

data/app/models/flyboy/task.rb

@@ -52,12 +52,20 @@ module Flyboy
 
     def self.to_csv(options = {})
       CSV.generate(options) do |csv|
-        csv << ['Action', 'Titre', 'Echéance']
+        csv << [
+          "Dossier",
+          "Avancement dossier",
+          "Tâche",
+          "Avancement tâche",
+          "Echéance"
+        ]
 
         all.each do |task|
           csv << [
             task.goal.title,
+            "#{task.goal.progress} %",
             task.title,
+            "#{task.progress} %",
             I18n.l(task.term),
           ]
         end

data/app/pdfs/flyboy/roadmap.rb

@@ -2,6 +2,9 @@
 
 module Flyboy
   class Roadmap < Prawn::Document
+    include ActionView::Helpers::NumberHelper
+    include Dorsale::TextHelper
+
     attr_accessor :tasks
 
     def initialize(tasks)
@@ -17,12 +20,20 @@ module Flyboy
     end
 
     def display_tasks(tasks)
-      display = [['Action', 'Titre', 'Echéance']]
+      display = [[
+        "Dossier",
+        "Avancement dossier",
+        "Tâche",
+        "Avancement tâche",
+        "Echéance"
+      ]]
 
       tasks.each do |t|
         display << [
           t.goal.title,
+          percentage(t.goal.progress),
           t.title,
+          percentage(t.progress),
           I18n.l(t.term)
         ]
       end
@@ -30,5 +41,6 @@ module Flyboy
       table display
       move_down(10)
     end
+
   end
 end

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

@@ -1,4 +1,7 @@
 .actions
+  - if can?(:read, @task.goal)
+    = dorsale_button goal_path(@task.goal), text: "Retour au dossier", icon: :tasks
+
   - if can?(:update, @task)
     = update_button edit_task_path(@task)
 
@@ -7,4 +10,3 @@
 
   - if can?(:complete, @task)
     = complete_button complete_task_path(@task)
-

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

@@ -2,13 +2,13 @@ table.default
   thead
     tr
       - if nested
-        th = Flyboy::Task.human_attribute_name(:progress)
         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 = Flyboy::Task.human_attribute_name(:progress)
         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(:term),  column: "term"
 
       th = t("actions.label")
@@ -23,15 +23,15 @@ table.default
             - else
               = task.goal.title
 
-        td.task_progress
-          = progress_bar percentage: task.progress, label: true
-
         td.title
           - if can?(:read, task)
             = link_to task.title, task_path(task)
           - else
             = task.title
 
+        td.task_progress
+          = progress_bar percentage: task.progress, label: true
+
         td.term
           = l task.term
 

data/app/views/flyboy/tasks/index.xls.erb

@@ -7,14 +7,18 @@
   <Worksheet ss:Name="Sheet1">
     <Table>
       <Row>
-        <Cell><Data ss:Type="String">Action</Data></Cell>
-        <Cell><Data ss:Type="String">Titre</Data></Cell>
+        <Cell><Data ss:Type="String">Dossier</Data></Cell>
+        <Cell><Data ss:Type="String">Avancement dossier</Data></Cell>
+        <Cell><Data ss:Type="String">Tâche</Data></Cell>
+        <Cell><Data ss:Type="String">Avancement tâche</Data></Cell>
         <Cell><Data ss:Type="String">Echéance</Data></Cell>
       </Row>
     <% @tasks.each do |task| %>
       <Row>
         <Cell><Data ss:Type="String"><%= task.goal.title %></Data></Cell>
+        <Cell><Data ss:Type="String"><%= percentage(task.goal.progress) %></Data></Cell>
         <Cell><Data ss:Type="String"><%= task.title %></Data></Cell>
+        <Cell><Data ss:Type="String"><%= percentage(task.progress) %></Data></Cell>
         <Cell><Data ss:Type="String"><%= l task.term %></Data></Cell>
       </Row>
     <% end %>

data/config/locales/fr.yml

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

data/lib/flyboy/version.rb

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