Skip to content

M
midterm_vincentdjango
Commit 558ff1db authored by Star Neptune R. Sy's avatar Star Neptune R. Sy
Browse files
Options

Merge commit '7ad0b235' into fixingdata2

parents 74922286 7ad0b235
Show whitespace changes
Inline Side-by-side
Showing with 499 additions and 142 deletions
widget_vincentdjango/announcementBoard/migrations/0002_auto_20230305_1528.py deleted 100644 → 0
View file @ 74922286
# Generated by Django 3.2 on 2023-03-05 07:28
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('dashboard', '0001_initial'),
('announcementBoard', '0001_initial'),
]
operations = [
migrations.AlterField(
model_name='announcement',
name='author',
field=models.ForeignKey(default=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='announcements', to='dashboard.widgetuser'),
),
migrations.AlterField(
model_name='reaction',
name='annoucement',
field=models.ForeignKey(default=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='reactions', to='announcementBoard.announcement'),
),
migrations.AlterField(
model_name='reaction',
name='name',
field=models.CharField(choices=[('Like', 'Like'), ('Love', 'Love'), ('Angry', 'Angry')], default='Like', max_length=5),
),
migrations.AlterField(
model_name='reaction',
name='tally',
field=models.PositiveIntegerField(default=0),
),
]
widget_vincentdjango/announcementBoard/migrations/0002_auto_20230305_1746.py deleted 100644 → 0
View file @ 74922286
# Generated by Django 3.2 on 2023-03-05 09:46
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('dashboard', '0001_initial'),
('announcementBoard', '0001_initial'),
]
operations = [
migrations.AlterField(
model_name='announcement',
name='author',
field=models.ForeignKey(default=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='announcements', to='dashboard.widgetuser'),
),
migrations.AlterField(
model_name='reaction',
name='annoucement',
field=models.ForeignKey(default=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='reactions', to='announcementBoard.announcement'),
),
migrations.AlterField(
model_name='reaction',
name='name',
field=models.CharField(choices=[('Like', 'Like'), ('Love', 'Love'), ('Angry', 'Angry')], default='Like', max_length=5),
),
migrations.AlterField(
model_name='reaction',
name='tally',
field=models.PositiveIntegerField(default=0),
),
]
widget_vincentdjango/announcementBoard/urls.py deleted 100644 → 0
View file @ 74922286
from django.urls import path
from .views import index
urlpatterns = [
path('', index, name='index'),
]
app_name = "announcementBoard"
\ No newline at end of file
widget_vincentdjango/announcementBoard/views.py deleted 100644 → 0
View file @ 74922286
from django.shortcuts import render
from django.http import HttpResponse
from .models import Announcement
from dashboard.models import WidgetUser
def index(request):
head = "<h1 style='border-bottom:4px solid lightgray;\
padding-bottom:30px;\
font-size:450%;'>\
Widget's Announcement Board\
</h1>"
body = "<h2>Announcements:</h2>"
for x in Announcement.objects.all():
reaction = x.reactions.all()
body += "<p style='border: 2px solid gray;\
border-radius:5px;\
padding:20px 30px;'>\
{} by {} {} published {}:\
<br>\
{}\
</p>".format(x.title, x.author.first_name, x.author.last_name,
x.format_pub_datetime(), x.body)
for y in reaction:
body += "<p>{}: {}\
</p>".format(y.name, y.tally)
body += '<p>&nbsp;</p>'
return_string = "<html>\
<body style = 'font-family:helvetica;\
padding:30px;'>\
{}{}\
</body></html>".format(head, body)
return HttpResponse(return_string)
widget_vincentdjango/announcementBoard/admin.py → widget_vincentdjango/announcements/admin.py
View file @ 558ff1db
...@@ -23,9 +23,9 @@ class AnnouncementAdmin(admin.ModelAdmin): ...@@ -23,9 +23,9 @@ class AnnouncementAdmin(admin.ModelAdmin):
class ReactionAdmin(admin.ModelAdmin): class ReactionAdmin(admin.ModelAdmin):
model = Reaction model = Reaction
list_display = ('name', 'tally', 'annoucement') list_display = ('name', 'tally', 'announcement')
search_fields = ('name', 'annoucement') search_fields = ('name', 'announcement')
list_filter = ('name', 'annoucement') list_filter = ('name', 'announcement')
admin.site.register(Announcement, AnnouncementAdmin) admin.site.register(Announcement, AnnouncementAdmin)
......
widget_vincentdjango/announcementBoard/apps.py → widget_vincentdjango/announcements/apps.py
View file @ 558ff1db
...@@ -3,4 +3,4 @@ from django.apps import AppConfig ...@@ -3,4 +3,4 @@ from django.apps import AppConfig
class AnnouncementboardConfig(AppConfig): class AnnouncementboardConfig(AppConfig):
default_auto_field = 'django.db.models.BigAutoField' default_auto_field = 'django.db.models.BigAutoField'
name = 'announcementBoard' name = 'announcements'
widget_vincentdjango/announcementBoard/migrations/0001_initial.py → widget_vincentdjango/announcements/migrations/0001_initial.py
View file @ 558ff1db
# Generated by Django 3.2 on 2023-03-04 07:17 # Generated by Django 3.2 on 2023-05-11 07:09
from django.db import migrations, models from django.db import migrations, models
import django.db.models.deletion import django.db.models.deletion
...@@ -20,16 +20,16 @@ class Migration(migrations.Migration): ...@@ -20,16 +20,16 @@ class Migration(migrations.Migration):
('title', models.CharField(default='', max_length=250)), ('title', models.CharField(default='', max_length=250)),
('body', models.TextField(blank=True, null=True)), ('body', models.TextField(blank=True, null=True)),
('pub_datetime', models.DateTimeField(auto_now_add=True)), ('pub_datetime', models.DateTimeField(auto_now_add=True)),
('author', models.ForeignKey(default=True, null=True, on_delete=django.db.models.deletion.SET_DEFAULT, to='dashboard.widgetuser')), ('author', models.ForeignKey(default=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='announcements', to='dashboard.widgetuser')),
], ],
), ),
migrations.CreateModel( migrations.CreateModel(
name='Reaction', name='Reaction',
fields=[ fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=10)), ('name', models.CharField(choices=[('Like', 'Like'), ('Love', 'Love'), ('Angry', 'Angry')], default='Like', max_length=5)),
('tally', models.IntegerField(default=0)), ('tally', models.PositiveIntegerField(default=0)),
('annoucement', models.ForeignKey(default=True, null=True, on_delete=django.db.models.deletion.SET_DEFAULT, to='announcementBoard.announcement')), ('announcement', models.ForeignKey(default=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='reactions', to='announcements.announcement')),
], ],
), ),
] ]
widget_vincentdjango/announcementBoard/models.py → widget_vincentdjango/announcements/models.py
View file @ 558ff1db
from django.db import models from django.db import models
from dashboard.models import WidgetUser from dashboard.models import WidgetUser
from django.urls import reverse
class Announcement(models.Model): class Announcement(models.Model):
...@@ -12,7 +13,7 @@ class Announcement(models.Model): ...@@ -12,7 +13,7 @@ class Announcement(models.Model):
on_delete=models.CASCADE, on_delete=models.CASCADE,
related_name='announcements', related_name='announcements',
) )
pub_datetime = models.DateTimeField(auto_now_add=True) pub_datetime = models.DateTimeField(auto_now_add=True, editable=False)
def __str__(self): def __str__(self):
return self.title return self.title
...@@ -20,12 +21,15 @@ class Announcement(models.Model): ...@@ -20,12 +21,15 @@ class Announcement(models.Model):
def format_pub_datetime(self): def format_pub_datetime(self):
return self.pub_datetime.strftime('%m/%d/%Y, %I:%M %p') return self.pub_datetime.strftime('%m/%d/%Y, %I:%M %p')
def get_absolute_url(self):
return reverse('announcements:announcements-detail', kwargs={'pk': self.pk})
class Reaction(models.Model): class Reaction(models.Model):
name = models.CharField(max_length=5, choices=[('Like', 'Like'), name = models.CharField(max_length=5, choices=[('Like', 'Like'),
('Love', 'Love'), ('Love', 'Love'),
('Angry', 'Angry')], default='Like') ('Angry', 'Angry')], default='Like')
tally = models.PositiveIntegerField(default=0) tally = models.PositiveIntegerField(default=0)
annoucement = models.ForeignKey( announcement = models.ForeignKey(
Announcement, Announcement,
null=True, null=True,
default=True, default=True,
......
widget_vincentdjango/announcements/templates/announcements/announcement-add.html 0 → 100644
View file @ 558ff1db
{% extends 'base.html' %}
{% load static %}
{% block title %} Add Announcement {% endblock %}
{% block heading %}
<h1 class="subheader"> Add a new announcement: </h1>
{% endblock %}
{% block content %}
<form method="post">
{% csrf_token %}
{{ form.as_p }}
<div class="separator-bar"></div>
<input class="action-button" type="submit" value="Add Announcement">
</form>
{% endblock %}
widget_vincentdjango/announcements/templates/announcements/announcement-details.html 0 → 100644
View file @ 558ff1db
{% extends 'base.html' %}
{% load static %}
{% block title %} {{ object.title }} {% endblock %}
{% block heading %}
<h1> {{ object.title }} </h1>
<h2> by {{ object.author.first_name }} {{ object.author.last_name }} </h2>
<h4> {{ object.format_pub_datetime }} </h4>
<p class="detail-body"> {{ object.body }} </p>
<div class="separator-bar"></div>
{% for reaction in object.reactions.all %}
<p class="detail-additionalinfo">
{{ reaction.name }}: {{ reaction.tally }}
</p>
{% endfor %}
<div class="separator-bar"></div>
<button class="action-button" onclick="window.location.href='{% url 'announcements:announcements-edit' pk=object.pk %}'">
Edit Announcement
</button>
{% endblock %}
\ No newline at end of file
widget_vincentdjango/announcements/templates/announcements/announcement-edit.html 0 → 100644
View file @ 558ff1db
{% extends 'base.html' %}
{% load static %}
{% block title %} Edit Anouncement {% endblock %}
{% block heading %}
<h1 class="subheader"> Edit Announcement: </h1>
{% endblock %}
{% block content %}
<form method="post">
{% csrf_token %}
{{ form.as_p }}
<br>
<div class="separator-bar"></div>
<input class="action-button" type="submit" value="Save Changes to Announcement">
</form>
{% endblock %}
widget_vincentdjango/announcements/templates/announcements/announcements.html 0 → 100644
View file @ 558ff1db
{% extends 'base.html' %}
{% load static %}
{% block title %} Widget's Announcement Board {% endblock %}
{% block heading %}
<h1 id="header"> Welcome to Widget's Announcement Board! </h1>
{% endblock %}
{% block content %}
<h2 class="subheader"> Announcements: </h2>
<ul>
{% for object in announcements|dictsortreversed:"pub_datetime" %}
<li class="object-cell">
<a href="{{ object.get_absolute_url }}"> <span class="object-title">{{ object.title }}</span> by
{{ object.author.first_name}} {{ object.author.last_name }}
</a>
</li>
{% endfor %}
</ul>
<hr>
<button onclick="window.location.href='{% url 'announcements:announcements-add' %}'" class="action-button">
New Announcement
</button>
<div id="footer">
<a href="{% url 'dashboard:index' %}">Dashboard</a>
<a href="{% url 'forum:index' %}">Forum</a>
<a href="{% url 'assignments:homePage' %}">Assignments</a>
<a href="{% url 'widget_calendar:index' %}">Calendar</a>
</div>
{% endblock %}
widget_vincentdjango/announcements/urls.py 0 → 100644
View file @ 558ff1db
from django.urls import path
from .views import index, AnnouncementsDetailView, AnnouncementsCreateView, AnnouncementsUpdateView
urlpatterns = [
path('', index, name='index'),
path('announcements/<int:pk>/details', AnnouncementsDetailView.as_view(), name='announcements-detail'),
path('announcements/add', AnnouncementsCreateView.as_view(), name = 'announcements-add'),
path('announcements/<int:pk>/edit', AnnouncementsUpdateView.as_view(), name = 'announcements-edit')
]
app_name = "announcements"
\ No newline at end of file
widget_vincentdjango/announcements/views.py 0 → 100644
View file @ 558ff1db
from django.shortcuts import render
from django.http import HttpResponse
from .models import Announcement
from django.views.generic.detail import DetailView
from django.views.generic.edit import CreateView, UpdateView
from dashboard.models import WidgetUser
def index(request):
announcements = Announcement.objects.all()
return render(request, 'announcements/announcements.html', {'announcements':announcements})
class AnnouncementsDetailView(DetailView):
model = Announcement
template_name = 'announcements/announcement-details.html'
class AnnouncementsCreateView(CreateView):
model = Announcement
template_name = 'announcements/announcement-add.html'
fields = ["title", "body", "author"]
class AnnouncementsUpdateView(UpdateView):
model = Announcement
template_name = 'announcements/announcement-edit.html'
fields = '__all__'
\ No newline at end of file
widget_vincentdjango/assignments/admin.py
View file @ 558ff1db
...@@ -9,17 +9,17 @@ class AssignmentInline(admin.StackedInline): ...@@ -9,17 +9,17 @@ class AssignmentInline(admin.StackedInline):
class AssignmentAdmin(admin.ModelAdmin): class AssignmentAdmin(admin.ModelAdmin):
model = Assignment model = Assignment
list_display = ('assignment_name', 'section') list_display = ('assignment_name', 'course',)
search_fields = ('course',) search_fields = ('course',)
list_filter = ('section', 'perfect_score', 'passing_score') list_filter = ('course', 'perfect_score', 'passing_score')
class CourseAdmin(admin.ModelAdmin): class CourseAdmin(admin.ModelAdmin):
model = Course model = Course
list_display = ('course_code', 'course_title',) list_display = ('course_code', 'course_title','section',)
search_fields = ('course_code', 'course_title',) search_fields = ('course_code', 'course_title','section',)
list_filter = ('course_code', 'course_title',) list_filter = ('course_code', 'course_title','section',)
admin.site.register(Course, CourseAdmin) admin.site.register(Course, CourseAdmin)
......
widget_vincentdjango/assignments/migrations/0005_assignment_coursedropdown.py 0 → 100644
View file @ 558ff1db
# Generated by Django 3.2 on 2023-05-12 05:26
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('assignments', '0004_alter_assignment_assignment_name'),
]
operations = [
migrations.AddField(
model_name='assignment',
name='courseDropDown',
field=models.CharField(default='', max_length=100),
),
]
widget_vincentdjango/assignments/migrations/0006_alter_assignment_coursedropdown.py 0 → 100644
View file @ 558ff1db
# Generated by Django 3.2 on 2023-05-12 05:33
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('assignments', '0005_assignment_coursedropdown'),
]
operations = [
migrations.AlterField(
model_name='assignment',
name='courseDropDown',
field=models.CharField(blank=True, default='', max_length=100, unique=True),
),
]
widget_vincentdjango/assignments/migrations/0007_auto_20230512_1428.py 0 → 100644
View file @ 558ff1db
# Generated by Django 3.2 on 2023-05-12 06:28
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('assignments', '0006_alter_assignment_coursedropdown'),
]
operations = [
migrations.RemoveField(
model_name='assignment',
name='section',
),
migrations.AddField(
model_name='course',
name='section',
field=models.CharField(default='', max_length=16),
),
]
widget_vincentdjango/announcementBoard/migrations/0003_merge_0002_auto_20230305_1528_0002_auto_20230305_1746.py → widget_vincentdjango/assignments/migrations/0008_remove_assignment_coursedropdown.py
View file @ 558ff1db
# Generated by Django 3.2 on 2023-03-05 11:15 # Generated by Django 3.2 on 2023-05-12 06:43
from django.db import migrations from django.db import migrations
...@@ -6,9 +6,12 @@ from django.db import migrations ...@@ -6,9 +6,12 @@ from django.db import migrations
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('announcementBoard', '0002_auto_20230305_1528'), ('assignments', '0007_auto_20230512_1428'),
('announcementBoard', '0002_auto_20230305_1746'),
] ]
operations = [ operations = [
migrations.RemoveField(
model_name='assignment',
name='courseDropDown',
),
] ]
widget_vincentdjango/assignments/models.py
View file @ 558ff1db
...@@ -4,8 +4,12 @@ from django.db import models ...@@ -4,8 +4,12 @@ from django.db import models
class Course(models.Model): class Course(models.Model):
course_code = models.CharField(unique=True, default="", max_length=10,) course_code = models.CharField(unique=True, default="", max_length=10,)
course_title = models.CharField(unique=True, default="", max_length=50,) course_title = models.CharField(unique=True, default="", max_length=50,)
section = models.CharField(default="",max_length=16,)
def __str__(self): def __str__(self):
return '{} - {}'.format(self.course_code, self.section,)
def anotherFormat(self):
return '{} {}'.format(self.course_code, self.course_title,) return '{} {}'.format(self.course_code, self.course_title,)
...@@ -14,7 +18,6 @@ class Assignment(models.Model): ...@@ -14,7 +18,6 @@ class Assignment(models.Model):
description = models.TextField(default="") description = models.TextField(default="")
perfect_score = models.IntegerField(default=100) perfect_score = models.IntegerField(default=100)
passing_score = models.IntegerField(default=80) passing_score = models.IntegerField(default=80)
section = models.CharField(max_length=16,)
course = models.ForeignKey( course = models.ForeignKey(
Course, Course,
on_delete=models.CASCADE, on_delete=models.CASCADE,
...@@ -22,11 +25,13 @@ class Assignment(models.Model): ...@@ -22,11 +25,13 @@ class Assignment(models.Model):
) )
def __str__(self): def __str__(self):
return '{} {}-'.format(self.assignment_name, self.section,) return '{} {}-'.format(self.assignment_name, self.course.section,)
def get_absolute_url(self): def get_absolute_url(self):
return '{}'.format(self.pk) return '{}'.format(self.pk)
def save(self, *args, **kwargs):
self.passing_score = self.perfect_score*0.6
super(Assignment, self).save(*args, **kwargs)
widget_vincentdjango/assignments/templates/assignments/assignment-details.html
View file @ 558ff1db
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
{% block heading %} <h1 class="pageTitle"> {{object.assignment_name}} </h1> {% endblock %} {% block heading %} <h1 class="pageTitle"> {{object.assignment_name}} </h1> {% endblock %}
{% block content %} {% block content %}
<h2> {{object.course}} - {{object.section}} </h2> <h2> {{object.course.anotherFormat}} - {{object.course.section}} </h2>
<p> <b>Description:</b> {{object.description}} <br> <p> <b>Description:</b> {{object.description}} <br>
<b>Perfect Score:</b> {{object.perfect_score}} <br> <b>Perfect Score:</b> {{object.perfect_score}} <br>
<b>Passing Score:</b> {{object.passing_score}} <br> <b>Passing Score:</b> {{object.passing_score}} <br>
......
widget_vincentdjango/assignments/templates/assignments/assignments.html
View file @ 558ff1db
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
{% block navigation %} {% block navigation %}
<button class="buttonLink" onclick="window.location.href='add/';"> <b>New Assignment</b> </button><br><br> <button class="buttonLink" onclick="window.location.href='add/';"> <b>New Assignment</b> </button><br><br>
<a class="miniLink" href="/dashboard"> Dashboard </a> <br> <a class="miniLink" href="/dashboard"> Dashboard </a> <br>
<a class="miniLink" href="/announcementBoard"> Announcements </a> <br> <a class="miniLink" href="/announcements"> Announcements </a> <br>
<a class="miniLink" href="/forum"> Forum </a> <br> <a class="miniLink" href="/forum"> Forum </a> <br>
<a class="miniLink" href="/widget_calendar"> Calendar </a> <br> <a class="miniLink" href="/widget_calendar"> Calendar </a> <br>
{% endblock %} {% endblock %}
\ No newline at end of file
widget_vincentdjango/dashboard/templates/dashboard/dashboard.html
View file @ 558ff1db
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
</button> </button>
</div> </div>
<div id="footer"> <div id="footer">
<a href="{% url 'announcementBoard:index' %}">Announcement Board</a> <a href="{% url 'announcements:index' %}">Announcement Board</a>
<a href="{% url 'forum:index' %}">Forum</a> <a href="{% url 'forum:index' %}">Forum</a>
<a href="{% url 'assignments:homePage' %}">Assignments</a> <a href="{% url 'assignments:homePage' %}">Assignments</a>
<a href="{% url 'widget_calendar:index' %}">Calendar</a> <a href="{% url 'widget_calendar:index' %}">Calendar</a>
......
widget_vincentdjango/forum/migrations/0003_auto_20230512_1300.py 0 → 100644
View file @ 558ff1db
# Generated by Django 3.2 on 2023-05-12 05:00
import datetime
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('forum', '0002_reply_post'),
]
operations = [
migrations.AlterField(
model_name='forumpost',
name='pub_datetime',
field=models.DateTimeField(default=datetime.datetime(2023, 5, 12, 13, 0, 44, 600788), 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/forum/migrations/0004_alter_forumpost_pub_datetime.py 0 → 100644
View file @ 558ff1db
# Generated by Django 3.2 on 2023-05-12 05:16
import datetime
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('forum', '0003_auto_20230512_1300'),
]
operations = [
migrations.AlterField(
model_name='forumpost',
name='pub_datetime',
field=models.DateTimeField(default=datetime.datetime(2023, 5, 12, 13, 16, 35, 558089), editable=False),
),
]
widget_vincentdjango/forum/migrations/0005_alter_forumpost_pub_datetime.py 0 → 100644
View file @ 558ff1db
# Generated by Django 3.2 on 2023-05-12 05:26
import datetime
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('forum', '0004_alter_forumpost_pub_datetime'),
]
operations = [
migrations.AlterField(
model_name='forumpost',
name='pub_datetime',
field=models.DateTimeField(default=datetime.datetime(2023, 5, 12, 13, 26, 27, 568329), editable=False),
),
]
widget_vincentdjango/forum/migrations/0006_alter_forumpost_pub_datetime.py 0 → 100644
View file @ 558ff1db
# Generated by Django 3.2 on 2023-05-12 05:33
import datetime
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('forum', '0005_alter_forumpost_pub_datetime'),
]
operations = [
migrations.AlterField(
model_name='forumpost',
name='pub_datetime',
field=models.DateTimeField(default=datetime.datetime(2023, 5, 12, 13, 33, 51, 594255), editable=False),
),
]
widget_vincentdjango/forum/migrations/0007_alter_forumpost_pub_datetime.py 0 → 100644
View file @ 558ff1db
# Generated by Django 3.2 on 2023-05-12 06:28
import datetime
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('forum', '0006_alter_forumpost_pub_datetime'),
]
operations = [
migrations.AlterField(
model_name='forumpost',
name='pub_datetime',
field=models.DateTimeField(default=datetime.datetime(2023, 5, 12, 14, 28, 15, 198274), editable=False),
),
]
widget_vincentdjango/forum/migrations/0008_alter_forumpost_pub_datetime.py 0 → 100644
View file @ 558ff1db
# Generated by Django 3.2 on 2023-05-12 06:43
import datetime
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('forum', '0007_alter_forumpost_pub_datetime'),
]
operations = [
migrations.AlterField(
model_name='forumpost',
name='pub_datetime',
field=models.DateTimeField(default=datetime.datetime(2023, 5, 12, 14, 43, 53, 323691), editable=False),
),
]
widget_vincentdjango/forum/migrations/0009_alter_forumpost_pub_datetime.py 0 → 100644
View file @ 558ff1db
# Generated by Django 3.2 on 2023-05-12 06:46
import datetime
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('forum', '0008_alter_forumpost_pub_datetime'),
]
operations = [
migrations.AlterField(
model_name='forumpost',
name='pub_datetime',
field=models.DateTimeField(default=datetime.datetime(2023, 5, 12, 14, 46, 44, 130987), editable=False),
),
]
widget_vincentdjango/forum/templates/forum/forum.html
View file @ 558ff1db
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<button onclick="window.location.href='{% url 'forum:forumpost-add' %}';" class="action-button"> New Post </button> <button onclick="window.location.href='{% url 'forum:forumpost-add' %}';" class="action-button"> New Post </button>
<div id="footer"> <div id="footer">
<a href="{% url 'dashboard:index' %}">Dashboard</a> <a href="{% url 'dashboard:index' %}">Dashboard</a>
<a href="{% url 'announcementBoard:index' %}">Announcements</a> <a href="{% url 'announcements:index' %}">Announcements</a>
<a href="{% url 'assignments:homePage' %}">Assignments</a> <a href="{% url 'assignments:homePage' %}">Assignments</a>
<a href="{% url 'widget_calendar:index' %}">Calendar</a> <a href="{% url 'widget_calendar:index' %}">Calendar</a>
</div> </div>
......
widget_vincentdjango/widget_calendar/migrations/0009_alter_event_target_datetime.py 0 → 100644
View file @ 558ff1db
# Generated by Django 3.2 on 2023-05-12 05:00
import datetime
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('widget_calendar', '0008_alter_event_target_datetime'),
]
operations = [
migrations.AlterField(
model_name='event',
name='target_datetime',
field=models.DateTimeField(default=datetime.datetime(2023, 5, 12, 13, 0, 44, 602793)),
),
]
widget_vincentdjango/widget_calendar/migrations/0010_alter_event_target_datetime.py 0 → 100644
View file @ 558ff1db
# Generated by Django 3.2 on 2023-05-12 05:16
import datetime
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('widget_calendar', '0009_alter_event_target_datetime'),
]
operations = [
migrations.AlterField(
model_name='event',
name='target_datetime',
field=models.DateTimeField(default=datetime.datetime(2023, 5, 12, 13, 16, 35, 560192)),
),
]
widget_vincentdjango/widget_calendar/migrations/0011_alter_event_target_datetime.py 0 → 100644
View file @ 558ff1db
# Generated by Django 3.2 on 2023-05-12 05:26
import datetime
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('widget_calendar', '0010_alter_event_target_datetime'),
]
operations = [
migrations.AlterField(
model_name='event',
name='target_datetime',
field=models.DateTimeField(default=datetime.datetime(2023, 5, 12, 13, 26, 27, 570448)),
),
]
widget_vincentdjango/widget_calendar/migrations/0012_alter_event_target_datetime.py 0 → 100644
View file @ 558ff1db
# Generated by Django 3.2 on 2023-05-12 05:33
import datetime
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('widget_calendar', '0011_alter_event_target_datetime'),
]
operations = [
migrations.AlterField(
model_name='event',
name='target_datetime',
field=models.DateTimeField(default=datetime.datetime(2023, 5, 12, 13, 33, 51, 596255)),
),
]
widget_vincentdjango/widget_calendar/migrations/0013_alter_event_target_datetime.py 0 → 100644
View file @ 558ff1db
# Generated by Django 3.2 on 2023-05-12 06:28
import datetime
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('widget_calendar', '0012_alter_event_target_datetime'),
]
operations = [
migrations.AlterField(
model_name='event',
name='target_datetime',
field=models.DateTimeField(default=datetime.datetime(2023, 5, 12, 14, 28, 15, 200372)),
),
]
widget_vincentdjango/widget_calendar/migrations/0014_alter_event_target_datetime.py 0 → 100644
View file @ 558ff1db
# Generated by Django 3.2 on 2023-05-12 06:43
import datetime
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('widget_calendar', '0013_alter_event_target_datetime'),
]
operations = [
migrations.AlterField(
model_name='event',
name='target_datetime',
field=models.DateTimeField(default=datetime.datetime(2023, 5, 12, 14, 43, 53, 325690)),
),
]
widget_vincentdjango/widget_calendar/migrations/0015_alter_event_target_datetime.py 0 → 100644
View file @ 558ff1db
# Generated by Django 3.2 on 2023-05-12 06:46
import datetime
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('widget_calendar', '0014_alter_event_target_datetime'),
]
operations = [
migrations.AlterField(
model_name='event',
name='target_datetime',
field=models.DateTimeField(default=datetime.datetime(2023, 5, 12, 14, 46, 44, 132978)),
),
]
widget_vincentdjango/widget_vincentdjango/settings.py
View file @ 558ff1db
...@@ -43,7 +43,7 @@ INSTALLED_APPS = [ ...@@ -43,7 +43,7 @@ INSTALLED_APPS = [
'django.contrib.staticfiles', 'django.contrib.staticfiles',
'dashboard', 'dashboard',
'assignments', 'assignments',
'announcementBoard', 'announcements',
'forum', 'forum',
'widget_calendar', 'widget_calendar',
] ]
......
widget_vincentdjango/widget_vincentdjango/urls.py
View file @ 558ff1db
...@@ -21,6 +21,6 @@ urlpatterns = [ ...@@ -21,6 +21,6 @@ urlpatterns = [
path('', include('dashboard.urls', namespace="dashboard")), path('', include('dashboard.urls', namespace="dashboard")),
path('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('assignments/', include('assignments.urls', namespace="assignments")),
path('announcementBoard/', include('announcementBoard.urls', namespace="announcementBoard")), path('announcements/', include('announcements.urls', namespace="announcements")),
path('forum/', include('forum.urls', namespace="forum")), path('forum/', include('forum.urls', namespace="forum")),
] ]
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment