diff --git a/src/schedule-2.0/assets/js/fullcalendar.js b/src/schedule-2.0/assets/js/fullcalendar.js index 989d1a4..2dc46d9 100644 --- a/src/schedule-2.0/assets/js/fullcalendar.js +++ b/src/schedule-2.0/assets/js/fullcalendar.js @@ -18,7 +18,10 @@ document.addEventListener('DOMContentLoaded', function() { locale: frLocale, weekNumbers: true, selectable: true, - events: 'event/load/'+iduser, + eventSources: [{ + 'id': 1, + 'url': 'event/load/'+iduser, + }], eventLimit:8, eventDrop: function(info) { info.revert(); diff --git a/src/schedule-2.0/templates/Event/list.html.twig b/src/schedule-2.0/templates/Event/list.html.twig index 1996800..34c02ce 100644 --- a/src/schedule-2.0/templates/Event/list.html.twig +++ b/src/schedule-2.0/templates/Event/list.html.twig @@ -18,10 +18,10 @@ .fc-content { height: 40px; } - + .fc-title { font-weight: bolder; - font-size: 12px; + font-size: 12px; } .eventAvatar { @@ -30,7 +30,7 @@ float: left; } - .eventInfo{ + .eventInfo{ margin: -5px 5px 0px 0px; clear: both; } @@ -39,7 +39,7 @@ clear: both; } - .eventEstimate { + .eventEstimate { margin: -3px 10px; } .select2-results__group { @@ -76,7 +76,7 @@ @@ -114,27 +114,27 @@ - +
-
+
-
+
-
+
+ @@ -162,7 +162,7 @@ - +
@@ -174,7 +174,7 @@ Intervenant*
- +
@@ -216,7 +216,7 @@
-
+
+ @@ -243,25 +243,25 @@ $(document).ready(function() { $("#modalsubmit #user").select2({ theme: 'bootstrap4', language: "fr" - }); + }); $("#modalsubmit #task").select2({ placeholder: "Selectionnez un projet", allowClear: true, theme: 'bootstrap4', language: "fr" - }); + }); $("#modalupdate #user").select2({ theme: 'bootstrap4', language: "fr" - }); + }); $("#modalupdate #task").select2({ placeholder: "Selectionnez un projet", theme: 'bootstrap4', language: "fr" - }); + }); }); // Rendu d'un évenement @@ -276,7 +276,7 @@ function eventRender(info) { content.append(""+info.event.extendedProps.username+""); var eventInfo=$(content).children('.eventUser'); - // Ajout container + // Ajout container content.append(""); var eventInfo=$(content).children('.eventInfo'); @@ -317,7 +317,7 @@ function eventSelect(selectionInfo) { } // Valeur par défaut - {% if (is_granted('ROLE_ADMIN') or is_granted('ROLE_VALIDATOR') or is_granted('ROLE_MASTER')) and app.session.get('iduser')!="all" %} + {% if (is_granted('ROLE_ADMIN') or is_granted('ROLE_VALIDATOR') or is_granted('ROLE_MASTER')) and app.session.get('iduser')!="all" %} $('#usersubmit').val({{app.session.get('iduser')}}).trigger("change"); {% else %} $('#usersubmit').val({{app.user.id}}).trigger("change"); @@ -341,7 +341,7 @@ function eventSelect(selectionInfo) { $('#modalsubmit #start').val(start.format("YYYY-MM-DD")); $('#modalsubmit #end').val(end.format("YYYY-MM-DD")); - + $('#modalsubmit #description').val(""); $('#modalsubmit #externaltrip').prop("checked",false); @@ -369,7 +369,7 @@ function eventClick(info) { $('#userupdate').val(userid).trigger("change"); $('#taskupdate').val(taskid).trigger("change"); $('#modalupdate #idevent').val(id); - + $('#modalupdate #fgastreinte').val(fgastreinte); $('#modalupdate #description').val(description); if (holiday) { @@ -409,7 +409,7 @@ function eventClick(info) { $('#modalupdate #apupdate').prop("checked",true); } } - + // Formulaire de création d'un évènement $('#modalupdate').modal(); } @@ -433,7 +433,7 @@ function eventSubmit() { } if(!error) { - $.ajax({ + $.ajax({ type: "POST", data: { iduser: $("#usersubmit").val(), @@ -444,7 +444,7 @@ function eventSubmit() { ap: $("#modalsubmit #apsubmit").prop("checked"), astreinte: $("#modalsubmit #astreinte").prop("checked"), externaltrip: $("#modalsubmit #externaltrip").prop("checked"), - description: $("#modalsubmit #description").val() + description: $("#modalsubmit #description").val() }, url: "{{ path('app_event_submit') }}", success: function (response) { @@ -453,7 +453,7 @@ function eventSubmit() { $("#modalsubmit .modal-body").append("
"+response.error+"
"); } else { - calendar.addEvent(response); + calendar.addEvent(response,1); calendar.render; $('#modalsubmit').modal('hide'); } @@ -466,7 +466,7 @@ function eventSubmit() { function eventUpdate() { $("#modalupdate .alert").remove(); - $.ajax({ + $.ajax({ type: "POST", data: { idevent: $("#modalupdate #idevent").val(), @@ -476,7 +476,7 @@ function eventUpdate() { ap: $("#modalupdate #apupdate").prop("checked"), fgastreinte: $("#modalupdate #fgastreinte").val(), externaltrip: $("#modalupdate #externaltripupdate").prop("checked"), - description: $("#modalupdate #description").val() + description: $("#modalupdate #description").val() }, url: "{{ path('app_event_update') }}", success: function (response) { @@ -486,8 +486,8 @@ function eventUpdate() { } else { var event = calendar.getEventById($("#modalupdate #idevent").val()); - event.remove(); - + event.remove(); + calendar.addEvent(response); calendar.render; $('#modalupdate').modal('hide'); @@ -500,7 +500,7 @@ function eventUpdate() { function eventDelete() { $("#modalupdate .alert").remove(); - $.ajax({ + $.ajax({ type: "POST", data: { idevent: $("#modalupdate #idevent").val(), @@ -514,7 +514,7 @@ function eventDelete() { } else { var event = calendar.getEventById($("#modalupdate #idevent").val()); - event.remove(); + event.remove(); $('#modalupdate').modal('hide'); } } @@ -539,4 +539,4 @@ $("#astreinte").change(function() { } }); -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/src/schedule-2.0/templates/base.html.twig b/src/schedule-2.0/templates/base.html.twig index 919b4cc..426b403 100644 --- a/src/schedule-2.0/templates/base.html.twig +++ b/src/schedule-2.0/templates/base.html.twig @@ -9,7 +9,7 @@ - + {% block head_style %} {{ encore_entry_link_tags('app') }} {% endblock head_style %} @@ -90,7 +90,7 @@ color: #CFD8DC; font-size: 16px; padding: 0px 10px 0px 10px; - display: block; + display: block; text-transform: uppercase; margin-left: 0px !important; font-weight: bold; @@ -130,26 +130,26 @@ } @media (max-width: 991px) { - .contentsidebar { + .contentsidebar { margin-left: auto; } - + #sidebar { position: static; margin:0px -15px; width: auto; } - } + } a.btn { color:#ffffff; } - + @media (min-width: 992px) { #sidebar { display: block; } - } + } {% if useheader is defined and useheader %} #main { @@ -159,7 +159,7 @@ th.dt-center, td.dt-center { text-align: center; } - + .new-page {display:none;} {% if fgprint is defined and fgprint %} @@ -171,7 +171,7 @@ border :1px solid transparent; page-break-after: always; } - + #sidebar,.navbar,.sf-toolbar { display: none; } @@ -189,8 +189,8 @@ .homecard { display:inline-block; float:none; - } - {% endif %} + } + {% endif %} {% block localstyle %} {% endblock %} @@ -246,7 +246,7 @@ {% endif %} {% endif %} - + {% endif %} @@ -254,7 +254,7 @@ {% set contentsidebar="" %} {% if usesidebar is defined and usesidebar %} {% set contentsidebar="contentsidebar" %} - +