common_core_js 0.1.1 → 0.3.4

data/app/assets/stylesheets/common_core_js/common_core.scss

@@ -0,0 +1,43 @@
+
+[data-role='close-button'] {
+    position: absolute;
+    top: 0;
+    right: 0;
+}
+
+
+i {
+    cursor: pointer;
+}
+
+
+.show-area{
+span.content {
+    background-color: #ddd;
+    padding: 0px 6px;
+    display: inline-block;
+}
+}
+
+
+td.paginate{
+    position: relative;
+}
+
+nav.pagination {
+    display: block;
+    text-align: right;
+    right: 0;
+    top: 0;
+
+    font-size: 1.1em;
+
+span {
+    margin: 0 2px;
+}
+span.page.current {
+    color: black;
+    text-decoration: underline;
+
+}
+}

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: value )
+
+      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/bin/rails

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+# This command will automatically be run when you run "rails" with Rails gems
+# installed from the root of your application.
+
+ENGINE_ROOT = File.expand_path('..', __dir__)
+ENGINE_PATH = File.expand_path('../lib/common_core_js/engine', __dir__)
+APP_PATH = File.expand_path('../test/dummy/config/application', __dir__)
+
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
+
+require 'rails/all'
+require 'rails/engine/commands'

data/common_core_js.gemspec

@@ -0,0 +1,70 @@
+$:.push File.expand_path("lib", __dir__)
+
+# Maintain your gem's version:
+require "common_core_js/version"
+require 'byebug'
+# Describe your gem and declare its dependencies:
+Gem::Specification.new do |spec|
+  spec.name        = "common_core_js"
+  spec.version     = CommonCoreJs::VERSION
+  spec.license     = 'MIT'
+  spec.date        = '2020-06-28'
+  spec.summary     = "A gem build scaffolding."
+  spec.description = "Simple, plug & play Rails scaffolding with really simple Javascript"
+  spec.authors     = ["Jason Fleetwood-Boldt"]
+  spec.email       = 'jason.fb@datatravels.com'
+
+
+
+
+  # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
+  # to allow pushing to a single host or delete this section to allow pushing to any host.
+  if spec.respond_to?(:metadata)
+    spec.metadata["allowed_push_host"] = "TODO: Set to 'http://mygemserver.com'"
+  else
+    raise "RubyGems 2.0 or newer is required to protect against " \
+      "public gem pushes."
+  end
+
+  # spec.files = Dir["{app,config,db,lib,vendor}/**/*", "LICENSE", "Rakefile", "README.md"]
+
+  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  end
+
+  spec.add_dependency "rails"
+  spec.homepage    = 'https://blog.jasonfleetwoodboldt.com/common-core-js/'
+  spec.metadata    = { "source_code_uri" => "https://github.com/jasonfb/common_core_js",
+                       "documentation_uri" => "https://github.com/jasonfb/common_core_js",
+                       "homepage_uri" => 'https://blog.jasonfleetwoodboldt.com/common-core-js/',
+                      "mailing_list_uri" => 'https://blog.jasonfleetwoodboldt.com/#sfba-form2-container'
+  }
+
+  spec.add_runtime_dependency('kaminari')
+  spec.add_runtime_dependency('haml-rails')
+  spec.add_runtime_dependency "sass-rails"
+
+  spec.add_runtime_dependency 'bootsnap'
+  spec.add_runtime_dependency 'bootstrap'
+  spec.add_runtime_dependency 'font-awesome-rails'
+  spec.add_dependency 'ffaker'
+
+  spec.post_install_message = <<~MSG
+    ---------------------------------------------
+    Welcome to Common Core
+    
+    rails generate common_score:scaffold Thing
+
+        * Build plug-and-play scaffolding mixing HAML with jQuery-based Javascript
+        * Automatically Reads Your Models (make them before building your scaffolding!)
+        * Excellent for CRUD, lists with pagination, searching, sorting.
+        * Wonderful for prototyping.
+        * Plays nicely with Devise, Kaminari, Haml-Rails, Rspec.
+        * Create specs autoamatically along with the controllers.
+        * Nest your routes model-by-model for built-in poor man's authentication
+        * Throw the scaffolding away when your app is ready to graduate to its next phase.
+
+    see README for complete instructions.
+    ---------------------------------------------
+  MSG
+end

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
+    # isolate_namespace CommonCoreJs
+
+
   end
 end

data/lib/common_core_js/version.rb

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

data/lib/generators/common_core/USAGE

@@ -1,8 +1,6 @@
 Description:
-    Explain the generator
+    Generate a controller, view files, and spec
 
 Example:
-    rails generate common_core_scaffold Thing
+    rails generate common_core:scaffold Thing
 
