Need to add carto body, and then private field block

This commit is contained in:
JC 2016-12-06 15:17:18 +01:00
parent e367cba480
commit f0d5b5dc25
6 changed files with 88 additions and 16 deletions

View file

@ -89,7 +89,19 @@
}
#carto {
}
#dossier, #infos, #carto {
#pieces-jointes {
.piece-row {
margin: 20px;
.piece-label {
text-align: right;
font-weight: bold;
}
}
.modal-title {
color: #000000;
}
}
#dossier, #pieces-jointes, #infos, #carto {
.body {
padding: 0 20px 0 20px;
color: #000000;
@ -125,6 +137,9 @@
.margin-top-40 {
margin-top: 40px;
}
.margin-bot-40 {
margin-bottom: 40px;
}
}
}
}

View file

@ -1,11 +0,0 @@
%div.col-lg-2.col-md-2.action
- unless @facade.dossier.read_only?
- if user_signed_in? && (@facade.dossier.owner?(current_user.email) || @facade.dossier.invite_by_user?(current_user.email))
- if @facade.procedure.cerfa_flag? || @facade.dossier.types_de_piece_justificative.size > 0
%a#maj_pj.btn.btn-success{"data-target" => "#UploadPJmodal",
"data-toggle" => "modal",
:type => "button",
style: 'margin-bottom: 15px; margin-top: -30px'}
Modifier les documents
%br
= render partial: 'users/recapitulatif/modal_upload_pj'

View file

@ -0,0 +1,11 @@
- unless @facade.dossier.read_only?
- if user_signed_in? && (@facade.dossier.owner?(current_user.email) || @facade.dossier.invite_by_user?(current_user.email))
- if @facade.procedure.cerfa_flag? || @facade.dossier.types_de_piece_justificative.size > 0
%div.col-lg-4.col-md-4.action
%a#maj_pj.action{"data-target" => "#UploadPJmodal",
"data-toggle" => "modal",
:type => "button",
style: 'margin-bottom: 15px; margin-top: -30px'}
Modifier les documents
%br
= render partial: 'users/recapitulatif/modal_upload_pj'

View file

@ -1,5 +1,5 @@
%div.row
.col-lg-12.col-md-12
.col-lg-12.col-md-12.margin-bot-40
- if @facade.procedure.for_individual?
.row.title-row
%div.col-md-4.col-lg-4.split-hr
@ -43,8 +43,6 @@
%div.col-md-5.col-lg-5.depositaire-info
- unless champ.decorate.value.blank?
= champ.decorate.value.html_safe
.row.margin-top-40
.col-lg-12.col-md-12= render partial: '/dossiers/pieces_justificatives'
- if @facade.dossier.mandataire_social && gestionnaire_signed_in?
.mandataire_social.text-success.center

View file

@ -0,0 +1,49 @@
#pieces_justificatives
.row
- if @facade.procedure.cerfa_flag?
.col-md-12.col-lg-12#piece_justificative_0
.row.piece-row
.col-md-6.col-lg-6.piece-label= 'Formulaire'
.col-md-1.col-lg-1.comments-off= "-"
.col-md-5.col-lg-5
- if @facade.dossier.cerfa_available?
%a{ href: "#{@facade.dossier.cerfa.last.content_url}", target: '_blank' } Consulter
%span{style:'margin-left:12px'}
\-
%a.btn.fa.fa-timer{style:'color: black; padding-top: 0',
"data-target" => "#PJmodal",
"data-toggle" => "modal",
:type => "button",
"data-modal_title" => 'formulaires',
"data-modal_index" => 'cerfa'}
- else
= 'Pièce non fournie'
.row
.col-md-12.col-lg-12
- @facade.dossier.types_de_piece_justificative.order('order_place ASC').each do |type_de_piece_justificative|
.row.piece-row
.col-md-12.col-lg-12{ id: "piece_justificative_#{type_de_piece_justificative.id}" }
.row
.col-md-6.col-lg-6= type_de_piece_justificative.libelle
.col-md-6.col-lg-6
- if type_de_piece_justificative.api_entreprise
%span.text-success Nous l'avons récupéré pour vous.
- elsif !(@pj = @facade.dossier.retrieve_last_piece_justificative_by_type(type_de_piece_justificative.id)).nil?
-#- if user_signed_in?
-# = 'Pièce fournie'
-#- elsif gestionnaire_signed_in?
%a{ href: "#{@pj.content_url}", target: '_blank' } Consulter
%span{style:'margin-left:12px'}
\-
%a.btn.fa.fa-timer{style:'color: black; padding-top: 0',
"data-target" => "#PJmodal",
"data-toggle" => "modal",
:type => "button",
"data-modal_title" => type_de_piece_justificative.libelle,
"data-modal_index" => "type_de_pj_#{type_de_piece_justificative.id}"}
- else
= 'Pièce non fournie'
-#- if gestionnaire_signed_in?
= render partial: '/dossiers/modal_historique'

View file

@ -80,7 +80,17 @@
= render partial: '/dossiers/edit_dossier'
%div.body
= render partial: '/dossiers/infos_dossier'
= render partial: '/dossiers/actions'
.default_data_block
%div.row.show-block#pieces-jointes
%div.header
%div.col-lg-8.col-md-8.title
%div.carret-right
%div.carret-down
= "pièces du dossier".upcase
= render partial: '/dossiers/edit_pieces_jointes'
%div.body
= render partial: '/dossiers/infos_pieces_jointes'
- if @facade.dossier.procedure.module_api_carto.use_api_carto
.default_data_block