Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
S
Student Allocator
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Falmouth Computing
Student Allocator
Commits
b8b58529
Commit
b8b58529
authored
3 years ago
by
Joseph Walton-Rivers
Browse files
Options
Downloads
Patches
Plain Diff
client group name cleanup
parent
8cef07b2
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Pipeline
#3216
passed
3 years ago
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
client/index.html
+7
-6
7 additions, 6 deletions
client/index.html
server/main.py
+5
-5
5 additions, 5 deletions
server/main.py
with
12 additions
and
11 deletions
client/index.html
+
7
−
6
View file @
b8b58529
...
@@ -89,12 +89,13 @@
...
@@ -89,12 +89,13 @@
</div>
</div>
<template
id=
"tpl-group"
>
<template
id=
"tpl-group"
>
<div
class=
"card"
>
<div
class=
"col-sm-6"
>
<div
class=
"card-body"
>
<div
class=
"card"
>
<h3>
Group name
</h3>
<div
class=
"card-body"
>
<ul
class=
"list-group"
>
<h3
class=
"card-title"
>
Group name
</h3>
</ul>
</div>
</div>
<ul
class=
"list-group list-group-flush"
></ul>
</div>
</div>
</div>
</template>
</template>
...
...
This diff is collapsed.
Click to expand it.
server/main.py
+
5
−
5
View file @
b8b58529
...
@@ -126,12 +126,12 @@ async def forceAllocate(client, message):
...
@@ -126,12 +126,12 @@ async def forceAllocate(client, message):
# send out group notifications
# send out group notifications
for
(
idx
,
group
)
in
enumerate
(
groups
):
for
(
idx
,
group
)
in
enumerate
(
groups
):
members
=
[
str
(
clients
[
x
].
name
)
for
x
in
group
]
members
=
[
str
(
clients
[
x
].
name
)
for
x
in
group
]
data
=
{
'
groupID
'
:
idx
,
'
members
'
:
members
}
summary
[
'
groups
'
].
append
(
data
)
for
student
in
group
:
for
student
in
group
:
data
=
{
'
groupID
'
:
idx
,
'
members
'
:
members
}
summary
[
'
groups
'
].
append
(
data
)
await
clients
[
student
].
send_topic
(
'
allocate
'
,
data
)
await
clients
[
student
].
send_topic
(
'
allocate
'
,
data
)
# Send master list to staff
# Send master list to staff
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment