Merge pull request #423 from fablabbcn/monolith-final-snagging

Monolith final snagging

Author: timcowlishaw

app/assets/stylesheets/application.scss

@@ -31,3 +31,4 @@
 @import "components/reading";
 @import "components/devices_typeahead";
 @import "components/extra_info";
+@import "components/blurable";

app/assets/stylesheets/bootstrap_variables.scss

@@ -33,6 +33,8 @@ $green: #00E597;
 $teal: #2CB5AE;
 $yellow: #FFC100;
 
+$darker-yellow: #CC9900;
+
 $primary: $yellow;
 $info: $purple;
 

app/assets/stylesheets/components/blurable.scss

@@ -0,0 +1,33 @@
+.blurable {
+  position: relative;
+  .blurable-inner {
+    filter: blur(0.25rem);
+  }
+  .blurable-cta-container {
+    position: absolute;
+    top: 0;
+    left: 0;
+    bottom: 0;
+    right: 0;
+    display: flex;
+    align-items: center;
+    .blurable-cta {
+      display: block;
+      background-color: $yellow;
+      color: $black;
+      padding: 0.5rem 1rem;
+      margin: 0 auto;
+      width: fit-content;
+      border-radius: 1rem;
+      filter: drop-shadow(5px 5px 5px rgba(0, 0, 0, 0.5));
+      font-weight: 600;
+      border: 1px solid #1c1c1c;
+      text-transform: uppercase;
+      font-family: "Kanit";
+      text-decoration: none;
+      &:hover, &:active {
+        text-decoration: underline;
+      }
+    }
+  }
+}

app/assets/stylesheets/global.scss

@@ -318,6 +318,16 @@ a.subtle-link {
     fill: $green;
   }
 
+  &.partially-online {
+    color: $yellow;
+    fill: $yellow;
+  }
+
+  .darker &.partially-online {
+    color: $darker-yellow;
+    fill: $darker-yellow;
+  }
+
   &.offline {
     color: $red;
     fill: $red;

app/controllers/ui/experiments_controller.rb

@@ -131,19 +131,29 @@ def authorize_experiment!(action, alert)
     end
 
     def experiment_params
-      params.require(:experiment).permit(
+      new_params = params.require(:experiment).permit(
         :name,
         :description,
         :is_test,
         :starts_at,
         :ends_at,
-        { :device_ids => [] },
-      ).transform_values {|v| v.blank? ? nil : v }
+        { device_ids: [] }
+      ).transform_values { |v| v.blank? ? nil : v }
+      new_params[:starts_at] = parse_local_time(new_params[:starts_at])
+      new_params[:ends_at] = parse_local_time(new_params[:ends_at])
+      new_params
     end
 
     def owner_name(capitalize=true)
       owner = @experiment&.owner || current_user
       helpers.possessive(owner, current_user, capitalize: capitalize, third_person: true)
     end
+
+    def parse_local_time(time)
+      tz = current_user&.time_zone || ActiveSupport::TimeZone["Etc/UTC"]
+      time && tz.rfc3339(time)
+    rescue ArgumentError
+      time
+    end
   end
 end

app/controllers/ui/users_controller.rb

@@ -47,6 +47,7 @@ def create
         :email,
         :password,
         :password_confirmation,
+        :preferred_time_zone,
         :ts_and_cs,
       ))
       if @user.valid?
@@ -121,7 +122,8 @@ def user_params
         :password_confirmation,
         :city,
         :country_code,
-        :url
+        :url,
+        :preferred_time_zone
       )
     end
 

app/controllers/v0/readings_controller.rb

@@ -11,9 +11,15 @@ def index
       check_missing_params("rollup", "sensor_key||sensor_id") # sensor_key or sensor_id
       return unless check_date_param_format("from")
       return unless check_date_param_format("to")
-      render json: Kairos.query(params)
+      data = Kairos.query(params)
+      if params["localtimes"] == "1"
+        render json: convert_to_local_times(data)
+      else
+        render json: data
+      end
     end
 
+
     def create
       check_missing_params("data")
       @device = Device.includes(:components).find(params[:id])
@@ -36,13 +42,12 @@ def create
     end
 
     def legacy_create
-
       if request.headers['X-SmartCitizenData']
         storer = RawStorer.new
         JSON.parse(request.headers['X-SmartCitizenData']).each do |raw_reading|
           mac = request.headers['X-SmartCitizenMacADDR']
           version = request.headers['X-SmartCitizenVersion']
-          ip = (request.headers['X-SmartCitizenIP'] || request.remote_ip)
+          ip = request.headers['X-SmartCitizenIP'] || request.remote_ip
           storer.store(raw_reading,mac,version,ip)
         end
       end
@@ -65,5 +70,18 @@ def csv_archive
       end
     end
 
+
+    private
+
+    def convert_to_local_times(data)
+      tz = current_user&.time_zone || ActiveSupport::TimeZone["Etc/UTC"]
+      from = tz.at(data["from"])
+      to = tz.at(data["to"])
+      readings = data["readings"].map {|reading|
+        [tz.at(reading[0]), reading[1]]
+      }
+      data.merge({ from: from, to: to, readings: readings })
+    end
+
   end
 end

app/helpers/application_helper.rb

@@ -4,6 +4,7 @@ def show_svg(path)
       raw file.read
     end
   end
+
   def flash_class(level)
     case level.to_sym
       when :success then "alert alert-success"
@@ -13,6 +14,19 @@ def flash_class(level)
     end
   end
 
+  def device_collection_status_class(container)
+    if container.all_devices_online?
+      "online"
+    elsif container.all_devices_offline?
+      "offline"
+    else
+      "partially-online"
+    end
+  end
+
+  def local_time_zone
+    current_user&.time_zone || ActiveSupport::TimeZone["Etc/UTC"]
+  end
 
   def sc_nav_button_to(legend, path, opts={})
     button_class = opts[:dark_buttons] ? "btn-dark" : "btn-secondary"

app/javascript/application.js

@@ -7,6 +7,8 @@ import {setupMapLocationPickers} from "components/map_location_picker";
 import {setupReadings} from "components/reading";
 import {setupDevicesTypeahead} from "components/devices_typeahead";
 import {setupExtraInfos} from "components/extra_info";
+import {setupAutoFillTimeZone} from "components/auto_fill_time_zone";
+import {setupBlurables} from "components/blurable";
 
 export default function setupApplication() {
   $(function() {
@@ -21,5 +23,7 @@ export default function setupApplication() {
     setupExtraInfos();
     setupDevicesTypeahead();
     setupReadings();
+    setupAutoFillTimeZone();
+    setupBlurables();
   });
 }

app/javascript/components/auto_fill_time_zone.js

@@ -0,0 +1,6 @@
+import * as $ from "jquery";
+
+export function setupAutoFillTimeZone() {
+  const tz = Intl.DateTimeFormat().resolvedOptions().timeZone;
+  $(".auto_fill_time_zone").val(tz);
+}