Merged dev into announcements branch. Resolved merge conflicts.

.gitignore

-*.env
+*.env
\ No newline at end of file
+widget_robo_mommy/announcements/__pycache__
\ No newline at end of file

.idea/misc.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.9 (midterm_robo_mommy)" project-jdk-type="Python SDK" />
+</project>
\ No newline at end of file

widget_robo_mommy/Assignments/admin.py

+from django.contrib import admin
+from .models import Assignment, Course
+
+class AssignmentAdmin(admin.ModelAdmin):
+    model = Assignment
+
+class CourseAdmin(admin.ModelAdmin):
+    model = Course
+
+admin.site.register(Assignment, AssignmentAdmin)
+admin.site.register(Course, CourseAdmin)
\ No newline at end of file

widget_robo_mommy/Assignments/apps.py

+from django.apps import AppConfig
+
+
+class AssignmentsConfig(AppConfig):
+    default_auto_field = 'django.db.models.BigAutoField'
+    name = 'Assignments'

widget_robo_mommy/Assignments/migrations/0001_initial.py

+# Generated by Django 4.1.7 on 2023-03-04 17:11
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Assignment',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(blank=True, max_length=255, null=True)),
+                ('description', models.TextField(blank=True, null=True)),
+                ('course', models.CharField(blank=True, max_length=255, null=True)),
+                ('perfect_score', models.IntegerField(blank=True, null=True)),
+                ('passing_score', models.IntegerField(blank=True, null=True)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Course',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('code', models.CharField(blank=True, max_length=10, null=True)),
+                ('title', models.CharField(blank=True, max_length=255, null=True)),
+                ('section', models.CharField(blank=True, max_length=3, null=True)),
+            ],
+        ),
+    ]

widget_robo_mommy/Assignments/migrations/0002_alter_assignment_course.py

+# Generated by Django 4.1.7 on 2023-03-04 17:27
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('Assignments', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='assignment',
+            name='course',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='Assignments.course'),
+        ),
+    ]

widget_robo_mommy/Assignments/models.py

+from django.db import models
+
+class Course(models.Model):
+    code = models.CharField(max_length=10, blank=True, null=True)
+    title = models.CharField(max_length=255, blank=True, null=True)
+    section = models.CharField(max_length=3, blank=True, null=True)
+
+class Assignment(models.Model):
+    name = models.CharField(max_length=255, blank=True, null=True)
+    description = models.TextField(blank=True, null=True)
+    course = models.ForeignKey(Course, on_delete=models.CASCADE, null=True)
+    perfect_score = models.IntegerField(blank=True, null=True)
+    passing_score = models.IntegerField(blank=True, null=True)
+
+    def save(self, *args, **kwargs):
+        self.passing_score = int(self.perfect_score * 0.60)
+        super(Assignment, self).save(*args, **kwargs)

widget_robo_mommy/Assignments/tests.py

+from django.test import TestCase
+
+# Create your tests here.

widget_robo_mommy/Assignments/urls.py

+from django.urls import path
+from .views import index
+
+urlpatterns = [
+    path('', index, name='index'),
+]
+
+app_name = "Assignments"

widget_robo_mommy/Assignments/views.py

+from django.shortcuts import render
+from django.http import HttpResponse
+from .models import Assignment, Course
+import os
+
+
+def index(request):
+    output = f"Widget's Assignments Page<br><br>"
+    count = Assignment.objects.all().count()
+
+    for i in range(1, count + 1):
+        assignments = Assignment.objects.get(id=i)
+        output += f"""Assignment Name: {assignments.name}<br>
+                   Description: {assignments.description}<br>
+                   Perfect Score: {assignments.perfect_score}<br>
+                   Passing Score: {assignments.passing_score}<br>
+                   Course/Section: {assignments.course.code} {assignments.course.title}-{assignments.course.section}<br>
+                   <br>"""
+
+    return HttpResponse(output)

widget_robo_mommy/Dashboard/admin.py

+from django.contrib import admin
+
+from .models import Department, WidgetUser
+
+
+class DepartmentAdmin(admin.ModelAdmin):
+    model = Department
+
+    list_display = ('dept_name', 'home_unit')
+
+    search_fields = ('dept_name', 'home_unit')
+
+
+class WidgetUserAdmin(admin.ModelAdmin):
+    model = WidgetUser
+
+
+admin.site.register(Department, DepartmentAdmin)
+admin.site.register(WidgetUser, WidgetUserAdmin)

widget_robo_mommy/Dashboard/apps.py

+from django.apps import AppConfig
+
+
+class DashboardConfig(AppConfig):
+    default_auto_field = 'django.db.models.BigAutoField'
+    name = 'Dashboard'

