Merge remote-tracking branch 'origin/master'

# Conflicts: # Wello/www/admin.php
etl12003 · Apr 25, 2017 · f3cf4a0 · f3cf4a0
2 parents 772b478 + 6171aa2
commit f3cf4a0
Show file tree

Hide file tree

Showing 13 changed files with 115 additions and 37 deletions.
diff --git a/Wello/platforms/browser/cordova/build b/Wello/platforms/browser/cordova/build
diff --git a/Wello/platforms/browser/cordova/clean b/Wello/platforms/browser/cordova/clean
diff --git a/Wello/platforms/browser/cordova/run b/Wello/platforms/browser/cordova/run
diff --git a/Wello/platforms/browser/cordova/version b/Wello/platforms/browser/cordova/version
diff --git a/Wello/www/admin.php b/Wello/www/admin.php
@@ -76,7 +76,7 @@ $query = "SELECT CONCAT(Well_Street_Number, ' ', Well_Street_Name) AS 'WellAddre
 					<a href="http://wellreportapp.uconn.edu/admin.php?move='.$row["Permit_Number"].'">Approve</a>
 					<a href="http://wellreportapp.uconn.edu/form.php?Admin=1?Well_ID='.$row["Permit_Number"].'">Edit</a>
 				</div>
-				</div>
+                </div>
 				';
             }
 

diff --git a/Wello/www/cred.php b/Wello/www/cred.php
@@ -1,5 +1,5 @@
-<?php
-$username="db10e41481317066";
-$password="jXLUjNG/cQxm4VJ1SionhDKdcT4BT1Dos7sZMddIapa/8LYDpDNz+3hwGCz8Shon";
-$database="db10e41481317066";
+<?php
+$username="db10e41481317066";
+$password="jXLUjNG/cQxm4VJ1SionhDKdcT4BT1Dos7sZMddIapa/8LYDpDNz+3hwGCz8Shon";
+$database="db10e41481317066";
 ?>
