Merge branch 'feature-plan-improve' into 'master'

Improve plan (current & wall)

See merge request kif/akplanning!49

AKPlan/templates/AKPlan/encode_events.html

@@ -6,6 +6,7 @@
         {% if slot.start %}
             {
                 'title': '{{ slot.ak.short_name }}',
+                'description': '{{ slot.ak.name }}',
                 'start': '{{ slot.start | timezone:event.timezone | date:"Y-m-d H:i:s" }}',
                 'end': '{{ slot.end | timezone:event.timezone | date:"Y-m-d H:i:s" }}',
                 'resourceId': '{{ slot.room.title }}',

AKPlan/templates/AKPlan/plan_index.html

@@ -17,7 +17,6 @@
         <script src='{% static 'AKPlan/vendor/fullcalendar/timeline/main.js' %}'></script>
         <script src='{% static 'AKPlan/vendor/fullcalendar/resource-common/main.js' %}'></script>
         <script src='{% static 'AKPlan/vendor/fullcalendar/resource-timeline/main.js' %}'></script>
-
         <script>
             document.addEventListener('DOMContentLoaded', function () {
                 var planEl = document.getElementById('planCalendar');
@@ -51,6 +50,9 @@
                             buttonText: '{% trans "Event" %}',
                         }
                     },
+                    eventRender: function(info) {
+                        $(info.el).tooltip({title: info.event.extendedProps.description});
+                    },
                     editable: false,
                     allDaySlot: false,
                     nowIndicator: true,
@@ -64,6 +66,9 @@
                 });
 
                 plan.render();
+
+                // Scroll to current time
+                $('.fc-scroller').scrollLeft($('.fc-now-indicator').position().left);
             });
         </script>
     {% endif %}

AKPlan/templates/AKPlan/plan_wall.html

@@ -53,7 +53,9 @@
                     start: '{{ start | timezone:event.timezone | date:"Y-m-d H:i:s" }}',
                     end: '{{ end | timezone:event.timezone  | date:"Y-m-d H:i:s"}}',
                 },
-                scrollTime: '{{ start | timezone:event.timezone | date:"H:i:s" }}',
+                eventRender: function(info) {
+                    $(info.el).tooltip({title: info.event.extendedProps.description});
+                },
                 editable: false,
                 allDaySlot: false,
                 nowIndicator: true,
@@ -75,6 +77,9 @@
             });
 
             plan.render();
+
+            // Scroll to current time
+            $('.fc-scroller').scrollLeft($('.fc-now-indicator').position().left);
         });
     </script>