PartPicker: Tab Event atomar, visuelles Feedback

diff --git a/css/kivitendo/main.css b/css/kivitendo/main.css
index 0b701b45d728979fcca506b698140fc4c4572122..9b87c4417d99ed67439e8ad4d0c46a02955a112d 100644 (file)
--- a/css/kivitendo/main.css
+++ b/css/kivitendo/main.css
@@ -404,6 +404,11 @@ label {
   padding-right: 16px;
 }
 
   padding-right: 16px;
 }
 

+.partpicker-undefined {
+  color: red;
+  font-style: italic;
+}
+

 div.part_picker_part {
   padding: 5px;
   margin: 5px;
 div.part_picker_part {
   padding: 5px;
   margin: 5px;

diff --git a/css/lx-office-erp/main.css b/css/lx-office-erp/main.css
index a4773abd5b0eb4f7f8d3941fa19b15bf3d353638..e8814bb85258bf02e9b0959557817f3c2fdfbc65 100644 (file)
--- a/css/lx-office-erp/main.css
+++ b/css/lx-office-erp/main.css
@@ -455,7 +455,10 @@ label {
 .part_picker {
   padding-right: 16px;
 }
 .part_picker {
   padding-right: 16px;
 }

-
+.partpicker-undefined {
+  color: red;
+  font-style: italic;
+}

 div.part_picker_part {
   padding: 5px;
   margin: 5px;
 div.part_picker_part {
   padding: 5px;
   margin: 5px;

diff --git a/js/autocomplete_part.js b/js/autocomplete_part.js
index fd1bda87c32320c60bd508d8c81a9a43908ec7c5..de8f6e535681b0ca2a65e1c20a946e8c9f0b853e 100644 (file)
--- a/js/autocomplete_part.js
+++ b/js/autocomplete_part.js
@@ -13,14 +13,19 @@ namespace('kivi', function(k){
       PAGE_UP: 33,
       PAGE_DOWN: 34,
     };
       PAGE_UP: 33,
       PAGE_DOWN: 34,
     };

+    var CLASSES = {
+      PICKED:       'partpicker-picked',
+      UNDEFINED:    'partpicker-undefined',
+      FAT_SET_ITEM: 'partpicker_fat_set_item',
+    }

     var o = $.extend({
       limit: 20,
       delay: 50,
     var o = $.extend({
       limit: 20,
       delay: 50,

-      fat_set_item: $real.hasClass('partpicker_fat_set_item'),
+      fat_set_item: $real.hasClass(CLASSES.FAT_SET_ITEM),

     }, options);
     var STATES = {
     }, options);
     var STATES = {

-      UNIQUE: 1,
-      UNDEFINED: 0,
+      PICKED:    CLASSES.PICKED,
+      UNDEFINED: CLASSES.UNDEFINED

     }
     var real_id = $real.attr('id');
     var $dummy  = $('#' + real_id + '_name');
     }
     var real_id = $real.attr('id');
     var $dummy  = $('#' + real_id + '_name');


@@ -31,7 +36,6 @@ namespace('kivi', function(k){
     var state   = STATES.PICKED;
     var last_real = $real.val();
     var last_dummy = $dummy.val();
     var state   = STATES.PICKED;
     var last_real = $real.val();
     var last_dummy = $dummy.val();

-    var last_unverified_dummy = $dummy.val();

     var timer;
 
     function open_dialog () {
     var timer;
 
     function open_dialog () {


@@ -39,7 +43,7 @@ namespace('kivi', function(k){
         url: 'controller.pl?action=Part/part_picker_search',
         data: $.extend({
           real_id: real_id,
         url: 'controller.pl?action=Part/part_picker_search',
         data: $.extend({
           real_id: real_id,

-        }, ajax_data(last_unverified_dummy)),
+        }, ajax_data($dummy.val())),

         id: 'part_selection',
         dialog: {
           title: k.t8('Part picker'),
         id: 'part_selection',
         dialog: {
           title: k.t8('Part picker'),


@@ -82,6 +86,7 @@ namespace('kivi', function(k){
       state = STATES.PICKED;
       last_real = $real.val();
       last_dummy = $dummy.val();
       state = STATES.PICKED;
       last_real = $real.val();
       last_dummy = $dummy.val();

+      last_unverified_dummy = $dummy.val();

       $real.trigger('change');
 
       if (o.fat_set_item && item.id) {
       $real.trigger('change');
 
       if (o.fat_set_item && item.id) {


@@ -95,16 +100,31 @@ namespace('kivi', function(k){
       } else {
         $real.trigger('set_item:PartPicker', item);
       }
       } else {
         $real.trigger('set_item:PartPicker', item);
       }

+      annotate_state();

     }
 
     function make_defined_state () {
     }
 
     function make_defined_state () {

-      if (state == STATES.PICKED)
+      if (state == STATES.PICKED) {
+        annotate_state();

         return true
         return true

-      else if (state == STATES.UNDEFINED && $dummy.val() == '')
+      } else if (state == STATES.UNDEFINED && $dummy.val() == '')

         set_item({})
         set_item({})

-      else
+      else {

         last_unverified_dummy = $dummy.val();
         set_item({ id: last_real, name: last_dummy })
         last_unverified_dummy = $dummy.val();
         set_item({ id: last_real, name: last_dummy })

+      }
+      annotate_state();
+    }
+
+    function annotate_state () {
+      if (state == STATES.PICKED)
+        $dummy.removeClass(STATES.UNDEFINED).addClass(STATES.PICKED);
+      else if (state == STATES.UNDEFINED && $dummy.val() == '')
+        $dummy.removeClass(STATES.UNDEFINED).addClass(STATES.PICKED);
+      else {
+        last_unverified_dummy = $dummy.val();
+        $dummy.addClass(STATES.UNDEFINED).removeClass(STATES.PICKED);
+      }

     }
 
     function update_results () {
     }
 
     function update_results () {


@@ -160,11 +180,9 @@ namespace('kivi', function(k){
     /* note:
      *  event.which does not contain tab events in keypressed in firefox but will report 0
      *  chrome does not fire keypressed at all on tab or escape
     /* note:
      *  event.which does not contain tab events in keypressed in firefox but will report 0
      *  chrome does not fire keypressed at all on tab or escape

-     *  TODO: users expect tab to work on keydown but enter to trigger on keyup,
-     *        should be handled seperately

      */
     $dummy.keydown(function(event){
      */
     $dummy.keydown(function(event){

-      if (event.which == KEY.ENTER || event.which == KEY.TAB) { // enter or tab or tab
+      if (event.which == KEY.ENTER || event.which == KEY.TAB) {

         // if string is empty assume they want to delete
         if ($dummy.val() == '') {
           set_item({});
         // if string is empty assume they want to delete
         if ($dummy.val() == '') {
           set_item({});


@@ -172,11 +190,12 @@ namespace('kivi', function(k){
         } else if (state == STATES.PICKED) {
           return true;
         }
         } else if (state == STATES.PICKED) {
           return true;
         }

+        if (event.which == KEY.TAB) event.preventDefault();

         $.ajax({
           url: 'controller.pl?action=Part/ajax_autocomplete',
           dataType: "json",
           data: $.extend( ajax_data($dummy.val()), { prefer_exact: 1 } ),
         $.ajax({
           url: 'controller.pl?action=Part/ajax_autocomplete',
           dataType: "json",
           data: $.extend( ajax_data($dummy.val()), { prefer_exact: 1 } ),

-          success: function (data){
+          success: function (data) {

             if (data.length == 1) {
               set_item(data[0]);
               if (event.which == KEY.ENTER)
             if (data.length == 1) {
               set_item(data[0]);
               if (event.which == KEY.ENTER)


@@ -184,12 +203,9 @@ namespace('kivi', function(k){
             } else if (data.length > 1) {
              if (event.which == KEY.ENTER)
                 open_dialog();
             } else if (data.length > 1) {
              if (event.which == KEY.ENTER)
                 open_dialog();

-              else
-                make_defined_state();

             } else {
             } else {

-              if (event.which == KEY.TAB)
-                make_defined_state();

             }
             }

+            annotate_state();

           }
         });
         if (event.which == KEY.ENTER)
           }
         });
         if (event.which == KEY.ENTER)


@@ -201,7 +217,7 @@ namespace('kivi', function(k){
 
     $dummy.blur(function(){
       window.clearTimeout(timer);
 
     $dummy.blur(function(){
       window.clearTimeout(timer);

-      timer = window.setTimeout(make_defined_state, 100);
+      timer = window.setTimeout(annotate_state, 100);

     });
 
     // now add a picker div after the original input
     });
 
     // now add a picker div after the original input


@@ -222,6 +238,7 @@ namespace('kivi', function(k){
       result_timer:   result_timer,
       set_item:       set_item,
       reset:          make_defined_state,
       result_timer:   result_timer,
       set_item:       set_item,
       reset:          make_defined_state,

+      is_defined_state: function() { return state == STATES.PICKED },

       init_results:    function () {
         $('div.part_picker_part').each(function(){
           $(this).click(function(){
       init_results:    function () {
         $('div.part_picker_part').each(function(){
           $(this).click(function(){