Merge remote-tracking branch 'origin/master'

# Conflicts: # Wello/www/form.php
etl12003 · Apr 23, 2017 · b71cc80 · b71cc80
2 parents a5bd4f0 + e7c16de
commit b71cc80
Showing 1 changed file with 31 additions and 17 deletions.
diff --git a/Wello/www/form.php b/Wello/www/form.php
@@ -181,7 +181,7 @@
 
             <li id="get-gps-local">
                 <label for="gps-coordinates">GPS coordinates 
-                        <img onclick="getLocation()" alt="get location" src="img/gps.svg">
+                    <img onclick="getLocation()" alt="get location" src="img/gps.svg">
                 </label>
                 <p id="demo"></p>
                 <label for="gps-coordinates">Latitude</label>
@@ -211,27 +211,41 @@
 
             <li>
                 <label for="use">Use</label>
-                <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'] == '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>
+
+                <?php
+                $ProposedArray = array('DOMESTIC','BUSINESS ESTABLISHMENT','FARM','TEST WELL','PUBLIC SUPPLY','INDUSTRIAL','AIR CONDITIONING','OTHER');
+                echo'<select id="use">';
+				    foreach ($ProposedArray as $value) {
+				    //sticky form implementation for drop down, set selected to previous user input
+									if ($row['Proposed_Use'] == $value) {
+										echo '<option value="' . $value . '" selected="selected">' . $value . '</option>';
+									} else {
+										echo '<option value="' . $value . '">' . $value . '</option>';
+									}
+								}
+                echo '</select>';
+                ?>
+
                 <input value="" type="text" id="other-use-case" class="other">
             </li>
 
             <li>
                 <label for="drilling-equipment">Drilling equipment</label>
-                <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>
+
+                <?php
+                $DrillingEquipArray = array('ROTARY','COMPRESSED AIR PERCUSSION','CABLE PERCUSSION','OTHER');
+                echo'<select id="use">';
+				    foreach ($DrillingEquipArray as $value) {
+				    //sticky form implementation for drop down, set selected to previous user input
+									if ($row['Proposed_Use'] == $value) {
+										echo '<option value="' . $value . '" selected="selected">' . $value . '</option>';
+									} else {
+										echo '<option value="' . $value . '">' . $value . '</option>';
+									}
+								}
+                echo '</select>';
+                ?>
+
                 <input value="" type="text" id="other-equipment" class="other">
             </li>