DGNum/demarches-normaliennes
13
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:
Xavier J 2016-12-07 17:03:45 +01:00
commit d282d7bbea
9 changed files with 21 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/assets/stylesheets/dossier_show.scss
View file

@ -117,7 +117,6 @@
.depositaire-label { .depositaire-label {
font-weight: bold; font-weight: bold;
text-align: end; text-align: end;
margin-left: -20px;
} }
.depositaire-info { .depositaire-info {
} }

5
app/assets/stylesheets/left_pannel.scss
View file

@ -23,9 +23,10 @@
padding: 5px; padding: 5px;
} }
} }
.en-cours { .dossiers-en-cours, .en-cours {
margin-top: 20px; margin-top: 20px;
font-size: 25px; }
.dossiers-en-cours, .nouveaux-dossiers, .en-cours {
line-height: initial; line-height: initial;
text-align: center; text-align: center;
margin-right: 10px; margin-right: 10px;

2
app/assets/stylesheets/navbar.scss
View file

@ -114,7 +114,7 @@
#download-menu { #download-menu {
.btn-sm { .btn-sm {
color: #000000; color: #000000;
font-size: 18px; font-size: 14px;
} }
} }

4
app/controllers/commentaires_controller.rb
View file

@ -36,7 +36,11 @@ class CommentairesController < ApplicationController
@commentaire.body = params['texte_commentaire'] @commentaire.body = params['texte_commentaire']
saved = false saved = false
unless @commentaire.body.blank? && @commentaire.piece_justificative.nil?
saved = @commentaire.save unless flash.alert saved = @commentaire.save unless flash.alert
else
flash.alert = "Veuillez rédiger un message ou ajouter une pièce jointe."
end
if is_gestionnaire? if is_gestionnaire?
unless current_gestionnaire.follow? @commentaire.dossier unless current_gestionnaire.follow? @commentaire.dossier

2
app/views/dossiers/_dossier_show.html.haml
View file

@ -56,8 +56,8 @@
%div.col-lg-8.col-md-8.title-no-expanse %div.col-lg-8.col-md-8.title-no-expanse
%div.carret-right %div.carret-right
INFORMATIONS ENTREPRISE / ASSOCIATION INFORMATIONS ENTREPRISE / ASSOCIATION
%div.col-lg-4.col-md-4.action
%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)}
%div.col-lg-4.col-md-4.action
= "Renseigner un SIRET" = "Renseigner un SIRET"
- unless @facade.entreprise.nil? - unless @facade.entreprise.nil?

2
app/views/dossiers/_edit_dossier.html.haml
View file

@ -1,5 +1,5 @@
- 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))
%div.col-lg-2.col-md-2.action
%a#maj_infos.action{href: "/users/dossiers/#{@facade.dossier.id}/description"} %a#maj_infos.action{href: "/users/dossiers/#{@facade.dossier.id}/description"}
%div.col-lg-2.col-md-2.action
= "éditer".upcase = "éditer".upcase

2
app/views/dossiers/_infos_dossier.html.haml
View file

@ -102,8 +102,8 @@
- if @facade.procedure.cerfa_flag? || @facade.dossier.types_de_piece_justificative.size > 0 - if @facade.procedure.cerfa_flag? || @facade.dossier.types_de_piece_justificative.size > 0
.row .row
.col-lg-4.col-md-4 .col-lg-4.col-md-4
.col-lg-4.col-md-4.action
%a#maj_pj.action{"data-target" => "#UploadPJmodal", "data-toggle" => "modal", :type => "button"} %a#maj_pj.action{"data-target" => "#UploadPJmodal", "data-toggle" => "modal", :type => "button"}
.col-lg-4.col-md-4.action
Modifier les documents Modifier les documents
%br %br
= render partial: 'users/recapitulatif/modal_upload_pj' = render partial: 'users/recapitulatif/modal_upload_pj'

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

@ -1,8 +1,8 @@
%div#first-block %div#first-block
%div %div.dossiers-en-cours
= @facade_data_view.total_dossier = @facade_data_view.total_dossier
DOSSIERS EN COURS DOSSIERS EN COURS
%div %div.nouveaux-dossiers
= @facade_data_view.total_new_dossier = @facade_data_view.total_new_dossier
NOUVEAUX DOSSIERS NOUVEAUX DOSSIERS

8
app/views/users/description/champs/_header_private_section.html.haml
View file

@ -1,10 +1,4 @@
.row .row
.col-lg-12.col-md-12 .col-lg-2.col-md-2
.row.title-row
.col-md-4.col-lg-4.split-hr
.col-md-4.col-lg-4.dossier-title= libelle
.col-md-4.col-lg-4.split-hr
.row
.col-lg-4.col-md-4
.col-lg-8.col-md-8 .col-lg-8.col-md-8
= render partial: 'users/description/champs/render_list_champs', locals: {champs: champs, order_place: order_place} = render partial: 'users/description/champs/render_list_champs', locals: {champs: champs, order_place: order_place}