diff --git a/Wello/www/admin.php b/Wello/www/admin.php index 857cbc2..f5164b6 100644 --- a/Wello/www/admin.php +++ b/Wello/www/admin.php @@ -1,119 +1,119 @@ -connect_errno) { - printf("Connect failed: %s\n", $mysqli->connect_error); - exit(); -} - -function moveWell() { - $PermitNumber = $mysqli->real_escape_string(trim($_GET['move'])); - $copyquery = "INSERT INTO well_completion_report SELECT * FROM well_pending WHERE Permit_Number = '".$PermitNumber."'"; - $mysqli->query($copyquery); - - $deletequery = "DELETE FROM well_pending WHERE Permit_Number = '".$PermitNumber."'"; - $mysqli->query($deletequery); - } - - if (isset($_GET['move'])) { - moveWell(); - } - -$query = "SELECT CONCAT(Well_Street_Number, ' ', Well_Street_Name) AS 'WellAddress', Well_Town, Permit_Number - FROM well_pending - LIMIT 10"; - -?> - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Pending Wells

- query($query)) { - - /* fetch associative array */ - while ($row = $result->fetch_assoc()) { - echo' -
- -
-
-
-

'.$row["WellAddress"].'

-

'.$row["Well_Town"].'

-

Permit Number: '.$row["Permit_Number"].'

-
-
- -
- Approve - Edit -
-
- '; - } - - /* free result set */ - $result->free(); - } - ?> -
- - - - - - - - - - - - - - - - +connect_errno) { + printf("Connect failed: %s\n", $mysqli->connect_error); + exit(); +} + +function moveWell() { + $PermitNumber = $mysqli->real_escape_string(trim($_GET['move'])); + $copyquery = "INSERT INTO well_completion_report SELECT * FROM well_pending WHERE Permit_Number = '".$PermitNumber."'"; + $mysqli->query($copyquery); + + $deletequery = "DELETE FROM well_pending WHERE Permit_Number = '".$PermitNumber."'"; + $mysqli->query($deletequery); + } + + if (isset($_GET['move'])) { + moveWell(); + } + +$query = "SELECT CONCAT(Well_Street_Number, ' ', Well_Street_Name) AS 'WellAddress', Well_Town, Permit_Number + FROM well_pending + LIMIT 10"; + +?> + + + + + + + + + + + + + + + + + + + + + + + + + +
+

Pending Wells

+ query($query)) { + + /* fetch associative array */ + while ($row = $result->fetch_assoc()) { + echo' +
+ +
+
+
+

'.$row["WellAddress"].'

+

'.$row["Well_Town"].'

+

Permit Number: '.$row["Permit_Number"].'

+
+
+ +
+ Approve + Edit +
+
+ '; + } + + /* free result set */ + $result->free(); + } + ?> +
+ + + + + + + + + + + + + + + + diff --git a/Wello/www/form.php b/Wello/www/form.php index 4a9b933..93c3142 100644 --- a/Wello/www/form.php +++ b/Wello/www/form.php @@ -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'])); @@ -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'])); @@ -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', @@ -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', @@ -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 '

IT RAN PROPERLY

'; - } - else { - echo '

IT FUCKED UP PROPERLY

'; - } +// } } -$query = "SELECT +if ($_GET['Admin'] == 1) { + echo''; + $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, @@ -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) { @@ -200,7 +234,7 @@ if ($result = $mysqli->query($query)) { '; + echo'
'; ?>