X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=html_generator.py;h=01cecdea7e521c48fb844db5c52e40865d27f58b;hb=46ee43c674ec697c6740b9a531ac0b6ff3a05ab4;hp=e337f08034dce8d0f0a19909b2c78351f96d1bdd;hpb=976a9bcf02620a4b1aec2a180efbc0d741a212ce;p=turbot-web

diff --git a/html_generator.py b/html_generator.py
index e337f08..01cecde 100644
--- a/html_generator.py
+++ b/html_generator.py
@@ -198,7 +198,7 @@ def overview(hunt, puzzles, rounds):
             if puzzle['status'] == 'solved':
                 expanding += ['      <tr class=\'solved\';>\n',
                 '        <td>{}</td>\n'.format(link(website + filename_from_name(puzzle['name']) + ".html", puzzle['name']+meta)),
-                '        <td>{}</td>\n'.format(puzzle['solution']),
+                '        <td>{}</td>\n'.format(", ".join(puzzle['solution']).upper()),
                 '      </tr>\n']
             else:
                 expanding += ['      <tr class=\'unsolved\';>\n',
@@ -266,9 +266,9 @@ def round_overview(hunt, rnd, puzzles):
              '                        <td>{}</td>\n'.format(elink(puzzle.get('url',''), 'Puzzle')),
              '                        <td>{}</td>\n'.format(elink(puzzle['sheet_url'], 'Sheet')),
              '                        <td>{}</td>\n'.format(link(website + filename_from_name(puzzle['name']) + '.html', 'Overview')),
-             '                        <td>{}</td>\n'.format(puzzle['solution']),
+             '                        <td>{}</td>\n'.format(", ".join(puzzle['solution']).upper()),
             # '                        <td></td>\n',
-             '                        <td>{}</td>\n'.format("".join(puzzle.get('tags',[]))),
+             '                        <td>{}</td>\n'.format(", ".join(puzzle.get('tags',[]))),
              '                    </tr>\n']
         else:
             puzzle_list += [ '                    <tr>\n',
@@ -278,7 +278,7 @@ def round_overview(hunt, rnd, puzzles):
              '                        <td>{}</td>\n'.format(link(website + filename_from_name(puzzle['name']) + '.html', 'Overview')),
              '                        <td></td>\n',
             # '                        <td></td>\n',
-             '                        <td>{}</td>\n'.format(" ".join(puzzle.get('tags',[]))),
+             '                        <td>{}</td>\n'.format(", ".join(puzzle.get('tags',[]))),
              '                    </tr>\n']
     end = ['                </tbody>\n',
     '            </table>\n',
@@ -308,7 +308,7 @@ def puzzle_overview(hunt, puzzle):
     else:
         round_url = ''
     if puzzle['status'] == 'solved':
-        solution = puzzle['solution']
+        solution = ", ".join(puzzle['solution']).upper()
         status = 'solved'
     else:
         solution = ""
@@ -337,7 +337,7 @@ def puzzle_overview(hunt, puzzle):
      '        <table class="center">\n',
      '            <tr>\n',
      '                <td>Round(s): {}</td>\n'.format(" ".join(round_url)), #round page on our site
-     '                <td>Tags: {}</td>\n'.format(" ".join(puzzle.get('tags',[]))), #add tags
+     '                <td>Tags: {}</td>\n'.format(", ".join(puzzle.get('tags',[]))), #add tags
      '            </tr>\n',
      '            <tr>\n',
      '                <td>Answer: {}</td>\n'.format(solution),
@@ -410,9 +410,9 @@ def puzzle_lists(hunt, puzzles, filt):
          '                        <td>{}</td>\n'.format(elink(puzzle.get('url',''), 'Puzzle')),
          '                        <td>{}</td>\n'.format(elink(puzzle['sheet_url'], 'Sheet')),
          '                        <td>{}</td>\n'.format(link(website + filename_from_name(puzzle['name']) + '.html', 'Overview')),
-         '                        <td>{}</td>\n'.format(puzzle['solution']),
+         '                        <td>{}</td>\n'.format(", ".join(puzzle['solution']).upper()),
          '                        <td>{}</td>\n'.format(round_url),
-         '                        <td>{}</td>\n'.format("".join(puzzle.get('tags',[]))),
+         '                        <td>{}</td>\n'.format(", ".join(puzzle.get('tags',[]))),
          '                    </tr>\n']
     for puzzle in unsolved_puzzles:
         if puzzle['type'] == 'meta':
@@ -433,7 +433,7 @@ def puzzle_lists(hunt, puzzles, filt):
          '                        <td>{}</td>\n'.format(link(website + filename_from_name(puzzle['name']) + '.html', 'Overview')),
          '                        <td></td>\n',
          '                        <td>{}</td>\n'.format(round_url),
-         '                        <td>{}</td>\n'.format("".join(puzzle.get('tags',[]))),
+         '                        <td>{}</td>\n'.format(", ".join(puzzle.get('tags',[]))),
          '                    </tr>\n']
     end = ['                </tbody>\n',
     '            </table>\n',
@@ -479,9 +479,10 @@ def generate_for_hunt_id(table, hunt_id):
         round_overview(hunt, rnd, puzzles)
         for puzzle in puzzles:
             puzzle_overview(hunt, puzzle)
-            puzzle_lists(hunt, puzzles, "All")
-            puzzle_lists(hunt, puzzles, "Solved")
-            puzzle_lists(hunt, puzzles, "Unsolved")
+    puzzle_lists(hunt, puzzles, "All")
+    puzzle_lists(hunt, puzzles, "Solved")
+    puzzle_lists(hunt, puzzles, "Unsolved")
+            
 
 # Initialize AWS resources to talk to the database
 db = boto3.resource('dynamodb')