Merge branch 'calendarv2'

widget_vincentdjango/assignments/migrations/0004_alter_assignment_assignment_name.py

 # Generated by Django 3.2 on 2023-05-12 05:00
 
+
 from django.db import migrations, models
 
 

widget_vincentdjango/widget_calendar/migrations/0002_alter_event_target_datetime.py → widget_vincentdjango/forum/migrations/0003_auto_20230513_1122.py

-# Generated by Django 3.2 on 2023-03-06 13:35
+# Generated by Django 3.2 on 2023-05-13 03:22
 
 import datetime
 from django.db import migrations, models
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('widget_calendar', '0001_initial'),
+        ('forum', '0002_reply_post'),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='event',
-            name='target_datetime',
-            field=models.DateTimeField(default=datetime.datetime(2023, 3, 6, 21, 35, 57, 125720)),
+            model_name='forumpost',
+            name='pub_datetime',
+            field=models.DateTimeField(default=datetime.datetime(2023, 5, 13, 11, 22, 5, 434143), editable=False),
+        ),
+        migrations.AlterField(
+            model_name='reply',
+            name='post',
+            field=models.ForeignKey(default=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='replies', to='forum.forumpost'),
         ),
     ]

widget_vincentdjango/widget_calendar/migrations/0001_initial.py

-# Generated by Django 3.2 on 2023-03-06 13:34
+# Generated by Django 3.2 on 2023-05-13 03:22
 
 import datetime
 from django.db import migrations, models
@@ -10,7 +10,7 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        ('assignments', '0002_alter_course_course_code'),
+        ('assignments', '0004_alter_assignment_assignment_name'),
     ]
 
     operations = [
@@ -26,11 +26,11 @@ class Migration(migrations.Migration):
             name='Event',
             fields=[
                 ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('target_datetime', models.DateTimeField(default=datetime.datetime(2023, 3, 6, 21, 34, 56, 441115))),
+                ('target_datetime', models.DateTimeField(default=datetime.datetime(2023, 5, 13, 11, 22, 5, 435155))),
                 ('activity', models.CharField(default='', max_length=100)),
                 ('estimated_hours', models.FloatField(default=0)),
                 ('course', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='assignments.course')),
-                ('location', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='Venue', to='widget_calendar.location')),
+                ('location', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='venues', to='widget_calendar.location')),
             ],
         ),
     ]

widget_vincentdjango/widget_calendar/migrations/0003_alter_event_target_datetime.py

-# Generated by Django 3.2 on 2023-03-06 13:36
-
-import datetime
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('widget_calendar', '0002_alter_event_target_datetime'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='event',
-            name='target_datetime',
-            field=models.DateTimeField(default=datetime.datetime(2023, 3, 6, 21, 36, 3, 571433)),
-        ),
-    ]

widget_vincentdjango/widget_calendar/migrations/0004_alter_event_target_datetime.py

-# Generated by Django 3.2 on 2023-03-06 13:36
-
-import datetime
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('widget_calendar', '0003_alter_event_target_datetime'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='event',
-            name='target_datetime',
-            field=models.DateTimeField(default=datetime.datetime(2023, 3, 6, 21, 36, 8, 203438)),
-        ),
-    ]

widget_vincentdjango/widget_calendar/migrations/0005_alter_event_target_datetime.py

-# Generated by Django 3.2 on 2023-03-06 13:36
-
-import datetime
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('widget_calendar', '0004_alter_event_target_datetime'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='event',
-            name='target_datetime',
-            field=models.DateTimeField(default=datetime.datetime(2023, 3, 6, 21, 36, 15, 496092)),
-        ),
-    ]

widget_vincentdjango/widget_calendar/migrations/0006_alter_event_target_datetime.py

-# Generated by Django 3.2 on 2023-03-06 13:36
-
-import datetime
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('widget_calendar', '0005_alter_event_target_datetime'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='event',
-            name='target_datetime',
-            field=models.DateTimeField(default=datetime.datetime(2023, 3, 6, 21, 36, 18, 142763)),
-        ),
-    ]