widget_robo_mommy/Dashboard/migrations/0001_initial.py

+# Generated by Django 4.1.6 on 2023-03-03 15:37
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Department',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('dept_name', models.CharField(max_length=50)),
+                ('home_unit', models.CharField(max_length=100)),
+            ],
+        ),
+    ]

widget_robo_mommy/Dashboard/migrations/0002_widgetuser.py

+# Generated by Django 4.1.6 on 2023-03-04 16:34
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('Dashboard', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='WidgetUser',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('first_name', models.CharField(max_length=50)),
+                ('middle_name', models.CharField(max_length=50)),
+                ('last_name', models.CharField(max_length=50)),
+                ('department', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='Dashboard.department')),
+            ],
+        ),
+    ]

widget_robo_mommy/Dashboard/models.py

+from django.db import models
+
+
+class Department(models.Model):
+    dept_name = models.CharField(max_length=50)
+    home_unit = models.CharField(max_length=100)
+
+
+class WidgetUser(models.Model):
+    first_name = models.CharField(max_length=50)
+    middle_name = models.CharField(max_length=50)
+    last_name = models.CharField(max_length=50)
+    department = models.ForeignKey(Department, on_delete=models.CASCADE)
\ No newline at end of file

widget_robo_mommy/Dashboard/tests.py

+from django.test import TestCase
+
+# Create your tests here.

widget_robo_mommy/Dashboard/urls.py

+from django.urls import path
+from .views import Dashboard_list_view
+
+urlpatterns = [
+    path('', Dashboard_list_view, name='Dashboard_list_view'),
+]
+
+app_name = "Dashboard"
\ No newline at end of file

widget_robo_mommy/Dashboard/views.py

+from .models import WidgetUser, Department
+from django.http import HttpResponse
+from django.shortcuts import render
+
+
+def Dashboard_list_view(request):
+    html_string_1 = '<html lang="en"><head><meta charset="UTF-8">' \
+                    '<h1>Welcome to Widget</h1>' \
+                    '<h2>WIDGET USERS</h2></head><ul>'
+    html_string_2 = ''
+    for wu in WidgetUser.objects.all():
+        html_string_2 += '<li>{}, {} {}: {}, {}' .format(wu.last_name, 
+                                                         wu.first_name,
+                                                         wu.middle_name,
+                                                         wu.department.dept_name,
+                                                         wu.department.home_unit)
+    html_string_2 += '</ul></li>'
+    html_string_final = html_string_1 + html_string_2 + '</html>'
+
+    return HttpResponse(html_string_final)

widget_robo_mommy/forum/admin.py

+from django.contrib import admin
+from .models import ForumPost, Reply
+
+# Register your models here.
+admin.site.register(ForumPost)
+admin.site.register(Reply)

widget_robo_mommy/forum/apps.py

+from django.apps import AppConfig
+
+
+class ForumConfig(AppConfig):
+    default_auto_field = 'django.db.models.BigAutoField'
+    name = 'forum'

widget_robo_mommy/forum/migrations/0001_initial.py

+# Generated by Django 3.2 on 2023-03-04 13:35
+
+import django.contrib.auth.models
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('auth', '0012_alter_user_first_name_max_length'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='ForumPost',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('title', models.CharField(blank=True, max_length=255, null=True)),
+                ('body', models.TextField(blank=True, null=True)),
+                ('pub_datetime', models.DateTimeField(auto_now_add=True)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='WidgetUser',
+            fields=[
+                ('user_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='auth.user')),
+            ],
+            options={
+                'verbose_name': 'user',
+                'verbose_name_plural': 'users',
+                'abstract': False,
+            },
+            bases=('auth.user',),
+            managers=[
+                ('objects', django.contrib.auth.models.UserManager()),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Reply',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('body', models.TextField(blank=True, null=True)),
+                ('pub_datetime', models.DateTimeField(auto_now_add=True)),
+                ('author', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='forum.widgetuser')),
+                ('forumpost', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='reply', to='forum.forumpost')),
+            ],
+        ),
+        migrations.AddField(
+            model_name='forumpost',
+            name='author',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='forumpost', to='forum.widgetuser'),
+        ),
+    ]

widget_robo_mommy/forum/migrations/0002_auto_20230304_2337.py

+# Generated by Django 3.2 on 2023-03-04 15:37
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('Dashboard', '0002_widgetuser'),
+        ('admin', '0003_logentry_add_action_flag_choices'),
+        ('forum', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='forumpost',
+            name='author',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='forumpost', to='Dashboard.widgetuser'),
+        ),
+        migrations.AlterField(
+            model_name='reply',
+            name='author',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='Dashboard.widgetuser'),
+        ),
+        migrations.DeleteModel(
+            name='WidgetUser',
+        ),
+    ]

