Merge pull request #60 from SEL-Columbia/cards

write card button disabled/enabled for vendors/customers
SEL-Columbia · Jul 19, 2017 · ac77558 · ac77558
2 parents cfc813a + be4934e
commit ac77558
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 19 deletions.
diff --git a/...id/static/src/js/minigrid_write_credit.js → ...grid/static/src/js/minigrid_write_card.js b/...id/static/src/js/minigrid_write_credit.js → ...grid/static/src/js/minigrid_write_card.js
@@ -7,7 +7,9 @@ import populateCardInfoTable from './populate_card_info.js';
 
 (function(){
 
-    const input = document.getElementById('card-value');
+    const inputs = document.getElementsByClassName('card-value');
+
+    console.log('new input', inputs)
 
     let conn = new SockJS(http_protocol + '://' + window.location.host + '/cardconn');
         let received_info;
@@ -21,14 +23,19 @@ import populateCardInfoTable from './populate_card_info.js';
         };
 
         conn.onmessage = function(e) {
-            console.log('Received: ' + JSON.stringify(e.data['received_info']));
+            console.log('Received!: ' + JSON.stringify(e.data));
             received_info = e.data['received_info'];
             card_read_error = e.data['card_read_error'];
+            console.log('its different part 1', e.data['device_active']);
 
             if (e.data['device_active']!==device_active) {
                 device_active = e.data['device_active'];
-                if (e.data['device_active']) input.disabled = false;
-                else input.disabled = true;
+                console.log('its different', device_active);
+                console.log(inputs);
+                [].forEach.call(inputs, function(input){
+                    if (e.data['device_active']) input.disabled = false;
+                    else input.disabled = true;
+                });
                 populateCardInfoTable(received_info, card_read_error);
             };
         };

diff --git a/minigrid/templates/minigrid_customers.html b/minigrid/templates/minigrid_customers.html
@@ -22,13 +22,13 @@ <h1>Minigrid Name: {{ minigrid.minigrid_name }}</h1>
         <p>User ID: {{ customer.customer_user_id }}</p>
         <form action="/minigrids/{{ minigrid.minigrid_id }}/customers" method="POST">
           {% module xsrf_form_html() %}
-  	<input type="hidden" name="action" value="write" />
-  	<input type="hidden" name="customer_id" value="{{ customer.customer_id }}" />
-  	{% if device_active %}
-            <input type="submit" value="Write ID card" />
-  	{% else %}
-            <input type="submit" value="Write ID card" title="Touch card to reader" disabled/>
-  	{% end %}
+        	<input type="hidden" name="action" value="write" />
+        	<input type="hidden" name="customer_id" value="{{ customer.customer_id }}" />
+          {% if device_active %}
+            <input class="card-value" type="submit" value="Write ID card" />
+          {% else %}
+            <input class="card-value" type="submit" value="Write ID card" title="Touch card to reader" disabled/>
+          {% end %}
         </form>
         <form action="/minigrids/{{ minigrid.minigrid_id }}/customers" method="POST">
           {% module xsrf_form_html() %}
@@ -62,5 +62,5 @@ <h1>Minigrid Name: {{ minigrid.minigrid_name }}</h1>
   <script>
     var http_protocol = '{{ http_protocol }}';
   </script>
-  <script type="text/javascript" src="{{ static_url('dist/read_card.bundle.js') }}"></script>
+  <script type="text/javascript" src="{{ static_url('dist/write_card.bundle.js') }}"></script>
 {% end %}
diff --git a/minigrid/templates/minigrid_vendors.html b/minigrid/templates/minigrid_vendors.html
@@ -25,9 +25,9 @@ <h1>Minigrid Name: {{ minigrid.minigrid_name }}</h1>
   	<input type="hidden" name="action" value="write" />
   	<input type="hidden" name="vendor_id" value="{{ vendor.vendor_id }}" />
   	{% if device_active %}
-            <input type="submit" value="Write ID card" />
+            <input class="card-value" type="submit" value="Write ID card" />
   	{% else %}
-            <input type="submit" value="Write ID card" title="Touch card to reader" disabled/>
+            <input class="card-value" type="submit" value="Write ID card" title="Touch card to reader" disabled/>
   	{% end %}
         </form>
         <form action="/minigrids/{{ minigrid.minigrid_id }}/vendors" method="POST">
@@ -63,5 +63,5 @@ <h1>Minigrid Name: {{ minigrid.minigrid_name }}</h1>
   <script>
     var http_protocol = '{{ http_protocol }}';
   </script>
-  <script type="text/javascript" src="{{ static_url('dist/read_card.bundle.js') }}"></script>
+  <script type="text/javascript" src="{{ static_url('dist/write_card.bundle.js') }}"></script>
 {% end %}
diff --git a/minigrid/templates/minigrid_write_credit.html b/minigrid/templates/minigrid_write_credit.html
@@ -14,9 +14,9 @@ <h1>Minigrid Name: {{ minigrid.minigrid_name }}</h1>
           {% module xsrf_form_html() %}
           <label>Card value : <input type="number" step="1" min="0" name="credit_value" required /></label><br>
 	  {% if device_active %}
-              <input id="card-value" type="submit" value="Write credit card" />
+              <input class="card-value" type="submit" value="Write credit card" />
 	  {% else %}
-              <input id="card-value" type="submit" value="Write credit card" title="Touch card to reader" disabled/>
+              <input class="card-value" type="submit" value="Write credit card" title="Touch card to reader" disabled/>
 	  {% end %}
         </form>
       </div>
@@ -36,6 +36,6 @@ <h1>Minigrid Name: {{ minigrid.minigrid_name }}</h1>
     var http_protocol = '{{ http_protocol }}';
   </script>
 
-  <script type="text/javascript" src="{{ static_url('dist/write_credit.bundle.js') }}"></script>
+  <script type="text/javascript" src="{{ static_url('dist/write_card.bundle.js') }}"></script>
 
 {% end %}
diff --git a/webpack.config.js b/webpack.config.js
@@ -3,7 +3,7 @@ const webpack = require('webpack');
 
 module.exports = {
   entry: {
-    write_credit: path.resolve(__dirname, 'minigrid/static/src/js/minigrid_write_credit.js'),
+    write_card: path.resolve(__dirname, 'minigrid/static/src/js/minigrid_write_card.js'),
     read_card: path.resolve(__dirname, 'minigrid/static/src/js/read_card.js'),
     tariffs: path.resolve(__dirname, 'minigrid/static/src/js/tariffs.js')
   },