[Fmsystem-commits] [15751]

[nelson . guerra]

Revision: 15751
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15751
Author:   nelson224
Date:     2016-09-29 01:32:30 +0000 (Thu, 29 Sep 2016)
Log Message:
-----------


Modified Paths:
--------------
    branches/dev-syncromind-2/property/js/portico/import_components.js

Modified: branches/dev-syncromind-2/property/js/portico/import_components.js
===================================================================
--- branches/dev-syncromind-2/property/js/portico/import_components.js  
2016-09-29 01:32:18 UTC (rev 15750)
+++ branches/dev-syncromind-2/property/js/portico/import_components.js  
2016-09-29 01:32:30 UTC (rev 15751)
@@ -61,7 +61,7 @@
                {
                        var selected = api.rows(this).data()[0];
                        //console.log(selected.location_code);
-                       $('#tab-content').responsiveTabs('enable', 2);
+                       $('#tab-content').responsiveTabs('enable', 1);
                        $('#tab-content').responsiveTabs('enable', 3);
                        $('#tab-content').responsiveTabs('activate', 1);
                        $('.location_name').html(selected.location_code + ' ' + 
selected.loc1_name);
@@ -99,6 +99,18 @@
                        return false;
                }
                
+               if ($('#location_item_id').val() === '')
+               {
+                       alert('Choose Location');
+                       return false;
+               }       
+       
+               if ($('#attribute_name_component_id').val() === '')
+               {
+                       alert('Choose attribute name for Component ID');
+                       return false;
+               }
+               
                if (isSendingData())
                {
                        return false;
@@ -108,6 +120,9 @@
                var file_data = $('#excel_files').prop('files')[0];
                var form_data = new FormData(form);
                form_data.append('file', file_data);
+               form_data.append('attribute_name_component_id', 
$('#attribute_name_component_id').val());
+               form_data.append('location_code', $('#location_code').val());
+               form_data.append('location_item_id', 
$('#location_item_id').val());
 
                $('.processing-import-relations').show();
                
@@ -124,7 +139,7 @@
                                statusSend = false;
                                $('.processing-import-relations').hide();
                                JqueryPortico.show_message(4, result);
-                               $('#import_components_files').prop('disabled', 
true);
+                               
//$('#import_components_files').prop('disabled', true);
                        }
                });
        });
@@ -413,7 +428,7 @@
                                                
$('#new_attributes').append(field + "<br>");
                                        });
                                }
-                               
$('#attribute_name_component_id').prop('disabled', true);
+                               
//$('#attribute_name_component_id').prop('disabled', true);
                                $('#step5').prop('disabled', false);
 
                        }, data, "GET", "JSON"