Change: (refs #183) change to display 'grade-index'

Sakuten · Sep 12, 2018 · 4ae4c32 · 4ae4c32
1 parent a848777
commit 4ae4c32
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/api/routes/api.py b/api/routes/api.py
@@ -443,7 +443,8 @@ def public_id_generator(lottery, kind):
     for kind in whole_results.keys():
         for lottery in lotteries:
             public_ids = list(public_id_generator(lottery, kind))
-            result = {'classroom_id': lottery.classroom_id,
+            cl = Classroom.query.get(lottery.classroom_id)
+            result = {'classroom': f'{cl.grade}-{cl.get_classroom_name()}',
                       'winners': public_ids}
             whole_results[kind].append(result)
     data = {'kinds': [], 'horizontal': 3}

diff --git a/api/templates/results.html b/api/templates/results.html
@@ -44,13 +44,13 @@
     </style>
   <body>
     {% for kind in kinds %}
-          class: {{ lottery['classroom_id'] }}
     <div class="outer-container">
       <div class="kind">
         For: {{ kind['kind'] }}
       </div>
         {% for lottery in kind['lotteries'] %}
           <div class="classroom">
+            class: {{ lottery['classroom'] }}
           {% for row in range(lottery['winners']|length // horizontal +1) %}
             <div class="row">
               <ul>