From a5bd4f00d5215e0cc7ce98a8aaa365180633a58e Mon Sep 17 00:00:00 2001
From: Erik Lindsay <erik.lindsay@uconn.edu>
Date: Sun, 23 Apr 2017 13:36:13 -0400
Subject: [PATCH] form

---
 Wello/www/form.php    | 25 +++++++++++--------------
 Wello/www/mapERIK.php |  2 +-
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/Wello/www/form.php b/Wello/www/form.php
index d5e9498..768644a 100644
--- a/Wello/www/form.php
+++ b/Wello/www/form.php
@@ -214,26 +214,23 @@
                 <select id="use" onchange='showOther(this.value, this);'>
                     <option <?php if ($row['Proposed_Use'] == 'DOMESTIC'){echo 'selected="selected"';} ?> value="Domestic">Domestic</option>
                     <option <?php if ($row['Proposed_Use'] == 'BUISNESS ESTABLISHMENT'){echo 'selected="selected"';} ?> value="Buisness Establishment">Buisness Establishment</option>
-                    <option <?php if ($row['Proposed_Use'] == 'DOMESTIC'){echo 'selected="selected"';} ?> value="Farm">Farm</option>
-                    <option <?php if ($row['Proposed_Use'] == 'DOMESTIC'){echo 'selected="selected"';} ?> value="Test Well">Test Well</option>
-                    <option <?php if ($row['Proposed_Use'] == 'DOMESTIC'){echo 'selected="selected"';} ?> value="Public Supply">Public Supply</option>
-                    <option <?php if ($row['Proposed_Use'] == 'DOMESTIC'){echo 'selected="selected"';} ?> value="Industrial">Industrial</option>
-                    <option <?php if ($row['Proposed_Use'] == 'DOMESTIC'){echo 'selected="selected"';} ?> value="Air Conditioning">Air Conditioning</option>
-                    <option <?php if ($row['Proposed_Use'] == 'DOMESTIC'){echo 'selected="selected"';} ?> value="Other">Other</option>
+                    <option <?php if ($row['Proposed_Use'] == 'FARM'){echo 'selected="selected"';} ?> value="Farm">Farm</option>
+                    <option <?php if ($row['Proposed_Use'] == 'TEST WELL'){echo 'selected="selected"';} ?> value="Test Well">Test Well</option>
+                    <option <?php if ($row['Proposed_Use'] == 'PUBLIC SUPPLY'){echo 'selected="selected"';} ?> value="Public Supply">Public Supply</option>
+                    <option <?php if ($row['Proposed_Use'] == 'INDUSTRIAL'){echo 'selected="selected"';} ?> value="Industrial">Industrial</option>
+                    <option <?php if ($row['Proposed_Use'] == 'AIR CONDITIONING'){echo 'selected="selected"';} ?> value="Air Conditioning">Air Conditioning</option>
+                    <option <?php if ($row['Proposed_Use'] == 'OTHER'){echo 'selected="selected"';} ?> value="Other">Other</option>
                 </select>
                 <input value="" type="text" id="other-use-case" class="other">
             </li>
 
             <li>
                 <label for="drilling-equipment">Drilling equipment</label>
-                <select value="<?php
-                //Should add ternary operator for nulls and blanks
-                echo $row['Drilling_Equipment'];
-                ?>" id="drilling-equipment">
-                    <option value="Rotary">Rotary</option>
-                    <option value="Compressed Air Percussion">Compressed Air Percussion</option>
-                    <option value="Cable Percussion">Cable Percussion</option>
-                    <option value="Other">Other</option>
+                <select id="drilling-equipment">
+                    <option <?php if ($row['Drilling_Equipment'] == 'ROTERY'){echo 'selected="selected"';} ?>  value="Rotary">Rotary</option>
+                    <option <?php if ($row['Drilling_Equipment'] == 'COMPRESSED AIR PERCUSSION'){echo 'selected="selected"';} ?>  value="Compressed Air Percussion">Compressed Air Percussion</option>
+                    <option <?php if ($row['Drilling_Equipment'] == 'CABLE PERCUSSION'){echo 'selected="selected"';} ?>  value="Cable Percussion">Cable Percussion</option>
+                    <option <?php if ($row['Drilling_Equipment'] == 'OTHER'){echo 'selected="selected"';} ?>  value="Other">Other</option>
                 </select>
                 <input value="" type="text" id="other-equipment" class="other">
             </li>
diff --git a/Wello/www/mapERIK.php b/Wello/www/mapERIK.php
index 717992e..ae644f7 100644
--- a/Wello/www/mapERIK.php
+++ b/Wello/www/mapERIK.php
@@ -118,9 +118,9 @@ function showPos(position) {
         }
         
         getLoc();
+        showPos();
         console.log(hereLA);
         console.log(hereLO);
-        var myVar = setInterval(console.log(hereLO), 1000);
         window.setInterval(console.log(hereLA), 10000);
 
         function initMap() {