Merge branch '3.2.5' into 'dev'

April 9 update v1

See merge request TheGamecraft/c-cms!96
This commit is contained in:
Mathieu Lagace
2020-04-09 21:55:16 +00:00

View File

@@ -34,6 +34,7 @@
</div> </div>
<!-- Scripts --> <!-- Scripts -->
<script src="https://polyfill.io/v3/polyfill.min.js?features=Intl.~locale.en"></script>
<script src="/js/core/jquery.min.js"></script> <script src="/js/core/jquery.min.js"></script>
<script src="/js/core/popper.min.js"></script> <script src="/js/core/popper.min.js"></script>
<script src="/js/core/bootstrap-material-design.min.js"></script> <script src="/js/core/bootstrap-material-design.min.js"></script>
@@ -55,27 +56,32 @@
document.addEventListener('DOMContentLoaded', function() { document.addEventListener('DOMContentLoaded', function() {
$('#test').html('DOM ContentLoaded'); $('#test').html('DOM ContentLoaded');
var calendarEl = document.getElementById('public_calendar'); var calendarEl = document.getElementById('public_calendar');
var calendar = new FullCalendar.Calendar(calendarEl, { try {
plugins: [ 'dayGrid' ], var calendar = new FullCalendar.Calendar(calendarEl, {
locale: 'fr', plugins: [ 'dayGrid' ],
header: { locale: 'fr',
left: 'title', header: {
center: '', left: 'title',
right: 'prev,next' center: '',
}, right: 'prev,next'
events: '/api/schedule/events', },
eventClick: function(info) { events: '/api/schedule/events',
console.log(info.event.id) eventClick: function(info) {
$.get( "/api/schedule/events/modal/" + info.event.id + "/"+ info.event.extendedProps.extraParams.db_type, function( data ) { console.log(info.event.id)
$( "#modal-content" ).html( data ); $.get( "/api/schedule/events/modal/" + info.event.id + "/"+ info.event.extendedProps.extraParams.db_type, function( data ) {
}); $( "#modal-content" ).html( data );
$('#schedulemodal').modal('toggle') });
} $('#schedulemodal').modal('toggle')
}); }
$('#test').html('Begin render'); });
calendar.render(); $('#test').html('Begin render');
$('#test').html('Render Done'); calendar.render();
$('#test').html('Done render');
}
catch(err) {
document.getElementById("test").innerHTML = err.message;
}
}); });
</script> </script>