glimmer-cw-cdatetime-nebula 1.4.0.2.0 → 1.5.0.2.0

data/opal/glimmer-cw-cdatetime-nebula/ext/glimmer/swt/c_date_time_proxy.rb

@@ -0,0 +1,281 @@
+require 'glimmer/swt/widget_proxy'
+#
+module Glimmer
+  module SWT
+    class CDateTimeProxy < WidgetProxy
+      class << self
+        def create(keyword, parent, args, block)
+          # TODO support :tab_fields style
+          # TODO support :border style
+          # TODO support :compact style
+          # TODO support :spinner style
+          # TODO support :date_medium and :date_long styles
+          # TODO support :time_medium style
+          # TODO support :CLOCK_24_HOUR style in addition to :CLOCK_12_HOUR
+          # TODO support :BUTTON_ALWAYS, :BUTTON_AUTO, :BUTTON_MANUAL, :BUTTON_NEVER, :BUTTON_LEFT, and :BUTTON_RIGHT styles
+          # TODO support "Today" functionality
+          # TODO support pattern functionality
+          if [keyword].include_any?('c_date', 'c_date_drop_down', 'c_date_spinner', 'c_date_compact')
+            args += [:date_short]
+          end
+          if [keyword].include_any?('c_time', 'c_time_drop_down', 'c_time_spinner', 'c_time_compact')
+            args += [:time_short]
+          end
+          if keyword.end_with?('_drop_down')
+            args += [:drop_down]
+          elsif keyword.end_with?('_spinner')
+            args += [:spinner]
+          elsif keyword.end_with?('_compact')
+            args += [:compact]
+          else
+            args += [:simple]
+          end
+          
+          new(parent, args, block)
+        end
+      end
+      
+      def initialize(parent, args, block)
+        super(parent, args, block)
+        post_add_content if block.nil?
+      end
+      
+      def post_add_content
+        if time?
+          clocklet
+          if drop_down?
+            time_button_dom_element.on('click') do |event|
+              `clocklet.open(document.getElementById(#{input_id}))`
+            end
+          end
+        else
+          options = {
+            changeMonth: true,
+            changeYear: true,
+          }
+          if drop_down?
+            options = {
+              showOn: 'both',
+              buttonImage: 'assets/glimmer/images/calendar.gif',
+              buttonImageOnly: true,
+              buttonText: 'Select date',
+            }
+          end
+          input_dom_element.datepicker(options)
+        end
+        selection_value = self.selection
+        @added_content = true
+        self.selection = selection_value
+      end
+      
+      def clocklet
+        unless defined?(@@clocklet_default_options_set)
+          `clocklet.defaultOptions.appendTo = 'parent'`
+          `clocklet.defaultOptions.format = 'hh:mm A'`
+          @@clocklet_default_options_set = true
+        end
+        if simple?
+          @clocklet ||= Native(`clocklet.inline(document.getElementById(#{clock_id}), {input: document.getElementById(#{input_id})})`)
+        end
+      end
+      
+      def date?
+        args.to_a.include_any?(:date_short, :date_medium, :date_long)
+      end
+      
+      def time?
+        args.to_a.include_any?(:time_short, :time_medium)
+      end
+      
+      def date_time?
+        !date? && !time?
+      end
+      
+      def drop_down?
+        args.to_a.include?(:drop_down)
+      end
+      
+      def simple?
+        args.to_a.include?(:simple)
+      end
+      
+      def compact?
+        args.to_a.include?(:compact)
+      end
+      
+      def spinner?
+        args.to_a.include?(:spinner)
+      end
+      
+      def selection
+        if @added_content
+          default_date = DateTime.new if @selection.nil?
+          default_year = @selection&.year || default_date.year
+          default_month = @selection&.month || default_date.month
+          default_day = @selection&.day || default_date.day
+          default_hour = @selection&.hour || default_date.hour
+          default_min = @selection&.min || default_date.min
+          default_sec = @selection&.sec || default_date.sec
+          if time?
+            time_string = input_dom_element.val
+             _, current_hour, current_min, am_pm = time_string.match(/(\d{1,2})\:(\d{1,2})[ ]?([APap]?\.?[Mm]?\.?)/).to_a
+            current_hour ||= default_hour
+            current_min ||= default_min
+            current_hour = current_hour.to_i
+            am_pm = am_pm.to_s.gsub('.', '').upcase
+            current_hour += 12 if am_pm == 'PM'
+            current_min = current_min.to_i
+            @selection = DateTime.new(default_year, default_month, default_day, current_hour, current_min, default_sec)
+          else
+            @selection = DateTime.new(input_dom_element.datepicker('getDate')&.year.to_i, input_dom_element.datepicker('getDate')&.month.to_i, input_dom_element.datepicker('getDate')&.day.to_i, default_hour, default_min, default_sec)
+          end
+          @selection = @selection&.to_datetime
+        else
+          @initial_selection
+        end
+      end
+      
+      def selection=(value)
+        if @added_content
+          @selection = value&.to_datetime || DateTime.new
+          if time?
+            formatted_time = @selection.strftime('%I:%M %p')
+            if drop_down? || spinner? || compact?
+              input_dom_element.val(formatted_time)
+            else
+              clocklet.value(formatted_time)
+            end
+          else
+            input_dom_element.datepicker('setDate', @selection.to_time)
+          end
+        else
+          @initial_selection = value
+        end
+      end
+      
+      def observation_request_to_event_mapping
+        {
+          'on_widget_selected' => [
+            { # time
+              event: 'input',
+            },
+            { # date
+              event: 'change',
+            },
+          ],
+        }
+      end
+      
+      def listener_path
+        input_path
+      end
+      
+      def time_button_id
+        "#{id}-time-button"
+      end
+      
+      def time_button_class
+        "#{name}-time-button"
+      end
+      
+      def time_button_path
+        "#{path} ##{time_button_id}"
+      end
+      
+      def time_button_dom_element
+        Document.find(time_button_path)
+      end
+      
+      def element
+        'span'
+      end
+      
+      def input_id
+        "#{id}-input"
+      end
+      
+      def input_class
+        "#{name}-input"
+      end
+      
+      def input_path
+        "#{path} ##{input_id}"
+      end
+      
+      def input_dom_element
+        Document.find(input_path)
+      end
+      
+      def clock_id
+        "#{id}-clock"
+      end
+      
+      def clock_class
+        "#{name}-clock"
+      end
+      
+      def clock_path
+        "#{path} .clocklet"
+      end
+      
+      def clock_dom_element
+        Document.find(clock_path)
+      end
+      
+      def dom
+        input_element = date? && simple? ? 'div' : 'input'
+        input_class_value = "#{input_class} hide" if time? && simple?
+        input_attributes = {type: 'text', id: input_id, class: input_class_value}
+        input_attributes['data-clocklet'] = 'format: hh:mm A; appendTo: parent;' if time?
+        the_class = name
+        the_class += ' simple' if simple?
+        the_class += ' drop-down' if drop_down?
+        the_class += ' compact' if compact?
+        the_class += ' spinner' if spinner?
+        @dom ||= html {
+          span(id: id, class: the_class) {
+            style {
+              css {
+                s('.c-date-time.compact .clocklet, .c-date-time.spinner .clocklet') {
+                  pv 'display', 'none'
+                }
+              }
+            }
+            send(input_element, input_attributes)
+            div(id: clock_id, class: clock_class) if time? && simple?
+            button(id: time_button_id, class: time_button_class, style: "border: none; background: url(assets/glimmer/images/ui-icons_222222_256x240.png) -80px, -96px; width: 16px; height: 16px;") if time? && drop_down?
+          }
+        }.to_s
+      end
+      
+      def widget_property_listener_installers
+        super.merge(
+          CDateTimeProxy => {
+            :selection => lambda do |observer|
+              on_widget_selected { |selection_event|
+                observer.call(selection)
+              }
+            end
+          },
+          
+        )
+      end
+    end
+    
+    # Aliases: `date`, `date_drop_down`, `time`, and `calendar`
+    # TODO
+    CDateProxy               = CDateTimeProxy
+    CDateDropDownProxy       = CDateTimeProxy
+    CDateSpinnerProxy        = CDateTimeProxy
+    CDateCompactProxy        = CDateTimeProxy
+    CTimeProxy               = CDateTimeProxy
+    CTimeDropDownProxy       = CDateTimeProxy
+    CTimeSpinnerProxy        = CDateTimeProxy
+    CTimeCompactProxy        = CDateTimeProxy
+    CDateTimeDropDownProxy   = CDateTimeProxy
+    CDateTimeSpinnerProxy    = CDateTimeProxy
+    CDateTimeCompactProxy    = CDateTimeProxy
+    
+  end
+  
+end

