Merge branch 'assignments' into staging

18d1d0ae · nheoxoz · b5f68311 · d822d5c8 · 18d1d0ae · 18d1d0ae
Commit 18d1d0ae authored Mar 05, 2023 by nheoxoz
21 changed files
--- a/widget_OhMyBash/.DS_Store
+++ b/widget_OhMyBash/.DS_Store
--- a/widget_OhMyBash/assignments/.DS_Store
+++ b/widget_OhMyBash/assignments/.DS_Store
--- a/widget_OhMyBash/assignments/__init__.py
+++ b/widget_OhMyBash/assignments/__init__.py
--- a/widget_OhMyBash/assignments/__pycache__/__init__.cpython-39.pyc
+++ b/widget_OhMyBash/assignments/__pycache__/__init__.cpython-39.pyc
--- a/widget_OhMyBash/assignments/__pycache__/admin.cpython-39.pyc
+++ b/widget_OhMyBash/assignments/__pycache__/admin.cpython-39.pyc
--- a/widget_OhMyBash/assignments/__pycache__/apps.cpython-39.pyc
+++ b/widget_OhMyBash/assignments/__pycache__/apps.cpython-39.pyc
--- a/widget_OhMyBash/assignments/__pycache__/models.cpython-39.pyc
+++ b/widget_OhMyBash/assignments/__pycache__/models.cpython-39.pyc
--- a/widget_OhMyBash/assignments/__pycache__/urls.cpython-39.pyc
+++ b/widget_OhMyBash/assignments/__pycache__/urls.cpython-39.pyc
--- a/widget_OhMyBash/assignments/__pycache__/views.cpython-39.pyc
+++ b/widget_OhMyBash/assignments/__pycache__/views.cpython-39.pyc
--- a/widget_OhMyBash/assignments/admin.py
+++ b/widget_OhMyBash/assignments/admin.py
+from django.contrib import admin
+from .models import Assignment, Course
+class AssignmentAdmin(admin.ModelAdmin):
+    model = Assignment
+    list_display = ('assignment_name', 'description', 'course', 'perfect_score',)
+    search_fields = ('assignment_name', 'description', 'course', 'perfect_score',)
+    list_filter = ('assignment_name', 'description', 'course', 'perfect_score',)
+class CourseAdmin(admin.ModelAdmin):
+    model = Course
+    list_display = ('code', 'title', 'section',)
+    search_fields = ('code', 'title', 'section',)
+    list_filter = ('code', 'title', 'section',)
+admin.site.register(Assignment, AssignmentAdmin)
+admin.site.register(Course, CourseAdmin)
--- a/widget_OhMyBash/assignments/apps.py
+++ b/widget_OhMyBash/assignments/apps.py
+from django.apps import AppConfig
+class AssignmentsConfig(AppConfig):
+    default_auto_field = 'django.db.models.BigAutoField'
+    name = 'assignments'
--- a/widget_OhMyBash/assignments/migrations/0001_initial.py
+++ b/widget_OhMyBash/assignments/migrations/0001_initial.py
+# Generated by Django 4.1.7 on 2023-03-05 14:44
+from django.db import migrations, models
+import django.db.models.deletion
+class Migration(migrations.Migration):
+    initial = True
+    dependencies = [
+    ]
+    operations = [
+        migrations.CreateModel(
+            name='Course',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('code', models.CharField(max_length=10)),
+                ('title', models.CharField(max_length=100)),
+                ('section', models.CharField(max_length=3)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Assignment',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('assignment_name', models.CharField(max_length=50)),
+                ('description', models.TextField()),
+                ('perfect_score', models.IntegerField()),
+                ('course', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='assignments.course')),
+            ],
+        ),
+    ]
--- a/widget_OhMyBash/assignments/migrations/__init__.py
+++ b/widget_OhMyBash/assignments/migrations/__init__.py
--- a/widget_OhMyBash/assignments/migrations/__pycache__/0001_initial.cpython-39.pyc
+++ b/widget_OhMyBash/assignments/migrations/__pycache__/0001_initial.cpython-39.pyc
--- a/widget_OhMyBash/assignments/migrations/__pycache__/__init__.cpython-39.pyc
+++ b/widget_OhMyBash/assignments/migrations/__pycache__/__init__.cpython-39.pyc
--- a/widget_OhMyBash/assignments/models.py
+++ b/widget_OhMyBash/assignments/models.py
+from django.db import models
+class Course(models.Model):
+    code = models.CharField(max_length=10)
+    title = models.CharField(max_length=100)
+    section = models.CharField(max_length=3)
+    def __str__(self):
+        return '''{}, {}, {}'''.format(
+            self.code,
+            self.title,
+            self.section,
+            )
+class Assignment(models.Model):
+    assignment_name = models.CharField(max_length=50)
+    description = models.TextField()
+    course = models.ForeignKey(Course, on_delete=models.CASCADE)
+    perfect_score = models.IntegerField()
+    def __str__(self):
+        return '''{}, {}, {}, {}'''.format(
+            self.assignment_name,
+            self.description,
+            self.course,
+            self.perfect_score,
+            )
\ No newline at end of file
--- a/widget_OhMyBash/assignments/tests.py
+++ b/widget_OhMyBash/assignments/tests.py
+from django.test import TestCase
+# Create your tests here.
--- a/widget_OhMyBash/assignments/urls.py
+++ b/widget_OhMyBash/assignments/urls.py
+from django.urls import path
+from .views import index
+urlpatterns = [
+    path('', index, name= 'index'),
+]
+app_name = "assignments"
\ No newline at end of file
--- a/widget_OhMyBash/assignments/views.py
+++ b/widget_OhMyBash/assignments/views.py
+from django.http import HttpResponse
+from .models import Assignment
+def index(request):
+    return_string = "<p>Widget's Assignment Page</p>"
+    for a in Assignment.objects.all():
+        return_string += '''Assignment Name: {} <br>Description: {}
+        <br>Perfect Score: {} <br>Passing Score: {}
+        <br>Course/Section: {} {}-{}<br><br>'''.format(
+            a.assignment_name,
+            a.description,
+            a.perfect_score,
+            int(a.perfect_score * 0.60),
+            a.course.code,
+            a.course.title,
+            a.course.section,
+        )
+    html_string = '<html><body>{}</body></html>'.format(return_string)
+    return HttpResponse(html_string)
--- a/widget_OhMyBash/widget_OhMyBash/settings.py
+++ b/widget_OhMyBash/widget_OhMyBash/settings.py
@@ -44,7 +44,7 @@ INSTALLED_APPS = [
    'forum',
    'widget_calendar',
    'announcements',
->>>>>>> f6700b35f7db8ac5d251ad6b596528ba9f7d4fac
+    'assignments',
 ]
 MIDDLEWARE = [

--- a/widget_OhMyBash/widget_OhMyBash/urls.py
+++ b/widget_OhMyBash/widget_OhMyBash/urls.py
@@ -21,5 +21,6 @@ urlpatterns = [
    path('forum/', include('forum.urls', namespace="forum")),
    path('announcements/', include('announcements.urls', namespace="announcements")),
    path('widget_calendar/', include('widget_calendar.urls', namespace="calendar")),
+    path('assignments/', include('assignments.urls', namespace="assignments")),
    path('admin/', admin.site.urls),
 ]