From bc58489d7662fb3ff78ace8a7f0216da8b02c5fb Mon Sep 17 00:00:00 2001
From: Sanjeev <sanjeev.p@venbainfotech.com>
Date: Thu, 17 Dec 2020 11:11:46 +0530
Subject: [PATCH] Yesterday report issues : ps

---
 Apollo/api/application/models/Reports_model.php        | 1 +
 Apollo/api/application/models/StatusUpdation_model.php | 4 ++--
 Apollo/assets/views/report_certificate_status.html     | 2 +-
 Apollo/assets/views/stafflead.html                     | 6 ++++--
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Apollo/api/application/models/Reports_model.php b/Apollo/api/application/models/Reports_model.php
index f02dcd9d..a073401b 100755
--- a/Apollo/api/application/models/Reports_model.php
+++ b/Apollo/api/application/models/Reports_model.php
@@ -1022,6 +1022,7 @@ LEFT JOIN BalFees AS BALFEE ON BALFEE.student = sfs.StudentID AND BALFEE.feestyp
             BillAmount AS BillAmount
     FROM
         T_Students_Fees_PaidDetails
+    WHERE IsActive = '1'
     GROUP BY FeesId) AS sfpd ON sfpd.FeeID = sfs.FeesID
 WHERE
     STU.IsActive = '1'
diff --git a/Apollo/api/application/models/StatusUpdation_model.php b/Apollo/api/application/models/StatusUpdation_model.php
index 0fc6b643..c9f446a0 100755
--- a/Apollo/api/application/models/StatusUpdation_model.php
+++ b/Apollo/api/application/models/StatusUpdation_model.php
@@ -1111,12 +1111,12 @@ $this->db->insert_batch('T_BroadcastStatus', $data);
         $courseId = $reqData['courseId'];
         // echo $studentId;exit();
         // $searchTableFor = APPLICATION_FORM;
-        $this->db->select('t1.ID, t2.BatchCode, t2.FeeType as SemID, CFD.Sem_Year as Sem_Year, t2.RegistrationMode, t2.RegistrationType, t1.AppFormDate as StatusUpdateDate,t3.ListName ,t1.Comments');
+        $this->db->select('t1.ID, t2.BatchCode, t2.FeeType as SemID, CFD.Sem_Year as Sem_Year, t2.RegistrationMode, t2.RegistrationType, t1.AppFormDate as StatusUpdateDate,if(t3.ListCode = "U001","-",t3.ListName) as ListName ,t1.Comments');
         $this->db->from('T_ApplicationFormStatus as t1');
         $this->db->join('T_Registration_Details as t2', 't2.ID = t1.Registration_Details_ID');
         $this->db->join('T_Course_Fees_Details as CFD', 'CFD.ID = t2.FeeType');
         $this->db->join('' . PICK_LIST_DETAILS . ' as t3', 't3.ListCode = t1.ListCode', 'LEFT');
-           
+        $this->db->join('T_Students_Fees_Status as SFS','SFS.FeesID = t2.Student_Fee_Status_Id');      
         $this->db->where('t2.StudentID', $studentId);
         $this->db->where('t2.CourseID', $courseId);
         $this->db->group_by('t1.ID');
diff --git a/Apollo/assets/views/report_certificate_status.html b/Apollo/assets/views/report_certificate_status.html
index 7c5edaed..8caf7f6c 100755
--- a/Apollo/assets/views/report_certificate_status.html
+++ b/Apollo/assets/views/report_certificate_status.html
@@ -185,7 +185,7 @@ td,th {
                         <td style="text-align:right;">{{p.balance || "0"}}</td>
                         <td>{{p.lcode === "U001" ? "-" : p.STATUS}}</td>
                         <td>{{p.certname}}</td>
-                        <td>{{p.Courier_Details}}</td>
+                        <td class="with-newlines">{{p.Courier_Details}}</td>
                         <td style="max-width: 120px;white-space: pre-wrap;  word-wrap: break-word !important;">{{p.acmts}}</td>                      
                         <td>{{p.adate | date :'dd-MM-yyyy'}}</td>
                     </tr>
diff --git a/Apollo/assets/views/stafflead.html b/Apollo/assets/views/stafflead.html
index a755969d..07f3d517 100644
--- a/Apollo/assets/views/stafflead.html
+++ b/Apollo/assets/views/stafflead.html
@@ -84,7 +84,9 @@
                         
                     </tr>
                 </thead> 
-                <tbody dir-paginate="p in SatffCountDetails|filter:search:strict">
+                
+                <!-- <tbody dir-paginate="p in SatffCountDetails|filter:search:strict|itemsPerPage:10"> -->
+                <tbody dir-paginate="p in SatffCountDetails|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10">
                     
                     <tr >
                         <td>{{p.SL_NO}}</td>
@@ -105,7 +107,7 @@
 
                 
             </table>
-<dir-pagination-controls direction-links="true" boundary-links="true">
+<dir-pagination-controls max-size="10" direction-links="true" boundary-links="true">
 </dir-pagination-controls>
 </div>