Skip to content

Commit 681bc72

Browse files
removing nuwanted columns
fixing the dates in return books
1 parent 49d220c commit 681bc72

File tree

2 files changed

+10
-46
lines changed

2 files changed

+10
-46
lines changed

findfine.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
$q=$_POST['searchword'] || "";
1515

16-
$sql_res="SELECT * FROM borrower INNER JOIN book_loans ON book_loans.card_no = borrower.card_no INNER JOIN fines ON book_loans.loan_id = fines.loan_id WHERE book_loans.card_no like '%$q%' or fname like '%$q%' or lname like '%$q%' ";
16+
$sql_res="SELECT *, SUM(fine_amt) AS total_fine FROM borrower INNER JOIN book_loans ON book_loans.card_no = borrower.card_no INNER JOIN fines ON book_loans.loan_id = fines.loan_id WHERE book_loans.card_no like '%$q%' or fname like '%$q%' or lname like '%$q%' GROUP BY book_loans.card_no ";
1717
$r=mysql_query($sql_res);
1818
$items = 0;
1919
?>
@@ -62,7 +62,7 @@
6262
<td width="190"> <?php echo $fine; ?></td>
6363

6464
<td align="center" class="del"><a title="EDIT" href="?addFine&card_no=<?php echo $row['card_no']; ?>&loan_id=<?php echo $row['loan_id']; ?>">Edit</a></td>
65-
65+
6666
</tr>
6767

6868

returnBooks.php

Lines changed: 8 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -269,10 +269,6 @@ function Openpen(borrowid, pageURL, title,w,h) {
269269
<td class="webkit" >Title of Books</td>
270270
<td class="webkit" >Date Due</td>
271271
<td class="webkit">Date Returned</td>
272-
<td class="webkit">Signature</td>
273-
<td class="webkit" colspan="0" align="center"><img src="icons/b_drop.png"/></td>
274-
<td class="webkit" colspan="0" align="center"><img src="icons/s_db.png" title="Penalty"/></td>
275-
276272
</tr>
277273

278274
<?php
@@ -367,7 +363,7 @@ class="trme" <?php if($borrower['status']=='Unsigned'){
367363
onclick="OpenPopUp(id,'','',800,500);" class='trnone'> <?php } ?>
368364

369365

370-
<div class="trdiv"><?php echo date_format(date_create($borrower['dateborrow']), 'M d Y h:i A'); ?></div> </a></td >
366+
<div class="trdiv"><?php echo date_format(date_create($borrower['date_out']), 'M d Y h:i A'); ?></div> </a></td >
371367
<td>
372368
<?php if($borrower['status']=="Signed"){}else{ ?>
373369
<a href="" style="margin-right:10px;" id="<?php echo $borrower['loan_id']; ?>"
@@ -386,9 +382,9 @@ class="trme" <?php if($borrower['status']=='Unsigned'){
386382

387383
</td>
388384
<td> <?php if($borrower['status']=="Signed"){}else{ ?>
389-
<a href="" style="margin-right:10px;" id="<?php echo $borrower['borrowid']; ?>"
385+
<a href="" style="margin-right:10px;" id="<?php echo $borrower['loan_id']; ?>"
390386
onclick="OpenPopUp(id,'','',700,400);" class='trnone'> <?php } ?><div class="trdiv">
391-
<?php echo date_format(date_create($borrower['duedate']), 'F j, Y '); ?>
387+
<?php echo date_format(date_create($borrower['due_date']), 'F j, Y '); ?>
392388
</div></a></td>
393389
<td> <div class="trdiv">
394390

@@ -430,7 +426,7 @@ class="trme" <?php if($borrower['status']=='Unsigned'){
430426
<?php }else{ ?>
431427
<?php if($borrower['status']=="Signed"){}else{ ?>
432428

433-
<a href="" style="margin-right:10px;" id="<?php echo $borrower['borrowid']; ?>"
429+
<a href="" style="margin-right:10px;" id="<?php echo $borrower['loan_id']; ?>"
434430
onclick="OpenPopUp(id,'','',700,400);" class='trnone'> <?php } ?>
435431

436432
<div class="trdiv">
@@ -440,42 +436,10 @@ class="trme" <?php if($borrower['status']=='Unsigned'){
440436

441437
</div>
442438
</a></td>
443-
<?php }else{ echo date_format(date_create($borrower['datereturn']), 'F j, Y'); } ?>
444-
445-
<td><?php if($_GET['id']==$borrower['borrowid']){?>
446-
<div class="trdiv">
447-
<?php if($borrower['status']=="Unsigned"){ ?>
448-
<select name="sig" >
449-
<option></option>
450-
<option value="Signed">Signed</option>
451-
</select>
452-
453-
<?php }?>
454-
<?php }else{
455-
if($borrower['status']=="Unsigned"){ ?>
456-
<div class="trdiv">
457-
<a href="" style="margin-right:10px;" id="<?php echo $borrower['borrowid']; ?>"
458-
onclick="OpenPopUp(id,'','',700,400);" class='trnone'>
459-
Unsigned </a>
460-
<?php }else{
461-
echo "<img src='images/tick.gif' height='15'/>".$borrower['status'];
462-
}
463-
}?></div></a>
464-
</td>
465-
466-
<?php if($borrower['status']=="Unsigned"){}else{ ?>
467-
<td width="30"><a href="" id="<?php echo $borrower['borrowid']; ?>" class="ass"><img src="icons/b_drop.png"/></td>
468-
<?php } ?>
469-
470-
471-
<td>
472-
473-
474-
<?php if($borrower['item']==0) {?>
475-
<a href="" id=<?php echo $borrower['borrowid']; ?> onclick="Openpen(id,'','',400,400);">
476-
<img src="icons/s_db.png" title="Penalty"/></a>
477-
<?php }else{}?>
478-
</td>
439+
<?php }else{ echo date_format(date_create($borrower['date_in']), 'F j, Y'); } ?>
440+
441+
442+
479443

480444

481445
</tr>

0 commit comments

Comments
 (0)