data/opal/views/nebula/c_date_time.rb

@@ -0,0 +1 @@
+ # TODO

data/samples/nebula/c_date_time_gallery.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2020 - Andy Maleh
-# 
+#
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 # "Software"), to deal in the Software without restriction, including
@@ -7,10 +7,10 @@
 # distribute, sublicense, and/or sell copies of the Software, and to
 # permit persons to whom the Software is furnished to do so, subject to
 # the following conditions:
-# 
+#
 # The above copyright notice and this permission notice shall be
 # included in all copies or substantial portions of the Software.
-# 
+#
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -19,16 +19,25 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-require_relative '../../lib/glimmer-cw-cdatetime-nebula'
+$LOAD_PATH.unshift File.expand_path('../../../lib', __FILE__)
+
+require 'glimmer-cw-cdatetime-nebula'
 
 class CDateTimeGallery
+  class Person
+    attr_accessor :date_of_birth
+  end
+  
   include Glimmer
   
   def open
-    shell {      
+    person = Person.new
+    person.date_of_birth = DateTime.new(2013, 7, 12, 18, 37, 23)
+    
+    shell {
       grid_layout(4, false) {
         vertical_spacing 20
-      }      
+      }
       text 'Nebula CDateTime Glimmer Custom Widget Gallery'
       
       label {
@@ -41,8 +50,8 @@ class CDateTimeGallery
       
       tab_folder {
         tab_item {
-          grid_layout 2, false  
-          text 'Plain'
+          grid_layout 2, false
+          text 'Simple'
           
           label {
             text 'c_date_time'
@@ -60,7 +69,9 @@ class CDateTimeGallery
             text 'c_time'
             font name: 'Consolas', height: 14
           }
-          c_time
+          c_time {
+            selection bind(person, :date_of_birth)
+          }
         }
          
         tab_item {
@@ -89,11 +100,12 @@ class CDateTimeGallery
           }
           c_time_drop_down {
             layout_data(:fill, :center, true, true)
+            selection bind(person, :date_of_birth)
           }
         }
          
         tab_item {
-          grid_layout 2, false  
+          grid_layout 2, false
           text 'Spinner'
           
           label {
@@ -118,11 +130,12 @@ class CDateTimeGallery
           }
           c_time_spinner {
             layout_data(:fill, :center, true, true)
+            selection bind(person, :date_of_birth)
           }
         }
               
         tab_item {
-          grid_layout 2, false  
+          grid_layout 2, false
           text 'Compact'
           
           label {
@@ -147,11 +160,12 @@ class CDateTimeGallery
           }
           c_time_compact {
             layout_data(:fill, :center, true, true)
+            selection bind(person, :date_of_birth)
           }
-        }  
+        }
       }
