From 4d379a6f764521495c06d375fb78fa0e74cf030a Mon Sep 17 00:00:00 2001
From: Matthieu Lamalle <mlamalle@cadoles.com>
Date: Wed, 31 Mar 2021 11:03:48 +0200
Subject: [PATCH 1/2] order menu project list by customer name

---
 src/schedule-2.0/templates/base.html.twig | 68 +++++++++++------------
 1 file changed, 34 insertions(+), 34 deletions(-)

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 @@
             <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
 
-        
+
         {% 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 %}
                     </li>
-                </ul>                
+                </ul>
             </nav>
         {% endif %}
 
@@ -254,7 +254,7 @@
             {% set contentsidebar="" %}
             {% if usesidebar is defined and usesidebar %}
                 {% set contentsidebar="contentsidebar" %}
-                
+
                 <div id="sidebar" class="collapse">
                     <ul style="padding-bottom:70px" class="nav">
                         {% if is_granted('ROLE_ADMIN') or is_granted('ROLE_VALIDATOR') or is_granted('ROLE_MASTER')  or is_granted('ROLE_USER') %}
@@ -271,7 +271,7 @@
                                     {% for i in 1..48 %}
                                         {% set selected="" %}
                                         {%if i==app.session.get('nbmonth') %}
-                                            {% set selected="selected" %}   
+                                            {% set selected="selected" %}
                                         {% endif %}
                                         <option value="{{i}}" {{selected}}>{{i}}</option>
                                     {% endfor %}
@@ -321,7 +321,7 @@
                             <div class="select-control">
                                 <select class="form-control select2entity" id="sideproject" name="sideproject">
                                     <option value="all" selected>Tous les projets</option>
-                                    {% for project in app.session.get('projects') %}
+                                    {% for project in app.session.get('projects')|sort((a, b) => a.displayname <=> b.displayname) %}
                                         {% set selected="" %}
                                         {%if project.id==app.session.get('idproject') %}
                                             {% set selected="selected" %}
@@ -330,24 +330,24 @@
                                     {% endfor %}
                                 </select>
                             </div>
-                            
+
                         </li>
 
                         <li class="last"></li>
-                        
+
                         <li class="title">Planning</li>
                         <li>
                             <a href="{{path("app_synthese")}}">
                             <i class="fa fa-id-card"></i>Synthese
                             </a>
                         </li>
-                        
+
                         <li>
                             <a href="{{path("app_planning")}}">
                             <i class="fa fa-tachometer-alt"></i>Planning
                             </a>
                         </li>
-                        
+
                         <li>
                             <a href="{{path("app_report")}}">
                             <i class="fa fa-pen-square"></i>Rapport
@@ -377,7 +377,7 @@
                             <i class="fas fa-chart-line"></i>Statistiques
                             </a>
                         </li>
-                        
+
                         <li class="last">
                             <a href="{{path("app_export_view")}}">
                             <i class="fa fa-file-download"></i>Exports
@@ -405,7 +405,7 @@
                             <a href="{{path("app_validationtimer")}}">
                             <i class="fa fa-user-clock"></i>Validation Horaires
                             </a>
-                        </li>                    
+                        </li>
 
                         {% endif %}
 
@@ -422,13 +422,13 @@
                             <a href="{{path("app_project")}}">
                             <i class="fa fa-suitcase"></i>Projets
                             </a>
-                        </li>                        
+                        </li>
 
                         <li>
                             <a href="{{path("app_offer")}}">
                             <i class="fa fa-euro-sign"></i>Commandes
                             </a>
-                        </li>                        
+                        </li>
 
                         <li class="last">
                             <a href="{{path("app_task")}}">
@@ -476,13 +476,13 @@
             {%endif%}
 
 
-            <div id="mycontent" class="content {{contentsidebar}}">        
+            <div id="mycontent" class="content {{contentsidebar}}">
                 {% block body %}
-        
+
                 {% endblock %}
             </div>
         </main>
-               
+
 
         {{ encore_entry_script_tags('app') }}
 
@@ -505,7 +505,7 @@
             $('#sidemonth').on('select2:select', function (e) {
                 var data = e.params.data;
                 console.log(data.id);
-                $.ajax({                                                            
+                $.ajax({
                     type: "POST",
                     data: {
                         nbmonth: data.id,
@@ -515,11 +515,11 @@
                         location.reload();
                     }
                 });
-            });            
+            });
 
             $('#sideuser').on('select2:select', function (e) {
                 var data = e.params.data;
-                $.ajax({                                                            
+                $.ajax({
                     type: "POST",
                     data: {
                         iduser: data.id,
@@ -529,11 +529,11 @@
                         location.reload();
                     }
                 });
-            });            
+            });
 
             $('#sideproject').on('select2:select', function (e) {
                 var data = e.params.data;
-                $.ajax({                                                            
+                $.ajax({
                     type: "POST",
                     data: {
                         idproject: data.id,
@@ -543,11 +543,11 @@
                         location.reload();
                     }
                 });
-            });            
+            });
 
             $('#sideservice').on('select2:select', function (e) {
                 var data = e.params.data;
-                $.ajax({                                                            
+                $.ajax({
                     type: "POST",
                     data: {
                         idservice: data.id,
@@ -557,7 +557,7 @@
                         location.reload();
                     }
                 });
-            });            
+            });
         </script>
 
         <script>

