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

Apollo/api/application/config/constants.php

@@ -113,6 +113,10 @@ defined('OTHER') OR define('OTHER','OTHER');
 // define default payment type
 defined('WAIVER') OR define('WAIVER','WAIVER');
 defined('REFERRAL') OR define('REFERRAL','REFERRAL');
+defined('CASH') OR define('CASH','CASH');
+defined('CHEQUE') OR define('CHEQUE','CHEQUE');
+defined('ONLINETRANSACTION') OR define('ONLINETRANSACTION','ONLINE TRANSACTION');
+defined('CreditDebitCard') OR define('CreditDebitCard','Credit/Debit Card');
 
 //encript database table name
 defined('LOGIN') OR define('LOGIN','T_Login');
@@ -163,6 +167,7 @@ defined('APPLICATION_CONST') OR define('APPLICATION_CONST','APPLICATION');
 // registration type constant
 defined('NEWREGISTRATION_CONST') OR define('NEWREGISTRATION_CONST','New Registration');
 defined('RE_REGISTRATION_CONST') OR define('RE_REGISTRATION_CONST','Re-registration');
+defined('DMC_CONST') OR define('DMC_CONST','DMC');
 
 
 
@@ -171,3 +176,6 @@ defined('RE_REGISTRATION_CONST') OR define('RE_REGISTRATION_CONST','Re-registrat
 //encripted password  -> md5 
 defined('ENCR_PASSWORD') OR define('ENCR_PASSWORD','e99a18c428cb38d5f260853678922e03');
 //end of encripted password
+
+
+

Apollo/api/application/config/routes.php

@@ -196,6 +196,8 @@ $route['update_DayBookDetails'] = 'DayBook_Controller/update_DayBookDetailsData'
 
 $route['AllgetUniversity'] = 'Report/getAllUniversity';
 $route['NewregDetails'] = 'Report/NewregDetails';
+$route['feepaidDetails'] = 'Report/feepaidDetails';
+
 /* Add New Contact Group */
 $route['addNewGroup'] = 'Broadcast_Controller/addNewGroup';
 $route['getGroups'] = 'Broadcast_Controller/getGroups';
@@ -293,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');
 
@@ -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/controllers/Report.php

@@ -443,5 +443,31 @@ class Report extends REST_Controller {
 
 
    
+   public function feepaidDetails_post()
+   {
+      $det['from'] = $this->post('from');
+      $det['to'] = $this->post('to');
+      $det['university'] = $this->post('university');
+
+      $feelist = $this->report_model->GetFeePaidDetails($det);
+
+      if($feelist)
+      {
+           $feelist['status'] = REST_Controller::HTTP_OK;
+            // Set the response and exit
+            $this->response($feelist, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
+      }
+      else
+      {
+          $this->response([
+                'message' => 'No records found!',
+                'status' => REST_Controller::HTTP_NOT_FOUND
+            ], REST_Controller::HTTP_NOT_FOUND);
+      }
+   }
+     
+   
+    
+
 
 }

Apollo/api/application/controllers/StatusUpdation_Controller.php

@@ -133,7 +133,9 @@ class StatusUpdation_Controller extends REST_Controller {
     // get certification type list
     public function getCertificateList_post() {
         $reqData = $this->post('data');
-        $certificateList = $this->statusupdation_model->get_certificate_list($reqData['localBranchID']); // Check if the employee exist
+        $stuData = $this->post('studentID');
+        $courseData = $this->post('courseID');
+        $certificateList = $this->statusupdation_model->get_certificate_list($reqData['localBranchID'], $stuData, $courseData); // Check if the employee exist
         if ($certificateList) {
             $certificateList['status'] = REST_Controller::HTTP_OK;
             // Set the response and exit

Apollo/api/application/models/Dashboard_model.php

@@ -118,7 +118,7 @@ class Dashboard_model extends CI_Model
        $feesDetails=array();
         $feesDetails['UniversityID']=$universityID;
         $feesDetails['UniversityName']=$universityName;
-        $this->db->select("SUM(SFS.CourseFees) as PayableFees");
+        $this->db->select("SUM(SFS.CourseFees+SFS.STFOrWR+Others) as PayableFees");
         $this->db->from( STUDENTS_FEES_STATUS . ' as SFS');
         $this->db->join( COURSE . ' as CU', 'CU.CourseID = SFS.CourseID');
         $this->db->where('CU.UniversityID',$universityID);
@@ -170,7 +170,7 @@ class Dashboard_model extends CI_Model
             foreach ($getBatchDetails->result() as $bRows){
                 $batchFeesDetails['BatchCode']=$bRows->BatchCode;
                 $batchFeesDetails['BatchName']=$bRows->BatchName;
-                $this->db->select("SUM(SFS.CourseFees) as PayableFees");
+                $this->db->select("SUM(SFS.CourseFees+SFS.STFOrWR+Others) as PayableFees");
                 $this->db->from( STUDENTS_FEES_STATUS . ' as SFS');
                 $this->db->where('SFS.BatchCode',$bRows->BatchCode);
                 $this->db->where('SFS.BranchCode',$branchCode);

Apollo/api/application/models/Fees_status_model.php

@@ -537,7 +537,7 @@ class Fees_status_model extends CI_Model
                     }
 
                     // Entry for all status screen except fees
-                    $this->entryForAllStatus($feesPaidDetails,$courseID);
+                    $this->entryForAllStatus($feesPaidDetails,$courseID,substr($feesName,0,3));
 
                 }
                 else{
@@ -1701,11 +1701,17 @@ class Fees_status_model extends CI_Model
      * Entry for all status update
      * created by kms
      * */
-    public function entryForAllStatus($feesDetails=null,$courseID=null){
+    public function entryForAllStatus($feesDetails=null,$courseID=null,$feesName=null){
         $singleFeesDetails=["SEM 1","SEM 2","SEM 3","SEM 4","SEM 5","SEM 6","SEM 7","SEM 8"];
         // get pick list expected status
         $this->db->select('ListCode,ListName');
+        if(strtoupper($feesName)==DMC_CONST){
+            $this->db->where('ListName','NOT APPLICABLE');
+        }
+        else{
             $this->db->where('ListName','EXPECTED');
+        }
+
         $this->db->where('BranchCode',$feesDetails['UpdatedBy']);
         $this->db->where('IsActive','1');
         $existStatusDetails = $this->db->get(PICK_LIST_DETAILS)->last_row();

Apollo/api/application/models/Hallticket_model.php

@@ -181,6 +181,70 @@ 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();
+		/////////////////////////
+		foreach($courseIDS as $c)
+		{
+		$this->db->distinct();
+		$this->db->select('SM.SubjectID,SM.SubjectCode,SM.SubjectName');
+		$this->db->from('T_SubjectMaster SM');
+		$this->db->join('T_SemSubMap_Child SC','SC.SubjectID = SM.SubjectID');
+		$this->db->join('T_SemSubMap_Master SMM','SMM.mapID =  SC.mapID');
+		$this->db->where('SMM.UniversityID',$universityID);
+		$this->db->where('SMM.CourseID',$c);
+		$result = $this->db->get();
+        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)-sum(sfp.bamount)),0) as Balance_fee,ifnull(sfp.bdate,'-') as Initial_paid_date, ifnull(std.AlternateNumber,'-') as AlternateNumber,ifnull(std.address,'-') as address
+        $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
@@ -19,7 +19,7 @@ class Reports_model extends CI_Model
         left join
         (SELECT StudentID as sid,FeesId as fid,BillDate as bdate,sum(BillAmount) as bamount,BillNO as billno FROM T_Students_Fees_PaidDetails
 where IsActive = 1 
-group by sid,fid,billno) as sfp on sfp.sid=sfs.sid and sfp.fid=sfs.fid
+group by sid,fid) as sfp on sfp.sid=sfs.sid and sfp.fid=sfs.fid
         left join
         (SELECT ID as cid,CourseID as ccid,FeesType as ftype,Sem_Year as syear FROM T_Course_Fees_Details) as cfd 
         on cfd.cid=sms.cid
@@ -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."'
         ";
        
@@ -48,7 +49,7 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen
             $sql.=" and cm.uid = '".$u."'";
           
           }
-          $sql.=" group by Student_id,Course_id,Branch,Batch_code,Sem";
+          $sql.=" group by Student_id,Course_id,Branch,Batch_code,Sem,univID";
           
         $leadDet=$this->db->query($sql);
         $statusDetails = $leadDet->result();
@@ -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)-sum(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
@@ -110,7 +111,7 @@ group by sid,sem,cid,lcode,branch) as sms
         left join
         (SELECT StudentID as sid,FeesId as fid,BillDate as bdate,sum(BillAmount) as bamount,BillNO as billno FROM T_Students_Fees_PaidDetails
 where IsActive = 1 
-group by sid,fid,billno) as sfp on sfp.sid=sfs.sid and sfp.fid=sfs.fid
+group by sid,fid) as sfp on sfp.sid=sfs.sid and sfp.fid=sfs.fid
         left join
         (SELECT ID as cid,CourseID as ccid,FeesType as ftype,Sem_Year as syear FROM T_Course_Fees_Details) as cfd 
         on cfd.cid=sms.cid
@@ -132,14 +133,13 @@ from T_AnswerBookletStatus abs
 left join T_PickListDetails list on list.ListCode=abs.ListCode 
 where AnsDate is not null and ID in (select max(ID) from T_AnswerBookletStatus where AnsDate is not null group by StudentID,Sem)
 group by sid,Sem) as andate on andate.sid=sms.sid and andate.Sem=cfd.syear
