thecore_dataentry_commons 1.4.7 → 1.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c32e615b4d9709032878d535a678e424161a124075427c4630feed29a4b6c46
-  data.tar.gz: '092968d69255797c074bd22fbd5f4cbea0a78ca480344c3131c3d84703f74d31'
+  metadata.gz: 69be673cf75a0edb0b5ffc9b8b2388bfd4227e70bdecbe7c94d5c1a229013d8c
+  data.tar.gz: 24d9b9cae23b01de0073c78cce3e2eda924d38db9cefd324b768065b8425453c
 SHA512:
-  metadata.gz: 2bd0cbbdb728ae47e4614fe48d29fc1bbb83e551e473d49692bee167aebf74a2a9fa05e55e534f3beeef2a2f106321ae015a497c3b8ed9244192726b3d948b08
-  data.tar.gz: cafdeb83b68bb348892114af3c1403575c80af52963e494bf0ace1362541f4617c2909d2be70036b987c40ce1056dc759d7e4dda5c80328cfec1c384088a4535
+  metadata.gz: '0385b1c20013adb0aab32119bacf53d0069728045d597c13f1f341485fa2540da46a63e01f3f4870e4a66bc98392d752dbe1a2d1ba8bff0e8fe2f46ceeeddeef'
+  data.tar.gz: 223980eb810a422634455c13b9bbe80c6b3feed6a7d7f1aace8a16461db87d557d071a22c66aed17a44188995b3c4660858d425e8c764407bf09ce183def536c

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();
+        $.get('<%=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/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/version.rb

@@ -1,3 +1,3 @@
 module ThecoreDataentryCommons
-  VERSION = '1.4.7'.freeze
+  VERSION = '1.4.9'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thecore_dataentry_commons
 version: !ruby/object:Gem::Version
-  version: 1.4.7
+  version: 1.4.9
 platform: ruby
 authors:
 - Gabriele Tassoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-30 00:00:00.000000000 Z
+date: 2019-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thecore_settings
@@ -49,6 +49,7 @@ 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