widget_robo_mommy/forum/models.py

+from django.db import models
+from Dashboard.models import WidgetUser
+# Create your models here.
+
+
+class ForumPost(models.Model):
+    title = models.CharField(max_length=255, blank=True, null=True)
+    body = models.TextField(blank=True, null=True)
+    author = models.ForeignKey(WidgetUser, related_name='forumpost', on_delete=models.CASCADE, null=True)
+    pub_datetime = models.DateTimeField(auto_now_add=True)
+
+
+class Reply(models.Model):
+    forumpost = models.ForeignKey(ForumPost, related_name='reply', on_delete=models.CASCADE, null=True)
+    body = models.TextField(blank=True, null=True)
+    author = models.ForeignKey(WidgetUser, on_delete=models.CASCADE, null=True)
+    pub_datetime = models.DateTimeField(auto_now_add=True)

widget_robo_mommy/forum/tests.py

+from django.test import TestCase
+
+# Create your tests here.

widget_robo_mommy/forum/urls.py

+from django.urls import path
+from .views import *
+
+urlpatterns = [
+    path('forum/', forum_post_list_view, name='forum_post_list_view')
+]

widget_robo_mommy/forum/views.py

+from django.shortcuts import render
+from django.http import HttpResponse
+from .models import ForumPost
+import pytz
+from django.utils import timezone
+
+
+# helper function to convert utc datetime object to local time
+def convert_utc_to_local(utctime):
+    datetime_format = '%d/%m/%Y %H:%M'
+    utc = utctime.replace(tzinfo=pytz.UTC)
+    localtz = utc.astimezone(timezone.get_current_timezone())
+    return localtz.strftime(datetime_format)
+
+
+def forum_post_list_view(request):
+    html_string_1 = '<html lang="en"><head><meta charset="UTF-8"><title>Forum Post List</title>' \
+                    '<h1>Forum Post List</h1></head><ul>'
+    html_string_2 = ''
+    for fp in ForumPost.objects.all():
+        html_string_2 += '<li><b style="font-size: 30px">{}</b>' \
+                         ' by <b style="font-size: large">{} {}</b>' \
+                         ' posted <b>{}</b><p>{}</p><ul>'.format(fp.title,
+                                                                 fp.author.first_name,
+                                                                 fp.author.last_name,
+                                                                 convert_utc_to_local(fp.pub_datetime), fp.body)
+        for replies in fp.reply.all():
+            html_string_2 += '<li> Reply by <b>{} {}</b> ' \
+                             'posted <b>{}</b><p>{}</p></li>'.format(replies.author.first_name,
+                                                                     replies.author.last_name,
+                                                                     convert_utc_to_local(replies.pub_datetime),
+                                                                     replies.body)
+        html_string_2 += '</ul></li>'
+    html_string_final = html_string_1 + html_string_2 + '</ul></html>'
+
+    return HttpResponse(html_string_final)

widget_robo_mommy/widget_robo_mommy/settings.py

@@ -14,6 +14,9 @@ from pathlib import Path
 from dotenv import load_dotenv
 import os
 
+DIRNAME = os.path.abspath(os.path.dirname(__file__))
+load_dotenv()
+
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
 BASE_DIR = Path(__file__).resolve().parent.parent
 
@@ -34,12 +37,16 @@ ALLOWED_HOSTS = []
 
 INSTALLED_APPS = [
     'announcements',
+    'Assignments',
+    'forum.apps.ForumConfig',
+    'Dashboard.apps.DashboardConfig',
     'django.contrib.admin',
     'django.contrib.auth',
     'django.contrib.contenttypes',
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
+    'tz_detect',
 ]
 
 MIDDLEWARE = [
@@ -108,7 +115,7 @@ AUTH_PASSWORD_VALIDATORS = [
 
 LANGUAGE_CODE = 'en-us'
 
-TIME_ZONE = 'UTC'
+TIME_ZONE = 'Asia/Hong_Kong'
 
 USE_I18N = True
 

widget_robo_mommy/widget_robo_mommy/urls.py

@@ -15,8 +15,12 @@ Including another URLconf
 """
 from django.contrib import admin
 from django.urls import include, path
+from django.urls import path, include
 
 urlpatterns = [
     path('announcements/', include('announcements.urls', namespace="announcements")),
     path('admin/', admin.site.urls),
+    path('Assignments/', include('Assignments.urls', namespace="Assignments")),
+    path('', include(('forum.urls', 'forum'), namespace='forum')),
+    path('Dashboard/', include('Dashboard.urls', namespace="Dashboard")),
 ]