Cleaned up some unnessesary ids and class tags under edit add list and clients

This commit is contained in:
johnny@pittpc.com
2021-02-02 22:13:52 -05:00
parent a8bf6c3718
commit ffc647b0ca
4 changed files with 71 additions and 77 deletions

View File

@@ -1,33 +1,33 @@
<div class="modal" id="addClientModal" tabindex="-1"> <div class="modal" id="addClientModal" tabindex="-1">
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content bg-dark"> <div class="modal-content bg-dark">
<div class="modal-header text-white"> <div class="modal-header">
<h5 class="modal-title"><i class="fa fa-fw fa-user mr-2"></i>New Client</h5> <h5 class="modal-title"><i class="fa fa-fw fa-user mr-2"></i>New Client</h5>
<button type="button" class="close text-white" data-dismiss="modal"> <button type="button" class="close text-white" data-dismiss="modal">
<span aria-hidden="true">&times;</span> <span>&times;</span>
</button> </button>
</div> </div>
<form action="post.php" method="post" autocomplete="off"> <form action="post.php" method="post" autocomplete="off">
<div class="modal-body bg-white"> <div class="modal-body bg-white">
<ul class="nav nav-pills nav-justified mb-3" id="pills-tab"> <ul class="nav nav-pills nav-justified mb-3">
<li class="nav-item"> <li class="nav-item">
<a class="nav-link active" id="pills-details-tab" data-toggle="pill" href="#pills-details">Details</a> <a class="nav-link active" data-toggle="pill" href="#pills-details">Details</a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" id="pills-address-tab" data-toggle="pill" href="#pills-address">Address</a> <a class="nav-link" data-toggle="pill" href="#pills-address">Address</a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" id="pills-contact-tab" data-toggle="pill" href="#pills-contact">Contact</a> <a class="nav-link" data-toggle="pill" href="#pills-contact">Contact</a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" id="pills-notes-tab" data-toggle="pill" href="#pills-notes">Notes</a> <a class="nav-link" data-toggle="pill" href="#pills-notes">Notes</a>
</li> </li>
</ul> </ul>
<hr> <hr>
<div class="tab-content" id="pills-tabContent"> <div class="tab-content">
<div class="tab-pane fade show active" id="pills-details"> <div class="tab-pane fade show active" id="pills-details">

View File

@@ -7,10 +7,6 @@ if($session_permission_level == 2){
$permission_sql = ""; $permission_sql = "";
} }
//Rebuild URL
//$url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
//Paging //Paging
if(isset($_GET['p'])){ if(isset($_GET['p'])){
$p = intval($_GET['p']); $p = intval($_GET['p']);
@@ -60,7 +56,6 @@ if(!empty($_GET['dtf'])){
} }
//Rebuild URL //Rebuild URL
$url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o))); $url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM clients WHERE (client_name LIKE '%$q%' OR client_type LIKE '%$q%' OR client_email LIKE '%$q%' OR client_contact LIKE '%$q%' OR client_phone LIKE '%$q%' OR client_mobile LIKE '%$q%' OR client_address LIKE '%$q%' OR client_city LIKE '%$q%' OR client_state LIKE '%$q%' OR client_zip LIKE '%$q%') AND DATE(client_created_at) BETWEEN '$dtf' AND '$dtt' AND company_id = $session_company_id $permission_sql ORDER BY $sb $o LIMIT $record_from, $record_to"); $sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM clients WHERE (client_name LIKE '%$q%' OR client_type LIKE '%$q%' OR client_email LIKE '%$q%' OR client_contact LIKE '%$q%' OR client_phone LIKE '%$q%' OR client_mobile LIKE '%$q%' OR client_address LIKE '%$q%' OR client_city LIKE '%$q%' OR client_state LIKE '%$q%' OR client_zip LIKE '%$q%') AND DATE(client_created_at) BETWEEN '$dtf' AND '$dtt' AND company_id = $session_company_id $permission_sql ORDER BY $sb $o LIMIT $record_from, $record_to");
@@ -69,8 +64,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
?> ?>
<div class="card mb-3"> <div class="card card-dark mb-3">
<div class="card-header bg-dark text-white"> <div class="card-header">
<h3 class="card-title mt-2"><i class="fa fa-users"></i> Clients</h3> <h3 class="card-title mt-2"><i class="fa fa-users"></i> Clients</h3>
<div class="card-tools"> <div class="card-tools">
<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addClientModal"><i class="fas fa-fw fa-plus"></i> New Client</button> <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addClientModal"><i class="fas fa-fw fa-plus"></i> New Client</button>
@@ -235,9 +230,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
</tbody> </tbody>
</table> </table>
<div class="mr-3">
<?php include("pagination.php"); ?> <?php include("pagination.php"); ?>
</div>
</div> </div>
</div> </div>
</div> </div>

View File

@@ -1,34 +1,34 @@
<div class="modal" id="editClientModal<?php echo $client_id; ?>" tabindex="-1"> <div class="modal" id="editClientModal<?php echo $client_id; ?>" tabindex="-1">
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content bg-dark"> <div class="modal-content bg-dark">
<div class="modal-header text-white"> <div class="modal-header">
<h5 class="modal-title"><i class="fa fa-fw fa-user mr-2"></i><?php echo $client_name; ?></h5> <h5 class="modal-title"><i class="fa fa-fw fa-user mr-2"></i><?php echo $client_name; ?></h5>
<button type="button" class="close text-white" data-dismiss="modal"> <button type="button" class="close text-white" data-dismiss="modal">
<span aria-hidden="true">&times;</span> <span>&times;</span>
</button> </button>
</div> </div>
<form action="post.php" method="post" autocomplete="off"> <form action="post.php" method="post" autocomplete="off">
<input type="hidden" name="client_id" value="<?php echo $client_id; ?>"> <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
<div class="modal-body bg-white"> <div class="modal-body bg-white">
<ul class="nav nav-pills nav-justified mb-3" id="pills-tab<?php echo $client_id; ?>"> <ul class="nav nav-pills nav-justified mb-3">
<li class="nav-item"> <li class="nav-item">
<a class="nav-link active" id="pills-details-tab<?php echo $client_id; ?>" data-toggle="pill" href="#pills-details<?php echo $client_id; ?>">Details</a> <a class="nav-link active" data-toggle="pill" href="#pills-details<?php echo $client_id; ?>">Details</a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" id="pills-address-tab<?php echo $client_id; ?>" data-toggle="pill" href="#pills-address<?php echo $client_id; ?>">Address</a> <a class="nav-link" data-toggle="pill" href="#pills-address<?php echo $client_id; ?>">Address</a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" id="pills-contact-tab<?php echo $client_id; ?>" data-toggle="pill" href="#pills-contact<?php echo $client_id; ?>">Contact</a> <a class="nav-link" data-toggle="pill" href="#pills-contact<?php echo $client_id; ?>">Contact</a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" id="pills-notes-tab<?php echo $client_id; ?>" data-toggle="pill" href="#pills-notes<?php echo $client_id; ?>">Notes</a> <a class="nav-link" data-toggle="pill" href="#pills-notes<?php echo $client_id; ?>">Notes</a>
</li> </li>
</ul> </ul>
<hr> <hr>
<div class="tab-content" id="pills-tabContent<?php echo $client_id; ?>"> <div class="tab-content">
<div class="tab-pane fade show active" id="pills-details<?php echo $client_id; ?>"> <div class="tab-pane fade show active" id="pills-details<?php echo $client_id; ?>">

View File

@@ -1,61 +1,60 @@
<?php include("header.php"); <?php include("header.php");
//Rebuild URL //Paging
$url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o))); if(isset($_GET['p'])){
$p = intval($_GET['p']);
$record_from = (($p)-1)*$config_records_per_page;
$record_to = $config_records_per_page;
}else{
$record_from = 0;
$record_to = $config_records_per_page;
$p = 1;
}
//Paging if(isset($_GET['q'])){
if(isset($_GET['p'])){ $q = mysqli_real_escape_string($mysqli,$_GET['q']);
$p = intval($_GET['p']); }else{
$record_from = (($p)-1)*$config_records_per_page; $q = "";
$record_to = $config_records_per_page; }
}else{ if(!empty($_GET['sb'])){
$record_from = 0; $sb = mysqli_real_escape_string($mysqli,$_GET['sb']);
$record_to = $config_records_per_page; }else{
$p = 1; $sb = "vendor_name";
} }
if(isset($_GET['o'])){
if(isset($_GET['q'])){ if($_GET['o'] == 'ASC'){
$q = mysqli_real_escape_string($mysqli,$_GET['q']);
}else{
$q = "";
}
if(!empty($_GET['sb'])){
$sb = mysqli_real_escape_string($mysqli,$_GET['sb']);
}else{
$sb = "vendor_name";
}
if(isset($_GET['o'])){
if($_GET['o'] == 'ASC'){
$o = "ASC";
$disp = "DESC";
}else{
$o = "DESC";
$disp = "ASC";
}
}else{
$o = "ASC"; $o = "ASC";
$disp = "DESC"; $disp = "DESC";
}
//Date From and Date To Filter
if(isset($_GET['dtf'])){
$dtf = $_GET['dtf'];
$dtt = $_GET['dtt'];
}else{ }else{
$dtf = "0000-00-00"; $o = "DESC";
$dtt = "9999-00-00"; $disp = "ASC";
} }
}else{
$o = "ASC";
$disp = "DESC";
}
$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM vendors WHERE client_id = 0 //Date From and Date To Filter
AND company_id = $session_company_id if(isset($_GET['dtf'])){
AND DATE(vendor_created_at) BETWEEN '$dtf' AND '$dtt' $dtf = $_GET['dtf'];
AND (vendor_name LIKE '%$q%' OR vendor_description LIKE '%$q%' OR vendor_account_number LIKE '%$q%') $dtt = $_GET['dtt'];
ORDER BY $sb $o LIMIT $record_from, $record_to"); }else{
$num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); $dtf = "0000-00-00";
$total_found_rows = $num_rows[0]; $dtt = "9999-00-00";
$total_pages = ceil($total_found_rows / 10); }
?> //Rebuild URL
$url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM vendors WHERE client_id = 0
AND company_id = $session_company_id
AND DATE(vendor_created_at) BETWEEN '$dtf' AND '$dtt'
AND (vendor_name LIKE '%$q%' OR vendor_description LIKE '%$q%' OR vendor_account_number LIKE '%$q%')
ORDER BY $sb $o LIMIT $record_from, $record_to");
$num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
?>
<div class="card mb-3"> <div class="card mb-3">
<div class="card-header bg-dark text-white"> <div class="card-header bg-dark text-white">