From 3044a9aaba066c799a53b6a9b530f25ce2ccd07d Mon Sep 17 00:00:00 2001
From: MFox <mfx@energyresourcesusa.net>
Date: Sat, 22 Apr 2017 15:46:34 -0400
Subject: [PATCH 1/2] IDK what these changes are

---
 Wello/www/details-content.php | 22 ++++++++++++++++------
 Wello/www/details.php         |  5 +++++
 Wello/www/form.php            | 20 +++++++++++++++++---
 3 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/Wello/www/details-content.php b/Wello/www/details-content.php
index a07ba4b..e191fca 100644
--- a/Wello/www/details-content.php
+++ b/Wello/www/details-content.php
@@ -168,7 +168,7 @@
                     <?php
                     //Should add ternary operator for nulls and blanks
                     echo $row['Casing_Length_Feet'];
-                    ?>
+                    ?> feet
                </p>
             </li>
             <li>
@@ -177,7 +177,7 @@
                     <?php
                     //Should add ternary operator for nulls and blanks
                     echo $row['Casing_Diamiter_Inches'];
-                    ?>
+                    ?> inches
                </p>
             </li>
 
@@ -187,18 +187,28 @@
                     <?php
                     //Should add ternary operator for nulls and blanks
                     echo $row['Casing_Weight_Per_Foot_Pounds'];
-                    ?>
+                    ?> (weight per foot pounds)
                </p>
             </li>
 
             <li>
-                <h3>Threaded/Welded</h3>
-                <p>STILLTODO</p>
+                <h3>Casing Joint Type</h3>
+                <p>
+                    <?php
+                    //Should add ternary operator for nulls and blanks
+                    echo $row['Casing_Joint_Type'];
+                    ?>
+               </p>
             </li>
 
             <li>
                 <h3>Drive Shoe?</h3>
-                <p>STILLTODO</p>
+                <p>
+                    <?php
+                    //Should add ternary operator for nulls and blanks
+                    echo $row['Drive_Shoe'];
+                    ?>
+               </p>
             </li>
 
             <li>
diff --git a/Wello/www/details.php b/Wello/www/details.php
index 1fd60b3..1bb7fbd 100644
--- a/Wello/www/details.php
+++ b/Wello/www/details.php
@@ -26,6 +26,11 @@
     Relative_Location, 
     Proposed_Use, 
     Drilling_Equipment, 
+    Casing_Length_Feet,
+    Casing_Diameter_Inches,
+    Casing_Weight_Per_Foot_Pounds,
+    Casing_Joint_Type,
+    Drive_Shoe,
     Depth_To_Top_Of_Gravel_Pack, 
     Depth_To_Bottom_Of_Gravel_Pack
             
diff --git a/Wello/www/form.php b/Wello/www/form.php
index a647a84..300db04 100644
--- a/Wello/www/form.php
+++ b/Wello/www/form.php
@@ -54,9 +54,21 @@
         </div>
 		<div class="group">
         <ul class="inputs" id="report-metadata">
-            <li><label for="well-completion-date">Date well completed</label>
-            <input type="date" id="well-completion-date"></li>
+            <li>
+                <label for="well-completion-date">Date well completed</label>
+                <?php
+                $W_Completion_Date = date("m/d/Y", strtotime($row['Date_Well_Completed']));
+                echo'<input type="date" id="well-completion-date" value="'.$W_Completion_Date.'">';  
+                ?>
+            </li>
 
+            
+                <?php
+                //Should add ternary operator for nulls and blanks
+                $W_Completion_Date = date("m/d/Y", strtotime($row['Date_Well_Completed']));
+                echo'<p id="well-completion-date">'.$W_Completion_Date.'</p>';
+                ?>
+            
             <li>
                 <label for="report-completion-date">Date of report</label>
                 <input type="date" id="report-completion-date">
@@ -64,7 +76,9 @@
 
             <li>
                 <label for="permit-number">Permit number</label>
-                <input type="number" min="1" id="permit-number" class="long-num">
+                <?php
+                echo'<input type="number" min="1" id="permit-number" class="long-num" value="'.$Well_ID.'">';
+                ?>
             </li>
 
             <li>

From 4297e166273332d52018c36b71089768549068a8 Mon Sep 17 00:00:00 2001
From: MFox <mfx@energyresourcesusa.net>
Date: Sat, 22 Apr 2017 17:02:32 -0400
Subject: [PATCH 2/2] IDK

---
 Wello/www/form.php                    | 19 +++----
 Wello/www/map.php                     |  2 +-
 Wello/www/{search.html => search.php} | 74 ++++++++++++++++-----------
 Wello/www/wells-list.php              |  5 +-
 4 files changed, 59 insertions(+), 41 deletions(-)
 rename Wello/www/{search.html => search.php} (55%)

diff --git a/Wello/www/form.php b/Wello/www/form.php
index 300db04..354201d 100644
--- a/Wello/www/form.php
+++ b/Wello/www/form.php
@@ -19,6 +19,11 @@
             WHERE Permit_Number = $Well_ID";
 if ($result = $mysqli->query($query)) {
     $row = $result->fetch_assoc();
+    foreach ($row as &$value) {
+        if ($value == ""){
+            $value == "Not Specified";
+        }
+    }
 }
 ?>
 <!doctype html>
