Skip to content

Commit 290dcfc

Browse files
committed
fix test
1 parent ad7a466 commit 290dcfc

File tree

2 files changed

+11
-8
lines changed

2 files changed

+11
-8
lines changed

evap/results/exporters.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@ class ResultsExporter(ExcelExporter):
3939
"evaluation": xlwt.easyxf(
4040
"alignment: horiz centre, wrap on, rota 90; borders: left medium, top medium, right medium, bottom medium"
4141
),
42+
"average": xlwt.easyxf(
43+
"alignment: horiz centre, wrap on, rota 90; borders: left medium, top medium, right medium, bottom medium; font: italic on"
44+
),
4245
"total_voters": xlwt.easyxf("alignment: horiz centre; borders: left medium, right medium"),
4346
"evaluation_rate": xlwt.easyxf("alignment: horiz centre; borders: left medium, bottom medium, right medium"),
4447
"evaluation_weight": xlwt.easyxf("alignment: horiz centre; borders: left medium, right medium"),
@@ -203,7 +206,7 @@ def write_headings_and_evaluation_info(
203206
else:
204207
self.write_cell(export_name, "headline")
205208

206-
self.write_cell(_("Average for this question over all evaluations in all published semesters"), "evaluation")
209+
self.write_cell(_("Average for this question over all evaluations in all published semesters"), "average")
207210

208211
for evaluation, __ in evaluations_with_results:
209212
title = evaluation.full_name

evap/results/tests/test_exporters.py

+7-7
Original file line numberDiff line numberDiff line change
@@ -596,7 +596,7 @@ def test_total_average(self):
596596

597597
questionnaire = baker.make(Questionnaire, order=1, type=Questionnaire.Type.TOP)
598598

599-
question = baker.make(Question, type=QuestionType.POSITIVE_LIKERT, questionnaire=questionnaire)
599+
question = baker.make(Question, type=QuestionType.GRADE, questionnaire=questionnaire)
600600

601601
evaluation_1 = baker.make(
602602
Evaluation,
@@ -610,17 +610,17 @@ def test_total_average(self):
610610
Evaluation,
611611
course__programs=[program],
612612
state=Evaluation.State.PUBLISHED,
613-
_participant_count=2,
614-
_voter_count=2,
613+
_participant_count=3,
614+
_voter_count=3,
615615
)
616616

617617
evaluation_1.general_contribution.questionnaires.set([questionnaire])
618618

619-
make_rating_answer_counters(question, evaluation_1.general_contribution)
619+
make_rating_answer_counters(question, evaluation_1.general_contribution, [1, 1, 0, 0, 0])
620620

621621
evaluation_2.general_contribution.questionnaires.set([questionnaire])
622622

623-
make_rating_answer_counters(question, evaluation_2.general_contribution)
623+
make_rating_answer_counters(question, evaluation_2.general_contribution, [1, 2, 0, 0, 0])
624624

625625
cache_results(evaluation_1)
626626
cache_results(evaluation_2)
@@ -642,7 +642,7 @@ def test_total_average(self):
642642
binary_content.seek(0)
643643
workbook = xlrd.open_workbook(file_contents=binary_content.read())
644644

645-
self.assertEqual(
645+
self.assertAlmostEqual(
646646
float(workbook.sheets()[0].row_values(5)[1]),
647647
(float(workbook.sheets()[0].row_values(5)[2]) + float(workbook.sheets()[0].row_values(5)[3])) / 2,
648648
)
@@ -707,7 +707,7 @@ def test_not_all_contributions_are_created_equal(self):
707707
workbook = xlrd.open_workbook(file_contents=binary_content.read())
708708

709709
self.assertEqual(float(workbook.sheets()[0].row_values(8)[1]), float(workbook.sheets()[0].row_values(8)[3]))
710-
self.assertEqual("", workbook.sheets()[0].row_values(8)[2])
710+
self.assertEqual("", workbook.sheets()[0].row_values(8)[2]) # testing empty heading for average
711711

712712
self.assertEqual(
713713
workbook.sheets()[0].row_values(0)[1],

0 commit comments

Comments
 (0)