thecore_dataentry_commons 1.4.6 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87f9ac84382de0a404470be5028fba6995603c98e365eb62903c947ead4cdeb5
-  data.tar.gz: 27e7051b9ad877b7da2258c92e7cf2699ac6bcc54d06542d85ce72cdb527e9c0
+  metadata.gz: e7e1ec2618c611bfd7ecf1c5bd25a021b1371e8fc1e518cedeb179877380668a
+  data.tar.gz: 95c6025fd0cb286fa150aeec8cd9eb83e81e6660924250209a900aa300c06012
 SHA512:
-  metadata.gz: 0b3db55eb4a617b6126b0563f00054edd0cff4a66064e80ab0cd6941827bad2e5676fea798167191f2842ca6b9c592c5cd219386a1eb21a51443eecf66004d79
-  data.tar.gz: 9df03f723df7e5456acf4481721622dbb028e8a9d1a0c58f658368ef7f3305e146598abaaee1042e679abf70df0d068eb3c7968adb145d6d0b9e8b39ac65d5a5
+  metadata.gz: c1829970cebb97ac0f2ec358db7a5f244a1101513a4a2b150fa5b0483b874fff681a2bbaa578d3aa086ec922ea5a8ad6a0bc04d581914bc16fae6b13f25ecddb
+  data.tar.gz: 8de5519f780b1dc693c71d94b16107c2f71ad68fe0339bd5d4b9a6e4e754e0f873ecfcd839003f185932f997d70914f371f2ec0c98e6b7dcd2bbaa037cc317dc

data/app/views/higher_level/_barcode_simple_scan.html.erb

@@ -3,10 +3,22 @@
 
 <%= render "dataentry_commons_data_container", hide_action: (hide_action rescue true)%>
 
+<%= render "dataentry_commons_data_action" %>
 <script>
     var code;
     var returnedData;
     var additionalData = {};
+    var disableKeyManagement = false;
+
+    function resetInfo() {
+        returnedData = code = undefined;
+        $("#barcode").empty();
+        $("#data-info").empty().hide();
+        $("#data-content").empty().hide();
+        <%-unless (hide_action rescue true)%>
+        $("#data-action").hide();
+        <%-end%>
+    }
 
     // These functions can be overridden in the containing file
     function setAll() {
@@ -17,14 +29,10 @@
         <%-end%>
     }
 
-    function resetInfo() {
-        returnedData = code = undefined;
-        $("#barcode").empty();
-        $("#data-info").empty().hide();
-        $("#data-content").empty().hide();
-        <%-unless (hide_action rescue true)%>
-        $("#data-action").hide();
-        <%-end%>
+    function resetAll() {
+        // Resetting all to the starting condition
+        resetCurrentBtn();
+        resetInfo();
     }
 
     function contentHtmlString(data){
@@ -33,6 +41,8 @@
 
     function barcodeScannedSuccess(data, status) {
         returnedData = data;
+        if(disableKeyManagement)
+            $(window).off('keydown');
         // Cleaning up
         $("#data-content").empty().hide();
         // Setting info already formatted from the controller
@@ -49,30 +59,21 @@
     function barcodeScannedThen(appended){}
 
     function barcodeScannedFailure(errorObj) {
-        // Resetting all to the starting condition
-        resetCurrentBtn();
-        resetInfo();
+        returnedData = errorObj.responseJSON;
         // Showing modal error
-        openModal("<%=t :error %>", errorObj.responseJSON.error);
+        var primary = null
+        var secondary = null
+        if (errorObj.responseJSON.primary_btn)
+            primary = window[errorObj.responseJSON.primary_btn];
+        if (errorObj.responseJSON.secondary_btn)
+            secondary = window[errorObj.responseJSON.secondary_btn];
+        openModal("<%=t :error %>", errorObj.responseJSON.error, primary, secondary);
+        if(!primary && !secondary)
+            resetAll();
     }
 
     <%-unless (hide_action rescue true)%>
-    function dataActionSuccess(data, status) {
-        openModal("<%=t :success %>", data.message);
-        setAll();
-        resetCurrentBtn();
-        return data;
-    }
-
-    function dataActionThen(data){}
-
-    function dataActionFailure(errorObj) {
-        barcodeScannedFailure(errorObj);
-    }
-
-    function dataActionAlways(){
-        $("#data-action").button('reset');
-    }
+    dataAction.init();
     <%-end%>
     // END of overridable functions
 
@@ -86,27 +87,13 @@
             parameters: additionalData
         }).then(barcodeScannedSuccess).done(barcodeScannedThen).fail(barcodeScannedFailure);
     }