-left join (select abs.ID,StudentID as sid,Sem_Year as sem,
+left join (SELECT rd.StudentID as sid,rd.CourseID as cid,max(if(list.ListName = 'SENT TO UNIVERSITY', afs.AppFormDate,'-')) as appdate,Sem_Year as sem 
-max(if(ListName = 'SENT TO UNIVERSITY', AppDate,'-')) as appdate
+FROM T_Registration_Details rd
-from T_ApplicationStatus abs
+left join T_ApplicationFormStatus afs on afs.Registration_Details_ID=rd.ID
-left join T_PickListDetails list on list.ListCode=abs.ListCode 
+left join T_PickListDetails list on list.ListCode=afs.ListCode 
-left join T_Course_Fees_Details cf on cf.CourseID=abs.CourseID 
+left join T_Course_Fees_Details cf on cf.ID=rd.FeeType
-where AppDate is not null
- and abs.ID in (select max(ID) from T_ApplicationStatus where AppDate is not null group by StudentID)
 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."'  
         ";
        
@@ -170,49 +170,43 @@ 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 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(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(sfp.bdate,'-') as Document_fee_paid_date,ifnull(((sfs.cf + sfs.stf + sfs.others)-sum(sfp.bamount)),0) as Balance_fee,ifnull(cfd.syear,'-') as Sem_year,ifnull(sms.sem,'-') as Sem,ifnull(list.status,'-') as Markcard_status,ifnull(sms.mdate,'-') as Markcard_date,ifnull(sms.mcmts,'-') as Markcard_comments,ifnull(ams.certname,'-') as Certificate_name,ifnull(alist.astatus,'-') as Certificate_status,ifnull(ams.adate,'-') as Certificate_date,ifnull(ams.acmts,'-') as Certificate_comments,ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber 
+        $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 
+from 
-		 (SELECT ID,StudentID as sid,CourseID as cid,BranchCode as branch,ListCode as lcode,             
+(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
-         CertificationType as ctype,CDate as mdate,Sem as sem,Comments as mcmts 
-	    FROM T_CertificationStatus  
-		WHERE ID IN (SELECT max(ID) FROM T_CertificationStatus group by StudentID,CourseID,BranchCode,Sem)
-		group by sid,sem,cid,lcode,branch) as sms
-left join
-        (SELECT ID,StudentID as sid,CourseID as cid,app.BranchCode as branch,ListCode as lcode,AppDate as        adate,Comments as acmts,CertificationType as ctype,CertificateName as certname 
 		FROM T_ApplicationStatus as app
         left join T_CertificationMaster cm on cm.CertificationID=app.CertificationType
-        where CertificationType != 'CERT024' and ID IN (SELECT max(ID) FROM T_ApplicationStatus group by        StudentID,CourseID,BranchCode)
+        left join T_PickListDetails p on p.ListCode = app.ListCode
-        group by sid,cid,lcode,branch) 
+        left join BalFees bal on bal.student=app.StudentID and bal.course=app.CourseID 
-    as ams on ams.branch=sms.branch and ams.sid=sms.sid
+        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 
-        (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 
+        (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 
         FROM T_Students_Fees_Status
-        group by sid,fid,cid,batch) 
+        group by sid,cid) 
-    as sfs on sfs.sid=sms.sid and sms.cid=sfs.ftype
+    as sfs on sfs.sid=sms.sid and sfs.cid=sms.cid
 left join
-        (SELECT StudentID as sid,FeesId as fid,BillDate as bdate,sum(BillAmount) as bamount,BillNO as billno        FROM T_Students_Fees_PaidDetails
+        (SELECT sfp.StudentID as sid,sfp.FeesId as fid,sfs.CourseID as cid,BillDate as bdate,sum(BillAmount) as bamount,BillNO as billno        FROM T_Students_Fees_PaidDetails sfp
+left join T_Students_Fees_Status sfs on sfs.FeesId=sfp.FeesId       
 where IsActive = 1
-        group by sid,fid,billno) 
+        group by sid,cid) 
-    as sfp on sfp.sid=sfs.sid and sfp.fid=sfs.fid
+    as sfb on sfb.sid=sms.sid
-left join
+ left join 
-        (SELECT ID as cid,CourseID as ccid,FeesType as ftype,Sem_Year as syear FROM T_Course_Fees_Details)    as cfd on cfd.cid=sms.cid
+       (select ID,StudentId,FeesID,BillDate from T_Students_Fees_PaidDetails where ID in 
-left join 
+       (select min(ID) from T_Students_Fees_PaidDetails group by FeesID)
-        (SELECT ListCode as lcode,ListName as status FROM T_PickListDetails) 
+       group by FeesID) as sfp on sfp.FeesID=sfb.fid
-    as list on list.lcode=sms.lcode
-left join 
-        (SELECT ListCode as lcode,ListName as astatus FROM T_PickListDetails) 
-    as alist on alist.lcode=ams.lcode
 left join
         (SELECT CourseID as cid,cm.UniversityID as cuid,u.UniversityID as uid,CourseName as course,     
         UniversityName as uname,cm.BranchCode as branch FROM T_CourseMaster as cm 
         left join T_UniversityMaster as u on u.UniversityID=cm.UniversityID 
         group by cid
         order by CourseID) 
-    as cm on cm.cid=cfd.ccid
+    as cm on cm.cid=sms.cid
 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
+left join 
-       where std.active = 1 and sms.branch = '".$br."'
+       (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."'
         ";
        
         if ($bat!= ''){
@@ -229,12 +223,12 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen
             $fromd= date("Y-m-d",strtotime($from));
             $tod=date("Y-m-d",strtotime($to));
             
-            $sql.="and STR_TO_DATE(ams.adate,'%d-%m-%Y') >= '".$fromd."'
+            $sql.="and STR_TO_DATE(sms.adate,'%d-%m-%Y') >= '".$fromd."'
-                and STR_TO_DATE(ams.adate,'%d-%m-%Y') <= '".$tod."'";
+                and STR_TO_DATE(sms.adate,'%d-%m-%Y') <= '".$tod."'";
         
         }
-          $sql.=" group by Student_id,Course_id,Batch_code,Branch_code";
+          $sql.=" group by Student_id,cid,ctype";
-          
+         // echo $sql;
         $leadDet=$this->db->query($sql);
         $cert_statusDetails = $leadDet->result();
         if (count($cert_statusDetails) > 0) {
@@ -250,36 +244,43 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen
     }
     public function mark_cert_status($bat=null,$br=null,$u=null,$from=null,$to=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(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(sfp.bdate,'-') as Document_fee_paid_date,ifnull(((sfs.cf + sfs.stf + sfs.others)-sum(sfp.bamount)),0) as Balance_fee,ifnull(cfd.syear,'-') as Sem_year,ifnull(sms.idate,'-') as idate,ifnull(sms.istatus,'-') as istatus,ifnull(sms.rdate,'-') as rdate,ifnull(sms.rstatus,'-') as rstatus,ifnull(sms.acmts,'-') as cmnts,sms.certname as Certificate_name
+        $sql = "select sms.ID,sms.sid,sms.cid,sms.fid,sms.sem as Sem_year,sms.certname as Certificate_name,sms.ctype,
-        from 
+sms.issuedate,sms.istatus,
-		 (SELECT c.ID as id,StudentID as sid,c.CourseID as cid,c.BranchCode as branch,c.ListCode as lcode,p.ListName as status,c.CertificationType as ctype,c.CDate as adate,c.Comments as acmts,c.CertificationType as certname,if(max(p.ListName)='ISSUED TO STUDENT',p.ListName,'-') as istatus,if(max(p.ListName)='ISSUED TO STUDENT',c.CDate,'-') as idate,if(max(p.ListName)='RECEIVED',p.ListName,'-') as rstatus,if(max(p.ListName)='RECEIVED',c.CDate,'-') as rdate 
+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 T_CertificationStatus c
+from 
- left join T_PickListDetails p on p.ListCode=c.ListCode
+(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,
- left join T_CertificationMaster cm on cm.CertificationID=c.CertificationType
+max(if(ListName = 'ISSUED TO STUDENT', CDate,'-')) as issuedate,max(if(ListName = 'ISSUED TO STUDENT', ListName,'-')) as istatus,
-WHERE c.ID IN (SELECT max(ID) FROM T_CertificationStatus group by StudentID,CourseID,BranchCode,Sem,CertificationType)
+max(if(ListName = 'RECEIVED', CDate,'-')) as rcvedate,max(if(ListName = 'RECEIVED', ListName,'-')) as rstatus,c.Comments as acmts
- and (p.ListName like 'ISSUED TO STUDENT' or p.ListName like 'RECEIVED') 
+from T_CertificationStatus c
-group by sid,sem,cid,branch,ctype
+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 app.ID as id,app.StudentID as sid,app.CourseID as cid,app.BranchCode as branch,app.ListCode as lcode,p.ListName as status,app.CertificationType as ctype,app.AppDate as adate,app.Comments as acmts,cm.CertificateName as certname,if(max(p.ListName)='ISSUED TO STUDENT',p.ListName,'-') as istatus,if(max(p.ListName)='ISSUED TO STUDENT',app.AppDate,'-') as idate,if(max(p.ListName)='RECEIVED',p.ListName,'-') as rstatus,if(max(p.ListName)='RECEIVED',app.AppDate,'-') as rdate  
+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,
-		FROM T_ApplicationStatus as app
+max(if(ListName = 'ISSUED TO STUDENT', AppDate,'-')) as issuedate,max(if(ListName = 'ISSUED TO STUDENT', ListName,'-')) as istatus,
-        left join T_CertificationMaster cm on cm.CertificationID=app.CertificationType
+max(if(ListName = 'RECEIVED', AppDate,'-')) as rcvedate,max(if(ListName = 'RECEIVED', ListName,'-')) as rstatus,a.Comments as acmts
-        left join T_PickListDetails p on p.ListCode=app.ListCode
+from T_ApplicationStatus a
-        where CertificateName not like 'APPLICATION%' and ID IN (SELECT max(ID) FROM T_ApplicationStatus group by        StudentID,CourseID,BranchCode,CertificationType) and (p.ListName like 'ISSUED TO STUDENT' or p.ListName like 'RECEIVED') 
+left join 
-        group by sid,cid,lcode,branch,ctype) as sms 
+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 
+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 
         FROM T_Students_Fees_Status
-        group by sid,fid,cid,batch) 
+        group by sid,cid) 
     as sfs on sfs.sid=sms.sid and sfs.cid=sms.cid
 left join
-        (SELECT StudentID as sid,FeesId as fid,BillDate as bdate,sum(BillAmount) as bamount,BillNO as billno        FROM T_Students_Fees_PaidDetails
+        (SELECT sfp.StudentID as sid,sfp.FeesId as fid,sfs.FeesType as ftype,sfs.CourseID as cid,BillDate as bdate,sum(BillAmount) as bamount,BillNO as billno  FROM T_Students_Fees_PaidDetails sfp
+left join T_Students_Fees_Status sfs on sfs.FeesId=sfp.FeesId       
 where IsActive = 1
-        group by sid,fid,billno) 
+        group by sid,cid) 
-    as sfp on sfp.sid=sms.sid and sfp.fid=sfs.fid
+    as sfb on sfb.sid=sms.sid and sfb.fid=sms.fid  and (sfb.ftype=sms.cid or sfb.cid=sms.cid)
-left join
+    left join
-        (SELECT ID as cid,CourseID as ccid,FeesType as ftype,Sem_Year as syear FROM T_Course_Fees_Details)    as cfd on cfd.ccid=sms.cid
-left join
         (SELECT CourseID as cid,cm.UniversityID as cuid,u.UniversityID as uid,CourseName as course,     
         UniversityName as uname,cm.BranchCode as branch FROM T_CourseMaster as cm 
         left join T_UniversityMaster as u on u.UniversityID=cm.UniversityID 
@@ -288,8 +289,9 @@ left join
     as cm on cm.cid=sms.cid
 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
+left join 
-      where std.active = 1   and sms.branch = '".$br."'     
+       (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."'     
         ";
        
         if ($bat!= ''){
@@ -306,13 +308,13 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen
             $fromd= date("Y-m-d",strtotime($from));
             $tod=date("Y-m-d",strtotime($to));
             
-            $sql.="and STR_TO_DATE(sfp.bdate,'%d-%m-%Y') >= '".$fromd."'
+            $sql.="and STR_TO_DATE(sms.mdate,'%d-%m-%Y') >= '".$fromd."'
-                and STR_TO_DATE(sfp.bdate,'%d-%m-%Y') <= '".$tod."'";
+                and STR_TO_DATE(sms.mdate,'%d-%m-%Y') <= '".$tod."'";
         
         }
         
-          $sql.=" group by Student_id,Course_id,Batch_code,Branch_code,Sem_year,Certificate_name";
          
+          //echo $sql;
           
         $leadDet=$this->db->query($sql);
         $mcert_statusDetails = $leadDet->result();
@@ -329,8 +331,9 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen
     }
     public function expense($from=null,$to=null,$br=null){
        
-        $sql = "SELECT ifnull(dbm.Date,'-') as date,ifnull(exp.TypeName,'-') as Expense_name,ifnull(sum(dbm.Amount),0) as Amount FROM (SELECT @s:= 0) AS s,T_Income_Outcome_Master exp
+        $sql = "SELECT ifnull(dbm.Date,'-') as date,ifnull(exp.TypeName,'-') as Expense_name,ifnull(sum(dbm.Amount),0) as Amount,b.BranchName as branch FROM (SELECT @s:= 0) AS s,T_Income_Outcome_Master exp
         join T_DayBookMaster dbm on dbm.Type=exp.ID
+		left join T_BranchMaster b on b.BranchCode=exp.BranchCode
         where dbm.Name = 'I001' and exp.TypeName not like 'FEES' and dbm.Status = 'Approved' and exp.BranchCode = '".$br."'
         ";
        
@@ -360,7 +363,7 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen
     }
     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  
@@ -376,7 +379,7 @@ left join
 left join
         (SELECT StudentID as sid,FeesId as fid,BillDate as bdate,sum(BillAmount) as bamount,BillNO as billno        FROM T_Students_Fees_PaidDetails
         where IsActive = 1
-        group by sid,fid,billno) 
+        group by sid,fid) 
     as sfp on sfp.sid=sfs.sid and sfp.fid=sfs.fid
 left join
         (SELECT ID as cid,CourseID as ccid,FeesType as ftype,Sem_Year as syear FROM T_Course_Fees_Details)    as cfd on cfd.ccid=sfs.cid and cfd.cid=sfs.ftype
@@ -401,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."'  
         ";
        
@@ -433,54 +437,72 @@ group by sid,Sem
     }
     public function app_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(sms.cid,'-') as Course_id,ifnull(cfd.syear,'-') as Sem_year,ifnull(sms.branch,'-') as Branch_code,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(sms.status,'-') as Status,ifnull(sfp.bdate,'-') as Admission_date,
+       $sql = "SELECT * FROM (SELECT   
-        sms.adate as appdate,ifnull(reg.formtype,'-') as formtype,sfs.batch as batch
+    APFS.Registration_Details_ID AS regid,
-        from 
+      APFS.ListCode as StatusCode, 
-			 (SELECT ID,StudentID as sid,CourseID as cid,app.BranchCode as branch,list.ListName as status,app.ListCode as lcode,AppDate as adate,Comments as acmts,app.CertificationType as ctype,CertificateName as certname 
+      APFS.AppFormDate as StatusUpdationOn, 
-FROM T_ApplicationStatus as app
+      APFS.Comments as StatusComments,
-left join T_CertificationMaster cm on cm.CertificationID=app.CertificationType
+      PKL.ListName as StatusName,
-left join T_PickListDetails list on list.ListCode=app.ListCode
+      concat(STU.Firstname,' ', STU.Lastname) as Student_name,
-where CertificateName like 'APPLICATION%' and list.ListName != 'SENT TO UNIVERSITY' and ID IN (SELECT max(ID) FROM T_ApplicationStatus group by StudentID,CourseID,BranchCode,CertificationType,ListCode)
+      STU.Fathername as FatherName,
-group by sid,cid,lcode,branch,ctype) as sms
+      STU.MobileNumber as Phone_number,
-left join
+      STU.AlternateNumber as AlternateNumber,
-(select StudentID as sid,CourseID as cid,BatchCode as batch,FeesID as fid from T_Students_Fees_Status) as sfs on sfs.sid=sms.sid and sfs.cid=sms.cid
+      STU.PresentAddress as address,
-left join
+      COUR.CourseName as Course_name,
-        (SELECT ID,StudentID as sid,FeesId as fid,BillDate as bdate,sum(BillAmount) as bamount,BillNO as billno        FROM T_Students_Fees_PaidDetails
+      UNIV.UniversityName as University,
-WHERE IsActive = 1 and ID IN (SELECT min(ID) FROM T_Students_Fees_PaidDetails group by StudentID,FeesID)
+      sfpd.BILL as InitialPayDate,
-        group by sid,fid,billno) 
+      RD.Student_Fee_Status_Id as FeesStatusID,
-    as sfp on sfp.sid=sfs.sid and sfs.fid=sfp.fid
+      STU_COUR.EnrollmentID as EnrollmentNumber,
-left join
+      CFD.Sem_Year as Sem_Year,
-        (SELECT ID as cid,CourseID as ccid,FeesType as ftype,Sem_Year as syear FROM T_Course_Fees_Details)    as cfd on cfd.ccid=sms.cid
+      RD.RegistrationType as FormType,
-left join
+      STU.StudentID as Student_id
-        (SELECT CourseID as cid,cm.UniversityID as cuid,u.UniversityID as uid,CourseName as course,     
+FROM T_ApplicationFormStatus AS APFS LEFT JOIN T_Registration_Details AS RD ON RD.ID = APFS.Registration_Details_ID
-        UniversityName as uname,cm.BranchCode as branch FROM T_CourseMaster as cm 
+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_UniversityMaster as u on u.UniversityID=cm.UniversityID 
+LEFT JOIN T_Course_Fees_Details AS CFD ON CFD.ID = RD.FeeType
-        group by cid
+LEFT JOIN T_UniversityMaster AS UNIV ON UNIV.UniversityID = COUR.UniversityID
-        order by CourseID) 
+LEFT JOIN (SELECT FeesId AS FeeID, min(CreatedOn), BillDate AS BILL  FROM T_Students_Fees_PaidDetails GROUP BY FeesId) AS sfpd ON sfpd.FeeID = RD.Student_Fee_Status_Id
-    as cm on cm.cid=cfd.ccid
+where COUR.UniversityID = '$u' and RD.BatchCode = '$bat'and STU_COUR.BranchID = '$br' and STU.IsActive = '1'
-left join 
+ORDER BY StatusUpdationOn DESC) x
-        (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
+GROUP BY x.regid";
-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 and scd.branch=sms.branch
-left join 
-(Select StudentID as sid,CourseID as cid,BatchCode as bcode,FeeType as ftype,BranchCode as branch,RegistrationType as formtype from T_Registration_Details) as reg on reg.sid=sms.sid and reg.cid=sms.cid
-
-       where std.active = 1 and sms.branch = '".$br."'  
-        ";
-       
-        if ($bat!= ''){
-      
-            $sql.=" and sfs.batch = '".$bat."'";
-          
-          }
-          if ($u!= ''){
-      
-            $sql.=" and cm.uid = '".$u."'";
-          
-          }
-        $sql.=" group by Student_id,Course_id,Branch_code,Sem_year";
-        
 
+// SELECT * FROM (SELECT   APFS.Registration_Details_ID AS regid,      APFS.ListCode AS StatusCode,       APFS.AppFormDate AS StatusUpdationOn,       APFS.Comments AS StatusComments,      PKL.ListName AS StatusName,      concat(STU.Firstname,' ', STU.Lastname) AS StudentName,      STU.Fathername AS FatherName,      STU.MobileNumber AS Phone_number,      COUR.CourseName AS CourseName,      UNIV.UniversityName AS UniversityName,      sfpd.BILL AS InitialPayDate,      RD.Student_Fee_Status_Id AS FeesStatusID,      STU_COUR.EnrollmentID AS EnrollmentNumber,      CFD.Sem_Year AS Sem_Year,      RD.RegistrationType AS FormType,      STU.StudentID
+// FROM T_ApplicationFormStatus AS APFS LEFT JOIN T_Registration_Details AS RD ON RD.ID = APFS.Registration_Details_ID
+// LEFT JOIN T_PickListDetails AS PKL ON PKL.ListCode =  APFS.ListCode  LEFT JOIN T_StudentDetails AS STU ON STU.StudentID = RD.StudentID LEFT JOIN T_CourseMaster AS COUR ON COUR.CourseID = RD.CourseID LEFT JOIN T_Student_CourseDetails AS STU_COUR ON STU_COUR.StudentID = RD.StudentID AND STU_COUR.CourseID = RD.CourseID
+// LEFT JOIN T_Course_Fees_Details AS CFD ON CFD.ID = RD.FeeType
+// LEFT JOIN T_UniversityMaster AS UNIV ON UNIV.UniversityID = COUR.UniversityID
+// LEFT JOIN (SELECT FeesId AS FeeID, min(CreatedOn), BillDate AS BILL  FROM T_Students_Fees_PaidDetails GROUP BY FeesId) AS sfpd ON sfpd.FeeID = RD.Student_Fee_Status_Id
+// ORDER BY StatusUpdationOn DESC) x
+// GROUP BY x.regid
 
+//         $sql = "SELECT 
+    //   APFS.ListCode as StatusCode, 
+    //   APFS.AppFormDate as StatusUpdationOn, 
+    //   APFS.Comments as StatusComments,
+    //   PKL.ListName as StatusName,
+    //   concat(STU.Firstname,' ', STU.Lastname) as Student_name,
+    //   STU.Fathername as FatherName,
+    //   STU.MobileNumber as Phone_number,
+    //   STU.AlternateNumber as AlternateNumber,
+    //   STU.PresentAddress as address,
+    //   COUR.CourseName as Course_name,
+    //   UNIV.UniversityName as University,
+    //   sfpd.BILL as InitialPayDate,
+    //   RD.Student_Fee_Status_Id as FeesStatusID,
+    //   STU_COUR.EnrollmentID as EnrollmentNumber,
+    //   CFD.Sem_Year as Sem_Year,
+    //   RD.RegistrationType as FormType,
+    //   STU.StudentID
+// FROM T_ApplicationFormStatus as APFS 
+// LEFT JOIN T_Registration_Details as RD ON RD.ID = APFS.Registration_Details_ID
+// LEFT JOIN T_PickListDetails as PKL ON PKL.ListCode =  APFS.ListCode  
+// LEFT JOIN T_StudentDetails as STU ON STU.StudentID = RD.StudentID 
+// LEFT JOIN T_CourseMaster as COUR ON COUR.CourseID = RD.CourseID 
+// LEFT JOIN T_Student_CourseDetails as STU_COUR ON STU_COUR.StudentID = RD.StudentID AND STU_COUR.CourseID = RD.CourseID
+// LEFT JOIN T_Course_Fees_Details as CFD ON CFD.ID = RD.FeeType
+// LEFT JOIN T_UniversityMaster as UNIV ON UNIV.UniversityID = COUR.UniversityID
+// LEFT JOIN (Select FeesId as FeeID, min(CreatedOn), BillDate as BILL  FROM T_Students_Fees_PaidDetails group by FeesId) as sfpd on sfpd.FeeID = RD.Student_Fee_Status_Id
+// where COUR.UniversityID = '$u' and RD.BatchCode = '$bat'and STU_COUR.BranchID = '$br' and STU.IsActive = '1'
+// group by APFS.Registration_Details_ID";
         $leadDet=$this->db->query($sql);
         $answer = $leadDet->result();
         if (count($answer) > 0) {
@@ -496,7 +518,7 @@ left join
     }
     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
@@ -670,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,
@@ -699,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."' 
 
    ";
@@ -894,4 +917,72 @@ $query = $this->db->query($subQuery,array(NEWREGISTRATION_CONST,'%d-%m-%Y',$from
 
     }
 
+
+    
+    public function GetFeePaidDetails($det)
+    {
+
+        $start_date= $det['from'];
+        $end_date = $det['to']; 
+
+
+        $fromd= date("Y-m-d",strtotime($start_date));
+         $tod=date("Y-m-d",strtotime($end_date));
+
+        //echo $det['university'];die() ;
+
+        $this->db->select('d.UniversityID,UniversityName, 
+                        sum(IF(ModeOfPayment ="CASH", BillAmount, 0)) AS Cash, 
+                        sum(IF(ModeOfPayment ="CHEQUE", BillAmount, 0)) AS Cheque, 
+                        sum(IF(ModeOfPayment ="REFERRAL", BillAmount, 0)) AS Referal, 
+                        sum(IF(ModeOfPayment ="ONLINE TRANSACTION", BillAmount, 0)) AS Onlinec, 
+                        sum(IF(ModeOfPayment ="WAIVER",BillAmount, 0)) AS WAIVER, 
+                        sum(IF(ModeOfPayment ="Credit/Debit Card",BillAmount, 0)) AS Card, 
+                        sum(a.BillAmount) AS Total,a.CreatedOn');
+        $this->db->from('T_Students_Fees_PaidDetails  a');
+        $this->db->join('T_Students_Fees_Status b','b.FeesId = a.FeesID','left');
+        $this->db->join('T_CourseMaster  c','c.CourseID = b.CourseID','left');
+        $this->db->join('T_UniversityMaster d','d.UniversityID=c.UniversityID','left');
+
+       //  $this->db->where('T_Students_Fees_PaidDetails.CreatedOn BETWEEN "'.date('Y-m-d', strtotime($start_date)). '" and "'. date('Y-m-d', strtotime($end_date)).'"');
+
+
+         $this->db->where("date_format(a.CreatedOn,'%Y-%m-%d')>=",date('Y-m-d', strtotime($start_date)));
+
+         
+
+          $this->db->where("date_format(a.CreatedOn,'%Y-%m-%d')<=",date('Y-m-d', strtotime($end_date)));
+
+        
+
+        $this->db->where('a.IsActive','1');
+
+        if($det['university']!='')
+        {
+            $this->db->where('d.UniversityID',$det['university']);
+        }
+
+        $this->db->group_by('UniversityID');
+
+        $feeDetails = $this->db->get()->result();
+
+ 
+if($feeDetails) 
+         {
+
+            //print_r($searchDetails->result());
+               $result_array['searchst'] = true;
+               $result_array['details'] = $feeDetails;
+         }
+        else
+        {
+                 $result_array['searchst'] = false;
+                $result_array['details'] = "No records found!";
+        }
+
+
+        return $result_array;
+     
+    }
+    
 }

Apollo/api/application/models/StatusUpdation_model.php

@@ -153,12 +153,19 @@ class StatusUpdation_model extends CI_Model {
     }
     
     // get certificate list
-    public function get_certificate_list($branchId) {
+    public function get_certificate_list($branchId, $sutendDetail, $courseDetails) {
-        $this->db->select('*');
+        // echo $sutendDetail, $courseDetails;exit();
+        $this->db->select('CFR.*');
         $this->db->order_by('CreatedOn', 'DESC');
-        $this->db->from(CERTIFICATION);
+        $this->db->from('T_Students_Fees_Status as SFS');
-        $this->db->where('IsActive', 1);
+        // $this->db->join('T_Course_Fees_Details as CFD', 'CFD.ID = SFS.FeeType');
-        $this->db->where('BranchCode', $branchId);
+        // $this->db->join('T_Students_Fees_Status as SFS', 'SFS.StudentID = $sutendDetail');
+        $this->db->join( '' . CERTIFICATION . ' as CFR', 'CFR.CertificateName = SFS.FeesType');
+        $this->db->where('CFR.IsActive', 1);
+        $this->db->where('SFS.StudentID',$sutendDetail);
+        $this->db->where('SFS.CourseID',$courseDetails);
+        $this->db->where('CFR.BranchCode', $branchId);
+        $this->db->where('SFS.BranchCode', $branchId);
         $cerfDetails = $this->db->get();
         $certificateDetails = $cerfDetails->result();
         if (count($certificateDetails) > 0) {
@@ -224,7 +231,7 @@ class StatusUpdation_model extends CI_Model {
                 $results['preStatusDetails'] = false;
                 $results['message'] = 'No record found';
             }
-        } else if ($reqDetailsFor == 'CERTIFICATE_STATUS') {
+        } else if ($reqDetailsFor == 'APPICATION_STATUS') {
             $searchFor = 'A001';
             $searchTableFor = APPLICATION_STATUS;
             $this->db->select('t1.*, t4.Firstname, t5.ListName, t6.CertificateName');
@@ -610,7 +617,7 @@ class StatusUpdation_model extends CI_Model {
         $htmlContent = $msg;
         // Email body load the html template
         // $body = $this->load->view('emails/anillabs.php',$data,TRUE);
-        $this->email->to('dineshkumar.k@venbainfotech.com');
+        $this->email->to($list);
         $this->email->from('noreply@apollodec.com','Apollo');
         $subj = $sub;
         $this->email->subject($subj);

Apollo/assets/i18n/en.json

@@ -19,6 +19,7 @@
       "MESSAGES": "My Messages",
       "LOCKSCREEN": "Lock Screen",
       "LOGOUT": "Log Out",
+      "MYPROFILE": "My Profile",
       "CHANGEPASSWORD": "Change Password"
     }
   },
@@ -54,123 +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":"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/config.constant.js

@@ -142,7 +142,9 @@ app.constant('JS_REQUIRES', {
         'newreg_reportCtrl': 'assets/js/controllers/newreg_reportCtrl.js',
         /*
 
-
+ * */
+        'FeeCollected_reportCtrl': 'assets/js/controllers/FeeCollected_reportCtrl.js',
+        /*
 
 
         * student status updation

Apollo/assets/js/config.router.js

@@ -194,6 +194,15 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com
                 ncyBreadcrumb: {
                     label: 'newreg'
                 },
+            
+            }).state('app.reports.feeCollect', {
+                url: '/feeCollect',
+                templateUrl: "assets/views/feecollected.html",
+                resolve: loadSequence('FeeCollected_reportCtrl','ngTable', 'ladda', 'angular-ladda'),
+                title: 'feeCollect',
+                ncyBreadcrumb: {
+                    label: 'feeCollect'
+                }
             }).state('app.master.studentStatusUpdate', {
             url: '/default activity',
             templateUrl: "assets/views/studentStatusUpdate.html",

Apollo/assets/js/controllers/FeeCollected_reportCtrl.js

@@ -0,0 +1,261 @@
+'use strict';
+/*** controller***/
+app.controller('FeeCollected_reportCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableParams", "API_POINTS", "$localStorage" ,"$http", "$state","$modal","$log",
+    function ($scope,$rootScope,toaster, $filter, ngTableParams, apiPoint, $localStorage, $http,ipCookie ,$state,$modal,$log){
+
+    //function ($scope, apiPoint, $http, SweetAlert, $state,$modal, md5, ipCookie, $window, dateListDescService) {
+
+        // DataTables configurable options
+
+
+        $scope.filters = {
+           
+            "from_date": "",
+            "to_date": "",
+
+        };
+
+
+         var localDetails = JSON.parse(localStorage.getItem('localObj'));
+         //var localDetails = ipCookie('cookiechk');
+
+        //console.log(localDetails);
+
+
+       // $scope.initHead = function() {
+//console.log('rfd');
+         var logcheck = JSON.parse(localStorage.getItem('localObj'));
+
+     const LOCALTYPE = logcheck.localType;
+        if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE == 'R005')) { 
+            console.log("if");
+        }else {
+            if(logcheck != null && LOCALTYPE !='R001') {
+             console.log("else if");
+                $state.go('app.dashboard');
+            } else {
+
+                console.log("else else");
+                //ipCookie.remove('cookiechk');
+                window.localStorage.clear();
+                $state.go('login.signin');
+            }
+        }
+
+      // }
+ $scope.universitySearchData = '';
+
+       $scope.init = function()
+       {
+
+       // alert()
+            var getuniv = {
+                method: 'POST',
+                url: apiPoint.url + 'AllgetUniversity/',
+                headers: {
+                    'Content-Type': 'application/json'
+                },
+
+                data: {
+                   
+                    branchId: JSON.parse(localStorage.getItem('localObj')).localBranchID,
+                }
+               
+            };
+
+            $http(getuniv).then(function (response) {
+
+                 if(response.status == 200)
+                 {
+                     $scope.universitySearchData=response.data.details;
+                 }
+               
+            });
+ 
+        
+       };
+
+
+
+
+
+   
+//$scope.opinctotal='';
+$scope.newreglist='';
+$scope.isLoaderShow ='';
+$scope.load = '';
+$scope.isShow= '';
+$scope.fromd='';
+$scope.tod='';
+$scope.universityId='';
+$scope.getDetails = function (form,myModel) 
+{
+
+
+var firstError = null;
+            if (form.$invalid) {
+                var field = null, firstError = null;
+        $scope.show = true;
+                for (field in form) {
+                    if (field[0] != '$') {
+                        if (firstError === null && !form[field].$valid) {
+                            firstError = form[field].$batch;
+                        }
+                        if (form[field].$pristine) {
+                            form[field].$dirty = true;
+                        }
+                    }
+                }
+                angular.element('.ng-invalid[batch=' + firstError + ']').focus();
+            }
+
+     else
+     {
+          var from =  $scope.filters.from_date;
+          var to  = $scope.filters.to_date;
+
+if(myModel === undefined)
+{
+     $scope.universityId='';
+}
+else
+{
+
+          $scope.universityId = myModel.myUnivSearch;
+}
+
+var f = new Date(from),
+month = '' + (f.getMonth() + 1),
+day = '' + f.getDate(),
+year = f.getFullYear();
+
+if (month.length < 2) month = '0' + month;
+if (day.length < 2) day = '0' + day;
+
+var from_dt = [day, month ,year].join('-');
+
+
+
+var t = new Date(to),
+month = '' + (t.getMonth() + 1),
+day = '' + t.getDate(),
+year = t.getFullYear();
+
+if (month.length < 2) month = '0' + month;
+if (day.length < 2) day = '0' + day;
+
+var to_dt = [day, month ,year].join('-');
+
+
+$scope.fromd = from_dt;
+$scope.tod = to_dt;
+
+
+          var getstudentdetails = {
+
+            method: 'POST',
+                url: apiPoint.url + 'feepaidDetails/',
+                headers: {
+                    'Content-Type': 'application/json'
+                },
+                data: {
+                    university: $scope.universityId,
+                    from : $scope.filters.from_date ,
+                    to : $scope.filters.to_date
+                    
+                }
+          }
+
+           $http(getstudentdetails).then(function (response) {
+
+            if(response.data.status == 200 && response.data.searchst==true)
+            { 
+
+              //console.log(response.data);
+              $scope.newreglist = response.data.details;
+              $scope.isShow=true;
+              $scope.isLoaderShow=false;
+
+              console.log($scope.newreglist);
+
+            }
+
+            else
+            {
+               $scope.isLoaderShow=true;
+                $scope.isShow=false;
+            }
+
+
+           });
+      }
+
+}
+
+
+
+      
+      
+        
+        
+        
+        $scope.exportData = function () 
+        {
+            //alert()
+
+             $scope.sam = 'Fee Paid list from '+$scope.fromd+' to '+$scope.tod;
+        
+
+          var mystyle = {
+            sheetid:$scope.sam,
+            headers: true,
+            caption: {
+              title: $scope.sam,
+              width: '1000px',
+              style:'font-size:50px;bold:true' 
+            },
+            // style:'background:#00FF00',
+            column: {
+              style:'font-size:12px'
+            },
+           
+        };
+        console.log(mystyle);
+            
+           alasql('SELECT UniversityName,Cash,Cheque,Referal,Onlinec as OnlineTransaction,WAIVER as Waiver,Card as CardTransaction,Total  INTO XLS("Fee Paid List report.xls",?) FROM ?',[mystyle,$scope.newreglist]);
+
+        };
+
+    
+    $scope.OpenWindowStatus = false;      
+    $scope.editId = -1;
+    $scope.setEditId = function (P) 
+    {
+        //alert(P);
+        $scope.editId = P;
+        
+    }
+
+     $scope.close = function () 
+    {
+        
+        $scope.editId = -1;
+       
+    }
+
+
+$scope.fdate ='';
+$scope.tdate ='';
+//$scope.Subtypes = '';
+
+
+   
+
+
+ 
+
+    }]);
+
+
+
+

Apollo/assets/js/controllers/certificateStatusCtrl.js

@@ -28,7 +28,7 @@ app.controller('certificateStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
     var localDetail = JSON.parse(localStorage.getItem('localObj'));
     var localDetails = ipCookie('cookiechk');
     
-    const localUpdateStatus = 'CERTIFICATE_STATUS';
+    const localUpdateStatus = 'APPICATION_STATUS';
      $scope.localTypeSuperAdmin = false;
         $scope.localBranchDetails = '';
 
@@ -57,10 +57,10 @@ app.controller('certificateStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
                     $scope.localTypeSuperAdmin = true;
                     $scope.getUniversityList();
                     $scope.getBranchList();
-                    getCertificateDetailsList();
+                    // getCertificateDetailsList();
                 } else {
                     $scope.getUniversityList();
-                    getCertificateDetailsList();
+                    // getCertificateDetailsList();
                 }
             } else {
             }
@@ -88,7 +88,7 @@ app.controller('certificateStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
         }
 
     // get certificate or application list 
-    var getCertificateDetailsList = function () {
+    var getCertificateDetailsList = function (stu, cour) {
         var getCerfreg = {
             method: 'POST',
             url: apiPoint.url + 'getCertificateList/',
@@ -96,6 +96,8 @@ app.controller('certificateStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
                 'Content-Type': 'application/json'
             },
             data: {
+                     studentID: stu,
+                     courseID: cour,
                 data: localDetails
             }
         };
@@ -245,7 +247,7 @@ app.controller('certificateStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
 
     // Select one row in a table once
     $scope.setOneSelect = function (value) {
-        // alert();
+        // alert(JSON.stringify(value));
         angular.forEach($scope.searchResultDetails, function (item) {
             item.Selected = false;
         });
@@ -253,7 +255,7 @@ app.controller('certificateStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
         $scope.statusUpdationId = value.UNI_ID;
         value.Selected = true;
         $scope.OpenWindowStatus = true;
-        $scope.openUpdateWind();
+        $scope.openUpdateWind(value);
     }
 
     // unselect all the selected item 
@@ -267,7 +269,7 @@ app.controller('certificateStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
 
     // open popup window onselct checkbox clicked or close popup window all the clicked items unchecked
     $scope.OpenWindowStatus = false;
-    $scope.openUpdateWind = function () {
+    $scope.openUpdateWind = function (s) {
         var ItemsSelected = $scope.searchResultDetails.filter(function (item) {
             if (item.Selected === true) { return true; }
         });
@@ -275,6 +277,7 @@ app.controller('certificateStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
             const courseLocal = $scope.searchData.Course;
             $scope.getSemYearList(courseLocal);
             $scope.getStatusList();
+            getCertificateDetailsList(s.StudentID, s.CourseID);
             $scope.OpenWindowStatus = true;
             $scope.myStatusModel = {
                 'semYear': '',

Apollo/assets/js/controllers/courseCtrl.js

@@ -206,6 +206,21 @@ app.controller('courseCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab
                      swal("Failed!", 'Please Enter Single/Sem-Year Fees ', "error");
 
                  }
+                 else{
+
+                     /* 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 = {};
 
@@ -252,6 +267,8 @@ app.controller('courseCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab
                          });
                      }
 
+                 }
+
 
 
 
@@ -296,6 +313,20 @@ app.controller('courseCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab
                     FeesAmount: semYear.FeesAmount
                 });
             }
+            /* 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){
+
+                swal("Warning!", 'Sem/Year Duplication  ', "warning");
+            }
+            else{
                 $scope.ldloading = {};
 
                 $scope.ldloading[loading.replace('-', '_')] = true;
@@ -348,6 +379,8 @@ app.controller('courseCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab
                     }
                 });
             }
+
+        }
     };
     /*
    *get course details when page loading called from view file

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',

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

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

Apollo/assets/js/controllers/daybooksuperadminCtrl.js

@@ -3,7 +3,7 @@
  * 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'));
@@ -11,10 +11,13 @@ app.controller('daybooksuperadminCtrl', ["$scope", "$rootScope", "toaster", "$fi
     $scope.disableAddButton = false;
     $scope.disableEditButton = false;
 
-//In controller
+
-$scope.exportAction = function(){ 
+
-    alert();
+
-      switch('excel'){
+    //In controller
+    $scope.exportAction = function () {
+        // alert();
+        switch ('excel') {
             case 'pdf': $scope.$broadcast('export-pdf', {});
                 break;
             case 'excel': $scope.$broadcast('export-excel', {});
@@ -23,7 +26,7 @@ $scope.exportAction = function(){
                 break;
             default: console.log('no event caught');
         }
-}
+    }
 
 
     $scope.searchData = {
@@ -79,10 +82,10 @@ $scope.exportAction = function(){
     function getDetails() {
         $scope.todayDate = new Date();
         const LOCALTYPE = localDetail.localType;
-        if(LOCALTYPE === 'R004') {
+        if (LOCALTYPE === 'R004') {
             $scope.currentDate = new Date();
             var d = new Date();
-                $scope.oneMonthBefore = d.setMonth(d.getMonth()-1);
+            $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);
@@ -91,7 +94,7 @@ $scope.exportAction = function(){
             $scope.getIncomeExpenseType_Status();
             $scope.viewStudentDetailsPage = true;
 
-        }else {
+        } else {
             ipCookie.remove('cookiechk');
             $window.localStorage.clear();
             $state.go('login.signin');
@@ -119,7 +122,7 @@ $scope.exportAction = function(){
     //     }
     // }
 
-$scope.dayBookApprovalAccess = '';
+    $scope.dayBookApprovalAccess = '';
     // Finance module access control
     function getFinanceModuleAccess() {
         var getFinacnceModuleAcccessCtrl = {
@@ -155,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,7 +170,7 @@ $scope.dayBookApprovalAccess = '';
 
     // 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();
@@ -183,8 +186,14 @@ $scope.dayBookApprovalAccess = '';
         $scope.reverse = !$scope.reverse; //if true make it false and vice versa
     }
 
+
+
+
+
+
     $scope.noRecordFound = true;
     $scope.dataLength = 0;
+
     // get day book type name list
     $scope.getDayBookList = function () {
         var getDatBookListDetails = {
@@ -202,6 +211,10 @@ $scope.dayBookApprovalAccess = '';
             if (response.data.dayBookListStatus) {
 
                 $scope.data = response.data.dayBookListDetails;
+                $scope.datasss = response.data.dayBookListDetails;
+                // alert(JSON.stringify($scope.data));
+
+
                 $scope.dataLength = $scope.data.length;
                 if ($scope.data.length !== 0) {
                     $scope.noRecordFound = false;
@@ -216,6 +229,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 = {
@@ -289,8 +559,8 @@ $scope.dayBookApprovalAccess = '';
             "paidTo": "",
             "description_paid": "",
             "voucherNumber": "",
-           "branch":"",
+            "branch": "",
-           "name":""
+            "name": ""
         }
     }
 
@@ -306,24 +576,24 @@ $scope.dayBookApprovalAccess = '';
         "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
 
         }
@@ -332,12 +602,12 @@ $scope.dayBookApprovalAccess = '';
 
 
     $scope.deleted1 = function (id) {
-	 var id=id;
+        var id = id;
-	 var reason=prompt("Reason For Deletion!","");
+        var reason = prompt("Reason For Deletion!", "");
-	 $scope.deleteFeePayableEntry(reason,id);
+        $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!",
@@ -350,15 +620,15 @@ $scope.dayBookApprovalAccess = '';
             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,
+                        reason: reason,
-                        data:id,
+                        data: id,
                         requestDetails: localDetails
                     }
                 };
@@ -378,15 +648,15 @@ $scope.dayBookApprovalAccess = '';
 
     $scope.deleted = function (id) {
 
-	 var id=id;
+        var id = id;
-	 var a=prompt("Enter Reason!","");
+        var a = prompt("Enter Reason!", "");
-	 $scope.deleEditEntry(a,id);
+        $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?",
@@ -398,9 +668,9 @@ $scope.dayBookApprovalAccess = '';
             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/',
@@ -408,7 +678,7 @@ $scope.dayBookApprovalAccess = '';
                     'Content-Type': 'application/json'
                 },
                 data: {
-                    reason:a,data: id,
+                    reason: a, data: id,
                     requestDetails: localDetails
                 }
             };
@@ -455,10 +725,10 @@ $scope.dayBookApprovalAccess = '';
                 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();
+                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);
@@ -564,7 +834,7 @@ $scope.dayBookApprovalAccess = '';
                 };
                 $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();
@@ -579,27 +849,29 @@ $scope.dayBookApprovalAccess = '';
     }
 
 
-      function styleXl(){
+    function styleXl() {
         var mystyle = {
             sheetid: 'DAYBOOK DETAILS',
             headers: true,
             caption: {
-                    title:'DAYBOOK DETAILS'+ '('+ $scope.searchData.date + ' - ' +  $scope.searchData.dateTo +')',
+                title: 'DAYBOOK DETAILS' + '(' + $scope.searchData.date + ' - ' + $scope.searchData.dateTo + ')',
                 width: '300px',
-                    style:'font-size:50px;color:blue;' 
+                style: 'font-size:50px;color:blue;'
             },
             // style:'background:#00FF00',
             column: {
-                    style:'font-size:11px; color:blue;'
+                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]);
+        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]);
     };
 
 
 }]);
 
 
+
+

Apollo/assets/js/controllers/examAttendanceCtrl.js

@@ -294,22 +294,25 @@ $scope.isLoaderTxt = "Loading...";
 				var headerAM = function(data) {
 				
 				var heading = $rootScope.pdfuname+'  '+$rootScope.pdfbatch+' Examination'+' '+'Center'+' '+$rootScope.pdfcenter['CenterName'];
-				var heading1='Attendance of '+$scope.pdfExamDateToDisplay+'After Noon Session'+" - "+ 'Attendance of '+$scope.pdfExamDateToDisplay+'Fore Noon Session';
+				var heading1='Attendance of '+$scope.pdfExamDateToDisplay+'Fore Noon Session';
 				doc1.setFontSize(9);
 				doc1.setFontStyle('bold');
 			   //doc1.text(60,30,heading);
 			   var heading_length = heading.length;
+			   console.log(heading_length);
 			   var heading_start_point = 0;
 			   var heading1_start_point = 0;
 			   if(heading_length <= 100)
 			   {
 				     var heading_start_point = 200;
-					 var heading1_start_point = 225;
+					 var heading1_start_point = 350;
+					 console.log('heading_length <= 100');
 			   }
 			   else
 			   {
 				     var heading_start_point = 100;
-					 var heading1_start_point = 150;
+					 var heading1_start_point = 300;
+					 console.log('else');
 			   }
 			   // console.log(heading_length);
 			   // console.log((doc1.internal.pageSize.width/2));
@@ -328,21 +331,24 @@ $scope.isLoaderTxt = "Loading...";
 				 var headerPM = function(data) {
 				
 				var heading = $rootScope.pdfuname+'  '+$rootScope.pdfbatch+' Examination'+' '+'Center'+' '+$rootScope.pdfcenter['CenterName'];
-				var heading1='Attendance of '+$scope.pdfExamDateToDisplay+'After Noon Session'+" - "+ 'Attendance of '+$scope.pdfExamDateToDisplay+'Fore Noon Session';
+				var heading1='Attendance of '+$scope.pdfExamDateToDisplay+'After Noon Session';
 				doc2.setFontSize(9);
 				doc2.setFontStyle('bold');
 			   var heading_length = heading.length;
+			   console.log(heading_length);
 			   var heading_start_point = 0;
 			   var heading1_start_point = 0;
 			   if(heading_length <= 100)
 			   {
 				     var heading_start_point = 200;
-					 var heading1_start_point = 225;
+					 var heading1_start_point = 350;
+					 console.log('heading_length <= 100');
 			   }
 			   else
 			   {
 				     var heading_start_point = 100;
-					 var heading1_start_point = 150;
+					 var heading1_start_point = 300;
+					 console.log('else');
 			   }
 			    doc2.text(heading_start_point,30,heading);
 				doc2.setFontSize(9);
@@ -384,7 +390,7 @@ $scope.isLoaderTxt = "Loading...";
 				
 				if(AttendanceTableID_PM != "")
 			  {
-				console.log('AttendanceTableID_AM');
+				console.log('AttendanceTableID_PM');
 				doc2.autoTable(AttendanceTableID_PM.columns, AttendanceTableID_PM.data, options2);
 				doc2.save(fileNamePM);
 			  } 								

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;

Apollo/assets/js/controllers/generateHallTicketCtrl.js

@@ -483,19 +483,20 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun
 				doc.addImage(dataURL, 'jpeg', 50, 35, 50, 50);//university logo location
 				doc.addImage(profiledataURL, 'jpeg', 470, 100, 60, 60);//student profile location
 				var uni_add_position = 0;
-				if($scope.length_of_universityNamePDF >= 20 ){
+				// if($scope.length_of_universityNamePDF >= 20 ){
 					
-					uni_add_position = 110;console.log(uni_add_position);
+				// 	uni_add_position = 110;console.log(uni_add_position);
-					}
+				// 	}
-					else{
+				// 	else{
-						uni_add_position = 10;console.log(uni_add_position);
+				// 		uni_add_position = 10;console.log(uni_add_position);
-						}
+				// 		}
+				doc.setFontSize(14);
+				doc.setFontType("bold");
+				doc.text(130,50,$scope.universityNamePDF);
 				doc.setFontSize(10);
-				doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF+uni_add_position),45,$scope.universityNamePDF);
+				doc.text(130,70,$scope.universityAddressPDF);
 				doc.setFontSize(8);
-				doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF),55,$scope.universityAddressPDF);
+				doc.text(130,90,$scope.universityEmailPDF);
-				doc.setFontSize(8);
-				doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF),93,$scope.universityEmailPDF);
 				
 				doc.rect(45, 100, 400, 60);
 				doc.rect(445, 100, 100, 60);
@@ -714,19 +715,20 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun
 				doc.addImage(dataURL, 'jpeg', 50, 35, 50, 50);//university logo location
 				doc.addImage(profiledataURL, 'jpeg', 470, 100, 60, 60);//student profile location
 				var uni_add_position = 0;
-				if($scope.length_of_universityNamePDF >= 20 ){
+				// if($scope.length_of_universityNamePDF >= 20 ){
 					
-					uni_add_position = 110;console.log(uni_add_position);
+				// 	uni_add_position = 110;console.log(uni_add_position);
-					}
+				// 	}
-					else{
+				// 	else{
-						uni_add_position = 10;console.log(uni_add_position);
+				// 		uni_add_position = 10;console.log(uni_add_position);
-						}
+				// 		}
+				doc.setFontSize(14);
+				doc.setFontType("bold");
+				doc.text(130,50,$scope.universityNamePDF);
 				doc.setFontSize(10);
-				doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF+uni_add_position),45,$scope.universityNamePDF);
+				doc.text(130,70,$scope.universityAddressPDF);
 				doc.setFontSize(8);
-				doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF),55,$scope.universityAddressPDF);
+				doc.text(130,90,$scope.universityEmailPDF);
-				doc.setFontSize(8);
-				doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF),93,$scope.universityEmailPDF);
 				
 				doc.rect(45, 100, 400, 60);
 				doc.rect(445, 100, 100, 60);
@@ -899,19 +901,20 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun
 				doc.addImage(profiledataURL, 'jpeg', 470, 100, 60, 60);//student profile location
 				
 				var uni_add_position = 0;
-				if($scope.length_of_universityNamePDF >= 20 ){
+				// if($scope.length_of_universityNamePDF >= 20 ){
 					
-					uni_add_position = 110;console.log(uni_add_position);
+				// 	uni_add_position = 110;console.log(uni_add_position);
-					}
+				// 	}
-					else{
+				// 	else{
-						uni_add_position = 10;console.log(uni_add_position);
+				// 		uni_add_position = 10;console.log(uni_add_position);
-						}
+				// 		}
+				doc.setFontSize(14);
+				doc.setFontType("bold");
+				doc.text(130,50,$scope.universityNamePDF);
 				doc.setFontSize(10);
-				doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF+uni_add_position),45,$scope.universityNamePDF);
+				doc.text(130,70,$scope.universityAddressPDF);
 				doc.setFontSize(8);
-				doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF),55,$scope.universityAddressPDF);
+				doc.text(130,90,$scope.universityEmailPDF);
-				doc.setFontSize(8);
-				doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF),93,$scope.universityEmailPDF);
 				
 				doc.rect(45, 100, 400, 60);
 				doc.rect(445, 100, 100, 60);
@@ -1020,4 +1023,38 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun
         $modalInstance.dismiss('cancel');
     };
 
+	 $scope.generatePDF = function(){
+	  var innerContents = document.getElementById("university_header").innerHTML;
+		
+        var popupWinindow = window.open('', '_blank', 'width=1200,height=700,scrollbars=no,menubar=no,toolbar=no,location=no,status=no,titlebar=no');
+        popupWinindow.document.open();
+        popupWinindow.document.write('<html>');
+		popupWinindow.document.write('<style type="text/css" media="print">');
+		 popupWinindow.document.write('@page { size: portrait; }');
+	    //popupWinindow.document.write('.title{border:3px solid black;}');
+	    popupWinindow.document.write('</style>');
+	    popupWinindow.document.write(innerContents);
+		popupWinindow.document.write('</br>');
+		popupWinindow.document.write('</br>');
+		popupWinindow.document.write('</br>');
+		popupWinindow.document.write('</br>');
+		//popupWinindow.document.write(innerContents);
+		popupWinindow.document.write('</html>');
+        popupWinindow.document.close();
+		popupWinindow.focus();
+	    popupWinindow.print();
+	    popupWinindow.close();
+       
+     
+     
+     
+    
+       
+     
+         
+  
+  }
+
+
+
 }]);

Apollo/assets/js/controllers/newreg_reportCtrl.js

@@ -203,7 +203,7 @@ $scope.tod = to_dt;
         
 
 //console.log($scope.fullincomedetail);
-           alasql('SELECT  Firstname as Name,Fathername,CourseName,BatchName,UniversityName,DOJ as RegistrationDate,MobileNumber  INTO XLS("New Registration report.xls",?) FROM ?',[mystyle,$scope.newreglist]);
+           alasql('SELECT  DOJ as RegistrationDate,Firstname as Name,Fathername,UniversityName,BatchName,CourseName,MobileNumber  INTO XLS("New Registration report.xls",?) FROM ?',[mystyle,$scope.newreglist]);
 
         };
 

Apollo/assets/js/controllers/report_ans_bookletCtrl.js

@@ -97,7 +97,6 @@ app.controller('report_ans_bookletCtrl', ["$scope", "$filter","$rootScope","$mod
         });
          $scope.show = false;
         $scope.onSubmit = function (form) {
-            $scope.filterUniv = angular.fromJson($scope.univModel.university);
 			var firstError = null;
             if (form.$invalid) {
                 var field = null, firstError = null;
@@ -115,6 +114,7 @@ app.controller('report_ans_bookletCtrl', ["$scope", "$filter","$rootScope","$mod
                 angular.element('.ng-invalid[batch=' + firstError + ']').focus();
             }else {
             //alert($scope.batch.name);
+			 $scope.filterUniv = angular.fromJson($scope.univModel.university);
             $scope.ans_book_data = '';
             $scope.message = '';
             var response_data = {
@@ -167,9 +167,248 @@ app.controller('report_ans_bookletCtrl', ["$scope", "$filter","$rootScope","$mod
             alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Enrollment_id 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,CAST(balance AS NUMBER) as BalanceFee,issuedate as IssuedToStudentDate,rcvedate as ReceivedFromStudentDate,Status as AnswerBookletStatus,Date as Date INTO XLS("Answer_booklet_status.xls",?) FROM ?',[mystyle,$scope.ans_book_data]);
         };
 
+    /**
+     * Auto Call Tracking Sriram
+     */
+    $scope.selectedStudentsID = [];
+    $scope.isCheckAll = function(e){
+        var val = (e.target.checked ? true : false);
+        if(val)
+    {
+       // $scope.disable = false;
+        var len =  $scope.ans_book_data.length;
+        var i = 0;
+        for(i=0;i<len;i++)
+        {
+            if($scope.selectedStudentsID.indexOf($scope.ans_book_data[i]) === -1)
+            {
+                
+                $scope.selectedStudentsID.push($scope.ans_book_data[i]);
+            }
+        }
+    }
+    else
+    {
+       // $scope.disable = true;
+        $scope.selectedStudentsID = [];
+    }
+    if($scope.selectedStudentsID !=''){
+        $scope.disable = false;
+    }else{
+        $scope.disable = true;
+    }
+   console.log($scope.selectedStudentsID);
+    }
+    $scope.isClick = function(e){
+        var ide = e.target;
+    var val = (ide.checked ? true : false);
+    var sid = e.target.id;
+    // console.log("328");
+    // console.log($scope.balfee_data);
+    angular.forEach($scope.ans_book_data,function(value,key){
+       
+        if(sid == value.Student_id)
+        {
+            sid = value;
+        }
+    });
+        console.log(sid);
+    var pos = $scope.selectedStudentsID.indexOf(sid);
+    //alert(val);
+    console.log($scope.selectedStudentsID.indexOf(sid));
+    if(val)
+    {
+        if( pos == -1)
+        {
+           
+            //console.log("PUSH");
+            $scope.selectedStudentsID.push(sid);
+        }
+        
+    }
+    else
+    {
+       
+        //console.log("POP");
+        $scope.selectedStudentsID.splice(pos,1);
+    }
+    //
+    if(val){
+        $scope.disable = false;
+    }else{
+        $scope.disable = true;
+    }
+    //console.log($scope.selectedStudentsID);
+    }
+    $scope.calltracking = function(){
+        
+        //$rootScope.student = $scope.selectedStudentsID;
+        if($scope.selectedStudentsID ==''){
+            swal('Select Check box','','warning');
+			return false;
+        }else{
+        $scope.controller = 'ng-controller="report_ans_bookletCtrl"';
+        $scope.myModel.comments = 'Call Tracking for Document Report';
+        var lead = {
+            method: 'POST',
+            url: apiPoint.url + 'getTrackingLeadDetails/',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            data: {
+                requestedBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
+                student:$scope.selectedStudentsID,
+                branchID:JSON.parse(localStorage.getItem('localObj')).localBranchID,
+                userType:JSON.parse(localStorage.getItem('localObj')).localType,
+            }
+        };
+        $http(lead).then(function (response) {
+            if (response.data.status==200) {
+                $rootScope.activity = response.data.activityDetails;
+                    $rootScope.status = response.data.statusDetails;
+                    $rootScope.staffDetails = response.data.staffDetails;
+                    $rootScope.studentDetails = $scope.selectedStudentsID;
+                 // $scope.modalopen($scope.activity);
+            $rootScope.modalInstance = $modal.open({
+            templateUrl: 'assets/views/autoCalltracking.html',
+            controller: 'report_ans_bookletCtrl',
+            // size: size,
+           
+            resolve: {
+                pdfitems: function () {
+                    return  $scope.activity;
+                    
+                }
+            }
+        });
+
+            $rootScope.modalInstance.result.then(function (selectedItem) {
+            $scope.selected = selectedItem;
+        }, function () {
+            $log.info('Modal dismissed at: ' + new Date());
+        });
+        
+    }
+    
+    });
+        }
+    }
+
+    $scope.trackForm = {
+        submit: function (form, myModel,loading,selectedStudents) {
+              //console.log(selectedStudents);return false;
+			  var comments = [];
+			  for(var stuid=0;stuid<=selectedStudents.length-1;stuid++){
+				  comments [stuid] ="Call Tracking For Report Answer Booklet Details - BalanceFee:"+selectedStudents[stuid].balance + " - IssuedToStudentDate:" +selectedStudents[stuid].issuedate;
+			  }
+			  
+            if(isNaN(myModel.date)){
+                $scope.nextFollowupDate = myModel.date;
+
+            }
+            else{
+                $scope.getdate=new Date(myModel.date).toDateString();
+
+                $scope.nextFollowupDate = $filter('date')(new Date($scope.getdate), 'dd-MM-yyyy');
+            }
+
+            var firstError = null;
+            if (form.$invalid) {
+
+                var field = null, firstError = null;
+                for (field in form) {
+                    if (field[0] != '$') {
+                        if (firstError === null && !form[field].$valid) {
+                            firstError = form[field].$name;
+                        }
+                        if (form[field].$pristine) {
+                            form[field].$dirty = true;
+                        }
+                    }
+                }
+                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 {
+
+                $scope.ldloading1 = {};
+
+                $scope.ldloading1[loading.replace('-', '_')] = true;
+               /* hide this fun after branch level changes
+                if($scope.userType !='R004'){
+                    $scope.updateBranchID = JSON.parse(localStorage.getItem('localObj')).localBranchID;
+                    $scope.updateAssignTo = myModel.assignedTo;
+
+                }
+                else{
+                    $scope.updateBranchID = myModel.branch.BranchCode;
+                    $scope.updateAssignTo = myModel.assignedTo;
+
+                }*/
+                   
+                var addLead = {
+                    method: 'POST',
+                    url: apiPoint.url + 'autoAddlead/',
+                    headers: {
+                        'Content-Type': 'application/json'
+                    },
+                    data: {
+                        student:selectedStudents,
+                        date: $scope.nextFollowupDate,
+                        activity: myModel.activity.activityID,
+                        assignedTo: myModel.assignedTo,
+                        status: myModel.status,
+                        referedBy: myModel.referedBy,
+                        comments:comments,
+                        
+                        enquiryStatus:myModel.enquiryStatus,
+                        createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
+                        branchId: JSON.parse(localStorage.getItem('localObj')).localBranchID
+
+                    }
+                };
+                $http(addLead).then(function (response) {
+                    if (response.data.status==200 && response.data.leadDetails.leadStatus == true) {
+                        $rootScope.modalInstance.close();
+                        swal(" ", response.data.leadDetails.message, "success");
+                        $state.go($state.current, {}, { reload: true });
+
+                    } else {
+                        
+                        swal(" ", response.data.leadDetails.message, "error");
+                    }
+                });
+
+
+            }
+        },
+        reset: function (form) {
+
+            $scope.myModel = angular.copy($scope.master);
+            form.$setPristine(true);
+            $scope.myModel = {
+                "studentName": "",
+                "mobileNumber": "",
+                "universityName": "",
+                "courseName": "",
+                "activity": "",
+                "assignedTo": "",
+                "status": "",
+                "referedBy": '',
+                "comments":''
+            };
+        }
+    };
+    
+
+     /**
+      * Call Tracking End
+      */
+
+    }]);
+
 /*modal controller
    * */
-  app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log", "API_POINTS", "$http", function ($scope,$rootScope, $modal, $log, apiPoint, $http) {
+app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log", "API_POINTS", "$http", function ($scope,$rootScope, $modal, $log, apiPoint, $http) {
     //Tooltip for print button
     $scope.dynamicTooltip = 'Student View';
 
@@ -307,245 +546,6 @@ app.controller('ModalInstanceCtrl1', ["$scope", "$modalInstance", "items1", "Wor
 
 
 }]);
-    /**
-     * Auto Call Tracking Sriram
-     */
-    $scope.selectedStudentsID = [];
-    $scope.isCheckAll = function(e){
-        var val = (e.target.checked ? true : false);
-        if(val)
-    {
-       // $scope.disable = false;
-        var len =  $scope.ans_book_data.length;
-        var i = 0;
-        for(i=0;i<len;i++)
-        {
-            if($scope.selectedStudentsID.indexOf($scope.ans_book_data[i]) === -1)
-            {
-                
-                $scope.selectedStudentsID.push($scope.ans_book_data[i]);
-            }
-        }
-    }
-    else
-    {
-       // $scope.disable = true;
-        $scope.selectedStudentsID = [];
-    }
-    if($scope.selectedStudentsID !=''){
-        $scope.disable = false;
-    }else{
-        $scope.disable = true;
-    }
-   console.log($scope.selectedStudentsID);
-    }
-    $scope.isClick = function(e){
-        var ide = e.target;
-    var val = (ide.checked ? true : false);
-    var sid = e.target.id;
-    // console.log("328");
-    // console.log($scope.balfee_data);
-    angular.forEach($scope.ans_book_data,function(value,key){
-       
-        if(sid == value.Student_id)
-        {
-            sid = value;
-        }
-    });
-        console.log(sid);
-    var pos = $scope.selectedStudentsID.indexOf(sid);
-    //alert(val);
-    console.log($scope.selectedStudentsID.indexOf(sid));
-    if(val)
-    {
-        if( pos == -1)
-        {
-           
-            //console.log("PUSH");
-            $scope.selectedStudentsID.push(sid);
-        }
-        
-    }
-    else
-    {
-       
-        //console.log("POP");
-        $scope.selectedStudentsID.splice(pos,1);
-    }
-    //
-    if(val){
-        $scope.disable = false;
-    }else{
-        $scope.disable = true;
-    }
-    //console.log($scope.selectedStudentsID);
-    }
-    $scope.calltracking = function(){
-        
-        //$rootScope.student = $scope.selectedStudentsID;
-        if($scope.selectedStudentsID ==''){
-            swal('Select Check box','','warning');
-			return false;
-        }else{
-        $scope.controller = 'ng-controller="report_ans_bookletCtrl"';
-        $scope.myModel.comments = 'Call Tracking for Document Report';
-        var lead = {
-            method: 'POST',
-            url: apiPoint.url + 'getTrackingLeadDetails/',
-            headers: {
-                'Content-Type': 'application/json'
-            },
-            data: {
-                requestedBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
-                student:$scope.selectedStudentsID,
-                branchID:JSON.parse(localStorage.getItem('localObj')).localBranchID,
-                userType:JSON.parse(localStorage.getItem('localObj')).localType,
-            }
-        };
-        $http(lead).then(function (response) {
-            if (response.data.status==200) {
-                $rootScope.activity = response.data.activityDetails;
-                    $rootScope.status = response.data.statusDetails;
-                    $rootScope.staffDetails = response.data.staffDetails;
-                    $rootScope.studentDetails = $scope.selectedStudentsID;
-                 // $scope.modalopen($scope.activity);
-        var modalInstance = $modal.open({
-            templateUrl: 'assets/views/autoCalltracking.html',
-            controller: 'report_ans_bookletCtrl',
-            // size: size,
-           
-            resolve: {
-                pdfitems: function () {
-                    return  $scope.activity;
-                    
-                }
-            }
-        });
-
-        modalInstance.result.then(function (selectedItem) {
-            $scope.selected = selectedItem;
-        }, function () {
-            $log.info('Modal dismissed at: ' + new Date());
-        });
-        
-    }
-    
-    });
-        }
-    }
-
-    $scope.trackForm = {
-        submit: function (form, myModel,loading,selectedStudents) {
-              //console.log(selectedStudents);return false;
-			  var comments = [];
-			  for(var stuid=0;stuid<=selectedStudents.length-1;stuid++){
-				  comments [stuid] ="Call Tracking For Report Answer Booklet Details - BalanceFee:"+selectedStudents[stuid].balance + " - IssuedDate:" +selectedStudents[stuid].issuedate;
-			  }
-			  
-            if(isNaN(myModel.date)){
-                $scope.nextFollowupDate = myModel.date;
-
-            }
-            else{
-                $scope.getdate=new Date(myModel.date).toDateString();
-
-                $scope.nextFollowupDate = $filter('date')(new Date($scope.getdate), 'dd-MM-yyyy');
-            }
-
-            var firstError = null;
-            if (form.$invalid) {
-
-                var field = null, firstError = null;
-                for (field in form) {
-                    if (field[0] != '$') {
-                        if (firstError === null && !form[field].$valid) {
-                            firstError = form[field].$name;
-                        }
-                        if (form[field].$pristine) {
-                            form[field].$dirty = true;
-                        }
-                    }
-                }
-                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 {
-
-                $scope.ldloading1 = {};
-
-                $scope.ldloading1[loading.replace('-', '_')] = true;
-               /* hide this fun after branch level changes
-                if($scope.userType !='R004'){
-                    $scope.updateBranchID = JSON.parse(localStorage.getItem('localObj')).localBranchID;
-                    $scope.updateAssignTo = myModel.assignedTo;
-
-                }
-                else{
-                    $scope.updateBranchID = myModel.branch.BranchCode;
-                    $scope.updateAssignTo = myModel.assignedTo;
-
-                }*/
-                   
-                var addLead = {
-                    method: 'POST',
-                    url: apiPoint.url + 'autoAddlead/',
-                    headers: {
-                        'Content-Type': 'application/json'
-                    },
-                    data: {
-                        student:selectedStudents,
-                        date: $scope.nextFollowupDate,
-                        activity: myModel.activity.activityID,
-                        assignedTo: myModel.assignedTo,
-                        status: myModel.status,
-                        referedBy: myModel.referedBy,
-                        comments:comments,
-                        
-                        enquiryStatus:myModel.enquiryStatus,
-                        createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
-                        branchId: JSON.parse(localStorage.getItem('localObj')).localBranchID
-
-                    }
-                };
-                $http(addLead).then(function (response) {
-                        console.log(response);
-                    if (response.data.status==200 && response.data.leadDetails.leadStatus == true) {
-                        
-                        swal(" ", response.data.leadDetails.message, "success");
-                        window.location.reload();
-                    } else {
-                        
-                        swal(" ", response.data.leadDetails.message, "error");
-                        window.location.reload();
-                    }
-                });
-
-
-            }
-        },
-        reset: function (form) {
-
-            $scope.myModel = angular.copy($scope.master);
-            form.$setPristine(true);
-            $scope.myModel = {
-                "studentName": "",
-                "mobileNumber": "",
-                "universityName": "",
-                "courseName": "",
-                "activity": "",
-                "assignedTo": "",
-                "status": "",
-                "referedBy": '',
-                "comments":''
-            };
-        }
-    };
-    
-
-     /**
-      * Call Tracking End
-      */
-
-    }]);
 
 
 

Apollo/assets/js/controllers/report_app_pendingCtrl.js

@@ -43,8 +43,6 @@ app.controller('report_app_pendingCtrl', ["$scope", "$filter","$rootScope","$mod
             "branch": "",
             "university": "",
             "batch": "",
-            
-
         };
 
         $scope.filters = function () {
@@ -98,6 +96,12 @@ app.controller('report_app_pendingCtrl', ["$scope", "$filter","$rootScope","$mod
 		//Response data
         $scope.show = false;
         $scope.onSubmit = function (form) {
+			$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;
@@ -125,7 +129,7 @@ app.controller('report_app_pendingCtrl', ["$scope", "$filter","$rootScope","$mod
                 },
                 data: {
                     branch: JSON.parse(localStorage.getItem('localObj')).localBranchID,
-                    university: $scope.univModel.university.universityID,
+                    university: $scope.filterUniv.universityID,
                     batch: $scope.univModel.batch
                    
                 }
@@ -147,16 +151,16 @@ 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;' 
             },
             // style:'background:#00FF00',
             column: {
-              style:'font-size:10px'
+              style:'font-size:12px'
             },
            
         };
@@ -164,13 +168,248 @@ app.controller('report_app_pendingCtrl', ["$scope", "$filter","$rootScope","$mod
         
         
         $scope.exportData = function () {
-            alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Admission_date as InititalPaymentDate,Enrollment_id 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,Status as ApplicationPendingStatus,formtype as FormType,appdate 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]);
         };
 
 
+ /**
+     * Auto Call Tracking Sriram
+     */
+    $scope.selectedStudentsID = [];
+    $scope.isCheckAll = function(e){
+        var val = (e.target.checked ? true : false);
+        if(val)
+    {
+       // $scope.disable = false;
+        var len =  $scope.app_pending_data.length;
+        var i = 0;
+        for(i=0;i<len;i++)
+        {
+            if($scope.selectedStudentsID.indexOf($scope.app_pending_data[i]) === -1)
+            {
+                
+                $scope.selectedStudentsID.push($scope.app_pending_data[i]);
+            }
+        }
+    }
+    else
+    {
+       // $scope.disable = true;
+        $scope.selectedStudentsID = [];
+    }
+    if($scope.selectedStudentsID !=''){
+        $scope.disable = false;
+    }else{
+        $scope.disable = true;
+    }
+   // console.log($scope.selectedStudentsID);
+    }
+    $scope.isClick = function(e){
+        var ide = e.target;
+    var val = (ide.checked ? true : false);
+    var sid = e.target.id;
+    angular.forEach($scope.app_pending_data,function(value,key){
+        //console.log(value);
+        if(sid == value.Student_id)
+        {
+            sid = value;
+        }
+    });
+    
+    var pos = $scope.selectedStudentsID.indexOf(sid);
+    //alert(val);
+    if(val)
+    {
+        if( pos == -1)
+        {
+           
+            //console.log("PUSH");
+            $scope.selectedStudentsID.push(sid);
+        }
+        
+    }
+    else
+    {
+       
+        //console.log("POP");
+        $scope.selectedStudentsID.splice(pos,1);
+    }
+    //
+    if(val){
+        $scope.disable = false;
+    }else{
+        $scope.disable = true;
+    }
+    //console.log($scope.selectedStudentsID);
+    }
+    $scope.calltracking = function(){
+        
+        //$rootScope.student = $scope.selectedStudentsID;
+        if($scope.selectedStudentsID ==''){
+            swal('Select Check box','','warning');
+			return false;
+        }else{
+        $scope.controller = 'ng-controller="report_app_pendingCtrl"';
+        $scope.myModel.comments = 'Call Tracking for Document Report';
+        var lead = {
+            method: 'POST',
+            url: apiPoint.url + 'getTrackingLeadDetails/',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            data: {
+                requestedBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
+                student:$scope.selectedStudentsID,
+                branchID:JSON.parse(localStorage.getItem('localObj')).localBranchID,
+                userType:JSON.parse(localStorage.getItem('localObj')).localType,
+            }
+        };
+        $http(lead).then(function (response) {
+            if (response.data.status==200) {
+                $rootScope.activity = response.data.activityDetails;
+                    $rootScope.status = response.data.statusDetails;
+                    $rootScope.staffDetails = response.data.staffDetails;
+                    $rootScope.studentDetails = $scope.selectedStudentsID;
+                 // $scope.modalopen($scope.activity);
+            $rootScope.modalInstance = $modal.open({
+            templateUrl: 'assets/views/autoCalltracking.html',
+            controller: 'report_app_pendingCtrl',
+            // size: size,
+           
+            resolve: {
+                pdfitems: function () {
+                    return  $scope.activity;
+                    
+                }
+            }
+        });
+
+                $rootScope.modalInstance.result.then(function (selectedItem) {
+            $scope.selected = selectedItem;
+        }, function () {
+            $log.info('Modal dismissed at: ' + new Date());
+        });
+        
+    }
+    
+    });
+        }
+    }
+
+    $scope.trackForm = {
+        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 ";
+			  }
+              //console.log(selectedStudents);
+            if(isNaN(myModel.date)){
+                $scope.nextFollowupDate = myModel.date;
+
+            }
+            else{
+                $scope.getdate=new Date(myModel.date).toDateString();
+
+                $scope.nextFollowupDate = $filter('date')(new Date($scope.getdate), 'dd-MM-yyyy');
+            }
+
+            var firstError = null;
+            if (form.$invalid) {
+
+                var field = null, firstError = null;
+                for (field in form) {
+                    if (field[0] != '$') {
+                        if (firstError === null && !form[field].$valid) {
+                            firstError = form[field].$name;
+                        }
+                        if (form[field].$pristine) {
+                            form[field].$dirty = true;
+                        }
+                    }
+                }
+                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 {
+
+                $scope.ldloading1 = {};
+
+                $scope.ldloading1[loading.replace('-', '_')] = true;
+               /* hide this fun after branch level changes
+                if($scope.userType !='R004'){
+                    $scope.updateBranchID = JSON.parse(localStorage.getItem('localObj')).localBranchID;
+                    $scope.updateAssignTo = myModel.assignedTo;
+
+                }
+                else{
+                    $scope.updateBranchID = myModel.branch.BranchCode;
+                    $scope.updateAssignTo = myModel.assignedTo;
+
+                }*/
+                   
+                var addLead = {
+                    method: 'POST',
+                    url: apiPoint.url + 'autoAddlead/',
+                    headers: {
+                        'Content-Type': 'application/json'
+                    },
+                    data: {
+                        student:selectedStudents,
+                        date: $scope.nextFollowupDate,
+                        activity: myModel.activity.activityID,
+                        assignedTo: myModel.assignedTo,
+                        status: myModel.status,
+                        referedBy: myModel.referedBy,
+                        comments:comments,
+                        
+                        enquiryStatus:myModel.enquiryStatus,
+                        createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
+                        branchId: JSON.parse(localStorage.getItem('localObj')).localBranchID
+
+                    }
+                };
+                $http(addLead).then(function (response) {
+                        console.log(response);
+                    if (response.data.status==200 && response.data.leadDetails.leadStatus == true) {
+                        $rootScope.modalInstance.close();
+                        swal(" ", response.data.leadDetails.message, "success");
+
+                        $state.go($state.current, {}, { reload: true });
+                    } else {
+                        
+                        swal(" ", response.data.leadDetails.message, "error");
+                    }
+                });
+
+
+            }
+        },
+        reset: function (form) {
+
+            $scope.myModel = angular.copy($scope.master);
+            form.$setPristine(true);
+            $scope.myModel = {
+                "studentName": "",
+                "mobileNumber": "",
+                "universityName": "",
+                "courseName": "",
+                "activity": "",
+                "assignedTo": "",
+                "status": "",
+                "referedBy": '',
+                "comments":''
+            };
+        }
+    };
+    
+
+     /**
+      * Call Tracking End
+      */
+
+    }]);
 /*modal controller
    * */
-  app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log", "API_POINTS", "$http", function ($scope,$rootScope, $modal, $log, apiPoint, $http) {
+app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log", "API_POINTS", "$http", function ($scope,$rootScope, $modal, $log, apiPoint, $http) {
     //Tooltip for print button
     $scope.dynamicTooltip = 'Student View';
 
@@ -309,238 +548,6 @@ app.controller('ModalInstanceCtrl1', ["$scope", "$modalInstance", "items1", "Wor
 
 }]);
 
- /**
-     * Auto Call Tracking Sriram
-     */
-    $scope.selectedStudentsID = [];
-    $scope.isCheckAll = function(e){
-        var val = (e.target.checked ? true : false);
-        if(val)
-    {
-       // $scope.disable = false;
-        var len =  $scope.app_pending_data.length;
-        var i = 0;
-        for(i=0;i<len;i++)
-        {
-            if($scope.selectedStudentsID.indexOf($scope.app_pending_data[i]) === -1)
-            {
-                
-                $scope.selectedStudentsID.push($scope.app_pending_data[i]);
-            }
-        }
-    }
-    else
-    {
-       // $scope.disable = true;
-        $scope.selectedStudentsID = [];
-    }
-    if($scope.selectedStudentsID !=''){
-        $scope.disable = false;
-    }else{
-        $scope.disable = true;
-    }
-   // console.log($scope.selectedStudentsID);
-    }
-    $scope.isClick = function(e){
-        var ide = e.target;
-    var val = (ide.checked ? true : false);
-    var sid = e.target.id;
-    angular.forEach($scope.app_pending_data,function(value,key){
-        //console.log(value);
-        if(sid == value.Student_id)
-        {
-            sid = value;
-        }
-    });
-    
-    var pos = $scope.selectedStudentsID.indexOf(sid);
-    //alert(val);
-    if(val)
-    {
-        if( pos == -1)
-        {
-           
-            //console.log("PUSH");
-            $scope.selectedStudentsID.push(sid);
-        }
-        
-    }
-    else
-    {
-       
-        //console.log("POP");
-        $scope.selectedStudentsID.splice(pos,1);
-    }
-    //
-    if(val){
-        $scope.disable = false;
-    }else{
-        $scope.disable = true;
-    }
-    //console.log($scope.selectedStudentsID);
-    }
-    $scope.calltracking = function(){
-        
-        //$rootScope.student = $scope.selectedStudentsID;
-        if($scope.selectedStudentsID ==''){
-            swal('Select Check box','','warning');
-			return false;
-        }else{
-        $scope.controller = 'ng-controller="report_app_pendingCtrl"';
-        $scope.myModel.comments = 'Call Tracking for Document Report';
-        var lead = {
-            method: 'POST',
-            url: apiPoint.url + 'getTrackingLeadDetails/',
-            headers: {
-                'Content-Type': 'application/json'
-            },
-            data: {
-                requestedBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
-                student:$scope.selectedStudentsID,
-                branchID:JSON.parse(localStorage.getItem('localObj')).localBranchID,
-                userType:JSON.parse(localStorage.getItem('localObj')).localType,
-            }
-        };
-        $http(lead).then(function (response) {
-            if (response.data.status==200) {
-                $rootScope.activity = response.data.activityDetails;
-                    $rootScope.status = response.data.statusDetails;
-                    $rootScope.staffDetails = response.data.staffDetails;
-                    $rootScope.studentDetails = $scope.selectedStudentsID;
-                 // $scope.modalopen($scope.activity);
-        var modalInstance = $modal.open({
-            templateUrl: 'assets/views/autoCalltracking.html',
-            controller: 'report_app_pendingCtrl',
-            // size: size,
-           
-            resolve: {
-                pdfitems: function () {
-                    return  $scope.activity;
-                    
-                }
-            }
-        });
-
-        modalInstance.result.then(function (selectedItem) {
-            $scope.selected = selectedItem;
-        }, function () {
-            $log.info('Modal dismissed at: ' + new Date());
-        });
-        
-    }
-    
-    });
-        }
-    }
-
-    $scope.trackForm = {
-        submit: function (form, myModel,loading,selectedStudents) {
-              //console.log(selectedStudents);
-            if(isNaN(myModel.date)){
-                $scope.nextFollowupDate = myModel.date;
-
-            }
-            else{
-                $scope.getdate=new Date(myModel.date).toDateString();
-
-                $scope.nextFollowupDate = $filter('date')(new Date($scope.getdate), 'dd-MM-yyyy');
-            }
-
-            var firstError = null;
-            if (form.$invalid) {
-
-                var field = null, firstError = null;
-                for (field in form) {
-                    if (field[0] != '$') {
-                        if (firstError === null && !form[field].$valid) {
-                            firstError = form[field].$name;
-                        }
-                        if (form[field].$pristine) {
-                            form[field].$dirty = true;
-                        }
-                    }
-                }
-                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 {
-
-                $scope.ldloading1 = {};
-
-                $scope.ldloading1[loading.replace('-', '_')] = true;
-               /* hide this fun after branch level changes
-                if($scope.userType !='R004'){
-                    $scope.updateBranchID = JSON.parse(localStorage.getItem('localObj')).localBranchID;
-                    $scope.updateAssignTo = myModel.assignedTo;
-
-                }
-                else{
-                    $scope.updateBranchID = myModel.branch.BranchCode;
-                    $scope.updateAssignTo = myModel.assignedTo;
-
-                }*/
-                   
-                var addLead = {
-                    method: 'POST',
-                    url: apiPoint.url + 'autoAddlead/',
-                    headers: {
-                        'Content-Type': 'application/json'
-                    },
-                    data: {
-                        student:selectedStudents,
-                        date: $scope.nextFollowupDate,
-                        activity: myModel.activity.activityID,
-                        assignedTo: myModel.assignedTo,
-                        status: myModel.status,
-                        referedBy: myModel.referedBy,
-                        comments:"Call Tracking For Report Application Details ",
-                        
-                        enquiryStatus:myModel.enquiryStatus,
-                        createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
-                        branchId: JSON.parse(localStorage.getItem('localObj')).localBranchID
-
-                    }
-                };
-                $http(addLead).then(function (response) {
-                        console.log(response);
-                    if (response.data.status==200 && response.data.leadDetails.leadStatus == true) {
-                        
-                        swal(" ", response.data.leadDetails.message, "success");
-                        window.location.reload();
-                    } else {
-                        
-                        swal(" ", response.data.leadDetails.message, "error");
-                        window.location.reload();
-                    }
-                });
-
-
-            }
-        },
-        reset: function (form) {
-
-            $scope.myModel = angular.copy($scope.master);
-            form.$setPristine(true);
-            $scope.myModel = {
-                "studentName": "",
-                "mobileNumber": "",
-                "universityName": "",
-                "courseName": "",
-                "activity": "",
-                "assignedTo": "",
-                "status": "",
-                "referedBy": '',
-                "comments":''
-            };
-        }
-    };
-    
-
-     /**
-      * Call Tracking End
-      */
-
-    }]);
-
 
 
 

Apollo/assets/js/controllers/report_balfeeCtrl.js

@@ -107,7 +107,6 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal",
        $scope.show = false;
 	   $scope.returnResultData = [];
         $scope.onSubmit = function (form) {
-            $scope.filterUniv = angular.fromJson($scope.univModel.university);
 			$scope.returnResultData.length=0;
 			var firstError = null;
             if (form.$invalid) {
@@ -125,6 +124,7 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal",
                 }
                 angular.element('.ng-invalid[batch=' + firstError + ']').focus();
             }else {
+				 $scope.filterUniv = angular.fromJson($scope.univModel.university);
             $scope.balfee_data = '';
             $scope.message = '';
             var response_data = {
@@ -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,13 +215,250 @@ 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]);
         };
 
 
 
-        /*modal controller
+/**
-   * */
+     * Auto Call Tracking Sriram
+     */
+    $scope.selectedStudentsID = [];
+    $scope.isCheckAll = function(e){
+        var val = (e.target.checked ? true : false);
+        if(val)
+    {
+       // $scope.disable = false;
+        var len =  $scope.balfee_data.length;
+        var i = 0;
+        for(i=0;i<len;i++)
+        {
+            if($scope.selectedStudentsID.indexOf($scope.balfee_data[i]) === -1)
+            {
+                
+                $scope.selectedStudentsID.push($scope.balfee_data[i]);
+            }
+        }
+    }
+    else
+    {
+       // $scope.disable = true;
+        $scope.selectedStudentsID = [];
+    }
+    if($scope.selectedStudentsID !=''){
+        $scope.disable = false;
+    }else{
+        $scope.disable = true;
+    }
+   console.log($scope.selectedStudentsID);
+    }
+    $scope.isClick = function(e){
+        var ide = e.target;
+    var val = (ide.checked ? true : false);
+    var sid = e.target.id;
+    // console.log("328");
+    // console.log($scope.balfee_data);
+    angular.forEach($scope.balfee_data,function(value,key){
+       
+        if(sid == value.Student_id)
+        {
+            sid = value;
+        }
+    });
+        console.log(sid);
+    var pos = $scope.selectedStudentsID.indexOf(sid);
+    //alert(val);
+    console.log($scope.selectedStudentsID.indexOf(sid));
+    if(val)
+    {
+        if( pos == -1)
+        {
+           
+            //console.log("PUSH");
+            $scope.selectedStudentsID.push(sid);
+        }
+        
+    }
+    else
+    {
+       
+        //console.log("POP");
+        $scope.selectedStudentsID.splice(pos,1);
+    }
+    //
+    if(val){
+        $scope.disable = false;
+    }else{
+        $scope.disable = true;
+    }
+    //console.log($scope.selectedStudentsID);
+    }
+    $scope.calltracking = function(){
+        
+        //$rootScope.student = $scope.selectedStudentsID;
+        if($scope.selectedStudentsID ==''){
+            swal('Select Check box','','warning');
+			return false;
+        }else{
+        $scope.controller = 'ng-controller="report_balfeeCtrl"';
+        $scope.myModel.comments = 'Call Tracking for Document Report';
+        var lead = {
+            method: 'POST',
+            url: apiPoint.url + 'getTrackingLeadDetails/',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            data: {
+                requestedBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
+                student:$scope.selectedStudentsID,
+                branchID:JSON.parse(localStorage.getItem('localObj')).localBranchID,
+                userType:JSON.parse(localStorage.getItem('localObj')).localType,
+            }
+        };
+        $http(lead).then(function (response) {
+            if (response.data.status==200) {
+                $rootScope.activity = response.data.activityDetails;
+                    $rootScope.status = response.data.statusDetails;
+                    $rootScope.staffDetails = response.data.staffDetails;
+                    $rootScope.studentDetails = $scope.selectedStudentsID;
+                 // $scope.modalopen($scope.activity);
+            $rootScope.modalInstance = $modal.open({
+            templateUrl: 'assets/views/autoCalltracking.html',
+            controller: 'report_balfeeCtrl',
+            // size: size,
+           
+            resolve: {
+                pdfitems: function () {
+                    return  $scope.activity;
+                    
+                }
+            }
+        });
+
+            $rootScope.modalInstance.result.then(function (selectedItem) {
+            $scope.selected = selectedItem;
+        }, function () {
+            $log.info('Modal dismissed at: ' + new Date());
+        });
+        
+    }
+    
+    });
+        }
+    }
+
+    $scope.trackForm = {
+        submit: function (form, myModel,loading,selectedStudents) {
+			var comments = [];
+			  for(var stuid=0;stuid<=selectedStudents.length-1;stuid++){
+				  comments [stuid] ="Call Tracking For Report Balance Fee";
+			  }
+              //console.log(selectedStudents);
+            if(isNaN(myModel.date)){
+                $scope.nextFollowupDate = myModel.date;
+
+            }
+            else{
+                $scope.getdate=new Date(myModel.date).toDateString();
+
+                $scope.nextFollowupDate = $filter('date')(new Date($scope.getdate), 'dd-MM-yyyy');
+            }
+
+            var firstError = null;
+            if (form.$invalid) {
+
+                var field = null, firstError = null;
+                for (field in form) {
+                    if (field[0] != '$') {
+                        if (firstError === null && !form[field].$valid) {
+                            firstError = form[field].$name;
+                        }
+                        if (form[field].$pristine) {
+                            form[field].$dirty = true;
+                        }
+                    }
+                }
+                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 {
+
+                $scope.ldloading1 = {};
+
+                $scope.ldloading1[loading.replace('-', '_')] = true;
+               /* hide this fun after branch level changes
+                if($scope.userType !='R004'){
+                    $scope.updateBranchID = JSON.parse(localStorage.getItem('localObj')).localBranchID;
+                    $scope.updateAssignTo = myModel.assignedTo;
+
+                }
+                else{
+                    $scope.updateBranchID = myModel.branch.BranchCode;
+                    $scope.updateAssignTo = myModel.assignedTo;
+
+                }*/
+                   
+                var addLead = {
+                    method: 'POST',
+                    url: apiPoint.url + 'autoAddlead/',
+                    headers: {
+                        'Content-Type': 'application/json'
+                    },
+                    data: {
+                        student:selectedStudents,
+                        date: $scope.nextFollowupDate,
+                        activity: myModel.activity.activityID,
+                        assignedTo: myModel.assignedTo,
+                        status: myModel.status,
+                        referedBy: myModel.referedBy,
+                        comments:comments,
+                        
+                        enquiryStatus:myModel.enquiryStatus,
+                        createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
+                        branchId: JSON.parse(localStorage.getItem('localObj')).localBranchID
+
+                    }
+                };
+                $http(addLead).then(function (response) {
+                    if (response.data.status==200 && response.data.leadDetails.leadStatus == true) {
+                        $rootScope.modalInstance.close();
+                        swal(" ", response.data.leadDetails.message, "success");
+                        $state.go($state.current, {}, { reload: true });
+
+                    } else {
+                        
+                        swal(" ", response.data.leadDetails.message, "error");
+                    }
+                });
+
+
+            }
+        },
+        reset: function (form) {
+
+            $scope.myModel = angular.copy($scope.master);
+            form.$setPristine(true);
+            $scope.myModel = {
+                "studentName": "",
+                "mobileNumber": "",
+                "universityName": "",
+                "courseName": "",
+                "activity": "",
+                "assignedTo": "",
+                "status": "",
+                "referedBy": '',
+                "comments":''
+            };
+        }
+    };
+    
+
+     /**
+      * Call Tracking End
+      */
+    }]);
+
+/*modal controller
+* */
 app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log", "API_POINTS", "$http", function ($scope,$rootScope, $modal, $log, apiPoint, $http) {
     //Tooltip for print button
     $scope.dynamicTooltip = 'Student View';
@@ -361,240 +598,6 @@ app.controller('ModalInstanceCtrl1', ["$scope", "$modalInstance", "items1", "Wor
 
 }]);
 
-/**
-     * Auto Call Tracking Sriram
-     */
-    $scope.selectedStudentsID = [];
-    $scope.isCheckAll = function(e){
-        var val = (e.target.checked ? true : false);
-        if(val)
-    {
-       // $scope.disable = false;
-        var len =  $scope.balfee_data.length;
-        var i = 0;
-        for(i=0;i<len;i++)
-        {
-            if($scope.selectedStudentsID.indexOf($scope.balfee_data[i]) === -1)
-            {
-                
-                $scope.selectedStudentsID.push($scope.balfee_data[i]);
-            }
-        }
-    }
-    else
-    {
-       // $scope.disable = true;
-        $scope.selectedStudentsID = [];
-    }
-    if($scope.selectedStudentsID !=''){
-        $scope.disable = false;
-    }else{
-        $scope.disable = true;
-    }
-   console.log($scope.selectedStudentsID);
-    }
-    $scope.isClick = function(e){
-        var ide = e.target;
-    var val = (ide.checked ? true : false);
-    var sid = e.target.id;
-    // console.log("328");
-    // console.log($scope.balfee_data);
-    angular.forEach($scope.balfee_data,function(value,key){
-       
-        if(sid == value.Student_id)
-        {
-            sid = value;
-        }
-    });
-        console.log(sid);
-    var pos = $scope.selectedStudentsID.indexOf(sid);
-    //alert(val);
-    console.log($scope.selectedStudentsID.indexOf(sid));
-    if(val)
-    {
-        if( pos == -1)
-        {
-           
-            //console.log("PUSH");
-            $scope.selectedStudentsID.push(sid);
-        }
-        
-    }
-    else
-    {
-       
-        //console.log("POP");
-        $scope.selectedStudentsID.splice(pos,1);
-    }
-    //
-    if(val){
-        $scope.disable = false;
-    }else{
-        $scope.disable = true;
-    }
-    //console.log($scope.selectedStudentsID);
-    }
-    $scope.calltracking = function(){
-        
-        //$rootScope.student = $scope.selectedStudentsID;
-        if($scope.selectedStudentsID ==''){
-            swal('Select Check box','','warning');
-			return false;
-        }else{
-        $scope.controller = 'ng-controller="report_balfeeCtrl"';
-        $scope.myModel.comments = 'Call Tracking for Document Report';
-        var lead = {
-            method: 'POST',
-            url: apiPoint.url + 'getTrackingLeadDetails/',
-            headers: {
-                'Content-Type': 'application/json'
-            },
-            data: {
-                requestedBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
-                student:$scope.selectedStudentsID,
-                branchID:JSON.parse(localStorage.getItem('localObj')).localBranchID,
-                userType:JSON.parse(localStorage.getItem('localObj')).localType,
-            }
-        };
-        $http(lead).then(function (response) {
-            if (response.data.status==200) {
-                $rootScope.activity = response.data.activityDetails;
-                    $rootScope.status = response.data.statusDetails;
-                    $rootScope.staffDetails = response.data.staffDetails;
-                    $rootScope.studentDetails = $scope.selectedStudentsID;
-                 // $scope.modalopen($scope.activity);
-        var modalInstance = $modal.open({
-            templateUrl: 'assets/views/autoCalltracking.html',
-            controller: 'report_balfeeCtrl',
-            // size: size,
-           
-            resolve: {
-                pdfitems: function () {
-                    return  $scope.activity;
-                    
-                }
-            }
-        });
-
-        modalInstance.result.then(function (selectedItem) {
-            $scope.selected = selectedItem;
-        }, function () {
-            $log.info('Modal dismissed at: ' + new Date());
-        });
-        
-    }
-    
-    });
-        }
-    }
-
-    $scope.trackForm = {
-        submit: function (form, myModel,loading,selectedStudents) {
-              //console.log(selectedStudents);
-            if(isNaN(myModel.date)){
-                $scope.nextFollowupDate = myModel.date;
-
-            }
-            else{
-                $scope.getdate=new Date(myModel.date).toDateString();
-
-                $scope.nextFollowupDate = $filter('date')(new Date($scope.getdate), 'dd-MM-yyyy');
-            }
-
-            var firstError = null;
-            if (form.$invalid) {
-
-                var field = null, firstError = null;
-                for (field in form) {
-                    if (field[0] != '$') {
-                        if (firstError === null && !form[field].$valid) {
-                            firstError = form[field].$name;
-                        }
-                        if (form[field].$pristine) {
-                            form[field].$dirty = true;
-                        }
-                    }
-                }
-                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 {
-
-                $scope.ldloading1 = {};
-
-                $scope.ldloading1[loading.replace('-', '_')] = true;
-               /* hide this fun after branch level changes
-                if($scope.userType !='R004'){
-                    $scope.updateBranchID = JSON.parse(localStorage.getItem('localObj')).localBranchID;
-                    $scope.updateAssignTo = myModel.assignedTo;
-
-                }
-                else{
-                    $scope.updateBranchID = myModel.branch.BranchCode;
-                    $scope.updateAssignTo = myModel.assignedTo;
-
-                }*/
-                   
-                var addLead = {
-                    method: 'POST',
-                    url: apiPoint.url + 'autoAddlead/',
-                    headers: {
-                        'Content-Type': 'application/json'
-                    },
-                    data: {
-                        student:selectedStudents,
-                        date: $scope.nextFollowupDate,
-                        activity: myModel.activity.activityID,
-                        assignedTo: myModel.assignedTo,
-                        status: myModel.status,
-                        referedBy: myModel.referedBy,
-                        comments:"Call Tracking For Report ExamFees Details ",
-                        
-                        enquiryStatus:myModel.enquiryStatus,
-                        createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
-                        branchId: JSON.parse(localStorage.getItem('localObj')).localBranchID
-
-                    }
-                };
-                $http(addLead).then(function (response) {
-                        console.log(response);
-                    if (response.data.status==200 && response.data.leadDetails.leadStatus == true) {
-                        
-                        swal(" ", response.data.leadDetails.message, "success");
-                        window.location.reload();
-                    } else {
-                        
-                        swal(" ", response.data.leadDetails.message, "error");
-                        window.location.reload();
-                    }
-                });
-
-
-            }
-        },
-        reset: function (form) {
-
-            $scope.myModel = angular.copy($scope.master);
-            form.$setPristine(true);
-            $scope.myModel = {
-                "studentName": "",
-                "mobileNumber": "",
-                "universityName": "",
-                "courseName": "",
-                "activity": "",
-                "assignedTo": "",
-                "status": "",
-                "referedBy": '',
-                "comments":''
-            };
-        }
-    };
-    
-
-     /**
-      * Call Tracking End
-      */
-    }]);
-
 
 
 

Apollo/assets/js/controllers/report_certificateCtrl.js

@@ -98,7 +98,7 @@ app.controller('report_certificateCtrl', ["$scope", "$filter","$rootScope","$mod
 
         });
         // disable submit
-        $scope.$watchCollection('filters.from_date', function (newValue,oldValue) {
+        $scope.$watchCollection('univModel.from_date', function (newValue,oldValue) {
             if(newValue==undefined || newValue=='' || newValue==null){
                 $scope.disableSubmit=true;
             }
@@ -110,7 +110,11 @@ app.controller('report_certificateCtrl', ["$scope", "$filter","$rootScope","$mod
         });
 
         $scope.onSubmit = function () {
+			 if($scope.univModel.university !== null && $scope.univModel.university !== '' ){
                $scope.filterUniv = angular.fromJson($scope.univModel.university);
+            }else {
+                $scope.filterUniv = '';
+            }
             //alert($scope.batch.name);
             $scope.cert_data = '';
             $scope.message = '';
@@ -161,12 +165,249 @@ app.controller('report_certificateCtrl', ["$scope", "$filter","$rootScope","$mod
         
         
         $scope.exportData = function () {
-            alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Document_fee_paid_date as DocumentFeePaidDate,Enrollment_id as EnrollmentID,Student_name as StudentName,Father as FatherName,Course_name as CourseName,Sem_year as SemYear,CAST(Phone_number AS NUMBER) as PhoneNumber,University as University,CAST(Balance_fee AS NUMBER) as Balance,Certificate_name as CertificateName,Status as CertificateStatus,Date as Date INTO XLS("Certificate_status.xls",?) FROM ?',[mystyle,$scope.cert_data]);
+            alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,initialPaid as DocumentFeePaidDate,Enrollment_id as EnrollmentID,Student_name as StudentName,Father_name as FatherName,Course_name as CourseName,CAST(Phone_number AS NUMBER) as PhoneNumber,University as University,CAST(balance AS NUMBER) as Balance,certname as CertificateName,status as CertificateStatus,adate as Date INTO XLS("Certificate_status.xls",?) FROM ?',[mystyle,$scope.cert_data]);
         };
 
-        /*modal controller
+    /**
-   * */
+     * Auto Call Tracking Sriram
-  app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log", "API_POINTS", "$http", function ($scope,$rootScope, $modal, $log, apiPoint, $http) {
+     */
+    $scope.selectedStudentsID = [];
+    $scope.isCheckAll = function(e){
+        var val = (e.target.checked ? true : false);
+        if(val)
+    {
+       // $scope.disable = false;
+        var len =  $scope.cert_data.length;
+        var i = 0;
+        for(i=0;i<len;i++)
+        {
+            if($scope.selectedStudentsID.indexOf($scope.cert_data[i]) === -1)
+            {
+                
+                $scope.selectedStudentsID.push($scope.cert_data[i]);
+            }
+        }
+    }
+    else
+    {
+       // $scope.disable = true;
+        $scope.selectedStudentsID = [];
+    }
+    if($scope.selectedStudentsID !=''){
+        $scope.disable = false;
+    }else{
+        $scope.disable = true;
+    }
+   console.log($scope.selectedStudentsID);
+    }
+    $scope.isClick = function(e){
+        var ide = e.target;
+    var val = (ide.checked ? true : false);
+    var sid = e.target.id;
+    // console.log("328");
+    // console.log($scope.balfee_data);
+    angular.forEach($scope.cert_data,function(value,key){
+       
+        if(sid == value.Student_id)
+        {
+            sid = value;
+        }
+    });
+        console.log(sid);
+    var pos = $scope.selectedStudentsID.indexOf(sid);
+    //alert(val);
+    console.log($scope.selectedStudentsID.indexOf(sid));
+    if(val)
+    {
+        if( pos == -1)
+        {
+           
+            //console.log("PUSH");
+            $scope.selectedStudentsID.push(sid);
+        }
+        
+    }
+    else
+    {
+       
+        //console.log("POP");
+        $scope.selectedStudentsID.splice(pos,1);
+    }
+    //
+    if(val){
+        $scope.disable = false;
+    }else{
+        $scope.disable = true;
+    }
+    //console.log($scope.selectedStudentsID);
+    }
+    $scope.calltracking = function(){
+        
+        //$rootScope.student = $scope.selectedStudentsID;
+        if($scope.selectedStudentsID ==''){
+            swal('Select Check box','','warning');
+			return false;
+        }else{
+        $scope.controller = 'ng-controller="report_certificateCtrl"';
+        $scope.myModel.comments = 'Call Tracking for Document Report';
+        var lead = {
+            method: 'POST',
+            url: apiPoint.url + 'getTrackingLeadDetails/',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            data: {
+                requestedBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
+                student:$scope.selectedStudentsID,
+                branchID:JSON.parse(localStorage.getItem('localObj')).localBranchID,
+                userType:JSON.parse(localStorage.getItem('localObj')).localType,
+            }
+        };
+        $http(lead).then(function (response) {
+            if (response.data.status==200) {
+                $rootScope.activity = response.data.activityDetails;
+                    $rootScope.status = response.data.statusDetails;
+                    $rootScope.staffDetails = response.data.staffDetails;
+                    $rootScope.studentDetails = $scope.selectedStudentsID;
+                 // $scope.modalopen($scope.activity);
+            $rootScope.modalInstance = $modal.open({
+            templateUrl: 'assets/views/autoCalltracking.html',
+            controller: 'report_certificateCtrl',
+            // size: size,
+           
+            resolve: {
+                pdfitems: function () {
+                    return  $scope.activity;
+                    
+                }
+            }
+        });
+
+            $rootScope.modalInstance.result.then(function (selectedItem) {
+            $scope.selected = selectedItem;
+        }, function () {
+            $log.info('Modal dismissed at: ' + new Date());
+        });
+        
+    }
+    
+    });
+        }
+    }
+
+    $scope.trackForm = {
+        submit: function (form, myModel,loading,selectedStudents) {
+              //console.log(selectedStudents);
+			   var comments = [];
+			  for(var stuid=0;stuid<=selectedStudents.length-1;stuid++){
+				  comments [stuid] ="Call Tracking For Report Certificate Status - DocumentName:"+selectedStudents[stuid].Certificate_name + " - Status:" +selectedStudents[stuid].Certificate_status + " - Date:" +selectedStudents[stuid].Certificate_date;
+			  }
+            if(isNaN(myModel.date)){
+                $scope.nextFollowupDate = myModel.date;
+
+            }
+            else{
+                $scope.getdate=new Date(myModel.date).toDateString();
+
+                $scope.nextFollowupDate = $filter('date')(new Date($scope.getdate), 'dd-MM-yyyy');
+            }
+
+            var firstError = null;
+            if (form.$invalid) {
+
+                var field = null, firstError = null;
+                for (field in form) {
+                    if (field[0] != '$') {
+                        if (firstError === null && !form[field].$valid) {
+                            firstError = form[field].$name;
+                        }
+                        if (form[field].$pristine) {
+                            form[field].$dirty = true;
+                        }
+                    }
+                }
+                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 {
+
+                $scope.ldloading1 = {};
+
+                $scope.ldloading1[loading.replace('-', '_')] = true;
+               /* hide this fun after branch level changes
+                if($scope.userType !='R004'){
+                    $scope.updateBranchID = JSON.parse(localStorage.getItem('localObj')).localBranchID;
+                    $scope.updateAssignTo = myModel.assignedTo;
+
+                }
+                else{
+                    $scope.updateBranchID = myModel.branch.BranchCode;
+                    $scope.updateAssignTo = myModel.assignedTo;
+
+                }*/
+                   
+                var addLead = {
+                    method: 'POST',
+                    url: apiPoint.url + 'autoAddlead/',
+                    headers: {
+                        'Content-Type': 'application/json'
+                    },
+                    data: {
+                        student:selectedStudents,
+                        date: $scope.nextFollowupDate,
+                        activity: myModel.activity.activityID,
+                        assignedTo: myModel.assignedTo,
+                        status: myModel.status,
+                        referedBy: myModel.referedBy,
+                        comments:comments,
+                        
+                        enquiryStatus:myModel.enquiryStatus,
+                        createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
+                        branchId: JSON.parse(localStorage.getItem('localObj')).localBranchID
+
+                    }
+                };
+                $http(addLead).then(function (response) {
+                    if (response.data.status==200 && response.data.leadDetails.leadStatus == true) {
+                        $rootScope.modalInstance.close();
+                        swal(" ", response.data.leadDetails.message, "success");
+                        $state.go($state.current, {}, { reload: true });
+                    } else {
+                        
+                        swal(" ", response.data.leadDetails.message, "error");
+                    }
+                });
+
+
+            }
+        },
+        reset: function (form) {
+
+            $scope.myModel = angular.copy($scope.master);
+            form.$setPristine(true);
+            $scope.myModel = {
+                "studentName": "",
+                "mobileNumber": "",
+                "universityName": "",
+                "courseName": "",
+                "activity": "",
+                "assignedTo": "",
+                "status": "",
+                "referedBy": '',
+                "comments":''
+            };
+        }
+    };
+    
+
+     /**
+      * Call Tracking End
+      */
+
+    }]);
+
+/*modal controller
+* */
+app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log", "API_POINTS", "$http", function ($scope,$rootScope, $modal, $log, apiPoint, $http) {
     //Tooltip for print button
     $scope.dynamicTooltip = 'Student View';
 
@@ -304,245 +545,6 @@ app.controller('ModalInstanceCtrl1', ["$scope", "$modalInstance", "items1", "Wor
 
 
 }]);
-    /**
-     * Auto Call Tracking Sriram
-     */
-    $scope.selectedStudentsID = [];
-    $scope.isCheckAll = function(e){
-        var val = (e.target.checked ? true : false);
-        if(val)
-    {
-       // $scope.disable = false;
-        var len =  $scope.cert_data.length;
-        var i = 0;
-        for(i=0;i<len;i++)
-        {
-            if($scope.selectedStudentsID.indexOf($scope.cert_data[i]) === -1)
-            {
-                
-                $scope.selectedStudentsID.push($scope.cert_data[i]);
-            }
-        }
-    }
-    else
-    {
-       // $scope.disable = true;
-        $scope.selectedStudentsID = [];
-    }
-    if($scope.selectedStudentsID !=''){
-        $scope.disable = false;
-    }else{
-        $scope.disable = true;
-    }
-   console.log($scope.selectedStudentsID);
-    }
-    $scope.isClick = function(e){
-        var ide = e.target;
-    var val = (ide.checked ? true : false);
-    var sid = e.target.id;
-    // console.log("328");
-    // console.log($scope.balfee_data);
-    angular.forEach($scope.cert_data,function(value,key){
-       
-        if(sid == value.Student_id)
-        {
-            sid = value;
-        }
-    });
-        console.log(sid);
-    var pos = $scope.selectedStudentsID.indexOf(sid);
-    //alert(val);
-    console.log($scope.selectedStudentsID.indexOf(sid));
-    if(val)
-    {
-        if( pos == -1)
-        {
-           
-            //console.log("PUSH");
-            $scope.selectedStudentsID.push(sid);
-        }
-        
-    }
-    else
-    {
-       
-        //console.log("POP");
-        $scope.selectedStudentsID.splice(pos,1);
-    }
-    //
-    if(val){
-        $scope.disable = false;
-    }else{
-        $scope.disable = true;
-    }
-    //console.log($scope.selectedStudentsID);
-    }
-    $scope.calltracking = function(){
-        
-        //$rootScope.student = $scope.selectedStudentsID;
-        if($scope.selectedStudentsID ==''){
-            swal('Select Check box','','warning');
-			return false;
-        }else{
-        $scope.controller = 'ng-controller="report_certificateCtrl"';
-        $scope.myModel.comments = 'Call Tracking for Document Report';
-        var lead = {
-            method: 'POST',
-            url: apiPoint.url + 'getTrackingLeadDetails/',
-            headers: {
-                'Content-Type': 'application/json'
-            },
-            data: {
-                requestedBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
-                student:$scope.selectedStudentsID,
-                branchID:JSON.parse(localStorage.getItem('localObj')).localBranchID,
-                userType:JSON.parse(localStorage.getItem('localObj')).localType,
-            }
-        };
-        $http(lead).then(function (response) {
-            if (response.data.status==200) {
-                $rootScope.activity = response.data.activityDetails;
-                    $rootScope.status = response.data.statusDetails;
-                    $rootScope.staffDetails = response.data.staffDetails;
-                    $rootScope.studentDetails = $scope.selectedStudentsID;
-                 // $scope.modalopen($scope.activity);
-        var modalInstance = $modal.open({
-            templateUrl: 'assets/views/autoCalltracking.html',
-            controller: 'report_certificateCtrl',
-            // size: size,
-           
-            resolve: {
-                pdfitems: function () {
-                    return  $scope.activity;
-                    
-                }
-            }
-        });
-
-        modalInstance.result.then(function (selectedItem) {
-            $scope.selected = selectedItem;
-        }, function () {
-            $log.info('Modal dismissed at: ' + new Date());
-        });
-        
-    }
-    
-    });
-        }
-    }
-
-    $scope.trackForm = {
-        submit: function (form, myModel,loading,selectedStudents) {
-              //console.log(selectedStudents);
-			   var comments = [];
-			  for(var stuid=0;stuid<=selectedStudents.length-1;stuid++){
-				  comments [stuid] ="Call Tracking For Report Certificate Status - DocumentName:"+selectedStudents[stuid].Certificate_name + " - Status:" +selectedStudents[stuid].Certificate_status + " - Date:" +selectedStudents[stuid].Certificate_date;
-			  }
-            if(isNaN(myModel.date)){
-                $scope.nextFollowupDate = myModel.date;
-
-            }
-            else{
-                $scope.getdate=new Date(myModel.date).toDateString();
-
-                $scope.nextFollowupDate = $filter('date')(new Date($scope.getdate), 'dd-MM-yyyy');
-            }
-
-            var firstError = null;
-            if (form.$invalid) {
-
-                var field = null, firstError = null;
-                for (field in form) {
-                    if (field[0] != '$') {
-                        if (firstError === null && !form[field].$valid) {
-                            firstError = form[field].$name;
-                        }
-                        if (form[field].$pristine) {
-                            form[field].$dirty = true;
-                        }
-                    }
-                }
-                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 {
-
-                $scope.ldloading1 = {};
-
-                $scope.ldloading1[loading.replace('-', '_')] = true;
-               /* hide this fun after branch level changes
-                if($scope.userType !='R004'){
-                    $scope.updateBranchID = JSON.parse(localStorage.getItem('localObj')).localBranchID;
-                    $scope.updateAssignTo = myModel.assignedTo;
-
-                }
-                else{
-                    $scope.updateBranchID = myModel.branch.BranchCode;
-                    $scope.updateAssignTo = myModel.assignedTo;
-
-                }*/
-                   
-                var addLead = {
-                    method: 'POST',
-                    url: apiPoint.url + 'autoAddlead/',
-                    headers: {
-                        'Content-Type': 'application/json'
-                    },
-                    data: {
-                        student:selectedStudents,
-                        date: $scope.nextFollowupDate,
-                        activity: myModel.activity.activityID,
-                        assignedTo: myModel.assignedTo,
-                        status: myModel.status,
-                        referedBy: myModel.referedBy,
-                        comments:comments,
-                        
-                        enquiryStatus:myModel.enquiryStatus,
-                        createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
-                        branchId: JSON.parse(localStorage.getItem('localObj')).localBranchID
-
-                    }
-                };
-                $http(addLead).then(function (response) {
-                        console.log(response);
-                    if (response.data.status==200 && response.data.leadDetails.leadStatus == true) {
-                        
-                        swal(" ", response.data.leadDetails.message, "success");
-                        window.location.reload();
-                    } else {
-                        
-                        swal(" ", response.data.leadDetails.message, "error");
-                        window.location.reload();
-                    }
-                });
-
-
-            }
-        },
-        reset: function (form) {
-
-            $scope.myModel = angular.copy($scope.master);
-            form.$setPristine(true);
-            $scope.myModel = {
-                "studentName": "",
-                "mobileNumber": "",
-                "universityName": "",
-                "courseName": "",
-                "activity": "",
-                "assignedTo": "",
-                "status": "",
-                "referedBy": '',
-                "comments":''
-            };
-        }
-    };
-    
-
-     /**
-      * Call Tracking End
-      */
-
-    }]);
-
 
 
 

Apollo/assets/js/controllers/report_doc_pendingCtrl.js

@@ -98,7 +98,7 @@ app.controller('report_doc_pendingCtrl', ["$scope", "$filter","$rootScope","$mod
 		//Response data
           $scope.show = false;
         $scope.onSubmit = function (form) {
-            $scope.filterUniv = angular.fromJson($scope.univModel.university);
+			
 			var firstError = null;
             if (form.$invalid) {
                 var field = null, firstError = null;
@@ -116,6 +116,7 @@ app.controller('report_doc_pendingCtrl', ["$scope", "$filter","$rootScope","$mod
                 angular.element('.ng-invalid[batch=' + firstError + ']').focus();
             }else {
             //alert($scope.batch.name);
+			 $scope.filterUniv = angular.fromJson($scope.univModel.university);
             $scope.doc_pending_data = '';
             $scope.message = '';
             var response_data = {
@@ -166,9 +167,245 @@ app.controller('report_doc_pendingCtrl', ["$scope", "$filter","$rootScope","$mod
         $scope.exportData = function () {
             alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Admission_date as AdmissionDate,Enrollment_id as EnrollmentID,Student_name as StudentName,Father_name as FatherName,Course_name as CourseName,CAST(Phone_number AS NUMBER) as PhoneNumber,University as University,fdate as Followupdate,certname as DocumentName INTO XLS("Document_pending_student_list.xls",?) FROM ?',[mystyle,$scope.doc_pending_data]);
         };
+
+    /**
+     * Auto Call Tracking Sriram
+     */
+    $scope.selectedStudentsID = [];
+    $scope.isCheckAll = function(e){
+        var val = (e.target.checked ? true : false);
+        if(val)
+    {
+       // $scope.disable = false;
+        var len =  $scope.doc_pending_data.length;
+        var i = 0;
+        for(i=0;i<len;i++)
+        {
+            if($scope.selectedStudentsID.indexOf($scope.doc_pending_data[i]) === -1)
+            {
+                
+                $scope.selectedStudentsID.push($scope.doc_pending_data[i]);
+            }
+        }
+    }
+    else
+    {
+       // $scope.disable = true;
+        $scope.selectedStudentsID = [];
+    }
+    if($scope.selectedStudentsID !=''){
+        $scope.disable = false;
+    }else{
+        $scope.disable = true;
+    }
+   // console.log($scope.selectedStudentsID);
+    }
+    $scope.isClick = function(e){
+        var ide = e.target;
+    var val = (ide.checked ? true : false);
+    var sid = e.target.id;
+    angular.forEach($scope.doc_pending_data,function(value,key){
+        //console.log(value);
+        if(sid == value.Student_id)
+        {
+            sid = value;
+        }
+    });
+    
+    var pos = $scope.selectedStudentsID.indexOf(sid);
+    //alert(val);
+    if(val)
+    {
+        if( pos == -1)
+        {
+           
+            //console.log("PUSH");
+            $scope.selectedStudentsID.push(sid);
+        }
+        
+    }
+    else
+    {
+       
+        //console.log("POP");
+        $scope.selectedStudentsID.splice(pos,1);
+    }
+    //
+    if(val){
+        $scope.disable = false;
+    }else{
+        $scope.disable = true;
+    }
+    console.log($scope.selectedStudentsID);
+    }
+    $scope.calltracking = function(){
+        
+        //$rootScope.student = $scope.selectedStudentsID;
+        if($scope.selectedStudentsID ==''){
+            swal('Select Check box','','warning');
+			return false;
+        }else{
+        $scope.controller = 'ng-controller="report_doc_pendingCtrl"';
+        $scope.myModel.comments = 'Call Tracking for Document Pending Report';
+        var lead = {
+            method: 'POST',
+            url: apiPoint.url + 'getTrackingLeadDetails/',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            data: {
+                requestedBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
+                student:$scope.selectedStudentsID,
+                branchID:JSON.parse(localStorage.getItem('localObj')).localBranchID,
+                userType:JSON.parse(localStorage.getItem('localObj')).localType,
+            }
+        };
+        $http(lead).then(function (response) {
+            if (response.data.status==200) {
+                $rootScope.activity = response.data.activityDetails;
+                    $rootScope.status = response.data.statusDetails;
+                    $rootScope.staffDetails = response.data.staffDetails;
+                    $rootScope.studentDetails = $scope.selectedStudentsID;
+                 // $scope.modalopen($scope.activity);
+            $rootScope.modalInstance = $modal.open({
+            templateUrl: 'assets/views/autoCalltracking.html',
+            controller: 'report_doc_pendingCtrl',
+            // size: size,
+           
+            resolve: {
+                pdfitems: function () {
+                    return  $scope.activity;
+                    
+                }
+            }
+        });
+
+            $rootScope.modalInstance.result.then(function (selectedItem) {
+            $scope.selected = selectedItem;
+        }, function () {
+            $log.info('Modal dismissed at: ' + new Date());
+        });
+        
+    }
+    
+    });
+        }
+    }
+
+    $scope.trackForm = {
+        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";
+			  }
+              //console.log(selectedStudents);
+            if(isNaN(myModel.date)){
+                $scope.nextFollowupDate = myModel.date;
+
+            }
+            else{
+                $scope.getdate=new Date(myModel.date).toDateString();
+
+                $scope.nextFollowupDate = $filter('date')(new Date($scope.getdate), 'dd-MM-yyyy');
+            }
+
+            var firstError = null;
+            if (form.$invalid) {
+
+                var field = null, firstError = null;
+                for (field in form) {
+                    if (field[0] != '$') {
+                        if (firstError === null && !form[field].$valid) {
+                            firstError = form[field].$name;
+                        }
+                        if (form[field].$pristine) {
+                            form[field].$dirty = true;
+                        }
+                    }
+                }
+                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 {
+
+                $scope.ldloading1 = {};
+
+                $scope.ldloading1[loading.replace('-', '_')] = true;
+               /* hide this fun after branch level changes
+                if($scope.userType !='R004'){
+                    $scope.updateBranchID = JSON.parse(localStorage.getItem('localObj')).localBranchID;
+                    $scope.updateAssignTo = myModel.assignedTo;
+
+                }
+                else{
+                    $scope.updateBranchID = myModel.branch.BranchCode;
+                    $scope.updateAssignTo = myModel.assignedTo;
+
+                }*/
+                   
+                var addLead = {
+                    method: 'POST',
+                    url: apiPoint.url + 'autoAddlead/',
+                    headers: {
+                        'Content-Type': 'application/json'
+                    },
+                    data: {
+                        student:selectedStudents,
+                        date: $scope.nextFollowupDate,
+                        activity: myModel.activity.activityID,
+                        assignedTo: myModel.assignedTo,
+                        status: myModel.status,
+                        referedBy: myModel.referedBy,
+                        comments:myModel.comments,
+                        
+                        enquiryStatus:myModel.enquiryStatus,
+                        createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
+                        branchId: JSON.parse(localStorage.getItem('localObj')).localBranchID
+
+                    }
+                };
+                $http(addLead).then(function (response) {
+                        console.log(response);
+                    if (response.data.status==200 && response.data.leadDetails.leadStatus == true) {
+                        $rootScope.modalInstance.close();
+
+                        swal(" ", response.data.leadDetails.message, "success");
+                        $state.go($state.current, {}, { reload: true });
+                    } else {
+                        
+                        swal(" ", response.data.leadDetails.message, "error");
+                    }
+                });
+
+
+            }
+        },
+        reset: function (form) {
+
+            $scope.myModel = angular.copy($scope.master);
+            form.$setPristine(true);
+            $scope.myModel = {
+                "studentName": "",
+                "mobileNumber": "",
+                "universityName": "",
+                "courseName": "",
+                "activity": "",
+                "assignedTo": "",
+                "status": "",
+                "referedBy": '',
+                "comments":''
+            };
+        }
+    };
+    
+
+     /**
+      * Call Tracking End
+      */
+
+    }]);
 /*modal controller
    * */
-  app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log", "API_POINTS", "$http", function ($scope,$rootScope, $modal, $log, apiPoint, $http) {
+app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log", "API_POINTS", "$http", function ($scope,$rootScope, $modal, $log, apiPoint, $http) {
     //Tooltip for print button
     $scope.dynamicTooltip = 'Student View';
 
@@ -306,237 +543,6 @@ app.controller('ModalInstanceCtrl1', ["$scope", "$modalInstance", "items1", "Wor
 
 
 }]);
-    /**
-     * Auto Call Tracking Sriram
-     */
-    $scope.selectedStudentsID = [];
-    $scope.isCheckAll = function(e){
-        var val = (e.target.checked ? true : false);
-        if(val)
-    {
-       // $scope.disable = false;
-        var len =  $scope.doc_pending_data.length;
-        var i = 0;
-        for(i=0;i<len;i++)
-        {
-            if($scope.selectedStudentsID.indexOf($scope.doc_pending_data[i]) === -1)
-            {
-                
-                $scope.selectedStudentsID.push($scope.doc_pending_data[i]);
-            }
-        }
-    }
-    else
-    {
-       // $scope.disable = true;
-        $scope.selectedStudentsID = [];
-    }
-    if($scope.selectedStudentsID !=''){
-        $scope.disable = false;
-    }else{
-        $scope.disable = true;
-    }
-   // console.log($scope.selectedStudentsID);
-    }
-    $scope.isClick = function(e){
-        var ide = e.target;
-    var val = (ide.checked ? true : false);
-    var sid = e.target.id;
-    angular.forEach($scope.doc_pending_data,function(value,key){
-        //console.log(value);
-        if(sid == value.Student_id)
-        {
-            sid = value;
-        }
-    });
-    
-    var pos = $scope.selectedStudentsID.indexOf(sid);
-    //alert(val);
-    if(val)
-    {
-        if( pos == -1)
-        {
-           
-            //console.log("PUSH");
-            $scope.selectedStudentsID.push(sid);
-        }
-        
-    }
-    else
-    {
-       
-        //console.log("POP");
-        $scope.selectedStudentsID.splice(pos,1);
-    }
-    //
-    if(val){
-        $scope.disable = false;
-    }else{
-        $scope.disable = true;
-    }
-    console.log($scope.selectedStudentsID);
-    }
-    $scope.calltracking = function(){
-        
-        //$rootScope.student = $scope.selectedStudentsID;
-        if($scope.selectedStudentsID ==''){
-            swal('Select Check box','','warning');
-			return false;
-        }else{
-        $scope.controller = 'ng-controller="report_doc_pendingCtrl"';
-        $scope.myModel.comments = 'Call Tracking for Document Report';
-        var lead = {
-            method: 'POST',
-            url: apiPoint.url + 'getTrackingLeadDetails/',
-            headers: {
-                'Content-Type': 'application/json'
-            },
-            data: {
-                requestedBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
-                student:$scope.selectedStudentsID,
-                branchID:JSON.parse(localStorage.getItem('localObj')).localBranchID,
-                userType:JSON.parse(localStorage.getItem('localObj')).localType,
-            }
-        };
-        $http(lead).then(function (response) {
-            if (response.data.status==200) {
-                $rootScope.activity = response.data.activityDetails;
-                    $rootScope.status = response.data.statusDetails;
-                    $rootScope.staffDetails = response.data.staffDetails;
-                    $rootScope.studentDetails = $scope.selectedStudentsID;
-                 // $scope.modalopen($scope.activity);
-        var modalInstance = $modal.open({
-            templateUrl: 'assets/views/autoCalltracking.html',
-            controller: 'report_doc_pendingCtrl',
-            // size: size,
-           
-            resolve: {
-                pdfitems: function () {
-                    return  $scope.activity;
-                    
-                }
-            }
-        });
-
-        modalInstance.result.then(function (selectedItem) {
-            $scope.selected = selectedItem;
-        }, function () {
-            $log.info('Modal dismissed at: ' + new Date());
-        });
-        
-    }
-    
-    });
-        }
-    }
-
-    $scope.trackForm = {
-        submit: function (form, myModel,loading,selectedStudents) {
-              //console.log(selectedStudents);
-            if(isNaN(myModel.date)){
-                $scope.nextFollowupDate = myModel.date;
-
-            }
-            else{
-                $scope.getdate=new Date(myModel.date).toDateString();
-
-                $scope.nextFollowupDate = $filter('date')(new Date($scope.getdate), 'dd-MM-yyyy');
-            }
-
-            var firstError = null;
-            if (form.$invalid) {
-
-                var field = null, firstError = null;
-                for (field in form) {
-                    if (field[0] != '$') {
-                        if (firstError === null && !form[field].$valid) {
-                            firstError = form[field].$name;
-                        }
-                        if (form[field].$pristine) {
-                            form[field].$dirty = true;
-                        }
-                    }
-                }
-                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 {
-
-                $scope.ldloading1 = {};
-
-                $scope.ldloading1[loading.replace('-', '_')] = true;
-               /* hide this fun after branch level changes
-                if($scope.userType !='R004'){
-                    $scope.updateBranchID = JSON.parse(localStorage.getItem('localObj')).localBranchID;
-                    $scope.updateAssignTo = myModel.assignedTo;
-
-                }
-                else{
-                    $scope.updateBranchID = myModel.branch.BranchCode;
-                    $scope.updateAssignTo = myModel.assignedTo;
-
-                }*/
-                   
-                var addLead = {
-                    method: 'POST',
-                    url: apiPoint.url + 'autoAddlead/',
-                    headers: {
-                        'Content-Type': 'application/json'
-                    },
-                    data: {
-                        student:selectedStudents,
-                        date: $scope.nextFollowupDate,
-                        activity: myModel.activity.activityID,
-                        assignedTo: myModel.assignedTo,
-                        status: myModel.status,
-                        referedBy: myModel.referedBy,
-                        comments:myModel.comments,
-                        
-                        enquiryStatus:myModel.enquiryStatus,
-                        createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
-                        branchId: JSON.parse(localStorage.getItem('localObj')).localBranchID
-
-                    }
-                };
-                $http(addLead).then(function (response) {
-                        console.log(response);
-                    if (response.data.status==200 && response.data.leadDetails.leadStatus == true) {
-                        
-                        swal(" ", response.data.leadDetails.message, "success");
-                        window.location.reload();
-                    } else {
-                        
-                        swal(" ", response.data.leadDetails.message, "error");
-                        window.location.reload();
-                    }
-                });
-
-
-            }
-        },
-        reset: function (form) {
-
-            $scope.myModel = angular.copy($scope.master);
-            form.$setPristine(true);
-            $scope.myModel = {
-                "studentName": "",
-                "mobileNumber": "",
-                "universityName": "",
-                "courseName": "",
-                "activity": "",
-                "assignedTo": "",
-                "status": "",
-                "referedBy": '',
-                "comments":''
-            };
-        }
-    };
-    
-
-     /**
-      * Call Tracking End
-      */
-
-    }]);
 
 
 

Apollo/assets/js/controllers/report_examfeeCtrl.js

@@ -178,9 +178,248 @@ app.controller('report_examfeeCtrl', ["$scope", "$filter","$rootScope","$modal",
         $scope.exportData = function () {
             alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Enrollment_id 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,CAST(Amount AS NUMBER) as ExamWritingFee,Comments as Comments INTO XLS("Exam_writing_fee_report.xls",?) FROM ?',[mystyle,$scope.examfee_data]);
         };
+
+    /**
+     * Auto Call Tracking Sriram
+     */
+    $scope.selectedStudentsID = [];
+    $scope.isCheckAll = function(e){
+        var val = (e.target.checked ? true : false);
+        if(val)
+    {
+       // $scope.disable = false;
+        var len =  $scope.examfee_data.length;
+        var i = 0;
+        for(i=0;i<len;i++)
+        {
+            if($scope.selectedStudentsID.indexOf($scope.examfee_data[i]) === -1)
+            {
+                
+                $scope.selectedStudentsID.push($scope.examfee_data[i]);
+            }
+        }
+    }
+    else
+    {
+       // $scope.disable = true;
+        $scope.selectedStudentsID = [];
+    }
+    if($scope.selectedStudentsID !=''){
+        $scope.disable = false;
+    }else{
+        $scope.disable = true;
+    }
+   console.log($scope.selectedStudentsID);
+    }
+    $scope.isClick = function(e){
+        var ide = e.target;
+    var val = (ide.checked ? true : false);
+    var sid = e.target.id;
+    // console.log("328");
+    // console.log($scope.balfee_data);
+    angular.forEach($scope.examfee_data,function(value,key){
+       
+        if(sid == value.Student_id)
+        {
+            sid = value;
+        }
+    });
+        console.log(sid);
+    var pos = $scope.selectedStudentsID.indexOf(sid);
+    //alert(val);
+    console.log($scope.selectedStudentsID.indexOf(sid));
+    if(val)
+    {
+        if( pos == -1)
+        {
+           
+            //console.log("PUSH");
+            $scope.selectedStudentsID.push(sid);
+        }
+        
+    }
+    else
+    {
+       
+        //console.log("POP");
+        $scope.selectedStudentsID.splice(pos,1);
+    }
+    //
+    if(val){
+        $scope.disable = false;
+    }else{
+        $scope.disable = true;
+    }
+    //console.log($scope.selectedStudentsID);
+    }
+    $scope.calltracking = function(){
+        
+        //$rootScope.student = $scope.selectedStudentsID;
+        if($scope.selectedStudentsID ==''){
+            swal('Select Check box','','warning');
+			return false;
+        }else{
+        $scope.controller = 'ng-controller="report_examfeeCtrl"';
+        //$scope.myModel.comments = 'Call Tracking for Exam Fee Report';
+        var lead = {
+            method: 'POST',
+            url: apiPoint.url + 'getTrackingLeadDetails/',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            data: {
+                requestedBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
+                student:$scope.selectedStudentsID,
+                branchID:JSON.parse(localStorage.getItem('localObj')).localBranchID,
+                userType:JSON.parse(localStorage.getItem('localObj')).localType,
+            }
+        };
+        $http(lead).then(function (response) {
+            if (response.data.status==200) {
+                $rootScope.activity = response.data.activityDetails;
+                    $rootScope.status = response.data.statusDetails;
+                    $rootScope.staffDetails = response.data.staffDetails;
+                    $rootScope.studentDetails = $scope.selectedStudentsID;
+                 // $scope.modalopen($scope.activity);
+                $rootScope.modalInstance = $modal.open({
+            templateUrl: 'assets/views/autoCalltracking.html',
+            controller: 'report_examfeeCtrl',
+            // size: size,
+           
+            resolve: {
+                pdfitems: function () {
+                    return  $scope.activity;
+                    
+                }
+            }
+        });
+
+                $rootScope.modalInstance.result.then(function (selectedItem) {
+            $scope.selected = selectedItem;
+        }, function () {
+            $log.info('Modal dismissed at: ' + new Date());
+        });
+        
+    }
+    
+    });
+        }
+    }
+
+    $scope.trackForm = {
+        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";
+			  }
+              //console.log(selectedStudents);
+            if(isNaN(myModel.date)){
+                $scope.nextFollowupDate = myModel.date;
+
+            }
+            else{
+                $scope.getdate=new Date(myModel.date).toDateString();
+
+                $scope.nextFollowupDate = $filter('date')(new Date($scope.getdate), 'dd-MM-yyyy');
+            }
+
+            var firstError = null;
+            if (form.$invalid) {
+
+                var field = null, firstError = null;
+                for (field in form) {
+                    if (field[0] != '$') {
+                        if (firstError === null && !form[field].$valid) {
+                            firstError = form[field].$name;
+                        }
+                        if (form[field].$pristine) {
+                            form[field].$dirty = true;
+                        }
+                    }
+                }
+                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 {
+
+                $scope.ldloading1 = {};
+
+                $scope.ldloading1[loading.replace('-', '_')] = true;
+               /* hide this fun after branch level changes
+                if($scope.userType !='R004'){
+                    $scope.updateBranchID = JSON.parse(localStorage.getItem('localObj')).localBranchID;
+                    $scope.updateAssignTo = myModel.assignedTo;
+
+                }
+                else{
+                    $scope.updateBranchID = myModel.branch.BranchCode;
+                    $scope.updateAssignTo = myModel.assignedTo;
+
+                }*/
+                   
+                var addLead = {
+                    method: 'POST',
+                    url: apiPoint.url + 'autoAddlead/',
+                    headers: {
+                        'Content-Type': 'application/json'
+                    },
+                    data: {
+                        student:selectedStudents,
+                        date: $scope.nextFollowupDate,
+                        activity: myModel.activity.activityID,
+                        assignedTo: myModel.assignedTo,
+                        status: myModel.status,
+                        referedBy: myModel.referedBy,
+                        comments:comments,
+                        
+                        enquiryStatus:myModel.enquiryStatus,
+                        createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
+                        branchId: JSON.parse(localStorage.getItem('localObj')).localBranchID
+
+                    }
+                };
+                $http(addLead).then(function (response) {
+                    if (response.data.status==200 && response.data.leadDetails.leadStatus == true) {
+                        $rootScope.modalInstance.close();
+
+                        swal(" ", response.data.leadDetails.message, "success");
+                        $state.go($state.current, {}, { reload: true });
+                    } else {
+                        
+                        swal(" ", response.data.leadDetails.message, "error");
+                    }
+                });
+
+
+            }
+        },
+        reset: function (form) {
+
+            $scope.myModel = angular.copy($scope.master);
+            form.$setPristine(true);
+            $scope.myModel = {
+                "studentName": "",
+                "mobileNumber": "",
+                "universityName": "",
+                "courseName": "",
+                "activity": "",
+                "assignedTo": "",
+                "status": "",
+                "referedBy": '',
+                "comments":''
+            };
+        }
+    };
+    
+
+     /**
+      * Call Tracking End
+      */
+
+
+    }]);
 /*modal controller
    * */
-  app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log", "API_POINTS", "$http", function ($scope,$rootScope, $modal, $log, apiPoint, $http) {
+app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log", "API_POINTS", "$http", function ($scope,$rootScope, $modal, $log, apiPoint, $http) {
     //Tooltip for print button
     $scope.dynamicTooltip = 'Student View';
 
@@ -319,242 +558,6 @@ app.controller('ModalInstanceCtrl1', ["$scope", "$modalInstance", "items1", "Wor
 
 }]);
 
-    /**
-     * Auto Call Tracking Sriram
-     */
-    $scope.selectedStudentsID = [];
-    $scope.isCheckAll = function(e){
-        var val = (e.target.checked ? true : false);
-        if(val)
-    {
-       // $scope.disable = false;
-        var len =  $scope.examfee_data.length;
-        var i = 0;
-        for(i=0;i<len;i++)
-        {
-            if($scope.selectedStudentsID.indexOf($scope.examfee_data[i]) === -1)
-            {
-                
-                $scope.selectedStudentsID.push($scope.examfee_data[i]);
-            }
-        }
-    }
-    else
-    {
-       // $scope.disable = true;
-        $scope.selectedStudentsID = [];
-    }
-    if($scope.selectedStudentsID !=''){
-        $scope.disable = false;
-    }else{
-        $scope.disable = true;
-    }
-   console.log($scope.selectedStudentsID);
-    }
-    $scope.isClick = function(e){
-        var ide = e.target;
-    var val = (ide.checked ? true : false);
-    var sid = e.target.id;
-    // console.log("328");
-    // console.log($scope.balfee_data);
-    angular.forEach($scope.examfee_data,function(value,key){
-       
-        if(sid == value.Student_id)
-        {
-            sid = value;
-        }
-    });
-        console.log(sid);
-    var pos = $scope.selectedStudentsID.indexOf(sid);
-    //alert(val);
-    console.log($scope.selectedStudentsID.indexOf(sid));
-    if(val)
-    {
-        if( pos == -1)
-        {
-           
-            //console.log("PUSH");
-            $scope.selectedStudentsID.push(sid);
-        }
-        
-    }
-    else
-    {
-       
-        //console.log("POP");
-        $scope.selectedStudentsID.splice(pos,1);
-    }
-    //
-    if(val){
-        $scope.disable = false;
-    }else{
-        $scope.disable = true;
-    }
-    //console.log($scope.selectedStudentsID);
-    }
-    $scope.calltracking = function(){
-        
-        //$rootScope.student = $scope.selectedStudentsID;
-        if($scope.selectedStudentsID ==''){
-            swal('Select Check box','','warning');
-			return false;
-        }else{
-        $scope.controller = 'ng-controller="report_examfeeCtrl"';
-        $scope.myModel.comments = 'Call Tracking for Document Report';
-        var lead = {
-            method: 'POST',
-            url: apiPoint.url + 'getTrackingLeadDetails/',
-            headers: {
-                'Content-Type': 'application/json'
-            },
-            data: {
-                requestedBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
-                student:$scope.selectedStudentsID,
-                branchID:JSON.parse(localStorage.getItem('localObj')).localBranchID,
-                userType:JSON.parse(localStorage.getItem('localObj')).localType,
-            }
-        };
-        $http(lead).then(function (response) {
-            if (response.data.status==200) {
-                $rootScope.activity = response.data.activityDetails;
-                    $rootScope.status = response.data.statusDetails;
-                    $rootScope.staffDetails = response.data.staffDetails;
-                    $rootScope.studentDetails = $scope.selectedStudentsID;
-                 // $scope.modalopen($scope.activity);
-        var modalInstance = $modal.open({
-            templateUrl: 'assets/views/autoCalltracking.html',
-            controller: 'report_examfeeCtrl',
-            // size: size,
-           
-            resolve: {
-                pdfitems: function () {
-                    return  $scope.activity;
-                    
-                }
-            }
-        });
-
-        modalInstance.result.then(function (selectedItem) {
-            $scope.selected = selectedItem;
-        }, function () {
-            $log.info('Modal dismissed at: ' + new Date());
-        });
-        
-    }
-    
-    });
-        }
-    }
-
-    $scope.trackForm = {
-        submit: function (form, myModel,loading,selectedStudents) {
-              //console.log(selectedStudents);
-            if(isNaN(myModel.date)){
-                $scope.nextFollowupDate = myModel.date;
-
-            }
-            else{
-                $scope.getdate=new Date(myModel.date).toDateString();
-
-                $scope.nextFollowupDate = $filter('date')(new Date($scope.getdate), 'dd-MM-yyyy');
-            }
-
-            var firstError = null;
-            if (form.$invalid) {
-
-                var field = null, firstError = null;
-                for (field in form) {
-                    if (field[0] != '$') {
-                        if (firstError === null && !form[field].$valid) {
-                            firstError = form[field].$name;
-                        }
-                        if (form[field].$pristine) {
-                            form[field].$dirty = true;
-                        }
-                    }
-                }
-                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 {
-
-                $scope.ldloading1 = {};
-
-                $scope.ldloading1[loading.replace('-', '_')] = true;
-               /* hide this fun after branch level changes
-                if($scope.userType !='R004'){
-                    $scope.updateBranchID = JSON.parse(localStorage.getItem('localObj')).localBranchID;
-                    $scope.updateAssignTo = myModel.assignedTo;
-
-                }
-                else{
-                    $scope.updateBranchID = myModel.branch.BranchCode;
-                    $scope.updateAssignTo = myModel.assignedTo;
-
-                }*/
-                   
-                var addLead = {
-                    method: 'POST',
-                    url: apiPoint.url + 'autoAddlead/',
-                    headers: {
-                        'Content-Type': 'application/json'
-                    },
-                    data: {
-                        student:selectedStudents,
-                        date: $scope.nextFollowupDate,
-                        activity: myModel.activity.activityID,
-                        assignedTo: myModel.assignedTo,
-                        status: myModel.status,
-                        referedBy: myModel.referedBy,
-                        comments:"Call Tracking For Report Exam Writing Fees Details ",
-                        
-                        enquiryStatus:myModel.enquiryStatus,
-                        createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
-                        branchId: JSON.parse(localStorage.getItem('localObj')).localBranchID
-
-                    }
-                };
-                $http(addLead).then(function (response) {
-                        console.log(response);
-                    if (response.data.status==200 && response.data.leadDetails.leadStatus == true) {
-                        
-                        swal(" ", response.data.leadDetails.message, "success");
-                        window.location.reload();
-                    } else {
-                        
-                        swal(" ", response.data.leadDetails.message, "error");
-                        window.location.reload();
-                    }
-                });
-
-
-            }
-        },
-        reset: function (form) {
-
-            $scope.myModel = angular.copy($scope.master);
-            form.$setPristine(true);
-            $scope.myModel = {
-                "studentName": "",
-                "mobileNumber": "",
-                "universityName": "",
-                "courseName": "",
-                "activity": "",
-                "assignedTo": "",
-                "status": "",
-                "referedBy": '',
-                "comments":''
-            };
-        }
-    };
-    
-
-     /**
-      * Call Tracking End
-      */
-
-
-    }]);
-
 
 
 

Apollo/assets/js/controllers/report_expenseCtrl.js

@@ -13,6 +13,7 @@ app.controller('report_expenseCtrl', ["$scope", "API_POINTS", "$http", "SweetAle
 
         };
 		
+
      var localDetail = JSON.parse(localStorage.getItem('localObj'));
          const LOCALTYPE = localDetail.localType;
          //console.log(LOCALTYPE)

Apollo/assets/js/controllers/report_markcard_certificateCtrl.js

@@ -48,6 +48,7 @@ app.controller('report_markcard_certificateCtrl', ["$scope", "$filter","$rootSco
 
         };
 		
+
         $scope.filters = function () {
             var filterlist = {
                 method: 'POST',
@@ -99,7 +100,7 @@ app.controller('report_markcard_certificateCtrl', ["$scope", "$filter","$rootSco
 
         });
         // disable submit
-        $scope.$watchCollection('filters.from_date', function (newValue,oldValue) {
+        $scope.$watchCollection('univModel.from_date', function (newValue,oldValue) {
             if(newValue==undefined || newValue=='' || newValue==null){
                 $scope.disableSubmit=true;
             }
@@ -110,8 +111,21 @@ app.controller('report_markcard_certificateCtrl', ["$scope", "$filter","$rootSco
 
         });
         $scope.onSubmit = function () {
+			//alert($scope.univModel.from_date);
+           // if(angular.isString($scope.univModel.university) && $scope.univModel.university !== null){
+                    // $scope.filterUniv = angular.fromJson($scope.univModel.university);
+                // }
+				// else{
+					// $scope.filterUniv ='';
+				// }
+				//alert($scope.univModel.university);
+				if($scope.univModel.university !== null && $scope.univModel.university !== '' ){
                $scope.filterUniv = angular.fromJson($scope.univModel.university);
-            //alert($scope.batch.name);
+            }else {
+                $scope.filterUniv = '';
+            }
+			
+            
             $scope.mark_cert_data = '';
             $scope.message = '';
             var response_data = {
@@ -161,11 +175,251 @@ app.controller('report_markcard_certificateCtrl', ["$scope", "$filter","$rootSco
         
         
         $scope.exportData = function () {
-            alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Document_fee_paid_date as DocumentFeePaidDate,Enrollment_id 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,CAST(Balance_fee AS NUMBER) as BalanceFee,Markcard_status as MarkcardStatus,Markcard_date as MarkcardDate,Markcard_comments as MarkcardComments,Certificate_name as CertificateName,Certificate_status as CertificateStatus,Certificate_date as CertificateDate,Certificate_comments as CertificateComments INTO XLS("Markcard/Certificate_status.xls",?) FROM ?',[mystyle,$scope.mark_cert_data]);
+            alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Student_name as StudentName,Father_name as FatherName,CAST(Phone_number AS NUMBER) as PhoneNumber,University as University,course_name as CourseName,Sem_year as SemYear,Certificate_name as CertificateName,rstatus as ReceivedStatus,rcvedate as ReceivedDate,istatus as IssuedStatus,issuedate as IssuedDate,acmts as CertificateIssuedComments,CAST(Balance_fee AS NUMBER) as BalanceFee INTO XLS("Markcard/Certificate_status.xls",?) FROM ?',[mystyle,$scope.mark_cert_data]);
         };
+    /**
+     * Auto Call Tracking Sriram
+     */
+    $scope.selectedStudentsID = [];
+    $scope.isCheckAll = function(e){
+        var val = (e.target.checked ? true : false);
+        if(val)
+    {
+       // $scope.disable = false;
+        var len =  $scope.mark_cert_data.length;
+        var i = 0;
+        for(i=0;i<len;i++)
+        {
+            if($scope.selectedStudentsID.indexOf($scope.mark_cert_data[i]) === -1)
+            {
+                
+                $scope.selectedStudentsID.push($scope.mark_cert_data[i]);
+            }
+        }
+    }
+    else
+    {
+       // $scope.disable = true;
+        $scope.selectedStudentsID = [];
+    }
+    if($scope.selectedStudentsID !=''){
+        $scope.disable = false;
+    }else{
+        $scope.disable = true;
+    }
+   console.log($scope.selectedStudentsID);
+    }
+    $scope.isClick = function(e){
+        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.sid)
+        {
+            sid = value;
+        }
+    });
+        console.log(sid);
+    var pos = $scope.selectedStudentsID.indexOf(sid);
+    //alert(val);
+    console.log($scope.selectedStudentsID.indexOf(sid));
+    if(val)
+    {
+        if( pos == -1)
+        {
+           
+            //console.log("PUSH");
+            $scope.selectedStudentsID.push(sid);
+        }
+        
+    }
+    else
+    {
+       
+        //console.log("POP");
+        $scope.selectedStudentsID.splice(pos,1);
+    }
+    //
+    if(val){
+        $scope.disable = false;
+    }else{
+        $scope.disable = true;
+    }
+    //console.log($scope.selectedStudentsID);
+    }
+    $scope.calltracking = function(){
+        
+        //$rootScope.student = $scope.selectedStudentsID;
+        if($scope.selectedStudentsID ==''){
+            swal('Select Check box','','warning');
+			return false;
+        }else{
+        $scope.controller = 'ng-controller="report_markcard_certificateCtrl"';
+        $scope.myModel.comments = 'Call Tracking for Document Report';
+        var lead = {
+            method: 'POST',
+            url: apiPoint.url + 'getTrackingLeadDetails/',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            data: {
+                requestedBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
+                student:$scope.selectedStudentsID,
+                branchID:JSON.parse(localStorage.getItem('localObj')).localBranchID,
+                userType:JSON.parse(localStorage.getItem('localObj')).localType,
+            }
+        };
+        $http(lead).then(function (response) {
+            if (response.data.status==200) {
+                $rootScope.activity = response.data.activityDetails;
+                    $rootScope.status = response.data.statusDetails;
+                    $rootScope.staffDetails = response.data.staffDetails;
+                    $rootScope.studentDetails = $scope.selectedStudentsID;
+                 // $scope.modalopen($scope.activity);
+            $rootScope.modalInstance = $modal.open({
+            templateUrl: 'assets/views/autoCalltracking.html',
+            controller: 'report_markcard_certificateCtrl',
+            // size: size,
+           
+            resolve: {
+                pdfitems: function () {
+                    return  $scope.activity;
+                    
+                }
+            }
+        });
+
+            $rootScope.modalInstance.result.then(function (selectedItem) {
+            $scope.selected = selectedItem;
+        }, function () {
+            $log.info('Modal dismissed at: ' + new Date());
+        });
+        
+    }
+    
+    });
+        }
+    }
+
+    $scope.trackForm = {
+        submit: function (form, myModel,loading,selectedStudents) {
+              //console.log(selectedStudents);
+			  var comments = [];
+			  for(var stuid=0;stuid<=selectedStudents.length-1;stuid++){
+				  comments [stuid] ="Call Tracking For Report Certificate Status - SemYear:"+selectedStudents[stuid].Sem_year + " - Balance:" +selectedStudents[stuid].Balance_fee + " - CertificateName:" +selectedStudents[stuid].Certificate_name + " - ReceivedStatus:" +selectedStudents[stuid].rstatus + " - ReceivedDate:" +selectedStudents[stuid].rdate;
+			  }
+            if(isNaN(myModel.date)){
+                $scope.nextFollowupDate = myModel.date;
+
+            }
+            else{
+                $scope.getdate=new Date(myModel.date).toDateString();
+
+                $scope.nextFollowupDate = $filter('date')(new Date($scope.getdate), 'dd-MM-yyyy');
+            }
+
+            var firstError = null;
+            if (form.$invalid) {
+
+                var field = null, firstError = null;
+                for (field in form) {
+                    if (field[0] != '$') {
+                        if (firstError === null && !form[field].$valid) {
+                            firstError = form[field].$name;
+                        }
+                        if (form[field].$pristine) {
+                            form[field].$dirty = true;
+                        }
+                    }
+                }
+                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 {
+
+                $scope.ldloading1 = {};
+
+                $scope.ldloading1[loading.replace('-', '_')] = true;
+               /* hide this fun after branch level changes
+                if($scope.userType !='R004'){
+                    $scope.updateBranchID = JSON.parse(localStorage.getItem('localObj')).localBranchID;
+                    $scope.updateAssignTo = myModel.assignedTo;
+
+                }
+                else{
+                    $scope.updateBranchID = myModel.branch.BranchCode;
+                    $scope.updateAssignTo = myModel.assignedTo;
+
+                }*/
+                   
+                var addLead = {
+                    method: 'POST',
+                    url: apiPoint.url + 'autoAddlead/',
+                    headers: {
+                        'Content-Type': 'application/json'
+                    },
+                    data: {
+                        student:selectedStudents,
+                        date: $scope.nextFollowupDate,
+                        activity: myModel.activity.activityID,
+                        assignedTo: myModel.assignedTo,
+                        status: myModel.status,
+                        referedBy: myModel.referedBy,
+                        comments:comments,
+                        
+                        enquiryStatus:myModel.enquiryStatus,
+                        createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
+                        branchId: JSON.parse(localStorage.getItem('localObj')).localBranchID
+
+                    }
+                };
+                $http(addLead).then(function (response) {
+                        console.log(response);
+                    if (response.data.status==200 && response.data.leadDetails.leadStatus == true) {
+                        $rootScope.modalInstance.close();
+                        swal(" ", response.data.leadDetails.message, "success");
+                        $state.go($state.current, {}, { reload: true });
+
+                    } else {
+                        
+                        swal(" ", response.data.leadDetails.message, "error");
+
+                    }
+                });
+
+
+            }
+        },
+        reset: function (form) {
+
+            $scope.myModel = angular.copy($scope.master);
+            form.$setPristine(true);
+            $scope.myModel = {
+                "studentName": "",
+                "mobileNumber": "",
+                "universityName": "",
+                "courseName": "",
+                "activity": "",
+                "assignedTo": "",
+                "status": "",
+                "referedBy": '',
+                "comments":''
+            };
+        }
+    };
+    
+
+     /**
+      * Call Tracking End
+      */
+
+    }]);
 /*modal controller
    * */
-  app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log", "API_POINTS", "$http", function ($scope,$rootScope, $modal, $log, apiPoint, $http) {
+app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log", "API_POINTS", "$http", function ($scope,$rootScope, $modal, $log, apiPoint, $http) {
     //Tooltip for print button
     $scope.dynamicTooltip = 'Student View';
 
@@ -303,244 +557,6 @@ app.controller('ModalInstanceCtrl1', ["$scope", "$modalInstance", "items1", "Wor
 
 
 }]);
-    /**
-     * Auto Call Tracking Sriram
-     */
-    $scope.selectedStudentsID = [];
-    $scope.isCheckAll = function(e){
-        var val = (e.target.checked ? true : false);
-        if(val)
-    {
-       // $scope.disable = false;
-        var len =  $scope.mark_cert_data.length;
-        var i = 0;
-        for(i=0;i<len;i++)
-        {
-            if($scope.selectedStudentsID.indexOf($scope.mark_cert_data[i]) === -1)
-            {
-                
-                $scope.selectedStudentsID.push($scope.mark_cert_data[i]);
-            }
-        }
-    }
-    else
-    {
-       // $scope.disable = true;
-        $scope.selectedStudentsID = [];
-    }
-    if($scope.selectedStudentsID !=''){
-        $scope.disable = false;
-    }else{
-        $scope.disable = true;
-    }
-   console.log($scope.selectedStudentsID);
-    }
-    $scope.isClick = function(e){
-        var ide = e.target;
-    var val = (ide.checked ? true : false);
-    var sid = e.target.id;
-    // console.log("328");
-    // console.log($scope.balfee_data);
-    angular.forEach($scope.mark_cert_data,function(value,key){
-       
-        if(sid == value.Student_id)
-        {
-            sid = value;
-        }
-    });
-        console.log(sid);
-    var pos = $scope.selectedStudentsID.indexOf(sid);
-    //alert(val);
-    console.log($scope.selectedStudentsID.indexOf(sid));
-    if(val)
-    {
-        if( pos == -1)
-        {
-           
-            //console.log("PUSH");
-            $scope.selectedStudentsID.push(sid);
-        }
-        
-    }
-    else
-    {
-       
-        //console.log("POP");
-        $scope.selectedStudentsID.splice(pos,1);
-    }
-    //
-    if(val){
-        $scope.disable = false;
-    }else{
-        $scope.disable = true;
-    }
-    //console.log($scope.selectedStudentsID);
-    }
-    $scope.calltracking = function(){
-        
-        //$rootScope.student = $scope.selectedStudentsID;
-        if($scope.selectedStudentsID ==''){
-            swal('Select Check box','','warning');
-			return false;
-        }else{
-        $scope.controller = 'ng-controller="report_markcard_certificateCtrl"';
-        $scope.myModel.comments = 'Call Tracking for Document Report';
-        var lead = {
-            method: 'POST',
-            url: apiPoint.url + 'getTrackingLeadDetails/',
-            headers: {
-                'Content-Type': 'application/json'
-            },
-            data: {
-                requestedBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
-                student:$scope.selectedStudentsID,
-                branchID:JSON.parse(localStorage.getItem('localObj')).localBranchID,
-                userType:JSON.parse(localStorage.getItem('localObj')).localType,
-            }
-        };
-        $http(lead).then(function (response) {
-            if (response.data.status==200) {
-                $rootScope.activity = response.data.activityDetails;
-                    $rootScope.status = response.data.statusDetails;
-                    $rootScope.staffDetails = response.data.staffDetails;
-                    $rootScope.studentDetails = $scope.selectedStudentsID;
-                 // $scope.modalopen($scope.activity);
-        var modalInstance = $modal.open({
-            templateUrl: 'assets/views/autoCalltracking.html',
-            controller: 'report_markcard_certificateCtrl',
-            // size: size,
-           
-            resolve: {
-                pdfitems: function () {
-                    return  $scope.activity;
-                    
-                }
-            }
-        });
-
-        modalInstance.result.then(function (selectedItem) {
-            $scope.selected = selectedItem;
-        }, function () {
-            $log.info('Modal dismissed at: ' + new Date());
-        });
-        
-    }
-    
-    });
-        }
-    }
-
-    $scope.trackForm = {
-        submit: function (form, myModel,loading,selectedStudents) {
-              //console.log(selectedStudents);
-			  var comments = [];
-			  for(var stuid=0;stuid<=selectedStudents.length-1;stuid++){
-				  comments [stuid] ="Call Tracking For Report Certificate Status - SemYear:"+selectedStudents[stuid].Sem_year + " - Balance:" +selectedStudents[stuid].Balance_fee + " - CertificateName:" +selectedStudents[stuid].Certificate_name + " - ReceivedStatus:" +selectedStudents[stuid].rstatus + " - ReceivedDate:" +selectedStudents[stuid].rdate;
-			  }
-            if(isNaN(myModel.date)){
-                $scope.nextFollowupDate = myModel.date;
-
-            }
-            else{
-                $scope.getdate=new Date(myModel.date).toDateString();
-
-                $scope.nextFollowupDate = $filter('date')(new Date($scope.getdate), 'dd-MM-yyyy');
-            }
-
-            var firstError = null;
-            if (form.$invalid) {
-
-                var field = null, firstError = null;
-                for (field in form) {
-                    if (field[0] != '$') {
-                        if (firstError === null && !form[field].$valid) {
-                            firstError = form[field].$name;
-                        }
-                        if (form[field].$pristine) {
-                            form[field].$dirty = true;
-                        }
-                    }
-                }
-                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 {
-
-                $scope.ldloading1 = {};
-
-                $scope.ldloading1[loading.replace('-', '_')] = true;
-               /* hide this fun after branch level changes
-                if($scope.userType !='R004'){
-                    $scope.updateBranchID = JSON.parse(localStorage.getItem('localObj')).localBranchID;
-                    $scope.updateAssignTo = myModel.assignedTo;
-
-                }
-                else{
-                    $scope.updateBranchID = myModel.branch.BranchCode;
-                    $scope.updateAssignTo = myModel.assignedTo;
-
-                }*/
-                   
-                var addLead = {
-                    method: 'POST',
-                    url: apiPoint.url + 'autoAddlead/',
-                    headers: {
-                        'Content-Type': 'application/json'
-                    },
-                    data: {
-                        student:selectedStudents,
-                        date: $scope.nextFollowupDate,
-                        activity: myModel.activity.activityID,
-                        assignedTo: myModel.assignedTo,
-                        status: myModel.status,
-                        referedBy: myModel.referedBy,
-                        comments:comments,
-                        
-                        enquiryStatus:myModel.enquiryStatus,
-                        createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
-                        branchId: JSON.parse(localStorage.getItem('localObj')).localBranchID
-
-                    }
-                };
-                $http(addLead).then(function (response) {
-                        console.log(response);
-                    if (response.data.status==200 && response.data.leadDetails.leadStatus == true) {
-                        
-                        swal(" ", response.data.leadDetails.message, "success");
-                        window.location.reload();
-                    } else {
-                        
-                        swal(" ", response.data.leadDetails.message, "error");
-                        window.location.reload();
-                    }
-                });
-
-
-            }
-        },
-        reset: function (form) {
-
-            $scope.myModel = angular.copy($scope.master);
-            form.$setPristine(true);
-            $scope.myModel = {
-                "studentName": "",
-                "mobileNumber": "",
-                "universityName": "",
-                "courseName": "",
-                "activity": "",
-                "assignedTo": "",
-                "status": "",
-                "referedBy": '',
-                "comments":''
-            };
-        }
-    };
-    
-
-     /**
-      * Call Tracking End
-      */
-
-    }]);
 
 
 

Apollo/assets/js/controllers/report_markcard_statusCtrl.js

@@ -97,8 +97,6 @@ app.controller('report_markcard_statusCtrl', ["$scope", "$filter","$rootScope",
 
         $scope.show = false;
         $scope.onSubmit = function (form) {
-
-            $scope.filterUniv = angular.fromJson($scope.univModel.university);
 			var firstError = null;
             if (form.$invalid) {
                 var field = null, firstError = null;
@@ -116,6 +114,7 @@ app.controller('report_markcard_statusCtrl', ["$scope", "$filter","$rootScope",
                 angular.element('.ng-invalid[batch=' + firstError + ']').focus();
             }else {
             //alert($scope.batch.name);
+			$scope.filterUniv = angular.fromJson($scope.univModel.university);
             $scope.markcard_data = '';
             $scope.message = '';
             var response_data = {
@@ -166,9 +165,244 @@ app.controller('report_markcard_statusCtrl', ["$scope", "$filter","$rootScope",
         $scope.exportData = function () {
             alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Initial_paid_date as InitialPaidDate,Enrollment_id as EnrollmentID,Student_name as StudentName,Roll_NO as RollNO,Father_name as FatherName,Course_name as CourseName,Sem_year as SemYear,CAST(Phone_number AS NUMBER) as PhoneNumber,University as University,CAST(Balance_Fee AS NUMBER) as BalanceFee,appdate as ApplicationSentDate,ansdate as AnswerBookletSentDate,Status as MarkCardStatus,Date as Date INTO XLS("Markcard_status.xls",?) FROM ?',[mystyle,$scope.markcard_data]);
         };
- /*modal controller
+      /**
+     * Auto Call Tracking Sriram
+     */
+    $scope.selectedStudentsID = [];
+    $scope.isCheckAll = function(e){
+        var val = (e.target.checked ? true : false);
+        if(val)
+    {
+       // $scope.disable = false;
+        var len =  $scope.markcard_data.length;
+        var i = 0;
+        for(i=0;i<len;i++)
+        {
+            if($scope.selectedStudentsID.indexOf($scope.markcard_data[i]) === -1)
+            {
+                
+                $scope.selectedStudentsID.push($scope.markcard_data[i]);
+            }
+        }
+    }
+    else
+    {
+       // $scope.disable = true;
+        $scope.selectedStudentsID = [];
+    }
+    if($scope.selectedStudentsID !=''){
+        $scope.disable = false;
+    }else{
+        $scope.disable = true;
+    }
+    console.log($scope.selectedStudentsID);
+    }
+    $scope.isClick = function(e){
+        var ide = e.target;
+    var val = (ide.checked ? true : false);
+    var sid = e.target.id;
+    angular.forEach($scope.markcard_data,function(value,key){
+        //console.log(value);
+        if(sid == value.Student_id)
+        {
+            console.log()
+            sid = value;
+        }
+    });
+    
+    var pos = $scope.selectedStudentsID.indexOf(sid);
+    //alert(val);
+    if(val)
+    {
+        if( pos == -1)
+        {
+           
+            console.log("PUSH");
+            $scope.selectedStudentsID.push(sid);
+        }
+        
+    }
+    else
+    {
+       
+        //console.log("POP");
+        $scope.selectedStudentsID.splice(pos,1);
+    }
+    //
+    if(val){
+        $scope.disable = false;
+    }else{
+        $scope.disable = true;
+    }
+    console.log($scope.selectedStudentsID);
+    }
+    $scope.calltracking = function(){
+        
+        //$rootScope.student = $scope.selectedStudentsID;
+        if($scope.selectedStudentsID ==''){
+            swal('Select Check box','','warning');
+			return false;
+        }else{
+        $scope.controller = 'ng-controller="report_markcard_statusCtrl"';
+        //$scope.myModel.comments = 'Call Tracking for Document Report';
+        var lead = {
+            method: 'POST',
+            url: apiPoint.url + 'getTrackingLeadDetails/',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            data: {
+                requestedBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
+                student:$scope.selectedStudentsID,
+                branchID:JSON.parse(localStorage.getItem('localObj')).localBranchID,
+                userType:JSON.parse(localStorage.getItem('localObj')).localType,
+            }
+        };
+        $http(lead).then(function (response) {
+            if (response.data.status==200) {
+                $rootScope.activity = response.data.activityDetails;
+                    $rootScope.status = response.data.statusDetails;
+                    $rootScope.staffDetails = response.data.staffDetails;
+                    $rootScope.studentDetails = $scope.selectedStudentsID;
+                 // $scope.modalopen($scope.activity);
+                $rootScope.modalInstance = $modal.open({
+            templateUrl: 'assets/views/autoCalltracking.html',
+            controller: 'report_markcard_statusCtrl',
+            // size: size,
+           
+            resolve: {
+                pdfitems: function () {
+                    return  $scope.activity;
+                    
+                }
+            }
+        });
+
+            $rootScope.modalInstance.result.then(function (selectedItem) {
+            $scope.selected = selectedItem;
+        }, function () {
+            $log.info('Modal dismissed at: ' + new Date());
+        });
+        
+    }
+    
+    });
+        }
+    }
+
+    $scope.trackForm = {
+        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";
+			  }
+              //console.log(selectedStudents);
+            if(isNaN(myModel.date)){
+                $scope.nextFollowupDate = myModel.date;
+
+            }
+            else{
+                $scope.getdate=new Date(myModel.date).toDateString();
+
+                $scope.nextFollowupDate = $filter('date')(new Date($scope.getdate), 'dd-MM-yyyy');
+            }
+
+            var firstError = null;
+            if (form.$invalid) {
+
+                var field = null, firstError = null;
+                for (field in form) {
+                    if (field[0] != '$') {
+                        if (firstError === null && !form[field].$valid) {
+                            firstError = form[field].$name;
+                        }
+                        if (form[field].$pristine) {
+                            form[field].$dirty = true;
+                        }
+                    }
+                }
+                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 {
+
+                $scope.ldloading1 = {};
+
+                $scope.ldloading1[loading.replace('-', '_')] = true;
+               /* hide this fun after branch level changes
+                if($scope.userType !='R004'){
+                    $scope.updateBranchID = JSON.parse(localStorage.getItem('localObj')).localBranchID;
+                    $scope.updateAssignTo = myModel.assignedTo;
+
+                }
+                else{
+                    $scope.updateBranchID = myModel.branch.BranchCode;
+                    $scope.updateAssignTo = myModel.assignedTo;
+
+                }*/
+                   
+                var addLead = {
+                    method: 'POST',
+                    url: apiPoint.url + 'autoAddlead/',
+                    headers: {
+                        'Content-Type': 'application/json'
+                    },
+                    data: {
+                        student:selectedStudents,
+                        date: $scope.nextFollowupDate,
+                        activity: myModel.activity.activityID,
+                        assignedTo: myModel.assignedTo,
+                        status: myModel.status,
+                        referedBy: myModel.referedBy,
+                        comments:comments,
+                        
+                        enquiryStatus:myModel.enquiryStatus,
+                        createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
+                        branchId: JSON.parse(localStorage.getItem('localObj')).localBranchID
+
+                    }
+                };
+                $http(addLead).then(function (response) {
+                    if (response.data.status==200 && response.data.leadDetails.leadStatus == true) {
+                        $rootScope.modalInstance.close();
+                        swal(" ", response.data.leadDetails.message, "success");
+                        $state.go($state.current, {}, { reload: true });
+                    } else {
+                        
+                        swal(" ", response.data.leadDetails.message, "error");
+                    }
+                });
+
+
+            }
+        },
+        reset: function (form) {
+
+            $scope.myModel = angular.copy($scope.master);
+            form.$setPristine(true);
+            $scope.myModel = {
+                "studentName": "",
+                "mobileNumber": "",
+                "universityName": "",
+                "courseName": "",
+                "activity": "",
+                "assignedTo": "",
+                "status": "",
+                "referedBy": '',
+                "comments":''
+            };
+        }
+    };
+    
+
+     /**
+      * Call Tracking End
+      */    
+        
+      
+    }]);
+/*modal controller
    * */
-  app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log", "API_POINTS", "$http", function ($scope,$rootScope, $modal, $log, apiPoint, $http) {
+app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log", "API_POINTS", "$http", function ($scope,$rootScope, $modal, $log, apiPoint, $http) {
     //Tooltip for print button
     $scope.dynamicTooltip = 'Student View';
 
@@ -306,239 +540,6 @@ app.controller('ModalInstanceCtrl1', ["$scope", "$modalInstance", "items1", "Wor
 
 
 }]);
-      /**
-     * Auto Call Tracking Sriram
-     */
-    $scope.selectedStudentsID = [];
-    $scope.isCheckAll = function(e){
-        var val = (e.target.checked ? true : false);
-        if(val)
-    {
-       // $scope.disable = false;
-        var len =  $scope.markcard_data.length;
-        var i = 0;
-        for(i=0;i<len;i++)
-        {
-            if($scope.selectedStudentsID.indexOf($scope.markcard_data[i]) === -1)
-            {
-                
-                $scope.selectedStudentsID.push($scope.markcard_data[i]);
-            }
-        }
-    }
-    else
-    {
-       // $scope.disable = true;
-        $scope.selectedStudentsID = [];
-    }
-    if($scope.selectedStudentsID !=''){
-        $scope.disable = false;
-    }else{
-        $scope.disable = true;
-    }
-    console.log($scope.selectedStudentsID);
-    }
-    $scope.isClick = function(e){
-        var ide = e.target;
-    var val = (ide.checked ? true : false);
-    var sid = e.target.id;
-    angular.forEach($scope.markcard_data,function(value,key){
-        //console.log(value);
-        if(sid == value.Student_id)
-        {
-            console.log()
-            sid = value;
-        }
-    });
-    
-    var pos = $scope.selectedStudentsID.indexOf(sid);
-    //alert(val);
-    if(val)
-    {
-        if( pos == -1)
-        {
-           
-            console.log("PUSH");
-            $scope.selectedStudentsID.push(sid);
-        }
-        
-    }
-    else
-    {
-       
-        //console.log("POP");
-        $scope.selectedStudentsID.splice(pos,1);
-    }
-    //
-    if(val){
-        $scope.disable = false;
-    }else{
-        $scope.disable = true;
-    }
-    console.log($scope.selectedStudentsID);
-    }
-    $scope.calltracking = function(){
-        
-        //$rootScope.student = $scope.selectedStudentsID;
-        if($scope.selectedStudentsID ==''){
-            swal('Select Check box','','warning');
-			return false;
-        }else{
-        $scope.controller = 'ng-controller="report_markcard_statusCtrl"';
-        $scope.myModel.comments = 'Call Tracking for Document Report';
-        var lead = {
-            method: 'POST',
-            url: apiPoint.url + 'getTrackingLeadDetails/',
-            headers: {
-                'Content-Type': 'application/json'
-            },
-            data: {
-                requestedBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
-                student:$scope.selectedStudentsID,
-                branchID:JSON.parse(localStorage.getItem('localObj')).localBranchID,
-                userType:JSON.parse(localStorage.getItem('localObj')).localType,
-            }
-        };
-        $http(lead).then(function (response) {
-            if (response.data.status==200) {
-                $rootScope.activity = response.data.activityDetails;
-                    $rootScope.status = response.data.statusDetails;
-                    $rootScope.staffDetails = response.data.staffDetails;
-                    $rootScope.studentDetails = $scope.selectedStudentsID;
-                 // $scope.modalopen($scope.activity);
-        var modalInstance = $modal.open({
-            templateUrl: 'assets/views/autoCalltracking.html',
-            controller: 'report_markcard_statusCtrl',
-            // size: size,
-           
-            resolve: {
-                pdfitems: function () {
-                    return  $scope.activity;
-                    
-                }
-            }
-        });
-
-        modalInstance.result.then(function (selectedItem) {
-            $scope.selected = selectedItem;
-        }, function () {
-            $log.info('Modal dismissed at: ' + new Date());
-        });
-        
-    }
-    
-    });
-        }
-    }
-
-    $scope.trackForm = {
-        submit: function (form, myModel,loading,selectedStudents) {
-              //console.log(selectedStudents);
-            if(isNaN(myModel.date)){
-                $scope.nextFollowupDate = myModel.date;
-
-            }
-            else{
-                $scope.getdate=new Date(myModel.date).toDateString();
-
-                $scope.nextFollowupDate = $filter('date')(new Date($scope.getdate), 'dd-MM-yyyy');
-            }
-
-            var firstError = null;
-            if (form.$invalid) {
-
-                var field = null, firstError = null;
-                for (field in form) {
-                    if (field[0] != '$') {
-                        if (firstError === null && !form[field].$valid) {
-                            firstError = form[field].$name;
-                        }
-                        if (form[field].$pristine) {
-                            form[field].$dirty = true;
-                        }
-                    }
-                }
-                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 {
-
-                $scope.ldloading1 = {};
-
-                $scope.ldloading1[loading.replace('-', '_')] = true;
-               /* hide this fun after branch level changes
-                if($scope.userType !='R004'){
-                    $scope.updateBranchID = JSON.parse(localStorage.getItem('localObj')).localBranchID;
-                    $scope.updateAssignTo = myModel.assignedTo;
-
-                }
-                else{
-                    $scope.updateBranchID = myModel.branch.BranchCode;
-                    $scope.updateAssignTo = myModel.assignedTo;
-
-                }*/
-                   
-                var addLead = {
-                    method: 'POST',
-                    url: apiPoint.url + 'autoAddlead/',
-                    headers: {
-                        'Content-Type': 'application/json'
-                    },
-                    data: {
-                        student:selectedStudents,
-                        date: $scope.nextFollowupDate,
-                        activity: myModel.activity.activityID,
-                        assignedTo: myModel.assignedTo,
-                        status: myModel.status,
-                        referedBy: myModel.referedBy,
-                        comments:"Call Tracking For Report MarkCard Details ",
-                        
-                        enquiryStatus:myModel.enquiryStatus,
-                        createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
-                        branchId: JSON.parse(localStorage.getItem('localObj')).localBranchID
-
-                    }
-                };
-                $http(addLead).then(function (response) {
-                        console.log(response);
-                    if (response.data.status==200 && response.data.leadDetails.leadStatus == true) {
-                        
-                        swal(" ", response.data.leadDetails.message, "success");
-                        window.location.reload();
-                    } else {
-                        
-                        swal(" ", response.data.leadDetails.message, "error");
-                        window.location.reload();
-                    }
-                });
-
-
-            }
-        },
-        reset: function (form) {
-
-            $scope.myModel = angular.copy($scope.master);
-            form.$setPristine(true);
-            $scope.myModel = {
-                "studentName": "",
-                "mobileNumber": "",
-                "universityName": "",
-                "courseName": "",
-                "activity": "",
-                "assignedTo": "",
-                "status": "",
-                "referedBy": '',
-                "comments":''
-            };
-        }
-    };
-    
-
-     /**
-      * Call Tracking End
-      */    
-        
-      
-    }]);
 
 
 

Apollo/assets/js/controllers/report_study_material_statusCtrl.js

@@ -89,7 +89,12 @@ app.controller('report_study_material_statusCtrl', ["$scope", "$filter","$rootSc
           
   $scope.show = false;
         $scope.onSubmit = function (form) {
+            if(angular.isString($scope.univModel.university)) {
                 $scope.filterUniv = angular.fromJson($scope.univModel.university);
+            }
+            else{
+                $scope.filterUniv=$scope.univModel.university;
+            }
 			var firstError = null;
             if (form.$invalid) {
                 var field = null, firstError = null;
@@ -166,9 +171,238 @@ $scope.exportExcel= function () {
                 FROM HTML("#data",{headers:true})');
 }
 
-      /*modal controller
+    /**
+     * Auto Call Tracking Status
+     */
+    $scope.selectedStudentsID = [];
+    $scope.isCheckAll = function(e){
+        var val = (e.target.checked ? true : false);
+        if(val)
+    {
+       // $scope.disable = false;
+        var len =  $scope.study_mat_data.length;
+        var i = 0;
+        for(i=0;i<len;i++)
+         {
+             if($scope.selectedStudentsID.indexOf($scope.study_mat_data[i]) === -1)
+             {
+                
+                 $scope.selectedStudentsID.push($scope.study_mat_data[i]);
+             }
+         }
+     
+    }
+    else
+    {
+       // $scope.disable = true;
+        $scope.selectedStudentsID = [];
+    }
+    if($scope.selectedStudentsID !=''){
+        $scope.disable = false;
+    }else{
+        $scope.disable = true;
+    }
+    }
+    $scope.isClick = function(e){
+        var ide = e.target;
+    var val = (ide.checked ? true : false);
+    var sid = e.target.id;
+    //console.log(sid);
+    angular.forEach($scope.study_mat_data,function(value,key){
+      //  console.log()
+        if(sid == value.Student_id)
+        {
+            sid = value;
+        }
+    });
+    var pos = $scope.selectedStudentsID.indexOf(sid);
+    if(val)
+    {
+        if( pos == -1)
+        {
+           
+
+            $scope.selectedStudentsID.push(sid);
+        }
+        
+    }
+    else
+    {
+
+        $scope.selectedStudentsID.splice(pos,1);
+    }
+    //
+    if(val){
+        $scope.disable = false;
+    }else{
+        $scope.disable = true;
+    }
+    }
+    $scope.calltracking = function(){
+        
+        //$rootScope.student = $scope.selectedStudentsID;
+        if($scope.selectedStudentsID ==''){
+            swal('Select Check box','','warning');
+			return false;
+        }else{
+        $scope.controller = 'ng-controller="report_study_material_statusCtrl"';
+       
+        var lead = {
+            method: 'POST',
+            url: apiPoint.url + 'getTrackingLeadDetails/',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            data: {
+                requestedBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
+                student:$scope.selectedStudentsID,
+                branchID:JSON.parse(localStorage.getItem('localObj')).localBranchID,
+                userType:JSON.parse(localStorage.getItem('localObj')).localType,
+            }
+        };
+        $http(lead).then(function (response) {
+            if (response.data.status==200) {
+                $rootScope.activity = response.data.activityDetails;
+                    $rootScope.status = response.data.statusDetails;
+                    $rootScope.staffDetails = response.data.staffDetails;
+                    $rootScope.studentDetails = $scope.selectedStudentsID;
+                 // $scope.modalopen($scope.activity);
+                // define modal in root scope
+                $rootScope.modalInstance = $modal.open({
+            templateUrl: 'assets/views/autoCalltracking.html',
+            controller: 'report_study_material_statusCtrl',
+            // size: size,
+           
+            resolve: {
+                pdfitems: function () {
+                    return  $scope.activity;
+                    
+                }
+            }
+        });
+
+        $rootScope.modalInstance.result.then(function (selectedItem) {
+            $scope.selected = selectedItem;
+        }, function () {
+            $log.info('Modal dismissed at: ' + new Date());
+        });
+        
+    }
+    
+    });
+        }
+    }
+
+    $scope.trackForm = {
+        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";
+			  }
+            if(isNaN(myModel.date)){
+                $scope.nextFollowupDate = myModel.date;
+
+            }
+            else{
+                $scope.getdate=new Date(myModel.date).toDateString();
+
+                $scope.nextFollowupDate = $filter('date')(new Date($scope.getdate), 'dd-MM-yyyy');
+            }
+
+            var firstError = null;
+            if (form.$invalid) {
+
+                var field = null, firstError = null;
+                for (field in form) {
+                    if (field[0] != '$') {
+                        if (firstError === null && !form[field].$valid) {
+                            firstError = form[field].$name;
+                        }
+                        if (form[field].$pristine) {
+                            form[field].$dirty = true;
+                        }
+                    }
+                }
+                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 {
+
+                $scope.ldloading1 = {};
+
+                $scope.ldloading1[loading.replace('-', '_')] = true;
+               /* hide this fun after branch level changes
+                if($scope.userType !='R004'){
+                    $scope.updateBranchID = JSON.parse(localStorage.getItem('localObj')).localBranchID;
+                    $scope.updateAssignTo = myModel.assignedTo;
+
+                }
+                else{
+                    $scope.updateBranchID = myModel.branch.BranchCode;
+                    $scope.updateAssignTo = myModel.assignedTo;
+
+                }*/
+                   
+                var addLead = {
+                    method: 'POST',
+                    url: apiPoint.url + 'autoAddlead/',
+                    headers: {
+                        'Content-Type': 'application/json'
+                    },
+                    data: {
+                        student:selectedStudents,
+                        date: $scope.nextFollowupDate,
+                        activity: myModel.activity.activityID,
+                        assignedTo: myModel.assignedTo,
+                        status: myModel.status,
+                        referedBy: myModel.referedBy,
+                        comments:comments,
+                        
+                        enquiryStatus:myModel.enquiryStatus,
+                        createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
+                        branchId: JSON.parse(localStorage.getItem('localObj')).localBranchID
+
+                    }
+                };
+                $http(addLead).then(function (response) {
+                    if (response.data.status==200 && response.data.leadDetails.leadStatus == true) {
+                        $rootScope.modalInstance.close();
+                        swal(" ", response.data.leadDetails.message, "success");
+                        $state.go($state.current, {}, { reload: true });
+
+                    } else {
+                        swal(" ", response.data.leadDetails.message, "error");
+
+                    }
+                });
+
+
+            }
+        },
+        reset: function (form) {
+
+            $scope.myModel = angular.copy($scope.master);
+            form.$setPristine(true);
+            $scope.myModel = {
+                "studentName": "",
+                "mobileNumber": "",
+                "universityName": "",
+                "courseName": "",
+                "activity": "",
+                "assignedTo": "",
+                "status": "",
+                "referedBy": '',
+                "comments":''
+            };
+        }
+    };
+     /*
+     *End Call Tracking Status
+     */   
+
+ }]);
+/*modal controller
  * */
-  app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log", "API_POINTS", "$http", function ($scope,$rootScope, $modal, $log, apiPoint, $http) {
+app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log", "API_POINTS", "$http", function ($scope,$rootScope, $modal, $log, apiPoint, $http) {
     //Tooltip for print button
     $scope.dynamicTooltip = 'Student View';
 
@@ -306,240 +540,6 @@ app.controller('ModalInstanceCtrl1', ["$scope", "$modalInstance", "items1", "Wor
 
 
 }]);
-    /**
-     * Auto Call Tracking Status
-     */
-    $scope.selectedStudentsID = [];
-    $scope.isCheckAll = function(e){
-        var val = (e.target.checked ? true : false);
-        if(val)
-    {
-       // $scope.disable = false;
-        var len =  $scope.study_mat_data.length;
-        console.log(len);
-        console.log($scope.study_mat_data);
-        var i = 0;
-        for(i=0;i<len;i++)
-         {
-             if($scope.selectedStudentsID.indexOf($scope.study_mat_data[i]) === -1)
-             {
-                
-                 $scope.selectedStudentsID.push($scope.study_mat_data[i]);
-             }
-         }
-     
-    }
-    else
-    {
-       // $scope.disable = true;
-        $scope.selectedStudentsID = [];
-    }
-    if($scope.selectedStudentsID !=''){
-        $scope.disable = false;
-    }else{
-        $scope.disable = true;
-    }
-    console.log($scope.selectedStudentsID);
-    }
-    $scope.isClick = function(e){
-        var ide = e.target;
-    var val = (ide.checked ? true : false);
-    var sid = e.target.id;
-    //console.log(sid);
-    angular.forEach($scope.study_mat_data,function(value,key){
-      //  console.log()
-        if(sid == value.Student_id)
-        {
-            sid = value;
-        }
-    });
-    console.log(sid);
-    var pos = $scope.selectedStudentsID.indexOf(sid);
-    //alert(val);
-    if(val)
-    {
-        if( pos == -1)
-        {
-           
-            //console.log("PUSH");
-            $scope.selectedStudentsID.push(sid);
-        }
-        
-    }
-    else
-    {
-       
-        //console.log("POP");
-        $scope.selectedStudentsID.splice(pos,1);
-    }
-    //
-    if(val){
-        $scope.disable = false;
-    }else{
-        $scope.disable = true;
-    }
-    console.log($scope.selectedStudentsID);
-    }
-
-    $scope.calltracking = function(){
-        
-        //$rootScope.student = $scope.selectedStudentsID;
-        if($scope.selectedStudentsID ==''){
-            swal('Select Check box','','warning');
-			return false;
-        }else{
-        $scope.controller = 'ng-controller="report_study_material_statusCtrl"';
-       
-        var lead = {
-            method: 'POST',
-            url: apiPoint.url + 'getTrackingLeadDetails/',
-            headers: {
-                'Content-Type': 'application/json'
-            },
-            data: {
-                requestedBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
-                student:$scope.selectedStudentsID,
-                branchID:JSON.parse(localStorage.getItem('localObj')).localBranchID,
-                userType:JSON.parse(localStorage.getItem('localObj')).localType,
-            }
-        };
-        $http(lead).then(function (response) {
-            if (response.data.status==200) {
-                $rootScope.activity = response.data.activityDetails;
-                    $rootScope.status = response.data.statusDetails;
-                    $rootScope.staffDetails = response.data.staffDetails;
-                    $rootScope.studentDetails = $scope.selectedStudentsID;
-                 // $scope.modalopen($scope.activity);
-        var modalInstance = $modal.open({
-            templateUrl: 'assets/views/autoCalltracking.html',
-            controller: 'report_study_material_statusCtrl',
-            // size: size,
-           
-            resolve: {
-                pdfitems: function () {
-                    return  $scope.activity;
-                    
-                }
-            }
-        });
-
-        modalInstance.result.then(function (selectedItem) {
-            $scope.selected = selectedItem;
-        }, function () {
-            $log.info('Modal dismissed at: ' + new Date());
-        });
-        
-    }
-    
-    });
-        }
-    }
-
-    $scope.trackForm = {
-        submit: function (form, myModel,loading,selectedStudents) {
-              //console.log(selectedStudents);
-            if(isNaN(myModel.date)){
-                $scope.nextFollowupDate = myModel.date;
-
-            }
-            else{
-                $scope.getdate=new Date(myModel.date).toDateString();
-
-                $scope.nextFollowupDate = $filter('date')(new Date($scope.getdate), 'dd-MM-yyyy');
-            }
-
-            var firstError = null;
-            if (form.$invalid) {
-
-                var field = null, firstError = null;
-                for (field in form) {
-                    if (field[0] != '$') {
-                        if (firstError === null && !form[field].$valid) {
-                            firstError = form[field].$name;
-                        }
-                        if (form[field].$pristine) {
-                            form[field].$dirty = true;
-                        }
-                    }
-                }
-                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 {
-
-                $scope.ldloading1 = {};
-
-                $scope.ldloading1[loading.replace('-', '_')] = true;
-               /* hide this fun after branch level changes
-                if($scope.userType !='R004'){
-                    $scope.updateBranchID = JSON.parse(localStorage.getItem('localObj')).localBranchID;
-                    $scope.updateAssignTo = myModel.assignedTo;
-
-                }
-                else{
-                    $scope.updateBranchID = myModel.branch.BranchCode;
-                    $scope.updateAssignTo = myModel.assignedTo;
-
-                }*/
-                   
-                var addLead = {
-                    method: 'POST',
-                    url: apiPoint.url + 'autoAddlead/',
-                    headers: {
-                        'Content-Type': 'application/json'
-                    },
-                    data: {
-                        student:selectedStudents,
-                        date: $scope.nextFollowupDate,
-                        activity: myModel.activity.activityID,
-                        assignedTo: myModel.assignedTo,
-                        status: myModel.status,
-                        referedBy: myModel.referedBy,
-                        comments:"Call Tracking For Study Material Status Report ",
-                        
-                        enquiryStatus:myModel.enquiryStatus,
-                        createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
-                        branchId: JSON.parse(localStorage.getItem('localObj')).localBranchID
-
-                    }
-                };
-                $http(addLead).then(function (response) {
-                        console.log(response);
-                    if (response.data.status==200 && response.data.leadDetails.leadStatus == true) {
-                        
-                        swal(" ", response.data.leadDetails.message, "success");
-                        window.location.reload();
-                    } else {
-                        
-                        swal(" ", response.data.leadDetails.message, "error");
-                        window.location.reload();
-                    }
-                });
-
-
-            }
-        },
-        reset: function (form) {
-
-            $scope.myModel = angular.copy($scope.master);
-            form.$setPristine(true);
-            $scope.myModel = {
-                "studentName": "",
-                "mobileNumber": "",
-                "universityName": "",
-                "courseName": "",
-                "activity": "",
-                "assignedTo": "",
-                "status": "",
-                "referedBy": '',
-                "comments":''
-            };
-        }
-    };
-     /*
-     *End Call Tracking Status
-     */   
-
- }]);
     
 
     

Apollo/assets/js/controllers/report_waiver_referalCtrl.js

@@ -81,6 +81,7 @@ app.controller('report_waiver_referalCtrl', ["$scope", "API_POINTS", "$http", "S
                 angular.element('.ng-invalid[batch=' + firstError + ']').focus();
             }else {
             //alert($scope.batch.name);
+			$scope.filterUniv = angular.fromJson($scope.univModel.university);
             $scope.waiver_referal_data = '';
             $scope.message = '';
             console.log($scope.waiver_referal_data);
@@ -92,7 +93,7 @@ app.controller('report_waiver_referalCtrl', ["$scope", "API_POINTS", "$http", "S
                 },
                 data: {
                     branch: JSON.parse(localStorage.getItem('localObj')).localBranchID,
-                    university: $scope.univModel.university.universityID,
+                    university: $scope.filterUniv.universityID,
                     batch: $scope.univModel.batch
                    
                 }
@@ -144,7 +145,7 @@ app.controller('report_waiver_referalCtrl', ["$scope", "API_POINTS", "$http", "S
         
         
         $scope.exportData = function () {
-            alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Enrollment_id as EnrollmentID,Student_name as StudentName,Father_name as FatherName,Course_name as CourseName,Sem_year as SemYear,University as University,CAST(Phone_number AS NUMBER) as PhoneNumber,staffname as Waiver/referalGivenBy,Waiver_bill as WaiverBillNo,CAST(Waiver_amount AS NUMBER) as WaiverAmount,Referal_bill as ReferalBillNo,CAST(Referal_amount AS NUMBER) as ReferalAmount,Comments as Comments INTO XLS("Waiver_referal_report.xls",?) FROM ?',[mystyle,$scope.waiver_referal_data]);
+            alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Enrollment_id as EnrollmentID,Student_name as StudentName,Father_name as FatherName,Course_name as CourseName,Sem_year as SemYear,University as University,CAST(Phone_number AS NUMBER) as PhoneNumber,staffname as Waiver_ReferalGivenBy,Waiver_bill as WaiverBillNo,CAST(Waiver_amount AS NUMBER) as WaiverAmount,Referal_bill as ReferalBillNo,CAST(Referal_amount AS NUMBER) as ReferalAmount,Comments as Comments INTO XLS("Waiver_referal_report.xls",?) FROM ?',[mystyle,$scope.waiver_referal_data]);
         };
 /*modal controller
    * */

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/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();
+    }
+    
+
+}]);

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>
@@ -340,82 +340,7 @@
                                             <div class="row">
 
                                                 <div class="col-md-12">
-                                                    <fieldset>
-                                                        <legend>{{myModelSemYear.FeesName}}</legend>
 
-                                                        <div class="panel-body" >
-
-                                                            <div class="panel-scroll height-180" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true">
-                                                        <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="myModelSemYear.programName" ng-disabled="myModelLateral.FeesAmount!='' || myModelRegular.FeesAmount!=''" 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="myModelSemYear.FeesAmount" ng-disabled="myModelLateral.FeesAmount!='' || myModelRegular.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-disabled="myModelLateral.FeesAmount!='' || myModelRegular.FeesAmount!=''" ng-click="addMoreFeesItems(myModelSemYear,Form);"/>
-
-                                                            </div>
-                                                        </div>
-                                                        <div class="row" ng-repeat="n in addMoreItems">
-                                                            <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>
-
-                                        </div>
-
-                                        <div class="col-md-6">
                                                     <fieldset>
                                                 <div class="row">
 
@@ -492,9 +417,90 @@
 
                                                 </div>
 
-
+                                                </div>
                                             </fieldset>
 
+
+                                                </div>
+                                            </div>
+
+                                        </div>
+
+                                        <div class="col-md-6">
+
+                                            <div class="col-md-12">
+                                                <fieldset>
+                                                    <legend>{{myModelSemYear.FeesName}}</legend>
+
+                                                    <div class="panel-body" >
+
+                                                        <!--<div class="panel-scroll height-400" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true">-->
+                                                            <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="myModelSemYear.programName" ng-disabled="myModelLateral.FeesAmount!='' || myModelRegular.FeesAmount!=''" 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="myModelSemYear.FeesAmount" ng-disabled="myModelLateral.FeesAmount!='' || myModelRegular.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-disabled="myModelLateral.FeesAmount!='' || myModelRegular.FeesAmount!=''" ng-click="addMoreFeesItems(myModelSemYear,Form);"/>
+
+                                                                </div>
+                                                            </div>
+                                                            <div class="row" ng-repeat="n in addMoreItems">
+                                                                <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>
                                     </div>
 

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>

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,56 +128,56 @@
                                 /*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>
-                                            <th ng-click="sort('Date')">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')">Income/Expense
+                                            <th ng-click="sort('ListName')" style="width: 5%">Income/</br>Expense
-                                                <!--<span class="glyphicon sort-icon" ng-show="sortKey=='ListName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
+                                                
                                             </th>
-                                            <th>Voucher Number / Bill Number
+                                            <th style="width: 5%">Voucher No / Bill No
-                                                <!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
+                                             
                                             </th>
-                                            <th>Paid To / Received From
+                                            <th style="width: 7.5%">Paid To / Received From
-                                                <!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
+                                               
                                             </th>
-                                            <th>Sem
+                                            <!-- <th>Sem
-                                                <!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
+                                              
                                             </th>
                                             <th>Course
-                                                <!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
+                                               
+                                            </th> -->
+                                            <th style="width: 7.5%"> University,</br>Course,</br>Sem
+                                              
                                             </th>
-                                            <th>University
+                                            <th ng-click="sort('TypeName')" style="width: 7.5%">Type
-                                                <!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
+                                                
                                             </th>
-                                            <th ng-click="sort('TypeName')">Type
+                                            <th style="width: 7%"> 
-                                                <!--<span class="glyphicon sort-icon" ng-show="sortKey=='TypeName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
-                                            </th>
-                                            <th> 
                                                 Receipt No
                                             </th>
-                                            <th> 
+                                            <th style="width: 7%"> 
                                                 Comments
                                             </th>
-                                            <th>Mode of Payment
+                                            <th style="width: 7%">Mode of Payment
-                                                <!--<span class="glyphicon sort-icon" ng-show="sortKey=='TypeName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
+                                              
                                             </th>
-                                            <th>Amount
+                                            <th style="width: 5%">Amount
-                                                <!--<span class="glyphicon sort-icon" ng-show="sortKey=='Amount'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
+                                               
                                             </th>
-                                            <th>Balance
+                                            <th style="width: 7%">Balance
-                                                <!--<span class="glyphicon sort-icon" ng-show="sortKey=='Amount'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
+                                                
                                             </th>
-<th>Reason
+                                            <th style="width: 7%">Reason
-                                                <!--<span class="glyphicon sort-icon" ng-show="sortKey=='Amount'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
+                                               
                                             </th>
-                                            <th class="center" ng-click="sort('Status')">Status
+                                            <th class="center" ng-click="sort('Status')" style="width: 7.5%">Status
-                                                <!--<span class="glyphicon sort-icon" ng-show="sortKey=='Status'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
+                                               
                                             </th>
-                                            <th class="center">Activity
+                                            <th class="center" style="width: 7.5%">Activity
                                             </th>
                                         </tr>
                                     </thead>
@@ -178,9 +187,7 @@
                                             <td>{{p.ListName}}</td>
                                             <td>{{p.VoucherNumber}}</td>
                                             <td>{{p.PaidTo}}</td>
-                                            <td> {{p.FeePaymentDetails}}</td>
+                                            <td> {{p.UniversityName}},{{p.CourseName}},{{p.FeePaymentDetails}}</td>
-                                            <td>{{p.CourseName}}</td>
-                                            <td> {{p.UniversityName}}</td>
                                             <td>
                                                 <span ng-if=" p.PaymentStatus == 1 ">{{p.TypeName}}</span>
                                                 <span tooltip="Fees Updation" ng-if=" p.PaymentStatus == 0 " style="color:chocolate">{{p.TypeName}}</span></td>
@@ -256,17 +263,8 @@
                                  <label for="form-field-select-2">
                                 Type <span class="symbol required"></span>
                                 </label>
-<!-- 
-                                                                <select class="form-control" ng-init="getType(p.Name)" tabindex="1" class="cs-select cs-skin-elastic" name="editType" ng-model="myModel.type"
-                                                                    required>
-                                                <option value="" disabled selected>Select Type</option>
-                                                <option ng-repeat="typeItem in getTypes" ng-selected="typeItem.ID == p.Type"  value="{{typeItem.ID}}">{{typeItem.TypeName}}</option>
-                                                </select> -->
 
-<!-- {{myModel.type}} {{incomeExpenseType}} -->
                                 <select class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="addType" ng-model="myModel.type" required>
-
-
                                 <optgroup ng-repeat="typeName in incomeExpenseName"  label="{{typeName.ListName}}">
                                 <option  ng-repeat="incexpType in incomeExpenseType" ng-if="typeName.ListCode == incexpType.TypeID" value="{{incexpType.ID}}" ng-selected="incexp.ID == incexpType.ID">{{incexpType.TypeName}}</option>
 
@@ -332,7 +330,7 @@
                         <div>
                             <div class="row">
                                 <div data-ng-controller="DatepickerDemoCtrl">
-                                    <div class="col-md-6 form-group" ng-class="{'has-error':Form.addDate.$dirty && Form.addDate.$invalid, 'has-success':Form.addDate.$valid}">
+                                    <div class="col-md-4 form-group" ng-class="{'has-error':Form.addDate.$dirty && Form.addDate.$invalid, 'has-success':Form.addDate.$valid}">
                                         <label>
                                                 Date <span
                                                     class="symbol required"></span>
@@ -347,7 +345,7 @@
                                         <span class="error text-small block" ng-if="Form.addDate.$error.maxlength">Enter a Valid Date </span>
                                     </div>
                                 </div>
-                                <div class="col-md-6 form-group" ng-class="{'has-error':Form.addName.$dirty && Form.addName.$invalid , 'has-success':Form.addName.$valid}">
+                                <div class="col-md-4 form-group" ng-class="{'has-error':Form.addName.$dirty && Form.addName.$invalid , 'has-success':Form.addName.$valid}">
                                     <label for="form-field-select-2">
                                                Income/Expense <span class="symbol required"></span>
                                                 </label>
@@ -355,12 +353,41 @@
                                     <select class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="addName" ng-model="myModelAdd.name" ng-change="getType(myModelAdd.name)"
                                         required>
                                                 <option value="" disabled selected>Select</option>
-                                                <!-- <option ng-repeat="typeName in incomeExpenseName" value="{{typeName.ListCode}}">{{typeName.ListName}}</option> -->
+                                                
                                                  <option value="I001">EXPENSE</option>
                                                 <option value="I002">INCOME</option>
                                                 </select>
                                     <span class="error text-small block" ng-if="Form.addName.$dirty && Form.addName.$error.required">Type is Required</span>
                                 </div>
+
+
+
+
+
+                                <div class="col-md-4" ng-class="{'has-error':Form.addType.$dirty && Form.addType.$invalid, 'has-success':Form.addType.$valid}">
+                                    <label for="form-field-select-2">
+                                              Type  <span class="symbol required"></span>
+                                                </label>
+                                           
+                                                <select class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="addType" ng-model="myModelAdd.type" required>
+                                     <option value="" disabled selected>Select Type</option>
+
+                                     <optgroup ng-repeat="typeName in incomeExpenseName"  label="{{typeName.ListName}}">
+                                                 <option  ng-repeat="incexpType in incomeExpenseType" ng-if="typeName.ListCode == incexpType.TypeID" value="{{incexpType.ID}}">{{incexpType.TypeName}}</option>
+
+                                    </optgroup> 
+                                                </select>
+
+
+                                    <span class="error text-small block" ng-if="Form.addType.$dirty && Form.addType.$error.required">Type is Required</span>
+
+                                </div>
+
+
+
+
+
+
                             </div>
                             <div class="row">
                                 <div class="col-md-4 form-group" ng-class="{'has-error':Form.voucherNumber.$dirty && Form.voucherNumber.$invalid , 'has-success':Form.voucherNumber.$valid}">
@@ -381,6 +408,33 @@
                                     required/>
                                     <span class="error text-small block" ng-if="Form.paidTo.$dirty && Form.paidTo.$invalid" ng-hide="Form.paidTo.$error.maxlength || Form.paidTo.$error.minlength || Form.paidTo.$error.pattern">Paid To / Reveived From is required.</span>
                                 </div>
+                                
+
+
+
+
+                                  <div class="col-md-4" ng-class="{'has-error':Form.addAmount.$dirty && Form.addAmount.$invalid, 'has-success':Form.addAmount.$valid}">
+                                    <label>
+                                               Amount <span class="symbol required"></span>
+                                            </label>
+                                    <input type="text" ng-pattern="/^[0-9]*$/" name="addAmount" tabindex="2" placeholder="Enter Amount" class="form-control"
+                                        ng-model="myModelAdd.amount" required/>
+                                    <span class="error text-small block" ng-if="Form.addAmount.$dirty && Form.addAmount.$error.required">Amount is Required </span>
+                                </div>
+
+                            </div>
+                            <div class="row">
+                                
+                              <!--   <div class="col-md-4" ng-class="{'has-error':Form.addAmount.$dirty && Form.addAmount.$invalid, 'has-success':Form.addAmount.$valid}">
+                                    <label>
+                                               Amount <span class="symbol required"></span>
+                                            </label>
+                                    <input type="text" ng-pattern="/^[0-9]*$/" name="addAmount" tabindex="2" placeholder="Enter Amount" class="form-control"
+                                        ng-model="myModelAdd.amount" required/>
+                                    <span class="error text-small block" ng-if="Form.addAmount.$dirty && Form.addAmount.$error.required">Amount is Required </span>
+                                </div> -->
+
+
                                 <div class="col-md-4"  ng-class="{'has-error':Form.description_paid.$dirty && Form.description_paid.$invalid , 'has-success':Form.description_paid.$valid}">
                                     <label>
                                                Description  <span class="symbol required"></span>
@@ -392,42 +446,6 @@
                                     <span class="error text-small block" ng-if="Form.description_paid.$dirty && Form.description_paid.$error.pattern">Invalid Description</span>
 
                                 </div>
-
-                            </div>
-                            <div class="row">
-                                <div class="col-md-4" ng-class="{'has-error':Form.addType.$dirty && Form.addType.$invalid, 'has-success':Form.addType.$valid}">
-                                    <label for="form-field-select-2">
-                                              Type  <span class="symbol required"></span>
-                                                </label>
-                                   <!--  <select class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="addType" ng-model="myModelAdd.type" required>
-                                                <option value="" disabled selected>Select Type</option>
-                                                <option ng-repeat="typeItem in getTypes"  value="{{typeItem.ID}}">{{typeItem.TypeName}}</option>
-                                                </select> -->
-                                           
-                                                <select class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="addType" ng-model="myModelAdd.type" required>
-                                     <option value="" disabled selected>Select Type</option>
-
-                                     <optgroup ng-repeat="typeName in incomeExpenseName"  label="{{typeName.ListName}}">
-                                                 <option  ng-repeat="incexpType in incomeExpenseType" ng-if="typeName.ListCode == incexpType.TypeID" value="{{incexpType.ID}}">{{incexpType.TypeName}}</option>
-
-                                    </optgroup> 
-                                                <!-- <option value="" disabled selected>Select Type</option>
-                                                <option ng-repeat="typeItem in getTypes"  value="{{typeItem.ID}}">{{typeItem.TypeName}}</option> -->
-                                                </select>
-
-
-                                    <span class="error text-small block" ng-if="Form.addType.$dirty && Form.addType.$error.required">Type is Required</span>
-
-                                </div>
-                                <div class="col-md-4" ng-class="{'has-error':Form.addAmount.$dirty && Form.addAmount.$invalid, 'has-success':Form.addAmount.$valid}">
-                                    <label>
-                                               Amount <span class="symbol required"></span>
-                                            </label>
-                                    <input type="text" ng-pattern="/^[0-9]*$/" name="addAmount" tabindex="2" placeholder="Enter Amount" class="form-control"
-                                        ng-model="myModelAdd.amount" required/>
-                                    <span class="error text-small block" ng-if="Form.addAmount.$dirty && Form.addAmount.$error.required">Amount is Required </span>
-                                    <!--<span class="error text-small block" ng-if="Form.addAmount.$dirty">Amount is Required </span>-->
-                                </div>
                                 <div class="col-md-4">
                                     <label>
                                                Comments

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,56 +129,56 @@
                                 /*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>
-                                            <th ng-click="sort('Date')">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')">Income/Expense
+                                            <th ng-click="sort('ListName')" style="width: 5%">Income/</br>Expense
-                                                <!--<span class="glyphicon sort-icon" ng-show="sortKey=='ListName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
+                                               
                                             </th>
-                                            <th>Voucher Number / Bill Number
+                                            <th style="width: 5%">Voucher No / Bill No
-                                                <!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
+                                               
                                             </th>
-                                            <th>Paid To / Received From
+                                            <th style="width: 7.5%">Paid To / Received From
-                                                <!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
+                                               
                                             </th>
-                                             <th>Sem
+                                            <!--  <th>Sem
-                                                <!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
+                                               
                                             </th>
                                             <th>Course
-                                                <!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
+                                               
+                                            </th> -->
+                                            <th style="width: 7.5%">University,</br>Course,</br>Sem
+                                               
                                             </th>
-                                            <th>University
+                                            <th ng-click="sort('TypeName')" style="width: 7.5%">Type
-                                                <!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
+                                               
                                             </th>
-                                            <th ng-click="sort('TypeName')">Type
+                                             <th style="width: 7%"> 
-                                                <!--<span class="glyphicon sort-icon" ng-show="sortKey=='TypeName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
-                                            </th>
-                                             <th> 
                                                 Receipt No
                                             </th>
-                                            <th> 
+                                            <th style="width: 7%"> 
                                                 Comments
                                             </th>
-                                            <th>Mode of Payment
+                                            <th style="width: 7%">Mode of Payment
-                                                <!--<span class="glyphicon sort-icon" ng-show="sortKey=='TypeName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
+                                                
                                             </th>
-                                            <th>Amount
+                                            <th style="width: 5%">Amount
-                                                <!--<span class="glyphicon sort-icon" ng-show="sortKey=='Amount'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
+                                               
                                             </th>
-                                            <th>Balance
+                                            <th style="width: 7%">Balance
-                                                <!--<span class="glyphicon sort-icon" ng-show="sortKey=='Amount'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
+                                                
                                             </th>
-<th>Reason
+                                            <th style="width: 7%">Reason
-                                                <!--<span class="glyphicon sort-icon" ng-show="sortKey=='Amount'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
+                                               
                                             </th>
-                                            <th class="center" ng-click="sort('Status')">Status
+                                            <th class="center" ng-click="sort('Status')" style="width: 7.5%">Status
-                                                <!--<span class="glyphicon sort-icon" ng-show="sortKey=='Status'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
+                                               
                                             </th>
-                                            <th class="center">Activity
+                                            <th class="center" style="width: 7.5%">Activity
                                             </th>
                                         </tr>
                                     </thead>
@@ -179,9 +189,9 @@
                                             <td>{{p.ListName}}</td>
                                             <td>{{p.VoucherNumber}}</td>
                                             <td>{{p.PaidTo}}</td>
-                                            <td> {{p.FeePaymentDetails}}</td>
+                                           <!--  <td> {{p.FeePaymentDetails}}</td>
-                                            <td>{{p.CourseName}}</td>
+                                            <td>{{p.CourseName}}</td> -->
-                                            <td>{{p.UniversityName}}</td>
+                                            <td>{{p.UniversityName}},{{p.CourseName}},{{p.FeePaymentDetails}}</td>
                                             <td>
                                                 <span ng-if=" p.PaymentStatus == 1 ">{{p.TypeName}}</span>
                                                 <span tooltip="Fees Updation" ng-if=" p.PaymentStatus == 0 " style="color:chocolate">{{p.TypeName}}</span></td>
@@ -336,7 +346,7 @@
                         <div>
                             <div class="row">
                                 <div data-ng-controller="DatepickerDemoCtrl">
-                                    <div class="col-md-6 form-group" ng-class="{'has-error':Form.addDate.$dirty && Form.addDate.$invalid, 'has-success':Form.addDate.$valid}">
+                                    <div class="col-md-4 form-group" ng-class="{'has-error':Form.addDate.$dirty && Form.addDate.$invalid, 'has-success':Form.addDate.$valid}">
                                         <label>
                                                 Date <span
                                                     class="symbol required"></span>
@@ -351,7 +361,8 @@
                                         <span class="error text-small block" ng-if="Form.addDate.$error.maxlength">Enter a Valid Date </span>
                                     </div>
                                 </div>
-                                <div class="col-md-6 form-group" ng-class="{'has-error':Form.addName.$dirty && Form.addName.$invalid , 'has-success':Form.addName.$valid}">
+
+                                <div class="col-md-4 form-group" ng-class="{'has-error':Form.addName.$dirty && Form.addName.$invalid , 'has-success':Form.addName.$valid}">
                                     <label for="form-field-select-2">
                                                Income/Expense <span class="symbol required"></span>
                                                 </label>
@@ -359,12 +370,36 @@
                                     <select class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="addName" ng-model="myModelAdd.name" ng-change="getType(myModelAdd.name)"
                                         required>
                                                 <option value="" disabled selected>Select</option>
-                                                <!-- <option ng-repeat="typeName in incomeExpenseName" value="{{typeName.ListCode}}">{{typeName.ListName}}</option> -->
+                                               
                                                  <option value="I001">EXPENSE</option>
                                                 <option value="I002">INCOME</option>
                                                 </select>
                                     <span class="error text-small block" ng-if="Form.addName.$dirty && Form.addName.$error.required">Type is Required</span>
                                 </div>
+
+                              
+                               <div class="col-md-4" ng-class="{'has-error':Form.addType.$dirty && Form.addType.$invalid, 'has-success':Form.addType.$valid}">
+                                    <label for="form-field-select-2">
+                                              Type  <span class="symbol required"></span>
+                                                </label>
+                                                <select class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="addType" ng-model="myModelAdd.type" required>
+                                     <option value="" disabled selected>Select Type</option>
+
+                                     <optgroup ng-repeat="typeName in incomeExpenseName"  label="{{typeName.ListName}}">
+                                                 <option  ng-repeat="incexpType in incomeExpenseType" ng-if="typeName.ListCode == incexpType.TypeID" value="{{incexpType.ID}}">{{incexpType.TypeName}}</option>
+
+                                    </optgroup> 
+                                                </select>
+                                                
+                                    <span class="error text-small block" ng-if="Form.addType.$dirty && Form.addType.$error.required">Type is Required</span>
+
+                                </div>
+
+
+
+
+
+
                             </div>
                             <div class="row">
                                 <div class="col-md-4 form-group" ng-class="{'has-error':Form.voucherNumber.$dirty && Form.voucherNumber.$invalid , 'has-success':Form.voucherNumber.$valid}">
@@ -385,6 +420,42 @@
                                     required/>
                                     <span class="error text-small block" ng-if="Form.paidTo.$dirty && Form.paidTo.$invalid" ng-hide="Form.paidTo.$error.maxlength || Form.paidTo.$error.minlength || Form.paidTo.$error.pattern">Paid To / Reveived From is required.</span>
                                 </div>
+                               <!--  <div class="col-md-4"  ng-class="{'has-error':Form.description_paid.$dirty && Form.description_paid.$invalid , 'has-success':Form.description_paid.$valid}">
+                                    <label>
+                                               Description  <span class="symbol required"></span>
+                                            </label>
+
+                                    <textarea type="text" placeholder="Enter Description" tabindex="3" class="form-control" name="description_paid" ng-model="myModelAdd.description_paid"
+                                        maxlength="100" required/>
+                                    <span class="text-small block" style="color: rgba(128, 128, 128, 0.64)">Max 100 Characters.</span>
+                                    <span class="error text-small block" ng-if="Form.description_paid.$dirty && Form.description_paid.$error.pattern">Invalid Description</span>
+
+                                </div> -->
+
+                                <div class="col-md-4" ng-class="{'has-error':Form.addAmount.$dirty && Form.addAmount.$invalid, 'has-success':Form.addAmount.$valid}">
+                                    <label>
+                                               Amount <span class="symbol required"></span>
+                                            </label>
+                                    <input type="text" ng-pattern="/^[0-9]*$/" name="addAmount" tabindex="2" placeholder="Enter Amount" class="form-control"
+                                        ng-model="myModelAdd.amount" required/>
+                                    <span class="error text-small block" ng-if="Form.addAmount.$dirty && Form.addAmount.$error.required">Amount is Required </span>
+                                </div>
+
+
+
+
+                            </div>
+                            <div class="row">
+                             
+                              <!--   <div class="col-md-4" ng-class="{'has-error':Form.addAmount.$dirty && Form.addAmount.$invalid, 'has-success':Form.addAmount.$valid}">
+                                    <label>
+                                               Amount <span class="symbol required"></span>
+                                            </label>
+                                    <input type="text" ng-pattern="/^[0-9]*$/" name="addAmount" tabindex="2" placeholder="Enter Amount" class="form-control"
+                                        ng-model="myModelAdd.amount" required/>
+                                    <span class="error text-small block" ng-if="Form.addAmount.$dirty && Form.addAmount.$error.required">Amount is Required </span>
+                                </div> -->
+
                                  <div class="col-md-4"  ng-class="{'has-error':Form.description_paid.$dirty && Form.description_paid.$invalid , 'has-success':Form.description_paid.$valid}">
                                     <label>
                                                Description  <span class="symbol required"></span>
@@ -396,41 +467,6 @@
                                     <span class="error text-small block" ng-if="Form.description_paid.$dirty && Form.description_paid.$error.pattern">Invalid Description</span>
 
                                 </div>
-
-                            </div>
-                            <div class="row">
-                                <div class="col-md-4" ng-class="{'has-error':Form.addType.$dirty && Form.addType.$invalid, 'has-success':Form.addType.$valid}">
-                                    <label for="form-field-select-2">
-                                              Type  <span class="symbol required"></span>
-                                                </label>
-                                   <!--  <select class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="addType" ng-model="myModelAdd.type" required>
-                                                <option value="" disabled selected>Select Type</option>
-                                                <option ng-repeat="typeItem in getTypes"  value="{{typeItem.ID}}">{{typeItem.TypeName}}</option>
-                                                </select> -->
-
-                                                <select class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="addType" ng-model="myModelAdd.type" required>
-                                     <option value="" disabled selected>Select Type</option>
-
-                                     <optgroup ng-repeat="typeName in incomeExpenseName"  label="{{typeName.ListName}}">
-                                                 <option  ng-repeat="incexpType in incomeExpenseType" ng-if="typeName.ListCode == incexpType.TypeID" value="{{incexpType.ID}}">{{incexpType.TypeName}}</option>
-
-                                    </optgroup> 
-                                                <!-- <option value="" disabled selected>Select Type</option>
-                                                <option ng-repeat="typeItem in getTypes"  value="{{typeItem.ID}}">{{typeItem.TypeName}}</option> -->
-                                                </select>
-                                                
-                                    <span class="error text-small block" ng-if="Form.addType.$dirty && Form.addType.$error.required">Type is Required</span>
-
-                                </div>
-                                <div class="col-md-4" ng-class="{'has-error':Form.addAmount.$dirty && Form.addAmount.$invalid, 'has-success':Form.addAmount.$valid}">
-                                    <label>
-                                               Amount <span class="symbol required"></span>
-                                            </label>
-                                    <input type="text" ng-pattern="/^[0-9]*$/" name="addAmount" tabindex="2" placeholder="Enter Amount" class="form-control"
-                                        ng-model="myModelAdd.amount" required/>
-                                    <span class="error text-small block" ng-if="Form.addAmount.$dirty && Form.addAmount.$error.required">Amount is Required </span>
-                                    <!--<span class="error text-small block" ng-if="Form.addAmount.$dirty">Amount is Required </span>-->
-                                </div>
                                 <div class="col-md-4">
                                     <label>
                                                Comments

Apollo/assets/views/daybook/daybooksuperadmin.html

@@ -77,7 +77,25 @@
                                                 background: #ddd;
                                                 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">
@@ -95,55 +113,58 @@
                                 background: lightgray;
                                 /*font-size: 16px;*/
                              }
+
+                            
+
+
                              </style>
-<button ng-click="exportData()">export</button>
                                 <table class="table table-bordered export-table">
                                     <thead>
                                         <tr>
-                                            <th ng-click="sort('Date')">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')">Income/Expense
+                                            <th class="th" ng-click="sort('ListName')" style="width: 5%">Income/</br>Expense
                                                 <!--<span class="glyphicon sort-icon" ng-show="sortKey=='ListName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
                                             </th>
-                                            <th>Voucher Number / Bill Number
+                                            <th style="width: 5%">Voucher No / Bill No
                                                 <!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
                                             </th>
-                                            <th>Paid To / Received From
+                                            <th style="width: 7.5%">Paid To / Received From
                                                 <!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
                                             </th>
-                                              <th>Sem
+                                              <!-- <th>Sem
-                                                <!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
+                                            
                                             </th>
                                             <th>
                                                 Course
+                                            </th> -->
+                                            <th style="width: 7.5%">
+                                               University,</br>Course,</br>Sem
                                             </th>
-                                            <th>
+                                            <th ng-click="sort('TypeName')" style="width: 7.5%">Type
-                                                University
+                                                
                                             </th>
-                                            <th ng-click="sort('TypeName')">Type
+                                             <th style="width: 7.5%"> 
-                                                <!--<span class="glyphicon sort-icon" ng-show="sortKey=='TypeName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
-                                            </th>
-                                             <th> 
                                                 Receipt No
                                             </th>
-                                            <th> 
+                                            <th style="width: 7.5%"> 
                                                 Comments
                                             </th>
-                                            <th>Mode of Payment
+                                            <th style="width: 7.5%">Mode of Payment
-                                                <!--<span class="glyphicon sort-icon" ng-show="sortKey=='TypeName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
+                                               
                                             </th>
-                                            <th>Amount
+                                            <th style="width: 5%">Amount
-                                                <!--<span class="glyphicon sort-icon" ng-show="sortKey=='Amount'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
+                                                
                                             </th>
-                                            <th>Balance
+                                            <th style="width: 7%">Balance
-                                                <!--<span class="glyphicon sort-icon" ng-show="sortKey=='Amount'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
+                                              
                                             </th>
-                                            <th>Reason</th>
+                                            <th style="width: 7%">Reason</th>
-                                            <th class="center" ng-click="sort('Status')">Status
+                                            <th class="center" ng-click="sort('Status')" style="width: 7.5%">Status
-                                                <!--<span class="glyphicon sort-icon" ng-show="sortKey=='Status'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
+                                               
                                             </th>
-                                            <th class="center">Activity
+                                            <th class="center" style="width: 7.5%">Action
                                             </th>
                                         </tr>
                                     </thead>
@@ -154,9 +175,8 @@
                                             <td>{{p.ListName}}</td>
                                             <td>{{p.VoucherNumber}}</td>
                                             <td>{{p.PaidTo}}</td>
-                                            <td> {{p.FeePaymentDetails}}</td>
+                                           
-                                            <td>{{p.CourseName}} </td> 
+                                            <td>{{p.UniversityName}},{{p.CourseName}},{{p.FeePaymentDetails}}</td>
-                                            <td>{{p.UniversityName}}</td>
                                             <td>
                                                 <span ng-if=" p.PaymentStatus == 1 ">{{p.TypeName}}</span>
                                                 <span tooltip="Fees Updation" ng-if=" p.PaymentStatus == 0 " style="color:chocolate">{{p.TypeName}}</span></td>
@@ -345,6 +365,25 @@
                                     <span class="error text-small block" ng-if="Form.addName.$dirty && Form.addName.$error.required">Type is Required</span>
                                 </div>
 
+
+
+                                  <div class="col-md-4" ng-class="{'has-error':Form.addType.$dirty && Form.addType.$invalid, 'has-success':Form.addType.$valid}">
+                                    <label for="form-field-select-2">
+                                              Type  <span class="symbol required"></span>
+                                                </label>
+                                    <select class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="addType" ng-model="myModelAdd.type" required>
+                                 <option value="" disabled selected>Select Type</option>
+
+                                     <optgroup ng-repeat="typeName in incomeExpenseName"  label="{{typeName.ListName}}">
+                                                 <option  ng-repeat="incexpType in incomeExpenseType" ng-if="typeName.ListCode == incexpType.TypeID" value="{{incexpType.ID}}">{{incexpType.TypeName}}</option>
+
+                                    </optgroup> 
+                                              
+                                                </select>
+                                    <span class="error text-small block" ng-if="Form.addType.$dirty && Form.addType.$error.required">Type is Required</span>
+
+                                </div>
+
                             </div>
                             <div class="row">
                                 <div class="col-md-4 form-group" ng-class="{'has-error':Form.voucherNumber.$dirty && Form.voucherNumber.$invalid , 'has-success':Form.voucherNumber.$valid}">
@@ -365,6 +404,26 @@
                                     required/>
                                     <span class="error text-small block" ng-if="Form.paidTo.$dirty && Form.paidTo.$invalid" ng-hide="Form.paidTo.$error.maxlength || Form.paidTo.$error.minlength || Form.paidTo.$error.pattern">Paid To / Reveived From is required.</span>
                                 </div>
+
+
+ <div class="col-md-4" ng-class="{'has-error':Form.addAmount.$dirty && Form.addAmount.$invalid, 'has-success':Form.addAmount.$valid}">
+                                    <label>
+                                               Amount <span class="symbol required"></span>
+                                            </label>
+                                    <input type="text" ng-pattern="/^[0-9]*$/" name="addAmount" tabindex="2" placeholder="Enter Amount" class="form-control"
+                                        ng-model="myModelAdd.amount" required/>
+                                    <span class="error text-small block" ng-if="Form.addAmount.$dirty && Form.addAmount.$error.required">Amount is Required </span>
+                                    
+                                </div>
+
+
+
+                             
+
+                            </div>
+                            <div class="row">
+
+                         
                             <div class="col-md-4"  ng-class="{'has-error':Form.description_paid.$dirty && Form.description_paid.$invalid , 'has-success':Form.description_paid.$valid}">
                                     <label>
                                                Description  <span class="symbol required"></span>
@@ -377,36 +436,15 @@
 
                                 </div>
 
-                            </div>
+                               <!--  <div class="col-md-4" ng-class="{'has-error':Form.addAmount.$dirty && Form.addAmount.$invalid, 'has-success':Form.addAmount.$valid}">
-                            <div class="row">
-
-                                <div class="col-md-4" ng-class="{'has-error':Form.addType.$dirty && Form.addType.$invalid, 'has-success':Form.addType.$valid}">
-                                    <label for="form-field-select-2">
-                                              Type  <span class="symbol required"></span>
-                                                </label>
-                                    <select class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="addType" ng-model="myModelAdd.type" required>
-<option value="" disabled selected>Select Type</option>
-
-                                     <optgroup ng-repeat="typeName in incomeExpenseName"  label="{{typeName.ListName}}">
-                                                 <option  ng-repeat="incexpType in incomeExpenseType" ng-if="typeName.ListCode == incexpType.TypeID" value="{{incexpType.ID}}">{{incexpType.TypeName}}</option>
-
-                                    </optgroup> 
-                                                <!-- <option value="" disabled selected>Select Type</option>
-                                                <option ng-repeat="typeItem in getTypes"  value="{{typeItem.ID}}">{{typeItem.TypeName}}</option> -->
-                                                </select>
-                                    <span class="error text-small block" ng-if="Form.addType.$dirty && Form.addType.$error.required">Type is Required</span>
-
-                                </div>
-
-                                <div class="col-md-4" ng-class="{'has-error':Form.addAmount.$dirty && Form.addAmount.$invalid, 'has-success':Form.addAmount.$valid}">
                                     <label>
                                                Amount <span class="symbol required"></span>
                                             </label>
                                     <input type="text" ng-pattern="/^[0-9]*$/" name="addAmount" tabindex="2" placeholder="Enter Amount" class="form-control"
                                         ng-model="myModelAdd.amount" required/>
                                     <span class="error text-small block" ng-if="Form.addAmount.$dirty && Form.addAmount.$error.required">Amount is Required </span>
-                                    <!--<span class="error text-small block" ng-if="Form.addAmount.$dirty">Amount is Required </span>-->
+                                    
-                                </div>
+                                </div> -->
                                 <div class="col-md-4">
                                     <label>
                                                Comments

Apollo/assets/views/editCourseDetails.html

@@ -156,8 +156,8 @@
 
                     <div class="row">
 
-                        <div class="col-md-6">
+                        <div class="col-md-6" ng-if="myModelRegular1.program=='P001' || myModelLateral1.program=='P002'">
-                            <div class="row" ng-if="myModelRegular1.program=='P001' || myModelLateral1.program=='P002'">
+                            <div class="row" >
                                 <div class="col-md-12">
 
                                     <fieldset>
@@ -199,15 +199,15 @@
 
                             </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>
                                 <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="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}">
@@ -272,16 +272,12 @@
 
                                         </div>
                                     </div>
-                                            </div>
+                                    <!--</div>-->
 
                                 </div>
                             </fieldset>
 
                         </div>
-                            </div>
-
-                        </div>
-
                         <div class="col-md-6">
                             <fieldset>
                                 <div class="row">
@@ -367,7 +363,10 @@
 
                             </fieldset>
 
+
                         </div>
+
+
                         </div>
 
 

Apollo/assets/views/feecollected.html

@@ -0,0 +1,210 @@
+
+
+<style type="text/css">
+  .pad {
+    background-color: #eee;
+    padding: 4px;
+}
+.fif {
+ /*   background-color: #ddd;*/
+    display: inline-block;
+    margin: 0 175px 0 0;
+    padding: 8px 8px;
+    text-align: left;
+    width: 200px;
+}
+
+
+.right {
+ /*   background-color: #ddd;*/
+    display: inline-block;
+    /*margin: 0 25px 0 0;*/
+    padding: 1px 1px;
+    text-align: right;
+}
+
+
+.rightac {
+ /*   background-color: #ddd;*/
+    display: inline-block;
+    margin: 0 175px 0 0;
+    padding: 8px 8px;
+    text-align: left;
+    width: 200px;
+}
+
+.a { 
+    word-spacing: 9cm;
+}
+
+
+
+</style>
+
+
+
+<section id="page-title">
+    <div class="row">
+        <div class="col-sm-8">
+            <h1 class="mainTitle">Fee Collected Report</h1>
+        </div>
+        <!-- <div ncy-breadcrumb></div>   -->
+    </div>
+</section>
+<style>
+    /* .sort-icon {
+        font-size: 9px;
+        margin-left: 5px;
+    }
+
+    th {
+        cursor: pointer;
+    } */
+</style>
+<script type="text/javascript" src="bower_components/ng-table-excel-export/ng-table-excel-export.min.js">
+   
+
+</script>
+<div class="container-fluid container-fullw bg-white">
+    <div ng-controller="FeeCollected_reportCtrl" data-ng-init="init()">
+        <form name="Form" id="form" novalidates method="post">
+            <fieldset>
+                <div class="row">
+                    <div class="col-md-12">
+
+                        
+                        <div class="row">
+                            <div class="col-md-3">
+                                <!--<pre>{{searchData.date}}</pre>-->
+                                <div data-ng-controller="DatepickerDemoCtrl">
+                                    <label>
+                                           From Date 
+                                        </label>
+                                    <input type="text" tabindex="1" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="filters.from_date"
+                                        is-open="startOpen" ng-init="startOpen = false" name="addDate" datepicker-options="dateOptions"
+                                        placeholder="Select Date" close-text="Close" required="required" ng-change="changeDate()" 
+                                        show-button-bar="true" />
+
+                                </div>
+                            </div>
+
+
+                            <div class="col-md-3">
+                                <!--<pre>{{searchData.date}}</pre>-->
+                                <div data-ng-controller="DatepickerDemoCtrl">
+                                    <label>
+                                            To Date   
+                                        </label>
+                                    <input type="text" tabindex="1" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="filters.to_date"
+                                        is-open="startOpen" ng-init="startOpen = false" name="addDate" datepicker-options="dateOptions"
+                                        placeholder="Select Date" close-text="Close" required="required" ng-change="changeToDate()"
+                                        show-button-bar="true" />
+
+                                </div>
+                            </div>
+
+
+                             <div class="col-md-3" >
+                                    <label for="form-field-select-2">
+                                               University
+                        </label>
+
+                            <select class="form-control" tabindex="3" class="cs-select cs-skin-elastic" name="university" ng-model="myModel.myUnivSearch"
+                                        ng-click="getEmployeeList()">
+                        
+                           <option value="" selected>Select University</option>
+                           <option  ng-repeat="item in universitySearchData" value="{{item.UniversityID}}">{{item.UniversityName}}</option>
+                            
+
+                            </select>
+                                </div>
+
+
+
+                            
+
+                            <div class="col-md-2" style="padding-top: 2.3%;">
+                                <div class="pull-right">
+
+                                    <button type="submit" class="btn btn-success btn-o" ng-click="getDetails(Form,myModel);" tabindex="8">
+                                        Submit
+                                    </button>
+
+                                </div>
+                            </div>
+                        </div>
+                        
+
+
+                    </div>
+                </div>
+            </fieldset>
+
+        </form>
+        <!-- <pre>{{statusr | json}}</pre> -->
+        <div class="row" style="text-align: right;">
+                <div class="col-md-4">
+               <!--  <input class="form-control"  type="text" ng-model="search" id="searchIn" autofocus tabindex="2" placeholder="Search" /> -->
+                </div>
+                <button class="btn btn-success btn-o" ng-click="exportData()">Export to Excel</button>
+
+                 <!-- <button type="button" ladda="ldloading1.zoom_in" tabindex="5" class="btn btn-success btn-o" data-style="zoom-in" ng-click="changeSem(myModel.universityName,myModel.courseName);">Generate PDF</button> -->
+
+                <!-- <button class="btn btn-success" id="print" ng-click="generatePDF();">Print</button></div> -->
+            
+        </div>
+
+<div>
+    <div ng-if="isLoaderShow">
+        <center> <h1>No Records Found !!</h1> </center>
+    </div>
+
+    <div class="col-md-12" ng-if="isShow">
+   <div class="table-responsive">
+      <table  id="datatable"   class="table table-hover">
+         <thead>
+            <tr >
+               <th style="font-size: 12px;">University</th>
+               <th style="font-size: 12px;">Cash</th>
+               <th style="font-size: 12px;">Cheque</th>
+               <th style="font-size: 12px">Referral</th>
+               <th style="font-size: 12px;">Online Transaction</th>
+               <th style="font-size: 12px;">Waiver</th>      
+               <th style="font-size: 12px;">Credit/Debit Card</th>
+               <th style="font-size: 12px;">Total</th>
+              <!-- <th style="font-size: 12px;">Amount</th>
+               <th style="font-size: 12px;">Action</th> -->
+            </tr>
+         </thead>
+         <tbody dir-paginate="p in newreglist|filter:search:strict|itemsPerPage:10">
+            <tr>
+                <td>{{p.UniversityName}}</td>
+                <td>{{p.Cash}}</td>
+                <td>{{p.Cheque}}</td>
+                <td>{{p.Referal}}</td>
+                <td>{{p.Onlinec}}</td>
+                <td>{{p.WAIVER}}</td>       
+                <td>{{p.Card}}</td>
+                <td>{{p.Total}}</td>
+                
+            </tr>
+            
+         </tbody>
+      </table>
+   </div>
+</div>
+
+
+
+
+</div> 
+
+<!-- <div ng-if="load=0">
+<b><h1 style="color:black;"><center> No Records Found</h1></center></b>
+</div> -->
+     <!--    <dir-pagination-controls  direction-links="true" boundary-links="true">
+        </dir-pagination-controls> -->
+    </div>
+</div>
+
+

Apollo/assets/views/hallticket/hallTicketPDF.html

@@ -1,15 +1,16 @@
-<style>
+<!--<style>
 .table{
 	border: 1px solid #000 !important;
 }
-</style>   
+</style>   -->
 
 
 <div class="container-fluid container-fullw bg-white" style="width: 786px;" ng-controller="generateHallTicketCtrl">
     
     
 		<div align="right">
-			<button class="btn btn-success btn-sm" ng-click="printStudentDetails(semDataTypePDF);">Print</button>
+			<button class="btn btn-success btn-sm" ng-click="generatePDF();">Print</button>
+	         <!--<button class="btn btn-success" id="print"ng-click="generatePDF();">Printer</button></div>-->
 		</div>
 	
     
@@ -30,9 +31,7 @@
 				</tbody>
 			
 		</table>
-		</div>
 		
-		<div id="student_header">
 		<table width="100%" border="1" id = "" style="background-color:#fff;">
 				<tbody>
 					<tr>
@@ -40,15 +39,11 @@
 					
 					</tr>
 					<tr>
-					<td><strong style="font-size:14px;" >Enrollment No</strong>&nbsp;:&nbsp;&nbsp;&nbsp;{{studentObj.EnrollmentID}}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<strong style="font-size:14px;" >Student Name</strong>&nbsp;&nbsp;:&nbsp;&nbsp;{{studentObj.Firstname}}&nbsp;{{studentObj.Lastname}}</br><strong style="font-size:14px;" >Center Name</strong>&nbsp;&nbsp;&nbsp;&nbsp;:&nbsp;&nbsp;&nbsp;&nbsp;{{centerNamePDF}}</td>
+					<td><strong style="font-size:14px;" >Enrollment No</strong>&nbsp;:&nbsp;&nbsp;&nbsp;{{studentObj.EnrollmentID}}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<strong style="font-size:14px;" >Student Name</strong>&nbsp;&nbsp;:&nbsp;&nbsp;{{studentObj.Firstname}}&nbsp;{{studentObj.Lastname}}<br></br><strong style="font-size:14px;" >Center Name</strong>&nbsp;&nbsp;&nbsp;&nbsp;:&nbsp;&nbsp;&nbsp;&nbsp;{{centerNamePDF}}</td>
 					</tr>
-					<!-- <tr> -->
-					<!-- <td >{{universityAddressPDF}}</td> -->
-					<!-- </tr> -->
 				</tbody>
-			
 			</table>
-		</div>
+		
 		
 		<!-- FOR SEMESTER TYPE STUDENTS-->
 		<table width="100%" border="1" ng-repeat ="subjects in studentObj.FeeDetails" and ng-if="semDataTypePDF == 'SEM'" id = "{{studentObj.StudentID}}{{$index}}">

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>
@@ -355,7 +356,7 @@
 					<i class="ti-write"></i>
 				</div>
 				<div class="item-inner">
-					<span class="title" translate="sidebar.nav.master.HALLTICKET"> GENERATE HALLTICKET </span>
+					<span class="title" translate="sidebar.nav.master.HALLTICKET"> GENERATE HALLTICKET </span><i class="icon-arrow"></i>
 				</div>
 			</div>
 		</a>
@@ -391,7 +392,7 @@
 					<i class="ti-rocket"></i>
 				</div>
 				<div class="item-inner">
-					<span class="title" translate="sidebar.nav.master.REREGISTRATION"> REREGISTRATION </span>
+					<span class="title" translate="sidebar.nav.master.REREGISTRATION"> REREGISTRATION </span><i class="icon-arrow"></i>
 				</div>
 			</div>
 		</a>
@@ -491,11 +492,17 @@
 						</a>
 				</li>
 
+				<li ui-sref-active="active">
+						<a ui-sref="app.reports.feeCollect" ng-click="checkSuperAdmin()">
+							<span class="title" translate="sidebar.nav.report.feeCollect">Fee Collected</span>
+						</a>
+				</li>
+					
 				
 
 		</ul>
 	</li>
-	<li ng-class="{'active open':$state.includes('app.myprofile')}">
+	<!--<li ng-class="{'active open':$state.includes('app.myprofile')}">
 		<a ui-sref="app.myprofile" ng-click="checkSuperAdmin()">
 			<div class="item-content">
 				<div class="item-media">
@@ -507,7 +514,7 @@
 			</div>
 		</a>
 
-	</li>
+	</li>-->
 </ul>
 
 <!-- end: Super Admin -->
@@ -826,7 +833,7 @@
 				<!-- </a> -->
 			<!-- </li> -->
 			<li ui-sref-active="active">
-				<a ui-sref="app.hallTicket.batchSchedule" ng-click="checkSuperAdmin()">
+				<a ui-sref="app.hallTicket.batchSchedule" ng-click="checkAdmin()">
 					<span class="title" translate="sidebar.nav.hallTicket.BATCHSCHEDULE">BATCHSCHEDULE</span>
 				</a>
 			</li>
@@ -850,7 +857,7 @@
 					<i class="ti-rocket"></i>
 				</div>
 				<div class="item-inner">
-					<span class="title" translate="sidebar.nav.master.REREGISTRATION"> REREGISTRATION </span>
+					<span class="title" translate="sidebar.nav.master.REREGISTRATION"> REREGISTRATION </span><i class="icon-arrow"></i>
 				</div>
 			</div>
 		</a>
@@ -977,9 +984,16 @@
 					
 
 			  
+				<li ui-sref-active="active">
+						<a ui-sref="app.reports.feeCollect" ng-click="checkSuperAdmin()">
+							<span class="title" translate="sidebar.nav.report.feeCollect">Report For Fees Collection</span>
+						</a>
+				</li>		
+					
+	
 			</ul>
 		</li>	
-	<li ng-class="{'active open':$state.includes('app.myprofile')}">
+	<!--<li ng-class="{'active open':$state.includes('app.myprofile')}">
 		<a ui-sref="app.myprofile" ng-click="checkAdmin()">
 			<div class="item-content">
 				<div class="item-media">
@@ -991,7 +1005,7 @@
 			</div>
 		</a>
 
-	</li>
+	</li>-->
 </ul>
 
 <!-- end: Admin -->
@@ -1195,7 +1209,7 @@
 				<!-- </a> -->
 			<!-- </li> -->
 			<li ui-sref-active="active">
-				<a ui-sref="app.hallTicket.batchSchedule" ng-click="checkSuperAdmin()">
+				<a ui-sref="app.hallTicket.batchSchedule" ng-click="checkStaff()">
 					<span class="title" translate="sidebar.nav.hallTicket.BATCHSCHEDULE">BATCHSCHEDULE</span>
 				</a>
 			</li>	
@@ -1215,7 +1229,7 @@
 					<i class="ti-rocket"></i>
 				</div>
 				<div class="item-inner">
-					<span class="title" translate="sidebar.nav.master.REREGISTRATION"> REREGISTRATION </span>
+					<span class="title" translate="sidebar.nav.master.REREGISTRATION"> REREGISTRATION </span><i class="icon-arrow"></i>
 				</div>
 			</div>
 		</a>
@@ -1235,7 +1249,7 @@
 		</ul>
 	</li>
 
-	<li ng-class="{'active open':$state.includes('app.myprofile')}">
+	<!--<li ng-class="{'active open':$state.includes('app.myprofile')}">
 		<a ui-sref="app.myprofile"  ng-click="checkStaff()">
 			<div class="item-content">
 				<div class="item-media">
@@ -1247,7 +1261,7 @@
 			</div>
 		</a>
 
-	</li>
+	</li>-->
 </ul>
 <ul class="main-navigation-menu" ng-if="getLoginDash == 'student'">
 	<li ui-sref-active="active">
@@ -1456,7 +1470,7 @@
 				</a>
 			</li>
 			<li ui-sref-active="active">
-				<a ui-sref="app.hallTicket.batchSchedule" ng-click="checkSuperAdmin()">
+				<a ui-sref="app.hallTicket.batchSchedule" ng-click="checkStaff()">
 					<span class="title" translate="sidebar.nav.hallTicket.BATCHSCHEDULE">BATCHSCHEDULE</span>
 				</a>
 			</li>	
@@ -1500,7 +1514,7 @@
 		</ul>
 	</li>
 
-	<li ng-class="{'active open':$state.includes('app.myprofile')}">
+	<!--<li ng-class="{'active open':$state.includes('app.myprofile')}">
 		<a ui-sref="app.myprofile"  ng-click="checkStaff()">
 			<div class="item-content">
 				<div class="item-media">
@@ -1512,7 +1526,7 @@
 			</div>
 		</a>
 
-	</li>
+	</li>-->
 </ul>
 <!--<ul class="main-navigation-menu" ng-if="getLoginDash == 'student'">
 	<li ui-sref-active="active">

Apollo/assets/views/partials/top-navbar.html

@@ -191,6 +191,12 @@
 					</a>
 				</li>-->
 				<li>
+		<a ui-sref="app.myprofile" translate="topbar.user.PROFILE">
+			   My Profile
+					</a>
+
+	</li>
+				<li>
 					<a ui-sref="app.changePassword" translate="topbar.user.CHANGEPASSWORD">
 						Change Password
 					</a>
@@ -200,6 +206,8 @@
 						Log Out
 					</a>
 				</li>
+				
+				
 			</ul>
 		</li>
 		<!-- end: USER OPTIONS DROPDOWN -->

Apollo/assets/views/report_application_pending.html

@@ -47,7 +47,6 @@
                                     <option value="" selected>Select University</option>
                                     <!--details.universityName for details in university-->
                                     <option ng-repeat="details in university"  value="{{details}}">{{details.universityName}}</option>
-
                                 </select>
                                <span style="color:red;" ng-if="show" ng-show="Form.university.$dirty && Form.university.$error.required">Please select University.</span>
                             </div>
@@ -120,17 +119,17 @@
                     <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>{{p.SL_NO}}</td>
-                        <td>{{p.Admission_date}}</td>
+                        <td>{{p.InitialPayDate}}</td>
-                        <td>{{p.Enrollment_id}}</td>
+                        <td>{{p.EnrollmentNumber}}</td>
                         <td><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.Student_name}}</a></td>
-                        <td>{{p.Father_name}}</td>
+                        <td>{{p.FatherName}}</td>
                         <td>{{p.Course_name}}</td>
-                        <td>{{p.Sem_year}}</td>
+                        <td>{{p.Sem_Year}}</td>
                         <td><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.Phone_number}}</a></td>
                         <td>{{p.University}}</td>
-                        <td>{{p.Status}}</td>
+                        <td>{{p.StatusName}}</td>
-						<td>{{p.formtype}}</td>
+						<td>{{p.FormType}}</td>
-						 <td>{{p.appdate}}</td>
+						 <td>{{p.StatusUpdationOn}}</td>
                         
                         
                     </tr>

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_certificate_status.html

@@ -70,7 +70,7 @@ td,th {
                                     <label>
                                            From Date 
                                         </label>
-                                    <input type="text" tabindex="1" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="filters.from_date"
+                                    <input type="text" tabindex="1" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="univModel.from_date"
                                         is-open="startOpen" ng-init="startOpen = false" name="addDate" datepicker-options="dateOptions"
                                         placeholder="Select Date" close-text="Close" required="required" ng-change="changeDate()" 
                                         show-button-bar="true" />
@@ -83,7 +83,7 @@ td,th {
                                     <label>
                                             To Date   
                                         </label>
-                                    <input type="text" tabindex="1" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="filters.to_date"
+                                    <input type="text" tabindex="1" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="univModel.to_date"
                                         is-open="startOpen" ng-init="startOpen = false" name="addDate" datepicker-options="dateOptions"
                                         placeholder="Select Date" close-text="Close" required="required" ng-change="changeToDate()"
                                         show-button-bar="true" />
@@ -156,18 +156,18 @@ td,th {
                     <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>{{p.SL_NO}}</td>
-                        <td>{{p.Document_fee_paid_date}}</td>
+                        <td>{{p.initialPaid || "-"}}</td>
-                        <td>{{p.Enrollment_id}}</td>
+                        <td>{{p.Enrollment_id || "-"}}</td>
                         <td><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.Student_name}}</a></td>
                         <td>{{p.Father_name}}</td>
-                        <td>{{p.course_name}}</td>
+                        <td>{{p.Course_name}}</td>
                        <!--  <td>{{p.Sem_year}}</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 || "0"}}</td>
