From 68fd0c3ee7e10cfe13e932d26adc685633973771 Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Fri, 24 Aug 2018 06:39:31 +0000
Subject: [PATCH 01/10] nav.html edited online with Bitbucket - removed upper
 case for superadmin

---
 Apollo/assets/views/partials/nav.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Apollo/assets/views/partials/nav.html b/Apollo/assets/views/partials/nav.html
index 4046ab1a..45153fc1 100755
--- a/Apollo/assets/views/partials/nav.html
+++ b/Apollo/assets/views/partials/nav.html
@@ -2,7 +2,8 @@
 
 <!-- start: Super Admin -->
 
-<ul style="text-transform: uppercase;" class="main-navigation-menu" ng-if="getLoginDash == 'superAdmin'">
+<!-- <ul style="text-transform: uppercase;" class="main-navigation-menu" ng-if="getLoginDash == 'superAdmin'"> -->
+<ul  class="main-navigation-menu" ng-if="getLoginDash == 'superAdmin'"> 
 	<li ui-sref-active="active">
 		<a ui-sref="app.dashboard">
 			<div class="item-content">

From fedf9435b01a7bc9be62da89e197b2ce0d21d5e1 Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Fri, 24 Aug 2018 07:14:53 +0000
Subject: [PATCH 02/10] en.json edited online with Bitbucket - Text changes
 done

---
 Apollo/assets/i18n/en.json | 158 ++++++++++++++++++-------------------
 1 file changed, 79 insertions(+), 79 deletions(-)

diff --git a/Apollo/assets/i18n/en.json b/Apollo/assets/i18n/en.json
index a7c8339e..3e98a564 100755
--- a/Apollo/assets/i18n/en.json
+++ b/Apollo/assets/i18n/en.json
@@ -55,125 +55,125 @@
     },
     "nav": {
       "dashboard": {
-        "MAIN": "Dashboard"
+        "MAIN": "DASHBOARD"
       },
       "master": {
         "MAIN": "SETTINGS",
-        "BRANCH": "BRANCH ",
-        "STAFF": "STAFF ",
-        "BATCH": "BATCH  ",
-        "UNIVERSITY": "UNIVERSITY",
-        "COURSE": "COURSE ",
-        "ACTIVITY": "ACTIVITY",
-        "EMPLOYEE": "EMPLOYEE",
-        "ANNOUNCEMENT": "ANNOUNCEMENT",
-        "STATUS": "STATUS",
-        "STUDENTSTATUS": "ACTIVITY STATUS",
-        "CERTIFICATETYPE": "CERTIFICATE TYPE",
-        "DAYBOOKMASTER":"INCOME/EXPENSE HEADS",
-        "CENTERMASTER": "CENTER DETAILS",
-        "SUBJECTMASTER":"SUBJECT MASTER",
-        "SESSIONMASTER":"SESSION DETAILS",
-        "SESSIONSCHEDULE": "SESSION SCHEDULE",
-        "HALLTICKET": "GENERATE HALLTICKET",
-        "REREGISTRATION":"RE REGISTRATION",
-        "ACCOUNTTYPE":"ACCOUNT TYPE"
+        "BRANCH": "Branch ",
+        "STAFF": "Staff ",
+        "BATCH": "Batches  ",
+        "UNIVERSITY": "University",
+        "COURSE": "Courses ",
+        "ACTIVITY": "Activity",
+        "EMPLOYEE": "Employee",
+        "ANNOUNCEMENT": "Announcements",
+        "STATUS": "Status",
+        "STUDENTSTATUS": "Activity-Status",
+        "CERTIFICATETYPE": "Certificate Types",
+        "DAYBOOKMASTER":"Income/Exp Heads",
+        "CENTERMASTER": "Center Details",
+        "SUBJECTMASTER":"Subjects",
+        "SESSIONMASTER":"Sessions",
+        "SESSIONSCHEDULE": "Session Schedule",
+        "HALLTICKET": "Hall Ticket",
+        "REREGISTRATION":"Re-Registration",
+        "ACCOUNTTYPE":"Account Types"
       },
 	   "report": {
         "TITLE": "REPORTS",
-        "studmatstatus": "STUDY MATERIAL STATUS ",
-        "mstatus": "MARK CARD STATUS ",
-        "certificate_status": "CERTIFICATE STATUS ",
-        "certificate_mark_status": "MARKS CARD/ CERTIFICATES - RECEIVED/ ISSUED STATUS REPORT",
-        "expense": "EXPENSE REPORT ",
-        "answer_booklets": "ANSWER BOOKLETS STATUS REPORT ",
-        "app_pending": "NEW & RE-REG FORM STATUS REPORT",
-        "doc_pending": "STUDENT DOCUMENTS PENDING REPORT",
-        "wav_ref": "WAIVER AND REFERAL REPORT",
-        "examfee": "EXAM WRITING FEE REPORT",
-        "balfee": "FEE BALANCE REPORT",
-	     	"lead": "LEAD TRACKING REPORT",   
-	    	"newreg":"NEW REG REPORT",
-        "feeCollect":"FEE COLLECTED"
+        "studmatstatus": "Study Material Status",
+        "mstatus": "Mark Cards Status",
+        "certificate_status": "Certificate Status ",
+        "certificate_mark_status": "Mark Cards / Certificates - Received / Issued",
+        "expense": "Expenses",
+        "answer_booklets": "Answer Booklets",
+        "app_pending": "New and Re-reg Form Status",
+        "doc_pending": "Student Docs Pending",
+        "wav_ref": "Waiver and Referral",
+        "examfee": "Exam Writing Fees",
+        "balfee": "Fees Balance",
+	     	"lead": "Call Tracking",   
+	    	"newreg":"New Registrations",
+        "feeCollect":"Fees Collected"
 
        
       },
       "student": {
         "MAIN": "STUDENTS",
-        "LISTING": "STUDENTS LISTING",
-        "ENROLLMENT": "STUDENT ENROLLMENT",
-        "STUDENTDETAILS": "MANAGE STUDENT DETAILS",
-        "STUDENTDETAILSADDEDIT": "MANAGE DETAILS",
+        "LISTING": "List Students",
+        "ENROLLMENT": "Enrollment",
+        "STUDENTDETAILS": "Manage",
+        "STUDENTDETAILSADDEDIT": "Manage Details",
         "status" : {
-          "MAIN": "UPDATE STATUS ",
-          "STUDYMATERIAL": "STUDY MATERIAL",
-          "ANSWERBOOKLET": "ANSWER BOOKLET",
-          "MARKCARD": "MARK CARD",
-          "CERTIFICATE" : "CERTIFICATE",
-          "APPLICATION": "APPLICATION"
+          "MAIN": "Update Status",
+          "STUDYMATERIAL": "Study Material",
+          "ANSWERBOOKLET": "Answer Booklet",
+          "MARKCARD": "Mark Cards",
+          "CERTIFICATE" : "Certificates",
+          "APPLICATION": "Application"
         }
       },
       "status": {
         "MAIN": "STATUS",
-        "APPLICATION": "APPLICATION STATUS",
-        "FEES": "FEES ",
-        "STUDENTFEES":"FEES DETAILS",
-        "CERTIFICATE": "CERTIFICATE STATUS",
-        "ANSWERBOOKLET": "ANSWER BOOKLET STATUS",
-        "STUDYMATERIAL": "STUDY MATERIAL STATUS "
+        "APPLICATION": "Application",
+        "FEES": "Fees ",
+        "STUDENTFEES":"Fees Details",
+        "CERTIFICATE": "Certificates",
+        "ANSWERBOOKLET": "Answer Booklets",
+        "STUDYMATERIAL": "Study Materials"
       },
       "login": {
         "MAIN": "Login",
-        "LOGIN": "Login Form",
-        "REGISTRATION": "Registration Form",
-        "FORGOT": "Forgot Password Form",
+        "LOGIN": "Login",
+        "REGISTRATION": "Registration",
+        "FORGOT": "Forgot Password",
         "LOCKSCREEN": "Lock Screen"
       },
       "tracking": {
         "MAIN": "CALL TRACKING",
-        "details":"ADD/VIEW LEADS",
-        "close":"CLOSED LEADS",
-        "pending":"PENDING LEADS",
-        "lead":"DAY WISE LEADS"
+        "details":"Add/View Leads",
+        "close":"Closed Leads",
+        "pending":"Pending Leads",
+        "lead":"Daywise Leads"
       },
       "daybook": {
         "MAIN": "INCOME / EXPENSE",
-        "INCOMELISTING": "INCOME LISTING",
-        "EXPENSELISTING": "EXPENSE LISTING",
-        "DAYBOOK": "DAY BOOK ",
-        "APPROVAL": "APPROVE EXPENSE",
-        "DAYBOOKDETAILS": "DAYBOOK DETAILS",
-        "DAYBOOKAPPROVAL": "DAYBOOK APPROVAL",
-        "INCOMEEXPENSEREPORT" : "PROFIT-LOSS STATEMENT",
-        "DATACORRECTION" : "DATA CORRECTION"
+        "INCOMELISTING": "Income Listing",
+        "EXPENSELISTING": "Expense Listing",
+        "DAYBOOK": "Day Book",
+        "APPROVAL": "Approve Expense",
+        "DAYBOOKDETAILS": "Daybook Details",
+        "DAYBOOKAPPROVAL": "Approve Expenses",
+        "INCOMEEXPENSEREPORT" : "Proft/Loss Statement",
+        "DATACORRECTION" : "Bills Correction"
       },
       "mydetails": {
-        "MAIN": "MY DETAILS"
+        "MAIN": "My Details"
       },
       "announcement": {
         "MAIN": "ANNOUNCEMENT",
-        "ANNOUNCEMENTLISTING": "ANNOUNCEMENT LISTING",
-        "ADDANNOUNCEMENT": "ADD ANNOUNCEMENT"
+        "ANNOUNCEMENTLISTING": "List",
+        "ADDANNOUNCEMENT": "Add"
       },
       "profile": {
-        "MAIN": "MY PROFILE"
+        "MAIN": "My Profile"
       },
       "sendSMSPage": {
-        "MAIN": "BROADCAST SMS",
-        "SENDSMS": "SEND MESSAGE",
-        "SENDSMSDETAILS": "SENT MESSAGE"
+        "MAIN": "NOTIFICATIONS",
+        "SENDSMS": "Send Message",
+        "SENDSMSDETAILS": "Sent Messages"
       },
 	  "hallTicket": {
         "MAIN": "HALL TICKET",
-        "COURSESEMESTERMAPPING": "COURSE SEMESTER MAPPING",
-		"BATCHSCHEDULE": "BATCH SCHEDULE",
-		"GENERATEHALLTICKET": "GENERATE HALLTICKET",
-		"EXAMATTENDANCE" : "EXAMINATION ATTENDANCE"
+        "COURSESEMESTERMAPPING": "Course Subject Mapping",
+		"BATCHSCHEDULE": "Schedule Batches",
+		"GENERATEHALLTICKET": "Generate HallTicket",
+		"EXAMATTENDANCE" : "Exam Attendance"
       },
       "reregistration":{
-        "MAIN":"RE REGISTRATION",
-        "REREGISTRATIONFORM":"RE REGISTRATION FORM",
-        "BATCHMOVEMENT":"PROMOTE BATCH"
+        "MAIN":"RE-REGISTRATION",
+        "REREGISTRATIONFORM":"Generate Form",
+        "BATCHMOVEMENT":"Promote Batch"
       }  
     }
   },

From 63dfe04a805850f30a07275bef236003316b98c2 Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Fri, 24 Aug 2018 07:17:54 +0000
Subject: [PATCH 03/10] nav.html edited online with Bitbucket - Subject menu
 order changed

---
 Apollo/assets/views/partials/nav.html | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Apollo/assets/views/partials/nav.html b/Apollo/assets/views/partials/nav.html
index 45153fc1..f684b758 100755
--- a/Apollo/assets/views/partials/nav.html
+++ b/Apollo/assets/views/partials/nav.html
@@ -62,7 +62,11 @@
 					<span class="title" translate="sidebar.nav.master.COURSE"> COURSE DETAILS </span>
 				</a>
 			</li>
-			
+			<li ui-sref-active="active" >
+				<a ui-sref="app.master.subjectMaster">
+					<span class="title" translate="sidebar.nav.master.SUBJECTMASTER"> SUBJECT DETAILS </span>
+				</a>
+			</li>
 			<li ui-sref-active="active">
 				<a ui-sref="app.hallTicket.semCourseMap" ng-click="checkSuperAdmin()">
 					<span class="title" translate="sidebar.nav.hallTicket.COURSESEMESTERMAPPING">COURSE SEMESTER MAPPING</span>
@@ -103,11 +107,7 @@
 					<span class="title" translate="sidebar.nav.master.CENTERMASTER"> CENTER DETAILS </span>
 				</a>
 			</li>
-			<li ui-sref-active="active" >
-				<a ui-sref="app.master.subjectMaster">
-					<span class="title" translate="sidebar.nav.master.SUBJECTMASTER"> SUBJECT DETAILS </span>
-				</a>
-			</li>
+			
 			<li ui-sref-active="active" >
 				<a ui-sref="app.master.sessionMaster">
 					<span class="title" translate="sidebar.nav.master.SESSIONMASTER"> SESSION DETAILS </span>

From d84bed35e7cff02d8e6d81b7d73a02c2499ae922 Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Fri, 24 Aug 2018 13:00:45 +0530
Subject: [PATCH 04/10] call tracking and balance fee issues in reports

---
 .../api/application/models/Reports_model.php  | 39 +++++++++++--------
 .../js/controllers/report_app_pendingCtrl.js  | 19 ++++-----
 .../js/controllers/report_balfeeCtrl.js       |  8 ++--
 .../js/controllers/report_doc_pendingCtrl.js  |  4 +-
 .../js/controllers/report_examfeeCtrl.js      |  4 +-
 .../report_markcard_certificateCtrl.js        |  3 +-
 .../controllers/report_markcard_statusCtrl.js |  4 +-
 .../report_study_material_statusCtrl.js       |  2 +-
 Apollo/assets/views/report_balance_fee.html   |  4 +-
 .../views/report_mark_certificate_status.html |  2 +-
 .../assets/views/report_markcardstatus.html   |  2 +-
 11 files changed, 50 insertions(+), 41 deletions(-)

diff --git a/Apollo/api/application/models/Reports_model.php b/Apollo/api/application/models/Reports_model.php
index 5685165d..9236c1b8 100755
--- a/Apollo/api/application/models/Reports_model.php
+++ b/Apollo/api/application/models/Reports_model.php
@@ -9,7 +9,7 @@ class Reports_model extends CI_Model
 {
     public function status($bat=null,$br=null,$u=null){
       
-        $sql = "select ifnull(sms.sid,'-') as Student_id,ifnull(scd.eid,'-') as Enrollment_id,ifnull(std.name,'-') as Student_name,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(sms.cid,'-') as Course_id,ifnull(sms.branch,'-') as Branch,ifnull(sms.date,'-') as Date,ifnull(cfd.syear,'-') as Sem_year,ifnull(sms.sem,'-') as Sem,ifnull(sfs.batch,'-') as Batch_Code,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(list.Status,'-') as Status,ifnull(((sfs.cf + sfs.stf + sfs.others)-(sfp.bamount)),0) as Balance_fee,ifnull(sfp.bdate,'-') as Initial_paid_date, ifnull(std.AlternateNumber,'-') as AlternateNumber,ifnull(std.address,'-') as address,cm.uid as univID
+        $sql = "select ifnull(sms.sid,'-') as Student_id,ifnull(scd.eid,'-') as Enrollment_id,ifnull(std.name,'-') as Student_name,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(sms.cid,'-') as Course_id,ifnull(sms.branch,'-') as Branch,ifnull(sms.date,'-') as Date,ifnull(cfd.syear,'-') as Sem_year,ifnull(sms.sem,'-') as Sem,ifnull(sfs.batch,'-') as Batch_Code,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(list.Status,'-') as Status,bal.balpayable as Balance_fee,ifnull(sfp.bdate,'-') as Initial_paid_date, ifnull(std.AlternateNumber,'-') as AlternateNumber,ifnull(std.address,'-') as address,cm.uid as univID
         from 
         (SELECT ID,StudentID as sid,CourseID as cid,ListCode as lcode,BranchCode as branch,SDate as date,Sem as sem FROM T_StudyMaterialStatus where ID in (SELECT max(ID) FROM T_StudyMaterialStatus group by StudentID,CourseID,BranchCode,Sem)
         group by sid,sem,cid,branch) as sms
@@ -35,6 +35,7 @@ order by CourseID) as cm
         left join 
         (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,FirstName as name,Fathername as father,AlternateNumber,PresentAddress as address FROM T_StudentDetails where IsActive = 1) as std on std.sid=sms.sid
 left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,EnrollmentID as eid,BranchID as branch FROM T_Student_CourseDetails) as scd on scd.sid=sms.sid 
+left join BalFees bal on bal.student=sms.sid and bal.feestype=sms.cid and bal.semyr=sms.sem
        where sms.branch = '".$br."'
         ";
        
