Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
f
  • Loading branch information
MFox committed Apr 25, 2017
1 parent 11cef42 commit 772b478
Show file tree
Hide file tree
Showing 2 changed files with 79 additions and 45 deletions.
2 changes: 1 addition & 1 deletion Wello/www/admin.php
View file
Expand Up @@ -74,7 +74,7 @@ $query = "SELECT CONCAT(Well_Street_Number, ' ', Well_Street_Name) AS 'WellAddre
</a>
<div class="actions">
<a href="http://wellreportapp.uconn.edu/admin.php?move='.$row["Permit_Number"].'">Approve</a>
<a href="http://wellreportapp.uconn.edu/form.php?Well_ID='.$row["Permit_Number"].'">Edit</a>
<a href="http://wellreportapp.uconn.edu/form.php?Admin=1?Well_ID='.$row["Permit_Number"].'">Edit</a>
</div>
</div>
';
Expand Down
122 changes: 78 additions & 44 deletions Wello/www/form.php
View file
Expand Up @@ -13,14 +13,6 @@ else {


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']));
Expand All @@ -30,7 +22,7 @@ if($_SERVER['REQUEST_METHOD']=='POST') {
$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']));
$WellStreetName = $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']));
Expand Down Expand Up @@ -66,18 +58,17 @@ if($_SERVER['REQUEST_METHOD']=='POST') {
$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
// 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_Street_Number = $WellStreetNumber,
Well_Street_Name = '$WellStreetName',
Well_Town = '$WellTown',
Well_Zip = '$WellZip',
Well_Lot_Number = '$WellLotNumber',
Expand All @@ -88,7 +79,7 @@ if($_SERVER['REQUEST_METHOD']=='POST') {
Drilling_Equipment = '$DrillingEquipment',
Casing_Length_Feet = '$CasingLength',
Casing_Diameter_Inches = '$CasingDiameter',
Casing_Weight_per_Foot_Pounds = '$CasingWeight',
Casing_Weight_Per_Foot_Pounds = '$CasingWeight',
Casing_Joint_Type = '$CasingJoint',
Drive_Shoe = '$DriveShoe',
Grouted = '$CasingGrouting',
Expand All @@ -112,17 +103,59 @@ if($_SERVER['REQUEST_METHOD']=='POST') {
WHERE Permit_Number = $Well_ID
LIMIT 1";
$r_update = $mysqli->query($form_update);
}
if ($mysqli->affected_rows == 1){
echo '<p>IT RAN PROPERLY</p>';
}
else {
echo '<p>IT FUCKED UP PROPERLY</p>';
}
// }

}

$query = "SELECT
if ($_GET['Admin'] == 1) {
echo'<script>alert("hi");</script>';
$query = "SELECT
Date_Well_Completed,
Date_of_Report,
Registration_Number,
State_Well_No,
Other_No,
Owner_First_Name,
Owner_Last_Name,
Owner_Address,
Well_Street_Number,
Well_Street_Name,
Well_Town,
Well_Lot_Number,
Well_Latitude,
Well_Longitude,
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
FROM well_pending
WHERE Permit_Number = $Well_ID";
$Admin = 1;
}
else {
$query = "SELECT
Date_Well_Completed,
Date_of_Report,
Registration_Number,
Expand Down Expand Up @@ -163,10 +196,11 @@ $query = "SELECT
comment,
Depth_To_Top_Of_Gravel_Pack,
Depth_To_Bottom_Of_Gravel_Pack
FROM well_completion_report
WHERE Permit_Number = $Well_ID";
$Admin = 0;
}

if ($result = $mysqli->query($query)) {
$row = $result->fetch_assoc();
foreach ($row as &$value) {
Expand Down Expand Up @@ -200,7 +234,7 @@ if ($result = $mysqli->query($query)) {
</nav>

<?php
echo'<form id="add-well" role="form" action="form.php?Well_ID='.$Well_ID.'" method="post">';
echo'<form id="add-well" role="form" action="form.php?Admin='.$Admin.'?Well_ID='.$Well_ID.'" method="post">';
?>
<div class="group">
<label for="well-picture">
Expand All @@ -214,22 +248,22 @@ if ($result = $mysqli->query($query)) {
<label for="well-completion-date">Date well completed</label>
<?php
$W_Completion_Date = date("m/d/Y", strtotime($row['Date_Well_Completed']));
echo'<input name="well-completion-date" value="'.$W_Completion_Date.'">';
echo'<input name="well-completion-date" value="'.$W_Completion_Date.'" readonly>';
?>
</li>

<li>
<label for="report-completion-date">Date of report</label>
<?php
$R_Completion_Date = date("m/d/Y", strtotime($row['Date_of_Report']));
echo'<input name="report-completion-date" value="'.$W_Completion_Date.'">';
echo'<input name="report-completion-date" value="'.$W_Completion_Date.'" readonly>';
?>
</li>

<li>
<label for="permit-number">Permit number</label>
<?php
echo'<input type="number" min="1" name="permit-number" class="long-num" value="'.$Well_ID.'">';
echo'<input type="number" min="1" name="permit-number" class="long-num" value="'.$Well_ID.'" readonly>';
?>
</li>

Expand Down Expand Up @@ -299,7 +333,7 @@ if ($result = $mysqli->query($query)) {
<input value="<?php
//Should add ternary operator for nulls and blanks
echo $row['Well_Lot_Number'];
?>" type="number" min="1" name="lot-number" class="med-num">
?>" type="number" min="1" name="lot-number" class="med-num" step="any">
</li>

<li name="get-gps-local">
Expand Down Expand Up @@ -378,22 +412,22 @@ if ($result = $mysqli->query($query)) {
<input value="<?php
//Should add ternary operator for nulls and blanks
echo $row['Casing_Length_Feet'];
?>" type="number" min="1" name="length"> feet
?>" type="number" min="1" name="length" step="any"> feet
</li>
<li>
<label for="diameter">Diameter</label>
<input value="<?php
//Should add ternary operator for nulls and blanks
echo round($row['Casing_Diameter_Inches'], 5);
?>" type="number" min="1" name="casing-diameter"> inches
?>" type="number" min="1" name="casing-diameter" step="any"> inches
</li>

<li>
<label for="weight">Weight per foot</label>
<input value="<?php
//Should add ternary operator for nulls and blanks
echo $row['Casing_Weight_per_Foot_Pounds'];
?>" type="number" min="1" step="any" name="weight"> lbs/feet
?>" type="number" min="1" step="any" name="weight" step="any"> lbs/feet
</li>

<li>
Expand Down Expand Up @@ -431,7 +465,7 @@ if ($result = $mysqli->query($query)) {
//Should add ternary operator for nulls and blanks

echo $row['Yield_Test_Hours'];
?>" type="number" min="1" name="yield-hours"> hours
?>" type="number" min="1" name="yield-hours" step="any"> hours
</li>

<li>
Expand All @@ -440,7 +474,7 @@ if ($result = $mysqli->query($query)) {
//Should add ternary operator for nulls and blanks

echo $row['Yield_GPM'];
?>" type="number" min="1" name="yield-gpm"> gallons per minute
?>" type="number" min="1" name="yield-gpm" step="any"> gallons per minute
</li>

<li>
Expand All @@ -463,7 +497,7 @@ if ($result = $mysqli->query($query)) {
//Should add ternary operator for nulls and blanks

echo $row['Static_Water_Level_Feet'];
?>" type="number" min="1" name="water-from-surface"> feet
?>" type="number" min="1" name="water-from-surface" step="any"> feet
</li>

<li>
Expand All @@ -472,7 +506,7 @@ if ($result = $mysqli->query($query)) {
//Should add ternary operator for nulls and blanks

echo $row['Yield_Test_Water_Level_Feet'];
?>" type="number" min="1" name="water-level-during-yield-test"> feet
?>" type="number" min="1" name="water-level-during-yield-test" step="any"> feet
</li>

<li>
Expand All @@ -481,7 +515,7 @@ if ($result = $mysqli->query($query)) {
//Should add ternary operator for nulls and blanks

echo $row['Well_Depth_Feet'];
?>" type="number" min="1" name="depth-of-well"> feet
?>" type="number" min="1" name="depth-of-well" step="any"> feet
</li>

</ul>
Expand All @@ -504,7 +538,7 @@ if ($result = $mysqli->query($query)) {
//Should add ternary operator for nulls and blanks

echo $row['Open_Screen_Length_Feet'];
?>" type="number" min="1" name="length-open-to-aquifier"> feet
?>" type="number" min="1" name="length-open-to-aquifier" step="any"> feet
</li>

<li>
Expand All @@ -513,7 +547,7 @@ if ($result = $mysqli->query($query)) {
//Should add ternary operator for nulls and blanks

echo $row['Screen_Slot_Size'];
?>" type="number" min="1" name="slot-size">
?>" type="number" min="1" name="slot-size" step="any">
</li>

<li>
Expand All @@ -522,7 +556,7 @@ if ($result = $mysqli->query($query)) {
//Should add ternary operator for nulls and blanks

echo $row['Screen_Diameter_Inches'];
?>" type="number" min="1" name="screen-diameter"> inches
?>" type="number" min="1" name="screen-diameter" step="any"> inches
</li>

<li>
Expand All @@ -537,7 +571,7 @@ if ($result = $mysqli->query($query)) {
//Should add ternary operator for nulls and blanks

echo $row['Well_Diameter_Inches'];
?>" type="number" min="1" name="diameter-including-gravel-pack"> inches
?>" type="number" min="1" name="diameter-including-gravel-pack" step="any"> inches
</li>

<li>
Expand All @@ -546,20 +580,20 @@ if ($result = $mysqli->query($query)) {
//Should add ternary operator for nulls and blanks

echo $row['Gravel_Size_Inches'];
?>" type="number" min="1" name="gravel-size"> inches
?>" type="number" min="1" name="gravel-size" step="any"> inches
</li>

<li>
<label for="gravel-pack-location">Gravel pack location</label>
<input value="<?php
//Should add ternary operator for nulls and blanks
echo $row['Depth_To_Top_Of_Gravel_Pack'];
?>" type="number" min="1" name="gravel-pack-location-from"> feet
?>" type="number" min="1" name="gravel-pack-location-from" step="any"> feet
<br>to<br>
<input value="<?php
//Should add ternary operator for nulls and blanks
echo $row['Depth_To_Bottom_Of_Gravel_Pack'];
?>" type="number" min="1" name="gravel-pack-location-to"> feet
?>" type="number" min="1" name="gravel-pack-location-to" step="any"> feet
</li>

</ul>
Expand Down

0 comments on commit 772b478

Please sign in to comment.