fix modal calendar - refs #2186

pull/2818/head
Alex Aragón 6 years ago
parent ceb69e369e
commit 7bcafeb423
  1. 267
      main/template/default/agenda/month.html.twig

@ -28,8 +28,6 @@ var region_value = '{{ region_value }}';
$(document).ready(function() {
console.log('{{ _p.web_main }}');
console.log('{{ _p.web_plugin }}');
var cookieData = Cookies.getJSON('agenda_cookies');
var defaultView = (cookieData && cookieData.view) || '{{ default_view }}';
var defaultStartDate = (cookieData && cookieData.start) || moment.now();
@ -39,23 +37,13 @@ $(document).ready(function() {
$("#session_id").find('option').removeAttr("selected");
});
$("#dialog-form").dialog({
autoOpen : false,
modal : false,
width : 580,
height : 480,
zIndex : 20000 // added because of qtip2
});
/*$("#simple-dialog-form").dialog({
autoOpen : false,
modal : false,
width : 580,
height : 480,
zIndex : 20000 // added because of qtip2
});*/
function loadColors(calEvent){
$('#color_calendar').removeClass();
$('#color_calendar').html('{{ type_label | escape('js') }}');
$('#color_calendar').addClass('label_tag');
$('#color_calendar').addClass(calEvent.type+'_event');
$('.type-agenda').show();
}
var title = $("#title"),
content = $("#content"),
@ -171,14 +159,17 @@ $(document).ready(function() {
//It shows the CKEDITOR while Adding an Event
$('#cke_content').show();
//It Fixing a minor bug with textarea ckeditor.remplace
$('#content').css('display','none');
// $('#content').css('display','none');
//Reset the CKEditor content that persist in memory
CKEDITOR.instances['content'].setData('');
allFields.removeClass("ui-state-error");
$("#dialog-form").dialog("open");
$("#dialog-form").dialog({
buttons: {
'{{ "Add" | get_lang }}' : function() {
$("#modalDialogForm").modal();
var btnSave = '<button id="btnSave" type="button" class="btn btn-primary">{{ "Add" | get_lang }}</button>';
$("#modalDialogForm #modalFooter").html(btnSave);
$("#btnSave").click( function() {
var bValid = true;
bValid = bValid && checkLength(title, "title", 1, 255);
@ -217,23 +208,16 @@ $(document).ready(function() {
}*/
}
$("#title").val('');
/*$("#title").val('');
$("#content").val('');
$("#comment").val('');
$("#comment").val('');*/
calendar.fullCalendar('refetchEvents');
calendar.fullCalendar('rerenderEvents');
$("#dialog-form").dialog('close');
$('#modalDialogForm').modal('toggle');
}
});
}
},
close: function() {
$("#title").val('');
$("#content").val('');
$("#comment").val('');
}
});
calendar.fullCalendar('unselect');
@ -242,83 +226,12 @@ $(document).ready(function() {
calendar.fullCalendar("rerenderEvents");
}
},
/*eventRender: function(event, element) {
if (event.attachment) {
/*element.qtip({
hide: {
delay: 2000
},
content: event.attachment,
position: { at:'top right' , my:'bottom right'}
}).removeData('qtip'); // this is an special hack to add multiple qtip in the same target
}
var onHoverInfo = '';
{#{% if on_hover_info.description %}#}
if (event.description) {
onHoverInfo = event.description;
}
{#{% endif %}
{% if on_hover_info.comment %}#}
if (event.comment) {
onHoverInfo = onHoverInfo + event.comment;
}
{#{% endif %}#}
if (onHoverInfo) {
element.qtip({
content: onHoverInfo,
position: {
at: 'top center',
my: 'bottom center'
}
});
}
},*/
eventClick: function(calEvent, jsEvent, view) {
var start = calEvent.start;
var end = calEvent.end;
var diffDays = moment(end).diff(start, 'days');
var endDateMinusOne = '';
//$('#modalBody').html(calEvent.description);
// If event is not editable then just return the qtip
/*if (!calEvent.editable) {
var onHoverInfo = '';
{#{% if calEvent.description %}#}
if (calEvent.description) {
onHoverInfo = calEvent.description;
}
{#{% endif %}
{% if on_hover_info.comment %}#}
if (calEvent.comment) {
onHoverInfo = onHoverInfo + calEvent.comment;
}
{#{% endif %}#}
if (/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent)) {
$(this).qtip({
overwrite: false,
show: {ready: true},
content: onHoverInfo,
position: {
at: 'top center',
my: 'bottom center'
}
});
return;
}
}*/
if (end) {
var clone = end.clone();
endDateMinusOne = clone.subtract(1, 'days').format('{{ js_format_date }}');
@ -336,15 +249,7 @@ $(document).ready(function() {
$(".user-sender").show();
{% endif %}
$('#color_calendar').html('{{ type_label | escape('js') }}');
$('#color_calendar').addClass('label_tag');
$('#color_calendar').removeClass('course_event');
$('#color_calendar').removeClass('personal_event');
$('#color_calendar').removeClass('group_event');
$('#color_calendar').addClass(calEvent.type+'_event');
$('.type-agenda').show();
// It hides the CKEDITOR while clicking an existing Event
$('#cke_content').hide();
loadColors(calEvent);
$('#simple_start_date').html(startDateToString);
if (diffDays > 1) {
@ -364,21 +269,20 @@ $(document).ready(function() {
$("#simple_comment").html(calEvent.comment);
if (calEvent.course_name) {
$('#type_course').html({{ 'Course' | get_lang }})
$("#calendar_course_info_simple").html(calEvent.course_name);
$("#type_course").html("{{ 'Course' | get_lang }}");
} else {
$("#calendar_course_info_simple").html('');
}
if (calEvent.session_name) {
$('#type_course').html({{ 'Session' | get_lang }})
$("#calendar_course_info_simple").html(calEvent.session_name);
$('#type_course').html("{{ 'Session' | get_lang }}");
} else {
$("#calendar_course_info_simple").html('');
}
allFields.removeClass( "ui-state-error" );
$("#dialog-form").dialog("open");
$('#modalTitle').html(calEvent.title);
$('#calendarModal').modal();
@ -401,6 +305,31 @@ $(document).ready(function() {
$('#modalFooter').html(exportCalConfidential+exportCalPrivate+exportCalPublic+btnEdit+btnDelete);
{% if type == 'not_available' %}
$('#btnEdit').click(function() {
var bValid = true;
bValid = bValid && checkLength( title, "title", 1, 255 );
var params = $("#add_event_form").serialize();
$.ajax({
url: url+'&'+params,
success:function() {
calEvent.title = $("#title").val();
calEvent.start = calEvent.start;
calEvent.end = calEvent.end;
calEvent.allDay = calEvent.allDay;
calEvent.description = $("#content").val();
calendar.fullCalendar('updateEvent',
calEvent,
true // make the event "stick"
);
//close modal
$('#calendarModal').modal('toggle');
}
});
});
{% endif %}
$('#btnDelete').click(function() {
if (calEvent.parent_event_id || calEvent.has_children != '') {
var newDiv = $('<div>');
@ -464,58 +393,12 @@ $(document).ready(function() {
);
calendar.fullCalendar('refetchEvents');
calendar.fullCalendar('rerenderEvents');
$("#dialog-form").dialog('close');
//close modal
$('#calendarModal').modal('toggle');
}
});
});
$("#dialog-form").dialog({
buttons: {
{% if type == 'not_available' %}
'{{ "Edit" | get_lang }}' : function() {
var bValid = true;
bValid = bValid && checkLength( title, "title", 1, 255 );
var params = $("#add_event_form").serialize();
$.ajax({
url: url+'&'+params,
success:function() {
calEvent.title = $("#title").val();
calEvent.start = calEvent.start;
calEvent.end = calEvent.end;
calEvent.allDay = calEvent.allDay;
calEvent.description = $("#content").val();
calendar.fullCalendar('updateEvent',
calEvent,
true // make the event "stick"
);
$("#dialog-form").dialog("close");
}
});
},
{% endif %}
},
close: function() {
$("#title_edit").hide();
$("#content_edit").hide();
$("#comment_edit").hide();
$("#title").show();
$("#content").show();
$("#comment").show();
$("#title_edit").html('');
$("#content_edit").html('');
$("#comment_edit").html('');
$("#title").val('');
$("#content").val('');
$("#comment").val('');
}
});
} else {
// Simple form
$('#simple_start_date').html(startDateToString);
@ -531,6 +414,8 @@ $(document).ready(function() {
$('#simple_end_date').html('');
}
loadColors(calEvent);
if (calEvent.course_name) {
$("#calendar_course_info_simple").html(calEvent.course_name);
$("#type_course").html("{{ 'Course' | get_lang }}");
@ -603,10 +488,24 @@ $(document).ready(function() {
{{ actions_div }}
{{ toolbar }}
<div id="dialog-form" style="display:none;">
<div class="dialog-form-content">
<div id="modalDialogForm" class="modal" tabindex="-1" role="dialog">
<div class="modal-dialog modal-lg" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title">{{ "Add event" | get_lang }}</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
{{ form_add }}
</div>
<div id="modalFooter" class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
<button type="button" class="btn btn-primary">Save changes</button>
</div>
</div>
</div>
</div>
{% if legend_list %}
@ -615,12 +514,14 @@ $(document).ready(function() {
{% endfor %}
<br /><br />
{% endif %}
<div id="loading" style="margin-left:150px;position:absolute;display:none">
{{ "Loading" | get_lang }}...
</div>
<div id="calendar"></div>
<div id="calendarModal" class="modal" tabindex="-1" role="dialog">
<div id="calendarModal" class="modal" tabindex="-1" role="dialog">
<div class="modal-dialog modal-lg" role="document">
<div class="modal-content">
<div class="modal-header">
@ -632,44 +533,44 @@ $(document).ready(function() {
<div id="modalBody" class="modal-body">
<dl class="row">
<!--- type event course o session -->
<dt id="type_course" class="col-sm-3"></dt>
<dd class="col-sm-9">
<dt id="type_course" class="col-sm-2"></dt>
<dd class="col-sm-10">
<span id="calendar_course_info_simple"></span>
</dd>
<!--- user sender -->
<dt class="user-sender col-sm-3" style="display: none;">
<dt class="user-sender col-sm-2" style="display: none;">
{{ "To" |get_lang }}
</dt>
<dd class="user-sender col-sm-9" style="display: none">
<dd class="user-sender col-sm-10" style="display: none">
<span id="visible_to_read_only_users"></span>
</dd>
<!--- type agenda -->
<dt class="type-agenda col-sm-3" style="display: none">
<dt class="type-agenda col-sm-2" style="display: none">
{{ "Agenda" |get_lang }}
</dt>
<dd class="type-agenda col-sm-9" style="display: none">
<dd class="type-agenda col-sm-10" style="display: none">
<div id="color_calendar"></div>
</dd>
<dt class="col-sm-3">{{ "Title" |get_lang }}</dt>
<dd class="col-sm-9">
<dt class="col-sm-2">{{ "Title" |get_lang }}</dt>
<dd class="col-sm-10">
<div id="simple_title"></div>
</dd>
<dt class="col-sm-3">{{ "Date" |get_lang }}</dt>
<dd class="col-sm-9">
<dt class="col-sm-2">{{ "Date" |get_lang }}</dt>
<dd class="col-sm-10">
<span id="simple_start_date"></span>
<span id="simple_end_date"></span>
</dd>
<dt class="col-sm-3">{{ "Description" |get_lang }}</dt>
<dd class="col-sm-9">
<dt class="col-sm-2">{{ "Description" |get_lang }}</dt>
<dd class="col-sm-10">
<div id="simple_content"></div>
</dd>
<dt class="col-sm-3">{{ "Comment" |get_lang }}</dt>
<dd class="col-sm-9">
<dt class="col-sm-2">{{ "Comment" |get_lang }}</dt>
<dd class="col-sm-10">
<div id="simple_comment"></div>
</dd>
</dl>
@ -679,6 +580,6 @@ $(document).ready(function() {
</div>
</div>
</div>
</div>
</div>
{% endautoescape %}
Loading…
Cancel
Save