FOMRMS AND THINGS

etl12003 · Apr 23, 2017 · c1d43a9 · c1d43a9
1 parent 309d69e
commit c1d43a9
Show file tree

Hide file tree

Showing 7 changed files with 594 additions and 82 deletions.
diff --git a/Wello/www/details-content.php b/Wello/www/details-content.php
@@ -94,11 +94,6 @@
                 ?>
             </li>
 
-            <li>
-                <h3>Zip code</h3>
-                <p id="zip-code" class="med-num">STILLTODO</p>
-            </li>
-
             <li>
                 <h3>Lot number</h3>
                 <p id="lot-number" class="med-num">
@@ -206,10 +201,7 @@
                 <p>
                     <?php
                     //Should add ternary operator for nulls and blanks
-<<<<<<< HEAD
-
-=======
->>>>>>> origin/master
+
                     echo $row['Drive_Shoe'];
                     ?>
                </p>
@@ -235,7 +227,6 @@
                 <p id="method">
                     <?php
                     //Should add ternary operator for nulls and blanks
-
                     echo $row['Yield_Test_Type'];
                     ?>
                </p>

diff --git a/Wello/www/details.php b/Wello/www/details.php
@@ -1,9 +1,9 @@
 <?php require 'cred.php';
 $mysqli = new mysqli("localhost", $username, $password, $database);
-if ( (isset($_GET['Well_ID']))  && (is_numeric($_GET['Well_ID'])) ) {
+if ( (isset($_GET['Well_ID']))) {
 	$Well_ID = $_GET['Well_ID'];
 }
-else if ( (isset($_POST['Well_ID'])) && (is_numeric($_POST['Well_ID'])) ) {
+else if ( (isset($_POST['Well_ID']))) {
 	$Well_ID = $_POST['Well_ID'];
 }
 else {