Fix timepicker in scenario edit view + update README

Author: nark

README.md

@@ -335,6 +335,9 @@ When creating a new grow, all you have to do is to configure its attributes, cho
 ![grows](md/grows.png)
 *List of grows*
 
+![grows](md/grow.png)
+*Grow view*
+
 #### Subjects
 
 Here, a subject is a living being, generally a plant, that is part of a grow, and placed into a room.
@@ -347,6 +350,20 @@ Each subject is identified by a a QR code that you can print (grouped by grow) a
 
 *NB: With the iOS app coming, you can scan the subject QR code to directly post an observation on this scanned subject.*
 
+### Calendar
+
+As for individual grow, MagicBox provides a general calendar view that regroups all active grows, as well as todos, issues and observations.
+
+![grows](md/calendar.png)
+*Calendar view*
+
+### Statistics
+
+MagicBox provides a set of statistics about sensors data, system usage, OpenWeather if configured and harvest progress.
+
+![grows](md/stats.png)
+* Statistics view*
+
 ### Users managment
 
 For now users managment is very minimal with two different roles:

app/assets/javascripts/application.js

@@ -44,17 +44,16 @@ function init_views() {
 
   $('#roomsSubmenu').collapse('show');
 
-  
   $('.timepicker').datetimepicker({format: 'HH:mm', stepping: "5"});
   $('.weekpicker').datetimepicker({format: 'YYYY-MM-DD', inline: true, sideBySide: true});
   $('#datetimepicker-todo-date').datetimepicker({format: 'YYYY-MM-DD HH:mm', inline: true, sideBySide: true});
 
-  $(document).on('mouseup touchend', function (e) {
-  var container = $('.bootstrap-datetimepicker-widget');
-    if (!container.is(e.target) && container.has(e.target).length === 0) {
-      container.parent().datetimepicker('hide');
-    }
-  });
+  // $(document).on('mouseup touchend', function (e) {
+  //   var container = $('.bootstrap-datetimepicker-widget');
+  //   if (!container.is(e.target) && container.has(e.target).length === 0) {
+  //     container.parent().datetimepicker('hide');
+  //   }
+  // });
 
   $('input[type=checkbox][data-toggle^=toggle]').bootstrapToggle();
 

app/views/admin/scenarios/_condition_fields.html.erb

@@ -6,10 +6,10 @@
 
 		<div class="condition_form condition_type_date">
 			<span>Between:&nbsp;</span>
-		  <%= f.text_field :start_time, value: ftime(f.object.start_time), placeholder: "8:00 am", class: "form-control mr-2 timepicker", id: "timepicker-#{f.object.id}-start_time", data: { toggle: "datetimepicker", target: "#timepicker-#{f.object.id}-start_time" } %>
+		  <%= f.text_field :start_time, value: ftime(f.object.start_time), placeholder: "8:00 am", class: "datetimepicker-input form-control mr-2 timepicker", id: "timepicker-#{f.object.id}-start_time", data: { toggle: "datetimepicker", target: "#timepicker-#{f.object.id}-start_time" } %>
 
 		  <span>And:&nbsp;</span>
-		  <%= f.text_field :end_time, value: ftime(f.object.end_time), placeholder: "8:00 pm", class: "form-control mr-2 timepicker", id: "timepicker-#{f.object.id}-end_time", data: { toggle: "datetimepicker", target: "#timepicker-#{f.object.id}-end_time" } %>
+		  <%= f.text_field :end_time, value: ftime(f.object.end_time), placeholder: "8:00 pm", class: "datetimepicker-input form-control mr-2 timepicker", id: "timepicker-#{f.object.id}-end_time", data: { toggle: "datetimepicker", target: "#timepicker-#{f.object.id}-end_time" } %>
 		</div>
 
 		<div class="condition_form condition_type_time_duration">