Merge remote-tracking branch 'origin/master'

# Conflicts: # Wello/www/details-content.php # Wello/www/details.php
etl12003 · Apr 23, 2017 · 309d69e · 309d69e
2 parents f892c09 + b8d310e
commit 309d69e
Show file tree

Hide file tree

Showing 7 changed files with 176 additions and 50 deletions.
diff --git a/Wello/www/details-content.php b/Wello/www/details-content.php
@@ -206,7 +206,10 @@
                 <p>
                     <?php
                     //Should add ternary operator for nulls and blanks
+<<<<<<< HEAD
 
+=======
+>>>>>>> origin/master
                     echo $row['Drive_Shoe'];
                     ?>
                </p>

diff --git 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>
@@ -54,17 +59,27 @@
         </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 id="well-completion-date" value="'.$W_Completion_Date.'">';  
+                ?>
+            </li>
+
             <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>
                 <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>

diff --git a/Wello/www/map.php b/Wello/www/map.php
@@ -97,20 +97,64 @@
 
     <script>
 
-      function initMap() {
-        var myLatLng = {lat: -25.363, lng: 131.044};
-
+        function initMap() {
         var map = new google.maps.Map(document.getElementById('map'), {
-          zoom: 4,
-          center: myLatLng
-        });
-
-        var marker = new google.maps.Marker({
-          position: myLatLng,
-          map: map,
-          title: 'Hello World!'
+          center: new google.maps.LatLng(41.79947, -72.37209),
+          zoom: 12
         });
+        var infoWindow = new google.maps.InfoWindow;
+
+          // Change this depending on the name of your PHP or XML file
+          downloadUrl('http://wellreportapp.uconn.edu/xmlGenerate.php', function(data) {
+            var xml = data.responseXML;
+            var markers = xml.documentElement.getElementsByTagName('marker');
+            Array.prototype.forEach.call(markers, function(markerElem) {
+              var id = markerElem.getAttribute('id');
+                var name = markerElem.getAttribute('id');
+                var address = markerElem.getAttribute('address');
+              var point = new google.maps.LatLng(
+                  parseFloat(markerElem.getAttribute('lat')),
+                  parseFloat(markerElem.getAttribute('lng')));
+
+              var infowincontent = document.createElement('div');
+              var strong = document.createElement('strong');
+              strong.textContent = name
+              infowincontent.appendChild(strong);
+              infowincontent.appendChild(document.createElement('br'));
+
+              var text = document.createElement('text');
+              text.textContent = address
+              infowincontent.appendChild(text);
+              var marker = new google.maps.Marker({
+                map: map,
+                position: point
+              });
+              marker.addListener('click', function() {
+                infoWindow.setContent(infowincontent);
+                infoWindow.open(map, marker);
+              });
+            });
+          });
+        }
+
+
+      function downloadUrl(url, callback) {
+        var request = window.ActiveXObject ?
+            new ActiveXObject('Microsoft.XMLHTTP') :
+            new XMLHttpRequest;
+
+        request.onreadystatechange = function() {
+          if (request.readyState == 4) {
+            request.onreadystatechange = doNothing;
+            callback(request, request.status);
+          }
+        };
+
+        request.open('GET', url, true);
+        request.send(null);
       }
+
+      function doNothing() {}
     </script>
     <script async defer
     src="https://maps.googleapis.com/maps/api/js?key=AIzaSyCNSoPsxLd0LbvQaH9R6npO7jj-jKAXyQ4&callback=initMap">
@@ -124,4 +168,4 @@ function initMap() {
 we will need a file where we import the well name, address, longiture and latitude within the range we chose
 
 we need a food loop for it
--->
+-->
diff --git a/Wello/www/search.html → Wello/www/search.php b/Wello/www/search.html → 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
@@ -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) {

diff --git a/Wello/www/xmlGenerate.php b/Wello/www/xmlGenerate.php
@@ -0,0 +1,47 @@
+<?php
+
+require("cred.php");
+
+// Start XML file, create parent node
+
+$dom = new DOMDocument("1.0");
+$node = $dom->createElement("markers");
+$parnode = $dom->appendChild($node);
+
+// Opens a connection to a MySQL server
+
+$connection=mysql_connect ('localhost', $username, $password);
+if (!$connection) {  die('Not connected : ' . mysql_error());}
+
+// Set the active MySQL database
+
+$db_selected = mysql_select_db($database, $connection);
+if (!$db_selected) {
+  die ('Can\'t use db : ' . mysql_error());
+}
+
+// Select all the rows in the markers table
+
+$query = "SELECT * FROM well_completion_report WHERE 1";
+$result = mysql_query($query);
+if (!$result) {
+  die('Invalid query: ' . mysql_error());
+}
+
+header("Content-type: text/xml");
+
+// Iterate through the rows, adding XML nodes for each
+
+while ($row = @mysql_fetch_assoc($result)){
+  // Add to XML document node
+  $node = $dom->createElement("marker");
+  $newnode = $parnode->appendChild($node);
+  $newnode->setAttribute("id",$row['Permit_Number']);
+  $newnode->setAttribute("address", $row['Well_Street_Number']. " ".$row['Well_Street_Name']. ", ".$row['Well_Town']);
+  $newnode->setAttribute("lat", $row['Well_Latitude']);
+  $newnode->setAttribute("lng", $row['Well_Longitude']);
+}
+
+echo $dom->saveXML();
+
+?>
diff --git a/map.php b/map.php
@@ -117,10 +117,10 @@ function initMap() {
           title: 'Hello World!'
         });
       }
-    </script>
+    </script>
     <script async defer
     src="https://maps.googleapis.com/maps/api/js?key=AIzaSyCNSoPsxLd0LbvQaH9R6npO7jj-jKAXyQ4&callback=initMap">
-    </script>
+    </script>
 </body>