Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Event CRUD 2.0 #587

Open
wants to merge 36 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
1d613f6
add interface
paul841029 Aug 20, 2017
6fdbff3
add modal box form
paul841029 Aug 20, 2017
fb9aa4d
investigating widget
paul841029 Aug 20, 2017
e429bbc
resolve widget issue
paul841029 Aug 20, 2017
0d948ff
next step is form validation
paul841029 Aug 20, 2017
f09603c
next step is update event
paul841029 Aug 21, 2017
e89a645
next step is edit event
paul841029 Aug 21, 2017
d8e77cf
fixed styling issue
paul841029 Aug 21, 2017
8d32297
configure exception interface
paul841029 Aug 21, 2017
86281bf
adding for editing events
paul841029 Aug 25, 2017
9290775
fixing styles
paul841029 Aug 25, 2017
8d41c45
html minor change
paul841029 Aug 25, 2017
fa5a492
bugs fixed
paul841029 Aug 26, 2017
ffb22f2
style
paul841029 Aug 26, 2017
3943313
Added shortcut for relate-edit_calendar
dzhuang Sep 14, 2017
fbcff66
Merge branch 'event_CRUD_2.0_patch' into 'event_CRUD_2.0'
dzhuang Sep 14, 2017
8f2a721
Re-organize calendar view.
dzhuang Sep 14, 2017
09d7aea
Merge remote-tracking branch 'remotes/gitlab_upstream/master' into ev…
dzhuang Sep 14, 2017
453ad2f
Re-organize calendar view (continued)
dzhuang Sep 14, 2017
ae19dd2
Merge branch 'event_CRUD_2.0_patch' into 'event_CRUD_2.0'
dzhuang Sep 21, 2017
5970032
date time comparable issue (fixed)
paul841029 Sep 21, 2017
b574f6f
Added testcases for event_CRUD_2.0. Allow update no-ordinal Events
dzhuang Sep 21, 2017
8f937b7
Remove dependency of eonasdan-bootstrap-datetimepicker
dzhuang Sep 25, 2017
98de7cf
Merge branch 'master' into event_CRUD_2.0
dzhuang Oct 5, 2017
d6c1dd4
Added confirmation before delete event.
dzhuang Oct 5, 2017
61b82ac
change to a responsive modal width
paul841029 Oct 15, 2017
d9e4d0d
Remove unnecessary js code since js dependency had been updated.
dzhuang Oct 16, 2017
04afa12
Merge remote-tracking branch 'remotes/gitlab_upstream/master' into ev…
dzhuang Feb 5, 2018
f5a81c6
Mobile view and check event perm for menu.
dzhuang Feb 5, 2018
473438d
Merge remote-tracking branch 'remotes/upstream/master' into event_CRU…
dzhuang May 6, 2018
5187581
Merge remote-tracking branch 'remotes/upstream/master' into event_CRU…
dzhuang May 26, 2018
1a21d6e
AJAX for edit calendar.
dzhuang May 26, 2018
09b5d5d
Prevent calendar notes being covered in listMonth view when no events
dzhuang May 30, 2018
1c143ac
Make sure only events for pctx.course get updated, fix invalid tests.
dzhuang Jun 1, 2018
fb46ebf
Disable input when processing event CRUD.
dzhuang Jun 1, 2018
1c6b4b3
fullCalendar's today should respect faked now.
dzhuang Jun 7, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,022 changes: 994 additions & 28 deletions course/calendar.py

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.10.7 on 2017-09-25 10:37
from __future__ import unicode_literals

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('course', '0111_alter_git_source_in_course_to_a_required_field'),
]

operations = [
migrations.AlterField(
model_name='event',
name='shown_in_calendar',
field=models.BooleanField(default=True, help_text="Shown in students' calendar", verbose_name='Shown in calendar'),
),
]
1 change: 1 addition & 0 deletions course/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,7 @@ def clean(self):
_("End time must not be ahead of start time.")})

def save(self, *args, **kwargs):
# type: (*Any, **Any) -> None
self.full_clean()

if self.ordinal is None:
Expand Down
Loading