From ea4b383e66cb258ff09dbff44bbc18476a674925 Mon Sep 17 00:00:00 2001 From: Marek Baczynski Date: Sun, 25 Nov 2018 00:01:11 +0200 Subject: [PATCH 1/4] fixed the numeric picker --- order_site/static/picker.js | 53 ++++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 25 deletions(-) diff --git a/order_site/static/picker.js b/order_site/static/picker.js index 337e9ef..c17de50 100644 --- a/order_site/static/picker.js +++ b/order_site/static/picker.js @@ -1,36 +1,39 @@ + $(document).ready(function(){ var quantitiy=0; - $('.quantity-right-plus').click(function(e){ - - // Stop acting like a button - e.preventDefault(); - // Get the field name - var quantity = parseInt($('#quantity').val()); - - // If is not undefined - - $('#quantity').val(quantity + 1); - + $('.quantity-right-plus').click(function(e){ + + // Stop acting like a button + e.preventDefault(); + // Get the field name + var quantity = parseInt( $(this).parent().siblings('input').val() ) ; + + // If is not undefined - // Increment - - }); + // $('#quantity').val(quantity + 1); + + $(this).parent().siblings('input').val(quantity + 1) - $('.quantity-left-minus').click(function(e){ - // Stop acting like a button - e.preventDefault(); - // Get the field name - var quantity = parseInt($('#quantity').val()); - // If is not undefined + // Increment + + }); + + $('.quantity-left-minus').click(function(e){ + // Stop acting like a button + e.preventDefault(); + // Get the field name + var quantity = parseInt( $(this).parent().siblings('input').val() ) ; - // Increment - if(quantity>0){ - $('#quantity').val(quantity - 1); - } - }); + // If is not undefined + // Increment + if(quantity>0){ + $(this).parent().siblings('input').val(quantity - 1); + } + }); + }); function submitOrder(){ From 7d22bc3b8679f5b255f1de2c7e174b63bd552442 Mon Sep 17 00:00:00 2001 From: Wilhelm Westermark Date: Sat, 24 Nov 2018 23:41:36 +0100 Subject: [PATCH 2/4] Updated for mobile --- order_site/templates/.index.html.swp | Bin 0 -> 1024 bytes order_site/templates/index.html | 11 ++++++----- 2 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 order_site/templates/.index.html.swp diff --git a/order_site/templates/.index.html.swp b/order_site/templates/.index.html.swp new file mode 100644 index 0000000000000000000000000000000000000000..f556e67d7cdd7eef2ec2b1956f1e6747128f79f5 GIT binary patch literal 1024 zcmeH@!41MN3`H{v3#3NCCcqiFiA5qgag-RfOv*YO=%uJIL45oFKgrS?_ZhS7j>EyM z?sYO|iX4d3s^1C=XBmr1*&;q21W5!74QF{&M{t>a9g3P)dbS YsX@%1<{@a}-w*oI4Rizl3|zm*Hv}jsEdT%j literal 0 HcmV?d00001 diff --git a/order_site/templates/index.html b/order_site/templates/index.html index 09395e5..f161699 100644 --- a/order_site/templates/index.html +++ b/order_site/templates/index.html @@ -2,6 +2,7 @@ + Alepa Twitch Grabs Candy @@ -13,7 +14,7 @@
-

Simple Quantity increment buttons with Javascript

+

Choose your sweets with a wicked system made out of an awesome humanless deployment process

Tasty treats
@@ -84,10 +85,10 @@
-
-
- -
+
+
+ +
From ccaee0bddd8e6e548febba33e8f2894a86c3bd8e Mon Sep 17 00:00:00 2001 From: Wilhelm Westermark Date: Sat, 24 Nov 2018 23:42:10 +0100 Subject: [PATCH 3/4] Remove faulty file --- order_site/templates/.index.html.swp | Bin 1024 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 order_site/templates/.index.html.swp diff --git a/order_site/templates/.index.html.swp b/order_site/templates/.index.html.swp deleted file mode 100644 index f556e67d7cdd7eef2ec2b1956f1e6747128f79f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 zcmeH@!41MN3`H{v3#3NCCcqiFiA5qgag-RfOv*YO=%uJIL45oFKgrS?_ZhS7j>EyM z?sYO|iX4d3s^1C=XBmr1*&;q21W5!74QF{&M{t>a9g3P)dbS YsX@%1<{@a}-w*oI4Rizl3|zm*Hv}jsEdT%j From 46801a586f4925be0f8e88f74c207204bbe5fd92 Mon Sep 17 00:00:00 2001 From: Wilhelm Westermark Date: Sat, 24 Nov 2018 23:53:50 +0100 Subject: [PATCH 4/4] Final fast code for the scale --- scale/scale.ino | 53 +++++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/scale/scale.ino b/scale/scale.ino index 8d90c47..0eeb557 100644 --- a/scale/scale.ino +++ b/scale/scale.ino @@ -4,48 +4,48 @@ HX711 scale; void setup() { - Serial.begin(38400); - Serial.println("HX711 Demo"); + Serial.begin(115200); + //Serial.println("HX711 Demo"); - Serial.println("Initializing the scale"); + //Serial.println("Initializing the scale"); // parameter "gain" is ommited; the default value 128 is used by the library // HX711.DOUT - pin #A1 // HX711.PD_SCK - pin #A0 scale.begin(2, 3); - Serial.println("Before setting up the scale:"); - Serial.print("read: \t\t"); - Serial.println(scale.read()); // print a raw reading from the ADC + //Serial.println("Before setting up the scale:"); + //Serial.print("read: \t\t"); + //Serial.println(scale.read()); // print a raw reading from the ADC - Serial.print("read average: \t\t"); - Serial.println(scale.read_average(20)); // print the average of 20 readings from the ADC + //Serial.print("read average: \t\t"); + //Serial.println(scale.read_average(20)); // print the average of 20 readings from the ADC - Serial.print("get value: \t\t"); - Serial.println(scale.get_value(5)); // print the average of 5 readings from the ADC minus the tare weight (not set yet) + //Serial.print("get value: \t\t"); + //Serial.println(scale.get_value(5)); // print the average of 5 readings from the ADC minus the tare weight (not set yet) - Serial.print("get units: \t\t"); - Serial.println(scale.get_units(5), 1); // print the average of 5 readings from the ADC minus tare weight (not set) divided + //Serial.print("get units: \t\t"); + //Serial.println(scale.get_units(5), 1); // print the average of 5 readings from the ADC minus tare weight (not set) divided // by the SCALE parameter (not set yet) scale.set_scale(2280.f); // this value is obtained by calibrating the scale with known weights; see the README for details scale.tare(); // reset the scale to 0 - Serial.println("After setting up the scale:"); + //Serial.println("After setting up the scale:"); - Serial.print("read: \t\t"); - Serial.println(scale.read()); // print a raw reading from the ADC + //Serial.print("read: \t\t"); + //Serial.println(scale.read()); // print a raw reading from the ADC - Serial.print("read average: \t\t"); - Serial.println(scale.read_average(20)); // print the average of 20 readings from the ADC + //Serial.print("read average: \t\t"); + //Serial.println(scale.read_average(20)); // print the average of 20 readings from the ADC - Serial.print("get value: \t\t"); - Serial.println(scale.get_value(5)); // print the average of 5 readings from the ADC minus the tare weight, set with tare() + //Serial.print("get value: \t\t"); + //Serial.println(scale.get_value(5)); // print the average of 5 readings from the ADC minus the tare weight, set with tare() - Serial.print("get units: \t\t"); - Serial.println(scale.get_units(5), 1); // print the average of 5 readings from the ADC minus tare weight, divided + //Serial.print("get units: \t\t"); + //Serial.println(scale.get_units(5), 1); // print the average of 5 readings from the ADC minus tare weight, divided // by the SCALE parameter set with set_scale - Serial.println("Readings:"); + //Serial.println("Readings:"); } void loop() { @@ -53,10 +53,11 @@ void loop() { //Serial.print(scale.get_units(), 1); //Serial.print("\t| average:\t"); if (Serial.available() > 0) { - Serial.println(scale.get_units(10), 1); + Serial.read(); + Serial.println(scale.get_units(), 1); - scale.power_down(); // put the ADC in sleep mode - delay(100); - scale.power_up(); + //scale.power_down(); // put the ADC in sleep mode + //delay(100); + //scale.power_up(); } }