common_core_js 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3c68ef2ddc0f4e98ca5b54d0c646a918b2f70d091fe89db9951a61879af34d2
-  data.tar.gz: 5ea645a245a197d42dabf6f697a7f94e5227d6c8416da47d8dfe875fdc28cbea
+  metadata.gz: e7e5ec56e4fffb8aab8840c9cc1aff9377d1291bd9b82fd91fe57841089d8b9e
+  data.tar.gz: c688ccfbca5218fdc210ee199b87e5b61f32405179f41268d2776b086e22e58a
 SHA512:
-  metadata.gz: 7490de5c8f29a6a80960c50ecbb37a02122cafcc96b345c200f1cdc4cb3cf5f50f15e2fb4609f6f4a920b814c9fb123b9024a8d226a1e0f225bebe5246fe9cbb
-  data.tar.gz: fccfc40f5851a9a0bffdc5410085073afa8798320b4abf7a770c1dd7e3070ff871e341ba613f67b7afed11ea2a69c9c685dd130b41bc301ca89386490c5dd77a
+  metadata.gz: 69bdb23d11a350e5f31b160840dc1f96abf8706a3716df9250e992e1e8cacbfd4b7d10d17be2103fc3f38c1064b178eec7cd2a445ead0c1c5e7269a59188560d
+  data.tar.gz: 29d5aea167e7cfaba9861758a72c8ecc16883ec1b70d11294e45e4ef89377d5654c12a0dcfbcac4c0d3a1b8abdace463e68fc9ca39f9aedfccbc20b18e470f0a

data/.gitignore

@@ -11,4 +11,6 @@ test/dummy/tmp/
 
 .idea/
 *.gem
-.DS_Store
+.DS_Store
+
+dump.rdb

data/app/helpers/common_core_js/application_helper.rb

@@ -1,4 +1,80 @@
 module CommonCoreJs
   module ApplicationHelper
