Skip to content

Commit

Permalink
bugfix for task HashenUdara#22
Browse files Browse the repository at this point in the history
  • Loading branch information
theunknownsky committed Jul 28, 2023
1 parent cb51377 commit 6b26ac4
Show file tree
Hide file tree
Showing 101 changed files with 5,075 additions and 388 deletions.
Binary file added admin/data/item_images/1/1525670999_1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added admin/data/item_images/2/1525681111_661539.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added admin/data/item_images/33/1525616395_661539.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added admin/data/item_images/33/1525620172_661539.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added admin/data/item_images/344/1525620268_1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added admin/data/item_images/6/1525710463_gym bag.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added admin/data/item_images/7/1525713267_handbag.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added admin/data/item_images/8/1525750683_661539.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added admin/data/item_images/9/1689133111_OIP.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added admin/data/item_images/9/1689133718_OIP.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added admin/data/item_images/9/1689134192_OIP.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added admin/data/item_images/imageNotAvailable.jpg
Binary file added admin/data/item_images/noimage.gif
19 changes: 10 additions & 9 deletions admin/invItem.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@

<title>Dashboard</title>
<style>
.dashbord-tables {
animation: transitionIn-Y-over 0.5s;
}
.dashbord-tables {
animation: transitionIn-Y-over 0.5s;
}

.filter-container {
animation: transitionIn-Y-bottom 0.5s;
}
.filter-container {
animation: transitionIn-Y-bottom 0.5s;
}

.sub-table {
animation: transitionIn-Y-bottom 0.5s;
}
.sub-table {
animation: transitionIn-Y-bottom 0.5s;
}
</style>


Expand Down Expand Up @@ -55,6 +55,7 @@
</div>
</div>
<?php include('../inc/scripts.php'); ?>
<script src="../inc/invScripts.js"></script>
</body>

</html>
2 changes: 2 additions & 0 deletions admin/invPurchase.php
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@
</div>
</div>
<?php include('../inc/scripts.php'); ?>
<script src="../inc/invScripts.js"></script>

</body>

</html>
2 changes: 2 additions & 0 deletions admin/invReports.php
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@
</div>
</div>
<?php include('../inc/scripts.php'); ?>
<script src="../inc/invScripts.js"></script>

</body>

</html>
20 changes: 11 additions & 9 deletions admin/invSale.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@

<title>Dashboard</title>
<style>
.dashbord-tables {
animation: transitionIn-Y-over 0.5s;
}
.dashbord-tables {
animation: transitionIn-Y-over 0.5s;
}

.filter-container {
animation: transitionIn-Y-bottom 0.5s;
}
.filter-container {
animation: transitionIn-Y-bottom 0.5s;
}

.sub-table {
animation: transitionIn-Y-bottom 0.5s;
}
.sub-table {
animation: transitionIn-Y-bottom 0.5s;
}
</style>


Expand Down Expand Up @@ -55,6 +55,8 @@
</div>
</div>
<?php include('../inc/scripts.php'); ?>
<script src="../inc/invScripts.js"></script>

</body>

</html>
1 change: 1 addition & 0 deletions admin/invSearch.php
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
</div>
</div>
<?php include('../inc/scripts.php'); ?>
<script src="../inc/invScripts.js"></script>
</body>

</html>
20 changes: 11 additions & 9 deletions admin/invVendor.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@

<title>Dashboard</title>
<style>
.dashbord-tables {
animation: transitionIn-Y-over 0.5s;
}
.dashbord-tables {
animation: transitionIn-Y-over 0.5s;
}

.filter-container {
animation: transitionIn-Y-bottom 0.5s;
}
.filter-container {
animation: transitionIn-Y-bottom 0.5s;
}

.sub-table {
animation: transitionIn-Y-bottom 0.5s;
}
.sub-table {
animation: transitionIn-Y-bottom 0.5s;
}
</style>


Expand Down Expand Up @@ -55,6 +55,8 @@
</div>
</div>
<?php include('../inc/scripts.php'); ?>
<script src="../inc/invScripts.js"></script>

</body>

</html>
21 changes: 1 addition & 20 deletions admin/inventory/item.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<div class="form-group col-md-2">
<label for="itemDetailsStatus">Status</label>
<select id="itemDetailsStatus" name="itemDetailsStatus" class="form-control chosenSelect">
<?php include('inc/statusList.html'); ?>
<?php include('../inc/statusList.html'); ?>
</select>
</div>
</div>
Expand Down Expand Up @@ -127,25 +127,6 @@ class="blueText">png</span> only )</label>
</div>


<ul class="nav nav-tabs" role="tablist">
<li class="nav-item">
<a class="nav-link active" data-toggle="tab" href="#itemDetailsTab">Item</a>
</li>
<li class="nav-item">
<a class="nav-link" data-toggle="tab" href="#itemImageTab">Upload Image</a>
</li>
</ul>

<!-- Tab panes for item details and image sections -->
<div class="tab-content">
<div id="itemDetailsTab" class="container-fluid tab-pane active">

</div>

<div id="itemImageTab" class="container-fluid tab-pane fade">

</div>