diff --git a/Wello/www/css/main.css b/Wello/www/css/main.css
@@ -173,7 +173,7 @@ div.slide-menu{
 
 nav img{
 	max-width: 3rem;
-	width: 100%;
+	width: 3rem;
 }
 
 div.main-bttns{
@@ -276,7 +276,7 @@ nav.fabs {
   bottom: 6rem;
   right: 0;
   width: 6rem;
-  height: 8rem; }
+  height: 4rem; }
 
 button, a {
   background-color: transparent;

diff --git a/Wello/www/details-content.php b/Wello/www/details-content.php
@@ -1,6 +1,19 @@
 
 <div class="group">
-            <img src="img/well-default.png"/>
+    <?php  
+        $path = "wellpics/";
+        $file_name = "wellpics/" . $Well_ID . ".jpg";
+
+    if($row['well_pics']=='yes'){ 
+            echo "<img src='" . $file_name . "'>";
+        }
+
+       else {
+            echo"<img src='img/well-default.png'/>";
+        }
+
+                    ?>
+
         <ul class="inputs" id="report-metadata">
             <li>
                 <h3>Date well completed</h3>

diff --git a/Wello/www/details.php b/Wello/www/details.php
@@ -11,6 +11,7 @@ else {
 }
 
 $query = "SELECT 
+    well_pics,
     Date_Well_Completed, 
     Date_of_Report, 
     Registration_Number, 
@@ -53,6 +54,7 @@ $query = "SELECT
             
     FROM well_completion_report
     WHERE Permit_Number = $Well_ID";
+
 if ($result = $mysqli->query($query)) {
     $row = $result->fetch_assoc();
 }

diff --git a/Wello/www/img/add-img-icon (1).png b/Wello/www/img/add-img-icon (1).png
diff --git a/Wello/www/map.php b/Wello/www/map.php
@@ -43,16 +43,6 @@
 
 		<div id="map" class="google-maps">
 		</div>
-
-
-<!--
-        <div class="desk-details">
-			<a href="details.php" class="go-to" > go to > </a>
-        <?php
-            include 'details-content.php';
-            ?>
-        </div>
--->
 
     </main>
 
@@ -62,7 +52,7 @@
     </nav>
 
     <nav class="fabs">
-        <button class="gps"><img src="img/gps.svg" alt="get location" /></button>
+        
         <a class="add-well" href="form.php"> <img src="img/add.svg" alt="add well" /></a>
     </nav>
 

diff --git a/Wello/www/search.php b/Wello/www/search.php
@@ -20,7 +20,13 @@ $mysqli = new mysqli("localhost", "db10e41481317066", "jXLUjNG/cQxm4VJ1SionhDKdc
     <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
@@ -31,9 +37,40 @@ if (isset($_GET['search_query'])) {
             LIMIT 500";
 }
 else{
-	$query = "SELECT CONCAT(Well_Street_Number, ' ', Well_Street_Name) AS 'WellAddress', Well_Town, Permit_Number
+    if (isset($_GET['lat']) && isset($_GET['long'])) {
+	$lat = (float)$_GET['lat'];
+	$lat2 = (float)$_GET['lat'] + 1;
+	$lat1 = (float)$_GET['lat'] - 1;
+
+	$long = (float)$_GET['long'];
+	$long2 = (float)$_GET['long'] + 1;
+	$long1 = (float)$_GET['long'] - 1;
+
+	$query = "SELECT
+	Well_Longitude,
+	Well_Longitude,
+		CONCAT(Well_Street_Number, ' ', Well_Street_Name) AS 'WellAddress', Well_Town, Permit_Number
             FROM well_completion_report
-            LIMIT 50";
+			WHERE (Well_Latitude BETWEEN $lat1 AND $lat2) AND (Well_Longitude BETWEEN $long1 AND $long2)
+			ORDER BY (((Well_Longitude-$long)*(Well_Longitude-$long)) + ((Well_Latitude-$lat)*(Well_Latitude-$lat))) ASC
+            LIMIT 30
+            ";
+
+} else {
+	echo "
+		<script type='text/javascript'>
+		if (navigator.geolocation) {
+         navigator.geolocation.getCurrentPosition(function (position) {
+             var lat = position.coords.latitude;
+			 var long = position.coords.longitude;
+			 
+             location.href = 'http://wellreportapp.uconn.edu/search.php?lat=' + lat + '&long=' + long;
+         });
+		}
+		</script>
+	";
+}
+
 }
 ?>
 
@@ -47,7 +84,7 @@ else{
         <form class="search" 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>
+        <a href="map.php"><img src="img/close.svg" alt="close" /></a>
     </nav>
 
     <main class="search">

diff --git a/Wello/www/wells-list.php b/Wello/www/wells-list.php
@@ -1,18 +1,3 @@
-<?php 
-require 'cred.php';
-$mysqli = new mysqli("localhost", $username, $password, $database);
-
-/* check connection */
-if ($mysqli->connect_errno) {
-    printf("Connect failed: %s\n", $mysqli->connect_error);
-    exit();
-}
-
-$query = "SELECT CONCAT(Well_Street_Number, ' ', Well_Street_Name) AS 'WellAddress', Well_Town, Permit_Number
-            FROM well_completion_report
-            LIMIT 10";
-
-?>
 	<!doctype html>
 	<html class="no-js" lang="">
 
@@ -30,6 +15,57 @@ $query = "SELECT CONCAT(Well_Street_Number, ' ', Well_Street_Name) AS 'WellAddre
 		<link rel="stylesheet" href="css/map-desktop.css">
 		<link rel="stylesheet" href="css/desktop.css">
 		<script src="js/vendor/modernizr-2.8.3.min.js"></script>
+
+
+<?php 
+require 'cred.php';
+$mysqli = new mysqli("localhost", $username, $password, $database);
+
+/* check connection */
+if ($mysqli->connect_errno) {
+    printf("Connect failed: %s\n", $mysqli->connect_error);
+    exit();
+}
+
+
+if (isset($_GET['lat']) && isset($_GET['long'])) {
+	$lat = (float)$_GET['lat'];
+	$lat2 = (float)$_GET['lat'] + 1;
+	$lat1 = (float)$_GET['lat'] - 1;
+
+	$long = (float)$_GET['long'];
+	$long2 = (float)$_GET['long'] + 1;
+	$long1 = (float)$_GET['long'] - 1;
+
+	$query = "SELECT
+	Well_Longitude,
+	Well_Longitude,
+		CONCAT(Well_Street_Number, ' ', Well_Street_Name) AS 'WellAddress', Well_Town, Permit_Number
+            FROM well_completion_report
+			WHERE (Well_Latitude BETWEEN $lat1 AND $lat2) AND (Well_Longitude BETWEEN $long1 AND $long2)
+			ORDER BY (((Well_Longitude-$long)*(Well_Longitude-$long)) + ((Well_Latitude-$lat)*(Well_Latitude-$lat))) ASC
+			LIMIT 30
+            ";
+
+} else {
+	echo "
+		<script type='text/javascript'>
+		if (navigator.geolocation) {
+         navigator.geolocation.getCurrentPosition(function (position) {
+             var lat = position.coords.latitude;
+			 var long = position.coords.longitude;
+			 
+             location.href = 'http://wellreportapp.uconn.edu/wells-list.php?lat=' + lat + '&long=' + long;
+         });
+		}
+		</script>
+	";
+}
+
+//$query = "SELECT CONCAT(Well_Street_Number, ' ', Well_Street_Name) AS 'WellAddress', Well_Town, Permit_Number FROM well_completion_report LIMIT 10";
+
+?>
+
 	</head>
 
 	<body>