User and Gestionnaire sort list

app/controllers/backoffice/dossiers_controller.rb

@@ -1,9 +1,16 @@
 class Backoffice::DossiersController < ApplicationController
+  include SmartListing::Helper::ControllerExtensions
+  helper SmartListing::Helper
+
   before_action :authenticate_gestionnaire!
 
   def index
     @liste = params[:liste] || 'a_traiter'
-    @dossiers = dossiers_to_display.paginate(page: params[:page]).decorate
+
+    @dossiers = smart_listing_create :dossiers,
+                                     dossiers_to_display,
+                                     partial: "backoffice/dossiers/list",
+                                     array: true
 
     total_dossiers_per_state
   end

app/controllers/users/dossiers_controller.rb

@@ -1,4 +1,7 @@
 class Users::DossiersController < UsersController
+  include SmartListing::Helper::ControllerExtensions
+  helper SmartListing::Helper
+
   before_action :authenticate_user!
   before_action :check_siret, only: :create
 
@@ -6,7 +9,11 @@ class Users::DossiersController < UsersController
     order = 'DESC'
 
     @liste = params[:liste] || 'a_traiter'
-    @dossiers = dossiers_to_display.paginate(page: params[:page]).decorate
+
+    @dossiers = smart_listing_create :dossiers,
+                                     dossiers_to_display,
+                                     partial: "users/dossiers/list",
+                                     array: true
 
     total_dossiers_per_state
   end
@@ -116,12 +123,12 @@ class Users::DossiersController < UsersController
   end
 
   def waiting_for_user
-    @en_attente_class = (@liste == 'a_traiter' ? 'active' : '')
+    @a_traiter_class = (@liste == 'a_traiter' ? 'active' : '')
     @waiting_for_user ||= current_user.dossiers.waiting_for_user 'DESC'
   end
 
   def waiting_for_gestionnaire
-    @a_traiter_class = (@liste == 'en_attente' ? 'active' : '')
+    @en_attente_class = (@liste == 'en_attente' ? 'active' : '')
     @waiting_for_gestionnaire ||= current_user.dossiers.waiting_for_gestionnaire 'DESC'
   end
 

app/views/backoffice/dossiers/_list.html.haml

@@ -1,16 +1,22 @@
-%table.table
+- unless smart_listing.empty?
-  %thead.row
+  %table.table
-    %th.col-md-4.col-lg-4 Procédure
+    %thead.row
-    %th.col-md-4.col-lg-4 Dossier
+      %th.col-md-4.col-lg-4= smart_listing.sortable 'Procédure', 'procedure.libelle'
-    %th.col-md-2.col-lg-2 État
+      %th.col-md-4.col-lg-4= smart_listing.sortable 'Dossier', 'nom_projet'
-    %th.col-md-2.col-lg-2 Date de mise à jour
+      %th.col-md-2.col-lg-2= smart_listing.sortable 'État', 'state'
-  - @dossiers.each do |dossier|
+      %th.col-md-2.col-lg-2= smart_listing.sortable 'Date de mise à jour', 'updated_at'
-    %tr
-      %td= dossier.procedure.libelle
-      %td
-        = link_to(dossier.nom_projet, "/backoffice/dossiers/#{dossier.id}")
-      %td= dossier.display_state
-      %td= dossier.last_update
 
-.pagination
+    - @dossiers.each do |dossier|
-  = will_paginate @dossiers, renderer: BootstrapPagination::Rails
+      - dossier = dossier.decorate
+      %tr
+        %td= dossier.procedure.libelle
+        %td
+          = link_to(dossier.nom_projet, "/backoffice/dossiers/#{dossier.id}")
+        %td= dossier.display_state
+        %td= dossier.last_update
+
+  = smart_listing.paginate
+  = smart_listing.pagination_per_page_links
+- else
+  %h4.center
+    Aucun dossier

app/views/backoffice/dossiers/index.html.haml

@@ -1,4 +1,4 @@
 #backoffice_index
   = render partial: 'onglets'
 
-  = render partial: 'list'
+  = smart_listing_render :dossiers

app/views/backoffice/dossiers/index.js.erb

@@ -0,0 +1 @@
+<%= smart_listing_update :dossiers %>

app/views/users/dossiers/_list.html.haml

@@ -1,17 +1,23 @@
-%table.table
+- unless smart_listing.empty?
-  %thead
+  %table.table
-    %th Procédure
+    %thead
-    %th Nom du Projet
+      %th.col-md-4.col-lg-4= smart_listing.sortable 'Procédure', 'procedure.libelle'
-    %th Etat
+      %th.col-md-4.col-lg-4= smart_listing.sortable 'Nom du Projet', 'nom_projet'
-    %th Mise à jour
+      %th.col-md-2.col-lg-2= smart_listing.sortable 'État', 'state'
-  - @dossiers.each do |dossier|
+      %th.col-md-2.col-lg-2= smart_listing.sortable 'Date de mise à jour', 'updated_at'
-    %tr
+    - @dossiers.each do |dossier|
-      %td
+      - dossier = dossier.decorate
-        = dossier.procedure.libelle
+      %tr
-      %td
+        %td
-        = link_to(dossier.nom_projet, users_dossier_recapitulatif_path(dossier))
+          = dossier.procedure.libelle
-      %td{id: "dossier_#{dossier.id}_state"}= dossier.display_state
+        %td
-      %td= dossier.last_update
+          = link_to(dossier.nom_projet, users_dossier_recapitulatif_path(dossier))
+        %td{id: "dossier_#{dossier.id}_state"}= dossier.display_state
+        %td= dossier.last_update
 
-.pagination
+  = smart_listing.paginate
-  = will_paginate @dossiers, renderer: BootstrapPagination::Rails
+  = smart_listing.pagination_per_page_links
+
+- else
+  %h4.center
+    Aucun dossier

app/views/users/dossiers/_onglets.html.haml

@@ -3,21 +3,21 @@
 
 #onglets
   %ul.nav.nav-tabs
-    %li{ class: (@dossiers.active_class_a_traiter(@liste) unless @dossiers.nil?) }
+    %li{ class: @a_traiter_class }
       %a{:href => "#{url_for users_dossiers_path(liste: 'a_traiter')}"}
         %h5.text-danger
           = "À traiter "
           .badge.progress-bar-danger
             = @dossiers_a_traiter_total
 
-    %li{ class: (@dossiers.active_class_en_attente(@liste) unless @dossiers.nil?) }
+    %li{ class: @en_attente_class }
       %a{:href => "#{url_for users_dossiers_path(liste: 'en_attente')}"}
         %h5.text-info
           ="En attente "
           .badge.progress-bar-info
             = @dossiers_en_attente_total
 
-    %li{ class: (@dossiers.active_class_termine(@liste) unless @dossiers.nil?) }
+    %li{ class:  @termine_class }
       %a{:href => "#{url_for users_dossiers_path(liste: 'termine')}"}
         %h5.text-success
           = "Terminé"

app/views/users/dossiers/index.html.haml

@@ -1,4 +1,4 @@
 #users_index
   = render partial: 'onglets'
 
-  = render partial: 'list'
+  = smart_listing_render :dossiers

app/views/users/dossiers/index.js.erb

@@ -0,0 +1 @@
+<%= smart_listing_update :dossiers %>