-    This will create:
-        what/will/it/create

data/lib/generators/common_core/install_generator.rb

@@ -0,0 +1,22 @@
+require 'rails/generators/erb/scaffold/scaffold_generator'
+require 'ffaker'
+
+module CommonCore
+  class InstallGenerator < Rails::Generators::Base
+    hook_for :form_builder, :as => :scaffold
+
+    source_root File.expand_path('templates', __dir__)
+
+
+    def initialize(*args) #:nodoc:
+      super
+      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

@@ -1,15 +1,46 @@
 require 'rails/generators/erb/scaffold/scaffold_generator'
+require 'ffaker'
+
+
 
 module CommonCore
-  class ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
+
+  module GeneratorHelper
+    def text_area_output(col, field_length)
+      lines = field_length % 40
+      if lines > 5
+        lines = 5
+      end
+
+      ".row
+  %div{class: \"form-group col-md-4 \#{'alert-danger' if #{singular}.errors.details.keys.include?(:#{col.to_s})}\"}
+    = f.text_area :#{col.to_s}, class: 'form-control', cols: 40, rows: '#{lines}'
+    %label.form-text
+      #{col.to_s.humanize}\n"
+    end
 
 
+
+    def field_output(col, type = nil, width)
+      ".row
+  %div{class: \"form-group col-md-4 \#{'alert-danger' if #{singular}.errors.details.keys.include?(:#{col.to_s})}\"}
+    = f.text_field :#{col.to_s}, value: @#{singular}.#{col.to_s}, size: #{width}, class: 'form-control', type: '#{type}'
+    %label.form-text
+      #{col.to_s.humanize}\n"
+    end
+  end
+
+
+  class ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
     hook_for :form_builder, :as => :scaffold
 
     source_root File.expand_path('templates', __dir__)
     attr_accessor :path, :singular, :plural, :singular_class, :nest_with
 
 
+    include GeneratorHelper
+
+
     def initialize(*meta_args) #:nodoc:
       super
 
@@ -20,21 +51,12 @@ module CommonCore
         exit
       end
 
-      begin
-        @columns = object.columns.map(&:name).map(&:to_sym).reject{|x| x==:updated_at || x==:created_at || x==:id}
-      rescue StandardError => e
-        puts "Ooops... it looks like is an object for #{class_name}. Please create the database table with fields first. "
-        exit
-      end
+
 
       args = meta_args[0]
       @singular = args[0].tableize.singularize # should be in form hello_world
 
 
-
-
-
-
       @plural = @singular + "s" # supply to override; leave blank to use default
       @singular_class = @singular.titleize.gsub(" ", "")
       @nest = nil
@@ -61,8 +83,18 @@ module CommonCore
         end
       end
 
+      auth_assoc = @auth.gsub("current_","")
+      auth_assoc_field = auth_assoc + "_id"
 
 
+      begin
+        @columns = object.columns.map(&:name).map(&:to_sym).reject{|field| field==:updated_at ||
+            field==:created_at || field==:id ||  field == auth_assoc_field.to_sym }
+      rescue StandardError => e
+        puts "Ooops... it looks like is an object for #{class_name}. Please create the database table with fields first. "
+        exit
+      end
+
       flags = meta_args[1]
       flags.each do |f|
         case (f)
@@ -70,10 +102,17 @@ module CommonCore
           @auth = nil
         when "--with-index"
           @with_index = true
+        when "--specs-only"
+          @specs_only = true
+        when "--no-specs"
+          @no_specs = true
         end
       end
 
-
+      if @specs_only && @no_specs
+        puts "oops… you seem to have specified both the --specs-only flag and --no-specs flags. this doesn't make any sense, so I am aborting. sorry."
+        exit
+      end
 
       if @auth_identifier.nil? && !@auth.nil?
         @auth_identifier = @auth.gsub("current_", "")
@@ -86,7 +125,6 @@ module CommonCore
         @nested_args.each do |a|
           @nested_args_plural[a] = a + "s"
         end
-
       end
     end
 
@@ -99,20 +137,77 @@ module CommonCore
     end
 
     def copy_controller_and_spec_files
-
       @default_colspan = @columns.size
-      template "controller.rb", File.join("app/controllers", "#{plural}_controller.rb")
-      # template "index", File.join("app/views", "app/views/#{self.name.downcase}/index")
 
-    end
+      unless @specs_only
+        template "controller.rb", File.join("app/controllers#{namespace_with_dash}", "#{plural}_controller.rb")
+      end
+
+      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
       @columns.map(&:to_s).map{|col_name| '      %th{:scope => "col"} ' + col_name.humanize}.join("\r")
     end
 
+    def columns_spec_with_sample_data
+      @columns.map { |c|
+        if eval("#{singular_class}.columns_hash['#{c}']").nil?
+          byebug
+        end
+        type = eval("#{singular_class}.columns_hash['#{c}']").type
+        random_data = case type
+          when :integer
+            rand(1...1000)
+          when :string
+            FFaker::AnimalUS.common_name
+          when :text
+            FFaker::AnimalUS.common_name
+          when :datetime
+            Time.now + rand(1..5).days
+        end
+        c.to_s + ": '" + random_data.to_s + "'"
+      }.join(", ")
+    end
+
+    def object_parent_mapping_as_argument_for_specs
+      if @nested_args.any?
+        ", " + @nested_args.last + ": " + @nested_args.last
+      elsif @auth
+       ", #{@auth_identifier}: #{@auth}"
+      end
+    end
+
+    def objest_nest_factory_setup
+      res = ""
+      if @auth
+        last_parent = ", #{@auth_identifier}: #{@auth}"
+      end
+
+      @nested_args.each do |arg|
+        res << "  let(:#{arg}) {create(:#{arg} #{last_parent} )}\n"
+        last_parent = ", #{arg}: #{arg}"
+      end
+      res
+    end
+
+
+    def objest_nest_params_by_id_for_specs
+      @nested_args.map{|arg|
+        "#{arg}_id: #{arg}.id"
+      }.join(",\n          ")
+    end
+
+
     def controller_class_name
-      plural.titleize.gsub(" ", "") + "Controller"
+      res = ""
+      res << @namespace.titleize + "::" if @namespace
+      res << plural.titleize.gsub(" ", "") + "Controller"
+      res
     end
 
     def singular_name
@@ -128,20 +223,26 @@ module CommonCore
     end
 
 
-    def path_helper
+    def path_helper_singular
       "#{@namespace+"_" if @namespace}#{(@nested_args.join("_") + "_" if @nested_args.any?)}#{singular}_path"
     end
 
+    def path_helper_plural
+      "#{@namespace+"_" if @namespace}#{(@nested_args.join("_") + "_" if @nested_args.any?)}#{plural}_path"
+    end
 
     def path_arity
-      (nested_objects_arity + ", " if @nested_args) + "@" + singular
+      res = ""
+      if @nested_args.any?
+        res << nested_objects_arity + ", "
+      end
+      res << "@" + singular
     end
 
     def line_path_partial
-      "#{@namespace+"/" if @namespace}#{singular}/line"
+      "#{@namespace+"/" if @namespace}#{plural}/line"
     end
 
-
     def nested_assignments
       @nested_args.map{|a| "#{a}: @#{a}"}.join(", ") #metaprgramming into Ruby hash
     end
@@ -166,13 +267,26 @@ module CommonCore
       end
     end
 
+
+    def all_objects_root
+      if @auth
+        if @nested_args.none?
+          @auth + ".#{plural}"
+        else
+          "@" + @nested_args.last + ".#{plural}"
+        end
+      else
+        @singular_class + ".all"
+      end
+    end
+
     def any_nested?
       @nested_args.any?
     end
 
     def all_objects_variable
       # needs the authenticated root user
-      "#{@auth}#{'.' + @nested_args.map{|a| "#{@nested_args_plural[a]}.find(@#{a})"}.join('.') + "." if @nested_args}#{plural}"
+      "#{@auth}.#{ @nested_args.map{|a| "#{@nested_args_plural[a]}.find(@#{a})"}.join('.') + "." if @nested_args.any?}#{plural}"
     end
 
     def auth_object
@@ -180,29 +294,49 @@ module CommonCore
     end
 
     def copy_view_files
+      return if @specs_only
       js_views.each do |view|
         formats.each do |format|
-
           filename = cc_filename_with_extensions(view, ["js","erb"])
-          template filename, File.join("app/views", controller_file_path, filename)
+          template filename, File.join("app/views#{namespace_with_dash}", controller_file_path, filename)
         end
       end
 
+
       haml_views.each do |view|
         formats.each do |format|
-
           filename = cc_filename_with_extensions(view, "haml")
-          template filename, File.join("app/views", controller_file_path, filename)
+          template filename, File.join("app/views#{namespace_with_dash}", controller_file_path, filename)
         end
       end
     end
 
+    def namespace_with_dash
+      if @namespace
+        "/#{@namespace}"
+      else
+        ""
+      end
+    end
+
+    def namespace_with_trailing_dash
+      if @namespace
+        "#{@namespace}/"
+      else
+        ""
+      end
+    end
+
     def js_views
       %w(index create destroy edit new update)
     end
 
     def haml_views
-      %w(_edit _form _line _list _new)
+      res =  %w(_edit _form _line _list _new)
+      if @with_index
+        res << 'all'
+      end
+      res
     end
 
 
@@ -214,11 +348,11 @@ module CommonCore
     def create_merge_params
       if @auth
         "#{@auth_identifier}: #{@auth}"
+      else
+        ""
       end
     end
 
-
-
     def model_has_strings?
       false
     end
@@ -228,6 +362,171 @@ module CommonCore
       []
     end
 
+    def all_form_fields
+      res = @columns.map { |col|
+
+
+        type = eval("#{singular_class}.columns_hash['#{col}']").type
+        limit = eval("#{singular_class}.columns_hash['#{col}']").limit
+        sql_type = eval("#{singular_class}.columns_hash['#{col}']").sql_type
+
+        case type
+        when :integer
+          # look for a belongs_to on this object
+          if col.to_s.ends_with?("_id")
+            # guess the association name label
+
+
+            assoc_name = col.to_s.gsub("_id","")
+            assoc = eval("#{singular_class}.reflect_on_association(:#{assoc_name})")
+            if assoc.nil?
+              puts "*** Oops. on the #{singular_class} object, there doesn't seem to be an association called '#{assoc_name}'"
+              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"
+            end
+
+            ".row
+  %div{class: \"form-group col-md-4 \#{'alert-danger' if #{singular}.errors.details.keys.include?(:#{assoc_name.to_s})}\"}
+    = 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}"
+
+          else
+            ".row
+  %div{class: \"form-group col-md-4 \#{'alert-danger' if #{singular}.errors.details.keys.include?(:#{col.to_s})}\"}
+    = f.text_field :#{col.to_s}, value: @#{singular}.#{col.to_s}, class: 'form-control', size: 4, type: 'number'
+    %label.form-text
+      #{col.to_s.humanize}\n"
+          end
+        when :string
+          limit ||= 40
+          if limit < 50
+            field_output(col, nil, limit)
+          else
+            text_area_output(col, limit)
+          end
+
+        when :text
+          limit ||= 40
+          if limit < 50
+            field_output(col, nil, limit)
+          else
+            text_area_output(col, limit)
+          end
+
+        when :datetime
+          ".row
+  %div{class: \"form-group col-md-4 \#{'alert-danger' if #{singular}.errors.details.keys.include?(:#{col.to_s})}\"}
+    = datetime_field_localized(f, :#{col.to_s}, @#{singular}.#{col.to_s}, '#{col.to_s.humanize}', #{@auth}.timezone)"
+        when :date
+        ".row
+  %div{class: \"form-group col-md-4 \#{'alert-danger' if #{singular}.errors.details.keys.include?(:#{col.to_s})}\"}
+    = date_field_localized(f, :#{col.to_s}, @#{singular}.#{col.to_s}, '#{col.to_s.humanize}', #{@auth}.timezone)"
+        when :time
+          ".row
+  %div{class: \"form-group col-md-4 \#{'alert-danger' if #{singular}.errors.details.keys.include?(:#{col.to_s})}\"}
+    = time_field_localized(f, :#{col.to_s}, @#{singular}.#{col.to_s}, '#{col.to_s.humanize}', #{@auth}.timezone)"
+
+      end
+
+    }.join("\n")
+      return res
+    end
+
+
+    def all_line_fields
+      res = "%tr{'data-id': #{singular}.id, 'data-edit': 'false'}\n"
+
+      res << @columns.map { |col|
+        type = eval("#{singular_class}.columns_hash['#{col}']").type
+        limit = eval("#{singular_class}.columns_hash['#{col}']").limit
+        sql_type = eval("#{singular_class}.columns_hash['#{col}']").sql_type
+
+        case type
+        when :integer
+          # look for a belongs_to on this object
+          if col.to_s.ends_with?("_id")
+
+            assoc_name = col.to_s.gsub("_id","")
+
+
+            assoc = eval("#{singular_class}.reflect_on_association(:#{assoc_name})")
+
+            if assoc.nil?
+              puts "*** Oops. on the #{singular_class} object, there doesn't seem to be an association called '#{assoc_name}'"
+              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}.#{display_column}"
+
+          else
+            "  %td
+    = #{singular}.#{col}"
+          end
+        when :string
+          width = (limit && limit < 40) ? limit : (40)
+          "  %td
+    = #{singular}.#{col}"
+        when :text
+          "  %td
+    = #{singular}.#{col}"
+        when :datetime
+          "  %td
+    - 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
+        MISSING
+"
+        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
+        MISSING
+"
+
+        end
+      }.join("\n")
+      return res
+    end
+
+
 
     private # thor does something fancy like sending the class all of its own methods during some strange run sequence
     # does not like public methods