From f892c091b267a605bfa8a2f4a4ea42db225a32aa Mon Sep 17 00:00:00 2001
From: Erik Lindsay <erik.lindsay@uconn.edu>
Date: Sun, 23 Apr 2017 10:10:56 -0400
Subject: [PATCH] details querys

---
 Wello/www/css/desktop.css     |   1 +
 Wello/www/details-content.php | 153 +++++++++++++++++++++++++++++-----
 Wello/www/details.php         |  21 +++++
 3 files changed, 152 insertions(+), 23 deletions(-)

diff --git a/Wello/www/css/desktop.css b/Wello/www/css/desktop.css
index 5fceb4c..6b1b31a 100644
--- a/Wello/www/css/desktop.css
+++ b/Wello/www/css/desktop.css
@@ -30,6 +30,7 @@
 	}
 	main.search{
 		display: flex;
+		flex-direction: column;
 		justify-content: center;
 	}
 
diff --git a/Wello/www/details-content.php b/Wello/www/details-content.php
index a07ba4b..3ee8556 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>
@@ -176,8 +176,8 @@
                 <p  id="diameter">
                     <?php
                     //Should add ternary operator for nulls and blanks
-                    echo $row['Casing_Diamiter_Inches'];
-                    ?>
+                    echo $row['Casing_Diameter_Inches'];
+                    ?> inches
                </p>
             </li>
 
@@ -187,23 +187,40 @@
                     <?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>
                 <h3>Casing Grouted?</h3>
-                <p>STILLTODO</p>
+                <p>
+                    <?php
+                    //Should add ternary operator for nulls and blanks
+                    
+                    echo $row['Grouted'];
+                    ?>
+               </p>
             </li>
         </ul>
 </div>
@@ -212,21 +229,45 @@
         <ul class="inputs" id="yield-test">
             <li>
                 <h3>Method</h3>
-                <p id="method">STILLTODO</p>
+                <p id="method">
+                    <?php
+                    //Should add ternary operator for nulls and blanks
+                    
+                    echo $row['Yield_Test_Type'];
+                    ?>
+               </p>
             </li>
             <li>
                 <h3>Test duration</h3>
-                <p  id="yield-hours">STILLTODO</p>
+                <p  id="yield-hours">
+                    <?php
+                    //Should add ternary operator for nulls and blanks
+                    
+                    echo $row['Yield_Test_Hours'];
+                    ?>
+               </p>
             </li>
 
             <li>
                 <h3>Yield</h3>
-                <p id="yeld-gpm">STILLTODO</p>
+                <p id="yeld-gpm">
+                    <?php
+                    //Should add ternary operator for nulls and blanks
+                    
+                    echo $row['Yield_GPM'];
+                    ?> GPM
+               </p>
             </li>
 
             <li>
                 <h3>Yield test notes</h3>
-                <p id="yield-test-notes">STILLTODO</p>
+                <p id="yield-test-notes">
+                    <?php
+                    //Should add ternary operator for nulls and blanks
+                    
+                    echo $row['Yield_Test_Notes'];
+                    ?>
+               </p>
             </li>
 
         </ul>
@@ -236,17 +277,35 @@
         <ul class="inputs" id="yield-test">
             <li>
                 <h3>From land surface</h3>
-                <p  id="water-from-surface">STILLTODO</p>
+                <p  id="water-from-surface">
+                    <?php
+                    //Should add ternary operator for nulls and blanks
+                    
+                    echo $row['Static_Water_Level_Feet'];
+                    ?>
+               </p>
             </li>
 
             <li>
                 <h3>During yield test</h3>
-                <p  id="water-level-during-yield-test">STILLTODO</p>
+                <p  id="water-level-during-yield-test">
+                    <?php
+                    //Should add ternary operator for nulls and blanks
+                    
+                    echo $row['Yield_Test_Water_Level_Feet'];
+                    ?>
+               </p>
             </li>
 
             <li>
                 <h3>Depth of complete well</h3>