widget_vincentdjango/widget_calendar/migrations/0007_alter_event_target_datetime.py

-# Generated by Django 3.2 on 2023-04-29 07:07
-
-import datetime
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('widget_calendar', '0006_alter_event_target_datetime'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='event',
-            name='target_datetime',
-            field=models.DateTimeField(default=datetime.datetime(2023, 4, 29, 15, 7, 16, 727183)),
-        ),
-    ]

widget_vincentdjango/widget_calendar/migrations/0008_alter_event_target_datetime.py

-# Generated by Django 3.2 on 2023-04-29 09:12
-
-import datetime
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('widget_calendar', '0007_alter_event_target_datetime'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='event',
-            name='target_datetime',
-            field=models.DateTimeField(default=datetime.datetime(2023, 4, 29, 17, 12, 10, 865421)),
-        ),
-    ]

widget_vincentdjango/widget_calendar/models.py

 from django.db import models
+from django.urls import reverse
 from datetime import datetime
-
 from assignments.models import Course
 
 
@@ -23,8 +23,11 @@ class Event(models.Model):
     location = models.ForeignKey(
         Location,
         on_delete=models.CASCADE,
-        related_name='Venue'
+        related_name='venues'
     )
 
     def __str__(self):
         return "{} {} {} {}".format(self.target_datetime, self.activity, self.estimated_hours, self.location)
+
+    def get_absolute_url(self):
+        return reverse('calendar:event-details', kwargs={'pk': self.pk})

widget_vincentdjango/widget_calendar/templates/calendar/calendar.html

+{% extends 'base.html' %}
+{% load static %}
+
+{% block title %}Widget's Calendar of Activities{% endblock %}
+{% block heading %}
+    <h1 id="header">Widget's Calendar of Activities </h1>
+    <div class="separator-bar"></div>
+{% endblock %}
+
+{% block content %}
+    <ul>
+        {% for event in events %}
+        <li class="object-cell">
+            <a href="{{ event.get_absolute_url }}">
+                <span class="object-title">{{ event.activity }} </span> </a>
+        </li>
+        {% endfor %}
+    </ul>
+
+    <button onclick="window.location.href='{% url 'calendar:event-add' %}';" class="action-button">
+        New Activity
+    </button>
+
+    <div id="footer">
+        <a href="{% url 'dashboard:index' %}">Dashboard</a>
+        <a href="{% url 'announcementBoard:index' %}">Announcement Board</a>
+        <a href="{% url 'forum:index' %}">Forum</a>
+        <a href="{% url 'assignments:homePage' %}">Assignments</a>
+    </div>
+{% endblock %}
\ No newline at end of file

widget_vincentdjango/widget_calendar/templates/calendar/event-add.html

+{% extends 'base.html' %}
+{% load static %}
+
+{% block title %} Add Activity {% endblock %}
+{% block heading %}
+    <h1 class="subheader"> Add a new activity: </h1>
+{% endblock %}
+
+{% block content %}
+	<form method="post">
+		{% csrf_token %}
+		<div class="form-fields"> {{ form.as_p }} </div>
+		<div class="separator-bar"></div>
+		<input class="action-button" type="submit" value="Save New Activity">
+	</form>
+{% endblock %}
\ No newline at end of file

widget_vincentdjango/widget_calendar/templates/calendar/event-details.html

+{% extends 'base.html' %}
+{% load static %}
+
+{% block title %} {{ object.activity }} {% endblock %}
+{% block heading %}
+    <h1 class="subheader"> {{ object.activity }} </h1>
+{% endblock %}
+
+{% block content %}
+	<div class="separator-bar"></div>
+    <div id="main">
+            <p class="detail-header"> Target Date & Time: {{ event.target_datetime }} </p>
+            <p class="detail-header"> Estimated Hours: {{ event.estimated_hours }} </p>
+            <p class="detail-header"> Course: {{ event.course }} </p>
+            <p class="detail-header"> Location: {{ event.location }} </p>
+    </div>
+
+    <div class="separator-bar"></div>
+    <button class="action-button" onclick="window.location.href='{% url 'calendar:event-edit' pk=object.pk %}';">
+        Edit Activity
+    </button>
+
+{% endblock %}
\ No newline at end of file