+
     <%-if (start_disabled rescue false)%>
     $('#send').off('click', sendFunction);
     <%-else%>
     $('#send').on('click', sendFunction);
     <%-end%>
 
-    <%-unless (hide_action rescue true)%>
-    // Operation on button click
-    $("#data-action").click(function () {
-        code = $('#barcode');
-        code.prop('disabled', true);
-        $(this).button('loading');
-        $.get('<%=rails_admin.send("#{action_name}_path")%>', {
-            barcode: code.val(),
-            parameters: additionalData,
-            what_to_do: "data-action",
-            data: returnedData
-        }).then(dataActionSuccess).done(dataActionThen).fail(dataActionFailure).always(dataActionAlways);
-    });
-    <%-end%>
-
     // Starting with a clean interface
     resetInfo();
 </script>

data/app/views/rails_admin/main/_dataentry_commons_data_action.html.erb

@@ -0,0 +1,54 @@
+<script>
+var dataAction = {
+
+    success: function(data, status) {
+        openModal('<%=t :success %>', data.message || data.info);
+        setAll();
+        resetCurrentBtn();
+        return data;
+    },
+
+    then: function(data) {},
+
+    failure: function(errorObj) {
+        barcodeScannedFailure(errorObj);
+    },
+
+    always: function () {
+        $("#data-action").button('reset');
+        dataAction.dispose();
+    },
+    // Operation on button click
+    before: function() {},
+
+    run: function() {
+        code = $('#barcode');
+        code.prop('disabled', true);
+        $(this).button('loading');
+        this.before();
+        $.post('<%=rails_admin.send("#{action_name}_path")%>', {
+            barcode: code.val(),
+            parameters: additionalData,
+            what_to_do: "data-action",
+            data: returnedData
+        }).then(this.success).done(this.then).fail(this.failure).always(this.always);
+    },
+    
+    init: function() {
+        $(window).off('keydown', manageScannedKeystrokes);
+        let dataActionHtml = $([
+            '<div class="row" id="data-action-container">',
+            '   <button id="data-action" onclick="dataAction.run(); return false;" class="btn btn-danger col-lg-12" data-loading-text="<i class=\'fa fa-spinner fa-spin \'></i> <%=t :loading %>"><%=t "barcode.action.name"%></button>',
+            '</div>'
+        ].join("\n"));
+        $("#info-container").append(dataActionHtml);
+        // $("#data-action").click(dataAction.run);
+    },
+
+    dispose: function() {
+        $("#data-action-container").remove();
+        $(window).off('keydown');
+        $(window).on('keydown', manageScannedKeystrokes);
+    }
+}
+</script>

data/app/views/rails_admin/main/_dataentry_commons_data_container.html.erb

@@ -1,13 +1,8 @@
-<div class="container" style="margin-top: 1em;">
+<div class="container" style="margin-top: 1em;" id="info-container">
   <div class="row">
     <div id="data-info" class="alert alert-warning col-lg-12"></div>
   </div>
   <div class="row">
     <div id="data-content" class="alert alert-warning col-lg-12"></div>
   </div>
-  <%-unless (hide_action rescue true)%>
-  <div class="row">
-    <button id="data-action" class="btn btn-danger col-lg-12" data-loading-text="<i class='fa fa-spinner fa-spin '></i> <%=t :loading %>"><%=t "barcode.action.name"%></button>
-  </div>
-  <%-end%>
 </div>