@@ -58,20 +63,16 @@
                 <label for="well-completion-date">Date well completed</label>
                 <?php
                 $W_Completion_Date = date("m/d/Y", strtotime($row['Date_Well_Completed']));
-                echo'<input type="date" id="well-completion-date" value="'.$W_Completion_Date.'">';  
+                echo'<input id="well-completion-date" value="'.$W_Completion_Date.'">';  
                 ?>
             </li>
-
-            
-                <?php
-                //Should add ternary operator for nulls and blanks
-                $W_Completion_Date = date("m/d/Y", strtotime($row['Date_Well_Completed']));
-                echo'<p id="well-completion-date">'.$W_Completion_Date.'</p>';
-                ?>
             
             <li>
                 <label for="report-completion-date">Date of report</label>
-                <input type="date" id="report-completion-date">
+                <?php
+                $R_Completion_Date = date("m/d/Y", strtotime($row['Date_of_Report']));
+                echo'<input id="report-completion-date" value="'.$W_Completion_Date.'">';  
+                ?>
             </li>
 
             <li>
diff --git a/Wello/www/map.php b/Wello/www/map.php
index 5a8dd75..b0a301b 100644
--- a/Wello/www/map.php
+++ b/Wello/www/map.php
@@ -97,7 +97,7 @@
     
     <script>
 
-              function initMap() {
+        function initMap() {
         var map = new google.maps.Map(document.getElementById('map'), {
           center: new google.maps.LatLng(41.79947, -72.37209),
           zoom: 12
diff --git a/Wello/www/search.html b/Wello/www/search.php
similarity index 55%
rename from Wello/www/search.html
rename to Wello/www/search.php
index 4789bda..d02ea70 100644
--- a/Wello/www/search.html
+++ b/Wello/www/search.php
@@ -1,3 +1,6 @@
+<?php
+$mysqli = new mysqli("localhost", "db10e41481317066", "jXLUjNG/cQxm4VJ1SionhDKdcT4BT1Dos7sZMddIapa/8LYDpDNz+3hwGCz8Shon", "db10e41481317066");
+?>
 <!doctype html>
 <html class="no-js" lang="">
 
@@ -17,47 +20,60 @@
     <script src="js/vendor/modernizr-2.8.3.min.js"></script>
 </head>
 
-
-
-
-
-
+<?php
+if (isset($_GET['search_query'])) {
+	$Search = '%' . $_GET['search_query'] . '%';
+	$query = "SELECT CONCAT(Well_Street_Number, ' ', Well_Street_Name) AS 'WellAddress', Well_Town, Permit_Number
+            FROM well_completion_report
+            WHERE Well_Town LIKE '$Search'
+            OR Permit_Number LIKE '$Search'
+            OR CONCAT(Well_Street_Number, ' ', Well_Street_Name) LIKE '$Search'
+            LIMIT 500";
+}
+else{
+	$query = "SELECT CONCAT(Well_Street_Number, ' ', Well_Street_Name) AS 'WellAddress', Well_Town, Permit_Number
+            FROM well_completion_report
+            LIMIT 50";
+}
+?>
+    
 <body>
     <!--[if lt IE 8]>
             <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
         <![endif]-->
     <!-- Add your site or application content here -->
-
-
-
-
-
-
+    
     <nav class="top-nav search">
-        <input type="search" >
+        <form action="search.php?<? $_GET['search_query'] ?>" method="GET">
+        <input type="search" name="search_query">
+        </form>
         <button><a href="map.php"><img src="img/close.svg" alt="close" /></a></button>
     </nav>
 
     <main class="search">
-		<a href="details.php" class="search-result clearfix">
-			<div class="well-card clearfix">
-				<div class="well-img"></div>
-				<div>
-					<h2>Well Name</h2>
-					<p>short well description</p>
-				</div>
-			</div>
-		</a>
+    <?php
+        if ($result = $mysqli->query($query)) {
+            /* fetch associative array */
+            while ($row = $result->fetch_assoc()) {
+                echo'
+                <a href="details.php?Well_ID='.$row["Permit_Number"].'">
+                    <div class="well-card clearfix">
+                        <div class="well-img"></div>
+                        <div>
+                            <h2>'.$row["WellAddress"].'</h2>
+                            <h2>'.$row["Well_Town"].'</h2>
+                            <p>Permit Number: '.$row["Permit_Number"].'</p>
+                        </div>
+                    </div>
+                </a>';
+            }
+
+            /* free result set */
+            $result->free();
+        }
+    ?>
     </main>
 
-
-
-
-
-
-
-
-
     <script src="https://code.jquery.com/jquery-1.12.0.min.js"></script>
     <script>
         window.jQuery || document.write('<script src="js/vendor/jquery-1.12.0.min.js"><\/script>')
diff --git a/Wello/www/wells-list.php b/Wello/www/wells-list.php
index 1b50345..a748031 100644
--- a/Wello/www/wells-list.php
+++ b/Wello/www/wells-list.php
@@ -1,5 +1,6 @@
-<?php
-$mysqli = new mysqli("localhost", "db10e41481317066", "jXLUjNG/cQxm4VJ1SionhDKdcT4BT1Dos7sZMddIapa/8LYDpDNz+3hwGCz8Shon", "db10e41481317066");
+<?php 
+require 'cred.php';
+$mysqli = new mysqli("localhost", $username, $password, $database);
 
 /* check connection */
 if ($mysqli->connect_errno) {