Skip to content
Snippets Groups Projects
Commit 36c1f845 authored by Carlos Vega's avatar Carlos Vega
Browse files

moved code and checks to eventRender

parent b7f9650f
No related branches found
No related tags found
1 merge request!206Improvement/interface changes
...@@ -154,14 +154,6 @@ function get_subjects_events(day) { ...@@ -154,14 +154,6 @@ function get_subjects_events(day) {
title_subject.find('a[title]').tooltip(); title_subject.find('a[title]').tooltip();
$.each(subject.events, function (index_event, event) { $.each(subject.events, function (index_event, event) {
if (event.link_when) { if (event.link_when) {
if(event.status == 'SCHEDULED'){
event.editable = true;
event.eventStartEditable = true;
}else{
event.editable = false;
event.eventStartEditable = false;
event.className = 'stripes';
}
event.title = event.short_title; event.title = event.short_title;
event.color = subject.color + ' !important'; event.color = subject.color + ' !important';
event.start = $.fullCalendar.moment(event.link_when); event.start = $.fullCalendar.moment(event.link_when);
...@@ -207,14 +199,6 @@ function get_subjects_events(day) { ...@@ -207,14 +199,6 @@ function get_subjects_events(day) {
title_location.find('a[title]').tooltip(); title_location.find('a[title]').tooltip();
$.each(location.events, function (index_event, event) { $.each(location.events, function (index_event, event) {
if (event.link_who) { if (event.link_who) {
if(event.status == 'SCHEDULED'){
event.editable = true;
event.eventStartEditable = true;
}else{
event.editable = false;
event.eventStartEditable = false;
event.className = 'stripes';
}
event.title = event.short_title; event.title = event.short_title;
event.color = location.color + ' !important'; event.color = location.color + ' !important';
event.start = $.fullCalendar.moment(event.link_when); event.start = $.fullCalendar.moment(event.link_when);
...@@ -382,8 +366,9 @@ function addDailyPlanningCalendar(calendar_selector, replace_all, calendar_dict_ ...@@ -382,8 +366,9 @@ function addDailyPlanningCalendar(calendar_selector, replace_all, calendar_dict_
var default_properties = { var default_properties = {
schedulerLicenseKey: 'CC-Attribution-NonCommercial-NoDerivatives', schedulerLicenseKey: 'CC-Attribution-NonCommercial-NoDerivatives',
defaultView: 'agendaDay', defaultView: 'agendaDay',
eventStartEditable: true,
eventDurationEditable: false, eventDurationEditable: false,
editable: false, editable: true,
selectable: true, selectable: true,
droppable: true, droppable: true,
weekends: false, weekends: false,
...@@ -467,7 +452,9 @@ function addDailyPlanningCalendar(calendar_selector, replace_all, calendar_dict_ ...@@ -467,7 +452,9 @@ function addDailyPlanningCalendar(calendar_selector, replace_all, calendar_dict_
}, },
eventRender: function (event, element) { eventRender: function (event, element) {
if (event.rendering !== 'background') { if (event.rendering !== 'background') {
if(event.className == 'stripes'){ if(!is_event_not_finished(event)){
event.editable = false;
event.startEditable = false;
var color = event.color.replace('!important', '').trim(); var color = event.color.replace('!important', '').trim();
element.css({ element.css({
'background': `repeating-linear-gradient( -45deg, ${color}, ${color} 10px, #333 10px, #333 20px )`, 'background': `repeating-linear-gradient( -45deg, ${color}, ${color} 10px, #333 10px, #333 20px )`,
......
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