-                        <td>{{p.Certificate_name}}</td>
+                        <td>{{p.certname}}</td>
-                        <td>{{p.Certificate_status}}</td>
+                        <td>{{p.status}}</td>
-                        <td>{{p.Certificate_date}}</td>
+                        <td>{{p.adate || "-"}}</td>
                     </tr>
                 
                 </tbody>

Apollo/assets/views/report_expense.html

@@ -86,6 +86,7 @@
             
         </div>
         <div pdf-save-content="getpdf" class="table-responsive">
+		<h4 style="text-align:center;">Apollo Distance Education College - {{expense_data[0].branch}}</h4>
 		<h4 style="text-align:center;">Expense Report {{filters.from_date | date : "dd-MM-yyyy"}} To {{filters.to_date | date : "dd-MM-yyyy"}}</h4>
             <table  id="datatable"   class="table table-hover">
                   

Apollo/assets/views/report_mark_certificate_status.html

@@ -70,7 +70,7 @@ td,th {
                                     <label>
                                            From Date 
                                         </label>
-                                    <input type="text" tabindex="1" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="filters.from_date"
+                                    <input type="text" tabindex="1" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="univModel.from_date"
                                         is-open="startOpen" ng-init="startOpen = false" name="addDate" datepicker-options="dateOptions"
                                         placeholder="Select Date" close-text="Close" required="required" ng-change="changeDate()" 
                                         show-button-bar="true" />
@@ -83,7 +83,7 @@ td,th {
                                     <label>
                                             To Date   
                                         </label>
-                                    <input type="text" tabindex="1" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="filters.to_date"
+                                    <input type="text" tabindex="1" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="univModel.to_date"
                                         is-open="startOpen" ng-init="startOpen = false" name="addDate" datepicker-options="dateOptions"
                                         placeholder="Select Date" close-text="Close" required="required" ng-change="changeToDate()"
                                         show-button-bar="true" />
@@ -142,37 +142,37 @@ td,th {
                         <th>SL.No</th>
                         <th>Student Name</th>
                         <th>Father Name</th>
-                        <th>Course</th>
-                        <th>Sem/Year</th>
 						 <th>Phone No</th>
 						 <th>University</th>
-                        <th>Balance Fee</th>
+                        <th>Course</th>
+                        <th>Sem/Year</th>
                        <th>Certificates Name</th>
                         <th>Received Status</th>
                         <th>Received Date</th>
 						<th>Issued Status</th>
                         <th>Issued Date</th>
                         <th>Certificate Issued Comments</th>
+						<th>Balance Fee</th>
                  
                     </tr>
                 </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>
-                        <td>{{p.course_name}}</td>
-                        <td>{{p.Sem_year}}</td>
 						 <td><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.Phone_number}}</a></td>
 						 <td>{{p.University}}</td>
-                        <td style="text-align:right;">{{p.Balance_fee}}</td>
+                        <td>{{p.course_name}}</td>
+                        <td>{{p.Sem_year}}</td>
                         <td>{{p.Certificate_name}}</td>
 						<td>{{p.rstatus}}</td>
-                        <td>{{p.rdate}}</td>
+                        <td>{{p.rcvedate}}</td>
                         <td>{{p.istatus}}</td>
-                        <td>{{p.idate}}</td>
+                        <td>{{p.issuedate}}</td>
-                        <td>{{p.cmnts}}</td>
+                        <td>{{p.acmts}}</td>
+						<td style="text-align:right;">{{p.Balance_fee}}</td>
                         
                     </tr>
                 

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>

Apollo/assets/views/report_waiver_referal.html

@@ -140,7 +140,7 @@
 						<td>{{p.staffname}}</td>
                         <td>{{p.Waiver_bill}}</td>
                         <td style="text-align:right;">{{p.Waiver_amount}}</td>
-                        <td>{{p.Referal_bill}}</td>
+                        <td style="text-align:center;">{{p.Referal_bill}}</td>
                         <td style="text-align:right;">{{p.Referal_amount}}</td>
                         <td>{{p.Comments}}</td>
                         

Apollo/assets/views/reregistration/reregistrationformpdf.html

@@ -9,7 +9,7 @@
         <td style="width:154px;text-align: left;border-right-style: hidden;border-bottom-style: hidden;"><img src="images/{{Course.ProfilePicPath || university/No_Image.png}}" id="logo" style="width: 40%;"></td>
         <td style="border-bottom-style: hidden;" colspan="2">
         <h3 style="color:blue; text-align:center;margin-left:-20%;"><strong>{{Course.UniversityName}}</strong></h3>
-        <p style="color:blue; margin-top: 2px;text-align:center;margin-left:-30%;">{{Course.Address}}</p>
+        <p style="color:blue; margin-top: 2px;text-align:center;margin-left:-22%;">{{Course.Address}}</p>
         </td>
         </tr>
         <tr>

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

Apollo/assets/views/student/studentDetailsModal.html

@@ -395,7 +395,7 @@
                                 </tab>
 
 
-                                <tab heading="Document Details" id="document">
+                                <tab heading="Certificate Details" id="document">
                                     <div class="panel-scroll ng-scope ps-container ps-theme-default ps-active-y" perfect-scrollbar="" data-ps-id="6fc3054c-6292-144d-eff7-cd557f527468">
                                         <div ng-if="course.certificateDetails==false">
                                             <!--<center>
@@ -406,7 +406,7 @@
                                             <thead>
                                             <tr>
                                                 <!-- <th>Type</th>-->
-                                                <th>Document Name</th>
+                                                <th>Certificate Name</th>
                                                 <th>Status</th>
                                                 <th>Date</th>
                                                 <th>Comments</th>

Apollo/assets/views/student/studentView.html

@@ -455,7 +455,7 @@
 
                             </tab>
 
-                            <tab heading="Document Details" id="document">
+                            <tab heading="Certificate Details" id="document">
                                 <div class="panel-scroll  ng-scope ps-container ps-theme-default ps-active-y" perfect-scrollbar=""  data-ps-id="6fc3054c-6292-144d-eff7-cd557f527468">
                                     <div ng-if="course.certificateDetails==false">
                                         <!--<center>
@@ -466,7 +466,7 @@
                                         <thead>
                                         <tr>
                                            <!-- <th>Type</th>-->
-                                            <th>Document Name</th>
+                                            <th>Certificate Name</th>
                                             <th>Status</th>
                                             <th>Date</th>
                                             <th>Comments</th>

Apollo/index.html

@@ -101,6 +101,11 @@
 		<script src="assets/js/directives/file-upload.js"></script>
         <script src="assets/js/directives/convert-words.js"></script>
 		<script src="assets/js/directives/table-export.js"></script>
+
+		<!--pdfmake plugin -->
+		<script src="assets/js/directives/pdf_make/pdfMake.js"></script>
+        <script src="assets/js/directives/pdf_make/virtual-fs.js"></script>
+
 		<!-- Clip-Two Controllers -->				
 		<script src="assets/js/controllers/mainCtrl.js"></script>
 		<script src="assets/js/controllers/bootstrapCtrl.js"></script>