widget_vincentdjango/widget_calendar/templates/calendar/event-edit.html

+{% extends 'base.html' %}
+{% load static %}
+
+{% block title %} Edit Activity {% endblock %}
+{% block heading %}
+	<h1 class="subheader"> Edit Activity: </h1>
+{% endblock %}
+{% block content %}
+	<form method="post">
+		{% csrf_token %}
+		{{ form.as_p }}
+		<div class="separator-bar"></div>
+		<input type="submit" value="Save New Activity" class="action-button">
+	</form>
+{% endblock %}
\ No newline at end of file

widget_vincentdjango/widget_calendar/urls.py

 from django.urls import path
-from .views import index
+from .views import index, EventDetailView, EventCreateView, EventUpdateView
 
 urlpatterns = [
     path('', index, name='index'),
+    path('events/<int:pk>/details', EventDetailView.as_view(), name='event-details'),
+    path('events/add', EventCreateView.as_view(), name='event-add'),
+    path('events/<int:pk>/edit', EventUpdateView.as_view(), name='event-edit'),
+
 ]
 
-app_name = "widget_calendar"
+app_name = "calendar"

widget_vincentdjango/widget_calendar/views.py

 from django.shortcuts import render
 from django.http import HttpResponse
+from django.views.generic.detail import DetailView
+from django.views.generic.edit import CreateView, UpdateView
 
 from .models import Event, Location
 
 
 def index(request):
+    events = Event.objects.all()
+    return render(request, 'calendar/calendar.html',
+                  {'events': events, })
 
-    head = "<h1 style='border-bottom:4px solid lightgray;\
-            padding-bottom:30px;\
-            font-size:500%;'>\
-            Widget’s Calendar of Activities\
-            </h1>"
-
-    body = ""
-
-    for event in Event.objects.all():
-        location = event.location
-        datetime = str(event.target_datetime)
-        estimated_hours = str(event.estimated_hours)
-        body += "<p style='border: 2px solid gray;\
-                border-radius:5px;\
-                padding:20px 30px;'>\
-                Date and Time: "+datetime+" <br>\
-                Activity: "+event.activity+" <br>\
-                Estimated Hours: "+estimated_hours+" <br>\
-                Course/Section: "+event.course.course_title+" <br>\
-                Mode: "+location.mode+" <br>\
-                Venue: "+location.venue+" <br>\
-                </p>"
-
-    return_string = "<html>\
-                    <body style = 'font-family:helvetica;\
-                    padding:30px;'>\
-                    {}{}\
-                    </body></html>".format(head, body)
-
-    return HttpResponse(return_string)
+
+class EventDetailView(DetailView):
+    model = Event
+    template_name = 'calendar/event-details.html'
+
+
+class EventCreateView(CreateView):
+    model = Event
+    template_name = 'calendar/event-add.html'
+    fields = ["activity", "target_datetime", "estimated_hours", "location", "course"]
+
+
+class EventUpdateView(UpdateView):
+    model = Event
+    template_name = 'calendar/event-edit.html'
+    fields = '__all__'

widget_vincentdjango/widget_vincentdjango/urls.py

@@ -19,7 +19,7 @@ from django.urls import include, path
 urlpatterns = [
     path('admin/', admin.site.urls),
     path('', include('dashboard.urls', namespace="dashboard")),
-    path('widget_calendar/', include('widget_calendar.urls', namespace="widget_calendar")),
+    path('calendar/', include('widget_calendar.urls', namespace="widget_calendar")),
     path('assignments/', include('assignments.urls', namespace="assignments")),
     path('announcements/', include('announcements.urls', namespace="announcements")),
     path('forum/', include('forum.urls', namespace="forum")),