data/app/views/rails_admin/main/_dataentry_commons_input_group_logic.html.erb

@@ -1 +1,9 @@
+<script>
+  function resetCurrentBtn() {
+    $("#send").button('reset');
+    $("#barcode").prop('disabled', false);
+    $("#barcode").val('');
+    // sendMessageToServer(msg_input_plugin_enable); clickedBtn = code = null;
+  }
+</script>
 <%=render (@type.presence || "kp"), start_disabled: (start_disabled rescue false) %>

data/app/views/rails_admin/main/_kp.html.erb

@@ -13,12 +13,6 @@
   // var clickedBtn; var code; Gestisco il keypress sull'input
   // $("#barcode").on(kpMode, keypressAndReturn);
 
-  function resetCurrentBtn() {
-    $("#send").button('reset');
-    $("#barcode").prop('disabled', false);
-    $("#barcode").val('');
-    // sendMessageToServer(msg_input_plugin_enable); clickedBtn = code = null;
-  }
   // var clickedBtn; var code; Gestisco il keypress sull'input
   function manageScannedKeystrokes(event) {
     const keycode = (event.keyCode ? event.keyCode : event.which);
@@ -29,6 +23,7 @@
         (keycode > 95 && keycode < 112)  || // numpad keys
         (keycode > 185 && keycode < 193) || // ;=,-./` (in order)
         (keycode > 218 && keycode < 223));   // [\]' (in order)
