Remove unnecessary string outputs

This commit is contained in:
gregoirenovel 2017-04-06 16:33:53 +02:00
parent 8d9cdf8e33
commit aaaed328fb
9 changed files with 25 additions and 25 deletions

View file

@ -3,15 +3,15 @@
%li{class: @draft_class} %li{class: @draft_class}
%a{:href => "#{url_for :admin_procedures_draft}"} %a{:href => "#{url_for :admin_procedures_draft}"}
%h5.text-primary %h5.text-primary
= "Brouillons" Brouillons
%li{class: @active_class} %li{class: @active_class}
%a{:href => "#{url_for :admin_procedures}"} %a{:href => "#{url_for :admin_procedures}"}
%h5.text-success %h5.text-success
= "Actives" Actives
%li{class: @archived_class} %li{class: @archived_class}
%a{:href => "#{url_for :admin_procedures_archived}"} %a{:href => "#{url_for :admin_procedures_archived}"}
%h5{style: 'color: black'} %h5{style: 'color: black'}
= "Archivées" Archivées
%br %br

View file

@ -29,7 +29,7 @@
= form_tag admin_procedure_archive_path(procedure_id: @facade.procedure.id, archive: !@facade.procedure.archived?), method: :put, style:'float: right; margin-top: 10px' do = form_tag admin_procedure_archive_path(procedure_id: @facade.procedure.id, archive: !@facade.procedure.archived?), method: :put, style:'float: right; margin-top: 10px' do
%button#archive.btn.btn-small.btn-default.text-info{type: :button} %button#archive.btn.btn-small.btn-default.text-info{type: :button}
%i.fa.fa-eraser %i.fa.fa-eraser
= 'Archiver' Archiver
#confirm #confirm
%button#valid.btn.btn-small.btn-success{type: :submit} %button#valid.btn.btn-small.btn-success{type: :submit}
%i.fa.fa-check %i.fa.fa-check

View file

@ -10,7 +10,7 @@
- if !@current_gestionnaire && ["draft", "updated", "replied", "initiated"].include?(@facade.dossier.state) - if !@current_gestionnaire && ["draft", "updated", "replied", "initiated"].include?(@facade.dossier.state)
%a#add_siret.action{href: users_dossier_add_siret_path(dossier_id: @facade.dossier.id)} %a#add_siret.action{href: users_dossier_add_siret_path(dossier_id: @facade.dossier.id)}
.col-lg-4.col-md-4.col-sm-4.col-xs-4.action .col-lg-4.col-md-4.col-sm-4.col-xs-4.action
= "Renseigner un SIRET" Renseigner un SIRET
- unless @facade.entreprise.nil? - unless @facade.entreprise.nil?
.default_data_block .default_data_block

View file

@ -43,10 +43,10 @@
- if @facade.dossier.mandataire_social && gestionnaire_signed_in? - if @facade.dossier.mandataire_social && gestionnaire_signed_in?
.mandataire_social.text-success.center .mandataire_social.text-success.center
%br %br
= "Il est probable que le soumissionnaire du dossier soit un des mandataire social de l'entreprise (" Il est probable que le soumissionnaire du dossier soit un des mandataire social de l'entreprise (
%b %b
= "#{@facade.dossier.user.given_name} #{@facade.dossier.user.family_name}" = "#{@facade.dossier.user.given_name} #{@facade.dossier.user.family_name}"
= ")" )
.row .row
- if @facade.procedure.cerfa_flag? || @facade.dossier.types_de_piece_justificative.count > 0 - if @facade.procedure.cerfa_flag? || @facade.dossier.types_de_piece_justificative.count > 0
.col-xs-12 .col-xs-12
@ -70,7 +70,7 @@
= link_to "", class: "historique", "data-toggle" => "modal", "data-target" => "#PJmodal", :type => "button", "data-modal_title" => 'formulaires', "data-modal_index" => 'cerfa' do = link_to "", class: "historique", "data-toggle" => "modal", "data-target" => "#PJmodal", :type => "button", "data-modal_title" => 'formulaires', "data-modal_index" => 'cerfa' do
%span.fa.fa-clock-o %span.fa.fa-clock-o
- else - else
= 'Pièce non fournie' Pièce non fournie
.row .row
.col-xs-12 .col-xs-12
- @facade.types_de_pieces_justificatives.each do |type_de_piece_justificative| - @facade.types_de_pieces_justificatives.each do |type_de_piece_justificative|
@ -90,7 +90,7 @@
= link_to "", class: "historique", "data-toggle" => "modal", "data-target" => "#PJmodal", :type => "button", "data-modal_title" => 'formulaires', "data-modal_index" => "type_de_pj_#{type_de_piece_justificative.id}" do = link_to "", class: "historique", "data-toggle" => "modal", "data-target" => "#PJmodal", :type => "button", "data-modal_title" => 'formulaires', "data-modal_index" => "type_de_pj_#{type_de_piece_justificative.id}" do
%span.fa.fa-clock-o %span.fa.fa-clock-o
- else - else
= 'Pièce non fournie' Pièce non fournie
- unless @facade.dossier.read_only? - unless @facade.dossier.read_only?
- if user_signed_in? && (@facade.dossier.owner?(current_user.email) || @facade.dossier.invite_by_user?(current_user.email)) - if user_signed_in? && (@facade.dossier.owner?(current_user.email) || @facade.dossier.invite_by_user?(current_user.email))

