c3lf/c3lf-system-3
7
0
Fork 0
Code Issues 51 Pull requests Projects 2 Releases Wiki Activity Actions

Merge branch 'master' into jedi/dev

Browse source
This commit is contained in:
/jedi/ 2018-12-30 12:01:55 +01:00
commit f949d07115
9 changed files with 68 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
index.php
View file

@ -76,7 +76,7 @@ function get_stats(){
if ($row = $res->fetch_assoc()) { if ($row = $res->fetch_assoc()) {
$ret["match"] = $row["c"]; $ret["match"] = $row["c"];
} }
$ret["unmatched"] = $ret["found"] + $ret["lost"] - 2 * $ret["match"];
return $ret; return $ret;
} }

8
templates/dashboard.php
View file

@ -29,7 +29,7 @@ $stats = get_stats();
</div> </div>
<div class="mr-5"><?php echo $stats["lost"]; ?> Lost Items</div> <div class="mr-5"><?php echo $stats["lost"]; ?> Lost Items</div>
</div> </div>
<a class="card-footer text-white clearfix small z-1" href="/?page=lost"> <a class="card-footer text-white clearfix small z-1" href="/lost/">
<span class="float-left">View Details</span> <span class="float-left">View Details</span>
<span class="float-right"> <span class="float-right">
<i class="fas fa-angle-right"></i> <i class="fas fa-angle-right"></i>
@ -45,7 +45,7 @@ $stats = get_stats();
</div> </div>
<div class="mr-5"><?php echo $stats["found"]; ?> Found Items</div> <div class="mr-5"><?php echo $stats["found"]; ?> Found Items</div>
</div> </div>
<a class="card-footer text-white clearfix small z-1" href="/?page=table"> <a class="card-footer text-white clearfix small z-1" href="/table/">
<span class="float-left">View Details</span> <span class="float-left">View Details</span>
<span class="float-right"> <span class="float-right">
<i class="fas fa-angle-right"></i> <i class="fas fa-angle-right"></i>
@ -61,7 +61,7 @@ $stats = get_stats();
</div> </div>
<div class="mr-5"><?php echo $stats["match"]; ?> Matched Items</div> <div class="mr-5"><?php echo $stats["match"]; ?> Matched Items</div>
</div> </div>
<a class="card-footer text-white clearfix small z-1" href="/?page=matches"> <a class="card-footer text-white clearfix small z-1" href="/matches/">
<span class="float-left">View Details</span> <span class="float-left">View Details</span>
<span class="float-right"> <span class="float-right">
<i class="fas fa-angle-right"></i> <i class="fas fa-angle-right"></i>
@ -77,7 +77,7 @@ $stats = get_stats();
</div> </div>
<div class="mr-5"><?php echo $stats["unmatched"]; ?> Unmatched Items</div> <div class="mr-5"><?php echo $stats["unmatched"]; ?> Unmatched Items</div>
</div> </div>
<a class="card-footer text-white clearfix small z-1" href="/?page=tinder"> <a class="card-footer text-white clearfix small z-1" href="/tinder/">
<span class="float-left">View Details</span> <span class="float-left">View Details</span>
<span class="float-right"> <span class="float-right">
<i class="fas fa-angle-right"></i> <i class="fas fa-angle-right"></i>

18
templates/insert.php
View file

@ -26,7 +26,7 @@
Insert Item into DB Insert Item into DB
</div> </div>
<div class="card-body"> <div class="card-body">
<form method="POST" action="action.php?action=insert"> <form method="POST" action="/action.php?action=insert">
<p><input type="text" class="form-control" placeholder="WANN" name="wann" value="<?php echo date("Y-m-d H:i:s");?>"></p> <p><input type="text" class="form-control" placeholder="WANN" name="wann" value="<?php echo date("Y-m-d H:i:s");?>"></p>
<p><input type="text" class="form-control" placeholder="WO" name="wo"></p> <p><input type="text" class="form-control" placeholder="WO" name="wo"></p>
<p><input type="text" class="form-control" placeholder="WAS" name="was"></p> <p><input type="text" class="form-control" placeholder="WAS" name="was"></p>
@ -43,19 +43,19 @@
<!-- Bootstrap core JavaScript--> <!-- Bootstrap core JavaScript-->
<script src="vendor/jquery/jquery.min.js"></script> <script src="/vendor/jquery/jquery.min.js"></script>
<script src="vendor/bootstrap/js/bootstrap.bundle.min.js"></script> <script src="/vendor/bootstrap/js/bootstrap.bundle.min.js"></script>
<!-- Core plugin JavaScript--> <!-- Core plugin JavaScript-->
<script src="vendor/jquery-easing/jquery.easing.min.js"></script> <script src="/vendor/jquery-easing/jquery.easing.min.js"></script>
<!-- Page level plugin JavaScript--> <!-- Page level plugin JavaScript-->
<script src="vendor/chart.js/Chart.min.js"></script> <script src="/vendor/chart.js/Chart.min.js"></script>
<!-- Custom scripts for all pages--> <!-- Custom scripts for all pages-->
<script src="js/sb-admin.min.js"></script> <script src="/js/sb-admin.min.js"></script>
<!-- Demo scripts for this page--> <!-- Demo scripts for this page-->
<script src="js/demo/chart-area-demo.js"></script> <script src="/js/demo/chart-area-demo.js"></script>
<script src="js/demo/chart-bar-demo.js"></script> <script src="/js/demo/chart-bar-demo.js"></script>
<script src="js/demo/chart-pie-demo.js"></script> <script src="/js/demo/chart-pie-demo.js"></script>

