Skip to content

Commit

Permalink
✨ Le conseiller peut consulter le détail de la réponse dans l'export …
Browse files Browse the repository at this point in the history
…détaillé
  • Loading branch information
cprodhomme authored and etienneCharignon committed Jun 27, 2024
1 parent 23f0f1a commit f749ae2
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 6 deletions.
4 changes: 4 additions & 0 deletions app/models/evenement.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,8 @@ class Evenement < ApplicationRecord
def fin_situation?
nom == 'finSituation'
end

def reponse_intitule
donnees['reponse_intitule'].presence || donnees['reponse']
end
end
2 changes: 1 addition & 1 deletion app/models/restitution/export_cafe_de_la_place.rb
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ def remplie_la_feuille(sheet)
def remplis_la_ligne(sheet, ligne, evenement)
sheet[ligne, 0] = evenement.donnees['question']
sheet[ligne, 1] = evenement.donnees['intitule']
sheet[ligne, 2] = evenement.donnees['reponse']
sheet[ligne, 2] = evenement.reponse_intitule
sheet[ligne, 3] = evenement.donnees['score']
sheet[ligne, 4] = evenement.donnees['score_max']
sheet[ligne, 5] = evenement.donnees['metacompetence']
Expand Down
12 changes: 7 additions & 5 deletions spec/models/restitution/export_cafe_de_la_place_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -33,19 +33,21 @@
donnees: {
question: 'LOdi1',
reponse: 'couverture',
reponse_intitule: nil,
score: 2,
score_max: 2,
intitule: 'De quoi s’agit-il ?',
metacompetence: 'numeratie'
}
intitule_reponse2 = 'Donc, c’est une émission sur les livres. Quel est le nom du livre \
intitule_question2 = 'Donc, c’est une émission sur les livres. Quel est le nom du livre \
dont on parle ?'
create :evenement_reponse,
partie: partie,
donnees: {
intitule: intitule_reponse2,
intitule: intitule_question2,
question: 'LOdi4',
reponse: 'chatMadameCoupin'
reponse: 'chatMadameCoupin',
reponse_intitule: 'Le chat de Mme Coupin'
}

xls = response_service.to_xls
Expand All @@ -62,8 +64,8 @@

question2 = worksheet.row(2)
expect(question2[0]).to eq('LOdi4')
expect(question2[1]).to eq(intitule_reponse2)
expect(question2[2]).to eq('chatMadameCoupin')
expect(question2[1]).to eq(intitule_question2)
expect(question2[2]).to eq('Le chat de Mme Coupin')
expect(question2[3]).to eq(nil)
expect(question2[4]).to eq(nil)
expect(question2[5]).to eq(nil)
Expand Down

0 comments on commit f749ae2

Please sign in to comment.