From a9c8825dfaf72d4df1ada9f529c125c9ddcc0474 Mon Sep 17 00:00:00 2001
From: Matthieu Lamalle <mlamalle@cadoles.com>
Date: Fri, 2 Apr 2021 11:47:48 +0200
Subject: [PATCH 2/2] prevent event display twice on addevent fix #67

---
 src/schedule-2.0/assets/js/fullcalendar.js    |  5 +-
 .../templates/Event/list.html.twig            | 70 +++++++++----------
 2 files changed, 39 insertions(+), 36 deletions(-)

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 @@
                         </label>
                         <select class="select2entity" id="usersubmit" name="usersubmit">
                             {% if is_granted('ROLE_ADMIN') or is_granted('ROLE_MASTER') or is_granted('ROLE_VALIDATOR')%}
-                                                            
+
                                  {% for user in app.session.get('users') %}
                                         {% set selected="" %}
                                         {%if user.id==app.session.get('iduser') %}
@@ -105,7 +105,7 @@
                                 {% endfor %}
                                 </optgroup>
                             {% endfor %}
-                            
+
                         </select>
                     </div>
 
@@ -114,27 +114,27 @@
                             <input type="checkbox" class="custom-control-input" id="amsubmit">
                             <label class="custom-control-label" for="amsubmit">Evènement sur la matinée</label>
                         </div>
-                    </div>  
+                    </div>
 
                     <div class="form-group">
                         <div class="custom-control custom-switch">
                             <input type="checkbox" class="custom-control-input" id="apsubmit">
                             <label class="custom-control-label" for="apsubmit">Evènement sur l'après-midi</label>
                         </div>
-                    </div>  
+                    </div>
 
                     <div class="form-group">
                         <div class="custom-control custom-switch">
                             <input type="checkbox" class="custom-control-input" id="astreinte">
                             <label class="custom-control-label" for="astreinte">Astreinte</label>
                         </div>
-                    </div>  
+                    </div>
                     <div class="form-group">
                         <div class="custom-control custom-switch">
                             <input type="checkbox" class="custom-control-input" id="externaltrip">
                             <label class="custom-control-label" for="externaltrip">Déplacement externe</label>
                         </div>
-                    </div>  
+                    </div>
 
 					<div class="form-group">
 			            <label for="description" class="control-label">
@@ -147,7 +147,7 @@
 
                     <input type="hidden" id="start" name="start" class="form-control" value="">
                     <input type="hidden" id="end" name="end" class="form-control" value="">
-                </div>            
+                </div>
             </div>
         </div>
     </div>
@@ -162,7 +162,7 @@
                     <span aria-hidden="true">&times;</span>
                     </button>
                 </div>
-                
+
                 <div class="modal-body">
                     <button onClick="eventUpdate()" class="btn btn-success">Valider</button>
                     <button onClick="" class="btn btn-secondary" data-dismiss="modal">Annuler</button>
@@ -174,7 +174,7 @@
                             Intervenant<span class="mandatory">*</span>
                         </label>
                         <select class="select2entity" id="userupdate" name="userupdate">
-                            {% if is_granted('ROLE_ADMIN') or is_granted('ROLE_MASTER') or is_granted('ROLE_VALIDATOR')%}                                
+                            {% if is_granted('ROLE_ADMIN') or is_granted('ROLE_MASTER') or is_granted('ROLE_VALIDATOR')%}
                                 {% for user in users %}
                                     <option value="{{user.id}}">{{user.displayname}}</option>
                                 {% endfor %}
@@ -203,7 +203,7 @@
                             <input type="checkbox" class="custom-control-input" id="amupdate">
                             <label class="custom-control-label" for="amupdate">Evènement sur la matinée</label>
                         </div>
-                    </div>  
+                    </div>
 
                     <div class="form-group">
                         <div class="custom-control custom-switch">
@@ -216,7 +216,7 @@
                             <input type="checkbox" class="custom-control-input" id="externaltripupdate">
                             <label class="custom-control-label" for="externaltripupdate">Déplacement externe</label>
                         </div>
-                    </div> 
+                    </div>
 					<div class="form-group">
 			            <label for="description" class="control-label">
                             Description
@@ -227,7 +227,7 @@
 
                     <input type="hidden" id="idevent" name="idevent" class="form-control" value="">
                     <input type="hidden" id="fgastreinte" name="fgastreinte" class="form-control" value="">
-                </div>            
+                </div>
             </div>
         </div>
     </div>
@@ -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("<span class='eventUser float-left small'>"+info.event.extendedProps.username+"</span>");
     var eventInfo=$(content).children('.eventUser');
 
-    // Ajout container 
+    // Ajout container
     content.append("<span style='margin-top:-12px' class='eventInfo float-right'></span>");
     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("<div class='alert alert-danger' style='margin: 5px 0px'>"+response.error+"</div>");
                 }
                 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 %}