-                <p  id="water-from-surface">STILLTODO</p>
+                <p  id="water-from-surface">
+                    <?php
+                    //Should add ternary operator for nulls and blanks
+                    
+                    echo $row['Well_Depth_Feet'];
+                    ?>
+               </p>
             </li>
 
         </ul>
@@ -256,37 +315,79 @@
         <ul class="inputs" id="screen-details">
             <li>
                 <h3>Make</h3>
-                <p type="text" id="make">STILLTODO</p>
+                <p type="text" id="make">
+                    <?php
+                    //Should add ternary operator for nulls and blanks
+                    
+                    echo $row['Screen_Make'];
+                    ?>
+               </p>
             </li>
 
             <li>
                 <h3>Length open to aquifier</h3>
-                <p id="length-open-to-aquifier">STILLTODO</p>
+                <p id="length-open-to-aquifier">
+                    <?php
+                    //Should add ternary operator for nulls and blanks
+                    
+                    echo $row['Open_Screen_Length_Feet'];
+                    ?>
+               </p>
             </li>
 
             <li>
                 <h3>Slot size</h3>
-                <p id="slot-size">STILLTODO</p>
+                <p id="slot-size">
+                    <?php
+                    //Should add ternary operator for nulls and blanks
+                    
+                    echo $row['Screen_Slot_Size'];
+                    ?>
+               </p>
             </li>
 
             <li>
                 <h3>Diameter</h3>
-                <p id="diameter">STILLTODO</p>
+                <p id="diameter">
+                    <?php
+                    //Should add ternary operator for nulls and blanks
+                    
+                    echo $row['Screen_Diameter_Inches'];
+                    ?>
+               </p>
             </li>
 
             <li>
                 <h3>Gravel</h3>
-                <p>STILLTODO</p>
+                <p>
+                    <?php
+                    //Should add ternary operator for nulls and blanks
+                    
+                    echo $row['Gravel_Packed'];
+                    ?>
+               </p>
             </li>
 
             <li>
                 <h3>Diameter including gravel pack</h3>
-                <p id="diameter-including-gravel-pack">STILLTODO</p>
+                <p id="diameter-including-gravel-pack">
+                    <?php
+                    //Should add ternary operator for nulls and blanks
+                    
+                    echo $row['Well_Diameter_Inches'];
+                    ?>
+               </p>
             </li>
 
             <li>
                 <h3>Gravel size</h3>
-                <p id="gravel-size">STILLTODO</p>
+                <p id="gravel-size">
+                    <?php
+                    //Should add ternary operator for nulls and blanks
+                    
+                    echo $row['Gravel_Size_Inches'];
+                    ?>
+               </p>
             </li>
 
             <li>
@@ -309,7 +410,13 @@
         <ul class="inputs" id="notes">
 
             <li>
-                <p id="notes">STILLTODO</p>
+                <p id="notes">
+                    <?php
+                    //Should add ternary operator for nulls and blanks
+                    
+                    echo $row['comment'];
+                    ?>
+               </p>
             </li>
 
         </ul>
diff --git a/Wello/www/details.php b/Wello/www/details.php
index 1fd60b3..8efb2f6 100644
--- a/Wello/www/details.php
+++ b/Wello/www/details.php
@@ -26,6 +26,27 @@
     Relative_Location, 
     Proposed_Use, 
     Drilling_Equipment, 
+    Casing_Length_Feet,
+    Casing_Diameter_Inches,
+    Casing_Weight_Per_Foot_Pounds,
+    Casing_Joint_Type,
+    Drive_Shoe,
+    Grouted,
+    Yield_Test_Type,
+    Yield_Test_Hours,
+    Yield_GPM,
+    Yield_Test_Notes,
+    Static_Water_Level_Feet,
+    Yield_Test_Water_Level_Feet,
+    Well_Depth_Feet,
+    Screen_Make,
+    Open_Screen_Length_Feet,
+    Screen_Slot_Size,
+    Screen_Diameter_Inches,
+    Gravel_Packed,
+    Well_Diameter_Inches,
+    Gravel_Size_Inches,
+    comment,
     Depth_To_Top_Of_Gravel_Pack, 
     Depth_To_Bottom_Of_Gravel_Pack