F4 to program tag

[koha.git] / ffzg / rfid / koha-rfid.js

diff --git a/ffzg/rfid/koha-rfid.js b/ffzg/rfid/koha-rfid.js
index ce8a327..1e3cbc7 100644 (file)
--- a/ffzg/rfid/koha-rfid.js
+++ b/ffzg/rfid/koha-rfid.js
@@ -26,19 +26,31 @@ function barcode_on_screen(barcode) {
        return found;
 }
 
-function rfid_secure(t,val) {
+var rfid_refresh = 1500; // ms
+
+function rfid_secure_json(t,val, success) {
        if ( t.security.toUpperCase() == val.toUpperCase() ) return;
-       console.debug('rfid_secure', t.content, t.sid, val);
-       if ( barcode_on_screen(t.content) ) 
-               $.getJSON( 'http://localhost:9000/secure.js?' + t.sid + '=' + val + ';callback=?' )
+       rfid_refresh = 0; // disable rfid pull until secure call returns
+       console.log('rfid_secure_json', t, val);
+       $.getJSON( 'http://localhost:9000/secure.js?' + t.sid + '=' + val + ';callback=?', success );
 }
 
+function rfid_secure_check(t,val) {
+       if ( barcode_on_screen(t.content) ) {
+               rfid_secure_json(t, val);
+       }
+}
+
+
 var rfid_reset_field = false;
+var rfid_current_sid = false;
+var rfid_blank_sid   = false;
 
 function rfid_scan(data,textStatus) {
-       var rfid_refresh = 1500; // ms
 
        console.debug( 'rfid_scan', data, textStatus );
+       rfid_current_sid = false;
+       rfid_blank_sid = false;
 
        var span = $('span#rfid');
 
@@ -54,34 +66,52 @@ function rfid_scan(data,textStatus) {
        if ( data.tags ) {
                if ( data.tags.length === 1 ) {
                        var t = data.tags[0];
+                       rfid_current_sid = t.sid;
+
 //                     if ( span.text() != t.content ) {
                        if ( 1 ) { // force update of security
 
                                var script_name = document.location.pathname.split(/\//).pop();
+                               var tab_active  = $("#header_search .ui-tabs-panel:not(.ui-tabs-hide)").prop('id');
+                               console.debug('tab_active', tab_active);
                                var circulation = script_name == 'circulation.pl';
-                               var returns     = script_name == 'returns.pl';
+                               var returns     = script_name == 'returns.pl' || tab_active == 'checkin_search';
 
-                               if ( t.content.length == 0 ) { // empty tag
+                               if ( t.content.length == 0 || t.content == 'UUUUUUUUUUUUUUUU' ) { // blank tag (3M is UUU....)
 
-                                       span.text( t.sid + ' empty' ).css('color', 'red' );
+                                       rfid_blank_sid = t.sid;
+                                       span.text( t.sid + ' blank' ).css('color', 'red' );
 
                                } else if ( t.content.substr(0,3) == '130' ) { // books
 
-                                       if ( circulation ) rfid_secure( t, 'D7' );
-                                       if ( returns     ) rfid_secure( t, 'DA' );
-
                                        var color = 'blue';
                                        if ( t.security.toUpperCase() == 'DA' ) color = 'red';
                                        if ( t.security.toUpperCase() == 'D7' ) color = 'green';
                                        span.text( t.content ).css('color', color);
 
-                                       if ( ! barcode_on_screen( t.content ) ) {
+
+                                       if ( tab_active == 'catalog_search' && script_name != 'moredetail.pl' ) {
+                                               if ( $('span.term:contains(bc:'+t.content+')').length == 0 ) {
+                                                       $('input[name=q]').val( 'bc:' + t.content ).closest('form').submit();
+                                               }
+                                       }
+
+                                       if ( ! barcode_on_screen( t.content ) || returns ) {
                                                rfid_reset_field = 'barcode';
-                                               var i = $('input[name=barcode]:last');
-                                               if ( i.val() != t.content )  {
-                                                       rfid_refresh = 0;
-                                                       i.val( t.content )
-                                                       .closest('form').submit();
+
+                                               // return must be first to catch change of tab to check-in
+                                               var afi_secure    = returns ? 'DA' : 'D7';
+                                               var form_selector = returns ? 'first' : 'last';
+                                               if ( returns || circulation ) {
+                                                       var i = $('input[name=barcode]:'+form_selector);
+                                                       if ( i.val() != t.content )  {
+                                                               rfid_secure_json( t, afi_secure, function(data) {
+                                                                       console.log('secure', afi_secure, data);
+                                                                       i.val( t.content ).closest('form').submit();
+                                                               });
+                                                       }
+                                               } else {
+                                                       console.error('not in circulation or returns');
                                                }
                                        }
 
@@ -91,7 +121,7 @@ function rfid_scan(data,textStatus) {
                                        if ( $('.patroninfo:contains('+t.content+')').length == 1 ) {
                                                console.debug('not submitting', t.contains);
                                        } else {
-                                               rfid_refresh = 0;
+                                               rfid_refresh = 0; // stop rfid scan while submitting form
                                                rfid_reset_field = 'findborrower';
                                                $('input[name=findborrower]').val( t.content )
                                                        .parent().submit();
@@ -123,4 +153,22 @@ function rfid_scan(data,textStatus) {
 
 $(document).ready( function() {
        $.getJSON("http://localhost:9000/scan?callback=?", rfid_scan);
+
+       shortcut.add('F4', function() {
+               // extract barcode from window title
+               var barcode = document.title.split(/\(barcode\s+#|\)/)[1];
+               if ( barcode ) {
+                       if ( ! rfid_blank_sid && rfid_current_sid && confirm('Reprogram this tag to barcode '+barcode) ) {
+                               rfid_blank_sid = rfid_current_sid;
+                       }
+
+                       console.debug('program barcode', barcode, 'to', rfid_blank_sid);
+                       $.getJSON( 'http://localhost:9000/program?' + rfid_blank_sid + '=' + barcode + ';callback=?', function(data) {
+                               console.info('programmed', rfid_blank_sid, barcode, data);
+                       });
+               } else {
+                       console.error('no barcode in window title');
+               }
+       });
+
 });