diff --git a/smash/web/api_views/daily_planning.py b/smash/web/api_views/daily_planning.py index 98189d0e0f13e6dc0b4ac6bb90cc03020bac24dd..ce152cf31c801e3c4c4bb95b0b0056f0fa7f6dd3 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 a5431df979fc817232aa7e663384f291513f48d7..6402f390b6f5fee01bcbd460029f121075caa3f0 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 de8065f92722485a623e4c067763295b00ef8e13..920909990dcf9d63544d1cc8aa0e62f1175c387e 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>' +