RFID add renew shortcut

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

diff --git a/ffzg/rfid/koha-rfid.js b/ffzg/rfid/koha-rfid.js
index 40e7db9..4c6a00a 100644 (file)
--- a/ffzg/rfid/koha-rfid.js
+++ b/ffzg/rfid/koha-rfid.js
@@ -27,6 +27,7 @@ function barcode_on_screen(barcode) {
 }
 
 var rfid_refresh = 1500; // ms
+var rfid_count_timeout = 10; // number of times to scan reader before turning off
 
 function rfid_secure_json(t,val, success) {
        if ( t.security.toUpperCase() == val.toUpperCase() ) return;
@@ -48,6 +49,12 @@ var rfid_blank_sid   = false;
 
 function rfid_scan(data,textStatus) {
 
+       var rfid_count = $.cookie('rfid_count');
+       if ( rfid_count === undefined ) {
+               rfid_count = rfid_count_timeout;
+       }
+       console.log('rfid_count', rfid_count);
+
        $.cookie('rfid', 'localhost'); // set cookie
 
        console.debug( 'rfid_scan', data, textStatus, $.cookie('rfid') );
@@ -61,9 +68,9 @@ function rfid_scan(data,textStatus) {
 //             span = $('ul#i18nMenu').append('<li><span id=rfid>RFID reader found<span>');
 
                // alternative pop-up version
-               span = $('#breadcrumbs').append('<div id="rfid_popup" style="position: fixed; bottom: 3em; right: 1em; background: #fff; border: 3px solid #ff0; padding: 1em; opacity: 0.7; z-index: 10;"><label for="rfid_active"><input type=checkbox id="rfid_active"> local_ip <span id="rfid">RFID reader</span></label></div>');
-               $('input#rfid_active').attr('checked',true);
-               $('input#rfid_active').click(scan_tags);
+               span = $('#breadcrumbs').append('<div id="rfid_popup" style="position: fixed; bottom: 3em; right: 1em; background: #fff; border: 3px solid #ff0; padding: 1em; opacity: 0.7; z-index: 1040;"><label for="rfid_active"><input type=checkbox id="rfid_active"> local_ip <span id="rfid">RFID reader</span></label></div>');
+               if ( rfid_count ) $('input#rfid_active').attr('checked',true);
+               $('input#rfid_active').click(activate_scan_tags);
        }
 
 
@@ -87,6 +94,7 @@ function rfid_scan(data,textStatus) {
                                console.debug('tab_active', tab_active);
                                var circulation = script_name == 'circulation.pl' || tab_active == 'circ_search' ;
                                var returns     = script_name == 'returns.pl' || tab_active == 'checkin_search';
+                               console.debug('script_name', script_name, 'circulation', circulation, 'returns', returns);
 
                                if ( t.content.length == 0 || t.content == 'UUUUUUUUUUUUUUUU' ) { // blank tag (3M is UUU....)
 
@@ -96,13 +104,15 @@ function rfid_scan(data,textStatus) {
                                } else if ( t.content.substr(0,3) == '130' && t.reader == '3M810' ) { // books on 3M reader
 
                                        var color = 'blue';
-                                       if ( t.security.toUpperCase() == 'DA' ) color = 'red';
-                                       if ( t.security.toUpperCase() == 'D7' ) color = 'green';
-                                       span.text( t.content ).css('color', color);
+                                       var icon  = '?';
+                                       if ( t.security.toUpperCase() == 'DA' ) { color = 'red'; icon = '&timesb;' }
+                                       if ( t.security.toUpperCase() == 'D7' ) { color = 'green'; icon = '&rarr;' }
+                                       span.html( t.content + '&nbsp;' + icon ).css('color', color);
 
 
-                                       if ( tab_active == 'catalog_search' && script_name != 'moredetail.pl' ) {
+                                       if ( tab_active == 'catalog_search' && script_name != 'moredetail.pl' && $('input#rfid_active').attr('checked') ) {
                                                if ( $('span.term:contains(bc:'+t.content+')').length == 0 ) {
+                                                       $.cookie('rfid_count', rfid_count_timeout);
                                                        $('input[name=q]').val( 'bc:' + t.content ).closest('form').submit();
                                                }
                                        }
@@ -114,12 +124,18 @@ function rfid_scan(data,textStatus) {
                                                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();
-                                                               });
+
+                                                       if ( circulation && $('#circ_needsconfirmation').length > 0 ) {
+                                                               console.log("in circulation, but needs confirmation");
+                                                       } else {
+                                                                       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);
+                                                                                       $.cookie('rfid_count', rfid_count_timeout);
+                                                                                       i.val( t.content ).closest('form').submit();
+                                                                               });
+                                                                       }
                                                        }
                                                } else {
                                                        console.error('not in circulation or returns');
@@ -131,7 +147,7 @@ function rfid_scan(data,textStatus) {
                                        span.text( 'Please put book on 3M reader!' ).css( 'color', 'red' );
 
                                } else {
-                                       span.text( t.content ).css('color', 'blue' );
+                                       span.html( t.content + '&nbsp;&sstarf;' ).css('color', 'blue' );
 
                                        if ( $('.patroninfo:contains('+t.content+')').length == 1 ) {
                                                console.debug('not submitting', t.contains);
@@ -157,6 +173,15 @@ function rfid_scan(data,textStatus) {
                }
        }
 
+
+       if (rfid_count > 0) rfid_count--;
+       if (rfid_count == 0) {
+               span.text('RFID reader disabled').css('color','black');
+               $('input#rfid_active').attr('checked', false)
+       }
+       $.cookie('rfid_count', rfid_count);
+
+
        if (rfid_refresh > 1 && $('input#rfid_active').attr('checked') ) {
                window.setTimeout( function() {
                        $('#rfid_popup').css('border','3px solid #ff0');
@@ -174,23 +199,35 @@ function scan_tags() {
        $.getJSON("///localhost:9000/scan?callback=?", rfid_scan);
 }
 
-function activate_scan_tags() {
-       var active = $('input#rfid_active').attr('checked');
-       if ( ! active ) {
-               $('input#rfid_active').attr('checked',true);
+function set_rfid_active(active) {
+       var input_active = $('input#rfid_active').attr('checked');
+       console.info('set_rfid_active', active);
+       if ( active ) {
+               $.cookie('rfid_count', rfid_count_timeout);
                scan_tags();
+               if ( ! input_active ) $('input#rfid_active').attr('checked', true);
+       } else {
+               if ( input_active ) $('input#rfid_active').attr('checked', false);
+               $.cookie('rfid_count', 0);
        }
 }
 
+function activate_scan_tags() {
+       var active = $('input#rfid_active').attr('checked');
+       console.info('activate_scan_tags', active);
+       set_rfid_active(active);
+}
+
 $(document).ready( function() {
        console.log('rfid_active', $('input#rfid_active').attr('checked') );
 
        scan_tags();
 
        // circulation keyboard shortcuts (FFZG specific!)
-       shortcut.add('Alt+r', function() { activate_scan_tags(); } );
-       shortcut.add('Alt+z', function() { activate_scan_tags(); } );
-       shortcut.add('Alt+k', function() { $('input#rfid_active').attr('checked',false) } );
+       shortcut.add('Alt+r', function() { set_rfid_active(true); } );
+       shortcut.add('Alt+z', function() { set_rfid_active(true); } );
+       shortcut.add('Alt+k', function() { set_rfid_active(false) } );
+       shortcut.add('Alt+y', function() { set_rfid_active(true); } ); // renew
 
        // intranet cataloging
        shortcut.add('F4', function() {