Skip to content

Commit

Permalink
Revert Changes & Update Readme
Browse files Browse the repository at this point in the history
Changed ReadMe to new email address.
Replaced missing null object check on lookup.php
Changed sv.php to double click.
  • Loading branch information
MPZinke committed Mar 13, 2019
1 parent 9137349 commit 6171742
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ Operational Software for any fablab or makerspace

FabApp was designed as a scaleable system to address the specific needs of the UTA FabLab, but also built as an open source project to address future problems and the needs of makersapces around the world. This system is the underlying software that supports OctoPuppet, a 3D printer manager, and JuiceBox, an access control device for anything that is powered. [Together](https://drive.google.com/open?id=0BzhfhIHqhlx1ekFxRVc0VTBLRHc) this allows an organization to monitor all equipment, provide equipment access through training requirements, manage inventory, and store completed objects for users.

This is a project in progress and will continue to have additional functionality added over time. Currently, we are under development and on V0.90. Please stay tuned and in touch as this project reaches maturity for additional information please visit [Google Drive](https://drive.google.com/open?id=0BzhfhIHqhlx1WldacWF0d3lkYWs) for additional information for both end-users and developers.
If you have any questions you can reach me at jonathan.le2@uta.edu
This is a project in progress and will continue to have additional functionality added over time. Currently, we are under development and on V0.92. Please stay tuned and in touch as this project reaches maturity for additional information please visit [Google Drive](https://drive.google.com/open?id=0BzhfhIHqhlx1WldacWF0d3lkYWs) for additional information for both end-users and developers.
If you have any questions you can reach me at jonathan.le@mavs.uta.edu
8 changes: 4 additions & 4 deletions admin/sv.php
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
</button>
<ul class="dropdown-menu pull-right" role="menu">
<li>
<a>Click on the row to edit</a>
<a>Double Click on the row to Edit.</a>
</li>
</ul>
</div>
Expand All @@ -65,15 +65,15 @@
<thead>
<tr class="tablerow">
<th class="col-sm-2">Key</th>
<th class="col-sm-4">Value</th>
<th class="col-sm-6">Description</th>
<th class="col-sm-5">Value</th>
<th class="col-sm-5">Description</th>
</tr>
</thead>

<?php //Fetch all values in the db to generate a table
$sv_array = Site_Variables::getAll();
foreach($sv_array as $sva){
echo "<tr onclick='edit_sv(".$sva->getId().")'>";
echo "<tr ondblclick='edit_sv(".$sva->getId().")'>";
echo ("<td>".$sva->getName()."</td>");
echo ("<td style='word-wrap: break-word'>".$sva->getValue()."</td>");
echo ("<td>".$sva->getNotes()."</td>");
Expand Down
8 changes: 4 additions & 4 deletions pages/lookup.php
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@
</div>
<!-- /.panel -->
<?php } ?>
<?php if ($staff && $ticket->getStatus()->getStatus_id() == 12){ ?>
<?php if (isset($staff) && $staff->getRoleID() >= $sv['LvlOfStaff'] && $ticket->getStatus()->getStatus_id() == 12){ ?>
<div class="panel panel-default">
<div class="panel-heading">
<i class="fas fa-wrench fa-lg" title="Undo"></i> Service Ticket
Expand Down Expand Up @@ -435,7 +435,7 @@
<td>Removed On</td>
<td><?php echo $objbox->getO_end(); ?></td>
</tr>
<?php if ($staff && $staff->getRoleID() >= $sv['LvlOfStaff']){?>
<?php if (isset($staff) && $staff->getRoleID() >= $sv['LvlOfStaff']){?>
<tr>
<td>Picked Up By</td>
<td><?php
Expand Down Expand Up @@ -495,7 +495,7 @@
<!-- /.panel -->
<?php }
//Look for associated charges
if(is_object($staff) && $ticket->getAc() && (($ticket->getUser()->getOperator() == $staff->getOperator()) || $staff->getRoleID() >= $sv['LvlOfStaff']) ){?>
if(isset($staff) && $ticket->getAc() && (($ticket->getUser()->getOperator() == $staff->getOperator()) || $staff->getRoleID() >= $sv['LvlOfStaff']) ){ ?>
<div class="panel panel-default">
<div class="panel-heading">
<i class="fas fa-credit-card fa-lg"></i> Related Charges
Expand Down Expand Up @@ -645,7 +645,7 @@
<button type="button" class="close" data-dismiss="modal">&times;</button>
<h4 class="modal-title">Add Authorized Recipient</h4>
</div>
<?php if ($staff->getOperator() == $ticket->getUser()->getOperator()) { ?>
<?php if (isset($staff) && $staff->getOperator() == $ticket->getUser()->getOperator()) { ?>
<form name="aarForm" method="post" action="" onsubmit="return validateAAR()">
<div class="modal-body">
<p>Authorized the following recipient to pick up and pay for this ticket.
Expand Down

0 comments on commit 6171742

Please sign in to comment.