Commit a8c32923 by Bridger Maxwell

Rotated the profile graph labels, so the all fit

--HG--
branch : bridger-dev
parent 1b6f0588
...@@ -134,8 +134,9 @@ def profile(request): ...@@ -134,8 +134,9 @@ def profile(request):
summary = "{0:.0%} ({1}/{2})".format( percentage, points_earned, points_possible ) summary = "{0:.0%} ({1}/{2})".format( percentage, points_earned, points_possible )
summary = "Homework {0} - {1}".format(i + 1, summary) summary = "Homework {0} - {1}".format(i + 1, summary)
label = "HW {0:02d}".format(i + 1)
homework_percentages.append( {'percentage': percentage, 'summary': summary} ) homework_percentages.append( {'percentage': percentage, 'summary': summary, 'label' : label} )
homework_total, homework_dropped_indices = totalWithDrops(homework_percentages, 2) homework_total, homework_dropped_indices = totalWithDrops(homework_percentages, 2)
#Figure the lab scores #Figure the lab scores
...@@ -156,7 +157,9 @@ def profile(request): ...@@ -156,7 +157,9 @@ def profile(request):
summary = "{0:.0%} ({1}/{2})".format( percentage, points_earned, points_possible ) summary = "{0:.0%} ({1}/{2})".format( percentage, points_earned, points_possible )
summary = "Lab {0} - {1}".format(i + 1, summary) summary = "Lab {0} - {1}".format(i + 1, summary)
lab_percentages.append( {'percentage': percentage, 'summary': summary} ) label = "Lab {0:02d}".format(i + 1)
lab_percentages.append( {'percentage': percentage, 'summary': summary, 'label' : label} )
lab_total, lab_dropped_indices = totalWithDrops(lab_percentages, 2) lab_total, lab_dropped_indices = totalWithDrops(lab_percentages, 2)
...@@ -171,7 +174,7 @@ def profile(request): ...@@ -171,7 +174,7 @@ def profile(request):
midterm_score = (random.randrange(50, 150), 150) midterm_score = (random.randrange(50, 150), 150)
midterm_percentage = midterm_score[0] / float(midterm_score[1]) midterm_percentage = midterm_score[0] / float(midterm_score[1])
final_score = (random.randrange(100, 250), 300) final_score = (random.randrange(100, 300), 300)
final_percentage = final_score[0] / float(final_score[1]) final_percentage = final_score[0] / float(final_score[1])
...@@ -181,6 +184,7 @@ def profile(request): ...@@ -181,6 +184,7 @@ def profile(request):
'subscores' : homework_percentages, 'subscores' : homework_percentages,
'dropped_indices' : homework_dropped_indices, 'dropped_indices' : homework_dropped_indices,
'totalscore' : {'score' : homework_total, 'summary' : "Homework Average - {0:.0%}".format(homework_total)}, 'totalscore' : {'score' : homework_total, 'summary' : "Homework Average - {0:.0%}".format(homework_total)},
'totallabel' : 'HW Avg',
'weight' : 0.15, 'weight' : 0.15,
}, },
{ {
...@@ -188,16 +192,19 @@ def profile(request): ...@@ -188,16 +192,19 @@ def profile(request):
'subscores' : lab_percentages, 'subscores' : lab_percentages,
'dropped_indices' : lab_dropped_indices, 'dropped_indices' : lab_dropped_indices,
'totalscore' : {'score' : lab_total, 'summary' : "Lab Average - {0:.0%}".format(lab_total)}, 'totalscore' : {'score' : lab_total, 'summary' : "Lab Average - {0:.0%}".format(lab_total)},
'totallabel' : 'Lab Avg',
'weight' : 0.15, 'weight' : 0.15,
}, },
{ {
'category': 'Midterm', 'category': 'Midterm',
'totalscore' : {'score' : midterm_percentage, 'summary' : "Midterm - {0:.0%} ({1}/{2})".format(midterm_percentage, midterm_score[0], midterm_score[1])}, 'totalscore' : {'score' : midterm_percentage, 'summary' : "Midterm - {0:.0%} ({1}/{2})".format(midterm_percentage, midterm_score[0], midterm_score[1])},
'totallabel' : 'Midterm',
'weight' : 0.30, 'weight' : 0.30,
}, },
{ {
'category': 'Final', 'category': 'Final',
'totalscore' : {'score' : final_percentage, 'summary' : "Final - {0:.0%} ({1}/{2})".format(final_percentage, final_score[0], final_score[1])}, 'totalscore' : {'score' : final_percentage, 'summary' : "Final - {0:.0%} ({1}/{2})".format(final_percentage, final_score[0], final_score[1])},
'totallabel' : 'Final',
'weight' : 0.40, 'weight' : 0.40,
} }
] ]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment