Skip to content

Commit

Permalink
Merge pull request #266 from DasunThathsara/sohani
Browse files Browse the repository at this point in the history 
Update View Parking Request Table Styles
  • Loading branch information
@DasunThathsara
DasunThathsara authored Feb 19, 2024
2 parents c044388 + c6c4f87 commit 75d6312
Show file tree
Hide file tree
Showing 11 changed files with 189 additions and 25 deletions.
14 changes: 14 additions & 0 deletions app/controllers/ParkingOwner.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,20 @@ public function viewReport(){
$this->view('parkingOwner/report', $data, $other_data);
}

// -------------------------------------- generate Report ---------------------------------------
public function viewGenerateReport(){
$data = [
'title' => 'Home page'
];

$other_data['notification_count'] = 0;

if ($other_data['notification_count'] < 10)
$other_data['notification_count'] = '0'.$other_data['notification_count'];

$this->view('parkingOwner/generatereport', $data, $other_data);
}

// ------------------------------------ Securities -------------------------------------
// View assign security to parking owner
public function securities($landID){
Expand Down
61 changes: 38 additions & 23 deletions app/views/admin/requests.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,25 @@
require APPROOT.'/views/inc/components/sidenavbar.php';
?>



<main class="page-container">
<section class="section" id="main">
<div class="container">
<h1>Registration Requests</h1>
<h1 id="requestheader">Registration Requests</h1>

<br><br>
<?php if (sizeof($data) == 0) {?>
<div class="emptyVehicle">You have no any registered vehicles</div>
<div class="emptyVehicle">You have no any registration requests</div>
<?php }
else {?>
<h1>Unassigned</h1>
<div class="table-container">
<table class="table">

<div class="table-container" id="tcontainer">
<h1 id="ttitle">Unassigned</h1>
<table class="requesttable" >
<tr>
<th width="60px">
<div class="content" style="display:flex;">
<th >
<div class="content" id="theader">
<div class="left" style="width:31%">
Name
</div>
Expand All @@ -41,7 +44,7 @@
<tr>
<td>
<a class="tile">
<div class="content">
<div class="content" id="content">
<div class="left" style="width:30%">
<?php echo $data[$i]->name ?>
</div>
Expand All @@ -51,21 +54,21 @@
<div class="right">
<form action="<?php echo URLROOT ?>/admin/verifyLand" method="post" class="update-form">
<input type="text" name="id" id="id" hidden value="<?php echo $data[$i]->id ?>" />
<button type="submit" class="edit" onclick="return confirmSubmit();">
<button type="submit" class="edit" onclick="return confirmSubmit1();">
<img src="<?php echo URLROOT ?>/images/tick.svg" style="width: 18px" alt="">
</button>
</form>
&nbsp;
<form action="<?php echo URLROOT ?>/admin/unverifyLand" method="post" class="delete-form">
<input type="text" name="id" id="id" hidden value="<?php echo $data[$i]->id ?>" />
<button type="submit" class="delete" onclick="return confirmSubmit();">
<button type="submit" class="delete" onclick="return confirmSubmit2();">
<img src="<?php echo URLROOT ?>/images/circle-xmark-regular.svg" style="width: 18px;" alt="">
</button>
</form>
&nbsp;
<form action="<?php echo URLROOT ?>/admin/assignMySelf" method="post" class="delete-form">
<input type="text" name="id" id="id" hidden value="<?php echo $data[$i]->id ?>" />
<button type="submit" class="delete" onclick="return confirmSubmit();" style="background-color: #fcd426; padding: 5px 10px;">
<button type="submit" class="delete" id="bttn" onclick="return confirmSubmit3();">
Assign myself
</button>
</form>
Expand All @@ -76,18 +79,18 @@
</tr>
<?php } ?>
</table>
</div>


<h1>Assigned</h1>
<div class="table-container">
<table class="table">
<h1 id="ttitle">Assigned</h1>

<table class="requesttable">
<tr>
<th width="60px">
<div class="content" style="display:flex;">
<th>
<div class="content" id="theader">
<div class="left" style="width:31%">
Name
</div>
<div class="left" style="width:20%; padding-left:5px">
<div class="left" style="width:20%; padding-left:5px ">
City
</div>
</div>
Expand All @@ -99,7 +102,7 @@
<tr>
<td>
<a class="tile">
<div class="content">
<div class="content" id="content" >
<div class="left" style="width:30%">
<?php echo $data[$i]->name ?>
</div>
Expand All @@ -109,21 +112,21 @@
<div class="right">
<form action="<?php echo URLROOT ?>/admin/verifyLand" method="post" class="update-form">
<input type="text" name="id" id="id" hidden value="<?php echo $data[$i]->id ?>" />
<button type="submit" class="edit" onclick="return confirmSubmit();">
<button type="submit" class="edit" onclick="return confirmSubmit1();">
<img src="<?php echo URLROOT ?>/images/tick.svg" style="width: 18px" alt="">
</button>
</form>
&nbsp;
<form action="<?php echo URLROOT ?>/admin/unverifyLand" method="post" class="delete-form">
<input type="text" name="id" id="id" hidden value="<?php echo $data[$i]->id ?>" />
<button type="submit" class="delete" onclick="return confirmSubmit();">
<button type="submit" class="delete" onclick="return confirmSubmit2();">
<img src="<?php echo URLROOT ?>/images/circle-xmark-regular.svg" style="width: 18px;" alt="">
</button>
</form>
&nbsp;
<form action="<?php echo URLROOT ?>/admin/unassignedMySelf" method="post" class="delete-form">
<input type="text" name="id" id="id" hidden value="<?php echo $data[$i]->id ?>" />
<button type="submit" class="delete" onclick="return confirmSubmit();" style="background-color: #fcd426; padding: 5px 10px;">
<button type="submit" class="delete" id="bttn" onclick="return confirmSubmit4();" >
Unassigned myself
</button>
</form>
Expand All @@ -142,9 +145,21 @@
</main>

<script>
function confirmSubmit() {
function confirmSubmit1() {
return confirm("Are you sure you want to conferm this land?");
}

function confirmSubmit2() {
return confirm("Are you sure you want to delete this land?");
}

function confirmSubmit3() {
return confirm("Are you sure you want to assign this land to yourself?");
}

function confirmSubmit4() {
return confirm("Are you sure you want to unassign this land from yourself?");
}
</script>

<script src="https://code.jquery.com/jquery-3.6.4.min.js"></script>
Expand Down
67 changes: 67 additions & 0 deletions app/views/parkingOwner/generatereport.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
<?php require APPROOT.'/views/inc/header.php'; ?>

<!-- TOP NAVIGATION -->
<?php require APPROOT.'/views/inc/components/topnavbar.php'; ?>

<!-- SIDE NAVIGATION -->
<?php
$section = 'reports';
require APPROOT.'/views/inc/components/sidenavbar.php';
?>

<main class="page-container">
<section class="section" id="main">
<div class="container">

<div class="generate-reports">

<div class="form-container" style="margin-top: 5vh"><!--change margin-top to 5vh-->
<h1>Report Type Selection</h1> <!--newly added-->
<?php if (!empty($data['err'])){?>
<div class="error-msg">
<span class="form-invalid"><?php echo $data["err"] ?></span>
</div>
<?php } ?>

<div class="type-select">
<a href="<?php echo URLROOT ?>/parkingowner/report">
<div class="type-select-btn">
Occupancy Summary Report
</div>
</a>

<a href="<?php echo URLROOT ?>/parkingowner/report">
<div class="type-select-btn">
Revenue Report
</div>
</a>

<a href="<?php echo URLROOT ?>/parkingowner/report">
<div class="type-select-btn">
Type 03
</div>
</a>

<a href="<?php echo URLROOT ?>/parkingowner/report">
<div class="type-select-btn">
Type 04
</div>
</a>

<a href="<?php echo URLROOT ?>/parkingowner/report">
<div class="type-select-btn">
Type 05
</div>
</a>
</div>


</div>


</div>
</section>
</main>


<?php require APPROOT.'/views/inc/footer.php'; ?>
4 changes: 2 additions & 2 deletions app/views/superAdmin/admins.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
else {?>
<!-- Titles of the table -->
<div class="title-options">
<div class="all-lands option-item option-item-active">All Lands</div>
<div class="all-lands option-item option-item-active">All Admins</div>
<div class="available-lands option-item">Available</div>
<div class="unavailable-lands option-item">Unavailable</div>
</div>
Expand Down Expand Up @@ -56,7 +56,7 @@
<tr style="background-color: green">
<td class="name-td" style="width: 200px; background-color: red" data-header>
<p class="name"></p>
<p class="id-p">Land ID: <span class="id"></span></p>
<p class="id-p">Admin ID: <span class="id"></span></p>
</td>
<td class="email" data-header></td>
<td class="status-td" data-header><span class="status">Available</span></td>
Expand Down
67 changes: 67 additions & 0 deletions public/css/adminlandrequeststyle.css
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
#requestheader{
color:#ffc32d;
transform: translateY(15px)
}



#theader{
display:flex;
}

#content{
padding-right: 0%;
}

