From 5e57a3180c0152673c6bdfcbb059f93777636744 Mon Sep 17 00:00:00 2001
From: lauranav <113923422+lauranav@users.noreply.github.com>
Date: Tue, 4 Oct 2022 10:32:20 -0400
Subject: [PATCH] final mod exercise1

---
 assets/js/quote.js | 41 ++++++++++++++++++++++++++++++++---------
 quote.html         |  9 ++++++---
 2 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/assets/js/quote.js b/assets/js/quote.js
index 070111a..a4b284c 100644
--- a/assets/js/quote.js
+++ b/assets/js/quote.js
@@ -13,8 +13,11 @@ $(document).ready(function () {
     });
 
 
-    $('#standart, #premium, #excelium').on('click', function () {
-        document.getElementById('elevPriceUnit').value = (7565).toFixed(2) + " $";
+    $('#standard, #premium, #excelium').on('click', function () {
+
+        var prodRange = getProdRange();
+
+        document.getElementById('elevPriceUnit').value = (prodRange.price).toFixed(2) + " $";
         doCalc();
     });
 
@@ -49,6 +52,7 @@ $(document).ready(function () {
     };
 
     function getProdRange() {
+
         if ($('#standard').is(':checked')) {
             prodRange.type = "standard";
             prodRange.price = parseFloat(7565);
@@ -57,7 +61,7 @@ $(document).ready(function () {
 
         } else if ($('#premium').is(':checked')) {
             prodRange.type = "premium";
-            prodRange.price = parseFloat(123456);
+            prodRange.price = parseFloat(12345);
             prodRange.installationFeePercentage = 0.13;
             return prodRange;
 
@@ -68,13 +72,14 @@ $(document).ready(function () {
             return prodRange;
         } else {
             prodRange.type = null,
-            prodRange.price = null,
-            prodRange.installationFeePercentage = null
+                prodRange.price = null,
+                prodRange.installationFeePercentage = null
             return prodRange;
         }
     };
 
     function GetInfos() {
+        getInfoNumApp();
         getInfoNumFloors();
         getInfoNumBase();
         getInfoNumElev();
@@ -93,18 +98,21 @@ $(document).ready(function () {
     };
 
     function emptyElevatorsNumberAndPricesFields() {
+        $('#numElev_2').val('');
         $('#numElev_3').val('');
         $('.priceField').val('');
     };
 
     function createFormData(projectType) {
+
         return {
             numberApp: numApp,
             numberFloors: numFloors,
             numberBase: numBase,
             maximumOcc: maxOcc,
             productRange: prodRange,
-            projectType: projectType
+            projectType: projectType,
+            numberElev: numElev
         }
     };
 
@@ -115,6 +123,12 @@ $(document).ready(function () {
             $('#numApp').val('');
             return true
 
+        } else if ($('#numFloors').val() < 0) {
+
+            alert("Please enter a positive number!");
+            $('#numFloors').val('');
+            return true
+
         } else if ($('#numBase').val() < 0) {
 
             alert("Please enter a positive number!");
@@ -162,6 +176,8 @@ $(document).ready(function () {
         //Preparing data for Api call
         formData = createFormData(projectType)
 
+        console.log(formData);
+
         $.ajax({
             type: "POST",
             // url: 'http://localhost:3000/api/quoteCalculation/', //for local testing
@@ -170,6 +186,10 @@ $(document).ready(function () {
             contentType: "application/json; charset=utf-8",
             dataType: "json",
             success: function (data) {
+
+                console.log(data);
+                console.log(data.finalNumElev);
+
                 setRequiredElevatorsResult(data.finalNumElev);
                 if (prodRange.type != null) {
                     setPricesResults(data.finalNumElev, data.subTotal, data.installationFee, data.grandTotal);
@@ -177,14 +197,17 @@ $(document).ready(function () {
             }
         });
     }
-    
+
     function doCalc() {
+
         if ($('#residential').hasClass('active') && !negativeValues() && $('#numApp').val() && $('#numFloors').val()) {
             apiCall('residential')
-        } else if ($('#commercial').hasClass('active') && !negativeValues() && $('#numElev').val()  && $('#numPark').val()) {
+        } else if ($('#commercial').hasClass('active') && !negativeValues() && $('#numElev').val()) {
             apiCall('commercial')
         } else if ($('#corporate').hasClass('active') && !negativeValues() && $('#numFloors').val() && $('#numBase').val() && $('#maxOcc').val()) {
-            apiCall('commercial')
+            apiCall('corporate')
+        } else if ($('#hybrid').hasClass('active') && !negativeValues() && $('#numFloors').val() && $('#numBase').val() && $('#maxOcc').val()) {
+            apiCall('hybrid')
         } else {
             emptyElevatorsNumberAndPricesFields();
         };
diff --git a/quote.html b/quote.html
index f06fa2a..8556112 100644
--- a/quote.html
+++ b/quote.html
@@ -214,17 +214,20 @@ <h2 class="card-title">Select a range</h2>
 
 											<!-- radio -->
 											<label class="radio">
-												<input type="radio" name="radio-btn" value="1" id="standard" class="productRangeBtn">
+												<input type="radio" name="radio-btn" value="1" id="standard"
+													class="productRangeBtn">
 												<i></i> Standard
 											</label>
 
 											<label class="radio">
-												<input type="radio" name="radio-btn" value="1" id="premium" class="productRangeBtn">
+												<input type="radio" name="radio-btn" value="1" id="premium"
+													class="productRangeBtn">
 												<i></i> Premium
 											</label>
 
 											<label class="radio">
-												<input type="radio" name="radio-btn" value="1" id="excelium" class="productRangeBtn">
+												<input type="radio" name="radio-btn" value="1" id="excelium"
+													class="productRangeBtn">
 												<i></i> Excelium
 											</label>