View file

@ -3,7 +3,7 @@
- if @facade.procedure.cerfa_flag? - if @facade.procedure.cerfa_flag?
%tr{id: "piece_justificative_0"} %tr{id: "piece_justificative_0"}
%th.col-lg-6 %th.col-lg-6
= 'Formulaire' Formulaire
%td.col-lg-6.col-md-6.col-sm-6.col-xs-6 %td.col-lg-6.col-md-6.col-sm-6.col-xs-6
- if @facade.dossier.cerfa_available? - if @facade.dossier.cerfa_available?
%a{ href: "#{@facade.dossier.cerfa.last.content_url}", target: '_blank' } Consulter %a{ href: "#{@facade.dossier.cerfa.last.content_url}", target: '_blank' } Consulter
@ -16,7 +16,7 @@
"data-modal_title" => 'formulaires', "data-modal_title" => 'formulaires',
"data-modal_index" => 'cerfa'} "data-modal_index" => 'cerfa'}
- else - else
= 'Pièce non fournie' Pièce non fournie
- @facade.dossier.types_de_piece_justificative.order('order_place ASC').each do |type_de_piece_justificative| - @facade.dossier.types_de_piece_justificative.order('order_place ASC').each do |type_de_piece_justificative|
%tr{ id: "piece_justificative_#{type_de_piece_justificative.id}" } %tr{ id: "piece_justificative_#{type_de_piece_justificative.id}" }

View file

@ -11,19 +11,19 @@
#procedure_list #procedure_list
%a{:href => "#{url_for :admin_procedures_draft}", id: "draft-procedures"} %a{:href => "#{url_for :admin_procedures_draft}", id: "draft-procedures"}
.procedure_list_element{class: @draft_class} .procedure_list_element{class: @draft_class}
= "Brouillons" Brouillons
.badge.progress-bar-default .badge.progress-bar-default
= current_administrateur.procedures.where(published: false, archived: false).count = current_administrateur.procedures.where(published: false, archived: false).count
%a{:href => "#{url_for :admin_procedures}", id: "active-procedures"} %a{:href => "#{url_for :admin_procedures}", id: "active-procedures"}
.procedure_list_element{class: @active_class} .procedure_list_element{class: @active_class}
= "Actives" Actives
.badge.progress-bar-success .badge.progress-bar-success
= current_administrateur.procedures.where(published: true, archived: false).count = current_administrateur.procedures.where(published: true, archived: false).count
%a{:href => "#{url_for :admin_procedures_archived}", id: "archived-procedures"} %a{:href => "#{url_for :admin_procedures_archived}", id: "archived-procedures"}
.procedure_list_element{class: @archived_class} .procedure_list_element{class: @archived_class}
= "Archivées" Archivées
.badge.progress-bar-purple .badge.progress-bar-purple
= current_administrateur.procedures.where(archived: true).count = current_administrateur.procedures.where(archived: true).count

View file

@ -1,13 +1,13 @@
%div#first-block %div#first-block
.dossiers-en-cours .dossiers-en-cours
.count= @facade_data_view.total_dossier_follow .count= @facade_data_view.total_dossier_follow
.text= "SUIVIS" .text SUIVIS
.nouveaux-dossiers .nouveaux-dossiers
.count= @facade_data_view.total_new_dossier .count= @facade_data_view.total_new_dossier
.text= "NOUVEAUX" .text NOUVEAUX
.nouvelles-notifications .nouvelles-notifications
.count= @facade_data_view.dossiers_with_unread_notifications.count .count= @facade_data_view.dossiers_with_unread_notifications.count
.text= "MODIFIÉS" .text MODIFIÉS
%div#action-block %div#action-block
@ -34,7 +34,7 @@
= procedure[:unread_notifications] = procedure[:unread_notifications]
#notifications_list.hidden #notifications_list.hidden
- if @facade_data_view.dossiers_with_unread_notifications.empty? - if @facade_data_view.dossiers_with_unread_notifications.empty?
.no-notification= "Aucune notification pour le moment." .no-notification Aucune notification pour le moment.
- else - else
- @facade_data_view.dossiers_with_unread_notifications.each do |dossier| - @facade_data_view.dossiers_with_unread_notifications.each do |dossier|
= link_to backoffice_dossier_path(dossier.id) do = link_to backoffice_dossier_path(dossier.id) do

