DGNum/demarches-normaliennes
15
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop_v2' of github.com:sgmap/tps into develop_v2

Browse source
This commit is contained in:
JC 2016-11-28 15:22:11 +01:00
commit ceff884751
7 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/assets/javascripts/dossiers_list_filter.js
View file

@ -35,6 +35,11 @@ function framed_id(event) {
function filter_framed_show(event) {
dom_object = $(framed_id(event));
dom_object.css('top', (event.pageY + 7) + 'px');
dom_object.css('left', (event.pageX + 7) + 'px');
var offset = $('#main-container').offset();
var y = event.pageY - offset.top;
var x = event.pageX - offset.left;
dom_object.css('top', (y + 7) + 'px');
dom_object.css('left', (x + 7) + 'px');
}

1
app/controllers/backoffice/dossiers/procedure_controller.rb
View file

@ -4,7 +4,6 @@ class Backoffice::Dossiers::ProcedureController < Backoffice::DossiersListContro
super
dossiers_list_facade.service.filter_procedure! params[:id]
@facade_data_view = dossiers_list_facade
render 'backoffice/dossiers/index'

4
app/controllers/backoffice/dossiers_controller.rb
View file

@ -3,8 +3,8 @@ class Backoffice::DossiersController < Backoffice::DossiersListController
def index
super
dossiers_list_facade.service.filter_procedure_reset!
@facade_data_view = dossiers_list_facade
procedure = dossiers_list_facade.gestionnaire_procedures_name_and_id_list.first
redirect_to backoffice_dossiers_procedure_path(id: procedure[:id])
end
def show

5
app/services/dossiers_list_gestionnaire_service.rb
View file

@ -17,7 +17,7 @@ class DossiersListGestionnaireService
end
def self.dossiers_liste_libelle
['nouveaux', 'suivi', 'a_traiter', 'fige' ,'deposes', 'a_instruire', 'termine', 'all_state']
['nouveaux', 'suivi', 'a_traiter', 'fige', 'deposes', 'a_instruire', 'termine', 'all_state']
end
def all_state
@ -25,7 +25,7 @@ class DossiersListGestionnaireService
end
def suivi
@suivi ||= @current_devise_profil.dossiers_follow
@suivi ||= @current_devise_profil.dossiers_follow.merge(all_state)
end
def nouveaux
@ -188,4 +188,5 @@ class DossiersListGestionnaireService
def current_preference_smart_listing_page
@current_devise_profil.preference_smart_listing_page
end
end

4
app/views/backoffice/dossiers/_list.html.haml
View file

@ -7,8 +7,8 @@
-else
= smart_listing.sortable preference.libelle, preference.table_attr
- if @dossiers_list_facade.active_filter? preference
%i.filter.fa.fa-filter{style: "cursor: pointer; margin-left:3px; font-size: 1.1em; color:#{(preference.filter.blank? ? 'grey' : 'orange')}", id: "filter_"+preference.table_attr.sub('.', '_')}
= render partial: 'backoffice/dossiers/filter_framed', locals:{preference: preference, filter_framed_id: "framed_filter_"+preference.table_attr.sub('.', '_')}
%i.filter.fa.fa-filter{style: "cursor: pointer; margin-left:3px; font-size: 1.1em; color:#{(preference.filter.blank? ? 'grey' : 'orange')}", id: "filter_#{smart_listing.name.to_s}_#{preference.table_attr.sub('.', '_')}"}
= render partial: 'backoffice/dossiers/filter_framed', locals:{preference: preference, filter_framed_id: "framed_filter_#{smart_listing.name.to_s}_#{preference.table_attr.sub('.', '_')}"}
%th.col-md-1.col-lg-1.center Actions
%th.col-md-1.col-lg-1.center Abonnés

4
app/views/backoffice/dossiers/index.js.erb
View file

@ -1,4 +1,6 @@
<%= smart_listing_update :dossiers %>
<%= smart_listing_update :new_dossiers %>
<%= smart_listing_update :follow_dossiers %>
<%= smart_listing_update :all_state_dossiers %>
filters_init();
link_init();

1
app/views/layouts/left_panels/_left_panel_backoffice_dossierscontroller_index.html.haml
View file

@ -20,7 +20,6 @@
%div#infos-block
#procedure_list
%div.procedure_list_element
=link_to "Tous les dossiers", backoffice_dossiers_path
- @dossiers_list_facade.gestionnaire_procedures_name_and_id_list.each do |procedure|
%div.procedure_list_element
=link_to truncate(procedure[:libelle], {length: 50}), backoffice_dossiers_procedure_path(procedure[:id]),{title: procedure[:libelle]}