From f5c55371e42e04ad8b35f09b18259a8f120056f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Valentin=20Grou=C3=A8s?= <valentin.groues@uni.lu>
Date: Thu, 18 May 2017 11:02:46 +0200
Subject: [PATCH] daily planning fixes
---
smash/web/api_views/daily_planning.py | 4 ++--
smash/web/static/css/daily_planning.css | 4 ++++
smash/web/static/js/daily_planning.js | 4 ++--
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/smash/web/api_views/daily_planning.py b/smash/web/api_views/daily_planning.py
index 98189d0e..ce152cf3 100644
--- a/smash/web/api_views/daily_planning.py
+++ b/smash/web/api_views/daily_planning.py
@@ -40,7 +40,7 @@ def events(request, date):
if appointment_subject.id not in subjects:
# create subject
subject = {
- 'name': str(appointment_subject),
+ 'name': unicode(appointment_subject),
'id': appointment_subject.id,
'color': RANDOM_COLORS[i],
'events': []
@@ -56,7 +56,7 @@ def events(request, date):
event = {
'title': link.appointment_type.description,
'duration': build_duration(link.appointment_type.default_duration),
- 'subject': str(appointment_subject),
+ 'subject': unicode(appointment_subject),
'id': '{}-{}'.format(i, j),
'link_id': link.id,
'link_when': link_when,
diff --git a/smash/web/static/css/daily_planning.css b/smash/web/static/css/daily_planning.css
index a5431df9..6402f390 100644
--- a/smash/web/static/css/daily_planning.css
+++ b/smash/web/static/css/daily_planning.css
@@ -22,4 +22,8 @@
list-style: none;
margin: 0;
padding: 0;
+}
+
+.fc-event {
+ font-size: 1em !important;
}
\ No newline at end of file
diff --git a/smash/web/static/js/daily_planning.js b/smash/web/static/js/daily_planning.js
index de8065f9..92090999 100644
--- a/smash/web/static/js/daily_planning.js
+++ b/smash/web/static/js/daily_planning.js
@@ -134,7 +134,6 @@ $(document).ready(function () {
$('#calendar').fullCalendar({
schedulerLicenseKey: 'CC-Attribution-NonCommercial-NoDerivatives',
defaultView: 'agendaDay',
- defaultDate: '2017-03-01',
eventDurationEditable: false,
eventStartEditable: true,
editable: true,
@@ -151,6 +150,7 @@ $(document).ready(function () {
minTime: "08:00:00",
maxTime: "19:00:00",
groupByResource: true,
+ height: "auto",
customButtons: {
save: {
text: 'Save',
@@ -226,7 +226,7 @@ $(document).ready(function () {
element.popover({
title: event.title,
container: 'body',
- // placement: 'bottom',
+ placement: 'bottom',
trigger: 'click',
content: '<ul>' +
'<li>' + event.subject + '</li>' +
--
GitLab