Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec

Apollo/api/application/config/routes.php

@@ -295,6 +295,7 @@ $route['updateSessionScheduleDetails'] = 'SessionSchedule_Controller/updateSessi
 /// halltickets and Exam Attendance
 $route['getUniversityCourseDetails'] = 'HallTickets_Controller/getUniversityCourseDetails';
 $route['getSemesterSubjectDetails'] = 'HallTickets_Controller/getSemesterSubjectDetails';
+$route['getExistingMapping'] = 'HallTickets_Controller/getExistingMapping';
 $route['saveAllSemSubMapping'] = 'HallTickets_Controller/saveAllSemesterSubjectMapping';
 $route['getAllSemSubjects'] = 'HallTickets_Controller/getAllSemesterSubjects';
 $route['getIndividualCourseSemMappingDetails'] = 'HallTickets_Controller/getIndividualCourseSemMappingDetails';

Apollo/api/application/controllers/HallTickets_Controller.php

@@ -25,6 +25,7 @@ class HallTickets_Controller extends REST_Controller {
 		$this->methods['getUniversityCourseDetails_post']['limit'] = 500; // 500 requests per hour per user/key
 		$this->methods['updateSheduleDetails_post']['limit'] = 500; // 500 requests per hour per user/key
 	
+
         // load the model
         $this->load->model('Hallticket_model', 'Hallticket_model');
 
@@ -133,7 +134,7 @@ class HallTickets_Controller extends REST_Controller {
      * get semester and subjects list for sem course mapping
      * created by velz
      * */
-    public function getSemesterSubjectDetails_post()
+	   public function getSemesterSubjectDetails_post()
     {
 		$universityID = $this->post('universityID');
 		$courseIDS = $this->post('courseID');
@@ -168,6 +169,56 @@ class HallTickets_Controller extends REST_Controller {
 		
 	}
 
+	/*
+     * get semester and subjects list for sem course mapping
+     * created by Bala
+     * */
+    public function getExistingMapping_post()
+    {
+		$universityID = $this->post('universityID');
+		$courseIDS = $this->post('courseID');
+		$requestedBy = $this->post('requestedBy');
+		$branchId = $this->post('branchId');
+		$tempCourseArray = array();
+		foreach($courseIDS as $val)
+		{
+			foreach($val as $v){
+			$tempCourseArray[] = $v;
+			}     
+			//print_r($value);
+		}
+			
+	  $data['subjectDetails'] = $this->Hallticket_model->getExistDetails($universityID,$tempCourseArray,$branchId);
+	 // print_r( $data['subjectDetails']);
+	 // die();
+			//$data['semesterDetails'] = $this->Hallticket_model->getSemesterDetails($universityID,$tempCourseArray);
+		//1000 it means already data exist http sents 1000//
+			
+		if($data['subjectDetails'] == 1 )
+		{
+			$this->response([
+                'message' => 'Already Exist',
+                'status' => REST_Controller::HTTP_NOT_FOUND
+            ], REST_Controller::HTTP_NOT_FOUND); 	
+		}
+		
+		else if($data['subjectDetails'])
+		{
+			$data['status'] = REST_Controller::HTTP_OK;
+            // Set the response and exit
+            $this->response($data, REST_Controller::HTTP_OK);
+		}
+		else{
+			
+			$this->response([
+                'message' => 'No records found!',
+                'status' => REST_Controller::HTTP_NOT_FOUND
+            ], REST_Controller::HTTP_NOT_FOUND); 	
+			
+		}
+		
+	}
+	
 	public function getBatchAndCenterDetails_post()
 	{
 		$requestedBy = $this->post('requestedBy');

Apollo/api/application/models/Hallticket_model.php

@@ -181,6 +181,56 @@ class Hallticket_model extends CI_Model
         return $courseDetails->result();
     }
 
+     /*
+     * check existing data,only batchschedule.
+     * @params university id and CourseID
+     * created by Bala
+     * */
+
+	public function getExistDetails($universityID,$courseIDS,$branchId)
+	{
+		// echo $universityID;
+		// //foreach()
+		// print_r ($courseIDS);
+		// die();
+		$i=0;
+		foreach($courseIDS as $c)
+		{
+				
+				//	$tempCourseArray= $c['CourseID'];
+				
+				 $this->db->select ('count(*) as count');
+				$this->db->from('T_Batch_Schedule_Master');
+				$this->db->where('UniversityID',$universityID);
+				$this->db->where('CourseID', $c);
+				$result = $this->db->get();	
+				$res = $result->result();
+				
+				if($res[0]->count > 0 )
+				{
+					$i++;
+				}
+		}
+		
+		if( $i > 0 )
+		 {
+		 	return 1;
+		 }
+		else
+		{
+		$this->db->distinct();
+		$this->db->select('SubjectID,SubjectCode,SubjectName');
+		$this->db->from('T_SubjectMaster');
+		//$this->db->join('T_SubjectMaster','T_CourseSubject_Details.SubjectID=T_SubjectMaster.SubjectID');
+		$this->db->where('T_SubjectMaster.IsActive','1');
+	//	$this->db->where('T_CourseSubject_Details.UniversityID',$universityID);
+		$this->db->where_in('T_SubjectMaster.BranchCode',$branchId);
+		$result = $this->db->get();
+		//echo $this->db->last_query();
+		return $result->result();
+		}
+	}
+	
 	/*
      * get subject details
      * @params university id and CourseID

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  
@@ -399,6 +404,7 @@ 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 
+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."' 
 
    ";

Apollo/assets/i18n/en.json

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

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);
-               $scope.filterUniv = angular.fromJson($scope.univModel.university);
+            // if($scope.univModel.university !== null){
-            }else {
+               // $scope.filterUniv = angular.fromJson($scope.univModel.university);
-                $scope.filterUniv = '';
+            // }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)){

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 Balance Fee";
 			  }
               //console.log(selectedStudents);
             if(isNaN(myModel.date)){

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)){

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)){

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;
         }

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)){

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;

Apollo/assets/js/controllers/schCtrl.js

@@ -178,7 +178,7 @@ app.controller('schCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableP
 			 $scope.semDropDownShowLoading = true;
 				var getsubject = {
 						method: 'POST',
-						url: apiPoint.url + 'getSemesterSubjectDetails/',
+						url: apiPoint.url + 'getExistingMapping/',
 						headers: {
 							'Content-Type': 'application/json'
 						},
@@ -190,7 +190,7 @@ app.controller('schCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableP
 						}
 					};
 					$http(getsubject).then(function (response) {
-							
+							console.log(response);
 							 if(response.data.status == 200)
 							 {
 								 $scope.semDropDownShowLoading = false;
@@ -206,6 +206,7 @@ app.controller('schCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableP
 										"ScheduleDate":"",
 										"ScheduleStartTime":"",
 										"ScheduleEndTime":""
+										
 									});// For Main Dropdown
 								 });
 								 
@@ -220,7 +221,8 @@ app.controller('schCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableP
 						
 					},function(error){
 						 $scope.semDropDownShowLoading = false;
-								  swal('No Subjetcs Found','','error');
+								  swal(error.data.message,'','error');
+								   $state.go($state.current, {}, {reload: true});
 						
 					} );
 					

Apollo/assets/views/daybook/daybook.html

@@ -123,7 +123,7 @@
                                 <table class="table table-bordered" export-table>
                                     <thead>
                                         <tr>
-                                            <th ng-click="sort('Date')" style="width: 20%">Date
+                                            <th ng-click="sort('Date')" style="width: 20%;padding-right:5%">Date
                                                
                                             </th>
                                             <th ng-click="sort('ListName')" style="width: 5%">Income/</br>Expense

Apollo/assets/views/daybook/daybookadmin.html

@@ -123,7 +123,7 @@
                                 <table class="table table-bordered export-table">
                                     <thead>
                                         <tr>
-                                            <th ng-click="sort('Date')" style="width: 20%">Date
+                                            <th ng-click="sort('Date')" style="width: 20%;padding-right:5%">Date
                                                 <!--<span class="glyphicon sort-icon" ng-show="sortKey=='Date'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
                                             </th>
                                             <th ng-click="sort('ListName')" style="width: 5%">Income/</br>Expense

Apollo/assets/views/daybook/daybooksuperadmin.html

@@ -121,7 +121,7 @@
                                 <table class="table table-bordered export-table">
                                     <thead>
                                         <tr>
-                                            <th ng-click="sort('Date')" style="width: 20%">Date
+                                            <th ng-click="sort('Date')" style="width: 20%;padding-right:5%">Date
                                                 <!--<span class="glyphicon sort-icon" ng-show="sortKey=='Date'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
                                             </th>
                                             <th class="th" ng-click="sort('ListName')" style="width: 5%">Income/</br>Expense

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">
@@ -61,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>
@@ -102,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>

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>

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>

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>