Merge branch 'master' of https://gitlab.discs.ateneo.edu/totallynotkai/widgets-fekk

WidgetFEKK/Assignments/templates/Assignments/assignment_list.html

@@ -17,7 +17,7 @@
                     <div class = "block">
                          <h2> {{a.course}} </h2>
                          <li>
-                              <a href="{% url 'Assignments:assignment-detail' a.pk%}"> {{a.name}} </a>
+                              <a href="/assignment/{{ a.pk }}/details"> {{a.name}} </a>
                          </li>
                     </div>
                {%endfor%}

WidgetFEKK/Assignments/urls.py

@@ -3,9 +3,8 @@ from . import views
 from .views import MainView, AssignmentListView, AssignmentDetailView
 
 urlpatterns = [
-    path('', MainView.as_view(), name='index'),
-    path('assignment', AssignmentListView.as_view(), name='assignment-list'),
-    path('assignment/<int:pk>/details', AssignmentDetailView.as_view(), name ='assignment-detail'),
+    path('', MainView.as_view(), name='assignments'),
+    path('assignments', AssignmentListView.as_view(), name='assignment-list'),
 ]
 
 app_name = 'Assignments'
\ No newline at end of file

WidgetFEKK/Assignments/views.py

@@ -10,7 +10,7 @@ class MainView(View):
           def get(self, request):
                course = Course.objects.all().order_by('course_code')
                assignment = Assignment.objects.all().order_by('course')   
-               return render(request, 'index.html',{
+               return render(request, 'assignments.html',{
                     'course': course,
                     'assignment': assignment,
                     })

WidgetFEKK/WidgetFEKK/urls.py

@@ -17,6 +17,7 @@ from django.contrib import admin
 from django.urls import path, include
 import Announcements.views as Announcements_views
 import Forum.views as Forum_views
+from Assignments.views import AssignmentDetailView
 
 urlpatterns = [
     path('admin/', admin.site.urls),
@@ -26,4 +27,7 @@ urlpatterns = [
     path('announcements/', include('Announcements.urls', namespace="Announcements")),
     path('announcements/<int:announcement_id>/details', Announcements_views.details, name='announcement_details'),
     path('assignments/', include('Assignments.urls', namespace="Assignments")),
+    path('assignment/<int:pk>/details', AssignmentDetailView.as_view(), name ='assignment-detail'),
+
+
 ]