18
templates/lost.php
View file

@ -26,7 +26,7 @@
Insert Item into DB Insert Item into DB
</div> </div>
<div class="card-body"> <div class="card-body">
<form id="lost_form" method="POST" action="action.php?action=lost"> <form method="POST" action="/action.php?action=lost">
<p><input type="text" class="form-control" placeholder="WANN" name="wann" value="<?php echo date("Y-m-d H:i:s");?>"></p> <p><input type="text" class="form-control" placeholder="WANN" name="wann" value="<?php echo date("Y-m-d H:i:s");?>"></p>
<p><input type="text" class="form-control" placeholder="WO" name="wo"></p> <p><input type="text" class="form-control" placeholder="WO" name="wo"></p>
<p><input type="text" class="form-control" placeholder="WAS" name="was"></p> <p><input type="text" class="form-control" placeholder="WAS" name="was"></p>
@ -57,19 +57,19 @@
<!-- Bootstrap core JavaScript--> <!-- Bootstrap core JavaScript-->
<script src="vendor/jquery/jquery.min.js"></script> <script src="/vendor/jquery/jquery.min.js"></script>
<script src="vendor/bootstrap/js/bootstrap.bundle.min.js"></script> <script src="/vendor/bootstrap/js/bootstrap.bundle.min.js"></script>
<!-- Core plugin JavaScript--> <!-- Core plugin JavaScript-->
<script src="vendor/jquery-easing/jquery.easing.min.js"></script> <script src="/vendor/jquery-easing/jquery.easing.min.js"></script>
<!-- Page level plugin JavaScript--> <!-- Page level plugin JavaScript-->
<script src="vendor/chart.js/Chart.min.js"></script> <script src="/vendor/chart.js/Chart.min.js"></script>
<!-- Custom scripts for all pages--> <!-- Custom scripts for all pages-->
<script src="js/sb-admin.min.js"></script> <script src="/js/sb-admin.min.js"></script>
<!-- Demo scripts for this page--> <!-- Demo scripts for this page-->
<script src="js/demo/chart-area-demo.js"></script> <script src="/js/demo/chart-area-demo.js"></script>
<script src="js/demo/chart-bar-demo.js"></script> <script src="/js/demo/chart-bar-demo.js"></script>
<script src="js/demo/chart-pie-demo.js"></script> <script src="/js/demo/chart-pie-demo.js"></script>

18
templates/neo-tinder.php
View file

@ -26,7 +26,7 @@
Insert Item into DB Insert Item into DB
</div> </div>
<div class="card-body"> <div class="card-body">
<form method="POST" action="action.php?action=tinder"> <form method="POST" action="/action.php?action=tinder">
<p> <p>
<select class="form-control" placeholder="FUND-ID" name="found" > <select class="form-control" placeholder="FUND-ID" name="found" >
<?php <?php
@ -66,19 +66,19 @@
<!-- Bootstrap core JavaScript--> <!-- Bootstrap core JavaScript-->
<script src="vendor/jquery/jquery.min.js"></script> <script src="/vendor/jquery/jquery.min.js"></script>
<script src="vendor/bootstrap/js/bootstrap.bundle.min.js"></script> <script src="/vendor/bootstrap/js/bootstrap.bundle.min.js"></script>
<!-- Core plugin JavaScript--> <!-- Core plugin JavaScript-->
<script src="vendor/jquery-easing/jquery.easing.min.js"></script> <script src="/vendor/jquery-easing/jquery.easing.min.js"></script>
<!-- Page level plugin JavaScript--> <!-- Page level plugin JavaScript-->
<script src="vendor/chart.js/Chart.min.js"></script> <script src="/vendor/chart.js/Chart.min.js"></script>
<!-- Custom scripts for all pages--> <!-- Custom scripts for all pages-->
<script src="js/sb-admin.min.js"></script> <script src="/js/sb-admin.min.js"></script>
<!-- Demo scripts for this page--> <!-- Demo scripts for this page-->
<script src="js/demo/chart-area-demo.js"></script> <script src="/js/demo/chart-area-demo.js"></script>
<script src="js/demo/chart-bar-demo.js"></script> <script src="/js/demo/chart-bar-demo.js"></script>
<script src="js/demo/chart-pie-demo.js"></script> <script src="/js/demo/chart-pie-demo.js"></script>

