pannabel/SkyLearn-Test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor fixes and UI update

Browse Source
This commit is contained in:
papi 2023-12-30 22:13:28 +03:00
parent 4b4e235100
commit 4c0577e219
14 changed files with 93 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
accounts/migrations/0016_alter_user_managers.py Normal file
View File

@ -0,0 +1,20 @@
# Generated by Django 4.0.8 on 2023-12-30 19:04
import accounts.models
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('accounts', '0015_alter_user_managers'),
]
operations = [
migrations.AlterModelManagers(
name='user',
managers=[
('objects', accounts.models.CustomUserManager()),
],
),
]

17
quiz/migrations/0003_rename_essay_question_essayquestion.py Normal file
View File

@ -0,0 +1,17 @@
# Generated by Django 4.0.8 on 2023-12-30 19:04
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('quiz', '0002_alter_choice_id_alter_progress_id_alter_question_id_and_more'),
]
operations = [
migrations.RenameModel(
old_name='Essay_Question',
new_name='EssayQuestion',
),
]

3
quiz/views.py
View File

@ -180,9 +180,6 @@ class QuizUserProgressView(TemplateView):
return context
from result.models import TakenCourse
@method_decorator([login_required, lecturer_required], name="dispatch")
class QuizMarkingList(QuizMarkerMixin, SittingFilterTitleMixin, ListView):
model = Sitting

2
templates/accounts/profile.html
View File

@ -73,7 +73,7 @@
{% endfor %}
</div>
{% else %}
<div class="text-danger"><i class="far fa-frown"></i>No courses!</div>
<div class="text-danger">No courses!</div>
{% endif %}
</div>
{% endif %}

2
templates/accounts/profile_single.html
View File

@ -65,7 +65,7 @@
{% endfor %}
</div>
{% else %}
<div class="text-danger"><i class="far fa-frown"></i>No courses!</div>
<div class="text-danger">No courses!</div>
{% endif %}
</div>
{% endif %}

2
templates/accounts/student_list.html
View File

@ -88,7 +88,7 @@
<td></td>
<td>
<span class="text-danger">
<i class="far fa-frown"></i>No Student.
No Student.
{% if request.user.is_superuser %}
<a href="{% url 'add_student' %}">
<i class="primary" style="font-size: 22px;">

4
templates/course/course_add.html
View File

@ -8,8 +8,8 @@
<a href="{% url 'programs' %}" class="primary1">Programs</a> Add & Update Course</div>
<div class="title-1">Course Add & Update Form</div>
<div class="title-line"></div>
<br>
<br>
{% if messages %}
{% for message in messages %}
{% if message.tags == 'error' %}

8
templates/course/course_registration.html
View File

@ -7,7 +7,7 @@
{% block content %}
<div id="input-nav"><a href="{% url 'home' %}" class="primary1">Home</a> Course Registration</div>
<p class="title-1">Course Add & Drop</p>
<p class="title-1">Course Add &amp; Drop</p>
{% if messages %}
{% for message in messages %}
@ -90,7 +90,7 @@
<td></td>
<td>
<span class="text-danger">
<i class="far fa-frown"></i>No Course.
No Course.
</span>
</td>
<td></td>
@ -153,7 +153,7 @@
<td></td>
<td>
<span class="text-danger">
<i class="far fa-frown"></i>No Course.
No Course.
</span>
</td>
<td></td>
@ -259,7 +259,7 @@
<td></td>
<td>
<span class="text-danger">
<i class="far fa-frown"></i>No Course.
No Course.
</span>
</td>
<td></td>

12
templates/course/course_single.html
View File