</div>
</div>
</div>
48 changes: 24 additions & 24 deletions admin/model/item/showItemNumber.php
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
<?php
require_once('../../inc/config/constants.php');
require_once('../../inc/config/db.php');

// Check if the POST request is received and if so, execute the script
if(isset($_POST['textBoxValue'])){
$output = '';
$itemNumberString = '%' . htmlentities($_POST['textBoxValue']) . '%';

// Construct the SQL query to get the item name
$sql = 'SELECT itemNumber FROM item WHERE itemNumber LIKE ?';
$stmt = $conn->prepare($sql);
$stmt->execute([$itemNumberString]);

// If we receive any results from the above query, then display them in a list
if($stmt->rowCount() > 0){
$output = '<ul class="list-unstyled suggestionsList" id="itemDetailsItemNumberSuggestionsList">';
while($row = $stmt->fetch(PDO::FETCH_ASSOC)){
$output .= '<li>' . $row['itemNumber'] . '</li>';
}
echo '</ul>';
} else {
$output = '';
require_once('../../../inc/config/constants.php');
require_once('../../../inc/config/db.php');

// Check if the POST request is received and if so, execute the script
if (isset($_POST['textBoxValue'])) {
$output = '';
$itemNumberString = '%' . htmlentities($_POST['textBoxValue']) . '%';

// Construct the SQL query to get the item name
$sql = 'SELECT itemNumber FROM item WHERE itemNumber LIKE ?';
$stmt = $conn->prepare($sql);
$stmt->execute([$itemNumberString]);

// If we receive any results from the above query, then display them in a list
if ($stmt->rowCount() > 0) {
$output = '<ul class="list-unstyled suggestionsList" id="itemDetailsItemNumberSuggestionsList">';
while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
$output .= '<li>' . $row['itemNumber'] . '</li>';
}
$stmt->closeCursor();
echo $output;
echo '</ul>';
} else {
$output = '';
}
$stmt->closeCursor();
echo $output;
}
?>
57 changes: 28 additions & 29 deletions inc/footer.php
Original file line number Diff line number Diff line change
@@ -1,30 +1,29 @@
<!-- Footer -->
<footer class="footer bg-dark">
<div class="container">
<p class="m-0 text-center text-white">Copyright &copy; Inventory System <?php echo date('Y'); ?></p>
</div>
</footer>
<!-- Footer -->
<footer class="footer bg-dark">
<div class="container">
<p class="m-0 text-center text-white">Copyright &copy; Inventory System
<?php echo date('Y'); ?>
</p>
</div>
</footer>

<!-- Bootstrap core JavaScript -->
<script src="../admin/vendor/jquery/jquery.min.js"></script>
<script src="../admin/vendor/bootstrap/js/bootstrap.bundle.min.js"></script>

<!-- Datatables script -->
<script type="text/javascript" charset="utf8" src="../admin/vendor/DataTables/datatables.js"></script>
<script type="text/javascript" charset="utf8" src="../admin/vendor/DataTables/sumsum.js"></script>

<!-- Chosen files for select boxes -->
<script src="../admin/vendor/chosen/chosen.jquery.min.js"></script>
<link rel="stylesheet" href="../admin/vendor/chosen/chosen.css" />

<!-- Datepicker JS -->
<script src="../admin/vendor/datepicker164/js/bootstrap-datepicker.min.js"></script>

<!-- Bootbox JS -->
<script src="../admin/vendor/bootbox/bootbox.min.js"></script>

<!-- Custom scripts -->
<script src="assets/js/scripts.js"></script>
<!-- <script src="assets/js/login.js"></script>
<script src="assets/js/register.js"></script> -->

<!-- Bootstrap core JavaScript -->
<script src="../admin/vendor/jquery/jquery.min.js"></script>
<script src="../admin/vendor/bootstrap/js/bootstrap.bundle.min.js"></script>

<!-- Datatables script -->
<script type="text/javascript" charset="utf8" src="../admin/vendor/DataTables/datatables.js"></script>
<script type="text/javascript" charset="utf8" src="../admin/vendor/DataTables/sumsum.js"></script>



<!-- Datepicker JS -->
<script src="../admin/vendor/datepicker164/js/bootstrap-datepicker.min.js"></script>

<!-- Bootbox JS -->
<script src="../admin/vendor/bootbox/bootbox.min.js"></script>

<!-- Custom scripts -->
<script src="../admin/assets/js/scripts.js"></script>
<!-- <script src="assets/js/login.js"></script>
<script src="assets/js/register.js"></script> -->
4 changes: 3 additions & 1 deletion inc/header.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.3.0/css/bootstrap.min.css"
integrity="sha512-t4GWSVZO1eC8BM339Xd7Uphw5s17a86tIZIj8qRxhnKub6WoyhnrxeCIMeAqBPgdZGlCcG2PrZjMc+Wr78+5Xg=="
crossorigin="anonymous" referrerpolicy="no-referrer" />
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.10.5/font/bootstrap-icons.css">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.10.5/font/bootstrap-icons.css">
<!-- Chosen files for select boxes -->
<link rel="stylesheet" href="../admin/vendor/chosen/chosen.css" />
Loading

0 comments on commit 6b26ac4

Please sign in to comment.