+    // console.log(`Is it Valid? ${valid}`);
     let prevent = false;
     if (event.ctrlKey && keycode == '32') {
       // Invia il form secondario
@@ -43,7 +38,7 @@
       prevent = true;
     } else if (valid) { // if (event.target.id != "barcode")
       // Scrivilo nell'input field (accumulando)
-      console.log("Write to the field");
+      // console.log("Write to the field");
       $("#barcode").val(function (index, val) {
         // Write
         return val + event.key;

data/app/views/thecore_utils/_html_helpers.html.erb

@@ -0,0 +1,65 @@
+<script>
+  function buildDTPicker(id, label, initialValue, ro, date_only){
+    var html = '<div class="input-group date" default-date="'+initialValue+'">';
+      html += '<label class="input-group-addon">'+label+'</label>';
+      html += '<input class="form-control" type="text" readonly/>';
+      html += '<label class="input-group-addon"><i class="fa fa-fw fa-calendar"></i></label>';
+      html += '</div>';
+      var jqueryObj = $(html);
+      var dtParams = {
+        locale: "<%=I18n.locale%>",
+        defaultDate: initialValue,
+        ignoreReadonly: !ro,
+        allowInputToggle: true,
+        sideBySide: true,
+        icons: {
+          time: 'fa fa-clock',
+          date: 'fa fa-calendar',
+          up: 'fa fa-chevron-up',
+          down: 'fa fa-chevron-down',
+          previous: 'fa fa-chevron-left',
+          next: 'fa fa-chevron-right',
+          today: 'fa fa-calendar-check',
+          clear: 'fa fa-trash',
+          close: 'fa fa-times'
+        }
+      }
+      if(date_only)
+        dtParams.format = "L";
+      jqueryObj.datetimepicker(dtParams).on('dp.change', function (e){
+        returnedData[id.replace(/-/g, '_')] = e.date.format();
+        $(this).datetimepicker('hide');
+      });
+      return jqueryObj;
+  }
+
+  function buildDatePicker(id, initialValue) {
+    var html = '<div class="input-group date" id="' + id + '">';
+    html += '<input type="text" class="form-control" />';
+    html += '<label class="input-group-addon"><i class="fa fa-fw fa-calendar"></i></label>';
+    html += '</div>';
+    var jqueryObj = $(html);
+    var dtParams = {
+      locale: "<%=I18n.locale%>",
+      defaultDate: initialValue,
+      allowInputToggle: true,
+      format: 'L',
+      icons: {
+        time: 'fa fa-clock',
+        date: 'fa fa-calendar',
+        up: 'fa fa-chevron-up',
+        down: 'fa fa-chevron-down',
+        previous: 'fa fa-chevron-left',
+        next: 'fa fa-chevron-right',
+        today: 'fa fa-calendar-check',
+        clear: 'fa fa-trash',
+        close: 'fa fa-times'
+      }
+    }
+    jqueryObj.datetimepicker(dtParams).on('dp.change', function (e){
+      $(this).datetimepicker('hide');
+      //returnedData[id.replace(/-/g, '_')] = e.date.format();
+    });
+    return jqueryObj;
+  }
+</script>

data/config/locales/en.thecore_datawedge_websocket_helpers.yml

@@ -16,4 +16,4 @@ en:
   barcode:
     action:
       name:
-        Send (CTRL + space)
+        Send

data/config/locales/it.thecore_datawedge_websocket_helpers.yml

@@ -16,4 +16,4 @@ it:
   barcode:
     action:
       name:
-        Invia (CTRL + spazio)
+        Elabora

data/lib/thecore_dataentry_commons.rb

@@ -1,6 +1,6 @@
-require "thecore_settings"
-require "thecore_dataentry_commons/engine"
+require "thecore_ui_rails_admin"
 require "browser"
+require "thecore_dataentry_commons/engine"
 
 module ThecoreDataentryCommons
   # Your code goes here...

data/lib/thecore_dataentry_commons/engine.rb

@@ -8,11 +8,13 @@ module ThecoreDataentryCommons
     #   app.middleware.use ::ActionDispatch::Static, "#{root}/app"
     # end
     initializer 'thecore_dataentry_commons.add_to_migrations' do |app|
-      unless app.root.to_s == root.to_s
+      unless app.root.to_s.match root.to_s
         # APPEND TO MAIN APP MIGRATIONS FROM THIS GEM
         config.paths['db/migrate'].expanded.each do |expanded_path|
           app.config.paths['db/migrate'] << expanded_path
         end
+        #  = app.config.paths['db/migrate'].uniq
+        # puts app.config.paths['db/migrate'].map(:path).inspect
       end
     end
   end

data/lib/thecore_dataentry_commons/version.rb

@@ -1,3 +1,3 @@
 module ThecoreDataentryCommons
-  VERSION = '1.4.6'.freeze
+  VERSION = '2.0.1'.freeze
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: thecore_dataentry_commons
 version: !ruby/object:Gem::Version
-  version: 1.4.6
+  version: 2.0.1
 platform: ruby
 authors:
 - Gabriele Tassoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-19 00:00:00.000000000 Z
+date: 2020-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: thecore_settings
+  name: thecore_ui_rails_admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: browser
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '4.1'
 description: This plugin adds some partials to deal with DataWedge WebSocket.
 email:
 - gabriele.tassoni@gmail.com
@@ -49,11 +49,13 @@ files:
 - README.md
 - app/views/higher_level/_barcode_simple_scan.html.erb
 - app/views/rails_admin/main/_barcode_scan_mode_detection.html.erb
+- app/views/rails_admin/main/_dataentry_commons_data_action.html.erb
 - app/views/rails_admin/main/_dataentry_commons_data_container.html.erb
 - app/views/rails_admin/main/_dataentry_commons_input_group.html.erb
 - app/views/rails_admin/main/_dataentry_commons_input_group_logic.html.erb
 - app/views/rails_admin/main/_kp.html.erb
 - app/views/rails_admin/main/_ws.html.erb
+- app/views/thecore_utils/_html_helpers.html.erb
 - config/locales/en.thecore_datawedge_websocket_helpers.yml
 - config/locales/it.thecore_datawedge_websocket_helpers.yml
 - db/migrate/20170913192906_add_keymode_to_settings.rb
@@ -80,8 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Some javascripts and partials to handle DW WS.