Skip to content

Commit 4d4cc05

Browse files
committed
merge?
2 parents 0270c04 + 8127704 commit 4d4cc05

File tree

6 files changed

+509
-135
lines changed

6 files changed

+509
-135
lines changed

hknweb/studentservices/admin.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ class ToursAdmin(admin.ModelAdmin):
4545

4646
@admin.register(CourseGuideNode)
4747
class CourseGuideNodeAdmin(admin.ModelAdmin):
48-
fields = ["name", "is_title", "x_0", "y_0"]
49-
list_display = ["name", "is_title", "x_0", "y_0"]
48+
fields = ["name", "is_title", "x_0", "y_0", "level"]
49+
list_display = ["name", "is_title", "x_0", "y_0", "level"]
5050

5151

5252
@admin.register(CourseGuideAdjacencyList)
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Generated by Django 4.2.17 on 2025-04-26 05:02
2+
3+
from django.db import migrations, models
4+
5+
6+
class Migration(migrations.Migration):
7+
dependencies = [
8+
("studentservices", "0011_coursedescription"),
9+
]
10+
11+
operations = [
12+
migrations.AddField(
13+
model_name="courseguidenode",
14+
name="level",
15+
field=models.IntegerField(default=0),
16+
),
17+
]

hknweb/studentservices/models.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ class CourseGuideNode(models.Model):
5151
is_title = models.BooleanField(default=False)
5252
x_0 = models.IntegerField(blank=True, null=True)
5353
y_0 = models.IntegerField(blank=True, null=True)
54+
level = models.IntegerField(blank=False, default=0)
5455

5556
def __str__(self):
5657
return self.name

hknweb/studentservices/views.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,8 @@ def course_guide(request):
101101
g.name for g in CourseGuideGroup.objects.all() if g.name != "Core"
102102
]
103103

104-
return render(request, "studentservices/course_guide.html", context=context)
104+
# Edited for the test
105+
return render(request, "studentservices/course_guide_test.html", context=context)
105106

106107

107108
@allow_public_access
@@ -140,8 +141,7 @@ def course_guide_data(request):
140141
if node.name in node_groups
141142
]
142143

143-
course_surveys_link = reverse("course_surveys:index")
144-
link_template = f"{course_surveys_link}?search_by=courses&search_value="
144+
link_template = "course_description/"
145145
nodes = []
146146
for n in CourseGuideNode.objects.all():
147147
if n.name not in node_groups:
@@ -155,6 +155,7 @@ def course_guide_data(request):
155155
"fx": n.x_0,
156156
"fy": n.y_0,
157157
"fixed": ((n.x_0 is not None) and (n.y_0 is not None)),
158+
"level": n.level,
158159
}
159160

160161
nodes.append(node_attrs)
@@ -180,6 +181,7 @@ def course_guide_data(request):
180181

181182
@allow_public_access
182183
def course_description(request, slug):
184+
print(request, slug)
183185
course = get_object_or_404(CourseDescription, slug=slug)
184186
context = {
185187
"course": course,

0 commit comments

Comments
 (0)