common_core_js 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ed403954e1619e60aed2c0c239679b882ded20fab6876557bc370682866e4e9
-  data.tar.gz: 82d2eff05dcd520bc721087573fcc01a928651415a66e3b9437e8641082df995
+  metadata.gz: 68b5a9a869b6a0f94746461670598d9cb5bedb33990863601ef3ecdf220fbdc9
+  data.tar.gz: 32503cb59ddee608eeae10c6ff8f75c044550c400d28bec85b0b0bb97170eea8
 SHA512:
-  metadata.gz: 0d962aeeb62c3a241cb00e774e207f20d6f7d5e0ce73ad18f3d77ee23806531278fcb897172125baf64c234f559b981b40a4e5fbb05e6f96b21c6684eba94e3a
-  data.tar.gz: fa77bc758647627c1995163e803646dfd144543881fe623c50ba9b5a9f6689337ba054e928623edf37e933e00bd01dd7c5ea16affdd499cd45a570c8edb5f3c1
+  metadata.gz: 80e02dc262dc51c695434596729c6fb3521ceb6399446a1ddfb0c3e331c5a34c0f91e533c9e27ce2135e1ccb5da5101ed981873ef26beb97f9b56e88545de8e1
+  data.tar.gz: 21be6527906de8b37ce77b497a10e3c2edbdd1fb5f94aab9ba250820ef58735a4933ae119c2f46aab956ed49724573e84c51c51e9d83e4f3e4434e238796b4db

data/app/helpers/{common_core_js/application_helper.rb → common_core_helper.rb}

@@ -1,7 +1,13 @@
-module CommonCoreJs
-  module ApplicationHelper
+module CommonCoreHelper
+
+    def timezonize(tz)
+      tz = tz.to_i
+      (tz >= 0 ? "+" : "-") + sprintf('%02d',tz.abs) + ":00"
+    end
+
 
     def datetime_field_localized(form_object, field_name, value, label, timezone = nil )
+
       res = form_object.label(label,
                               field_name,
                               class: 'small form-text text-muted')
@@ -10,7 +16,7 @@ module CommonCoreJs
                                     type: 'datetime-local',
                                     value: date_to_current_timezone(value, timezone))
 
-      res << human_timezone(Time.now, timezone)
+      res << timezonize(timezone)
       res
     end
 
@@ -36,33 +42,27 @@ module CommonCoreJs
                                     type: 'time',
                                     value: date_to_current_timezone(value, timezone))
 
-      res << human_timezone(Time.now, timezone)
+      res << timezonize(tz)
       res
     end
 
     def current_timezone
-      if method(:current_user)
+      if controller.try(:current_timezone)
+        controller.current_timezone
+      elsif defined?(current_user)
         if current_user.try(:timezone)
           Time.now.in_time_zone(current_user.timezone).strftime("%z").to_i/100
         else
           Time.now.strftime("%z").to_i/100
         end
       else
-        raise "no method current_user is available or it does not implement timezone; please implement/override the method current_timezone"
+        raise "no method current_user is available or it does not implement timezone; please implement/override the method current_timezone IN YOUR CONTROLLER"
       end
     end
 
-    def human_timezone(time_string, timezone)
-      time = time_string.in_time_zone(timezone)
-
-      if time.zone.match?(/^\w/)
-        time.zone
-      else
-        time.formatted_offset
-      end
-    end
 
     def date_to_current_timezone(date, timezone = nil)
+
       # if the timezone is nil, use the server date'
       if timezone.nil?
         timezone = Time.now.strftime("%z").to_i/100
@@ -76,5 +76,4 @@ module CommonCoreJs
         return nil
       end
     end
-  end
 end

data/app/views/common/_common_edit_form.haml

@@ -1,4 +1,8 @@
 %td{style: "position: relative;", colspan: controller.default_colspan}
+  - if object.errors.any?
+    = render(partial: "#{controller.namespace}errors", locals: {resource: object})
+
+
   Editing
   - if object.try(:to_label)
     = object.to_label

data/app/views/common/_common_update.js.erb

@@ -1,6 +1,7 @@
 <% if object.errors.any? %>
 <% pass_through_locals ||= {} %>
-$(".<%= singular %>-table tr[data-id=<%= object.id %>][data-edit='true']").html("<%= j render(partial: '#{controller.namespace}errors', locals: {resource: object}) %><%= j render partial: 'edit', locals: {singular.to_sym => object, url: url, colspan: controller.default_colspan}.merge(pass_through_locals || {}) %>")
+$(".<%= singular %>-table tr[data-id=<%= object.id %>][data-edit='true']").html("<%= j render partial: 'edit', locals: {singular.to_sym => object, url: url, colspan: controller.default_colspan}.merge(pass_through_locals || {}) %>")
+
 $(".flash-notices").html("<%= j render 'layouts/flash_notices' %>");
 <% else %>
 $(".<%= singular %>-table tr[data-id=<%= object.id %>]:not([data-edit='true'])").replaceWith("<%= j render partial: 'line', locals: {singular.to_sym => object } %>").fadeIn()

data/lib/common_core_js.rb

@@ -8,7 +8,7 @@ module CommonCoreJs
   # Your code goes here...
   #
   module ControllerHelpers
-    def modify_date_inputs_on_params(modified_params, authenticated_user = nil)
+    def modify_date_inputs_on_params(modified_params)
       use_timezone = authenticated_user.timezone || Time.now.strftime("%z")
 
       modified_params = modified_params.tap do |params|

data/lib/common_core_js/version.rb

@@ -1,3 +1,3 @@
 module CommonCoreJs
-  VERSION = '0.3.4'
+  VERSION = '0.3.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: common_core_js
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Jason Fleetwood-Boldt
@@ -142,7 +142,7 @@ files:
 - app/assets/stylesheets/common_core_js/application.css
 - app/assets/stylesheets/common_core_js/common_core.scss
 - app/controllers/common_core_js/application_controller.rb
-- app/helpers/common_core_js/application_helper.rb
+- app/helpers/common_core_helper.rb
 - app/jobs/common_core_js/application_job.rb
 - app/mailers/common_core_js/application_mailer.rb
 - app/models/common_core_js/application_record.rb