@ -16,16 +16,16 @@
<div class="row">
<div class="col ml-auto">
{% if request.user.is_superuser or request.user.is_lecturer %}
<a class="add-button" href="{% url 'upload_file_view' course.slug %}"><i class="fas fa-plus"></i>
<a class="btn btn-primary" href="{% url 'upload_file_view' course.slug %}"><i class="fas fa-plus"></i>
Upload new file
</a>
<a class="add-button" href="{% url 'upload_video' course.slug %}"><i class="fas fa-plus"></i>
<a class="btn btn-primary" href="{% url 'upload_video' course.slug %}"><i class="fas fa-plus"></i>
Upload new video
</a>
{% endif %}
</div>
<div class="col text-right">
<a class="btn btn-lg btn-warning" href="{% url 'quiz_index' course.slug %}"><i class="fas fa-list"></i>
<a class="btn btn-warning" href="{% url 'quiz_index' course.slug %}"><i class="fas fa-list"></i>
Take a Quiz
</a>
</div>
@ -33,7 +33,7 @@
</div>
<div class="title-1">{{ course }}</div>
<p class="program-description">{{ course.summary }}</p>
<p>{{ course.summary }}</p>
{% if request.user.is_superuser %}
<div class="btn-flex">
@ -112,7 +112,7 @@
<td></td>
<td>
<span class="text-danger">
<i class="far fa-frown fa-1x"></i> No video Uploaded.
No video Uploaded.
{% if request.user.is_superuser or request.user.is_lecturer %}
<a href="{% url 'upload_video' course.slug %}">
<i class="primary" style="font-size: 22px;">
@ -190,7 +190,7 @@
<td></td>
<td>
<span class="text-danger">
<i class="far fa-frown fa-1x"></i> No File Uploaded.
No File Uploaded.
{% if request.user.is_superuser or request.user.is_lecturer %}
<a href="{% url 'upload_file_view' course.slug %}">
<i class="primary" style="font-size: 22px;">

20
templates/course/program_list.html
View File

@ -113,6 +113,26 @@
</td>
{% endif %}
</tr>
{% empty %}
<tr>
<td></td>
<td></td>
<td>
<span class="text-danger">
No program.
{% if request.user.is_superuser %}
<a href="{% url 'add_program' %}">
<i class="primary" style="font-size: 22px;">
Add program now.
</i>
{% endif %}
</a>
</span>
</td>
<td></td>
<td></td>
<td></td>
</tr>
{% endfor %}
</tbody>
</table>

17
templates/course/program_single.html
View File

@ -19,7 +19,7 @@
{% if program %}
<div class="title-1">{{ program.title }}</div>
{% if program.summary %}
<p class="program-description">{{ program.summary }}</p>
<p>{{ program.summary }}</p>
{% endif %}
{% endif %}
@ -103,6 +103,21 @@
</td>
{% endif %}
</tr>
{% empty %}
<tr>
<td colspan="9">
<span class="text-danger">
No course for this progrm.
{% if request.user.is_superuser %}
<a href="{% url 'course_add' pk=program.pk %}">
<i class="primary" style="font-size: 22px;">
Add one now.
</i>
{% endif %}
</a>
</span>
</td>
</tr>
{% endfor %}
</tbody>
</table>

2
templates/quiz/sitting_list.html
View File

@ -53,7 +53,7 @@
</table>
{% else %}
<p class="p-3 bg-light">{% trans "There are no matching results for your search..." %}.</p>
<p class="p-3 bg-light">{% trans "No completed exams for you" %}.</p>
{% endif %}
</div>
{% endblock %}

4
templates/result/add_score.html
View File

@ -30,7 +30,7 @@
{{ current_semester }} Semester - <i class="result-title">{{ current_session }}</i>
</p><br>
<div class="container">
<div class="content-center"><i class="far fa-frown fa-2x"></i> No course selected.</div>
<div class="content-center">No course selected.</div>
<div class="dropdown">
<button class="btn btn-primary dropdown-toggle" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
@ -40,7 +40,7 @@
{% for course in courses %}
<a class="dropdown-item" href="{% url 'add_score_for' course.id %}" title="{{ course.code }}">{{ course.title }}</a>
{% empty %}
<p class="dropdown-item"><i class="far fa-frown fa-1x"></i> No course.</p>
<p class="dropdown-item">No course.</p>
{% endfor %}
</div>
</div>

4
templates/result/add_score_for.html
View File

@ -15,7 +15,7 @@
{% for course in courses %}
<a class="dropdown-item" href="{% url 'add_score_for' course.id %}" title="{{ course.code }}">{{ course.title }}</a>
{% empty %}
<p class="dropdown-item"><i class="far fa-frown fa-1x"></i> No course.</p>
<p class="dropdown-item">No course.</p>
{% endfor %}
</div>
</div>
@ -131,7 +131,7 @@
<td></td>
<td>
<span class="text-danger">
<i class="far fa-frown"></i> No Student.
No Student.
</span>
</td>
<td></td>