diff --git a/client/index.html b/client/index.html index 0ad84a1b48c574f1d92763ca3a38f20bd6871116..4d7da1b05382db11951d5bf1a48ad98cd9990a43 100644 --- a/client/index.html +++ b/client/index.html @@ -89,12 +89,13 @@ </div> <template id="tpl-group"> - <div class="card"> - <div class="card-body"> - <h3>Group name</h3> - <ul class="list-group"> - </ul> - </div> + <div class="col-sm-6"> + <div class="card"> + <div class="card-body"> + <h3 class="card-title">Group name</h3> + </div> + <ul class="list-group list-group-flush"></ul> + </div> </div> </template> diff --git a/server/main.py b/server/main.py index 99ec534608cb07d76b7989b4d911c5ef03bf0b14..34c7a86dba061128eb31d2d3d033f9968147f3d6 100755 --- a/server/main.py +++ b/server/main.py @@ -126,12 +126,12 @@ async def forceAllocate(client, message): # send out group notifications for (idx, group) in enumerate(groups): members = [ str( clients[x].name ) for x in group ] + data = { + 'groupID': idx, + 'members': members + } + summary['groups'].append( data ) for student in group: - data = { - 'groupID': idx, - 'members': members - } - summary['groups'].append( data ) await clients[ student ].send_topic( 'allocate', data ) # Send master list to staff