Skip to content
Snippets Groups Projects
Commit f5c55371 authored by Valentin Groues's avatar Valentin Groues :eyes:
Browse files

daily planning fixes

parent d325c5d7
No related branches found
No related tags found
No related merge requests found
Pipeline #
...@@ -40,7 +40,7 @@ def events(request, date): ...@@ -40,7 +40,7 @@ def events(request, date):
if appointment_subject.id not in subjects: if appointment_subject.id not in subjects:
# create subject # create subject
subject = { subject = {
'name': str(appointment_subject), 'name': unicode(appointment_subject),
'id': appointment_subject.id, 'id': appointment_subject.id,
'color': RANDOM_COLORS[i], 'color': RANDOM_COLORS[i],
'events': [] 'events': []
...@@ -56,7 +56,7 @@ def events(request, date): ...@@ -56,7 +56,7 @@ def events(request, date):
event = { event = {
'title': link.appointment_type.description, 'title': link.appointment_type.description,
'duration': build_duration(link.appointment_type.default_duration), 'duration': build_duration(link.appointment_type.default_duration),
'subject': str(appointment_subject), 'subject': unicode(appointment_subject),
'id': '{}-{}'.format(i, j), 'id': '{}-{}'.format(i, j),
'link_id': link.id, 'link_id': link.id,
'link_when': link_when, 'link_when': link_when,
......
...@@ -22,4 +22,8 @@ ...@@ -22,4 +22,8 @@
list-style: none; list-style: none;
margin: 0; margin: 0;
padding: 0; padding: 0;
}
.fc-event {
font-size: 1em !important;
} }
\ No newline at end of file
...@@ -134,7 +134,6 @@ $(document).ready(function () { ...@@ -134,7 +134,6 @@ $(document).ready(function () {
$('#calendar').fullCalendar({ $('#calendar').fullCalendar({
schedulerLicenseKey: 'CC-Attribution-NonCommercial-NoDerivatives', schedulerLicenseKey: 'CC-Attribution-NonCommercial-NoDerivatives',
defaultView: 'agendaDay', defaultView: 'agendaDay',
defaultDate: '2017-03-01',
eventDurationEditable: false, eventDurationEditable: false,
eventStartEditable: true, eventStartEditable: true,
editable: true, editable: true,
...@@ -151,6 +150,7 @@ $(document).ready(function () { ...@@ -151,6 +150,7 @@ $(document).ready(function () {
minTime: "08:00:00", minTime: "08:00:00",
maxTime: "19:00:00", maxTime: "19:00:00",
groupByResource: true, groupByResource: true,
height: "auto",
customButtons: { customButtons: {
save: { save: {
text: 'Save', text: 'Save',
...@@ -226,7 +226,7 @@ $(document).ready(function () { ...@@ -226,7 +226,7 @@ $(document).ready(function () {
element.popover({ element.popover({
title: event.title, title: event.title,
container: 'body', container: 'body',
// placement: 'bottom', placement: 'bottom',
trigger: 'click', trigger: 'click',
content: '<ul>' + content: '<ul>' +
'<li>' + event.subject + '</li>' + '<li>' + event.subject + '</li>' +
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment