From fc0a0376376bad56af90375d67c851c8817c0ed7 Mon Sep 17 00:00:00 2001 From: Erik Lindsay Date: Sun, 23 Apr 2017 16:21:27 -0400 Subject: [PATCH] stylethings --- Wello/www/css/desktop.css | 3 +- Wello/www/css/main.css | 31 ++++- Wello/www/css/map-desktop.css | 8 +- Wello/www/form.php | 245 +++++++++++++++++++++++++--------- Wello/www/map.php | 41 +++--- Wello/www/search.php | 2 +- Wello/www/wells-list.php | 20 +-- 7 files changed, 238 insertions(+), 112 deletions(-) diff --git a/Wello/www/css/desktop.css b/Wello/www/css/desktop.css index 6b1b31a..3d1f1a9 100644 --- a/Wello/www/css/desktop.css +++ b/Wello/www/css/desktop.css @@ -32,9 +32,10 @@ display: flex; flex-direction: column; justify-content: center; + align-items: center; } - main.search a{ + main.search a{ color: inherit; width: 50%; max-width: 41rem; diff --git a/Wello/www/css/main.css b/Wello/www/css/main.css index 491e6a4..38a3a4f 100644 --- a/Wello/www/css/main.css +++ b/Wello/www/css/main.css @@ -145,7 +145,7 @@ nav.top-nav { background-color: #65b2ff; z-index: 10; } -nav.top-nav button { +nav.top-nav a { margin: .5rem; } .closed{ @@ -228,8 +228,22 @@ nav.bottom-nav { display: flex; justify-content: space-around; background-color: #65b2ff; } - nav.bottom-nav button { - margin: .5rem; } + nav.bottom-nav button, nav.bottom-nav a { + margin: .5rem; +display: flex; +justify-content: center; +align-items: center;} + +a > img{ + + margin-left: auto; + margin-right: auto; +} +a.add-well{ + display: flex; + justify-content: center; + align-items: center; +} nav.fabs { display: flex; @@ -242,10 +256,10 @@ nav.fabs { width: 6rem; height: 8rem; } -button { +button, a { background-color: transparent; border: none; } - button.add-well { + button.add-well, a.add-well { background: #65b2ff; border-radius: 10rem; width: 4rem; @@ -406,9 +420,14 @@ input[type=submit]{ margin: 1rem; height: 3rem; } +form.search{ + width:100%; + max-width: none; + max-width: 41rem; +} input[type=search]{ - width: 80%; + width: 100%; padding: .7rem; margin: .5rem; background: rgba(255, 255, 255, 0.19); diff --git a/Wello/www/css/map-desktop.css b/Wello/www/css/map-desktop.css index c9f8dd0..00792f9 100644 --- a/Wello/www/css/map-desktop.css +++ b/Wello/www/css/map-desktop.css @@ -15,12 +15,12 @@ nav.bottom-nav{ width: 5rem; flex-direction: column; - height: calc(100vh - 8rem); - margin-top: 5rem; + height: calc(100vh - 5rem); + margin-top: 0rem; justify-content: flex-start; - padding-top: 4rem; + padding-top: 5rem; } - nav.bottom-nav button{ + nav.bottom-nav button, nav.bottom-nav a{ margin-bottom: 3rem; } diff --git a/Wello/www/form.php b/Wello/www/form.php index cf516c1..844cd0a 100644 --- a/Wello/www/form.php +++ b/Wello/www/form.php @@ -11,15 +11,128 @@ $Well_ID = "0"; } + +if($_SERVER['REQUEST_METHOD']=='POST') { + $errors = array(); + + if (is_numeric($_POST['Permit_Number']) == FALSE){ + $errors[] = 'Permit Number must be a number.'; + } + else { +// $Well_ID = $mysqli->real_escape_string(trim($_POST['Permit_Number'])); + } +// $Permit_Number = $mysqli->real_escape_string(trim($_POST['well-completion-date'])); +// $Permit_Number = $mysqli->real_escape_string(trim($_POST['report-completion-date'])); + $PermitNumber = $mysqli->real_escape_string(trim($_POST['permit-number'])); + $RegistrantNumber = $mysqli->real_escape_string(trim($_POST['registrant-number'])); + $StateWellNumber = $mysqli->real_escape_string(trim($_POST['state-well-number'])); + $OtherNumber = $mysqli->real_escape_string(trim($_POST['other-number'])); + $OwnerFirstName = $mysqli->real_escape_string(trim($_POST['first-name'])); + $OwnerLastName = $mysqli->real_escape_string(trim($_POST['last-name'])); + $WellStreetNumber = $mysqli->real_escape_string(trim($_POST['well-street-number'])); + $WellStreetAddress = $mysqli->real_escape_string(trim($_POST['well-street-address'])); + $OwnerAddress = $mysqli->real_escape_string(trim($_POST['owner-address'])); + $WellTown = $mysqli->real_escape_string(trim($_POST['town'])); + $WellZip = $mysqli->real_escape_string(trim($_POST['zip-code'])); + $WellLotNumber = $mysqli->real_escape_string(trim($_POST['lot-number'])); + $WellLatitude = $mysqli->real_escape_string(trim($_POST['gps-coordinates-latitude'])); + $WellLongitude = $mysqli->real_escape_string(trim($_POST['gps-coordinate-longitude'])); + $RelativeLocation = $mysqli->real_escape_string(trim($_POST['relative-location'])); + $ProposedUse = $mysqli->real_escape_string(trim($_POST['use'])); +// $OtherUse = $mysqli->real_escape_string(trim($_POST['other-use-case'])); + $DrillingEquipment = $mysqli->real_escape_string(trim($_POST['drilling-equipment'])); +// $OtherEquipment = $mysqli->real_escape_string(trim($_POST['other-equipment'])); + $CasingLength = $mysqli->real_escape_string(trim($_POST['length'])); + $CasingDiameter = $mysqli->real_escape_string(trim($_POST['casing-diameter'])); + $CasingWeight = $mysqli->real_escape_string(trim($_POST['weight'])); + $CasingJoint = $mysqli->real_escape_string(trim($_POST['threaded-vs-welded'])); + $DriveShoe = $mysqli->real_escape_string(trim($_POST['drive-shoe'])); + $CasingGrouting = $mysqli->real_escape_string(trim($_POST['casing-grouting'])); + $YieldType = $mysqli->real_escape_string(trim($_POST['method'])); + $YieldHours = $mysqli->real_escape_string(trim($_POST['yield-hours'])); + $YieldGPM = $mysqli->real_escape_string(trim($_POST['yield-gpm'])); + $YieldNotes = $mysqli->real_escape_string(trim($_POST['yield-test-notes'])); + $WaterDepth = $mysqli->real_escape_string(trim($_POST['water-from-surface'])); + $YieldWaterLevel = $mysqli->real_escape_string(trim($_POST['water-level-during-yield-test'])); + $WellDepth = $mysqli->real_escape_string(trim($_POST['depth-of-well'])); + $ScreenMake = $mysqli->real_escape_string(trim($_POST['make'])); + $OpenScreenLength = $mysqli->real_escape_string(trim($_POST['length-open-to-aquifier'])); + $ScreenSlotSize = $mysqli->real_escape_string(trim($_POST['slot-size'])); + $ScreenDiameter = $mysqli->real_escape_string(trim($_POST['screen-diameter'])); + $Gravel = $mysqli->real_escape_string(trim($_POST['gravel'])); + $DiameterIncludingGravel = $mysqli->real_escape_string(trim($_POST['diameter-including-gravel-pack'])); + $GravelSize = $mysqli->real_escape_string(trim($_POST['gravel-size'])); + $DepthToTop = $mysqli->real_escape_string(trim($_POST['gravel-pack-location-from'])); + $DepthToBottom = $mysqli->real_escape_string(trim($_POST['gravel-pack-location-to'])); + $Comment = $mysqli->real_escape_string(trim($_POST['notes'])); + + if (empty($errors)) { //If no errors in error array + $form_update = "UPDATE well_completion_report + SET + Permit_Number = '$PermitNumber', + Registration_Number = '$RegistrantNumber', + State_Well_No = '$StateWellNumber', + Other_No = '$OtherNumber', + Owner_First_Name = '$OwnerFirstName', + Owner_Last_Name = '$OwnerLastName', + Owner_Address = '$OwnerAddress', + Well_Street_Number = '$WellStreetNumber', + Well_Street_Address = '$WellStreetAddress', + Well_Town = '$WellTown', + Well_Zip = '$WellZip', + Well_Lot_Number = '$WellLotNumber', + Well_Latitude = '$WellLatitude', + Well_Longitude = '$WellLongitude', + Relative_Location = '$RelativeLocation', + Proposed_Use = '$ProposedUse', + Drilling_Equipment = '$DrillingEquipment', + Casing_Length_Feet = '$CasingLength', + Casing_Diameter_Inches = '$CasingDiameter', + Casing_Weight_Per_Foot_Pounds = '$CasingWeight', + Casing_Joint_Type = '$CasingJoint', + Drive_Shoe = '$DriveShoe', + Grouted = '$CasingGrouting', + Yield_Test_Type = '$YieldType', + Yield_Test_Hours = '$YieldHours', + Yield_GPM = '$YieldGPM', + Yield_Test_Notes = '$YieldNotes', + Static_Water_Level_Feet = '$WaterDepth', + Yield_Test_Water_Level_Feet = '$YieldWaterLevel', + Well_Depth_Feet = '$WellDepth', + Screen_Make = '$ScreenMake', + Open_Screen_Length_Feet = '$OpenScreenLength', + Screen_Slot_Size = '$ScreenSlotSize', + Screen_Diameter_Inches = '$ScreenDiameter', + Gravel_Packed = '$Gravel', + Well_Diameter_Inches = '$DiameterIncludingGravel', + Gravel_Size_Inches = '$GravelSize', + comment = '$Comment', + Depth_To_Top_Of_Gravel_Pack = '$DepthToTop', + Depth_To_Bottom_Of_Gravel_Pack = '$DepthToBottom' + WHERE Permit_Number = $Well_ID + LIMIT 1"; + $r_update = $mysqli->query($form_update); + } + if ($mysqli->affected_rows == 1){ + echo '

IT RAN PROPERLY

'; + } + else { + echo '

IT FUCKED UP PROPERLY

'; + } + +} + $query = "SELECT Date_Well_Completed, Date_of_Report, Registration_Number, State_Well_No, Other_No, - CONCAT(Owner_First_Name, ' ', Owner_Last_Name) AS 'Owner_Name', + Owner_First_Name, + Owner_Last_Name, Owner_Address, - CONCAT(Well_Street_Number, ' ', Well_Street_Name) AS 'WellAddress', + Well_Street_Number, + Well_Street_Name, Well_Town, Well_Lot_Number, Well_Latitude, @@ -86,8 +199,10 @@ - -
+ + '; + ?>

Owner Info

-
    -
  • -
    • +
      +
    • + +
      • + +
    • + +
    • - +

Well location

-
    +
    • - - + + +
      • + +
    • + +
    • - +
    • - +
    • @@ -176,28 +301,28 @@ + ?>" type="number" min="1" name="lot-number" class="med-num">
      • -
    • +
    • -

      +

      + ?>" type="text" name="gps-coordinates-latitude"> + ?>" type="text" name="gps-coordinates-longitude">
      • @@ -206,15 +331,14 @@ + ?>" name="relative-location">
    • - '; + echo''; ?> - - +
    • - '; + echo''; ?> - - +

Casing Details

-
    +
    • feet + ?>" type="number" min="1" name="length"> feet
    • inches + ?>" type="number" min="1" name="casing-diameter"> inches
    • @@ -274,7 +395,7 @@ lbs/feet + ?>" type="number" min="1" step="any" name="weight"> lbs/feet
    • @@ -284,23 +405,23 @@
    • - value="" type="radio" name="drive-show" value="yes"> yes - value="" type="radio" name="drive-show" value="no"> no + value="" type="radio" name="drive-shoe" value="1"> yes + value="" type="radio" name="drive-shoe" value="0"> no
    • - type="radio" name="casing-grouting" value="yes"> yes - type="radio" name="casing-grouting" value="no"> no + type="radio" name="casing-grouting" value="1"> yes + type="radio" name="casing-grouting" value="0"> no

Yield Test

-
    +
    • - @@ -312,7 +433,7 @@ //Should add ternary operator for nulls and blanks echo $row['Yield_Test_Hours']; - ?>" type="number" min="1" id="yield-hours"> hours + ?>" type="number" min="1" name="yield-hours"> hours
    • @@ -321,7 +442,7 @@ //Should add ternary operator for nulls and blanks echo $row['Yield_GPM']; - ?>" type="number" min="1" id="yeld-gpm"> gallons per minute + ?>" type="number" min="1" name="yield-gpm"> gallons per minute
    • @@ -330,21 +451,21 @@ //Should add ternary operator for nulls and blanks echo $row['Yield_Test_Notes']; - ?>" id="yield-test-notes"> + ?>" name="yield-test-notes">

Water Level

-
    +
    • feet + ?>" type="number" min="1" name="water-from-surface"> feet
    • @@ -353,7 +474,7 @@ //Should add ternary operator for nulls and blanks echo $row['Yield_Test_Water_Level_Feet']; - ?>" type="number" min="1" id="water-level-during-yield-test"> feet + ?>" type="number" min="1" name="water-level-during-yield-test"> feet
    • @@ -362,21 +483,21 @@ //Should add ternary operator for nulls and blanks echo $row['Well_Depth_Feet']; - ?>" type="number" min="1" id="water-from-surface"> feet + ?>" type="number" min="1" name="depth-of-well"> feet

Screen Details

-
    +
    • + ?>" type="text" name="make">
    • @@ -385,7 +506,7 @@ //Should add ternary operator for nulls and blanks echo $row['Open_Screen_Length_Feet']; - ?>" type="number" min="1" id="length-open-to-aquifier"> feet + ?>" type="number" min="1" name="length-open-to-aquifier"> feet
    • @@ -394,7 +515,7 @@ //Should add ternary operator for nulls and blanks echo $row['Screen_Slot_Size']; - ?>" type="number" min="1" id="slot-size"> + ?>" type="number" min="1" name="slot-size">
    • @@ -403,7 +524,7 @@ //Should add ternary operator for nulls and blanks echo $row['Screen_Diameter_Inches']; - ?>" type="number" min="1" id="diameter"> inches + ?>" type="number" min="1" name="screen-diameter"> inches
    • @@ -418,7 +539,7 @@ //Should add ternary operator for nulls and blanks echo $row['Well_Diameter_Inches']; - ?>" type="number" min="1" id="diameter-including-gravel-pack"> inches + ?>" type="number" min="1" name="diameter-including-gravel-pack"> inches
    • @@ -427,7 +548,7 @@ //Should add ternary operator for nulls and blanks echo $row['Gravel_Size_Inches']; - ?>" type="number" min="1" id="gravel-size"> inches + ?>" type="number" min="1" name="gravel-size"> inches
    • @@ -435,26 +556,26 @@ feet + ?>" type="number" min="1" name="gravel-pack-location-from"> feet
      to
      feet + ?>" type="number" min="1" name="gravel-pack-location-to"> feet

Other Notes

-
    +
    • + ?>" name="notes">
    @@ -470,7 +591,7 @@ - + @@ -99,10 +86,17 @@ function initMap() { var map = new google.maps.Map(document.getElementById('map'), { - center: new google.maps.LatLng(41.79947, -72.37209), - zoom: 15 + center: new google.maps.LatLng(41.31412, -72.23311), + zoom: 16 }); + if (navigator.geolocation) { + navigator.geolocation.getCurrentPosition(function (position) { + initialLocation = new google.maps.LatLng(position.coords.latitude, position.coords.longitude); + map.setCenter(initialLocation); + }); + } 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) { @@ -138,6 +132,7 @@ function initMap() { position: point }); marker.addListener('click', function() { + infoWindow.setContent(infowincontent); infoWindow.open(map, marker); }); @@ -176,4 +171,4 @@ function doNothing() {} 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 ---> +--> \ No newline at end of file diff --git a/Wello/www/search.php b/Wello/www/search.php index d02ea70..e8fdc76 100644 --- a/Wello/www/search.php +++ b/Wello/www/search.php @@ -44,7 +44,7 @@