-    }.open  
-  end  
+    }.open
+  end
 end
 
 CDateTimeGallery.new.open

metadata

@@ -1,35 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-cw-cdatetime-nebula
 version: !ruby/object:Gem::Version
-  version: 1.4.0.2.0
+  version: 1.5.0.2.0
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-17 00:00:00.000000000 Z
+date: 2020-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.8
+        version: 4.17.10.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 5.0.0.0
   name: glimmer-dsl-swt
-  type: :runtime
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.8
+        version: 4.17.10.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 5.0.0.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -37,8 +37,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.5.0
   name: rspec
-  type: :development
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -51,8 +51,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.3.9
   name: jeweler
-  type: :development
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
@@ -65,30 +65,15 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: simplecov
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  name: glimmer-cs-gladiator
   type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Nebula CDateTime Widget - Glimmer Custom Widget - A Date and Time selection
-  widget that can be used in a plain (graphical), dropdown, spinner, or compact text
-  style.
+  widget that can be used in a simple, dropdown, spinner, or compact style.
 email: andy.am@gmail.com
 executables: []
 extensions: []
@@ -96,17 +81,25 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.md
 files:
+- CHANGELOG.md
 - LICENSE.txt
 - README.md
 - VERSION
+- app/assets/stylesheets/glimmer_cw_cdatetime_nebula/clocklet.min.css
+- app/assets/stylesheets/glimmer_cw_cdatetime_nebula/glimmer_cw_cdatetime_nebula.css
 - lib/glimmer-cw-cdatetime-nebula.rb
 - lib/glimmer-cw-cdatetime-nebula/ext/glimmer/dsl/swt/cdt_expression.rb
 - lib/glimmer-cw-cdatetime-nebula/ext/glimmer/swt/c_date_time_proxy.rb
 - lib/glimmer-cw-cdatetime-nebula/ext/glimmer/swt/cdt_proxy.rb
+- lib/glimmer-cw-cdatetime-nebula/vendor/clocklet.min.js
+- lib/glimmer_cw_cdatetime_nebula/engine.rb
 - lib/views/nebula/c_date_time.rb
+- opal/glimmer-cw-cdatetime-nebula/ext/glimmer/cdt.rb
+- opal/glimmer-cw-cdatetime-nebula/ext/glimmer/swt/c_date_time_proxy.rb
+- opal/views/nebula/c_date_time.rb
 - samples/nebula/c_date_time_gallery.rb
-- vendor/nebula/org.eclipse.nebula.cwt_1.1.0.jar
-- vendor/nebula/org.eclipse.nebula.widgets.cdatetime_1.4.0.jar
+- vendor/nebula/org.eclipse.nebula.cwt_1.1.0.202007241204.jar
+- vendor/nebula/org.eclipse.nebula.widgets.cdatetime_1.5.0.202007241204.jar
 homepage: http://github.com/AndyObtiva/glimmer-cw-cdatetime-nebula
 licenses:
 - MIT
@@ -115,6 +108,7 @@ post_install_message:
 rdoc_options: []
 require_paths:
 - lib
+- opal
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -126,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Nebula CDateTime Widget - Glimmer Custom Widget