From 6c64c85602c1a46ab988aea1d5c73109acd808ff Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Thu, 6 Dec 2018 11:53:37 +0530
Subject: [PATCH] roll no in new reg report

---
 Apollo/api/application/models/Reports_model.php     | 10 ++++++++--
 Apollo/assets/views/report_application_pending.html |  2 ++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Apollo/api/application/models/Reports_model.php b/Apollo/api/application/models/Reports_model.php
index 2a52dd20..358c9c53 100755
--- a/Apollo/api/application/models/Reports_model.php
+++ b/Apollo/api/application/models/Reports_model.php
@@ -542,7 +542,7 @@ left join BalFees bal on bal.student=sms.sid and bal.feestype=sms.cid and bal.se
       ifnull(STU_COUR.EnrollmentID,'-') as EnrollmentNumber,
       CFD.Sem_Year as Sem_Year,
       RD.RegistrationType as FormType,
-      STU.StudentID as Student_id
+      STU.StudentID as Student_id,sfs.RollNo as StudentRollNo
 FROM T_ApplicationFormStatus AS APFS 
 LEFT JOIN T_Registration_Details AS RD ON RD.ID = APFS.Registration_Details_ID
 LEFT JOIN T_PickListDetails AS PKL ON PKL.ListCode =  APFS.ListCode  
@@ -552,10 +552,16 @@ LEFT JOIN T_Student_CourseDetails AS STU_COUR ON STU_COUR.StudentID = RD.Student
 LEFT JOIN T_Course_Fees_Details AS CFD ON CFD.ID = RD.FeeType
 LEFT JOIN T_UniversityMaster AS UNIV ON UNIV.UniversityID = COUR.UniversityID
 LEFT JOIN (SELECT FeesId AS FeeID, min(CreatedOn), BillDate AS BILL  FROM T_Students_Fees_PaidDetails GROUP BY FeesId) AS sfpd ON sfpd.FeeID = RD.Student_Fee_Status_Id
+LEFT JOIN T_Students_Fees_Status as sfs ON sfs.FeesID=sfpd.FeeID
 where  STU.IsActive = '1' and APFS.ID in (select max(ID) from T_ApplicationFormStatus group by Registration_Details_ID)
 
  ";
 
+
+ //sfs.RollNo as StudentRollNo
+
+// LEFT JOIN T_Students_Fees_Status as sfs ON sfs.FeesID=sfpd.FeeID
+
 // SELECT * FROM (SELECT   APFS.Registration_Details_ID AS regid,      APFS.ListCode AS StatusCode,       APFS.AppFormDate AS StatusUpdationOn,       APFS.Comments AS StatusComments,      PKL.ListName AS StatusName,      concat(STU.Firstname,' ', STU.Lastname) AS StudentName,      STU.Fathername AS FatherName,      STU.MobileNumber AS Phone_number,      COUR.CourseName AS CourseName,      UNIV.UniversityName AS UniversityName,      sfpd.BILL AS InitialPayDate,      RD.Student_Fee_Status_Id AS FeesStatusID,      STU_COUR.EnrollmentID AS EnrollmentNumber,      CFD.Sem_Year AS Sem_Year,      RD.RegistrationType AS FormType,      STU.StudentID
 // FROM T_ApplicationFormStatus AS APFS LEFT JOIN T_Registration_Details AS RD ON RD.ID = APFS.Registration_Details_ID
 // LEFT JOIN T_PickListDetails AS PKL ON PKL.ListCode =  APFS.ListCode  LEFT JOIN T_StudentDetails AS STU ON STU.StudentID = RD.StudentID LEFT JOIN T_CourseMaster AS COUR ON COUR.CourseID = RD.CourseID LEFT JOIN T_Student_CourseDetails AS STU_COUR ON STU_COUR.StudentID = RD.StudentID AND STU_COUR.CourseID = RD.CourseID
@@ -644,7 +650,7 @@ STU.AlternateNumber as AlternateNumber,
 STU.PermanentAddress as address,
 ifnull(STU_COUR.EnrollmentID,'-') as eid,
 COUR.CourseName as Course_name,
-UNIV.UniversityName as University
+UNIV.UniversityName as University,ifnull(sfs.RollNo,'-') as StudentRollNo 
 from T_ApplicationStatus a
 left join T_Students_Fees_Status sfs on sfs.StudentID = a.StudentID and sfs.CourseID = a.CourseID
 left join (SELECT StudentID,FeesId AS FeesID, min(CreatedOn), BillDate AS bill  FROM T_Students_Fees_PaidDetails GROUP BY FeesId) as sfp on sfp.StudentID = sfs.StudentID and sfp.FeesID = sfs.FeesID
diff --git a/Apollo/assets/views/report_application_pending.html b/Apollo/assets/views/report_application_pending.html
index 2b52d00c..af216168 100755
--- a/Apollo/assets/views/report_application_pending.html
+++ b/Apollo/assets/views/report_application_pending.html
@@ -103,6 +103,7 @@
                         <th>SL.No</th>
                         <th style=" white-space: pre-wrap;text-align:left;width: 100px;"!important>Initital Payment Date</th>
                         <th>Enrollment ID</th>
+                        <th>RollNo</th>
                         <th>Student Name</th>
                         <th>Father Name</th>
                         <th>Course</th>
@@ -123,6 +124,7 @@
                         <td>{{p.SL_NO}}</td>
                         <td>{{p.InitialPayDate}}</td>
                         <td>{{p.EnrollmentNumber}}</td>
+                        <td>{{p.StudentRollNo}}</td>
                         <td><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.Student_name}}</a></td>
                         <td>{{p.FatherName}}</td>
                         <td>{{p.Course_name}}</td>