+
+    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')
+
+      res << form_object.text_field(field_name, class: 'form-control',
+                                    type: 'datetime-local',
+                                    value: date_to_current_timezone(value, timezone))
+
+      res << human_timezone(Time.now, timezone)
+      res
+    end
+
+
+    def date_field_localized(form_object, field_name, value, label, timezone = nil )
+      res = form_object.label(label,
+                              field_name,
+                              class: 'small form-text text-muted')
+
+      res << form_object.text_field(field_name, class: 'form-control',
+                                    type: 'date',
+                                    value: date_to_current_timezone(value, timezone))
+
+      res
+    end
+
+    def time_field_localized(form_object, field_name, value, label, timezone = nil )
+      res = form_object.label(label,
+                              field_name,
+                              class: 'small form-text text-muted')
+
+      res << form_object.text_field(field_name, class: 'form-control',
+                                    type: 'time',
+                                    value: date_to_current_timezone(value, timezone))
+
+      res << human_timezone(Time.now, timezone)
+      res
+    end
+
+    def current_timezone
+      if method(: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"
+      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
+      end
+
+      return nil if date.nil?
+
+      begin
+        return date.in_time_zone(timezone).strftime("%Y-%m-%dT%H:%M")
+      rescue
+        return nil
+      end
+    end
   end
 end

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

@@ -8,7 +8,7 @@
 
 <% if object.errors.any? %>
 $(".flash-notices").html("<%= j render 'layouts/flash_notices' %>");
-$("<%= (scope + " ") if controller.common_scope %> .new-<%=singular%>-form").html("<%= j render(partial: '#{controller.namespace}errors', locals: {resource: object}) %>")
+$("<%= (scope + " ") if controller.common_scope %> .new-<%=singular%>-form").html('<%= j render(partial: "#{controller.namespace}errors", locals: {resource: object}) %>')
 $("<%= (scope + " ") if controller.common_scope %> .new-<%=singular%>-form").append("<%= j render(partial: "new", locals: { singular.to_sym => object}) %><i class='fa fa-times-circle fa-2x' data-name='<%=singular%>' data-role='close-button' />").slideDown();
 <% else %>
 $("<%= (scope + " ") if controller.common_scope %> .new-<%=singular%>-form").slideUp();

data/lib/common_core_js.rb

@@ -6,4 +6,24 @@ require 'haml-rails'
 
 module CommonCoreJs
   # Your code goes here...
+  #
+  module ControllerHelpers
+    def modify_date_inputs_on_params(modified_params, authenticated_user = nil)
+      use_timezone = authenticated_user.timezone || Time.now.strftime("%z")
+
+      modified_params = modified_params.tap do |params|
+        params.keys.each{|k|
+          if k.ends_with?("_at") || k.ends_with?("_date")
+
+            begin
+              params[k] = DateTime.strptime("#{params[k]} #{use_timezone}", '%Y-%m-%dT%H:%M %z')
+            rescue StandardError
+
+            end
+          end
+        }
+      end
+      modified_params
+    end
+  end
 end

data/lib/common_core_js/engine.rb

@@ -1,5 +1,7 @@
 module CommonCoreJs
   class Engine < ::Rails::Engine
     # isolate_namespace CommonCoreJs
+
+
   end
 end

data/lib/common_core_js/version.rb

@@ -1,3 +1,3 @@
 module CommonCoreJs
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
 end

data/lib/generators/common_core/install_generator.rb

@@ -10,12 +10,11 @@ module CommonCore
 
     def initialize(*args) #:nodoc:
       super
-
-      copy_file "common_core.js", "vendor/assets/javascripts/common_core.js"
-      copy_file "common_core.scss", "vendor/assets/stylesheets/common_core.scss"
+      copy_file "common_core.js", "app/javascript/common_core.js"
+      copy_file "common_core.scss", "app/assets/stylesheets/common_core.scss"
+      copy_file "_flash_notices.haml", "app/views/layouts/_flash_notices.haml"
 
     end
-
   end
 end
 

data/lib/generators/common_core/scaffold_generator.rb

@@ -146,6 +146,8 @@ module CommonCore
       unless @no_specs
         template "controller_spec.rb", File.join("spec/controllers#{namespace_with_dash}", "#{plural}_controller_spec.rb")
       end
+
+      template "_errors.haml", File.join("app/views#{namespace_with_dash}", "_errors.haml")
     end
 
     def list_column_headings
@@ -396,7 +398,7 @@ module CommonCore
 
             ".row
   .form-group.col-md-4
-    = f.collection_select(:#{col.to_s}, #{assoc_name.titleize}.all, :id, :#{display_column}, {prompt: true, selected: @#{singular}.#{col.to_s} , class: 'form-control')
+    = f.collection_select(:#{col.to_s}, #{assoc_name.titleize}.all, :id, :#{display_column}, {prompt: true, selected: @#{singular}.#{col.to_s} }, class: 'form-control')
     %label.small.form-text.text-muted
       #{col.to_s.humanize}"
 
@@ -424,13 +426,21 @@ module CommonCore
           end
 
         when :datetime
-            ".row
+          ".row
   .form-group.col-md-4
-    = f.text_field :#{col.to_s}, value: @#{singular}.#{col.to_s}, class: 'form-control', type: 'datetime-local'
-    %label.form-text
-      #{col.to_s.humanize}\n"
-          end
-      }.join("\n")
+    = datetime_field_localized(f, :#{col.to_s}, @#{singular}.#{col.to_s}, '#{col.to_s.humanize}', #{@auth}.timezone)"
+        when :date
+        ".row
+  .form-group.col-md-4
+    = date_field_localized(f, :#{col.to_s}, @#{singular}.#{col.to_s}, '#{col.to_s.humanize}', #{@auth}.timezone)"
+        when :time
+          ".row
+  .form-group.col-md-4
+    = time_field_localized(f, :#{col.to_s}, @#{singular}.#{col.to_s}, '#{col.to_s.humanize}', #{@auth}.timezone)"
+
+      end
+
+    }.join("\n")
       return res
     end
 
@@ -458,8 +468,22 @@ module CommonCore
               exit
             end
 
+            if assoc.active_record.column_names.include?("name")
+              display_column = "name"
+            elsif assoc.active_record.column_names.include?("to_label")
+              display_column = "to_label"
+            elsif assoc.active_record.column_names.include?("full_name")
+              display_column = "full_name"
+            elsif assoc.active_record.column_names.include?("display_name")
+              display_column = "display_name"
+            elsif assoc.active_record.column_names.include?("email")
+              display_column = "email"
+            else
+              puts "cant find any column to use as label for #{assoc.name.to_s}; any of name, to_labe, full_name, display_name, or email"
+            end
+
             "  %td
-    = #{singular}.#{assoc.name.to_s}.to_label"
+    = #{singular}.#{assoc.name.to_s}.#{display_column}"
 
           else
             "  %td
@@ -474,7 +498,27 @@ module CommonCore
     = #{singular}.#{col}"
         when :datetime
           "  %td
-    = #{singular}.#{col}"
+    - unless #{singular}.#{col}.nil?
+      = #{singular}.#{col}.in_time_zone(current_timezone).strftime('%m/%d/%Y @ %l:%M %p ') + human_timezone(Time.now, current_timezone)
+    - else
+      %span.alert-danger
+        MISSING
+"
+        when :date
+          "  %td
+    - unless #{singular}.#{col}.nil?
+      = #{singular}.#{col}
+    - else
+      %span.alert-danger
+"
+        when :time
+          "  %td
+    - unless #{singular}.#{col}.nil?
+      = #{singular}.#{col}.in_time_zone(current_timezone).strftime('%l:%M %p ') + human_timezone(Time.now, current_timezone)
+    - else
+      %span.alert-danger
+"
+
         end
       }.join("\n")
       return res

data/lib/generators/common_core/templates/_errors.haml

@@ -0,0 +1,5 @@
+- if resource.errors.any?
+  #error_explanation
+    - resource.errors.full_messages.each do |message|
+      %div.alert.alert-danger
+        = message

data/lib/generators/common_core/templates/_flash_notices.haml

@@ -0,0 +1,7 @@
+- unless notice.nil?
+  %div.alert.alert-notice.alert-dismissible
+    = notice
+
+- unless alert.nil?
+  %div.alert.alert-danger.alert-dismissible
+    = alert

data/lib/generators/common_core/templates/common_core.js

@@ -2,15 +2,30 @@
 require("jquery")
 console.log("loading common core...")
 
-$(function(){
-  // always pass csrf tokens on ajax calls
-  $.ajaxSetup({
-    headers: { 'X-CSRF-Token': $('meta[name="csrf-token"]').attr('content') }
-  });
-});
+require("jstimezonedetect/dist/jstz.min")
+var JSTZ = require('jstimezonedetect');
+
+
+
 
 $(document).on('turbolinks:load', function() {
+
   $(document).ready(() => {
+    var user_timezone = '';
+    try {user_timezone = JSTZ.determine().name();} catch(e){}
+    // always pass csrf tokens on ajax calls
+
+
+    // $.ajaxSetup({
+    //   beforeSend: (xhr) => {
+    //
+    //     xhr.setRequestHeader('X-CSRF-Token',  $('meta[name="csrf-token"]').attr('content'))
+    //     xhr.setRequestHeader( 'X-User-Timezone', user_timezone)
+    //
+    //
+    //   }
+    // })
+
     $("body").on("click", "[data-role='close-button']", (event) => {
       var form_name;
       form_name = $(event.currentTarget).data("name");
@@ -30,7 +45,7 @@ $(document).on('turbolinks:load', function() {
         $form.find("i").remove()
       }
     })
-  })
+  });
 });
 
 

data/lib/generators/common_core/templates/controller.rb

@@ -22,6 +22,7 @@ class <%= controller_class_name %> < ApplicationController
   def load_<%= singular_name %>
     @<%= singular_name %> = <%= object_scope %>.find(params[:id])
   end
+  include CommonCoreJs::ControllerHelpers
 
   def index
     @<%= plural_name %> = <%= object_scope %><% if model_has_strings? %>.where(<%=class_name %>.arel_table[:email].matches("%#{@__general_string}%"))<% end %>.page(params[:page])
@@ -40,14 +41,14 @@ class <%= controller_class_name %> < ApplicationController
   end
 
   def create
-    @<%=singular_name %> = <%=class_name %>.create(<%=singular_name %>_params<% if !create_merge_params.empty? %>.merge!(<%= create_merge_params %>)<%end%>)
+    modified_params = modify_date_inputs_on_params(<%=singular_name %>_params.dup<% if !create_merge_params.empty? %>.merge!(<%= create_merge_params %><%end%> ), <%=@auth%>)
+    @<%=singular_name %> = <%=class_name %>.create(modified_params)
     respond_to do |format|
       if @<%= singular_name %>.save
-        format.js
       else
         flash[:alert] = "Oops, your <%=singular_name %> could not be saved."
-        format.js
       end
+      format.js
     end
   end
 
@@ -65,7 +66,7 @@ class <%= controller_class_name %> < ApplicationController
 
   def update
     respond_to do |format|
-      if !@<%=singular_name %>.update(<%= singular %>_params)
+      if !@<%=singular_name %>.update(modify_date_inputs_on_params(<%= singular %>_params, <%=@auth%> ))
         flash[:alert] = "<%=singular_name.titlecase %> could not be saved"
       end
       format.js {}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: common_core_js
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Jason Fleetwood-Boldt
@@ -143,7 +143,6 @@ files:
 - 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_js/generator_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
@@ -170,6 +169,8 @@ files:
 - lib/generators/common_core/install_generator.rb
 - lib/generators/common_core/scaffold_generator.rb
 - lib/generators/common_core/templates/_edit.haml
+- lib/generators/common_core/templates/_errors.haml
+- lib/generators/common_core/templates/_flash_notices.haml
 - lib/generators/common_core/templates/_form.haml
 - lib/generators/common_core/templates/_line.haml
 - lib/generators/common_core/templates/_list.haml