View file

@ -3,7 +3,7 @@
= dossier_count = current_user.dossiers.count = dossier_count = current_user.dossiers.count
= ("Dossier".pluralize(dossier_count)).upcase = ("Dossier".pluralize(dossier_count)).upcase
%br %br
= "EN COURS" EN COURS
%div#action-block %div#action-block
@ -13,31 +13,31 @@
- unless current_user.dossiers.count == 0 - unless current_user.dossiers.count == 0
%a{:href => "#{url_for users_dossiers_path(liste: 'brouillon')}", 'data-toggle' => :tooltip, title: 'Les dossiers jamais proposés à la relecture.'} %a{:href => "#{url_for users_dossiers_path(liste: 'brouillon')}", 'data-toggle' => :tooltip, title: 'Les dossiers jamais proposés à la relecture.'}
.procedure_list_element{ class: @dossiers_list_facade.brouillon_class, id: 'brouillon' } .procedure_list_element{ class: @dossiers_list_facade.brouillon_class, id: 'brouillon' }
= "Brouillons" Brouillons
.badge.progress-bar-default .badge.progress-bar-default
= @dossiers_list_facade.brouillon_total = @dossiers_list_facade.brouillon_total
%a{:href => "#{url_for users_dossiers_path(liste: 'a_traiter')}", 'data-toggle' => :tooltip, title: 'Les dossiers qui requièrent une action de votre part.'} %a{:href => "#{url_for users_dossiers_path(liste: 'a_traiter')}", 'data-toggle' => :tooltip, title: 'Les dossiers qui requièrent une action de votre part.'}
.procedure_list_element{ class: @dossiers_list_facade.en_construction_class, id: 'a_traiter' } .procedure_list_element{ class: @dossiers_list_facade.en_construction_class, id: 'a_traiter' }
= "En construction" En construction
.badge.progress-bar-danger .badge.progress-bar-danger
= @dossiers_list_facade.en_construction_total = @dossiers_list_facade.en_construction_total
%a{:href => "#{url_for users_dossiers_path(liste: 'en_instruction')}", 'data-toggle' => :tooltip, title: 'Les dossiers en cours d\'examen par l\'administration compétante.'} %a{:href => "#{url_for users_dossiers_path(liste: 'en_instruction')}", 'data-toggle' => :tooltip, title: 'Les dossiers en cours d\'examen par l\'administration compétante.'}
.procedure_list_element{ class: @dossiers_list_facade.en_instruction_class, id: 'en_instruction' } .procedure_list_element{ class: @dossiers_list_facade.en_instruction_class, id: 'en_instruction' }
= "En instruction" En instruction
.badge.progress-bar-default .badge.progress-bar-default
= @dossiers_list_facade.en_instruction_total = @dossiers_list_facade.en_instruction_total
%a{:href => "#{url_for users_dossiers_path(liste: 'termine')}", 'data-toggle' => :tooltip, title: 'Les dossiers cloturés qui peuvent être "Accepté", "Refusé" ou "Sans suite".'} %a{:href => "#{url_for users_dossiers_path(liste: 'termine')}", 'data-toggle' => :tooltip, title: 'Les dossiers cloturés qui peuvent être "Accepté", "Refusé" ou "Sans suite".'}
.procedure_list_element{ class: @dossiers_list_facade.termine_class, id: 'termine' } .procedure_list_element{ class: @dossiers_list_facade.termine_class, id: 'termine' }
= "Terminé" Terminé
.badge.progress-bar-success .badge.progress-bar-success
= @dossiers_list_facade.termine_total = @dossiers_list_facade.termine_total
%a{:href => "#{url_for users_dossiers_path(liste: 'invite')}"} %a{:href => "#{url_for users_dossiers_path(liste: 'invite')}"}
.procedure_list_element{ class: @dossiers_list_facade.invite_class, id: 'invite' } .procedure_list_element{ class: @dossiers_list_facade.invite_class, id: 'invite' }
= "Invitation" Invitation
.badge.progress-bar-warning .badge.progress-bar-warning
= @dossiers_list_facade.invite_total = @dossiers_list_facade.invite_total
.split-hr-left .split-hr-left

View file

@ -1,7 +1,7 @@
.row#carto_page .row#carto_page
.col-lg-12.col-md-12.col-sm-12.col-xs-12 .col-lg-12.col-md-12.col-sm-12.col-xs-12
%h2 %h2
= 'Localisation' Localisation
%h4.text-primary %h4.text-primary
Positionnez-vous et dessinez sur la carte la zone d'action de votre demande. Positionnez-vous et dessinez sur la carte la zone d'action de votre demande.
%br %br