- add decorator for procedure and procedures

- add link to procedure on admin procedures list

app/controllers/admin/procedures_controller.rb

@@ -2,16 +2,18 @@ class Admin::ProceduresController < AdminController
 
   def index
     @procedures = current_administrateur.procedures.where(archived: false)
-                      .paginate(:page => params[:page])
+                      .paginate(:page => params[:page]).decorate
+    @page = 'active'
   end
 
   def archived
-    @procedures_archived = current_administrateur.procedures.where(archived: true)
-                               .paginate(:page => params[:page])
+    @procedures = current_administrateur.procedures.where(archived: true)
+                     .paginate(:page => params[:page]).decorate
+    @page = 'archived'
   end
 
   def show
-    @procedure = current_administrateur.procedures.find(params[:id])
+    @procedure = current_administrateur.procedures.find(params[:id]).decorate
     @types_de_champ = @procedure.types_de_champ.order(:order_place)
     @types_de_piece_justificative = @procedure.types_de_piece_justificative.order(:libelle)
 

app/controllers/demo_controller.rb

@@ -1,7 +1,7 @@
 class DemoController < ApplicationController
 
   def index
-    @procedures = Procedure.where(archived: false).order('libelle ASC')
+    @procedures = Procedure.where(archived: false).order('libelle ASC').decorate
   end
 
 end

app/decorators/procedure_decorator.rb

@@ -0,0 +1,7 @@
+class ProcedureDecorator < Draper::Decorator
+  delegate_all
+
+  def lien
+    h.new_users_dossiers_url(procedure_id: id)
+  end
+end

app/decorators/procedures_decorator.rb

@@ -0,0 +1,4 @@
+class ProceduresDecorator < Draper::CollectionDecorator
+  delegate :current_page, :per_page, :offset, :total_entries, :total_pages
+
+end

app/views/admin/procedures/_list.html.haml

@@ -0,0 +1,14 @@
+%table.table
+  %thead
+    %th#id ID
+    %th#libelle Libellé
+    %th#lien Lien
+  - @procedures.each do |procedure|
+    %tr
+      %td.col-md-1.col-lg-1= procedure.id
+      %td.col-md-6.col-lg-6
+        = link_to(procedure.libelle, "/admin/procedures/#{procedure.id}")
+      %td= link_to procedure.lien, procedure.lien
+
+.pagination
+  = will_paginate @procedures, renderer: BootstrapPagination::Rails

app/views/admin/procedures/_onglets.html.haml

@@ -1,11 +1,11 @@
 #onglets
   %ul.nav.nav-tabs
-    %li{class: "#{'active' unless @procedures.nil?  }"}
+    %li{class: "#{'active' if @page == 'active'  }"}
       %a{:href => "#{url_for :admin_procedures}"}
         %h5.text-success
           = "Actives"
 
-    %li{class: "#{'active' unless @procedures_archived.nil?  }"}
+    %li{class: "#{'active' if @page == 'archived'  }"}
       %a{:href => "#{url_for :admin_procedures_archived}"}
         %h5{style: 'color: black'}
           ="Archivées"

app/views/admin/procedures/archived.html.haml

@@ -4,19 +4,4 @@
 
 = render partial: 'onglets'
 
-%table.table
-  %thead
-    %th#id ID
-    %th#libelle Libellé
-    %th#organisation Organisation
-    %th#direction Direction
-  - @procedures_archived.each do |procedure|
-    %tr
-      %td= procedure.id
-      %td
-        = link_to(procedure.libelle, "/admin/procedures/#{procedure.id}")
-      %td= procedure.organisation
-      %td= procedure.direction
-
-.pagination
-  = will_paginate @procedures_archived, renderer: BootstrapPagination::Rails
+= render partial: 'list'

app/views/admin/procedures/index.html.haml

@@ -4,19 +4,4 @@
 
 = render partial: 'onglets'
 
-%table.table
-  %thead
-    %th#id ID
-    %th#libelle Libellé
-    %th#organisation Organisation
-    %th#direction Direction
-  - @procedures.each do |procedure|
-    %tr
-      %td= procedure.id
-      %td
-        = link_to(procedure.libelle, "/admin/procedures/#{procedure.id}")
-      %td= procedure.organisation
-      %td= procedure.direction
-
-.pagination
-  = will_paginate @procedures, renderer: BootstrapPagination::Rails
+= render partial: 'list'

app/views/admin/procedures/show.html.haml

@@ -30,4 +30,4 @@
     = render partial: 'informations', locals: {f: f}
     = f.submit 'Editer', class: 'btn btn-success', style: 'float:right'
 %br
-%br
+%br

app/views/demo/index.html.haml

@@ -13,7 +13,7 @@
       %td
         = procedure.id
       %td.col-md-4.col-lg-4
-        = link_to procedure.libelle, "/users/dossiers/new?procedure_id=#{procedure.id}"
+        = link_to procedure.libelle, procedure.lien
       %td
         = procedure.description
       %td.col-md-3.col-lg-3