Skip to content

Commit

Permalink
AJAX for edit calendar.
Browse files Browse the repository at this point in the history
  • Loading branch information
dzhuang committed May 28, 2018
1 parent 5187581 commit 9e89cff
Show file tree
Hide file tree
Showing 14 changed files with 3,652 additions and 1,019 deletions.
1,167 changes: 968 additions & 199 deletions course/calendar.py

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion course/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,6 @@ class Event(models.Model):
verbose_name=_('All day'))

shown_in_calendar = models.BooleanField(default=True,
help_text=_("Shown in students' calendar"),
verbose_name=_('Shown in calendar'))

class Meta:
Expand All @@ -332,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
631 changes: 486 additions & 145 deletions course/templates/course/calendar.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion course/templates/course/course-base.html
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
{% if perms.course.add_event and perms.course.change_event and perms.course.delete_event %}
<li><a href="{% url "admin:course_event_changelist" %}?course__id__exact={{ course.id }}" target="_blank">{% trans "Edit events (admin)" %}</a></li>
{% endif %}
<li><a href="{% url "relate-edit_calendar" course.identifier %}">{% trans "Edit events (calendar)" %}</a></li>
<li><a href="{% url "relate-view_calendar" course.identifier "edit" %}">{% trans "Edit events (calendar)" %}</a></li>
<li><a href="{% url "relate-create_recurring_events" course.identifier %}">{% trans "Create recurring events" %}</a></li>
<li><a href="{% url "relate-renumber_events" course.identifier %}">{% trans "Renumber events" %}</a></li>
{% endif %}
Expand Down
12 changes: 12 additions & 0 deletions course/templates/course/events_info.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{% for event_info in event_info_list %}
<div id="event-{{ event_info.id }}" class="panel panel-default relate-calendar-event">
<div class="panel-heading">
<b>{{ event_info.human_title }}</b>
({{ event_info.start_time }}{% if event_info.end_time %} -
{{ event_info.end_time }}{% endif %})
</div>
<div class="panel-body">
{{ event_info.description|safe }}
</div>
</div>
{% endfor %}
Loading

0 comments on commit 9e89cff

Please sign in to comment.