Merge branch 'layug/calendar' into 'master'

Created calendarapp model, added admin view for the calendarapp, and updated...

See merge request !1

widget_group_25/calendarapp/admin.py

 from django.contrib import admin
 
+from .models import Event
+
 # Register your models here.
+class EventAdmin(admin.ModelAdmin):
+    model = Event
+    list_display = ('target_date', 'activity', 'estimated_hours')
+
+admin.site.register(Event, EventAdmin)
\ No newline at end of file

widget_group_25/calendarapp/migrations/0001_initial.py

+# Generated by Django 4.0.3 on 2022-03-17 15:19
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Event',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('target_date', models.DateField()),
+                ('activity', models.CharField(max_length=150)),
+                ('estimated_hours', models.FloatField()),
+            ],
+        ),
+    ]

widget_group_25/calendarapp/models.py

 from django.db import models
 
 # Create your models here.
+class Event(models.Model):
+    target_date = models.DateField()
+    activity = models.CharField(max_length=150)
+    estimated_hours = models.FloatField()
+
+    def __str__(self):
+        return '{} with {} hours duration on {} '.format(self.activity, self.estimated_hours, self.target_date)
\ No newline at end of file

widget_group_25/widget_group_25/settings.py

@@ -44,7 +44,7 @@ INSTALLED_APPS = [
     'announcementboard',
     'forum',
     'assignments',
-    'calendar'
+    'calendarapp'
 ]
 
 MIDDLEWARE = [