24
templates/page.php
View file

@ -20,16 +20,16 @@
<title>C3CLOC - Tables</title> <title>C3CLOC - Tables</title>
<!-- Bootstrap core CSS--> <!-- Bootstrap core CSS-->
<link href="../vendor/bootstrap/css/bootstrap.min.css" rel="stylesheet"> <link href="/vendor/bootstrap/css/bootstrap.min.css" rel="stylesheet">
<!-- Custom fonts for this template--> <!-- Custom fonts for this template-->
<link href="../vendor/fontawesome-free/css/all.min.css" rel="stylesheet" type="text/css"> <link href="/vendor/fontawesome-free/css/all.min.css" rel="stylesheet" type="text/css">
<!-- Page level plugin CSS--> <!-- Page level plugin CSS-->
<link href="../vendor/datatables/dataTables.bootstrap4.css" rel="stylesheet"> <link href="/vendor/datatables/dataTables.bootstrap4.css" rel="stylesheet">
<!-- Custom styles for this template--> <!-- Custom styles for this template-->
<link href="../css/sb-admin.css" rel="stylesheet"> <link href="/css/sb-admin.css" rel="stylesheet">
</head> </head>
@ -37,7 +37,7 @@
<nav class="navbar navbar-expand navbar-dark bg-dark static-top"> <nav class="navbar navbar-expand navbar-dark bg-dark static-top">
<a class="navbar-brand mr-1" href="../demo/index.html">C3CLOC L&F</a> <a class="navbar-brand mr-1" href="/">C3CLOC L&F</a>
<button class="btn btn-link btn-sm text-white order-1 order-sm-0" id="sidebarToggle" href="#"> <button class="btn btn-link btn-sm text-white order-1 order-sm-0" id="sidebarToggle" href="#">
<i class="fas fa-bars"></i> <i class="fas fa-bars"></i>
@ -153,21 +153,21 @@
</div> </div>
<!-- Bootstrap core JavaScript--> <!-- Bootstrap core JavaScript-->
<script src="../vendor/jquery/jquery.min.js"></script> <script src="/vendor/jquery/jquery.min.js"></script>
<script src="../vendor/bootstrap/js/bootstrap.bundle.min.js"></script> <script src="/vendor/bootstrap/js/bootstrap.bundle.min.js"></script>
<!-- Core plugin JavaScript--> <!-- Core plugin JavaScript-->
<script src="../vendor/jquery-easing/jquery.easing.min.js"></script> <script src="/vendor/jquery-easing/jquery.easing.min.js"></script>
<!-- Page level plugin JavaScript--> <!-- Page level plugin JavaScript-->
<script src="../vendor/datatables/jquery.dataTables.js"></script> <script src="/vendor/datatables/jquery.dataTables.js"></script>
<script src="../vendor/datatables/dataTables.bootstrap4.js"></script> <script src="/vendor/datatables/dataTables.bootstrap4.js"></script>
<!-- Custom scripts for all pages--> <!-- Custom scripts for all pages-->
<script src="../js/sb-admin.min.js"></script> <script src="/js/sb-admin.min.js"></script>
<!-- Demo scripts for this page--> <!-- Demo scripts for this page-->
<script src="../js/demo/datatables-demo.js"></script> <script src="/js/demo/datatables-demo.js"></script>
</body> </body>

16
templates/request.php
View file

@ -68,19 +68,19 @@
<!-- Bootstrap core JavaScript--> <!-- Bootstrap core JavaScript-->
<script src="vendor/jquery/jquery.min.js"></script> <script src="/vendor/jquery/jquery.min.js"></script>
<script src="vendor/bootstrap/js/bootstrap.bundle.min.js"></script> <script src="/vendor/bootstrap/js/bootstrap.bundle.min.js"></script>
<!-- Core plugin JavaScript--> <!-- Core plugin JavaScript-->
<script src="vendor/jquery-easing/jquery.easing.min.js"></script> <script src="/vendor/jquery-easing/jquery.easing.min.js"></script>
<!-- Page level plugin JavaScript--> <!-- Page level plugin JavaScript-->
<script src="vendor/chart.js/Chart.min.js"></script> <script src="/vendor/chart.js/Chart.min.js"></script>
<!-- Custom scripts for all pages--> <!-- Custom scripts for all pages-->
<script src="js/sb-admin.min.js"></script> <script src="/js/sb-admin.min.js"></script>
<!-- Demo scripts for this page--> <!-- Demo scripts for this page-->
<script src="js/demo/chart-area-demo.js"></script> <script src="/js/demo/chart-area-demo.js"></script>
<script src="js/demo/chart-bar-demo.js"></script> <script src="/js/demo/chart-bar-demo.js"></script>
<script src="js/demo/chart-pie-demo.js"></script> <script src="/js/demo/chart-pie-demo.js"></script>

