From 713268de561b9e02175de1239a4f66e701b83ee3 Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Tue, 24 Apr 2018 17:03:40 +0530
Subject: [PATCH] day book approval

---
 api/application/models/DayBook_model.php  | 5 +++--
 assets/views/daybook/dayBookApproval.html | 6 ++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/api/application/models/DayBook_model.php b/api/application/models/DayBook_model.php
index e0e9f2e..7b2d32c 100755
--- a/api/application/models/DayBook_model.php
+++ b/api/application/models/DayBook_model.php
@@ -127,8 +127,9 @@ class DayBook_model extends CI_Model
             AND '$toDate' AND t1.BranchCode = '$reqpayType' AND t1.Status NOT IN ('Approved', 'Cancel') ORDER BY ORDER_ID DESC";
         } 
         else {   $reqpayType = $reqDataBy['localBranchID'];
-            $querys = "SELECT t1.ID as ORDER_ID, t1.*, t2.ListName, t3.TypeName, t5.Firstname as Approved_by_name FROM ".DAYBOOKMASTER." as t1 LEFT JOIN ".PICK_LIST_DETAILS." as t2 ON t2.ListCode = t1.Name LEFT JOIN ".INCOMEOUTCOMEMASTER." as t3 ON t3.ID = t1.Type 
-            LEFT JOIN ".LOGIN." as t4 ON t4.ID = t1.Approval_By LEFT JOIN ".STAFF." as t5 ON t5.StaffID = t4.StaffID
+            $querys = "SELECT t1.ID as ORDER_ID, t1.*, t2.ListName, t3.TypeName, t5.Firstname as Approved_by_name,t7.UniversityName as UniversityName, t6.CourseName as CourseName FROM ".DAYBOOKMASTER." as t1 LEFT JOIN ".PICK_LIST_DETAILS." as t2 ON t2.ListCode = t1.Name LEFT JOIN ".INCOMEOUTCOMEMASTER." as t3 ON t3.ID = t1.Type 
+            LEFT JOIN ".LOGIN." as t4 ON t4.ID = t1.Approval_By LEFT JOIN ".STAFF." as t5 ON t5.StaffID = t4.StaffID LEFT JOIN ".COURSE." as t6 ON t6.CourseID = t1.CourseID
+              LEFT JOIN ".UNIVERSITY." as t7 ON t7.UniversityID = t6.UniversityID
             WHERE t1.BranchCode = '$reqpayType' AND t1.Status NOT IN ('Approved', 'Cancel') ORDER BY ORDER_ID DESC";
             
         }
diff --git a/assets/views/daybook/dayBookApproval.html b/assets/views/daybook/dayBookApproval.html
index 8d1a1a3..22904bf 100755
--- a/assets/views/daybook/dayBookApproval.html
+++ b/assets/views/daybook/dayBookApproval.html
@@ -212,6 +212,10 @@
                                                         <th ng-click="sort('PaidTo')">Paid To / Received From
                                                             <!--<span class="glyphicon sort-icon" ng-show="sortKey=='PaidTo'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
                                                         </th>
+
+                                                        <th>Sem/Course/University
+                                                        <!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
+                                                        </th> 
                                                         <th>Description/Comments
                                                             <!--<span class="glyphicon sort-icon" ng-show="sortKey=='PaidTo'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
                                                         </th>
@@ -240,6 +244,8 @@
                                                         <td>{{p.ListName}}</td>
                                                         <td>{{p.VoucherNumber}}</td>
                                                         <td>{{p.PaidTo}}</td>
+
+                                                         <td> {{p.FeePaymentDetails}}<br>{{p.CourseName}} <br> {{p.UniversityName}}</td>
                                                         <td>
                                                             <div id="containersPara">
                                                                 <div id="wrapper">