@@ -98,7 +99,7 @@ where BranchCode = '".$br."' and BatchName = '".$batch."'";
     }
     public function markcard($bat=null,$br=null,$u=null){
        
-        $sql = "select ifnull(sms.sid,'-') as Student_id,ifnull(scd.eid,'-') as Enrollment_id,ifnull(sfs.rollno,'-') as Roll_NO,ifnull(std.name,'-') as Student_name,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(sms.cid,'-') as Course_id,ifnull(sms.cdate,'-') as Date,ifnull(cfd.syear,'-') as Sem_year,ifnull(sms.sem,'-') as Sem,ifnull(sfs.batch,'-') as Batch_code,ifnull(sms.branch,'-') as Branch_code,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(list.status,'-') as Status,ifnull(sfp.bdate,'-') as Initial_paid_date,ifnull(((sfs.cf + sfs.stf + sfs.others)-(sfp.bamount)),0) as Balance_Fee,ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber,appdate,ansdate 
+        $sql = "select ifnull(sms.sid,'-') as Student_id,ifnull(scd.eid,'-') as Enrollment_id,ifnull(sfs.rollno,'-') as Roll_NO,ifnull(std.name,'-') as Student_name,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(sms.cid,'-') as Course_id,ifnull(sms.cdate,'-') as Date,ifnull(cfd.syear,'-') as Sem_year,ifnull(sms.sem,'-') as Sem,ifnull(sfs.batch,'-') as Batch_code,ifnull(sms.branch,'-') as Branch_code,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(list.status,'-') as Status,ifnull(sfp.bdate,'-') as Initial_paid_date,bal.balpayable as Balance_Fee,ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber,appdate,ansdate 
         from 
         (SELECT c.ID,StudentID as sid,c.CourseID as cid,c.BranchCode as branch,c.ListCode as lcode,p.ListName,c.CertificationType as ctype,c.CDate as cdate,c.Sem as sem FROM T_CertificationStatus c
  left join T_PickListDetails p on p.ListCode=c.ListCode
@@ -138,6 +139,7 @@ left join T_ApplicationFormStatus afs on afs.Registration_Details_ID=rd.ID
 left join T_PickListDetails list on list.ListCode=afs.ListCode 
 left join T_Course_Fees_Details cf on cf.ID=rd.FeeType
 group by sid,sem) as apdate on apdate.sid=sms.sid and apdate.sem=cfd.syear
+left join BalFees bal on bal.student=sms.sid and bal.feestype=sms.cid and bal.semyr=sms.sem
        where std.active = 1  and sms.branch = '".$br."'  
         ";
        
@@ -168,12 +170,13 @@ group by sid,sem) as apdate on apdate.sid=sms.sid and apdate.sem=cfd.syear
     }
     public function certificate_status($bat=null,$br=null,$u=null,$from=null,$to=null){
        
-        $sql = "select sms.sid,sms.cid,sms.status,sms.adate,sms.acmts,sms.ctype,sms.certname,((sfs.cf + sfs.stf + sfs.others) - sfb.bamount) as balance,sfs.cf , sfs.stf , sfs.others,sfb.bamount,sfp.BillDate as initialPaid,ifnull(scd.eid,'-') as Enrollment_id,ifnull(std.name,'-') as Student_name,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,cm.uid as univID
+        $sql = "select sms.sid as Student_id,sms.cid,sms.status,sms.adate,sms.acmts,sms.ctype,sms.certname,balance as balance,sfp.BillDate as initialPaid,ifnull(scd.eid,'-') as Enrollment_id,ifnull(std.name,'-') as Student_name,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,cm.uid as univID,ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber
 from 
-(SELECT app.ID,app.StudentID as sid,app.CourseID as cid,app.BranchCode as branch,app.ListCode as lcode,p.ListName as status,AppDate as adate,app.Comments as acmts,CertificationType as ctype,CertificateName as certname
+(SELECT app.ID,app.StudentID as sid,app.CourseID as cid,app.BranchCode as branch,app.ListCode as lcode,p.ListName as status,AppDate as adate,app.Comments as acmts,CertificationType as ctype,CertificateName as certname,sum(bal.balpayable) as balance
 		FROM T_ApplicationStatus as app
         left join T_CertificationMaster cm on cm.CertificationID=app.CertificationType
         left join T_PickListDetails p on p.ListCode = app.ListCode
+        left join BalFees bal on bal.student=app.StudentID and bal.course=app.CourseID 
         where CertificateName not like 'APPLICATION%' and app.ID IN (SELECT max(ID) FROM T_ApplicationStatus group by        StudentID,CourseID,ListCode,BranchCode,CertificationType) 
         group by app.ID) as sms 
 left join 
@@ -202,6 +205,7 @@ left join
         (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,FirstName as name,Fathername as father,PermanentAddress as address,AlternateNumber FROM T_StudentDetails) as std on std.sid=sms.sid
 left join 
        (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,EnrollmentID as eid,BranchID as branch FROM T_Student_CourseDetails) as scd on scd.sid=sms.sid and scd.cid=sms.cid
+       
 	   where sms.branch = '".$br."'
         ";
        
@@ -223,7 +227,7 @@ left join
                 and STR_TO_DATE(sms.adate,'%d-%m-%Y') <= '".$tod."'";
         
         }
-          $sql.=" group by sms.sid,sms.cid,ctype,univID";
+          $sql.=" group by Student_id,cid,ctype";
          // echo $sql;
         $leadDet=$this->db->query($sql);
         $cert_statusDetails = $leadDet->result();
@@ -242,18 +246,19 @@ left join
        
         $sql = "select sms.ID,sms.sid,sms.cid,sms.fid,sms.sem as Sem_year,sms.certname as Certificate_name,sms.ctype,
 sms.issuedate,sms.istatus,
-sms.rcvedate,sms.rstatus,sms.acmts,((sfs.cf + sfs.stf + sfs.others) - ifnull(sfb.bamount,0)) as Balance_fee,sfs.cf , sfs.stf , sfs.others,sfb.bamount,std.name as Student_name,std.father as Father_name,std.phone as Phone_number,cm.course as course_name,cm.uname as University,mdate
+sms.rcvedate,sms.rstatus,sms.acmts,sms.balance as Balance_fee,std.name as Student_name,std.father as Father_name,std.phone as Phone_number,cm.course as course_name,cm.uname as University,mdate,ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber
 from 
-(select c.ID,c.StudentID as sid,sfs.CourseID as cid,sfs.BranchCode as branch,sfs.FeesID as fid,Sem as sem,c.CertificationType as certname,c.CertificationType as ctype,CDate as mdate,
+(select c.ID,c.StudentID as sid,sfs.CourseID as cid,sfs.BranchCode as branch,sfs.FeesID as fid,Sem as sem,c.CertificationType as certname,c.CertificationType as ctype,CDate as mdate,balpayable as balance,
 max(if(ListName = 'ISSUED TO STUDENT', CDate,'-')) as issuedate,max(if(ListName = 'ISSUED TO STUDENT', ListName,'-')) as istatus,
 max(if(ListName = 'RECEIVED', CDate,'-')) as rcvedate,max(if(ListName = 'RECEIVED', ListName,'-')) as rstatus,c.Comments as acmts
 from T_CertificationStatus c
 left join T_Students_Fees_Status sfs on sfs.FeesType=c.CourseID and sfs.StudentID=c.StudentID
 left join T_PickListDetails list on list.ListCode=c.ListCode 
+left join BalFees bal on bal.student=c.StudentID and bal.course=sfs.CourseID and bal.semyr=c.Sem
 where CDate is not null and (list.ListName like 'ISSUED TO STUDENT' or list.ListName like 'RECEIVED%' )
 group by sid,cid,sem,ctype
 union
-select a.ID,a.StudentID as sid,a.CourseID as cid,sfs.BranchCode as branch,sfs.FeesID as fid,'-' as sem,cm.CertificateName as certname,a.CertificationType as ctype,AppDate as mdate,
+select a.ID,a.StudentID as sid,a.CourseID as cid,sfs.BranchCode as branch,sfs.FeesID as fid,'-' as sem,cm.CertificateName as certname,a.CertificationType as ctype,AppDate as mdate,bal.balpayable as balance,
 max(if(ListName = 'ISSUED TO STUDENT', AppDate,'-')) as issuedate,max(if(ListName = 'ISSUED TO STUDENT', ListName,'-')) as istatus,
 max(if(ListName = 'RECEIVED', AppDate,'-')) as rcvedate,max(if(ListName = 'RECEIVED', ListName,'-')) as rstatus,a.Comments as acmts
 from T_ApplicationStatus a
@@ -261,7 +266,8 @@ left join
 T_Students_Fees_Status sfs on sfs.StudentID=a.StudentID and sfs.CourseID=a.CourseID
 left join T_CertificationMaster cm on cm.CertificationID=a.CertificationType
 left join T_PickListDetails list on list.ListCode=a.ListCode 
-where AppDate is not null and a.ID in (SELECT max(ID) FROM T_ApplicationStatus group by StudentID,CourseID,CertificationType) 
+left join (select student, course, sum(balpayable) balpayable from BalFees group by student, course) bal on bal.student=a.StudentID and bal.course=a.CourseID
+where AppDate is not null 
 group by sid,cid,ctype) as sms
 left join 
         (SELECT FeesID as fid,BatchCode as batch,StudentID as sid,CourseID as cid,FeesType as ftype,sum(CourseFees) as cf,Sum(STFOrWR) as stf,sum(Others) as others 
@@ -285,8 +291,7 @@ left join
         (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,FirstName as name,Fathername as father,PermanentAddress as address,AlternateNumber FROM T_StudentDetails) as std on std.sid=sms.sid
 left join 
        (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,EnrollmentID as eid,BranchID as branch FROM T_Student_CourseDetails) as scd on scd.sid=sms.sid and scd.cid=sms.cid
-
-        where sms.branch = '".$br."'     
+       where sms.branch = '".$br."'     
         ";
        
         if ($bat!= ''){
@@ -358,7 +363,7 @@ left join
     }
     public function answer_booklet($bat=null,$br=null,$u=null){
        
-        $sql = "select ifnull(sms.sid,'-') as Student_id,ifnull(scd.eid,'-') as Enrollment_id,ifnull(std.name,'-') as Student_name,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(sms.cid,'-') as Course_id,ifnull(sfs.batch,'-') as Batch_code,ifnull(sms.branch,'-') as Branch_code,ifnull(sms.adate,'-') as Date,ifnull(cfd.syear,'-') as Sem_year,ifnull(sms.sem,'-') as Sem,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(list.status,'-') as Status,ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber,listdate.issuedate as issuedate,listdate.rcvedate as rcvedate,ifnull(((sfs.cf + sfs.stf + sfs.others)-(sfp.bamount)),0) as balance
+        $sql = "select ifnull(sms.sid,'-') as Student_id,ifnull(scd.eid,'-') as Enrollment_id,ifnull(std.name,'-') as Student_name,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(sms.cid,'-') as Course_id,ifnull(sfs.batch,'-') as Batch_code,ifnull(sms.branch,'-') as Branch_code,ifnull(sms.adate,'-') as Date,ifnull(cfd.syear,'-') as Sem_year,ifnull(sms.sem,'-') as Sem,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(list.status,'-') as Status,ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber,listdate.issuedate as issuedate,listdate.rcvedate as rcvedate,bal.balpayable as balance
 
         from 
 			 (SELECT ID,StudentID as sid,CourseID as cid,BranchCode as branch,ListCode as lcode,AnsDate as  
@@ -398,7 +403,8 @@ max(if(ListName = 'RECEIVED FROM STUDENT', AnsDate,'-')) as rcvedate
 from T_AnswerBookletStatus abs
 left join T_PickListDetails list on list.ListCode=abs.ListCode where AnsDate is not null
 group by sid,Sem
-) as listdate on listdate.sid=sms.sid and listdate.sem=sms.sem    
+) as listdate on listdate.sid=sms.sid and listdate.sem=sms.sem 
+left join BalFees bal on bal.student=sms.sid and bal.feestype=sms.cid and bal.semyr=sms.sem   
        where std.active = 1  and sms.branch = '".$br."'  
         ";
        
@@ -449,7 +455,7 @@ group by sid,Sem
       STU_COUR.EnrollmentID as EnrollmentNumber,
       CFD.Sem_Year as Sem_Year,
       RD.RegistrationType as FormType,
-      STU.StudentID
+      STU.StudentID as Student_id
 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
 LEFT JOIN T_Course_Fees_Details AS CFD ON CFD.ID = RD.FeeType
@@ -512,7 +518,7 @@ GROUP BY x.regid";
     }
     public function doc_pending($bat=null,$br=null,$u=null){
        
-        $sql = "select ifnull(sms.sid,'-') as Student_id,ifnull(scd.eid,'-') as Enrollment_id,ifnull(std.name,'-') as Student_name,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(sfs.cid,'-') as Course_id,ifnull(sfs.batch,'-') as Batch_code,ifnull(sfs.branch,'-') as Branch_code,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(sms.status,'-') as Status,sms.certname as certname,ifnull(sfp.bdate,'-') as Admission_date,sms.follow_date as fdate
+        $sql = "select ifnull(sms.sid,'-') as Student_id,ifnull(scd.eid,'-') as Enrollment_id,ifnull(std.name,'-') as Student_name,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(sfs.cid,'-') as Course_id,ifnull(sfs.batch,'-') as Batch_code,ifnull(sfs.branch,'-') as Branch_code,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(sms.status,'-') as Status,sms.certname as certname,ifnull(sfp.bdate,'-') as Admission_date,sms.follow_date as fdate,ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber
         from 
 			 (select StudentID as sid,Details as certname,DocumentDate as follow_date,StatusName as status
 from T_Student_DocumentTrack_Details
@@ -686,7 +692,7 @@ left join
     }
     public function balfee($bat=null,$br=null,$u=null){
        
-        $sql = "SELECT  ifnull(sfp.StudentID,'-') as Student_id,scd.EnrollmentID as eid,sfs.CourseID as cid,std.MobileNumber as Phone_number,FirstName as Student_name,Fathername as Father_name,PermanentAddress as address,AlternateNumber,date_format(std.CreatedOn,'%d-%m-%Y') as regdate,cm.CourseName as Course_name,u.UniversityName as University,sfp.FeesID as fid,(CourseFees + STFOrWR + Others) as Total,ifnull((sfp.BillAmount),0) as Paid_fee,((CourseFees + STFOrWR + Others) - sfp.BillAmount) as balance,cfd.Sem_Year as Sem_year,std.PermanentAddress as address,std.AlternateNumber as AlternateNumber,
+        $sql = "SELECT  ifnull(sfp.StudentID,'-') as Student_id,scd.EnrollmentID as eid,sfs.CourseID as cid,std.MobileNumber as Phone_number,FirstName as Student_name,Fathername as Father_name,PermanentAddress as address,AlternateNumber,date_format(std.CreatedOn,'%d-%m-%Y') as regdate,cm.CourseName as Course_name,u.UniversityName as University,sfp.FeesID as fid,(sfs.CourseFees + sfs.STFOrWR + sfs.Others) as Total,ifnull((sum(sfp.BillAmount)),0) as Paid_fee,sfs.CourseFees , sfs.STFOrWR , sfs.Others,((sfs.CourseFees + sfs.STFOrWR + sfs.Others) - sfp.BillAmount) as balance,bal.balpayable as bal,cfd.Sem_Year as Sem_year,std.PermanentAddress as address,std.AlternateNumber as AlternateNumber,
         ifnull(MAX(CASE WHEN Installment = 1 THEN sfp.BillNO END),'-') as billno1,
         ifnull(MAX(CASE WHEN Installment = 1 THEN sfp.BillAmount END),0) as billamt1,
         ifnull(MAX(CASE WHEN Installment = 2 THEN sfp.BillNO END),'-') as billno2,
@@ -715,6 +721,7 @@ left join
         left join T_UniversityMaster u on u.UniversityID=cm.UniversityID
         left join T_StudentDetails std on std.StudentID=sfp.StudentID and std.IsActive = 1
         left join T_Student_CourseDetails scd on scd.StudentID=sfs.StudentID and scd.CourseID=sfs.CourseID
+        left join BalFees as bal on bal.student=sfp.StudentID and bal.course=sfs.CourseID and bal.semyr=cfd.Sem_Year
         where sfp.IsActive = 1 and sfp.UpdatedBy = '".$br."' 
 
    ";
diff --git a/Apollo/assets/js/controllers/report_app_pendingCtrl.js b/Apollo/assets/js/controllers/report_app_pendingCtrl.js
index c20f334f..93ca7955 100755
--- a/Apollo/assets/js/controllers/report_app_pendingCtrl.js
+++ b/Apollo/assets/js/controllers/report_app_pendingCtrl.js
@@ -96,11 +96,12 @@ app.controller('report_app_pendingCtrl', ["$scope", "$filter","$rootScope","$mod
 		//Response data
         $scope.show = false;
         $scope.onSubmit = function (form) {
-            if($scope.univModel.university !== null){
-               $scope.filterUniv = angular.fromJson($scope.univModel.university);
-            }else {
-                $scope.filterUniv = '';
-            }
+			$scope.filterUniv = angular.fromJson($scope.univModel.university);
+            // if($scope.univModel.university !== null){
+               // $scope.filterUniv = angular.fromJson($scope.univModel.university);
+            // }else {
+                // $scope.filterUniv = '';
+            // }
 			var firstError = null;
             if (form.$invalid) {
                 var field = null, firstError = null;
@@ -150,10 +151,10 @@ app.controller('report_app_pendingCtrl', ["$scope", "$filter","$rootScope","$mod
         }
 		}
         var mystyle = {
-            sheetid: 'APPLICAITON PENDING STUDENT LIST REPORT',
+            sheetid: 'New & Re-Reg Form Status Report',
             headers: true,
             caption: {
-              title:'APPLICAITON PENDING STUDENT LIST REPORT',
+              title:'New & Re-Reg Form Status Report',
               width: '300px',
               style:'font-size:50px;' 
             },
@@ -167,7 +168,7 @@ app.controller('report_app_pendingCtrl', ["$scope", "$filter","$rootScope","$mod
         
         
         $scope.exportData = function () {
-            alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,InitialPayDate as InititalPaymentDate,EnrollmentNumber as EnrollmentID,Student_name as StudentName,FatherName as FatherName,Course_name as CourseName,Sem_Year as SemYear,CAST(Phone_number AS NUMBER) as PhoneNumber,University as University,StatusName as ApplicationPendingStatus,FormType as FormType,StatusUpdationOn as Date INTO XLS("Application_pending_student_list.xls",?) FROM ?',[mystyle,$scope.app_pending_data]);
+            alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,InitialPayDate as InititalPaymentDate,EnrollmentNumber as EnrollmentID,Student_name as StudentName,FatherName as FatherName,Course_name as CourseName,Sem_Year as SemYear,CAST(Phone_number AS NUMBER) as PhoneNumber,University as University,StatusName as ApplicationPendingStatus,FormType as FormType,StatusUpdationOn as Date INTO XLS("New_RegFormStatusReport.xls",?) FROM ?',[mystyle,$scope.app_pending_data]);
         };
 
 
@@ -299,7 +300,7 @@ app.controller('report_app_pendingCtrl', ["$scope", "$filter","$rootScope","$mod
         submit: function (form, myModel,loading,selectedStudents) {
 			var comments = [];
 			  for(var stuid=0;stuid<=selectedStudents.length-1;stuid++){
-				  comments [stuid] ="Call Tracking For Report Application Details :"+selectedStudents[stuid].Course_name + " - Status:" +selectedStudents[stuid].StatusName;
+				  comments [stuid] ="Call Tracking For Report Application Details ";
 			  }
               //console.log(selectedStudents);
             if(isNaN(myModel.date)){
diff --git a/Apollo/assets/js/controllers/report_balfeeCtrl.js b/Apollo/assets/js/controllers/report_balfeeCtrl.js
index befbaa56..89b31626 100755
--- a/Apollo/assets/js/controllers/report_balfeeCtrl.js
+++ b/Apollo/assets/js/controllers/report_balfeeCtrl.js
@@ -147,7 +147,7 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal",
                 if (response.data.balfeeList == true) {
                     $scope.balfee_data = response.data.balfee_data;
                     for(var i=0;i<$scope.balfee_data.length;i++)
-                    if($scope.balfee_data[i].balance !=0){
+                    if($scope.balfee_data[i].bal !=0){
                     $scope.balfee_data[i].SL_NO = j+1;
 					$scope.returnResultData.push($scope.balfee_data[i]);
                     j++;
@@ -183,7 +183,7 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal",
                    var totalbalance=0;
                     for(var i = 0; i < $scope.returnResultData.length; i++){
                         var item = $scope.returnResultData[i];
-                        totalbalance += parseFloat(item.balance);
+                        totalbalance += parseFloat(item.bal);
 						
                     }
 					
@@ -215,7 +215,7 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal",
         
         
         $scope.exportData = function () {
-            alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,eid as EnrollmentID,Student_name as StudentName,Father_name as FatherName,Course_name as CourseName,Sem_year as SemYear,CAST(Phone_number AS NUMBER) as PhoneNumber,University as University,regdate as RegistrationDate,CAST(Total AS NUMBER) as TotalFee,CAST(Paid_fee AS NUMBER) as FeesPaid,CAST(balance AS NUMBER) as Balance,billno1 as BillNO1,CAST(billamt1 AS NUMBER) as BillAmount1,billno2 as BillNO2,CAST(billamt2 AS NUMBER) as BillAmount2, billno3 as BillNO3, CAST(billamt3 AS NUMBER) as BillAmount3, billno4 as BillNO4, CAST(billamt4 AS NUMBER) as BillAmount4, billno5 as BillNO5,CAST(billamt5 AS NUMBER) as BillAmount5,billno6 as BillNO6,CAST(billamt6 AS NUMBER) as BillAmount6,billno7 as BillNo7,CAST(billamt7 AS NUMBER)as BillAmount7,billno8 as BillNO8,CAST(billamt8 AS NUMBER) as BillAmount8,billno9 as BillNO9,CAST(billamt9 AS NUMBER) as BillAmount9,billno10 as BillNO10,CAST(billamt10 AS NUMBER) as BillAmount10  INTO XLS("Balancefee_status.xls",?) FROM ?',[mystyle,$scope.balfee_data]);
+            alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,eid as EnrollmentID,Student_name as StudentName,Father_name as FatherName,Course_name as CourseName,Sem_year as SemYear,CAST(Phone_number AS NUMBER) as PhoneNumber,University as University,regdate as RegistrationDate,CAST(Total AS NUMBER) as TotalFee,CAST(Paid_fee AS NUMBER) as FeesPaid,CAST(bal AS NUMBER) as Balance,billno1 as BillNO1,CAST(billamt1 AS NUMBER) as BillAmount1,billno2 as BillNO2,CAST(billamt2 AS NUMBER) as BillAmount2, billno3 as BillNO3, CAST(billamt3 AS NUMBER) as BillAmount3, billno4 as BillNO4, CAST(billamt4 AS NUMBER) as BillAmount4, billno5 as BillNO5,CAST(billamt5 AS NUMBER) as BillAmount5,billno6 as BillNO6,CAST(billamt6 AS NUMBER) as BillAmount6,billno7 as BillNo7,CAST(billamt7 AS NUMBER)as BillAmount7,billno8 as BillNO8,CAST(billamt8 AS NUMBER) as BillAmount8,billno9 as BillNO9,CAST(billamt9 AS NUMBER) as BillAmount9,billno10 as BillNO10,CAST(billamt10 AS NUMBER) as BillAmount10  INTO XLS("Balancefee_status.xls",?) FROM ?',[mystyle,$scope.returnResultData]);
         };
 
 
@@ -351,7 +351,7 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal",
         submit: function (form, myModel,loading,selectedStudents) {
 			var comments = [];
 			  for(var stuid=0;stuid<=selectedStudents.length-1;stuid++){
-				  comments [stuid] ="Call Tracking For Report Balence Fee:"+selectedStudents[stuid].balance + " - RegistrationDate:" +selectedStudents[stuid].regdate;
+				  comments [stuid] ="Call Tracking For Report Balence Fee";
 			  }
               //console.log(selectedStudents);
             if(isNaN(myModel.date)){
diff --git a/Apollo/assets/js/controllers/report_doc_pendingCtrl.js b/Apollo/assets/js/controllers/report_doc_pendingCtrl.js
index c0491250..163575ca 100755
--- a/Apollo/assets/js/controllers/report_doc_pendingCtrl.js
+++ b/Apollo/assets/js/controllers/report_doc_pendingCtrl.js
@@ -246,7 +246,7 @@ app.controller('report_doc_pendingCtrl', ["$scope", "$filter","$rootScope","$mod
 			return false;
         }else{
         $scope.controller = 'ng-controller="report_doc_pendingCtrl"';
-        $scope.myModel.comments = 'Call Tracking for Document Report';
+        $scope.myModel.comments = 'Call Tracking for Document Pending Report';
         var lead = {
             method: 'POST',
             url: apiPoint.url + 'getTrackingLeadDetails/',
@@ -296,7 +296,7 @@ app.controller('report_doc_pendingCtrl', ["$scope", "$filter","$rootScope","$mod
         submit: function (form, myModel,loading,selectedStudents) {
 			var comments = [];
 			  for(var stuid=0;stuid<=selectedStudents.length-1;stuid++){
-				  comments [stuid] ="Call Tracking For Report Document Pending:"+selectedStudents[stuid].Course_name + " - Followupdate:" +selectedStudents[stuid].Followupdate;
+				  comments [stuid] ="Call Tracking For Report Document Pending";
 			  }
               //console.log(selectedStudents);
             if(isNaN(myModel.date)){
diff --git a/Apollo/assets/js/controllers/report_examfeeCtrl.js b/Apollo/assets/js/controllers/report_examfeeCtrl.js
index 5384fd15..59771a17 100755
--- a/Apollo/assets/js/controllers/report_examfeeCtrl.js
+++ b/Apollo/assets/js/controllers/report_examfeeCtrl.js
@@ -260,7 +260,7 @@ app.controller('report_examfeeCtrl', ["$scope", "$filter","$rootScope","$modal",
 			return false;
         }else{
         $scope.controller = 'ng-controller="report_examfeeCtrl"';
-        $scope.myModel.comments = 'Call Tracking for Document Report';
+        //$scope.myModel.comments = 'Call Tracking for Exam Fee Report';
         var lead = {
             method: 'POST',
             url: apiPoint.url + 'getTrackingLeadDetails/',
@@ -310,7 +310,7 @@ app.controller('report_examfeeCtrl', ["$scope", "$filter","$rootScope","$modal",
         submit: function (form, myModel,loading,selectedStudents) {
 			 var comments = [];
 			  for(var stuid=0;stuid<=selectedStudents.length-1;stuid++){
-				  comments [stuid] ="Call Tracking For Report Exam Writing Fees Details:"+selectedStudents[stuid].Course_name + " - ExamWritingFee:" +selectedStudents[stuid].ExamWritingFee;
+				  comments [stuid] ="Call Tracking For Report Exam Writing Fees Details";
 			  }
               //console.log(selectedStudents);
             if(isNaN(myModel.date)){
diff --git a/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js b/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js
index b2d7c8d8..aa27b2c7 100755
--- a/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js
+++ b/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js
@@ -213,11 +213,12 @@ app.controller('report_markcard_certificateCtrl', ["$scope", "$filter","$rootSco
         var ide = e.target;
     var val = (ide.checked ? true : false);
     var sid = e.target.id;
+	 console.log(sid);
     // console.log("328");
     // console.log($scope.balfee_data);
     angular.forEach($scope.mark_cert_data,function(value,key){
        
-        if(sid == value.Student_id)
+        if(sid == value.sid)
         {
             sid = value;
         }
diff --git a/Apollo/assets/js/controllers/report_markcard_statusCtrl.js b/Apollo/assets/js/controllers/report_markcard_statusCtrl.js
index d0331da4..42b27ea9 100755
--- a/Apollo/assets/js/controllers/report_markcard_statusCtrl.js
+++ b/Apollo/assets/js/controllers/report_markcard_statusCtrl.js
@@ -244,7 +244,7 @@ app.controller('report_markcard_statusCtrl', ["$scope", "$filter","$rootScope",
 			return false;
         }else{
         $scope.controller = 'ng-controller="report_markcard_statusCtrl"';
-        $scope.myModel.comments = 'Call Tracking for Document Report';
+        //$scope.myModel.comments = 'Call Tracking for Document Report';
         var lead = {
             method: 'POST',
             url: apiPoint.url + 'getTrackingLeadDetails/',
@@ -294,7 +294,7 @@ app.controller('report_markcard_statusCtrl', ["$scope", "$filter","$rootScope",
         submit: function (form, myModel,loading,selectedStudents) {
 			 var comments = [];
 			  for(var stuid=0;stuid<=selectedStudents.length-1;stuid++){
-				  comments [stuid] ="Call Tracking For Report MarkCard Details:"+selectedStudents[stuid].Balance_Fee + " - ApplicationDate:" +selectedStudents[stuid].appdate;
+				  comments [stuid] ="Call Tracking For Report MarkCard Details";
 			  }
               //console.log(selectedStudents);
             if(isNaN(myModel.date)){
diff --git a/Apollo/assets/js/controllers/report_study_material_statusCtrl.js b/Apollo/assets/js/controllers/report_study_material_statusCtrl.js
index b273ed7e..d9f1c1f3 100755
--- a/Apollo/assets/js/controllers/report_study_material_statusCtrl.js
+++ b/Apollo/assets/js/controllers/report_study_material_statusCtrl.js
@@ -297,7 +297,7 @@ $scope.exportExcel= function () {
         submit: function (form, myModel,loading,selectedStudents) {
 			 var comments = [];
 			  for(var stuid=0;stuid<=selectedStudents.length-1;stuid++){
-				  comments [stuid] ="Call Tracking For Study Material Status Report:"+selectedStudents[stuid].Balance_fee + " - Date:" +selectedStudents[stuid].Date;
+				  comments [stuid] ="Call Tracking For Study Material Status Report";
 			  }
             if(isNaN(myModel.date)){
                 $scope.nextFollowupDate = myModel.date;
diff --git a/Apollo/assets/views/report_balance_fee.html b/Apollo/assets/views/report_balance_fee.html
index 61ca29e3..39d2fed5 100755
--- a/Apollo/assets/views/report_balance_fee.html
+++ b/Apollo/assets/views/report_balance_fee.html
@@ -163,7 +163,7 @@
                      
                         </tr>
                     </thead>
-                    <tbody dir-paginate="p in balfee_data|filter:search:strict|itemsPerPage:itemsPerPage" current-page="currentPage">
+                    <tbody dir-paginate="p in returnResultData|filter:search:strict|itemsPerPage:itemsPerPage" current-page="currentPage">
                         <tr ng-if= "p.balance !=0">
                                 <td><input type="checkbox" ng-checked="myModel.all" id="{{p.Student_id}}" name="{{p.Student_id}}" class="form-control" ng-click="isClick($event);" /></td>
                             <td nowrap>{{p.SL_NO}}</td>
@@ -177,7 +177,7 @@
 							<td nowrap>{{p.regdate}}</td>
                             <td nowrap style="text-align:right;">{{p.Total}}</td>
                             <td nowrap style="text-align:right;">{{p.Paid_fee}}</td>
-                            <td nowrap style="text-align:right;">{{p.balance}}</td>
+                            <td nowrap style="text-align:right;">{{p.bal}}</td>
                             <td nowrap>
                                     <span ng-if="p.billno1">{{p.billno1}}</span>        
                                     <span ng-if="!p.billno1"> - </span>
diff --git a/Apollo/assets/views/report_mark_certificate_status.html b/Apollo/assets/views/report_mark_certificate_status.html
index 69b882f3..1f3c2613 100755
--- a/Apollo/assets/views/report_mark_certificate_status.html
+++ b/Apollo/assets/views/report_mark_certificate_status.html
@@ -158,7 +158,7 @@ td,th {
                 </thead>
                 <tbody dir-paginate="p in mark_cert_data|filter:search:strict|itemsPerPage:10">
                     <tr>
-                            <td><input type="checkbox" ng-checked="myModel.all" id="{{p.Student_id}}" name="{{p.Student_id}}" class="form-control" ng-click="isClick($event);" /></td>
+                            <td><input type="checkbox" ng-checked="myModel.all" id="{{p.sid}}" name="{{p.sid}}" class="form-control" ng-click="isClick($event);" /></td>
                         <td>{{p.SL_NO}}</td>
                         <td><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.Student_name}}</a></td>
                         <td>{{p.Father_name}}</td>
diff --git a/Apollo/assets/views/report_markcardstatus.html b/Apollo/assets/views/report_markcardstatus.html
index 8f26dba0..851cb631 100755
--- a/Apollo/assets/views/report_markcardstatus.html
+++ b/Apollo/assets/views/report_markcardstatus.html
@@ -128,7 +128,7 @@
                         <td>{{p.Sem_year}}({{p.Sem}})</td>
                         <td><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.Phone_number}}</a></td>
                         <td>{{p.University}}</td>
-                        <td>{{p.Balance_Fee}}</td>
+                        <td style="text-align:right;">{{p.Balance_Fee}}</td>
 						<td>{{p.appdate}}</td>
 						<td>{{p.ansdate}}</td>
                         <td>{{p.Status}}</td>

From e3df495e833a2c790a43eb3ec0cd1134b6e147b0 Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Fri, 24 Aug 2018 08:48:11 +0000
Subject: [PATCH 05/10] report_balfeeCtrl.js edited online with Bitbucket

---
 Apollo/assets/js/controllers/report_balfeeCtrl.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Apollo/assets/js/controllers/report_balfeeCtrl.js b/Apollo/assets/js/controllers/report_balfeeCtrl.js
index 89b31626..03153f14 100755
--- a/Apollo/assets/js/controllers/report_balfeeCtrl.js
+++ b/Apollo/assets/js/controllers/report_balfeeCtrl.js
@@ -351,7 +351,7 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal",
         submit: function (form, myModel,loading,selectedStudents) {
 			var comments = [];
 			  for(var stuid=0;stuid<=selectedStudents.length-1;stuid++){
-				  comments [stuid] ="Call Tracking For Report Balence Fee";
+				  comments [stuid] ="Call Tracking For Report Balance Fee";
 			  }
               //console.log(selectedStudents);
             if(isNaN(myModel.date)){

From 76fd5cc9f17eecbb2caa8830cbd06cfd803c1bfa Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Fri, 24 Aug 2018 09:05:08 +0000
Subject: [PATCH 06/10] en.json edited online with Bitbucket - menu items
 corrected

---
 Apollo/assets/i18n/en.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Apollo/assets/i18n/en.json b/Apollo/assets/i18n/en.json
index 3e98a564..281f4e89 100755
--- a/Apollo/assets/i18n/en.json
+++ b/Apollo/assets/i18n/en.json
@@ -66,7 +66,7 @@
         "COURSE": "Courses ",
         "ACTIVITY": "Activity",
         "EMPLOYEE": "Employee",
-        "ANNOUNCEMENT": "Announcements",
+        "ANNOUNCEMENT": "ANNOUNCEMENTS",
         "STATUS": "Status",
         "STUDENTSTATUS": "Activity-Status",
         "CERTIFICATETYPE": "Certificate Types",
@@ -75,8 +75,8 @@
         "SUBJECTMASTER":"Subjects",
         "SESSIONMASTER":"Sessions",
         "SESSIONSCHEDULE": "Session Schedule",
-        "HALLTICKET": "Hall Ticket",
-        "REREGISTRATION":"Re-Registration",
+        "HALLTICKET": "HALL TICKET",
+        "REREGISTRATION":"RE-REGISTRATION",
         "ACCOUNTTYPE":"Account Types"
       },
 	   "report": {
@@ -140,7 +140,7 @@
         "MAIN": "INCOME / EXPENSE",
         "INCOMELISTING": "Income Listing",
         "EXPENSELISTING": "Expense Listing",
-        "DAYBOOK": "Day Book",
+        "DAYBOOK": "DAY BOOK",
         "APPROVAL": "Approve Expense",
         "DAYBOOKDETAILS": "Daybook Details",
         "DAYBOOKAPPROVAL": "Approve Expenses",

From 1134bc5018df17a10067d3608ad23db1aad8da1c Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Fri, 24 Aug 2018 14:45:29 +0530
Subject: [PATCH 07/10] course master changes for duplication validations

---
 Apollo/assets/js/controllers/courseCtrl.js | 201 ++++++++++++---------
 Apollo/assets/views/courseDetails.html     |   4 +-
 Apollo/assets/views/editCourseDetails.html |  89 ++++++++-
 3 files changed, 207 insertions(+), 87 deletions(-)

diff --git a/Apollo/assets/js/controllers/courseCtrl.js b/Apollo/assets/js/controllers/courseCtrl.js
index 7a73d074..5d0612b5 100755
--- a/Apollo/assets/js/controllers/courseCtrl.js
+++ b/Apollo/assets/js/controllers/courseCtrl.js
@@ -207,49 +207,66 @@ app.controller('courseCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab
 
                  }
                  else{
-                     $scope.ldloading1 = {};
 
-                     $scope.ldloading1[loading.replace('-', '_')] = true;
+                     /* check duplication objects values */
+                     if(semYearModel.program=='Y001'){
+                         $scope.myModelSemYear.programName="";
+                         $scope.myModelSemYear.FeesAmount="";
+                         var valueArr = $scope.addMoreItems.map(function(item){ return item.programName });
+                         var isDuplicate = valueArr.some(function(item, idx){
+                             return valueArr.indexOf(item) != idx;
+                         });
+                     }
+                     if(semYearModel.program=='Y001' && isDuplicate==true){
+
+                         swal("Warning!", 'Sem/Year Duplication  ', "warning");
+                     }
+                     else{
+                         $scope.ldloading1 = {};
+
+                         $scope.ldloading1[loading.replace('-', '_')] = true;
 
 
-                     var addCourse = {
-                         method: 'POST',
-                         url: apiPoint.url + 'addCourseDetails/',
-                         headers: {
-                             'Content-Type': 'application/json'
-                         },
-                         data: {
-                             courseCode: myModel.courseCode,
-                             courseName: myModel.courseName,
-                             universityName: myModel.universityName,
-                             feesType:myModel.ListName.ListCode,
-                             status: myModel.switchsetting,
-                             provFess:myModel.provFess,
-                             transferAmount:myModel.transferAmount,
-                             degreeAmount:myModel.degreeAmount,
-                             migrationAmount:myModel.migrationAmount,
-                             otherAmount:myModel.otherAmount,
-                             regularFeesAmounts:regularModel,
-                             lateralFeesAmounts:lateralModel,
-                             semFeesAmounts:$scope.addMoreItems,
-                             createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
-                             specilization1:myModel.specilization1,
-                             specilization2:myModel.specilization2,
-                            // subjects:myModel.subject,
-                             branchCode:JSON.parse(localStorage.getItem('localObj')).localBranchID
-                         }
-                     };
-                     $http(addCourse).then(function (response) {
-                         if (response.data.status==200 && response.data.courseStatus) {
-                             $scope.ldloading1[loading.replace('-', '_')] = false;
-                             swal(" ", "Course added successfully.", "success");
-                             $state.go($state.current, {}, {reload: true});
-                         } else {
-                             $scope.addMoreItems.splice($scope.addMoreItems.length-1);
-                             $scope.ldloading1[loading.replace('-', '_')] = false;
-                             swal(" ", response.data.message, "error");
-                         }
-                     });
+                         var addCourse = {
+                             method: 'POST',
+                             url: apiPoint.url + 'addCourseDetails/',
+                             headers: {
+                                 'Content-Type': 'application/json'
+                             },
+                             data: {
+                                 courseCode: myModel.courseCode,
+                                 courseName: myModel.courseName,
+                                 universityName: myModel.universityName,
+                                 feesType:myModel.ListName.ListCode,
+                                 status: myModel.switchsetting,
+                                 provFess:myModel.provFess,
+                                 transferAmount:myModel.transferAmount,
+                                 degreeAmount:myModel.degreeAmount,
+                                 migrationAmount:myModel.migrationAmount,
+                                 otherAmount:myModel.otherAmount,
+                                 regularFeesAmounts:regularModel,
+                                 lateralFeesAmounts:lateralModel,
+                                 semFeesAmounts:$scope.addMoreItems,
+                                 createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
+                                 specilization1:myModel.specilization1,
+                                 specilization2:myModel.specilization2,
+                                 // subjects:myModel.subject,
+                                 branchCode:JSON.parse(localStorage.getItem('localObj')).localBranchID
+                             }
+                         };
+                         $http(addCourse).then(function (response) {
+                             if (response.data.status==200 && response.data.courseStatus) {
+                                 $scope.ldloading1[loading.replace('-', '_')] = false;
+                                 swal(" ", "Course added successfully.", "success");
+                                 $state.go($state.current, {}, {reload: true});
+                             } else {
+                                 $scope.addMoreItems.splice($scope.addMoreItems.length-1);
+                                 $scope.ldloading1[loading.replace('-', '_')] = false;
+                                 swal(" ", response.data.message, "error");
+                             }
+                         });
+                     }
+
                  }
 
 
@@ -296,57 +313,73 @@ app.controller('courseCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab
                     FeesAmount: semYear.FeesAmount
                 });
             }
-            $scope.ldloading = {};
+            /* check duplication objects values */
+            if(semYear.program=='Y001'){
+                $scope.myModelSemYear1.programName="";
+                $scope.myModelSemYear1.FeesAmount="";
+                var valueArr = $rootScope.updateMoreItems.map(function(item){ return item.programName });
+                var isDuplicate = valueArr.some(function(item, idx){
+                    return valueArr.indexOf(item) != idx;
+                });
+            }
+            if(semYear.program=='Y001' && isDuplicate==true){
 
-            $scope.ldloading[loading.replace('-', '_')] = true;
+                swal("Warning!", 'Sem/Year Duplication  ', "warning");
+            }
+            else{
+                $scope.ldloading = {};
+
+                $scope.ldloading[loading.replace('-', '_')] = true;
 
 
-            var update = {
-                method: 'POST',
-                url: apiPoint.url + 'updateCourseDetails/',
-                headers: {
-                    'Content-Type': 'application/json'
-                },
-                data: {
-                    courseID: myModel.CourseID,
-                    universityID: myModel.UniversityID,
-                    courseCode: myModel.CourseCode,
-                    courseName: myModel.CourseName,
-                    provFess:myModel.PC,
-                    transferAmount:myModel.TC,
-                    degreeAmount:myModel.DC,
-                    migrationAmount:myModel.MC,
-                    otherAmount:myModel.OtherFees,
-                    feesAmounts:myModel.feesStructures,
-                    regularFeesAmounts:regular,
-                    lateralFeesAmounts:lateral,
-                    semFeesAmounts:$rootScope.updateMoreItems,
-                    status: myModel.IsActive,
-                    updatedBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
-                    specilization1:myModel.Specilization1,
-                    specilization2:myModel.Specilization2,
-                    existCourseID:myModel.CourseID,
-                   // subjects:subjects.list,
-                    branchCode:JSON.parse(localStorage.getItem('localObj')).localBranchID
+                var update = {
+                    method: 'POST',
+                    url: apiPoint.url + 'updateCourseDetails/',
+                    headers: {
+                        'Content-Type': 'application/json'
+                    },
+                    data: {
+                        courseID: myModel.CourseID,
+                        universityID: myModel.UniversityID,
+                        courseCode: myModel.CourseCode,
+                        courseName: myModel.CourseName,
+                        provFess:myModel.PC,
+                        transferAmount:myModel.TC,
+                        degreeAmount:myModel.DC,
+                        migrationAmount:myModel.MC,
+                        otherAmount:myModel.OtherFees,
+                        feesAmounts:myModel.feesStructures,
+                        regularFeesAmounts:regular,
+                        lateralFeesAmounts:lateral,
+                        semFeesAmounts:$rootScope.updateMoreItems,
+                        status: myModel.IsActive,
+                        updatedBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
+                        specilization1:myModel.Specilization1,
+                        specilization2:myModel.Specilization2,
+                        existCourseID:myModel.CourseID,
+                        // subjects:subjects.list,
+                        branchCode:JSON.parse(localStorage.getItem('localObj')).localBranchID
 
-                }
-            };
-            $http(update).then(function (response) {
-                if (response.data.status==200 && response.data.courseStatus) {
-                    $scope.ldloading[loading.replace('-', '_')] = false;
-                    $rootScope.updateMoreItems=[];
-                    $rootScope.init();
-                    swal(" ", "Updated successfully.", "success");
+                    }
+                };
+                $http(update).then(function (response) {
+                    if (response.data.status==200 && response.data.courseStatus) {
+                        $scope.ldloading[loading.replace('-', '_')] = false;
+                        $rootScope.updateMoreItems=[];
+                        $rootScope.init();
+                        swal(" ", "Updated successfully.", "success");
 
-                    $scope.editId = -1;
+                        $scope.editId = -1;
 
 
-                } else {
-                    $scope.ldloading[loading.replace('-', '_')] = false;
-                   // $rootScope.init();
-                    swal(" ", response.data.message, "error");
-                }
-            });
+                    } else {
+                        $scope.ldloading[loading.replace('-', '_')] = false;
+                        // $rootScope.init();
+                        swal(" ", response.data.message, "error");
+                    }
+                });
+            }
+
         }
     };
     /*
diff --git a/Apollo/assets/views/courseDetails.html b/Apollo/assets/views/courseDetails.html
index c8f4810a..5c8c38b1 100755
--- a/Apollo/assets/views/courseDetails.html
+++ b/Apollo/assets/views/courseDetails.html
@@ -309,7 +309,7 @@
 
                                                                 <input type="text"  placeholder="Enter Regular Fees Amt"
                                                                        autofocus tabindex="7" class="form-control" name="regularFees" id="regularFees" ng-maxlength="8"
-                                                                       ng-model="myModelRegular.FeesAmount" ng-disabled="myModelLateral.FeesAmount!='' || myModelSemYear.programName!='' || myModelSemYear.FeesAmount!=''" ng-pattern="/^[0-9]*$/"/>
+                                                                       ng-model="myModelRegular.FeesAmount" ng-disabled="myModelLateral.FeesAmount!='' || myModelSemYear.programName!='' || myModelSemYear.FeesAmount!='' || addMoreItems.length!=0" ng-pattern="/^[0-9]*$/"/>
 
                                                                 <span class="error text-small block"
                                                                       ng-if="Form.regularFees.$error.maxlength || Form.regularFees.$error.pattern">Enter a valid amount</span>
@@ -322,7 +322,7 @@
 
                                                                 <input type="text"  placeholder="Enter Lateral Fees Amt"
                                                                        autofocus tabindex="8" class="form-control" name="lateralFees" id="lateralFees" ng-maxlength="8"
-                                                                       ng-model="myModelLateral.FeesAmount" ng-disabled="myModelRegular.FeesAmount!='' || myModelSemYear.programName!='' || myModelSemYear.FeesAmount!=''" ng-pattern="/^[0-9]*$/"/>
+                                                                       ng-model="myModelLateral.FeesAmount" ng-disabled="myModelRegular.FeesAmount!='' || myModelSemYear.programName!='' || myModelSemYear.FeesAmount!='' || addMoreItems.length!=0" ng-pattern="/^[0-9]*$/"/>
 
                                                                 <span class="error text-small block"
                                                                       ng-if="Form.lateralFees.$error.maxlength || Form.lateralFees.$error.pattern">Enter a valid amount</span>
diff --git a/Apollo/assets/views/editCourseDetails.html b/Apollo/assets/views/editCourseDetails.html
index 675f8cab..da1139a2 100755
--- a/Apollo/assets/views/editCourseDetails.html
+++ b/Apollo/assets/views/editCourseDetails.html
@@ -290,8 +290,95 @@
                             </div>
 
                         </div>
+                        <div class="col-md-6" ng-if="updateMoreItems.length==0">
+                            <fieldset>
+                                <div class="row">
+                                    <div class="col-md-6 form-group"
+                                         ng-class="{'has-error':Form.provFess.$dirty && Form.provFess.$invalid}">
+                                        <label>
+                                            Prov Cert Fees
+                                        </label>
 
-                        <div class="col-md-6">
+                                        <input type="text"  placeholder="Enter Prov Cert Fees"
+                                               autofocus tabindex="11" class="form-control" name="provFess" id="provFess" ng-maxlength="8"
+                                               ng-model="p.PC" ng-pattern="/^[0-9]*$/">
+                                        <span class="error text-small block"
+                                              ng-if="Form.provFess.$error.maxlength || Form.provFess.$error.pattern">Enter a valid amount</span>
+
+                                    </div>
+
+
+
+                                    <div class="col-md-6 form-group"
+                                         ng-class="{'has-error':Form.transferAmount.$dirty && Form.transferAmount.$invalid}">
+                                        <label>
+                                            Transfer Cert Fees
+                                        </label>
+
+                                        <input type="text"  placeholder="Enter transfer Cert Fees"
+                                               autofocus tabindex="12" class="form-control" name="transferAmount" id="transferAmount" ng-maxlength="8"
+                                               ng-model="p.TC" ng-pattern="/^[0-9]*$/">
+                                        <span class="error text-small block"
+                                              ng-if="Form.transferAmount.$error.maxlength || Form.transferAmount.$error.pattern">Enter a valid amount</span>
+
+                                    </div>
+                                </div>
+
+
+                                <div class="row">
+                                    <div class="col-md-6 form-group"
+                                         ng-class="{'has-error':Form.degreeAmount.$dirty && Form.degreeAmount.$invalid}">
+                                        <label>
+                                            Degree Cert Fees
+                                        </label>
+
+                                        <input type="text"  placeholder="Enter Degree Cert Fees"
+                                               autofocus tabindex="13" class="form-control" name="degreeAmount" id="degreeAmount" ng-maxlength="8"
+                                               ng-model="p.DC" ng-pattern="/^[0-9]*$/">
+                                        <span class="error text-small block"
+                                              ng-if="Form.degreeAmount.$error.maxlength || Form.degreeAmount.$error.pattern">Enter a valid amount</span>
+
+                                    </div>
+                                    <div class="col-md-6 form-group"
+                                         ng-class="{'has-error':Form.migrationAmount.$dirty && Form.migrationAmount.$invalid}">
+                                        <label>
+                                            Migration Cert Fees
+                                        </label>
+
+                                        <input type="text"  placeholder="Enter Migration Cert Fees"
+                                               autofocus tabindex="14" class="form-control" name="migrationAmount" id="migrationAmount" ng-maxlength="8"
+                                               ng-model="p.MC" ng-pattern="/^[0-9]*$/">
+                                        <span class="error text-small block"
+                                              ng-if="Form.migrationAmount.$error.maxlength || Form.migrationAmount.$error.pattern">Enter a valid amount</span>
+
+                                    </div>
+                                </div>
+
+                                <div class="row">
+                                    <div class="col-md-6 form-group"
+                                         ng-class="{'has-error':Form.otherAmount.$dirty && Form.otherAmount.$invalid}">
+                                        <label>
+                                            Other Fees
+                                        </label>
+
+                                        <input type="text"  placeholder="Enter Other Fees"
+                                               autofocus tabindex="15" class="form-control" name="otherAmount" id="otherAmount" ng-maxlength="8"
+                                               ng-model="p.OtherFees" ng-pattern="/^[0-9]*$/">
+                                        <span class="error text-small block"
+                                              ng-if="Form.otherAmount.$error.maxlength || Form.otherAmount.$error.pattern">Enter a valid amount</span>
+
+                                    </div>
+                                </div>
+
+
+
+
+                            </fieldset>
+
+
+                        </div>
+
+                        <div class="col-md-6" ng-if="updateMoreItems.length!=0">
 
                             <fieldset>
                                 <legend >{{myModelSemYear1.FeesName}}</legend>

From 43c225e730ae723a887dc3b5fd8953b36ff6689f Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Fri, 24 Aug 2018 14:59:08 +0530
Subject: [PATCH 08/10] edit course master changes for duplication validations

---
 Apollo/assets/views/editCourseDetails.html | 207 ++++++---------------
 1 file changed, 59 insertions(+), 148 deletions(-)

diff --git a/Apollo/assets/views/editCourseDetails.html b/Apollo/assets/views/editCourseDetails.html
index da1139a2..61ac2103 100755
--- a/Apollo/assets/views/editCourseDetails.html
+++ b/Apollo/assets/views/editCourseDetails.html
@@ -156,8 +156,8 @@
 
                     <div class="row">
 
-                        <div class="col-md-6">
-                            <div class="row" ng-if="myModelRegular1.program=='P001' || myModelLateral1.program=='P002'">
+                        <div class="col-md-6" ng-if="myModelRegular1.program=='P001' || myModelLateral1.program=='P002'">
+                            <div class="row" >
                                 <div class="col-md-12">
 
                                     <fieldset>
@@ -199,98 +199,86 @@
 
                             </div>
 
-                            <div class="row" ng-if="updateMoreItems.length!=0">
+                        </div>
+                        <div class="col-md-6" ng-if="updateMoreItems.length!=0">
 
-                                <div class="col-md-12">
-                                    <fieldset>
-                                        <div class="row">
-                                            <div class="col-md-6 form-group"
-                                                 ng-class="{'has-error':Form.provFess.$dirty && Form.provFess.$invalid}">
-                                                <label>
-                                                    Prov Cert Fees
-                                                </label>
+                            <fieldset>
+                                <legend >{{myModelSemYear1.FeesName}}</legend>
 
-                                                <input type="text"  placeholder="Enter Prov Cert Fees"
-                                                       autofocus tabindex="11" class="form-control" name="provFess" id="provFess" ng-maxlength="8"
-                                                       ng-model="p.PC" ng-pattern="/^[0-9]*$/">
-                                                <span class="error text-small block"
-                                                      ng-if="Form.provFess.$error.maxlength || Form.provFess.$error.pattern">Enter a valid amount</span>
+                                <div class="panel-body" >
 
-                                            </div>
+                                    <!--<div class="panel-scroll height-180" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true">-->
+                                    <div class="row">
+                                        <div class="col-md-6 form-group"
+                                             ng-class="{'has-error':Form.sem_year.$dirty && Form.sem_year.$invalid}">
+                                            <label>
+                                                Sem/Year
+                                            </label>
 
+                                            <input type="text"  placeholder="Enter Sem/year"
+                                                   tabindex="9" class="form-control" name="sem_year"
+                                                   ng-model="myModelSemYear1.programName" ng-pattern="/^[a-zA-Z0-9-./\s]*$/"/>
+                                            <!--<span class="error text-small block"
+                                                  ng-if="Form.sem_year.$dirty && Form.sem_year.$error.required">Sem/Year is required</span>-->
+                                            <span class="error text-small block"
+                                                  ng-if="Form.sem_year.$dirty && Form.sem_year.$error.pattern">Invalid Sem/Year name </span>
+                                        </div>
+                                        <div class="col-md-6 form-group"
+                                             ng-class="{'has-error':Form.feesAmount.$dirty && Form.feesAmount.$invalid}">
+                                            <label>
+                                                Fees
+                                            </label>
 
+                                            <input type="text"  placeholder="Enter Fees Amount"
+                                                   autofocus tabindex="10" class="form-control" name="feesAmount" id="feesAmount" ng-maxlength="8"
+                                                   ng-model="myModelSemYear1.FeesAmount" ng-pattern="/^[0-9]*$/"/>
+                                            <!--<span class="error text-small block"
+                                                  ng-if="Form.feesAmount.$dirty && Form.feesAmount.$invalid"
+                                                  ng-hide="Form.feesAmount.$error.maxlength || Form.feesAmount.$error.pattern">Fees amount is required</span>-->
+                                            <span class="error text-small block"
+                                                  ng-if="Form.feesAmount.$error.maxlength || Form.feesAmount.$error.pattern">Enter a valid amount</span>
 
-                                            <div class="col-md-6 form-group"
-                                                 ng-class="{'has-error':Form.transferAmount.$dirty && Form.transferAmount.$invalid}">
-                                                <label>
-                                                    Transfer Cert Fees
-                                                </label>
-
-                                                <input type="text"  placeholder="Enter transfer Cert Fees"
-                                                       autofocus tabindex="12" class="form-control" name="transferAmount" id="transferAmount" ng-maxlength="8"
-                                                       ng-model="p.TC" ng-pattern="/^[0-9]*$/">
-                                                <span class="error text-small block"
-                                                      ng-if="Form.transferAmount.$error.maxlength || Form.transferAmount.$error.pattern">Enter a valid amount</span>
+                                        </div>
+                                        <div class="col-md-12">
+                                            <div class="pull-right">
+                                                <input type="button" class="btn btn-sm btn-info" title="Click to add one more fees items" value="Add More" ng-click="updateMoreFeesItems(myModelSemYear1,Form);"/>
 
                                             </div>
                                         </div>
+                                    </div>
 
 
-                                        <div class="row">
-                                            <div class="col-md-6 form-group"
-                                                 ng-class="{'has-error':Form.degreeAmount.$dirty && Form.degreeAmount.$invalid}">
-                                                <label>
-                                                    Degree Cert Fees
-                                                </label>
 
-                                                <input type="text"  placeholder="Enter Degree Cert Fees"
-                                                       autofocus tabindex="13" class="form-control" name="degreeAmount" id="degreeAmount" ng-maxlength="8"
-                                                       ng-model="p.DC" ng-pattern="/^[0-9]*$/">
-                                                <span class="error text-small block"
-                                                      ng-if="Form.degreeAmount.$error.maxlength || Form.degreeAmount.$error.pattern">Enter a valid amount</span>
+                                    <div class="row" ng-repeat="n in updateMoreItems">
+                                        <div class="col-md-6 form-group" ng-class="{'has-error':n.programName==undefined, 'has-success':n.programName!=undefined}">
+                                            <label>
 
-                                            </div>
-                                            <div class="col-md-6 form-group"
-                                                 ng-class="{'has-error':Form.migrationAmount.$dirty && Form.migrationAmount.$invalid}">
-                                                <label>
-                                                    Migration Cert Fees
-                                                </label>
+                                            </label>
 
-                                                <input type="text"  placeholder="Enter Migration Cert Fees"
-                                                       autofocus tabindex="14" class="form-control" name="migrationAmount" id="migrationAmount" ng-maxlength="8"
-                                                       ng-model="p.MC" ng-pattern="/^[0-9]*$/">
-                                                <span class="error text-small block"
-                                                      ng-if="Form.migrationAmount.$error.maxlength || Form.migrationAmount.$error.pattern">Enter a valid amount</span>
-
-                                            </div>
+                                            <input type="text"  placeholder="Enter Sem/year"
+                                                   class="form-control" name="sem_year{{$index}}"
+                                                   ng-model="n.programName" ng-pattern="/^[a-zA-Z0-9-./\s]*$/" required/>
+                                            <span class="error text-small block"  ng-if="n.programName==undefined">Enter a valid name</span>
                                         </div>
+                                        <div class="col-md-6 form-group" ng-class="{'has-error':n.FeesAmount==undefined, 'has-success':n.FeesAmount!=undefined}">
+                                            <label>
 
-                                        <div class="row">
-                                            <div class="col-md-6 form-group"
-                                                 ng-class="{'has-error':Form.otherAmount.$dirty && Form.otherAmount.$invalid}">
-                                                <label>
-                                                    Other Fees
-                                                </label>
+                                            </label>
 
-                                                <input type="text"  placeholder="Enter Other Fees"
-                                                       autofocus tabindex="15" class="form-control" name="otherAmount" id="otherAmount" ng-maxlength="8"
-                                                       ng-model="p.OtherFees" ng-pattern="/^[0-9]*$/">
-                                                <span class="error text-small block"
-                                                      ng-if="Form.otherAmount.$error.maxlength || Form.otherAmount.$error.pattern">Enter a valid amount</span>
+                                            <input type="text"  placeholder="Enter Fees Amount"
+                                                   autofocus class="form-control" name="feesAmount{{$index}}" id="feesAmount{{$index}}" ng-maxlength="8"
+                                                   ng-model="n.FeesAmount" ng-pattern="/^[0-9]*$/" required/>
+                                            <span class="error text-small block"  ng-if="n.FeesAmount==undefined">Enter a valid amount</span>
 
-                                            </div>
                                         </div>
-
-
-
-
-                                    </fieldset>
+                                    </div>
+                                    <!--</div>-->
 
                                 </div>
-                            </div>
+                            </fieldset>
 
                         </div>
-                        <div class="col-md-6" ng-if="updateMoreItems.length==0">
+                        <div class="col-md-6">
                             <fieldset>
                                 <div class="row">
                                     <div class="col-md-6 form-group"
@@ -378,84 +366,7 @@
 
                         </div>
 
-                        <div class="col-md-6" ng-if="updateMoreItems.length!=0">
 
-                            <fieldset>
-                                <legend >{{myModelSemYear1.FeesName}}</legend>
-
-                                <div class="panel-body" >
-
-                                    <!--<div class="panel-scroll height-180" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true">-->
-                                        <div class="row">
-                                            <div class="col-md-6 form-group"
-                                                 ng-class="{'has-error':Form.sem_year.$dirty && Form.sem_year.$invalid}">
-                                                <label>
-                                                    Sem/Year
-                                                </label>
-
-                                                <input type="text"  placeholder="Enter Sem/year"
-                                                       tabindex="9" class="form-control" name="sem_year"
-                                                       ng-model="myModelSemYear1.programName" ng-pattern="/^[a-zA-Z0-9-./\s]*$/"/>
-                                                <!--<span class="error text-small block"
-                                                      ng-if="Form.sem_year.$dirty && Form.sem_year.$error.required">Sem/Year is required</span>-->
-                                                <span class="error text-small block"
-                                                      ng-if="Form.sem_year.$dirty && Form.sem_year.$error.pattern">Invalid Sem/Year name </span>
-                                            </div>
-                                            <div class="col-md-6 form-group"
-                                                 ng-class="{'has-error':Form.feesAmount.$dirty && Form.feesAmount.$invalid}">
-                                                <label>
-                                                    Fees
-                                                </label>
-
-                                                <input type="text"  placeholder="Enter Fees Amount"
-                                                       autofocus tabindex="10" class="form-control" name="feesAmount" id="feesAmount" ng-maxlength="8"
-                                                       ng-model="myModelSemYear1.FeesAmount" ng-pattern="/^[0-9]*$/"/>
-                                                <!--<span class="error text-small block"
-                                                      ng-if="Form.feesAmount.$dirty && Form.feesAmount.$invalid"
-                                                      ng-hide="Form.feesAmount.$error.maxlength || Form.feesAmount.$error.pattern">Fees amount is required</span>-->
-                                                <span class="error text-small block"
-                                                      ng-if="Form.feesAmount.$error.maxlength || Form.feesAmount.$error.pattern">Enter a valid amount</span>
-
-                                            </div>
-                                            <div class="col-md-12">
-                                                <div class="pull-right">
-                                                    <input type="button" class="btn btn-sm btn-info" title="Click to add one more fees items" value="Add More" ng-click="updateMoreFeesItems(myModelSemYear1,Form);"/>
-
-                                                </div>
-                                            </div>
-                                        </div>
-
-
-
-                                        <div class="row" ng-repeat="n in updateMoreItems">
-                                            <div class="col-md-6 form-group" ng-class="{'has-error':n.programName==undefined, 'has-success':n.programName!=undefined}">
-                                                <label>
-
-                                                </label>
-
-                                                <input type="text"  placeholder="Enter Sem/year"
-                                                       class="form-control" name="sem_year{{$index}}"
-                                                       ng-model="n.programName" ng-pattern="/^[a-zA-Z0-9-./\s]*$/" required/>
-                                                <span class="error text-small block"  ng-if="n.programName==undefined">Enter a valid name</span>
-                                            </div>
-                                            <div class="col-md-6 form-group" ng-class="{'has-error':n.FeesAmount==undefined, 'has-success':n.FeesAmount!=undefined}">
-                                                <label>
-
-                                                </label>
-
-                                                <input type="text"  placeholder="Enter Fees Amount"
-                                                       autofocus class="form-control" name="feesAmount{{$index}}" id="feesAmount{{$index}}" ng-maxlength="8"
-                                                       ng-model="n.FeesAmount" ng-pattern="/^[0-9]*$/" required/>
-                                                <span class="error text-small block"  ng-if="n.FeesAmount==undefined">Enter a valid amount</span>
-
-                                            </div>
-                                        </div>
-                                    <!--</div>-->
-
-                                </div>
-                            </fieldset>
-
-                            </div>
                         </div>
 
 

From 9500df0dc624bc1628de5e1239534a99a88db14a Mon Sep 17 00:00:00 2001
From: dineshkumarkannan <dineshmail.kannan@gmail.com>
Date: Fri, 24 Aug 2018 15:57:19 +0530
Subject: [PATCH 09/10] daybook details screen enable printpdf option : kdk

---
 Apollo/assets/js/controllers/daybookCtrl.js   | 258 +++++++
 .../assets/js/controllers/daybookadminCtrl.js | 258 +++++++
 .../js/controllers/daybooksuperadminCtrl.js   | 648 ++++++++++--------
 .../assets/js/filters/daybookPrintService.js  | 230 +++++++
 Apollo/assets/views/daybook/daybook.html      |  11 +-
 Apollo/assets/views/daybook/daybookadmin.html |  14 +-
 .../views/daybook/daybooksuperadmin.html      |   4 +-
 7 files changed, 1139 insertions(+), 284 deletions(-)
 create mode 100644 Apollo/assets/js/filters/daybookPrintService.js

diff --git a/Apollo/assets/js/controllers/daybookCtrl.js b/Apollo/assets/js/controllers/daybookCtrl.js
index d3892373..f311d628 100755
--- a/Apollo/assets/js/controllers/daybookCtrl.js
+++ b/Apollo/assets/js/controllers/daybookCtrl.js
@@ -121,6 +121,7 @@ $scope.dayBookApprovalAccess = '';
             if (response.data.dayBookListStatus) {
 
                 $scope.data = response.data.dayBookListDetails;
+                $scope.datas = response.data.dayBookListDetails;
                 $scope.dataLength = $scope.data.length;
                 if ($scope.data.length !== 0) {
                     $scope.noRecordFound = false;
@@ -135,6 +136,263 @@ $scope.dayBookApprovalAccess = '';
         });
     }
 
+     //print PDF -------- START ==============================================================================
+
+    var rows1 = '';
+
+    $scope.paymentOptions = [
+        {
+            "paymentOn": "CASH"
+        },
+        {
+            "paymentOn": "CHEQUE"
+        },
+        {
+            "paymentOn": "REFERRAL"
+        },
+        {
+            "paymentOn": "ONLINE TRANSACTION"
+        },
+        {
+            "paymentOn": "WAIVER"
+        },
+        {
+            "paymentOn": "Credit/Debit Card"
+        }
+
+    ];
+
+    function getSortCutModeofPayment(type) {
+        var sortCutName = '';
+        switch (type) {
+            case 'CASH':
+                sortCutName = 'CH';
+                break;
+            case 'CHEQUE':
+                sortCutName = 'CHQ';
+                break;
+            case 'REFERRAL':
+                sortCutName = 'REF';
+                break;
+            case 'ONLINE TRANSACTION':
+                sortCutName = 'ONL';
+                break;
+            case 'WAIVER':
+                sortCutName = 'WAI';
+                break;
+            case 'Credit/Debit Card':
+                sortCutName = 'CARD';
+                break;
+            default:
+                sortCutName = type;
+        }
+        return sortCutName;
+    }
+
+
+    $scope.generatePFD = function (datas) {
+
+        // daybookDetails.generatePFD(datas,$scope.searchData.date, $scope.searchData.dateTo);
+
+        var o = {};
+        var intDataSNo = 1;
+        var intDate = 0;
+        // var arrForeach = datas.reverse();
+        // for()
+        // var ememem = datas[7-1];
+        // alert(ememem.VoucherNumber);
+        for(var i = datas.length ; i > 0; --i){
+            var element = datas[i-1];
+            var value = {};
+            value['SNo'] = intDataSNo;
+            value['Date'] = element.VoucherNumber + '\n/' + element.Date || '-';
+            var ListName = element.ListName;
+            value['PaidReceivedToFrom'] = element.PaidTo || '-';
+            var Sem = element.FeePaymentDetails || '-';
+            var Course = element.CourseName || '-';
+            var University = element.UniversityName || '-';
+            value['UnivCourseSem'] = University.concat('/ ' + Course, '/ ' + Sem);
+            value['Type'] = element.TypeName || '-';
+            value['ReceiptNo'] = element.ReceiptNo || '-';
+            value['Comments'] = element.ReceiptNoComments || '-';
+            value['ModeofPayment'] = getSortCutModeofPayment(element.ModeOfPayment) || '-';
+            value['Amount'] = (ListName == 'Expense' ? '-' : '+') + ' ' + element.Amount || '-';
+            value['Balance'] = element.Balance || '-';
+            o[intDate] = value;
+            intDate++;
+            intDataSNo++;
+        }
+        // alert(JSON.stringify(o));
+        // arrForeach.forEach(function (element) {
+        //     var value = {};
+        //     value['SNo'] = intDataSNo;
+        //     value['Date'] = element.VoucherNumber + '\n/' + element.Date || '-';
+        //     var ListName = element.ListName;
+        //     value['PaidReceivedToFrom'] = element.PaidTo || '-';
+        //     var Sem = element.FeePaymentDetails || '-';
+        //     var Course = element.CourseName || '-';
+        //     var University = element.UniversityName || '-';
+        //     value['UnivCourseSem'] = University.concat('/ ' + Course, '/ ' + Sem);
+        //     value['Type'] = element.TypeName || '-';
+        //     value['ReceiptNo'] = element.ReceiptNo || '-';
+        //     value['Comments'] = element.ReceiptNoComments || '-';
+        //     value['ModeofPayment'] = getSortCutModeofPayment(element.ModeOfPayment) || '-';
+        //     value['Amount'] = (ListName == 'Expense' ? '-' : '+') + ' ' + element.Amount || '-';
+        //     value['Balance'] = element.Balance || '-';
+        //     o[intDate] = value;
+        //     intDate++;
+        //     intDataSNo++;
+        // });
+        rows1 = o;
+        var headers = {
+            fila_1: {
+                col_1: { text: 'SNo', style: 'tableHeader', alignment: 'center', bold: true },
+                col_2: { text: 'Voucher Number Bill Number / DATE', style: 'tableHeader', alignment: 'center', bold: true },
+                col_3: { text: 'Paid To  Received From', style: 'tableHeader', alignment: 'center', bold: true },
+                col_4: { text: 'University / Course/ Sem', style: 'tableHeader', alignment: 'center', bold: true },
+                col_5: { text: 'Type', style: 'tableHeader', alignment: 'center', bold: true },
+                col_6: { text: 'Receipt No', style: 'tableHeader', alignment: 'center', bold: true },
+                col_7: { text: 'Comments', style: 'tableHeader', alignment: 'center', bold: true },
+                col_8: { text: 'Mode of Payment', style: 'tableHeader', alignment: 'center', bold: true },
+                col_9: { text: 'Amount', style: 'tableHeader', alignment: 'center', bold: true },
+                col_10: { text: 'Balance', style: 'tableHeader', alignment: 'center', bold: true },
+            }
+        }
+        var body = [];
+        for (var key in headers) {
+            if (headers.hasOwnProperty(key)) {
+                var header = headers[key];
+                var row = new Array();
+                row.push(header.col_1);
+                row.push(header.col_2);
+                row.push(header.col_3);
+                row.push(header.col_4);
+                row.push(header.col_5);
+                row.push(header.col_6);
+                row.push(header.col_7);
+                row.push(header.col_8);
+                row.push(header.col_9);
+                row.push(header.col_10);
+                body.push(row);
+            }
+        }
+        for (var key in rows1) {
+            if (rows1.hasOwnProperty(key)) {
+                var data = rows1[key];
+                var row = new Array();
+                row.push(data.SNo.toString());
+                row.push(data.Date.toString());
+                row.push(data.PaidReceivedToFrom.toString());
+                row.push(data.UnivCourseSem.toString());
+                row.push(data.Type.toString());
+                row.push(data.ReceiptNo.toString());
+                row.push(data.Comments.toString());
+                row.push(data.ModeofPayment.toString());
+                row.push(data.Amount.toString());
+                row.push(data.Balance.toString());
+                body.push(row);
+            }
+        }
+
+
+        var docDefinition = {
+            pageMargins: [20, 85, 20, 50],
+            pageOrientation: 'landscape',
+            header: function () {
+                return {
+                    margin: 0,
+                    columns: [
+                        {
+                            text: ['DAYBOOK DETAILS' + '( ' + $scope.searchData.date + ' - ' + $scope.searchData.dateTo + ' )'],
+                            alignment: 'left', bold: true, margin: [20, 30, 0, 0], fontSize: 18
+                        }
+                    ]
+                }
+            },
+            footer: function (currentPage, pageCount) {
+                if (currentPage === pageCount) {
+                    return {
+                        columns: [
+                            {
+                                text: ['Note :' + '\n\t\t\t\t\t\t CH-CASH, CHQ-CHEQUE, REF-REFERRAL, ONL-ONLINE TRANSACTION, WAI-WAIVER, CARD-Credit/Debit Card'],
+                                alignment: 'left', margin: [10, 0, 0, 0], fontSize: 8
+                            },
+                            { text: ['\n Page ' + currentPage.toString() + ' of ' + pageCount], alignment: 'right', margin: [0, 10, 10, 0], fontSize: 10 }
+                        ]
+                    };
+                } else {
+                    return {
+                        text: 'Page ' + currentPage.toString() + ' of ' + pageCount, alignment: 'right', margin: [0, 10, 10, 0], fontSize: 10
+                    };
+                }
+            },
+            content: [
+                {
+                    //   layout: 'lightHorizontalLines', // optional
+                    table: {
+                        // headers are automatically repeated if the table spans over multiple pages
+                        // you can declare how many rows should be treated as headers
+                        // headerRows: 1,
+                        // widths: [ '40', '40', '40', '40', '40'],
+                        headerRows: 1,
+                        keepWithHeaderRows: 0,
+                        body: body
+                    },
+                    layout: {
+                        hLineWidth: function (i, node) {
+                            return 0.5;
+                        },
+                        vLineWidth: function (i, node) {
+                            // return (i === 0 || i === node.table.widths.length) ? 0 : 40;
+                            return 0.5;
+                        },
+                        hLineColor: function (i, node) {
+                            return '#2D4D81';
+                        },
+                        vLineColor: function (i, node) {
+                            return '#2D4D81';
+                        },
+                    }
+                }
+            ],
+            styles: {
+                header: {
+                    fontSize: 12,
+                    bold: true
+                },
+                subheader: {
+                    fontSize: 12,
+                    bold: true
+                },
+                quote: {
+                    italics: true
+                },
+                small: {
+                    fontSize: 6
+                },
+                sta: {
+                    fontSize: 8,
+                    bold: false,
+                    alignment: 'justify'
+                }
+            }
+        };
+
+        // alert(JSON.stringify(rows1));
+        //     pdfMake.createPdf(docDefinition).download('file.pdf', () => {
+        //     console.log("success");
+        // });
+        pdfMake.createPdf(docDefinition).print(() => {
+            console.log("success");
+        });
+    }
+
+
+
+    //   print PDF-------- END ==============================================================================
+
+
+
     // income expense type status list
     $scope.getIncomeExpenseType_Status = function () {
         var getIncomeExpenseType = {
diff --git a/Apollo/assets/js/controllers/daybookadminCtrl.js b/Apollo/assets/js/controllers/daybookadminCtrl.js
index 9e747f14..c8b41bf1 100755
--- a/Apollo/assets/js/controllers/daybookadminCtrl.js
+++ b/Apollo/assets/js/controllers/daybookadminCtrl.js
@@ -121,6 +121,7 @@ $scope.dayBookApprovalAccess = '';
             if (response.data.dayBookListStatus) {
 
                 $scope.data = response.data.dayBookListDetails;
+                   $scope.datas = response.data.dayBookListDetails;
                 $scope.dataLength = $scope.data.length;
                 if ($scope.data.length !== 0) {
                     $scope.noRecordFound = false;
@@ -135,6 +136,263 @@ $scope.dayBookApprovalAccess = '';
         });
     }
 
+    
+    //print PDF -------- START ==============================================================================
+
+    var rows1 = '';
+
+    $scope.paymentOptions = [
+        {
+            "paymentOn": "CASH"
+        },
+        {
+            "paymentOn": "CHEQUE"
+        },
+        {
+            "paymentOn": "REFERRAL"
+        },
+        {
+            "paymentOn": "ONLINE TRANSACTION"
+        },
+        {
+            "paymentOn": "WAIVER"
+        },
+        {
+            "paymentOn": "Credit/Debit Card"
+        }
+
+    ];
+
+    function getSortCutModeofPayment(type) {
+        var sortCutName = '';
+        switch (type) {
+            case 'CASH':
+                sortCutName = 'CH';
+                break;
+            case 'CHEQUE':
+                sortCutName = 'CHQ';
+                break;
+            case 'REFERRAL':
+                sortCutName = 'REF';
+                break;
+            case 'ONLINE TRANSACTION':
+                sortCutName = 'ONL';
+                break;
+            case 'WAIVER':
+                sortCutName = 'WAI';
+                break;
+            case 'Credit/Debit Card':
+                sortCutName = 'CARD';
+                break;
+            default:
+                sortCutName = type;
+        }
+        return sortCutName;
+    }
+
+
+    $scope.generatePFD = function (datas) {
+
+        // daybookDetails.generatePFD(datas,$scope.searchData.date, $scope.searchData.dateTo);
+
+        var o = {};
+        var intDataSNo = 1;
+        var intDate = 0;
+        // var arrForeach = datas.reverse();
+        // for()
+        // var ememem = datas[7-1];
+        // alert(ememem.VoucherNumber);
+        for(var i = datas.length ; i > 0; --i){
+            var element = datas[i-1];
+            var value = {};
+            value['SNo'] = intDataSNo;
+            value['Date'] = element.VoucherNumber + '\n/' + element.Date || '-';
+            var ListName = element.ListName;
+            value['PaidReceivedToFrom'] = element.PaidTo || '-';
+            var Sem = element.FeePaymentDetails || '-';
+            var Course = element.CourseName || '-';
+            var University = element.UniversityName || '-';
+            value['UnivCourseSem'] = University.concat('/ ' + Course, '/ ' + Sem);
+            value['Type'] = element.TypeName || '-';
+            value['ReceiptNo'] = element.ReceiptNo || '-';
+            value['Comments'] = element.ReceiptNoComments || '-';
+            value['ModeofPayment'] = getSortCutModeofPayment(element.ModeOfPayment) || '-';
+            value['Amount'] = (ListName == 'Expense' ? '-' : '+') + ' ' + element.Amount || '-';
+            value['Balance'] = element.Balance || '-';
+            o[intDate] = value;
+            intDate++;
+            intDataSNo++;
+        }
+        // alert(JSON.stringify(o));
+        // arrForeach.forEach(function (element) {
+        //     var value = {};
+        //     value['SNo'] = intDataSNo;
+        //     value['Date'] = element.VoucherNumber + '\n/' + element.Date || '-';
+        //     var ListName = element.ListName;
+        //     value['PaidReceivedToFrom'] = element.PaidTo || '-';
+        //     var Sem = element.FeePaymentDetails || '-';
+        //     var Course = element.CourseName || '-';
+        //     var University = element.UniversityName || '-';
+        //     value['UnivCourseSem'] = University.concat('/ ' + Course, '/ ' + Sem);
+        //     value['Type'] = element.TypeName || '-';
+        //     value['ReceiptNo'] = element.ReceiptNo || '-';
+        //     value['Comments'] = element.ReceiptNoComments || '-';
+        //     value['ModeofPayment'] = getSortCutModeofPayment(element.ModeOfPayment) || '-';
+        //     value['Amount'] = (ListName == 'Expense' ? '-' : '+') + ' ' + element.Amount || '-';
+        //     value['Balance'] = element.Balance || '-';
+        //     o[intDate] = value;
+        //     intDate++;
+        //     intDataSNo++;
+        // });
+        rows1 = o;
+        var headers = {
+            fila_1: {
+                col_1: { text: 'SNo', style: 'tableHeader', alignment: 'center', bold: true },
+                col_2: { text: 'Voucher Number Bill Number / DATE', style: 'tableHeader', alignment: 'center', bold: true },
+                col_3: { text: 'Paid To  Received From', style: 'tableHeader', alignment: 'center', bold: true },
+                col_4: { text: 'University / Course/ Sem', style: 'tableHeader', alignment: 'center', bold: true },
+                col_5: { text: 'Type', style: 'tableHeader', alignment: 'center', bold: true },
+                col_6: { text: 'Receipt No', style: 'tableHeader', alignment: 'center', bold: true },
+                col_7: { text: 'Comments', style: 'tableHeader', alignment: 'center', bold: true },
+                col_8: { text: 'Mode of Payment', style: 'tableHeader', alignment: 'center', bold: true },
+                col_9: { text: 'Amount', style: 'tableHeader', alignment: 'center', bold: true },
+                col_10: { text: 'Balance', style: 'tableHeader', alignment: 'center', bold: true },
+            }
+        }
+        var body = [];
+        for (var key in headers) {
+            if (headers.hasOwnProperty(key)) {
+                var header = headers[key];
+                var row = new Array();
+                row.push(header.col_1);
+                row.push(header.col_2);
+                row.push(header.col_3);
+                row.push(header.col_4);
+                row.push(header.col_5);
+                row.push(header.col_6);
+                row.push(header.col_7);
+                row.push(header.col_8);
+                row.push(header.col_9);
+                row.push(header.col_10);
+                body.push(row);
+            }
+        }
+        for (var key in rows1) {
+            if (rows1.hasOwnProperty(key)) {
+                var data = rows1[key];
+                var row = new Array();
+                row.push(data.SNo.toString());
+                row.push(data.Date.toString());
+                row.push(data.PaidReceivedToFrom.toString());
+                row.push(data.UnivCourseSem.toString());
+                row.push(data.Type.toString());
+                row.push(data.ReceiptNo.toString());
+                row.push(data.Comments.toString());
+                row.push(data.ModeofPayment.toString());
+                row.push(data.Amount.toString());
+                row.push(data.Balance.toString());
+                body.push(row);
+            }
+        }
+
+
+        var docDefinition = {
+            pageMargins: [20, 85, 20, 50],
+            pageOrientation: 'landscape',
+            header: function () {
+                return {
+                    margin: 0,
+                    columns: [
+                        {
+                            text: ['DAYBOOK DETAILS' + '( ' + $scope.searchData.date + ' - ' + $scope.searchData.dateTo + ' )'],
+                            alignment: 'left', bold: true, margin: [20, 30, 0, 0], fontSize: 18
+                        }
+                    ]
+                }
+            },
+            footer: function (currentPage, pageCount) {
+                if (currentPage === pageCount) {
+                    return {
+                        columns: [
+                            {
+                                text: ['Note :' + '\n\t\t\t\t\t\t CH-CASH, CHQ-CHEQUE, REF-REFERRAL, ONL-ONLINE TRANSACTION, WAI-WAIVER, CARD-Credit/Debit Card'],
+                                alignment: 'left', margin: [10, 0, 0, 0], fontSize: 8
+                            },
+                            { text: ['\n Page ' + currentPage.toString() + ' of ' + pageCount], alignment: 'right', margin: [0, 10, 10, 0], fontSize: 10 }
+                        ]
+                    };
+                } else {
+                    return {
+                        text: 'Page ' + currentPage.toString() + ' of ' + pageCount, alignment: 'right', margin: [0, 10, 10, 0], fontSize: 10
+                    };
+                }
+            },
+            content: [
+                {
+                    //   layout: 'lightHorizontalLines', // optional
+                    table: {
+                        // headers are automatically repeated if the table spans over multiple pages
+                        // you can declare how many rows should be treated as headers
+                        // headerRows: 1,
+                        // widths: [ '40', '40', '40', '40', '40'],
+                        headerRows: 1,
+                        keepWithHeaderRows: 0,
+                        body: body
+                    },
+                    layout: {
+                        hLineWidth: function (i, node) {
+                            return 0.5;
+                        },
+                        vLineWidth: function (i, node) {
+                            // return (i === 0 || i === node.table.widths.length) ? 0 : 40;
+                            return 0.5;
+                        },
+                        hLineColor: function (i, node) {
+                            return '#2D4D81';
+                        },
+                        vLineColor: function (i, node) {
+                            return '#2D4D81';
+                        },
+                    }
+                }
+            ],
+            styles: {
+                header: {
+                    fontSize: 12,
+                    bold: true
+                },
+                subheader: {
+                    fontSize: 12,
+                    bold: true
+                },
+                quote: {
+                    italics: true
+                },
+                small: {
+                    fontSize: 6
+                },
+                sta: {
+                    fontSize: 8,
+                    bold: false,
+                    alignment: 'justify'
+                }
+            }
+        };
+
+        // alert(JSON.stringify(rows1));
+        //     pdfMake.createPdf(docDefinition).download('file.pdf', () => {
+        //     console.log("success");
+        // });
+        pdfMake.createPdf(docDefinition).print(() => {
+            console.log("success");
+        });
+    }
+
+
+
+    //   print PDF-------- END ==============================================================================
+
+
     // income expense type status list
     $scope.getIncomeExpenseType_Status = function () {
         var getIncomeExpenseType = {
diff --git a/Apollo/assets/js/controllers/daybooksuperadminCtrl.js b/Apollo/assets/js/controllers/daybooksuperadminCtrl.js
index 46e3a8df..a8d174ee 100755
--- a/Apollo/assets/js/controllers/daybooksuperadminCtrl.js
+++ b/Apollo/assets/js/controllers/daybooksuperadminCtrl.js
@@ -3,30 +3,30 @@
  * daybook details capturing
  * 
  */
-app.controller('daybooksuperadminCtrl', ["$scope", "$rootScope", "toaster", "$filter", "ngTableParams", "API_POINTS", "$localStorage", "$http", "$state", 'ipCookie', '$window','SweetAlert', '$timeout', function ($scope, $rootScope, toaster, $filter, ngTableParams, apiPoint, $localStorage, $http, $state, ipCookie, $window, SweetAlert, $timeout) {
+app.controller('daybooksuperadminCtrl', ["$scope", "$rootScope", "toaster", "$filter", "ngTableParams", "API_POINTS", "$localStorage", "$http", "$state", 'ipCookie', '$window', 'SweetAlert', '$timeout', function ($scope, $rootScope, toaster, $filter, ngTableParams, apiPoint, $localStorage, $http, $state, ipCookie, $window, SweetAlert, $timeout) {
 
     // get local client details
     var localDetail = JSON.parse(localStorage.getItem('localObj'));
     var localDetails = ipCookie('cookiechk');
-   $scope.disableAddButton = false;
-     $scope.disableEditButton = false;
+    $scope.disableAddButton = false;
+    $scope.disableEditButton = false;
 
 
- 
 
-//In controller
-$scope.exportAction = function(){ 
-    // alert();
-      switch('excel'){
-          case 'pdf': $scope.$broadcast('export-pdf', {}); 
-                      break; 
-          case 'excel': $scope.$broadcast('export-excel', {}); 
-                      break; 
-          case 'doc': $scope.$broadcast('export-doc', {});
-                      break; 
-          default: console.log('no event caught'); 
-       }
-}
+
+    //In controller
+    $scope.exportAction = function () {
+        // alert();
+        switch ('excel') {
+            case 'pdf': $scope.$broadcast('export-pdf', {});
+                break;
+            case 'excel': $scope.$broadcast('export-excel', {});
+                break;
+            case 'doc': $scope.$broadcast('export-doc', {});
+                break;
+            default: console.log('no event caught');
+        }
+    }
 
 
     $scope.searchData = {
@@ -34,7 +34,7 @@ $scope.exportAction = function(){
         "dateTo": ""
     }
 
-      $scope.viewStudentDetailsPage = false;
+    $scope.viewStudentDetailsPage = false;
     // load when html page load
     $scope.init = function () {
         if (localDetail != null) {
@@ -80,21 +80,21 @@ $scope.exportAction = function(){
     // }
 
     function getDetails() {
-         $scope.todayDate = new Date();
+        $scope.todayDate = new Date();
         const LOCALTYPE = localDetail.localType;
-        if(LOCALTYPE === 'R004') {
-                $scope.currentDate = new Date();
-                var d = new Date();
-                $scope.oneMonthBefore = d.setMonth(d.getMonth()-1);
-                // alert($scope.oneMonthBefore);
-                var formate = "dd-MM-yyyy";
-                $scope.searchData.date = $filter('date')(new Date($scope.oneMonthBefore), formate);
-                $scope.searchData.dateTo = $filter('date')(new Date($scope.currentDate), formate);
-                $scope.getDayBookList();
-                $scope.getIncomeExpenseType_Status();
-                $scope.viewStudentDetailsPage = true;
-     
-        }else {
+        if (LOCALTYPE === 'R004') {
+            $scope.currentDate = new Date();
+            var d = new Date();
+            $scope.oneMonthBefore = d.setMonth(d.getMonth() - 1);
+            // alert($scope.oneMonthBefore);
+            var formate = "dd-MM-yyyy";
+            $scope.searchData.date = $filter('date')(new Date($scope.oneMonthBefore), formate);
+            $scope.searchData.dateTo = $filter('date')(new Date($scope.currentDate), formate);
+            $scope.getDayBookList();
+            $scope.getIncomeExpenseType_Status();
+            $scope.viewStudentDetailsPage = true;
+
+        } else {
             ipCookie.remove('cookiechk');
             $window.localStorage.clear();
             $state.go('login.signin');
@@ -114,7 +114,7 @@ $scope.exportAction = function(){
     //             $scope.searchData.dateTo = $filter('date')(new Date($scope.currentDate), formate);
     //             $scope.getDayBookList();
     //             $scope.getIncomeExpenseType_Status();
-     
+
     //     }else {alert();
     //         ipCookie.remove('cookiechk');
     //         $window.localStorage.clear();
@@ -122,10 +122,10 @@ $scope.exportAction = function(){
     //     }
     // }
 
-$scope.dayBookApprovalAccess = '';
-        // Finance module access control
+    $scope.dayBookApprovalAccess = '';
+    // Finance module access control
     function getFinanceModuleAccess() {
-          var getFinacnceModuleAcccessCtrl = {
+        var getFinacnceModuleAcccessCtrl = {
             method: 'POST',
             url: apiPoint.url + 'empDayBookModuleAccessChk/',
             headers: {
@@ -149,7 +149,7 @@ $scope.dayBookApprovalAccess = '';
                 return true;
             }
         });
-      
+
     }
 
     // $scope.getApproveLoad = function() {
@@ -158,7 +158,7 @@ $scope.dayBookApprovalAccess = '';
 
     // change from date, update and call search functionality 
     $scope.changeDate = function () {
-        if($scope.searchData.date !== undefined) {
+        if ($scope.searchData.date !== undefined) {
             var formate = "dd-MM-yyyy";
             $scope.searchData.date = $filter('date')(new Date($scope.searchData.date), formate);
             $scope.getDayBookList();
@@ -167,10 +167,10 @@ $scope.dayBookApprovalAccess = '';
             $scope.getDayBookList();
         }
     }
-  
+
     // change to date, update and call search functionality 
     $scope.changeToDate = function () {
-        if($scope.searchData.dateTo !== undefined) {
+        if ($scope.searchData.dateTo !== undefined) {
             var formate = "dd-MM-yyyy";
             $scope.searchData.dateTo = $filter('date')(new Date($scope.searchData.dateTo), formate);
             $scope.getDayBookList();
@@ -186,10 +186,14 @@ $scope.dayBookApprovalAccess = '';
         $scope.reverse = !$scope.reverse; //if true make it false and vice versa
     }
 
+
+
+
+
+
     $scope.noRecordFound = true;
     $scope.dataLength = 0;
-    
-var rows1 = '';
+
     // get day book type name list
     $scope.getDayBookList = function () {
         var getDatBookListDetails = {
@@ -207,33 +211,9 @@ var rows1 = '';
             if (response.data.dayBookListStatus) {
 
                 $scope.data = response.data.dayBookListDetails;
+                $scope.datasss = response.data.dayBookListDetails;
                 // alert(JSON.stringify($scope.data));
 
-                var o = {};
-                // o[key] = value;
-                var intDate = 0;
-
-                var arrForeach = $scope.data;
-                arrForeach.forEach(function(element) {
-                    var value = {};
-                    value['Date'] = element.Date || '-';
-                    value['IncomeExpence'] = element.ListName || '-';
-                    value['VoucherBillNumber'] = element.VoucherNumber || '-';
-                    value['PaidReceivedToFrom'] = element.PaidTo || '-';
-                    value['Sem'] = element.FeePaymentDetails || '-';
-                    // value['Course'] = element.CourseName || '-';
-                    // value['University'] = element.UniversityName || '-';
-                    // value['Type'] = element.TypeName || '-';
-                    // value['ReceiptNo'] = element.ReceiptNo || '-';
-                    // value['Comments'] = element.ReceiptNoComments || '-';
-                    // value['ModeofPayment'] = element.ModeOfPayment || '-';
-                    // value['Amount'] = element.Amount || '-';
-                    // value['Balance'] = element.Balance || '-';
-                    o[intDate] = value;
-                    intDate++;
-                });
-
-                rows1 = o;
 
                 $scope.dataLength = $scope.data.length;
                 if ($scope.data.length !== 0) {
@@ -251,150 +231,260 @@ var rows1 = '';
 
 
 
-    //==============================================================================
+    //print PDF -------- START ==============================================================================
 
-   
-    $scope.generatePFD = function() {
+    var rows1 = '';
 
-             // var docDefinition = { content: 'This is an sample PDF printed with pdfMake' };
-
-var headers = {
-    // fila_0:{
-    //     col_1:{ text: 'Faltas', style: 'tableHeader',rowSpan: 2, alignment: 'center',margin: [0, 8, 0, 0] },
-    //     col_2:{ text: 'Fecha', style: 'tableHeader',rowSpan: 2, alignment: 'center',margin: [0, 8, 0, 0] },
-    //     col_3:{ text: 'Descripción', style: 'tableHeader',rowSpan: 2, alignment: 'center',margin: [0, 8, 0, 0] },
-    //     col_4:{ text: 'Cita con acudientes', style: 'tableHeader',colSpan: 2, alignment: 'center' }
-    // },
-    fila_1:{
-        col_1:{ text: 'DATE', style: 'tableHeader', alignment: 'center' },
-        col_2:{ text: 'Income Expense', style: 'tableHeader', alignment: 'center' }, 
-        col_3:{ text: 'Voucher Number Bill Number', style: 'tableHeader', alignment: 'center' },
-        col_4:{ text: 'Paid To  Received From', style: 'tableHeader', alignment: 'center' },
-        col_5:{ text: 'Sem', style: 'tableHeader', alignment: 'center'},
-        // col_6:{ text: 'Course', style: 'tableHeader', alignment: 'center'},
-        // col_7:{ text: 'University', style: 'tableHeader', alignment: 'center'},
-        // col_8:{ text: 'Type', style: 'tableHeader', alignment: 'center'},
-        // col_9:{ text: 'Receipt No', style: 'tableHeader', alignment: 'center'},
-        // col_10:{ text: 'Comments', style: 'tableHeader', alignment: 'center'},
-        // col_11:{ text: 'Mode of Payment', style: 'tableHeader', alignment: 'center'},
-        // col_12:{ text: 'Amount', style: 'tableHeader', alignment: 'center'},
-        // col_13:{ text: 'Balance', style: 'tableHeader', alignment: 'center'},
-    }
-}
-var body = [];
-for (var key in headers){
-    if (headers.hasOwnProperty(key)){
-        var header = headers[key];
-        var row = new Array();
-        row.push( header.col_1 );
-        row.push( header.col_2 );
-        row.push( header.col_3 );
-        row.push( header.col_4 );
-        row.push( header.col_5 );
-        // row.push( header.col_6 );
-        // row.push( header.col_7 );
-        // row.push( header.col_8 );
-        // row.push( header.col_9 );
-        // row.push( header.col_10 );
-        // row.push( header.col_11 );
-        // row.push( header.col_12 );
-        // row.push( header.col_13 );
-        body.push(row);
-    }
-}
-for (var key in rows1) 
-{
-    if (rows1.hasOwnProperty(key))
-    {
-        var data = rows1[key];
-        var row = new Array();
-        row.push( data.Date.toString() );
-        row.push( data.IncomeExpence.toString()  );
-        row.push( data.VoucherBillNumber.toString() );
-        row.push( data.PaidReceivedToFrom.toString()  );
-        row.push( data.Sem.toString() );
-        //  row.push( data.Course.toString()  );
-        // row.push( data.University.toString() );
-        // row.push( data.Type.toString()  );
-        // row.push( data.ReceiptNo.toString() );
-        //  row.push( data.Comments.toString()  );
-        // row.push( data.ModeofPayment.toString() );
-        // row.push( data.Amount.toString()  );
-        // row.push( data.Balance.toString() );
-        body.push(row);
-    }
-}
-
-
-var docDefinition = {
-     pageMargins: [40,165,40,55],
-        pageOrientation: 'landscape',
-        header: function() {
-            return {
-                margin: 2,
-                columns: [
-                  {
-                    },
-                    { text:['DAYBOOK DETAILS'], 
-                            alignment: 'left',bold:true,margin:[-405,80,0,0],fontSize: 24}
-                ]
-            }
+    $scope.paymentOptions = [
+        {
+            "paymentOn": "CASH"
         },
-        footer: function(currentPage, pageCount) {
-            return { text:'Pagina '+ currentPage.toString() + ' de ' + pageCount, alignment: 'center',margin:[0,30,0,0] };
+        {
+            "paymentOn": "CHEQUE"
         },
-  content: [
-    {
-      layout: 'lightHorizontalLines', // optional
-      table: {
-        // headers are automatically repeated if the table spans over multiple pages
-        // you can declare how many rows should be treated as headers
-        // headerRows: 1,
-        // widths: [ '*', 'auto', 100, '*' ],
+        {
+            "paymentOn": "REFERRAL"
+        },
+        {
+            "paymentOn": "ONLINE TRANSACTION"
+        },
+        {
+            "paymentOn": "WAIVER"
+        },
+        {
+            "paymentOn": "Credit/Debit Card"
+        }
 
-        // body: [
-        //   [ 'First', 'Second', 'Third', 'The last one' ],
-        //   [ 'Value 1', 'Value 2', 'Value 3', 'Value 4' ],
-        //   [ { text: 'Bold value', bold: true }, 'Val 2', 'Val 3', 'Val 4' ]
-        // ]
-        widths: [ '40', 'auto', 'auto', 'auto', 'auto'],
-                    headerRows: 2,
-                    // keepWithHeaderRows: 1,
-                    body: body
-      }
+    ];
+
+    function getSortCutModeofPayment(type) {
+        var sortCutName = '';
+        switch (type) {
+            case 'CASH':
+                sortCutName = 'CH';
+                break;
+            case 'CHEQUE':
+                sortCutName = 'CHQ';
+                break;
+            case 'REFERRAL':
+                sortCutName = 'REF';
+                break;
+            case 'ONLINE TRANSACTION':
+                sortCutName = 'ONL';
+                break;
+            case 'WAIVER':
+                sortCutName = 'WAI';
+                break;
+            case 'Credit/Debit Card':
+                sortCutName = 'CARD';
+                break;
+            default:
+                sortCutName = type;
+        }
+        return sortCutName;
     }
-  ],
-  styles: {
-            header: {
-                fontSize: 28,
-                bold: true
-            },
-            subheader: {
-                fontSize: 15,
-                bold: true
-            },
-            quote: {
-                italics: true
-            },
-            small: {
-                fontSize: 8
-            },
-            sta: {
-                fontSize: 11,
-                bold: false,
-                alignment: 'justify'
+
+
+    $scope.generatePFD = function (datas) {
+
+        // daybookDetails.generatePFD(datas,$scope.searchData.date, $scope.searchData.dateTo);
+
+        var o = {};
+        var intDataSNo = 1;
+        var intDate = 0;
+        // var arrForeach = datas.reverse();
+        // for()
+        var ememem = datas[7-1];
+        // alert(ememem.VoucherNumber);
+        for(var i = datas.length ; i > 0; --i){
+            var element = datas[i-1];
+            var value = {};
+            value['SNo'] = intDataSNo;
+            value['Date'] = element.VoucherNumber + '\n/' + element.Date || '-';
+            var ListName = element.ListName;
+            value['PaidReceivedToFrom'] = element.PaidTo || '-';
+            var Sem = element.FeePaymentDetails || '-';
+            var Course = element.CourseName || '-';
+            var University = element.UniversityName || '-';
+            value['UnivCourseSem'] = University.concat('/ ' + Course, '/ ' + Sem);
+            value['Type'] = element.TypeName || '-';
+            value['ReceiptNo'] = element.ReceiptNo || '-';
+            value['Comments'] = element.ReceiptNoComments || '-';
+            value['ModeofPayment'] = getSortCutModeofPayment(element.ModeOfPayment) || '-';
+            value['Amount'] = (ListName == 'Expense' ? '-' : '+') + ' ' + element.Amount || '-';
+            value['Balance'] = element.Balance || '-';
+            o[intDate] = value;
+            intDate++;
+            intDataSNo++;
+        }
+        // alert(JSON.stringify(o));
+        // arrForeach.forEach(function (element) {
+        //     var value = {};
+        //     value['SNo'] = intDataSNo;
+        //     value['Date'] = element.VoucherNumber + '\n/' + element.Date || '-';
+        //     var ListName = element.ListName;
+        //     value['PaidReceivedToFrom'] = element.PaidTo || '-';
+        //     var Sem = element.FeePaymentDetails || '-';
+        //     var Course = element.CourseName || '-';
+        //     var University = element.UniversityName || '-';
+        //     value['UnivCourseSem'] = University.concat('/ ' + Course, '/ ' + Sem);
+        //     value['Type'] = element.TypeName || '-';
+        //     value['ReceiptNo'] = element.ReceiptNo || '-';
+        //     value['Comments'] = element.ReceiptNoComments || '-';
+        //     value['ModeofPayment'] = getSortCutModeofPayment(element.ModeOfPayment) || '-';
+        //     value['Amount'] = (ListName == 'Expense' ? '-' : '+') + ' ' + element.Amount || '-';
+        //     value['Balance'] = element.Balance || '-';
+        //     o[intDate] = value;
+        //     intDate++;
+        //     intDataSNo++;
+        // });
+        rows1 = o;
+        var headers = {
+            fila_1: {
+                col_1: { text: 'SNo', style: 'tableHeader', alignment: 'center', bold: true },
+                col_2: { text: 'Voucher Number Bill Number / DATE', style: 'tableHeader', alignment: 'center', bold: true },
+                col_3: { text: 'Paid To  Received From', style: 'tableHeader', alignment: 'center', bold: true },
+                col_4: { text: 'University / Course/ Sem', style: 'tableHeader', alignment: 'center', bold: true },
+                col_5: { text: 'Type', style: 'tableHeader', alignment: 'center', bold: true },
+                col_6: { text: 'Receipt No', style: 'tableHeader', alignment: 'center', bold: true },
+                col_7: { text: 'Comments', style: 'tableHeader', alignment: 'center', bold: true },
+                col_8: { text: 'Mode of Payment', style: 'tableHeader', alignment: 'center', bold: true },
+                col_9: { text: 'Amount', style: 'tableHeader', alignment: 'center', bold: true },
+                col_10: { text: 'Balance', style: 'tableHeader', alignment: 'center', bold: true },
             }
         }
-};
+        var body = [];
+        for (var key in headers) {
+            if (headers.hasOwnProperty(key)) {
+                var header = headers[key];
+                var row = new Array();
+                row.push(header.col_1);
+                row.push(header.col_2);
+                row.push(header.col_3);
+                row.push(header.col_4);
+                row.push(header.col_5);
+                row.push(header.col_6);
+                row.push(header.col_7);
+                row.push(header.col_8);
+                row.push(header.col_9);
+                row.push(header.col_10);
+                body.push(row);
+            }
+        }
+        for (var key in rows1) {
+            if (rows1.hasOwnProperty(key)) {
+                var data = rows1[key];
+                var row = new Array();
+                row.push(data.SNo.toString());
+                row.push(data.Date.toString());
+                row.push(data.PaidReceivedToFrom.toString());
+                row.push(data.UnivCourseSem.toString());
+                row.push(data.Type.toString());
+                row.push(data.ReceiptNo.toString());
+                row.push(data.Comments.toString());
+                row.push(data.ModeofPayment.toString());
+                row.push(data.Amount.toString());
+                row.push(data.Balance.toString());
+                body.push(row);
+            }
+        }
+
+
+        var docDefinition = {
+            pageMargins: [20, 85, 20, 50],
+            pageOrientation: 'landscape',
+            header: function () {
+                return {
+                    margin: 0,
+                    columns: [
+                        {
+                            text: ['DAYBOOK DETAILS' + '( ' + $scope.searchData.date + ' - ' + $scope.searchData.dateTo + ' )'],
+                            alignment: 'left', bold: true, margin: [20, 30, 0, 0], fontSize: 18
+                        }
+                    ]
+                }
+            },
+            footer: function (currentPage, pageCount) {
+                if (currentPage === pageCount) {
+                    return {
+                        columns: [
+                            {
+                                text: ['Note :' + '\n\t\t\t\t\t\t CH-CASH, CHQ-CHEQUE, REF-REFERRAL, ONL-ONLINE TRANSACTION, WAI-WAIVER, CARD-Credit/Debit Card'],
+                                alignment: 'left', margin: [10, 0, 0, 0], fontSize: 8
+                            },
+                            { text: ['\n Page ' + currentPage.toString() + ' of ' + pageCount], alignment: 'right', margin: [0, 10, 10, 0], fontSize: 10 }
+                        ]
+                    };
+                } else {
+                    return {
+                        text: 'Page ' + currentPage.toString() + ' of ' + pageCount, alignment: 'right', margin: [0, 10, 10, 0], fontSize: 10
+                    };
+                }
+            },
+            content: [
+                {
+                    //   layout: 'lightHorizontalLines', // optional
+                    table: {
+                        // headers are automatically repeated if the table spans over multiple pages
+                        // you can declare how many rows should be treated as headers
+                        // headerRows: 1,
+                        // widths: [ '40', '40', '40', '40', '40'],
+                        headerRows: 1,
+                        keepWithHeaderRows: 0,
+                        body: body
+                    },
+                    layout: {
+                        hLineWidth: function (i, node) {
+                            return 0.5;
+                        },
+                        vLineWidth: function (i, node) {
+                            // return (i === 0 || i === node.table.widths.length) ? 0 : 40;
+                            return 0.5;
+                        },
+                        hLineColor: function (i, node) {
+                            return '#2D4D81';
+                        },
+                        vLineColor: function (i, node) {
+                            return '#2D4D81';
+                        },
+                    }
+                }
+            ],
+            styles: {
+                header: {
+                    fontSize: 12,
+                    bold: true
+                },
+                subheader: {
+                    fontSize: 12,
+                    bold: true
+                },
+                quote: {
+                    italics: true
+                },
+                small: {
+                    fontSize: 6
+                },
+                sta: {
+                    fontSize: 8,
+                    bold: false,
+                    alignment: 'justify'
+                }
+            }
+        };
 
         // alert(JSON.stringify(rows1));
-        // pdfMake.createPdf(docDefinition).download();
-        pdfMake.createPdf(docDefinition).print();
+        //     pdfMake.createPdf(docDefinition).download('file.pdf', () => {
+        //     console.log("success");
+        // });
+        pdfMake.createPdf(docDefinition).print(() => {
+            console.log("success");
+        });
     }
-    
 
 
-    //==============================================================================
+
+    //   print PDF-------- END ==============================================================================
 
     // income expense type status list
     $scope.getIncomeExpenseType_Status = function () {
@@ -430,15 +520,15 @@ var docDefinition = {
             return val.TypeID === 'I003' ? 1 : 0;
         });
 
-         $scope.getExpenseTypes = $scope.incomeExpenseName.filter(function (val) {
+        $scope.getExpenseTypes = $scope.incomeExpenseName.filter(function (val) {
             return val.TypeID === 'I004' ? 1 : 0;
         });
 
-          $scope.getExpenseTypes = $scope.incomeExpenseName.filter(function (val) {
+        $scope.getExpenseTypes = $scope.incomeExpenseName.filter(function (val) {
             return val.TypeID === 'I005' ? 1 : 0;
         });
 
-           $scope.getExpenseTypes = $scope.incomeExpenseName.filter(function (val) {
+        $scope.getExpenseTypes = $scope.incomeExpenseName.filter(function (val) {
             return val.TypeID === 'I006' ? 1 : 0;
         });
 
@@ -452,7 +542,7 @@ var docDefinition = {
 
     $scope.editId = -1;
     $scope.setEditId = function (P) {
-         //alert(id);
+        //alert(id);
         $scope.editId = P;
     }
 
@@ -468,9 +558,9 @@ var docDefinition = {
             "description": "",
             "paidTo": "",
             "description_paid": "",
-           "voucherNumber": "",
-           "branch":"",
-           "name":""
+            "voucherNumber": "",
+            "branch": "",
+            "name": ""
         }
     }
 
@@ -486,38 +576,38 @@ var docDefinition = {
         "description_paid": "",
         "voucherNumber": "",
         "branch": "",
-        "name":""
+        "name": ""
     }
 
     $scope.copyModel = function (p) {
-        var inc = $scope.incomeExpenseType.filter((inc)=>inc.ID == p.Type);
+        var inc = $scope.incomeExpenseType.filter((inc) => inc.ID == p.Type);
         $scope.incexp = inc[0];
         $scope.myModel = {
             "id": p.ID,
             "date": p.Date,
             "incomeExpense": p.Name,
-            "type" : $scope.incexp.ID,
+            "type": $scope.incexp.ID,
             "amount": p.Amount,
             "status": p.Status,
             "description": p.Description,
             "paidTo": p.PaidTo,
             "description_paid": p.PaidDescription,
             "voucherNumber": p.VoucherNumber,
-            "branch":p.BranchCode,
+            "branch": p.BranchCode,
             "name": p.Name
 
         }
         // alert(JSON.stringify($scope.myModel));
     }
-    
-	
-	$scope.deleted1 = function (id) {
-	 var id=id;
-	 var reason=prompt("Reason For Deletion!","");
-	 $scope.deleteFeePayableEntry(reason,id);
-	}
+
+
+    $scope.deleted1 = function (id) {
+        var id = id;
+        var reason = prompt("Reason For Deletion!", "");
+        $scope.deleteFeePayableEntry(reason, id);
+    }
     //delete the income entry From the fees payable
-    $scope.deleteFeePayableEntry = function (reason,id) {
+    $scope.deleteFeePayableEntry = function (reason, id) {
         // alert(id);      
         SweetAlert.swal({
             title: "Warning!",
@@ -530,15 +620,15 @@ var docDefinition = {
             if (res === true) {
                 // alert(id);
                 // alert(stuId);
-                var deleteFeePayableDetails ={
+                var deleteFeePayableDetails = {
                     method: 'POST',
                     url: apiPoint.url + 'deleteDayBookFeePayableDetails/',
                     headers: {
                         'Content-Type': 'application/json'
                     },
                     data: {
-                        reason:reason,
-                        data:id,
+                        reason: reason,
+                        data: id,
                         requestDetails: localDetails
                     }
                 };
@@ -554,21 +644,21 @@ var docDefinition = {
         });
     }
 
-  
 
-  $scope.deleted = function (id) {
-	 
-	 var id=id;
-	 var a=prompt("Enter Reason!","");
-	 $scope.deleEditEntry(a,id);
-    
-    
-	
+
+    $scope.deleted = function (id) {
+
+        var id = id;
+        var a = prompt("Enter Reason!", "");
+        $scope.deleEditEntry(a, id);
+
+
+
     }
     // delete the income/expense list row
-    $scope.deleEditEntry = function (a,id) {
+    $scope.deleEditEntry = function (a, id) {
         swal({
-			
+
             title: "Are you sure?",
             text: "Your will not be able to recover this record!",
             type: "warning",
@@ -578,9 +668,9 @@ var docDefinition = {
             closeOnConfirm: false
         },
             function () {
-                $scope.indexDelete2(a,id);
+                $scope.indexDelete2(a, id);
             });
-        $scope.indexDelete2 = function (a,id) {
+        $scope.indexDelete2 = function (a, id) {
             var deleteDetails = {
                 method: 'POST',
                 url: apiPoint.url + 'deleteDayBookDetails/',
@@ -588,7 +678,7 @@ var docDefinition = {
                     'Content-Type': 'application/json'
                 },
                 data: {
-                    reason:a,data: id,
+                    reason: a, data: id,
                     requestDetails: localDetails
                 }
             };
@@ -635,10 +725,10 @@ var docDefinition = {
                 angular.element('.ng-invalid[name=' + firstError + ']').focus();
                 //    swal("The form cannot be submitted because it contains validation errors!", "Errors are marked with a red, dashed border!", "error");
             } else {
-                var sdate= $('#date').val();
-                 $scope.disableAddButton = true;
+                var sdate = $('#date').val();
+                $scope.disableAddButton = true;
                 var formate = "dd-MM-yyyy";
-                $scope.myModelAdd.date= sdate;
+                $scope.myModelAdd.date = sdate;
                 //$scope.myModelAdd.date = $filter('date')(new Date($scope.myModelAdd.date), formate);
                 $scope.myModelAdd.status = $scope.myModelAdd.name == 'I001' ? 'Pending' : 'Approved';
                 // $scope.data.push(myModelAdd);
@@ -658,34 +748,34 @@ var docDefinition = {
                     if (response.data.addDayBookStatus) {
                         swal(" ", "Income/Expense added successfully.", "success");
                         $state.go($state.current, {}, { reload: true });
-                         $scope.viewStudentDetailsPage = false;
+                        $scope.viewStudentDetailsPage = false;
                         //   $scope.myActivateDiv();
-                             $scope.disableAddButton = false;
+                        $scope.disableAddButton = false;
                     } else {
                         swal(" ", response.data.message, "error");
-                           $scope.disableAddButton = false;
+                        $scope.disableAddButton = false;
                     }
                 });
             }
         },
         reset: function (form) {
-                form.$setPristine(true);
-               $scope.myModelAdd = {
-        "id": "",
-        "date": "",
-        "name": "",
-        "type": "",
-        "amount": "",
-        "status": "",
-        "description": "",
-        "paidTo": "",
-        "description_paid": "",
-        "voucherNumber": ""
-    }
+            form.$setPristine(true);
+            $scope.myModelAdd = {
+                "id": "",
+                "date": "",
+                "name": "",
+                "type": "",
+                "amount": "",
+                "status": "",
+                "description": "",
+                "paidTo": "",
+                "description_paid": "",
+                "voucherNumber": ""
+            }
         }
     }
 
-    
+
     // $scope.myActivateDiv = function () {
     //     $scope.viewStudentDetailsPage = false;
     //              $scope.myModelAdd = {
@@ -700,7 +790,7 @@ var docDefinition = {
     //     "description_paid": "",
     //     "voucherNumber": ""
     // }
-      
+
     //     $timeout(function () {
     //         getDetails();
     //     }, 1000);
@@ -711,7 +801,7 @@ var docDefinition = {
     $scope.daybookeditUpdate = {
         submit: function (form, myModel) {
 
- //return false;
+            //return false;
             var firstError = null;
             if (form.$invalid) {
 
@@ -730,7 +820,7 @@ var docDefinition = {
                 swal("The form cannot be submitted because it contains validation errors!", "Errors are marked with a red, dashed border!", "error");
             } else {
                 //  alert(JSON.stringify($scope.myModel));exit();
-                  $scope.disableEditButton = true;
+                $scope.disableEditButton = true;
                 var updateDayBookDetails = {
                     method: 'POST',
                     url: apiPoint.url + 'updateDayBookDetails/',
@@ -744,40 +834,40 @@ var docDefinition = {
                 };
                 $http(updateDayBookDetails).then(function (response) {
                     if (response.data.updateDetailsStatus) {
-                        swal(" ","Updated successfully.", "success");
+                        swal(" ", "Updated successfully.", "success");
                         // for success state
                         $scope.editId = -1;
                         $scope.getDayBookList();
-                          $scope.disableEditButton = false;
+                        $scope.disableEditButton = false;
                     } else {
                         swal(" ", response.data.message, "error");
-                          $scope.disableEditButton = false;
+                        $scope.disableEditButton = false;
                     }
                 });
             }
         }
     }
 
-    
-      function styleXl(){
-            var mystyle = {
-                    sheetid: 'DAYBOOK DETAILS',
-                    headers: true,
-                    caption: {
-                    title:'DAYBOOK DETAILS'+ '('+ $scope.searchData.date + ' - ' +  $scope.searchData.dateTo +')',
-                    width: '300px',
-                    style:'font-size:50px;color:blue;' 
-                    },
-                    // style:'background:#00FF00',
-                    column: {
-                    style:'font-size:11px; color:blue;'
-                }
-                }; 
-            return mystyle;
-        }
-        $scope.exportData = function () {
-            alasql('SELECT Date as Date, ListName as IncomeExpense, VoucherNumber as VoucherNumberBillNumber, PaidTo as PaidToReceivedFrom,FeePaymentDetails as Sem, CourseName as Course,UniversityName as University,TypeName as Type, ReceiptNo as Receipt_No, ReceiptNoComments as Comments, ModeOfPayment as Mode_of_Payment,Amount as Amount,Balance as Balance, Reason, Activity INTO XLS("daybook_details.xls",?) FROM ?',[styleXl(),$scope.data]);
+
+    function styleXl() {
+        var mystyle = {
+            sheetid: 'DAYBOOK DETAILS',
+            headers: true,
+            caption: {
+                title: 'DAYBOOK DETAILS' + '(' + $scope.searchData.date + ' - ' + $scope.searchData.dateTo + ')',
+                width: '300px',
+                style: 'font-size:50px;color:blue;'
+            },
+            // style:'background:#00FF00',
+            column: {
+                style: 'font-size:11px; color:blue;'
+            }
         };
+        return mystyle;
+    }
+    $scope.exportData = function () {
+        alasql('SELECT Date as Date, ListName as IncomeExpense, VoucherNumber as VoucherNumberBillNumber, PaidTo as PaidToReceivedFrom,FeePaymentDetails as Sem, CourseName as Course,UniversityName as University,TypeName as Type, ReceiptNo as Receipt_No, ReceiptNoComments as Comments, ModeOfPayment as Mode_of_Payment,Amount as Amount,Balance as Balance, Reason, Activity INTO XLS("daybook_details.xls",?) FROM ?', [styleXl(), $scope.data]);
+    };
 
 
 }]);
diff --git a/Apollo/assets/js/filters/daybookPrintService.js b/Apollo/assets/js/filters/daybookPrintService.js
new file mode 100644
index 00000000..4000dd2a
--- /dev/null
+++ b/Apollo/assets/js/filters/daybookPrintService.js
@@ -0,0 +1,230 @@
+'use strict';
+
+app.service('daybookDetails', ['$scope', function ($scope) {
+
+    function getSortCutModeofPayment(type){
+    var sortCutName = '';
+       switch(type){
+            case 'CASH': 
+                      sortCutName = 'CH'; 
+                      break; 
+            case 'CHEQUE': 
+                      sortCutName = 'CHQ'; 
+                      break; 
+            case 'REFERRAL': 
+                      sortCutName = 'REF'; 
+                      break; 
+            case 'ONLINE TRANSACTION': 
+                      sortCutName = 'ONL'; 
+                      break; 
+            case 'WAIVER': 
+                      sortCutName = 'WAI'; 
+                      break; 
+            case 'Credit/Debit Card': 
+                      sortCutName = 'CARD'; 
+                      break; 
+            default: 
+                  sortCutName = type;  
+       }
+       return sortCutName;
+}
+
+   
+    $scope.generatePFD = function(datas, from, to) {
+                var o = {};
+                var intDataSNo = 1;
+                var intDate = 0;
+                var arrForeach = datas.reverse();
+                alert(JSON.stringify(arrForeach));
+                arrForeach.forEach(function(element) {
+                    var value = {};
+                    value['SNo'] = intDataSNo;
+                    value['Date'] = element.VoucherNumber + '\n/' + element.Date  || '-';
+                    // value['IncomeExpence'] = element.ListName || '-';
+                    var ListName = element.ListName;
+                    // value['VoucherBillNumber'] = element.VoucherNumber || '-';
+                    value['PaidReceivedToFrom'] = element.PaidTo || '-';
+                    var Sem = element.FeePaymentDetails || '-';
+                    var Course = element.CourseName || '-';
+                    var University = element.UniversityName || '-';
+                    value['UnivCourseSem'] = University.concat('/ ' + Course, '/ '+ Sem );
+                    value['Type'] = element.TypeName || '-';
+                    value['ReceiptNo'] = element.ReceiptNo || '-';
+                    value['Comments'] = element.ReceiptNoComments || '-';
+                    value['ModeofPayment'] = getSortCutModeofPayment(element.ModeOfPayment) || '-';
+                    // value['ModeofPayment'] = element.ModeOfPayment == ''? '-' : getSortCutModeofPayment(element.ModeOfPayment);
+                    value['Amount'] = (ListName == 'Expense' ? '-' : '+') +' '+ element.Amount || '-';
+                    value['Balance'] = element.Balance || '-';
+                    o[intDate] = value;
+                    intDate++;
+                    intDataSNo++;
+                });
+
+                rows1 = o;
+
+
+
+
+var headers = {
+    // fila_0:{
+    //     col_1:{ text: 'Faltas', style: 'tableHeader',rowSpan: 2, alignment: 'center',margin: [0, 8, 0, 0] },
+    //     col_2:{ text: 'Fecha', style: 'tableHeader',rowSpan: 2, alignment: 'center',margin: [0, 8, 0, 0] },
+    //     col_3:{ text: 'Descripción', style: 'tableHeader',rowSpan: 2, alignment: 'center',margin: [0, 8, 0, 0] },
+    //     col_4:{ text: 'Cita con acudientes', style: 'tableHeader',colSpan: 2, alignment: 'center' }
+    // },
+    fila_1:{
+        col_1:{ text: 'SNo', style: 'tableHeader', alignment: 'center', bold:true },
+        col_2:{ text: 'Voucher Number Bill Number / DATE', style: 'tableHeader', alignment: 'center', bold:true },
+        // col_3:{ text: 'Income Expense', style: 'tableHeader', alignment: 'center' }, 
+        // col_3:{ text: 'Voucher Number Bill Number', style: 'tableHeader', alignment: 'center' },
+        col_3:{ text: 'Paid To  Received From', style: 'tableHeader', alignment: 'center', bold:true },
+        // col_5:{ text: 'Sem', style: 'tableHeader', alignment: 'center'},
+        // col_6:{ text: 'Course', style: 'tableHeader', alignment: 'center'},
+        col_4:{ text: 'University / Course/ Sem', style: 'tableHeader', alignment: 'center', bold:true},
+        col_5:{ text: 'Type', style: 'tableHeader', alignment: 'center', bold:true},
+        col_6:{ text: 'Receipt No', style: 'tableHeader', alignment: 'center', bold:true},
+        col_7:{ text: 'Comments', style: 'tableHeader', alignment: 'center', bold:true},
+        col_8:{ text: 'Mode of Payment', style: 'tableHeader', alignment: 'center', bold:true},
+        col_9:{ text: 'Amount', style: 'tableHeader', alignment: 'center', bold:true},
+        col_10:{ text: 'Balance', style: 'tableHeader', alignment: 'center', bold:true},
+    }
+}
+var body = [];
+for (var key in headers){
+    if (headers.hasOwnProperty(key)){
+        var header = headers[key];
+        var row = new Array();
+        row.push( header.col_1 );
+        row.push( header.col_2 );
+        row.push( header.col_3 );
+        row.push( header.col_4 );
+        row.push( header.col_5 );
+        row.push( header.col_6 );
+        row.push( header.col_7 );
+        row.push( header.col_8 );
+        row.push( header.col_9 );
+        row.push( header.col_10 );
+        // row.push( header.col_11 );
+        // row.push( header.col_12 );
+        // row.push( header.col_13 );
+        body.push(row);
+    }
+}
+for (var key in rows1) 
+{
+    if (rows1.hasOwnProperty(key))
+    {
+        var data = rows1[key];
+        var row = new Array();
+        row.push( data.SNo.toString() );
+        row.push( data.Date.toString() );
+        // row.push( data.IncomeExpence.toString()  );
+        // row.push( data.VoucherBillNumber.toString() );
+        row.push( data.PaidReceivedToFrom.toString()  );
+        // row.push( data.Sem.toString() );
+        //  row.push( data.Course.toString()  );
+        row.push( data.UnivCourseSem.toString() );
+        row.push( data.Type.toString()  );
+        row.push( data.ReceiptNo.toString() );
+         row.push( data.Comments.toString()  );
+        row.push( data.ModeofPayment.toString() );
+        row.push( data.Amount.toString()  );
+        row.push( data.Balance.toString() );
+        body.push(row);
+    }
+}
+
+
+var docDefinition = {
+     pageMargins: [20,85,20,50],
+        pageOrientation: 'landscape',
+        header: function() {
+            return {
+                margin: 0,
+                columns: [
+                    { text:['DAYBOOK DETAILS' + '( '+from+ ' - ' + to +' )'], 
+                            alignment: 'left', bold:true ,margin:[20,30,0,0],fontSize: 18}
+                ]
+            }
+        },
+        footer: function(currentPage, pageCount) {
+            if(currentPage === pageCount){
+            return { 
+                columns:[ 
+                     { text:['Note :' + '\n\t\t\t\t\t\t CH-CASH, CHQ-CHEQUE, REF-REFERRAL, ONL-ONLINE TRANSACTION, WAI-WAIVER, CARD-Credit/Debit Card' ], 
+                            alignment: 'left',margin:[10,0,0,0], fontSize: 8},
+                    {text:['\n Page '+ currentPage.toString() + ' of ' + pageCount ], alignment: 'right',margin:[0,10,10,0], fontSize: 10} 
+                    ]
+            };
+            } else{
+            return { 
+                text:'Page '+ currentPage.toString() + ' of ' + pageCount,alignment: 'right',margin:[0,10,10,0], fontSize: 10
+            };
+            }
+        },
+  content: [
+    {
+    //   layout: 'lightHorizontalLines', // optional
+      table: {
+        // headers are automatically repeated if the table spans over multiple pages
+        // you can declare how many rows should be treated as headers
+        // headerRows: 1,
+        // widths: [ '*', 'auto', 100, '*' ],
+
+        // body: [
+        //   [ 'First', 'Second', 'Third', 'The last one' ],
+        //   [ 'Value 1', 'Value 2', 'Value 3', 'Value 4' ],
+        //   [ { text: 'Bold value', bold: true }, 'Val 2', 'Val 3', 'Val 4' ]
+        // ]
+        // widths: [ '40', '40', '40', '40', '40'],
+                    headerRows:1,
+                    keepWithHeaderRows: 0,
+                    body: body
+      },
+			layout: {
+				hLineWidth: function (i, node) {
+					return 0.5;
+				},
+				vLineWidth: function (i, node) {
+					// return (i === 0 || i === node.table.widths.length) ? 0 : 40;
+                    return 0.5;
+				},
+				hLineColor: function (i, node) {
+					return '#2D4D81';
+				},
+				vLineColor: function (i, node) {
+					return '#2D4D81';
+				},
+			}
+    }
+  ],
+  styles: {
+            header: {
+                fontSize: 12,
+                bold: true
+            },
+            subheader: {
+                fontSize: 12,
+                bold: true
+            },
+            quote: {
+                italics: true
+            },
+            small: {
+                fontSize: 6
+            },
+            sta: {
+                fontSize: 8,
+                bold: false,
+                alignment: 'justify'
+            }
+        }
+    };
+
+        // alert(JSON.stringify(rows1));
+        pdfMake.createPdf(docDefinition).download();
+        pdfMake.createPdf(docDefinition).print();
+    }
+    
+
+}]);
\ No newline at end of file
diff --git a/Apollo/assets/views/daybook/daybook.html b/Apollo/assets/views/daybook/daybook.html
index 4d8a0385..ac424f17 100755
--- a/Apollo/assets/views/daybook/daybook.html
+++ b/Apollo/assets/views/daybook/daybook.html
@@ -102,6 +102,15 @@
                                             }
                             </style>
 
+  <div class="pull-right" ng-if="data">
+                                    <button ng-click="exportData()"  class="btn btn-sm btn-default">
+                                           Export As Excel
+                                            </button>
+                                    <button  ng-click="generatePFD(datas)" class="btn btn-sm btn-default">
+                                                Export As PDF
+                                            </button>
+                                </div>
+
                             <div class="row">
                                 <div class="pull-right">
                                     <div style="margin: 8px;">
@@ -119,7 +128,7 @@
                                 /*font-size: 16px;*/
                              }
                              </style>
-                                <button ng-click="exportData()">export</button>
+                                <!--<button ng-click="exportData()">export</button>-->
                                 <table class="table table-bordered" export-table>
                                     <thead>
                                         <tr>
diff --git a/Apollo/assets/views/daybook/daybookadmin.html b/Apollo/assets/views/daybook/daybookadmin.html
index 84d364c5..b73852a5 100755
--- a/Apollo/assets/views/daybook/daybookadmin.html
+++ b/Apollo/assets/views/daybook/daybookadmin.html
@@ -101,7 +101,17 @@
                                                 white-space: pre;
                                             }
                             </style>
-
+<div class="row">
+    <!--<button ng-click="exportData()">export</button>-->
+    <div class="pull-right" ng-if="data">
+                                    <button ng-click="exportData()"  class="btn btn-sm btn-default">
+                                           Export As Excel
+                                            </button>
+                                    <button  ng-click="generatePFD(datas)" class="btn btn-sm btn-default">
+                                                Export As PDF
+                                            </button>
+                                </div>
+</div>
                             <div class="row">
                                 <div class="pull-right">
                                     <div style="margin: 8px;">
@@ -119,7 +129,7 @@
                                 /*font-size: 16px;*/
                              }
                              </style>
-                                <button ng-click="exportData()">export</button>
+                                <!--<button ng-click="exportData()">export</button>-->
                                 <table class="table table-bordered export-table">
                                     <thead>
                                         <tr>
diff --git a/Apollo/assets/views/daybook/daybooksuperadmin.html b/Apollo/assets/views/daybook/daybooksuperadmin.html
index 5dd5d61e..05f308b8 100755
--- a/Apollo/assets/views/daybook/daybooksuperadmin.html
+++ b/Apollo/assets/views/daybook/daybooksuperadmin.html
@@ -88,9 +88,9 @@
                                     <button ng-click="exportData()"  class="btn btn-sm btn-default">
                                            Export As Excel
                                             </button>
-                                    <!--<button  ng-click="generatePFD()" class="btn btn-sm btn-default">
+                                    <button  ng-click="generatePFD(datas)" class="btn btn-sm btn-default">
                                                 Export As PDF
-                                            </button>-->
+                                            </button>
                                 </div>
 </div>
 

From 35f3e52f800954c94ccd544b0a994edf7249053d Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Fri, 24 Aug 2018 16:21:37 +0530
Subject: [PATCH 10/10] edit course master changes for duplication validations

---
 Apollo/assets/js/controllers/dashboardCtrl.js      |  1 -
 Apollo/assets/js/controllers/feesStatusCtrl.js     |  6 +++---
 Apollo/assets/views/dashboard.html                 | 14 +++++++-------
 Apollo/assets/views/status-update/fees_status.html |  4 ++--
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/Apollo/assets/js/controllers/dashboardCtrl.js b/Apollo/assets/js/controllers/dashboardCtrl.js
index 56cc608f..9098144b 100755
--- a/Apollo/assets/js/controllers/dashboardCtrl.js
+++ b/Apollo/assets/js/controllers/dashboardCtrl.js
@@ -353,7 +353,6 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
 
     $scope.open = function (studentDetails) {
 
-
         // get student view details
         var getcourse = {
             method: 'POST',
diff --git a/Apollo/assets/js/controllers/feesStatusCtrl.js b/Apollo/assets/js/controllers/feesStatusCtrl.js
index 99e94d3b..2ef1749e 100755
--- a/Apollo/assets/js/controllers/feesStatusCtrl.js
+++ b/Apollo/assets/js/controllers/feesStatusCtrl.js
@@ -2387,7 +2387,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
 
     //  $scope.items = ['item1', 'item2', 'item3'];
 
-    $scope.openStudentView = function (studentDetails) {
+    $scope.open = function (studentDetails) {
 
 
         // get student view details
@@ -2515,7 +2515,7 @@ $scope.reregisterPDF = function(student){
                   //     console.log(subkey);
                   //         $scope.subjectDetails.push(subjectdata);
                   // });     
-                  $scope.open(coursefiltered,response.data.SubjectDetails,student);
+                  $scope.openReregistration(coursefiltered,response.data.SubjectDetails,student);
           //});
          
      }
@@ -2530,7 +2530,7 @@ $scope.reregisterPDF = function(student){
 
   
 }
-$scope.open = function(coursefiltered,Subjects,sem){
+$scope.openReregistration = function(coursefiltered,Subjects,sem){
   
      // console.log(PDFdata);
       //$rootScope.Student = PDFdata;
diff --git a/Apollo/assets/views/dashboard.html b/Apollo/assets/views/dashboard.html
index 6e35d5ad..81f47706 100755
--- a/Apollo/assets/views/dashboard.html
+++ b/Apollo/assets/views/dashboard.html
@@ -17,7 +17,7 @@
 <div ng-controller="dashboardCtrl">
 	<div class="container-fluid container-fullw padding-bottom-10">
 		<div class="row" data-ng-init="initCallTracking()">
-			<div class="col-sm-12">
+			<div class="col-sm-12" ng-controller="studentModalDemoCtrl">
 				<div class="panel panel-white no-radius">
 
 					<div class="panel-body no-padding">
@@ -36,7 +36,7 @@
 											view more
 										</a>
 									</div>
-									<table class="table table-hover no-margin" ng-if="emptyDataToday==false" ng-controller="studentModalDemoCtrl">
+									<table class="table table-hover no-margin" ng-if="emptyDataToday==false">
 										<thead>
 										<tr><!--<td colspan="5" style="background:#1FBBA6;color:#fff !important">Total Entries :{{todayFolloupDetails.length}}</td></tr>-->
 										<tr>
@@ -72,7 +72,7 @@
 											view more
 										</a>
 									</div>
-									<table class="table table-hover no-margin" ng-if="emptyDataToday==false" ng-controller="studentModalDemoCtrl">
+									<table class="table table-hover no-margin" ng-if="emptyDataToday==false">
 										<thead>
 										<tr><!--<td colspan="5" style="background:#1FBBA6;color:#fff !important">Total Entries :{{todayFolloupDetails.length}}</td></tr>-->
 										<tr>
@@ -113,7 +113,7 @@
 											view more
 										</a>
 									</div>
-									<table class="table table-hover" ng-if="emptyDataPending==false" ng-controller="studentModalDemoCtrl">
+									<table class="table table-hover" ng-if="emptyDataPending==false">
 										<thead>
 										<!-- <tr> -->
 										<!-- <td colspan="6" style="background:#C82E29;color:#fff !important">Total Entries :{{pendingFolloupDetails.length}}</td></tr> -->
@@ -153,7 +153,7 @@
 											view more
 										</a>
 									</div>
-									<table class="table table-hover" ng-if="emptyDataPending==false" ng-controller="studentModalDemoCtrl">
+									<table class="table table-hover" ng-if="emptyDataPending==false">
 										<thead>
 										<!-- <tr> -->
 										<!-- <td colspan="6" style="background:#C82E29;color:#fff !important">Total Entries :{{pendingFolloupDetails.length}}</td></tr> -->
@@ -196,7 +196,7 @@
 											view more
 										</a>
 									</div>
-									<table class="table table-hover" ng-if="emptyDataLead==false" ng-controller="studentModalDemoCtrl">
+									<table class="table table-hover" ng-if="emptyDataLead==false">
 										<thead>
 										<!-- <tr><td colspan="6" style="background:#DD5A82;color:#fff !important">Total Entries :{{leadDetails.length}}</td></tr> -->
 										<tr>
@@ -235,7 +235,7 @@
 											view more
 										</a>
 									</div>
-									<table class="table table-hover" ng-if="emptyDataLead==false" ng-controller="studentModalDemoCtrl">
+									<table class="table table-hover" ng-if="emptyDataLead==false">
 										<thead>
 										<!-- <tr><td colspan="6" style="background:#DD5A82;color:#fff !important">Total Entries :{{leadDetails.length}}</td></tr> -->
 										<tr>
diff --git a/Apollo/assets/views/status-update/fees_status.html b/Apollo/assets/views/status-update/fees_status.html
index 31c99c09..416f8ab2 100755
--- a/Apollo/assets/views/status-update/fees_status.html
+++ b/Apollo/assets/views/status-update/fees_status.html
@@ -126,9 +126,9 @@
             </thead>
             <tbody dir-paginate="user in studentInfo|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10">
             <tr>
-                <td><a tooltip="View Student" class="text-dark" ng-click="openStudentView(user);">{{user.Firstname}}</a></td>
+                <td><a tooltip="View Student" class="text-dark" ng-click="open(user);">{{user.Firstname}}</a></td>
                 <td>{{user.Lastname}}</td>
-                <td><a tooltip="View Student" class="text-dark" ng-click="openStudentView(user);">{{user.MobileNumber}}</a></td>
+                <td><a tooltip="View Student" class="text-dark" ng-click="open(user);">{{user.MobileNumber}}</a></td>
                 <td>{{user.UniversityName}}</td>
                 <td>{{user.CourseName}}</td>
               <!--  <td>{{user.SessionName}}</td>-->