14
templates/sidebar.php
View file

@ -15,43 +15,43 @@
</a> </a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" href="/?page=table"> <a class="nav-link" href="/table/">
<i class="fas fa-fw fa-archive"></i> <i class="fas fa-fw fa-archive"></i>
<span>Found Items</span> <span>Found Items</span>
</a> </a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" href="/?page=insert"> <a class="nav-link" href="/insert/">
<i class="fas fa-fw fa-plus"></i> <i class="fas fa-fw fa-plus"></i>
<span>Found</span> <span>Found</span>
</a> </a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" href="/?page=losttable"> <a class="nav-link" href="/losttable/">
<i class="fas fa-fw fa-archive"></i> <i class="fas fa-fw fa-archive"></i>
<span>Lost Items</span> <span>Lost Items</span>
</a> </a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" href="/?page=lost"> <a class="nav-link" href="/lost/">
<i class="fas fa-fw fa-plus"></i> <i class="fas fa-fw fa-plus"></i>
<span>Lost</span> <span>Lost</span>
</a> </a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" href="/?page=matches"> <a class="nav-link" href="/matches/">
<i class="fas fa-fw fa-check"></i> <i class="fas fa-fw fa-check"></i>
<span>Matches</span> <span>Matches</span>
</a> </a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" href="/?page=tinder"> <a class="nav-link" href="/tinder/">
<i class="fas fa-fw fa-comments"></i> <i class="fas fa-fw fa-comments"></i>
<span>Tinder</span> <span>Tinder</span>
</a> </a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" href="/?page=neo-tinder"> <a class="nav-link" href="/neo-tinder/">
<i class="fas fa-fw fa-comments"></i> <i class="fas fa-fw fa-comments"></i>
<span>NeoTinder</span> <span>NeoTinder</span>
</a> </a>

18
templates/tinder.php
View file

@ -26,7 +26,7 @@
Insert Item into DB Insert Item into DB
</div> </div>
<div class="card-body"> <div class="card-body">
<form method="POST" action="action.php?action=tinder"> <form method="POST" action="/action.php?action=tinder">
<p><input type="text" class="form-control" placeholder="FUND-ID" name="found"></p> <p><input type="text" class="form-control" placeholder="FUND-ID" name="found"></p>
<p><input type="text" class="form-control" placeholder="SUCH-ID" name="lost"></p> <p><input type="text" class="form-control" placeholder="SUCH-ID" name="lost"></p>
<p><input type="submit" class="form-control"></p> <p><input type="submit" class="form-control"></p>
@ -44,19 +44,19 @@
<!-- Bootstrap core JavaScript--> <!-- Bootstrap core JavaScript-->
<script src="vendor/jquery/jquery.min.js"></script> <script src="/vendor/jquery/jquery.min.js"></script>
<script src="vendor/bootstrap/js/bootstrap.bundle.min.js"></script> <script src="/vendor/bootstrap/js/bootstrap.bundle.min.js"></script>
<!-- Core plugin JavaScript--> <!-- Core plugin JavaScript-->
<script src="vendor/jquery-easing/jquery.easing.min.js"></script> <script src="/vendor/jquery-easing/jquery.easing.min.js"></script>
<!-- Page level plugin JavaScript--> <!-- Page level plugin JavaScript-->
<script src="vendor/chart.js/Chart.min.js"></script> <script src="/vendor/chart.js/Chart.min.js"></script>
<!-- Custom scripts for all pages--> <!-- Custom scripts for all pages-->
<script src="js/sb-admin.min.js"></script> <script src="/js/sb-admin.min.js"></script>
<!-- Demo scripts for this page--> <!-- Demo scripts for this page-->
<script src="js/demo/chart-area-demo.js"></script> <script src="/js/demo/chart-area-demo.js"></script>
<script src="js/demo/chart-bar-demo.js"></script> <script src="/js/demo/chart-bar-demo.js"></script>
<script src="js/demo/chart-pie-demo.js"></script> <script src="/js/demo/chart-pie-demo.js"></script>