/* Style for the table headers */
.table-container {
margin-top: 20px;

}

.requesttable {
width: 100%;
border-collapse: collapse;

}

.requesttable th {
background-color: #f2f2f2;
border: 1px solid #ddd;
padding: 8px;
width: 60px;


}

.requesttable td {
border: 1px solid #ddd;
padding: 8px;
}

/* Style for the "Unassigned" and "Assigned" headings */
#ttitle {
margin-top: 20px;
font-size: 24px;
color: #615f5f;
text-align: left;
margin-left: 40px;
}

#bttn{
background-color: #fcd426;
padding: 5px 10px;
border-radius: 10px;
cursor: pointer;
}

#tcontainer{
background-color: white;
padding: 30px;
border-radius: 20px;
box-shadow: 0 0 15px 0.1px rgba(0, 0, 0, 0.12);

margin-bottom: 15px;

}

1 change: 1 addition & 0 deletions public/css/style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
@import url('landingpage.css');
@import url('driver.css');
@import url('merchandiser.css');
@import url('adminlandrequeststyle.css');

/* ----------------- General Styles ---------------- */
body{
Expand Down
Binary file added public/deeds/DEED-658e627dc86c60.53008365.pdf
View file
Binary file not shown.
Binary file added public/deeds/DEED-658e67e64db026.24698852.pdf
View file
Binary file not shown.
Binary file added public/deeds/DEED-658e6895878109.63221205.pdf
View file
Binary file not shown.
Binary file added public/deeds/DEED-6595a09b124a18.63291685.pdf
View file
Binary file not shown.
Binary file added public/profile_pics/IMG-658e61a4af0ed3.71728387.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 75d6312

Please sign in to comment.