echo removed : ps

Apollo/.htaccess

@@ -0,0 +1 @@
+SetEnv PHPRC /home/apollod4/public_html/apollo/php.ini

Apollo/api/application/config/constants.php

@@ -148,6 +148,7 @@ defined('CERTIFICATION') OR define('CERTIFICATION','T_CertificationMaster');
 defined('DEFAULTACTIVITY') OR define('DEFAULTACTIVITY','T_StatusMaster');
 defined('CERTIFICATION_MASTER') OR define('CERTIFICATION_MASTER','T_CertificationMaster');
 defined('DAYBOOKMASTER') OR define('DAYBOOKMASTER','T_DayBookMaster');
+defined('DAYBOOKMASTERONLINE') OR define('DAYBOOKMASTERONLINE','T_DayBookMaster_Online');
 defined('INCOMEOUTCOMEMASTER') OR define('INCOMEOUTCOMEMASTER','T_Income_Outcome_Master');
 defined('FEES_INSTALLMENT') OR define('FEES_INSTALLMENT','T_Fees_Installments');
 defined('CENTER') OR define('CENTER','T_CenterMaster');

Apollo/api/application/config/database.php

@@ -72,34 +72,34 @@ defined('BASEPATH') OR exit('No direct script access allowed');
 */
 $active_group = 'default';
 $query_builder = TRUE;
-
-$db['default'] = array(
-	'dsn'	=> '',
-	'hostname' => 'apollodec.com',
-            'username' => 'apollod4_DEV',
-            'password' => 'apollo1234',
-	        'database' => 'apollod4_ApolloDECDev',
-
-	        // 'username' => 'apollod4_SIT',
-	        // 'password' => 'apollosit1234',
-	        // 'database' => 'apollod4_ApolloDECNEWSIT',
-	   
-	     // 'username' => 'apollod4_PROD',
-	     // 'password' => 'approd!2017',
-	     // 'database' =>'apollod4_ApolloDECNEWPROD',
 	
-	'dbdriver' => 'mysqli',
-	'dbprefix' => '',
-	'pconnect' => FALSE,
-	'db_debug' => (ENVIRONMENT !== 'production'),
-	'cache_on' => FALSE,
-	'cachedir' => '',
-	'char_set' => 'utf8',
-	'dbcollat' => 'utf8_general_ci',
-	'swap_pre' => '',
-	'encrypt' => FALSE,
-	'compress' => FALSE,
-	'stricton' => FALSE,
-	'failover' => array(),
-	'save_queries' => TRUE
+$db['default'] = array(
+    'dsn'	=> '',
+    'hostname' => 'apollodec.com',
+    'username' => 'apollod4_SIT',
+	'password' => 'apollosit1234',
+    'database' => 'apollod4_SIT',
+    // 'database' => 'apollod4_ApolloDECNEWSIT',
+    
+    // 'username' => 'apollod4_DEV',
+    // 'password' => 'apollo1234',
+	// 'database' => 'apollod4_ApolloDECDev',
+
+    // 'username' => 'apollod4_PROD',
+    // 'password' => 'approd!2017',
+    // 'database' => 'apollod4_ApolloDECNEWPROD',
+    'dbdriver' => 'mysqli',
+    'dbprefix' => '',
+    'pconnect' => FALSE,
+    'db_debug' => (ENVIRONMENT !== 'production'),
+    'cache_on' => FALSE,
+    'cachedir' => '',
+    'char_set' => 'utf8',
+    'dbcollat' => 'utf8_general_ci',
+    'swap_pre' => '',
+    'encrypt' => FALSE,
+    'compress' => FALSE,
+    'stricton' => FALSE,
+    'failover' => array(),
+    'save_queries' => TRUE
 );

Apollo/api/application/config/routes.php

@@ -93,6 +93,8 @@ $route['getRecentLeadDetails'] = 'Call_Tracking_Controller/getRecentLeadDetails'
 $route['getRecentCloseDetails'] = 'Call_Tracking_Controller/getRecentCloseDetails';
 $route['getRecentPendingDetails'] = 'Call_Tracking_Controller/getRecentPendingDetails';
 $route['callAsImportantFlag'] = 'Call_Tracking_Controller/callAsImportantFlag';
+$route['getTrackingLeadDetails2'] = 'Call_Tracking_Controller/getTrackingLeadDetails2';
+$route['updateFollowupDetails2'] = 'Call_Tracking_Controller/updateFollowupDetails2';
 // auto call track
 $route['autoAddlead'] = 'Call_Tracking_Controller/autoAddlead';
 $route['autoTrackingDetails'] = 'Call_Tracking_Controller/autoTrackingDetails';
@@ -286,7 +288,9 @@ $route['getUniveCourseBratch'] = 'StatusUpdation_Controller/getUniveCourseBratch
 $route['getSearchAutoDetails'] = 'StatusUpdation_Controller/getSearchDetails';
 $route['getSemYearForCourse'] = 'StatusUpdation_Controller/getSemYearForCourse';
 $route['updateStudentMaterialStatus'] = 'StatusUpdation_Controller/updateStudentMaterialStatus';
+$route['getFinalSemCourier'] = 'StatusUpdation_Controller/getFinalSemCourier';
 $route['updateAnswerBookLetStatus'] = 'StatusUpdation_Controller/updateAnswerBookLetStatus';
+$route['updateSameAsFinalSemCourier'] = 'StatusUpdation_Controller/updateSameAsFinalSemCourier';
 $route['getCertificateList'] = 'StatusUpdation_Controller/getCertificateList';
 $route['updateCertificationStatus'] = 'StatusUpdation_Controller/updateCertificationStatus'; 
 $route['updateApplicationStatus'] = 'StatusUpdation_Controller/updateApplicationStatus';
@@ -295,8 +299,7 @@ $route['getPrevStatusDetailsForStu'] = 'StatusUpdation_Controller/getPrevStatusD
 
 /*get student view details*/
 $route['getStudentBasicInfo'] = 'StudentView_Controller/getStudentInfo';
-
-
+$route['updateStudentCommentDetails']= 'StudentView_Controller/updateStudentCommentDetails';
 
 
 /*get certificate Details*/  
@@ -309,6 +312,7 @@ $route['updateCertificateDetails'] = 'Certificate_Controller/updateCertificateDe
 $route['deleteDayBookDetails'] = 'DayBook_Controller/deleteDayBookDetails';
 $route['updateDayBookDetails'] = 'DayBook_Controller/updateDayBookDetails';
 $route['getDayBookDetails'] = 'DayBook_Controller/getDayBookDetails'; 
+$route['getDayBookOnlineDetails'] = 'DayBook_Controller/getDayBookOnlineDetails'; 
 $route['getDayBookApprovalDetails'] = 'DayBook_Controller/getDayBookApprovalDetails'; 
 $route['getIncomeExpenseTypeState'] = 'DayBook_Controller/getIncomeExpenseTypeState';
 $route['addDayBook'] = 'DayBook_Controller/adddaybook';
@@ -411,11 +415,14 @@ $route['promoteBatchInfomation'] = 'Reregister_Controller/promoteBatchInfomation
 $route['report_status'] = 'Report/status';
 $route['report_filters'] = 'Report/filters';
 $route['report_filter'] = 'Report/filter';
+$route['report_markcard_filter'] = 'Report/markcard_filter';
 $route['report_markcard'] = 'Report/markcard';
+$route['report_certificate_filter'] = 'Report/certificate_filter';
 $route['report_certificate'] = 'Report/certificate';
 $route['report_markcard_certificate'] = 'Report/mark_cert';
 $route['report_expense'] = 'Report/expense';
 $route['report_answer_booklet'] = 'Report/answer_booklet';
+$route['report_app_pending_filter'] = 'Report/app_pending_filter';
 $route['report_app_pending'] = 'Report/app_pending';
 $route['report_app_pending_old'] = 'Report/app_pending_old';
 $route['report_doc_pending'] = 'Report/doc_pending';
@@ -456,5 +463,6 @@ $route['getUnmatchedFormIdFeesDetails'] = 'Receive_Enrolment_Fees_Univ_Controlle
 $route['addToAccountStateList'] = 'Receive_Enrolment_Fees_Univ_Controller/addToAccountStateList';
 $route['addUniversityPaymentDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/addUniversityPaymentDetails';
 $route['updateUniversityPaymentDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/updateUniversityPaymentDetails';
+$route['testsmsandmailflow'] = 'Student_Controller/testsmsandmailflow';
 
 

Apollo/api/application/controllers/Call_Tracking_Controller.php

@@ -132,7 +132,8 @@ class Call_Tracking_Controller extends REST_Controller {
 
 
         $leadDetails = $this->Calltracking_model->addleadDetails($AssignedTo,$lead_details,$tracking_details,$tracking_followup_details,$message);
-		// Check if the users data store contains users (in case the database result returns NULL)
+        // Check if the users data store contains users (in case the database result returns NULL)
+        
         if ($leadDetails)
         {
             $leadDetails['status'] = REST_Controller::HTTP_OK;
@@ -230,6 +231,10 @@ class Call_Tracking_Controller extends REST_Controller {
 
 
         $updateDetails = $this->Calltracking_model->updateFollowupDetails($update_followup_details,$followup_details);// Check if the users data store contains users (in case the database result returns NULL)
+//         echo "com";
+// print_r($followup_details);
+// print_r($update_followup_details);
+// exit();
         if ($updateDetails)
         {
             $updateDetails['status'] = REST_Controller::HTTP_OK;
@@ -580,11 +585,77 @@ public function getstaffCountDetails_post()
          }
 }
 
-
-
 /*
 * End of call tracking 
 */
+public function getTrackingLeadDetails2_post()
+{
+        $activity = $this->post('activity');
+        $requestedBy = $this->post('requestedBy');
+        $mobileNumber = '';
+        $branchID = $this->post('branchID');
+        $loginType = $this->post('userType');
+        $getLeadDetails = $this->Calltracking_model->getLeadDetails($requestedBy,$mobileNumber,$branchID,$loginType);
+        $getLeadDetails['statusDetails'] = $this->Calltracking_model->getStatus($activity);
+        if ($getLeadDetails)
+        {
+            $getLeadDetails['status'] = REST_Controller::HTTP_OK;
+            // Set the response and exit
+            $this->response($getLeadDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
+        }
+        else
+        {
+            // Set the response and exit
+            $this->response([
+                'message' => 'No records found!',
+                'status' => REST_Controller::HTTP_NOT_FOUND
+            ], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
+        }
 
 
+}
+public function updateFollowupDetails2_post()
+{
+    $now = new DateTime();
+    $now->setTimezone(new DateTimezone('Asia/Kolkata'));
+    $student = $this->post('student');
+
+        foreach($student as $index =>$student){
+                
+                if($this->post('status') == '' || $this->post('status') == NULL){
+                    $status = $student['StatusCode'];
+                }else{
+                    $status = $this->post('status');
+                }
+                $update_followup_details['TrackingID'] = $student['TrackingID'];
+                $update_followup_details['UpdatedBy'] = $this->post('createdBy');
+                $update_followup_details['StatusCode'] = $status;
+                $update_followup_details['AssignedTo'] = $this->post('assignedTo');
+                $update_followup_details['UpdatedOn'] = $now->format('Y-m-d H:i:s');
+                $update_followup_details['CreatedBranch'] = $this->post('branchId');
+                
+                // followup details for insert
+                $followup_details['TrackingID'] = $student['TrackingID'];
+                $followup_details['FollowupOn'] = $this->post('date');
+                $followup_details['CreatedBy'] = $this->post('createdBy');
+                $followup_details['FollowupComments'] = $this->post('comments');
+                $followup_details['CreatedOn'] = $now->format('Y-m-d H:i:s');
+                $followup_details['StatusName'] = $status;
+                $followup_details['AssignedStaff'] = $this->post('assignedTo');
+                $leadDetails['leadDetails'] = $this->Calltracking_model->updateFollowupDetails2($update_followup_details,$followup_details);
+        }
+
+        if (sizeof($leadDetails)>0)
+        {
+                $leadDetails['status'] = REST_Controller::HTTP_OK;
+                // Set the response and exit
+                $this->response($leadDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
+        }
+        else {
+                // Set the response and exit
+                $this->response(['message' => 'Something went wrong.please try again!','status' => REST_Controller::HTTP_NOT_FOUND], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
+        }
+
+    }
+
 }

Apollo/api/application/controllers/Dashboard_Controller.php

@@ -304,7 +304,6 @@ class Dashboard_Controller extends REST_Controller {
         $requestedBy = $this->post('requestedBy');
         $logintype = $this->post('requestedDept');
         $leadMonth = $this->dashboard_model->leadMonth($branchId,$requestedBy,$logintype);
-		
         if ($leadMonth) {
             $leadMonth['status'] = REST_Controller::HTTP_OK;
             // Set the response and exit

Apollo/api/application/controllers/DayBook_Controller.php

@@ -152,6 +152,27 @@ class DayBook_Controller extends REST_Controller {
 
     }
 
+    public function getDayBookOnlineDetails_post() {
+        $reqData = $this->post('data');
+        $reqDataBy = $this->post('localReqDetails');
+        $getDayBookDetails = $this->daybook_model->get_Daybookonline_Details_List($reqData, $reqDataBy);// Check if the employee exist
+            if ($getDayBookDetails)
+            {
+                $getDayBookDetails['status'] = REST_Controller::HTTP_OK;
+                // Set the response and exit
+                $this->response($getDayBookDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
+            }
+            else
+            {
+                // Set the response and exit
+                $this->response([
+                    'message' => 'No list were found',
+                    'status' => REST_Controller::HTTP_NOT_FOUND
+                ], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
+        }
+
+    }
+
 
 
 
@@ -262,7 +283,7 @@ public function getDayBookfilterDetails_post()
 		$reason = $this->post('reason');
         $reqbyData = $this->post('requestDetails');
         // print_r($reqbyData);exit();
-        $deletedayBookFeePayableDetails = $this->daybook_model->delete_dayBookFeePayableDetails($reqData,$reason);// Check if the employee exist
+        $deletedayBookFeePayableDetails = $this->daybook_model->delete_dayBookFeePayableDetails($reqData,$reason,$reqbyData['localUserID']);// Check if the employee exist
             if ($deletedayBookFeePayableDetails)
             {
                 $deletedayBookFeePayableDetails['status'] = REST_Controller::HTTP_OK;
@@ -603,10 +624,7 @@ public function updateNonOperationalDetails_post() {
         // echo $from.'from';
         // echo $to.'to';
 
-
-        //echo $br;die();
         $getStatus = $this->daybook_model->Income_expense($from,$to,$br);
-        //print_r($getStatus);
         if ($getStatus)
         {
             $getStatus['status'] = REST_Controller::HTTP_OK;
@@ -659,10 +677,9 @@ public function updateNonOperationalDetails_post() {
         $from= $this->post('from');
         $to = $this->post('to');
         $branch = $this->post('branch');
-         $getexceldet = $this->daybook_model->GetPLexcelDetails($from,$to,$branch);
+        $getexceldet = $this->daybook_model->GetPLexcelDetails($from,$to,$branch);
 
-
-        if($getexceldet)
+        if(!empty($getexceldet))
         {
 
           $getexceldet['status'] = REST_Controller::HTTP_OK;

Apollo/api/application/controllers/Employee_Controller.php

@@ -175,9 +175,6 @@ class Employee_Controller extends REST_Controller {
     // add employee without image
     public function addEmployee_post() {
         $data = $this->post('data');
-
-
-        //print_r($data);die();
        
         $createdBy = $this->post('createdBy');
 

Apollo/api/application/controllers/Fees_Status_Controller.php

@@ -62,6 +62,7 @@ class Fees_Status_Controller extends REST_Controller {
         $search['CourseID'] = $this->post('course');
         $search['requestedDept'] = $this->post('requestedDept');
         $search['requestedBranch'] = $this->post('branchId');
+        $search['BatchCode'] = $this->post('batch');
         $getStudentDetails = $this->Fees_model->getStudentList($search);
         if ($getStudentDetails)
         {
@@ -150,7 +151,9 @@ class Fees_Status_Controller extends REST_Controller {
         $detailsChild['Installment'] = $this->post('existPaidCount');
         $smsDetails['FeesName'] = $this->post('feesName');
         $smsDetails['CurrentBalance'] = $this->post('currentBalance');
+
         $updateDetails = $this->Fees_model->updateFees($detailsChild,$this->post('courseID'),$this->post('feesName'),$smsDetails);// Check if the users data store contains users (in case the database result returns NULL)
+        
         if ($updateDetails)
         {
             $updateDetails['status'] = REST_Controller::HTTP_OK;
@@ -211,6 +214,7 @@ class Fees_Status_Controller extends REST_Controller {
         $student['CourseID'] = $this->post('courseID');
         $student['StudentID'] = $this->post('studentID');
         $student['BranchCode'] = $this->post('branchCode');
+        // $student['BatchCode'] = $this->post('batchCode');
         $getStudentFeesDetails = $this->Fees_model->getFeesStructureAssign($student);
         if ($getStudentFeesDetails)
         {
@@ -235,6 +239,9 @@ class Fees_Status_Controller extends REST_Controller {
      * */
     public function setFeesForStudent_post()
     {
+        // echo "I am Here Setfees for Students";
+        // print_r($this->post());
+        // exit;
         $now = new DateTime();
         $now->setTimezone(new DateTimezone('Asia/Kolkata'));
         $details['StudentID'] = $this->post('studID');
@@ -253,7 +260,6 @@ class Fees_Status_Controller extends REST_Controller {
         $details['BranchCode'] = $this->post('branchCode');
         $details['Comments'] = $this->post('comments');
         $jsonInstallmenData = $this->post('installmentItems');
-        //print_r($details);
         $updateDetails = $this->Fees_model->setFees($details,$jsonInstallmenData);// Check if the users data store contains users (in case the database result returns NULL)
        
       
@@ -306,6 +312,9 @@ class Fees_Status_Controller extends REST_Controller {
      * */
     public function deleteSetFeesDetails_post(){
         $details['FeesID'] = $this->post('feesAssignID');
+
+        // print_r($this->post('requestedtBy'));
+        // exit();
         $deleteSetFeesDetails = $this->Fees_model->deleteSetFees($details);
         if ($deleteSetFeesDetails)
         {

Apollo/api/application/controllers/Report.php

@@ -43,7 +43,9 @@ class Report extends REST_Controller {
         $bat = $this->post('batch');
         $br = $this->post('branch');
         $u = $this->post('university');
-        $getStatus = $this->report_model->status($bat,$br,$u);
+        $s = $this->post('status');
+        // print_r($this->post());
+        $getStatus = $this->report_model->status($bat,$br,$u,$s);
         //print_r($getStatus);
         if ($getStatus)
         {
@@ -61,13 +63,49 @@ class Report extends REST_Controller {
         }
 
 
+    }
+    public function markcard_filter_post()
+    {
+        $br = $this->post('branch');
+        // $userID = $this->post('userID');
+        $getStatus = $this->report_model->getUniversity2($br);
+        
+        if ($getStatus)
+        {   
+            $result = $this->report_model->getDefaultActivity('C001',$br);
+            
+            if(!empty($result)){$getStatus['markcardstatus'] = $result;
+                $cnt = count($getStatus['markcardstatus']);    
+                $getStatus['markcardstatus'][$cnt+1]["ListCode"] = "all";
+                $getStatus['markcardstatus'][$cnt+1]["ListName"] = "ALL";
+                $getStatus['markcardstatus'][$cnt+1]["StudentActivityCode"]= 'C001';    
+            }
+            else{ $getStatus['markcardstatus'] = array();}
+            $getStatus['status'] = REST_Controller::HTTP_OK;
+            // Set the response and exit
+            $this->response($getStatus, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
+        }
+        else
+        {
+            // Set the response and exit
+            $this->response([
+                'message' => 'No records found!',
+                'status' => REST_Controller::HTTP_NOT_FOUND
+            ], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
+        }
+
+
     }
     public function markcard_post()
     {
         $bat = $this->post('batch');
         $br = $this->post('branch');
         $u = $this->post('university');
-        $getStatus = $this->report_model->markcard($bat,$br,$u);
+        $sts = $this->post('status');
+        $fd = $this->post('from_date');
+        $td = $this->post('to_date');
+
+        $getStatus = $this->report_model->markcard($bat,$br,$u,$sts,$fd,$td);
         //print_r($getStatus);
         if ($getStatus)
         {
@@ -85,16 +123,48 @@ class Report extends REST_Controller {
         }
 
 
+    }
+
+    public function certificate_filter_post()
+    {
+        $br = $this->post('branch');
+        $getStatus = $this->report_model->getUniversity($br);
+        
+        if ($getStatus)
+        {   
+            $result = $this->report_model->getDefaultActivity('A001',$br);
+            if(!empty($result)){$getStatus['certificatestatus'] = $result;
+                $cnt = count($getStatus['certificatestatus']);    
+                $getStatus['certificatestatus'][$cnt+1]["StudentActivityCode"]= 'A001'; 
+                $getStatus['certificatestatus'][$cnt+1]["ListCode"] = "all";
+                $getStatus['certificatestatus'][$cnt+1]["ListName"] = "ALL";
+            }
+            else{ $getStatus['certificatestatus'] = array();}
+            $getStatus['status'] = REST_Controller::HTTP_OK;
+            // Set the response and exit
+            $this->response($getStatus, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
+        }
+        else
+        {
+            // Set the response and exit
+            $this->response([
+                'message' => 'No records found!',
+                'status' => REST_Controller::HTTP_NOT_FOUND
+            ], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
+        }
+
+
     }
     public function certificate_post()
     {
         $bat = $this->post('batch');
         $br = $this->post('branch');
         $u = $this->post('university');
-		 $from = $this->post('from');
+        $st = $this->post('status');
+		$from = $this->post('from');
         $to = $this->post('to');
-        $getStatus = $this->report_model->certificate_status($bat,$br,$u,$from,$to);
-        // print_r($getStatus);
+        $getStatus = $this->report_model->certificate_status($bat,$br,$u,$from,$to,$st);
+        //print_r($getStatus);
         if ($getStatus)
         {
             $getStatus['status'] = REST_Controller::HTTP_OK;
@@ -168,8 +238,9 @@ class Report extends REST_Controller {
         $bat = $this->post('batch');
         $br = $this->post('branch');
         $u = $this->post('university');
+        $s = $this->post('status');
        
-        $getStatus = $this->report_model->answer_booklet($bat,$br,$u);
+        $getStatus = $this->report_model->answer_booklet($bat,$br,$u,$s);
         //print_r($getStatus);
         if ($getStatus)
         {
@@ -187,15 +258,58 @@ class Report extends REST_Controller {
         }
 
 
+    }
+    public function app_pending_filter_post(){
+        $br = $this->post('branch');
+        $getStatus = $this->report_model->getUniversity($br);
+        
+        if ($getStatus)
+        {   $cnt = count($getStatus['university']);
+            if($cnt>=0){
+            $getStatus['university'][$cnt]["universityID"] = "all";
+            $getStatus['university'][$cnt]["universityName"] = "ALL";
+            $getStatus['university'][$cnt]["batchDetails"]= [];}
+            
+            $getStatus['rollnostatus'][0]["ListCode"] = "pending";
+            $getStatus['rollnostatus'][0]["ListName"] = "PENDING";
+            $getStatus['rollnostatus'][0]["BranchCode"]= $br;
+            $getStatus['rollnostatus'][1]["ListCode"] = "received";
+            $getStatus['rollnostatus'][1]["ListName"] = "RECEIVED";
+            $getStatus['rollnostatus'][1]["BranchCode"]= $br;
+            $getStatus['rollnostatus'][2]["ListCode"] = "all";
+            $getStatus['rollnostatus'][2]["ListName"] = "ALL";
+            $getStatus['rollnostatus'][2]["BranchCode"]= $br;
+
+            $getStatus['status'] = REST_Controller::HTTP_OK;
+            // Set the response and exit
+            $this->response($getStatus, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
+        }
+        else
+        {
+            // Set the response and exit
+            $this->response([
+                'message' => 'No records found!',
+                'status' => REST_Controller::HTTP_NOT_FOUND
+            ], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
+        }
     }
     public function app_pending_post()
     {
         $bat = $this->post('batch');
         $br = $this->post('branch');
         $u = $this->post('university');
-       
-        $getStatus = $this->report_model->app_pending($bat,$br,$u);
-        //print_r($getStatus);
+        $st = $this->post('status');
+		$from = $this->post('from');
+        $to = $this->post('to');
+        $updateddate = $this->post('updateddate');
+        $getStatus = $this->report_model->app_pending($bat,$br,$u,$st,$from,$to,$updateddate);
+        if($getStatus['app_pendingList']){
+            $count = count($getStatus['app_pending_data']);
+            for ($i = 0;$i < $count;$i++) {
+                $getStatus['app_pending_data'][$i]->FormType = implode('-', array_map('ucfirst', explode('-', $getStatus['app_pending_data'][$i]->FormType)));
+            }
+        }
+
         if ($getStatus)
         {
             $getStatus['status'] = REST_Controller::HTTP_OK;
@@ -370,11 +484,24 @@ class Report extends REST_Controller {
     public function filters_post()
     {
         $br = $this->post('branch');
-		$getStatus = $this->report_model->getUniversity($br);
-        //print_r($getStatus);
+        $activityCode = $this->post('activity');
+        $getStatus = $this->report_model->getUniversity($br);
+        // print_r($getStatus);
         if ($getStatus)
         {
             $getStatus['status'] = REST_Controller::HTTP_OK;
+            if($activityCode != "" ){ 
+            // if($activityCode == "application"){}else{}
+                $details = $this->report_model->getDefaultActivity($activityCode,$br);
+                if(!empty($details)){$getStatus['statusList'] = $details;
+                    $cnt = count($getStatus['statusList']);    
+                    $getStatus['statusList'][$cnt]["StudentActivityCode"]= $activityCode;
+                    $getStatus['statusList'][$cnt]["ListCode"] = "all";
+                    $getStatus['statusList'][$cnt]["ListName"] = "ALL";
+                }
+                else{ $getStatus['statusList'] = array();} 
+            }
+            else{ $getStatus['statusList'] = array(); }
             // Set the response and exit
             $this->response($getStatus, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
         }

Apollo/api/application/controllers/Reregister_Controller.php

@@ -59,7 +59,7 @@ class Reregister_Controller extends REST_Controller {
 		$branchId = $this->post('branchId');
 		
 		$res =  $this->Reregister_model->getStudentListForPromoteBatchmodal($UID,$batchCode,$branchId,$batchDate);
-		// print_r($res['studentList']);die();
+		//print_r($res['studentList']);die();
 		if(count($res['finalStudentList']) > 0)
 		{
 			$data['status'] = REST_Controller::HTTP_OK;

Apollo/api/application/controllers/SessionMaster_Controller.php

@@ -99,8 +99,6 @@ class SessionMaster_Controller extends REST_Controller {
         $details['UpdatedBy'] = $this->post('updatedBy');
         $details['UpdatedOn'] = $now->format("Y-m-d H:i:s");
         $details['BranchCode'] = $this->post('branchCode');
-
-       // echo $details['BranchCode'];die();
         $updateDetails = $this->sessionM_model->updateSession($details,$universityDetails);// Check if the users data store contains users (in case the database result returns NULL)
 
         if ($updateDetails)

Apollo/api/application/controllers/SessionMater_Controller.php

@@ -0,0 +1,123 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: karthi
+ * Date: 2/7/18
+ * Time: 10:37 AM
+ */
+class SessionMater_Controller extends REST_Controller {
+
+    function __construct()
+    {
+        // Construct the parent class
+        parent::__construct();
+
+        // Configure limits on our controller methods
+        // Ensure you have created the 'limits' table and enabled 'limits' within application/config/rest.php
+        $this->methods['addSessionMaterDetails_post']['limit'] = 100;  // 50 requests per hour per user/key
+        $this->methods['getSessionMaterDetails_post']['limit'] = 500; // 50 requests per hour per user/key
+        $this->methods['updateSessionMaterDetails_post']['limit'] = 500;// 500 requests per hour per user/key
+        // load the model
+        $this->load->model('SeesionMaster_model', 'sessionM_model');
+
+    }
+
+    /*
+     * This method used to add session master details
+     * created by kms
+     * */
+
+    public function addSessionMaterDetails_post()
+    {
+        $now = new DateTime();
+        $now->setTimezone(new DateTimezone('Asia/Kolkata'));
+        $details['SessionName'] = $this->post('sessionName');
+        $details['SessionDate'] = $this->post('sessionDate');
+        $details['CreatedBy'] = $this->post('createdBy');
+        $details['IsActive'] = $this->post('status');
+        $details['BranchCode'] = $this->post('branchCode');
+        $details['CreatedOn'] = $now->format('Y-m-d H:i:s');
+        $university['UniversityID'] = $this->post('universityName');
+
+        $sessionDetails = $this->sessionM_model->addSession($details,$university);// Check if the users data store contains users (in case the database result returns NULL)
+        if ($sessionDetails)
+        {
+            $sessionDetails['status'] = REST_Controller::HTTP_OK;
+            // Set the response and exit
+            $this->response($sessionDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
+        }
+        else
+        {
+            // Set the response and exit
+            $this->response([
+                'message' => 'Something went wrong.please try again!',
+                'status' => REST_Controller::HTTP_NOT_FOUND
+            ], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
+        }
+
+
+    }
+    /*
+     * get session master details
+     * created by kms
+     * */
+    public function getSessionMaterDetails_post()
+    {
+        $requestedBy = $this->post('requestedBy');
+        $branchCode = $this->post('branchCode');
+        $getSession = $this->sessionM_model->getSession($requestedBy,$branchCode);
+        if ($getSession)
+        {
+            $getSession['status'] = REST_Controller::HTTP_OK;
+            // Set the response and exit
+            $this->response($getSession, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
+        }
+        else
+        {
+            // Set the response and exit
+            $this->response([
+                'message' => 'No records found!',
+                'status' => REST_Controller::HTTP_NOT_FOUND
+            ], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
+        }
+
+
+    }
+    /*
+     * update the session master details
+     * created by kms
+     * */
+    public function updateSessionMaterDetails_post()
+    {
+        $now = new DateTime();
+        $now->setTimezone(new DateTimezone('Asia/Kolkata'));
+        $details['SessionID'] = $this->post('sessionID');
+        $details['SessionDate'] = $this->post('sessionDate');
+        $details['SessionName'] = $this->post('sessionName');
+        $details['IsActive'] = $this->post('status');
+        $universityDetails['University'] = $this->post('university');
+        $details['UpdatedBy'] = $this->post('updatedBy');
+        $details['UpdatedOn'] = $now->format("Y-m-d H:i:s");
+        $details['BranchCode'] = $this->post('branchCode');
+        $updateDetails = $this->sessionM_model->updateSession($details,$universityDetails);// Check if the users data store contains users (in case the database result returns NULL)
+
+        if ($updateDetails)
+        {
+            $updateDetails['status'] = REST_Controller::HTTP_OK;
+            // Set the response and exit
+            $this->response($updateDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
+        }
+        else
+        {
+            // Set the response and exit
+            $this->response([
+                'message' => 'Something went wrong.please try again!',
+                'status' => REST_Controller::HTTP_NOT_FOUND
+            ], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
+        }
+
+
+    }
+
+
+}

Apollo/api/application/controllers/StatusUpdation_Controller.php

@@ -84,6 +84,24 @@ class StatusUpdation_Controller extends REST_Controller {
         }
     }
 
+// get final sem courier
+    public function getFinalSemCourier_post() {
+        $reqData = $this->post('data');
+        $stuFor = $this->post('stuFor');
+        $reqBranch = $this->post('branchID');
+        $getSemYeatList = $this->statusupdation_model->getFinalSemAnswerBookletStatus($reqData, $stuFor, $reqBranch); // Check if the course exist for this student
+        if ($getSemYeatList) {
+            $getSemYeatList['status'] = REST_Controller::HTTP_OK;
+            // Set the response and exit
+            $this->response($getSemYeatList, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
+            
+        } else {
+            // Set the response and exit
+            $this->response(['message' => 'No list were found', 'status' => REST_Controller::HTTP_NOT_FOUND], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
+            
+        }
+    }
+    
     // update the study material Status
     public function updateStudentMaterialStatus_post() {
         $reqData = $this->post('data');
@@ -112,11 +130,15 @@ class StatusUpdation_Controller extends REST_Controller {
         $reqData = $this->post('data');
         $reqDetails = $this->post('requestDetails');
         $time = date('Y-m-d H:i:s');
+        // $scope.text.replace(/\n\r?/g, '<br />');
         $dateTime = $time;
         $count = count($reqData);
         for ($i = 0;$i < $count;$i++) {
-            $data[] = array('StudentID' => $reqData[$i]['StudentID'], 'CourseID' => $reqData[$i]['CourseID'], 'BranchCode' => $reqData[$i]['BranchCode'], 'ListCode' => $reqData[$i]['ListCode'], 'AnsDate' => $reqData[$i]['SDate'], 'Coursedetail' => $reqData[$i]['Coursedetail'], 'Comments' => $reqData[$i]['Comments'], 'Sem' => $reqData[$i]['Sem'], 'CreatedBy' => $reqDetails['localUserID'], 'CreatedOn' => $dateTime,);
+            $data[] = array('StudentID' => $reqData[$i]['StudentID'], 'CourseID' => $reqData[$i]['CourseID'], 'BranchCode' => $reqData[$i]['BranchCode'], 'ListCode' => $reqData[$i]['ListCode'], 'AnsDate' => $reqData[$i]['SDate'], 'Coursedetail' => $reqData[$i]['Coursedetail'], 'Comments' => $reqData[$i]['Comments'],'CourierDetails' => $reqData[$i]['CourierDetails'], 'Sem' => $reqData[$i]['Sem'], 'CreatedBy' => $reqDetails['localUserID'], 'CreatedOn' => $dateTime,);
         }
+
+        // print_r($data);
+        // die();
         $updateAnswerBookletStat = $this->statusupdation_model->update_answerbooklet($data, $reqDetails); // Check if the employee exist
         if ($updateAnswerBookletStat) {
             $updateAnswerBookletStat['status'] = REST_Controller::HTTP_OK;
@@ -175,13 +197,17 @@ class StatusUpdation_Controller extends REST_Controller {
 
     // update application status
     public function updateApplicationStatus_post() {
+        // echo "A Look Here";
+        
         $reqData = $this->post('data');
         $reqDetails = $this->post('requestDetails');
+        // print_r($reqData);
+        // die();
         $time = date('Y-m-d H:i:s');
         $dateTime = $time;
         $count = count($reqData);
         for ($i = 0;$i < $count;$i++) {
-            $data[] = array('StudentID' => $reqData[$i]['StudentID'], 'CourseID' => $reqData[$i]['CourseID'], 'BranchCode' => $reqData[$i]['BranchCode'], 'ListCode' => $reqData[$i]['ListCode'], 'AppDate' => $reqData[$i]['SDate'], 'Comments' => $reqData[$i]['Comments'], 'CreatedBy' => $reqDetails['localUserID'], 'CreatedOn' => $dateTime, 'CertificationType' => $reqData[$i]['CertificateType'], 'CertificationNo' => $reqData[$i]['CertificateNumber'],);
+            $data[] = array('StudentID' => $reqData[$i]['StudentID'], 'CourseID' => $reqData[$i]['CourseID'], 'BranchCode' => $reqData[$i]['BranchCode'], 'ListCode' => $reqData[$i]['ListCode'], 'AppDate' => $reqData[$i]['SDate'], 'Comments' => $reqData[$i]['Comments'], 'CreatedBy' => $reqDetails['localUserID'], 'CreatedOn' => $dateTime, 'CertificationType' => $reqData[$i]['CertificateType'], 'CertificationNo' => $reqData[$i]['CertificateNumber'],'CourierDetails'=>$reqData[$i]['CourierDetails']);
         }
         $updateApplicationStatus = $this->statusupdation_model->update_applicationStatus($data, $reqDetails); // Check if the employee exist
         if ($updateApplicationStatus) {
@@ -218,10 +244,6 @@ class StatusUpdation_Controller extends REST_Controller {
         $reqData = $this->post('data');
         $reqDetailsFor = $this->post('statusFor');
         $reqDetails = $this->post('getDetailsFor');
-
-
-        //print_r($reqDetails);die();
-
         $getPrevStatusList = $this->statusupdation_model->get_prev_status_list($reqDetailsFor, $reqDetails); // Check if the employee exist
         if ($getPrevStatusList) {
             $getPrevStatusList['status'] = REST_Controller::HTTP_OK;

Apollo/api/application/controllers/StudentView_Controller.php

@@ -32,6 +32,7 @@ class StudentView_Controller extends REST_Controller
         // Ensure you have created the 'limits' table and enabled 'limits' within application/config/rest.php
 
         $this->methods['getStudentInfo_post']['limit'] = 500;
+        $this->methods['updateStudentCommentDetails_post']['limit'] = 500;
         // load the employee model
         $this->load->model('Studentview_model', 'studentview_model');
 
@@ -61,5 +62,25 @@ class StudentView_Controller extends REST_Controller
             ], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
         }
 
+    }
+    public function updateStudentCommentDetails_post(){
+        
+        
+        $id = $this->post('studentID');
+        $comment = $this->post('comments');
+        $studentListDetails = $this->studentview_model->updateStudentComment($id,$comment);
+        if ($studentListDetails) {
+            $studentListDetails['status'] = REST_Controller::HTTP_OK;
+            // // Set the response and exit
+            $this->response($studentListDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
+        } else {
+            // Set the response and exit
+            $this->response([
+                'message' => 'No users were found',
+                'status' => REST_Controller::HTTP_NOT_FOUND
+            ], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
+        }
+
+        
     }
 }

Apollo/api/application/controllers/Student_Controller.php

@@ -120,6 +120,7 @@ class Student_Controller extends REST_Controller {
     }
    public function getStudentTrackingDetails_post()
 	{
+
 	$universityid=$this->post('universityid');
 	$courseid=$this->post('courseid');
 	$MobileNumber = $this->post('MobileNumber');
@@ -127,6 +128,7 @@ class Student_Controller extends REST_Controller {
 	$userType =$this->post('userType');
 	$createdBy =$this->post('createdBy');
         $trackingDetails = $this->student_model->get_student_tracking_details($universityid,$courseid,$MobileNumber,$loginBranch,$userType,$createdBy); // Check if the employee exist
+        
         if ($trackingDetails) {
           
 			$trackingDetailsData['trackingdata']=$trackingDetails;
@@ -136,7 +138,7 @@ class Student_Controller extends REST_Controller {
             $this->response($trackingDetailsData, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
             
         } else {
-           
+            // $this->response($trackingDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
 			
             
         }	
@@ -175,6 +177,8 @@ class Student_Controller extends REST_Controller {
     
     public function updateStudentCourseDetail_post() {
         $data = $this->post('data');
+       // error_log("data================".implode(',', $data));
+        // exit;
         $updatedBy = $this->post('updatedBy');
         $id = $data['ID'];
         $req['StudentID'] = $data['StudentID'];
@@ -182,15 +186,20 @@ class Student_Controller extends REST_Controller {
         $req['CourseID'] = $data['CourseID'];
         $req['SessionID'] = $data['SessionID'];
         $req['DOJ'] = $data['DOJ'];
-        $req['IsActive'] = $data['IsActive'];
         $req['BranchID'] = $data['BranchID'];
         $req['EnrollmentID'] = $data['EnrollmentID'];
         $req['Specilization1'] = $data['Specilization1'];
         $req['Specilization2'] = $data['Specilization2'];
-        $req['DeactiveComments'] = $data['IsActive'] == 1 ? '' : $data['DeactiveComments'];
         $req['UpdatedBy'] = $updatedBy;
         $date = date('Y-m-d H:i:s');
         $req['UpdatedOn'] = $date;
+        
+        // below fields we need to update only for admins
+        if($this->post('updatedUserType') == SUPER_ADMIN || $this->post('updatedUserType') == ADMIN ){
+            $req['IsActive'] = $data['IsActive'];
+            $req['Status'] = $data['Status'];
+            $req['DeactiveComments'] = $data['IsActive'] == 1 ? '' : $data['DeactiveComments'];
+        }
         $studentCourseUpdate = $this->student_model->update_student_course($req, $id);
         if ($studentCourseUpdate) {
             $studentCourseUpdate['status'] = REST_Controller::HTTP_OK;
@@ -701,8 +710,6 @@ class Student_Controller extends REST_Controller {
 
     // add new course for student
     public function insertStudentCourse_post() {
-
-
         $addStudent = $this->post('addStudent');
         $coursedata = $this->post('coursedata');
         $createdBy = $this->post('createdBy');
@@ -735,9 +742,6 @@ class Student_Controller extends REST_Controller {
     }
 
     public function insertStudentImg_post() {
-
-
-        
         $imagename = $_FILES['idStuProof']['name'];
         $size = $_FILES['idStuProof']['size'];
         $imageSource = $_FILES['idStuProof']['tmp_name'];
@@ -869,7 +873,19 @@ class Student_Controller extends REST_Controller {
             
         }
     }
-
+public function testsmsandmailflow_get(){
+    $studentAdd = $this->student_model->testsmsandmailflow();
+    if ($studentAdd) {
+        $studentAdd['status'] = REST_Controller::HTTP_OK;
+        // Set the response and exit
+        $this->response($studentAdd, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
+        
+    } else {
+        // Set the response and exit
+        $this->response(['message' => 'No users were found', 'status' => REST_Controller::HTTP_NOT_FOUND], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
+        
+    }
+}
     public function getEmployeeDetailsBranch_post() {
             $data = $this->post('data');
             $loginUserId = $data['localUserID'];

Apollo/api/application/models/Broadcast_model.php

@@ -127,10 +127,9 @@ class Broadcast_model extends CI_Model {
     
     public function getSMSGroupDetails($reqData ,$reqBy) {
         $localBranch = $reqBy['localBranchID'];
-        $querys = "SELECT t1.*, t2.DeliveredStatus, t2.DeliveredOn FROM T_BroadcastStatus as t1 
+        $querys = "SELECT t1.id, t1.MsgId, t1.MsgBody, t1.Status, t1.MobileNumber, t1.CreatedBy, t1.CreatedOn, t1.MsgGroup, t1.BranchCode, t2.DeliveredStatus, t2.DeliveredOn FROM T_BroadcastStatus as t1 
             LEFT JOIN T_BroadcastDeliveryCron as t2 ON t2.MsgId = t1.MsgId 
             WHERE t1.MsgGroup = '$reqData' AND t1.BranchCode='$localBranch' ORDER BY t1.CreatedOn DESC";
-    //    echo $querys;exit();
 
         $smsSendGroupDetails = $this->db->query($querys);
         $smsSendGroupDetailsList = $smsSendGroupDetails->result();
@@ -267,14 +266,27 @@ class Broadcast_model extends CI_Model {
                 continue;
             }
         }
-        $this->db->insert_batch('T_BroadcastStatus', $data);
-        if ($this->db->affected_rows() >= 1) {
-            $result['msgStatus'] = true;
-            $result['message'] = "Successfully Messages Sent!!";
-        } else {
+        $this->db->db_debug = false;
+        $res = $this->db->insert_batch('T_BroadcastStatus', $data);
+    
+        if(!$res)
+        {
+            $error = $this->db->error();
+            // 
             $result['msgStatus'] = false;
+            $result['error'] = $error;
             $result['message'] = "error!!";
         }
+        else
+        {
+                if ($this->db->affected_rows() >= 1) {
+                    $result['msgStatus'] = true;
+                    $result['message'] = "Successfully Messages Sent!!";
+                } else {
+                    $result['msgStatus'] = false;
+                    $result['message'] = "error!!";
+                }
+        }
         // print_r($data);
         // exit();
         // $msgID = $arrss[1];

Apollo/api/application/models/Calltracking_model.php

@@ -417,7 +417,9 @@ class Calltracking_model extends CI_Model {
 
                 // $msg='Dear '.$name.', Thank you for enquiring with Apollo Distance Education College for the course '.$CourseName.'. Pls feel free to call us for more information at '.$Sname.'- '.$SMobileno.'';
 
-$msg='Dear '.$name.', Thank you for enquiring with Apollo Distance Education College for the course '.$CourseName.'. Pls feel free to call '.$Sname.' for more information at '.$SMobileno.'.';
+$msg='Dear '.$name.', Thank you for enquiring with Apollo Distance Education College for the course '.$CourseName.'. Pls feel free to call '.$Sname.' for more information at '.$SMobileno.'. APOLLO DEC';
+
+
 //echo $msg; 
                 $messa = urlencode($msg);
 				//echo  $messa ;
@@ -455,8 +457,14 @@ $msg='Dear '.$name.', Thank you for enquiring with Apollo Distance Education Col
 
 
              $this->mailsend($Email, $msg);
-
-             $this->db->insert_batch('T_BroadcastStatus', $data);
+            $this->db->db_debug = false;
+            $res = $this->db->insert_batch('T_BroadcastStatus', $data);
+                if(!$res){
+                    $error = $this->db->error();
+                    $result['msgStatus'] = false;
+                    $result['error'] = $error;
+                    $result['message'] = "error!!";
+                }
              
           }
 
@@ -610,7 +618,7 @@ $msg='Dear '.$name.', Thank you for enquiring with Apollo Distance Education Col
 
 
 
-        $this->db->select('LTF.FollowupOn,LD.LeadID,LD.LeadName,LD.MobileNumber,LD.IsNewEnquiry,LT.TrackingID,LT.ActivityStatus,LT.AssignedTo,LT.StatusCode,LT.University,LT.Course,LT.AlternateMobile,LT.Address,LT.Flag,ST.StaffID,ST.Firstname,PLD1.ListCode as statusListCode,PLD1.ListName as statusListName,AV.ActivityID,AV.ActivityName,LTF.FollowupComments,LT.ReferredBy as ReferredBy');
+        $this->db->select('LTF.FollowupOn,LD.LeadID,LD.LeadName,LD.MobileNumber,LD.IsNewEnquiry,LT.TrackingID,LT.ActivityStatus,LT.AssignedTo,LT.StatusCode,LT.University,LT.Course,LT.AlternateMobile,LT.Address,LT.Flag,ST.StaffID,ST.Firstname,PLD1.ListCode as statusListCode,PLD1.ListName as statusListName,AV.ActivityID,AV.ActivityName,LTF.FollowupComments,LT.ReferredBy as ReferredBy,date_format(LT.CreatedOn,"%d-%m-%Y") as trackingDetailsCreatedOn,date_format(LD.CreatedOn,"%d-%m-%Y") as leadDetailsCreatedOn');
         $this->db->from(LEAD_TRACKING_FOLLOWUP.' as LTF');
         $this->db->join(LEAD_TRACKING.' as LT','LT.TrackingID=LTF.TrackingID');
         $this->db->join(LEAD_DETAILS.' as LD', 'LT.LeadID = LD.LeadID');
@@ -670,7 +678,7 @@ $msg='Dear '.$name.', Thank you for enquiring with Apollo Distance Education Col
         $leadDet=$this->db->get();
 
 
-     // print_r($this->db->last_query());die();
+    //  print_r($this->db->last_query());die();
 
         if($this->db->affected_rows()==0){
             $result_array['trackingStatus']=false;
@@ -693,6 +701,7 @@ $msg='Dear '.$name.', Thank you for enquiring with Apollo Distance Education Col
                     $tracking_array["ActivityStatus"]=$row->ActivityStatus;
                     $tracking_array["AssignedTo"]=$row->AssignedTo;
                     $tracking_array["Firstname"]=$row->Firstname;
+                    $tracking_array["StudentID"]=$row->Firstname;
                     $tracking_array["StatusCode"]=$row->StatusCode;
                     $tracking_array["statusName"]=$row->statusListName;
                     $tracking_array["UniversityName"]=$row->University;
@@ -703,6 +712,7 @@ $msg='Dear '.$name.', Thank you for enquiring with Apollo Distance Education Col
                     $tracking_array["Address"]=$row->Address;
                     $tracking_array["Comments"]=$row->FollowupComments;
                     $tracking_array["ReferredBy"]=$row->ReferredBy;
+                    $tracking_array["trackingDetailsCreatedOn"]=$row->trackingDetailsCreatedOn;
                     // $tracking_array["followupDetails"]=$this->getTrackingFollowup($row->TrackingID);
                    // $followupDetails=$this->getTrackingFollowup($row->TrackingID);
 
@@ -821,7 +831,7 @@ $msg='Dear '.$name.', Thank you for enquiring with Apollo Distance Education Col
 
 
 
-        $this->db->select('LTF.FollowupOn,LD.LeadID,LD.LeadName,LD.MobileNumber,LD.IsNewEnquiry,LT.TrackingID,LT.ActivityStatus,LT.AssignedTo,LT.StatusCode,LT.University,LT.Course,LT.AlternateMobile,LT.Address,LT.Flag,ST.StaffID,ST.Firstname,PLD1.ListCode as statusListCode,PLD1.ListName as statusListName,AV.ActivityID,AV.ActivityName,LTF.FollowupComments');
+        $this->db->select('LTF.FollowupOn,LD.LeadID,LD.LeadName,LD.MobileNumber,LD.IsNewEnquiry,LT.TrackingID,LT.ActivityStatus,LT.AssignedTo,LT.StatusCode,LT.University,LT.Course,LT.AlternateMobile,LT.Address,LT.Flag,ST.StaffID,ST.Firstname,PLD1.ListCode as statusListCode,PLD1.ListName as statusListName,AV.ActivityID,AV.ActivityName,LTF.FollowupComments,date_format(LT.CreatedOn,"%d-%m-%Y") as trackingDetailsCreatedOn,date_format(LD.CreatedOn,"%d-%m-%Y") as leadDetailsCreatedOn');
         $this->db->from(LEAD_TRACKING_FOLLOWUP.' as LTF');
         $this->db->join(LEAD_TRACKING.' as LT','LT.TrackingID=LTF.TrackingID');
         $this->db->join(LEAD_DETAILS.' as LD', 'LT.LeadID = LD.LeadID');
@@ -890,6 +900,7 @@ $msg='Dear '.$name.', Thank you for enquiring with Apollo Distance Education Col
                     $tracking_array["AlternateMobile"]=$row->AlternateMobile;
                     $tracking_array["Address"]=$row->Address;
                     $tracking_array["Comments"]=$row->FollowupComments;
+                    $tracking_array["trackingDetailsCreatedOn"]=$row->trackingDetailsCreatedOn;
                     // $tracking_array["followupDetails"]=$this->getTrackingFollowup($row->TrackingID);
                     // $followupDetails=$this->getTrackingFollowup($row->TrackingID);
 
@@ -959,6 +970,14 @@ $msg='Dear '.$name.', Thank you for enquiring with Apollo Distance Education Col
 
     public function updateFollowupDetails($updateDetails=null,$insertDetails=null)
     {
+        // $updateDetails['StatusCode'] = implode(',', $updateDetails['StatusCode']);
+        // $updateDetails['AssignedTo'] = implode(',', $updateDetails['AssignedTo']);
+        // $insertDetails['AssignedStaff'] = implode(',', $insertDetails['AssignedStaff']);
+        // $insertDetails['StatusName'] = $this->getStatusName($insertDetails['StatusName']);
+        // // print_r($insertDetails);
+        // // print_r($updateDetails);
+        // die();
+        // exit();
         $deactivateStatus['IsActive']=false;
         $this->db->where('TrackingID',$updateDetails['TrackingID']);
         $this->db->update(LEAD_TRACKING_FOLLOWUP, $deactivateStatus);
@@ -1003,13 +1022,51 @@ $msg='Dear '.$name.', Thank you for enquiring with Apollo Distance Education Col
 
     }
 
+    public function updateFollowupDetails2($updateDetails=null,$insertDetails=null)
+    {
+        
+        $deactivateStatus['IsActive']=false;
+        $this->db->where('TrackingID',$updateDetails['TrackingID']);
+        $this->db->update(LEAD_TRACKING_FOLLOWUP, $deactivateStatus);
+        if($this->db->affected_rows() > '0') {
+            $this->db->insert(LEAD_TRACKING_FOLLOWUP, $insertDetails);
+            // this if for insert follow up details
+            if ($this->db->affected_rows() == '1') {
+                $this->db->where('TrackingID', $updateDetails['TrackingID']);
+                $upateStatus = $this->db->update(LEAD_TRACKING, $updateDetails);
+                $result['leadStatus'] = true;
+                $result['message'] = "details updated";
+            } else {
+                $result['leadStatus'] = false;
+                $result['message'] = "Something went wrong.please try again";
+            }
+        }
+        else{
+            $activateStatus['IsActive']=true;
+            $this->db->where('TrackingID',$updateDetails['TrackingID']);
+            $this->db->update(LEAD_TRACKING_FOLLOWUP, $activateStatus);
+            $result['leadStatus'] = false;
+            $result['message'] = "Something went wrong.please try again";
+        }
 
+        return $result;
+    }
+    // public function getStatusName($statusArr){
+    //     $arr = implode(',', $statusArr);
+    //     echo $arr; 
+    //     $this->db->select('ListName');
+    //     $this->db->where_in('ListCode',$arr);
+    //     $statusDetails=$this->db->get(PICK_LIST_DETAILS);
+    //     $status = $statusDetails->result_array();
+    //     print_r($this->db->last_query());die();
+    //     $arr2 = implode(',', $status);
+    //     return $arr2;
+    // }
     /*
      * get tracking information when page is loading
      * created by kms
      * */
 
-
     public function getLoadFollowupDetails($trackingID)
     {
       //sprint_r($trackingID);die();
@@ -1051,7 +1108,7 @@ $msg='Dear '.$name.', Thank you for enquiring with Apollo Distance Education Col
        
 
 
-        $this->db->select('LD.LeadID,LD.LeadName,LD.MobileNumber,LD.IsNewEnquiry,LT.TrackingID,LT.ActivityStatus,LT.AssignedTo,LT.CreatedBranch,LT.PendingDocStatus,BR.BranchName,LT.StatusCode,LT.University,LT.Course,LT.AlternateMobile,LT.Address,LT.ReferredBy,ST.StaffID,ST.Firstname,PLD1.ListCode as statusListCode,PLD1.ListName as statusListName,AV.ActivityID,AV.ActivityName');
+        $this->db->select('LD.LeadID,LD.LeadName,LD.MobileNumber,LD.IsNewEnquiry,LT.TrackingID,LT.ActivityStatus,LT.AssignedTo,LT.CreatedBranch,LT.PendingDocStatus,BR.BranchName,LT.StatusCode,LT.University,LT.Course,LT.AlternateMobile,LT.Address,LT.ReferredBy,ST.StaffID,ST.Firstname,PLD1.ListCode as statusListCode,PLD1.ListName as statusListName,AV.ActivityID,AV.ActivityName,date_format(LT.CreatedOn,"%d-%m-%Y") as trackingDetailsCreatedOn');
         $this->db->from(LEAD_DETAILS.' as LD');
         $this->db->join(LEAD_TRACKING.' as LT', 'LT.LeadID = LD.LeadID');
         $this->db->join(LOGIN.' as LO', 'LO.ID = LT.AssignedTo');
@@ -1128,6 +1185,7 @@ $msg='Dear '.$name.', Thank you for enquiring with Apollo Distance Education Col
                 $tracking_array["PendingDocStatus"]=$row->PendingDocStatus;
                 $tracking_array["followupDetails"]=$this->getTrackingFollowup($row->TrackingID);
                 $tracking_array["collectTrackedID"]=$this->getStudentTrackedID($row->MobileNumber,$trackingID['CreatedBranch'],$trackingID['requestedDept'],$trackingID['UpdatedBy']);
+                $tracking_array["trackingDetailsCreatedOn"]=$row->trackingDetailsCreatedOn;
 
                 $result[]=$tracking_array;
 
@@ -1937,6 +1995,7 @@ public function GetStaffCallDetails($branchID,$myDate,$staff)
     $this->db->join('T_Login L','L.ID=LT.AssignedTo');
     $this->db->join('T_StaffDetails SD','SD.StaffID=L.StaffID');
     $this->db->join('T_PickListDetails PLD','PLD.ListCode = LTF.StatusName');
+    $this->db->where('LTF.IsActive',1);
     $this->db->where("date_format(LTF.CreatedOn,'%Y-%m-%d')=",$myDate);
     $this->db->where('LT.CreatedBranch',$branchID);
     $this->db->where('LTF.AssignedStaff',$staff);
@@ -1945,7 +2004,8 @@ public function GetStaffCallDetails($branchID,$myDate,$staff)
      $Details = $this->db->get()->result();
 
 
-    // print_r($this->db->last_query());die();
+    // print_r($this->db->last_query());
+    // exit();
 
      if($Details) 
      {
@@ -1966,25 +2026,44 @@ public function GetStaffCallDetails($branchID,$myDate,$staff)
 
 public function GetStaffCountDetails($branchID,$myDate)
 {
-
-     $this->db->select('AssignedStaff,Firstname,Lastname,SD.StaffID,count(InteractionId) as count');
+     $this->db->select('AssignedStaff,Firstname,Lastname,SD.StaffID,count(InteractionId) as TotalCount');
      $this->db->from('T_Lead_Tracking_Followup LTF');
      $this->db->join('T_Login L','L.ID=LTF.AssignedStaff');
      $this->db->join('T_StaffDetails SD','SD.StaffID=L.StaffID');
      $this->db->join('T_Staff_BranchAccess SBA','SBA.StaffID = SD.StaffID');
+     $this->db->where('LTF.IsActive',1);
      $this->db->where("date_format(LTF.CreatedOn,'%Y-%m-%d')=",$myDate);
      $this->db->where('SBA.BranchCode',$branchID); 
      $this->db->group_by('AssignedStaff');
 
      $Details = $this->db->get()->result();
-
-
-    // print_r($this->db->last_query());die();
-
+    // print_r($this->db->last_query());exit();
      if($Details) 
      {
-               $result_array['searchst'] = true;
-               $result_array['details'] = $Details;
+        foreach($Details as $row){
+            // print_r($row->AssignedStaff);
+            $this->db->select('LT.TrackingID');
+            $this->db->from('T_Lead_Tracking_Followup LTF');
+            $this->db->join('T_Lead_Tracking LT','LT.TrackingID=LTF.TrackingID');
+            $this->db->where('LTF.IsActive',1);
+            $this->db->where("date_format(LTF.CreatedOn,'%Y-%m-%d')=",$myDate);
+            $this->db->where('LT.CreatedBranch',$branchID);
+            $this->db->where('LTF.AssignedStaff',$row->AssignedStaff);
+            $this->db->group_by('InteractionId');
+            $leadDet= $this->db->get()->result();
+            $leadDetcount = $this->db->affected_rows();
+            $row->count = $leadDetcount;
+        }
+        $filtered_array = array();
+        foreach ($Details as $value) {
+            if (isset($value->count)) {
+                if ($value->count != 0) {
+                    $filtered_array[] = $value;
+                }
+            }
+        }
+        if(!empty($filtered_array)){$result_array['searchst'] = true;$result_array['details'] = $filtered_array;
+        }else{$result_array['searchst'] = false;$result_array['details'] = "No records found!";}    
      }
      else
     {

Apollo/api/application/models/DayBook_model.php

@@ -76,7 +76,7 @@ class DayBook_model extends CI_Model
         LEFT JOIN ".UNIVERSITY." as t7 ON t7.UniversityID = t6.UniversityID AND t7.BranchCode = t1.BranchCode
         left join ".STUDENTS." as t8 on t8.StudentID = t1.StudentID
         WHERE STR_TO_DATE(DATE,'%d-%m-%Y') BETWEEN '$fromDate' 
-        AND '$toDate' AND t1.BranchCode = '$reqpayType' AND t1.IsActive ='1'AND t1.Status != 'Cancel' ORDER BY ORDER_ID DESC";
+        AND '$toDate' AND t1.BranchCode = '$reqpayType' AND t1.IsActive ='1' ORDER BY ORDER_ID DESC";
 // echo $querys;exit();
         // $this->db->where(' STR_TO_DATE(t1.Date, %d-%m-%Y) >=', $fromDate);
         // $this->db->where(' STR_TO_DATE(t1.Date, %d-%m-%Y) >=', $toDate); 
@@ -120,6 +120,76 @@ class DayBook_model extends CI_Model
         return $results;
     }
 
+    public function get_Daybookonline_Details_List($reqData, $reqDataBy) {
+
+        if($reqData['date'] != '' && $reqData['dateTo'] != '') {
+        // $this->db->select('t1.*, t2.ListName, t3.TypeName');
+        // $this->db->from(''.DAYBOOKMASTER. ' as t1');
+        // $this->db->join('' . PICK_LIST_DETAILS . ' as t2', 't2.ListCode = t1.Name', 'LEFT');
+        // $this->db->join('' . INCOMEOUTCOMEMASTER . ' as t3', 't3.ID = t1.Type', 'LEFT');
+        
+        $d = new DateTime($reqData['date']);
+        $dTo = new DateTime($reqData['dateTo']);
+        $fromDate = $d->format('Y-m-d');
+        $toDate = $dTo->format('Y-m-d');
+        $reqpayType = $reqDataBy['localBranchID'];
+
+        $querys = "SELECT t5.Firstname as Fname,t1.ID as ORDER_ID, t1.*, t2.ListName, t3.TypeName , t5.Firstname as Approved_by_name ,
+        t7.UniversityName as UniversityName, t6.CourseName as CourseName,t7.UniversityID,t8.Lastname,t8.MobileNumber
+        FROM ".DAYBOOKMASTERONLINE." as t1 
+        LEFT JOIN ".PICK_LIST_DETAILS." as t2 ON t2.ListCode = t1.Name 
+        LEFT JOIN ".INCOMEOUTCOMEMASTER." as t3 ON t3.ID = t1.Type AND t3.BranchCode = t1.BranchCode
+        LEFT JOIN ".LOGIN." as t4 ON t4.ID = t1.CreatedBy 
+        LEFT JOIN ".STAFF." as t5 ON t5.StaffID = t4.StaffID
+        LEFT JOIN ".COURSE." as t6 ON t6.CourseID = t1.CourseID AND t6.BranchCode = t1.BranchCode
+        LEFT JOIN ".UNIVERSITY." as t7 ON t7.UniversityID = t6.UniversityID AND t7.BranchCode = t1.BranchCode
+        left join ".STUDENTS." as t8 on t8.StudentID = t1.StudentID
+        WHERE STR_TO_DATE(DATE,'%d-%m-%Y') BETWEEN '$fromDate' 
+        AND '$toDate' AND t1.BranchCode = '$reqpayType' AND t1.IsActive ='1' ORDER BY ORDER_ID DESC";
+// echo $querys;exit();
+        // $this->db->where(' STR_TO_DATE(t1.Date, %d-%m-%Y) >=', $fromDate);
+        // $this->db->where(' STR_TO_DATE(t1.Date, %d-%m-%Y) >=', $toDate); 
+        // $this->db->where('t1.Date', $reqData['date']);
+        // $this->db->order_by('CreatedOn', 'DESC');
+        // $this->db->where('t1.BranchCode', $reqDataBy['localBranchID']);
+        
+        } else {
+        // $this->db->select('t1.*, t2.ListName, t3.TypeName');
+        // $this->db->from(''.DAYBOOKMASTER. ' as t1');
+        // $this->db->join('' . PICK_LIST_DETAILS . ' as t2', 't2.ListCode = t1.Name', 'LEFT');
+        // $this->db->join('' . INCOMEOUTCOMEMASTER . ' as t3', 't3.ID = t1.Type', 'LEFT');
+        // // $this->db->where('t1.Date', $reqData['date']);
+        // $this->db->order_by('CreatedOn', 'DESC');
+        // $this->db->where('t1.BranchCode', $reqDataBy['localBranchID']);
+            $reqpayType = $reqDataBy['localBranchID'];
+            $querys = "SELECT t5.Firstname,t1.ID as ORDER_ID, t1.*, t2.ListName, t3.TypeName, t5.Firstname as Approved_by_name ,
+            t7.UniversityName as UniversityName, t6.CourseName as CourseName,t7.UniversityID,t8.Lastname,t8.MobileNumber
+            FROM ".DAYBOOKMASTERONLINE." as t1 
+            LEFT JOIN ".PICK_LIST_DETAILS." as t2 ON t2.ListCode = t1.Name 
+            LEFT JOIN ".INCOMEOUTCOMEMASTER." as t3 ON t3.ID = t1.Type  AND t3.BranchCode = t1.BranchCode
+            LEFT JOIN ".LOGIN." as t4 ON t4.ID = t1.CreatedBy 
+            LEFT JOIN ".STAFF." as t5 ON t5.StaffID = t4.StaffID
+            LEFT JOIN ".COURSE." as t6 ON t6.CourseID = t1.CourseID AND t6.BranchCode = t1.BranchCode
+            LEFT JOIN ".UNIVERSITY." as t7 ON t7.UniversityID = t6.UniversityID AND t7.BranchCode = t1.BranchCode
+            left join ".STUDENTS." as t8 on t8.StudentID = t1.StudentID
+            WHERE t1.BranchCode = '$reqpayType' AND t1.IsActive ='1' ORDER BY ORDER_ID DESC";
+            
+        }
+
+
+
+       
+        // $this->db->join('' . COURSE . ' as t2', 't2.UniversityID = t1.UniversityID', 'LEFT');
+        $dayBookDetails = $this->db->query($querys);
+        $dayBookDetailsList = $dayBookDetails->result();
+        $results['dayBookListStatus']      = true;
+        $results['dayBookListDetails'] = $dayBookDetailsList;
+         // print_r($this->db->last_query());die;
+       
+        return $results;
+    }
+
+
 
 
 
@@ -328,8 +398,13 @@ class DayBook_model extends CI_Model
         $mysql = "SELECT * FROM ".DAYBOOKMASTER." WHERE ID = '$id'";
         $deleteDetails = $this->db->query($mysql);
         $deleteDataDetails = $deleteDetails->result();
+        $deleteDataDetails1 = $deleteDetails->result_array();
         $branch = $deleteDataDetails[0]->BranchCode;
-
+        $id = $deleteDataDetails[0]->ID;
+        $oldBalance = $deleteDataDetails[0]->Balance;
+        $next_id = $id + 1;
+        $deleteDataDetails1[0]['ID'] = $next_id;
+        $deleteDataDetails1[0]['Status'] = "Cancel";
         $sql = "SELECT * FROM ".DAYBOOKMASTER." WHERE (BranchCode = '$branch' AND ID < '$id')
                 ORDER BY  ID DESC
                 LIMIT 1 ";
@@ -339,7 +414,6 @@ class DayBook_model extends CI_Model
         $latestUpdateDetails = $latestUpdate->result();
         $currBalance = $latestUpdateDetails[0]->Balance;
         $currID = $latestUpdateDetails[0]->ID;
-
         // $sql1 = " DELETE FROM ".DAYBOOKMASTER." WHERE ID ='$id'";
         $sql1 = "UPDATE ".DAYBOOKMASTER." SET Status ='Cancel',Reason='$reason' WHERE ID ='$id'";
              
@@ -360,8 +434,10 @@ class DayBook_model extends CI_Model
                     $currBalance = $currBalance - $clip->Amount;
                 } else {
                 }
-                $updateSql = "UPDATE ".DAYBOOKMASTER." SET Balance ='$currBalance' WHERE ID = '$clip->ID'";
+                $updateSql = "UPDATE ".DAYBOOKMASTER." SET Balance ='$oldBalance' WHERE ID = '$clip->ID'";
                 $this->db->query($updateSql);
+                $deleteDataDetails1[0]['Balance'] = $currBalance;
+                $this->db->insert(DAYBOOKMASTER, $deleteDataDetails1[0]);          
             }
 
             $result['deletedStatus'] = true;
@@ -377,8 +453,8 @@ class DayBook_model extends CI_Model
     }
 
     // delete the daybook fees entry details
-    public function delete_dayBookFeePayableDetails($id,$reason) {
-        $this->db->select('FeesPaymentID, BranchCode');
+    public function delete_dayBookFeePayableDetails($id,$reason, $loggedInUser) {
+        $this->db->select('*');
         $this->db->from(DAYBOOKMASTER);
         $this->db->where('ID', $id);
         $typeDetails = $this->db->get();
@@ -386,10 +462,15 @@ class DayBook_model extends CI_Model
         $getID = $typeStateDetails[0]->FeesPaymentID;
         $branch = $typeStateDetails[0]->BranchCode;
         // echo $id;exit();
+        $typeStateDetails[0]->Status="Cancel";
+        $typeStateDetails[0]->Name="I001";
         try {
             // load fees status model
             $this->load->model('Fees_status_model');
-            $this->Fees_status_model->deleteStudentStatusEntry($getID);
+            /** comment due to  
+             * 1 .Create new received fees entry after deleting the previously created received fees entry ,in that time don't display the status as "Blank" In Mark card and certificate report when the status already updated from student status update screen 
+             * $this->Fees_status_model->deleteStudentStatusEntry($getID);
+             */
             // end fees status model
             // $sql1 = " DELETE FROM ".STUDENTS_FEES_PAID." WHERE ID ='$getID'";
             $sql1 = "UPDATE ".STUDENTS_FEES_PAID." SET IsActive ='0' WHERE ID ='$getID'";
@@ -397,16 +478,65 @@ class DayBook_model extends CI_Model
         } catch(Exception $e) {
             echo 'error';
         } finally {
-            $sql = "SELECT * FROM ".DAYBOOKMASTER." WHERE (BranchCode = '$branch' AND ID < '$id')
+            //
+            $sql1 = "UPDATE ".DAYBOOKMASTER." SET Status ='Cancel',Reason='$reason' WHERE FeesPaymentID ='$getID'";
+            
+            // insert additional entry for cancelled records
+            if ($this->db->query($sql1)  == '1') {
+                $now = new DateTime();
+                $now->setTimezone(new DateTimezone('Asia/Kolkata'));
+                
+                $additionalReq["Name"] = "I001";
+                $additionalReq["Type"] = $typeStateDetails[0]->Type;
+                $additionalReq["Amount"] = $typeStateDetails[0]->Amount;
+                $additionalReq["Date"] = $now->format('d-m-Y');
+                $additionalReq["Status"] = "Cancel";
+                $additionalReq["Reason"] = $reason;
+                $additionalReq["BranchCode"] = $typeStateDetails[0]->BranchCode;
+                $additionalReq["Description"] =$typeStateDetails[0]->Description;
+                $additionalReq["Approval_By"] =$typeStateDetails[0]->Approval_By;
+                $additionalReq["Approval_Comments"] =$typeStateDetails[0]->Approval_Comments;
+                $additionalReq["IsActive"] =$typeStateDetails[0]->IsActive;
+                $additionalReq["CreatedBy"] =$loggedInUser;
+                $additionalReq["CreatedOn"] =$now->format('Y-m-d H:i:s');
+                $additionalReq["UpdatedBy"] =$loggedInUser;
+                $additionalReq["UpdatedOn"] =$now->format('Y-m-d H:i:s');
+                $additionalReq["PaidTo"] =$typeStateDetails[0]->PaidTo;
+                $additionalReq["PaidDescription"] =$typeStateDetails[0]->PaidDescription;
+//                 $additionalReq["VoucherNumber"] =$typeStateDetails[0]->VoucherNumber;
+                $additionalReq["VoucherNumber"] = $typeStateDetails[0]->VoucherNumber."-CAN";
+                $additionalReq["PaymentStatus"] =$typeStateDetails[0]->PaymentStatus;
+                $additionalReq["FeesPaymentID"] = $typeStateDetails[0]->FeesPaymentID;
+                $additionalReq["Balance"] = $typeStateDetails[0]->Balance;
+                $additionalReq["ModeOfPayment"] =$typeStateDetails[0]->ModeOfPayment;
+                $additionalReq["StudentID"] =$typeStateDetails[0]->StudentID;
+                $additionalReq["CourseID"] =$typeStateDetails[0]->CourseID;
+                $additionalReq["UniversityID"] =$typeStateDetails[0]->UniversityID;
+                $additionalReq["FeePaymentDetails"] =$typeStateDetails[0]->FeePaymentDetails;
+                $additionalReq["ReceiptNo"] =$typeStateDetails[0]->ReceiptNo;
+                $additionalReq["ReceiptNoComments"] =$typeStateDetails[0]->ReceiptNoComments;
+                $additionalReq["Isdaybook"] =$typeStateDetails[0]->Isdaybook;
+                $this->add_dayBook($additionalReq);
+                
+                $result['deletedStatus'] = true;
+                $result['message']               = "Entry is Deleted";
+            } else {
+                $result['deletedStatus'] = false;
+                $result['message']               = "Something went wrong.please try again";
+            }
+            // ignored below steps since we no need to update the balance for the existing records and insert the new expense with the cancelled amount
+         /*   $sql = "SELECT * FROM ".DAYBOOKMASTER." WHERE (BranchCode = '$branch' AND ID < '$id')
             ORDER BY  ID DESC
             LIMIT 1 ";
 
             $currBalance = 0;
             $currID = $id;
             $latestUpdate = $this->db->query($sql);
+            error_log("================finally block".$this->db->last_query());
             $latestUpdateDetails = $latestUpdate->result();
             If(is_array($latestUpdateDetails) && count($latestUpdateDetails)>0)
             {
+                error_log("================finally block--> if block");
                 $currBalance = $latestUpdateDetails[0]->Balance;
                 $currID = $latestUpdateDetails[0]->ID;
 
@@ -416,10 +546,11 @@ class DayBook_model extends CI_Model
                
             // update branch to staff_branch table
             if ($this->db->query($sql1)  == '1') {
-
+                error_log("================finally block--> if block --> if block".$this->db->last_query());
                 $sql2 = "SELECT * FROM ".DAYBOOKMASTER." WHERE (BranchCode = '$branch' AND ID > '$currID')
                     ORDER BY  ID ASC";
                 $latestUpdate2 = $this->db->query($sql2);
+                error_log("================finally block--> if block --> if block--latestUpdate2-----".$this->db->last_query());
                 $latestUpdateDetails2 = $latestUpdate2->result();
 
                 foreach( $latestUpdateDetails2 as $clip){
@@ -431,6 +562,7 @@ class DayBook_model extends CI_Model
                         $currBalance = $currBalance - $clip->Amount;
                     } else {
                     }
+                    error_log("================finally block--> if block --> if block-->inside forloop------".$this->db->last_query());
                     $updateSql = "UPDATE ".DAYBOOKMASTER." SET Balance ='$currBalance' WHERE ID = '$clip->ID'";
                     $this->db->query($updateSql);
                 }
@@ -438,6 +570,7 @@ class DayBook_model extends CI_Model
                 $result['deletedStatus'] = true;
                 $result['message']               = "Entry is Deleted";
             } else {
+                error_log("================finally block--> if block --> else block");
                 $result['deletedStatus'] = false;
                 $result['message']               = "Something went wrong.please try again";
             }
@@ -445,10 +578,11 @@ class DayBook_model extends CI_Model
                 $sql1 = "UPDATE ".DAYBOOKMASTER." SET Status ='Cancel' ,Reason='$reason',  Balance ='$currBalance' WHERE FeesPaymentID ='$getID'";
                // update branch to staff_branch table
             if ($this->db->query($sql1)  == '1') {
-
+                error_log("sql1=================".$this->db->last_query());
                 $sql2 = "SELECT * FROM ".DAYBOOKMASTER." WHERE (BranchCode = '$branch' AND ID > '$currID')
                     ORDER BY  ID ASC";
                 $latestUpdate2 = $this->db->query($sql2);
+                error_log("latestUpdate2=================".$this->db->last_query());
                 $latestUpdateDetails2 = $latestUpdate2->result();
 
                 foreach( $latestUpdateDetails2 as $clip){
@@ -461,7 +595,9 @@ class DayBook_model extends CI_Model
                     } else {
                     }
                     $updateSql = "UPDATE ".DAYBOOKMASTER." SET Balance ='$currBalance' WHERE ID = '$clip->ID'";
+                    
                     $this->db->query($updateSql);
+                    error_log("updateSql=================".$this->db->last_query());
                 }
                 
                 $result['deletedStatus'] = true;
@@ -471,7 +607,7 @@ class DayBook_model extends CI_Model
                 $result['message']               = "Something went wrong.please try again";
             }
             }
-            
+            */ //END 
         }
         return $result;
     }
@@ -648,15 +784,21 @@ class DayBook_model extends CI_Model
         }else{
         }
         
-        if($Arr['Name'] == 'I002') {
-            //Income
-            $Arr['Balance'] = $prevBalance + $Arr['Amount'];
-        }else if ($Arr['Name'] == 'I001') {
-            //Expense
-            $Arr['Balance'] = $prevBalance - $Arr['Amount'];
-        } else {
-            $Arr['Balance'] = 0;
+        if($Arr['Status'] != 'Cancel' || $Arr["ModeOfPayment"] == 'CASH')
+        {
+            if($Arr['Name'] == 'I002') {
+                //Income
+                $Arr['Balance'] = $prevBalance + $Arr['Amount'];
+            }else if ($Arr['Name'] == 'I001') {
+                //Expense
+                $Arr['Balance'] = $prevBalance - $Arr['Amount'];
+            } else {
+                $Arr['Balance'] = 0;
+            }
+        }else{
+            $Arr['Balance'] = $prevBalance;
         }
+       
 
         $this->db->insert(DAYBOOKMASTER, $Arr);
         if ($this->db->affected_rows() == '1') {
@@ -984,14 +1126,19 @@ class DayBook_model extends CI_Model
 
         // echo $from.'ff';
         // echo $to.'to';
+        
         $incomecode='I002';
         $expensecode='I001';
 
-         $fromd= date("Y-m-d",strtotime($from));
-         $tod=date("Y-m-d",strtotime($to));
-// echo $fromd;
-// echo $tod;
-// die();
+        $fromd= date("Y-m-d",strtotime($from));
+        $tod=date("Y-m-d",strtotime($to));
+        
+        if($from != null && $to != null){
+        $where="str_to_date(Date,'%d-%m-%Y')>='".$fromd."' and str_to_date(Date,'%d-%m-%Y')<='".$tod."' and";
+        }else{
+        $where="";
+        }
+        
         $subQuery= 'SELECT 
                     DISTINCT(p.Name) AS TID,ListName,
                     SUM(IF(p.Name=?,Amount,0)) AS Income,
@@ -1003,16 +1150,37 @@ class DayBook_model extends CI_Model
                     FROM
                     T_DayBookMaster AS p 
                     join T_PickListDetails on T_PickListDetails.ListCode = p.name
-                    where str_to_date(Date,?)>=? and str_to_date(Date,?)<=? and p.IsActive=? and (p.Name=? and p.Status !=? or p.Name=?) and (p.ModeOfPayment != ? and  p.ModeOfPayment != ? ) and Status !=? and p.BranchCode=? 
-                    GROUP BY p.`Name`';
-		
-	  $query = $this->db->query($subQuery,array($incomecode,$expensecode,'Pending',$incomecode,$expensecode,'%d-%m-%Y',$fromd,'%d-%m-%Y',$tod,'1','I001','Pending','I002','WAIVER','REFERRAL','Cancel',$br));
-       $expense = $query->result();  
-// print_r($this->db->last_query());die();and p.Isdaybook=?
-       // if(count($expense) > 0)
-       // {
-        $results['expense_data'] = $expense;
-       // }  
+                    LEFT JOIN T_Income_Outcome_Master ON T_Income_Outcome_Master.ID = p.Type
+                    where '.$where.' p.IsActive=? and 
+                    (CASE
+                    WHEN
+                        p.Name=?
+                    THEN
+                        p.ModeOfPayment != ?
+                            AND p.ModeOfPayment != ?
+                            AND p.Status != ?
+                            AND T_Income_Outcome_Master.TypeName NOT LIKE ?
+                    WHEN
+                        p.Name=?
+                    THEN
+                        p.Status != ?
+                            AND T_Income_Outcome_Master.TypeName != ?
+                            AND T_Income_Outcome_Master.TypeName NOT LIKE ?
+                    END)
+                    and Status !=? and p.BranchCode=? 
+                    GROUP BY p.`Name`';		
+	    $query = $this->db->query($subQuery,array($incomecode,$expensecode,'Pending',$incomecode,$expensecode,'1','I002','WAIVER','REFERRAL','Pending','%BY CASH%','I001','Pending','FEES','%CASH TO%','Cancel',$br));
+        $expense = $query->result();  
+        // print_r($this->db->last_query());
+        // echo "    income total query";
+        // print_r($query);
+
+        // die();
+        // and p.Isdaybook=?
+            // if(count($expense) > 0)
+            // {
+                $results['expense_data'] = $expense;
+            // }  
 
   
 
@@ -1020,7 +1188,6 @@ class DayBook_model extends CI_Model
                     DISTINCT(q.Name) AS TID,ListName,T_Income_Outcome_Master.TypeID as Orgtype,
                     SUM(IF(q.Name=?,Amount,0)) AS Income,
                     SUM(IF(q.Name=? ,Amount,0)) AS Expense,
-
                     SUM( CASE Name 
                     WHEN ? THEN Amount
                     WHEN ? THEN Amount
@@ -1028,20 +1195,20 @@ class DayBook_model extends CI_Model
                     FROM T_NonOperationalMaster AS q 
                     Join T_Income_Outcome_Master on T_Income_Outcome_Master.ID=q.Type
                     join T_PickListDetails on T_PickListDetails.ListCode = q.name
-                    where str_to_date(Date,?)>=? and str_to_date(Date,?)<=? and q.IsActive=? and (q.Name=? or q.Name=?) 
+                    where '.$where.' q.IsActive=? and (q.Name=? or q.Name=?) 
                     and Status !=? and q.BranchCode=? and q.Isdaybook=? GROUP BY q.Name';
 
 
-      $querynon = $this->db->query($subQueryNON,array($incomecode,$expensecode,$incomecode,$expensecode,'%d-%m-%Y',$fromd,'%d-%m-%Y',$tod,'1','I001','I002','Cancel',$br,'1'));
-      $expensenon = $querynon->result();  
-
-       // if(count($expensenon)>0)
-       // {
-        $results['expense_data_nonop'] = $expensenon;
-       // }  
-              
- // print_r($results);die();
-       return $results;
+        $querynon = $this->db->query($subQueryNON,array($incomecode,$expensecode,$incomecode,$expensecode,'1','I001','I002','Cancel',$br,'1'));
+        $expensenon = $querynon->result();  
+        // print_r($this->db->last_query());
+        // if(count($expensenon)>0)
+        // {
+                $results['expense_data_nonop'] = $expensenon;
+        // }  
+                    
+        // print_r($results);die();
+        return $results;
 
     }
 
@@ -1051,65 +1218,67 @@ class DayBook_model extends CI_Model
          $fromd= date("Y-m-d",strtotime($from));
          $tod=date("Y-m-d",strtotime($to));
          $expid = 'I001';
+         if($from != null && $to != null){
+            $where="str_to_date(Date,'%d-%m-%Y')>='".$fromd."' and str_to_date(Date,'%d-%m-%Y')<='".$tod."' and";
+        }else{
+            $where="";
+        }
+        //        $subQuery='select Name,sum(Amount) as Total,T_DayBookMaster.ID,T_Income_Outcome_Master.ID as SubID,T_Income_Outcome_Master.TypeID as OrgType,T_Income_Outcome_Master.TypeName,T_DayBookMaster.Date,Reason,T_DayBookMaster.Description,ListName from T_DayBookMaster
+        // left join T_Income_Outcome_Master on  T_Income_Outcome_Master.ID = T_DayBookMaster.Type
+        // join T_PickListDetails on T_PickListDetails.ListCode = T_Income_Outcome_Master.TypeID
+        // where str_to_date(date,?)>=? and str_to_date(date,?)<=?  and Status!=? and T_DayBookMaster.BranchCode=?  and (T_DayBookMaster.ModeOfPayment != ? and  T_DayBookMaster.ModeOfPayment != ?and T_DayBookMaster.Status !=?) group by Type,Name';  
 
+        // $query = $this->db->query($subQuery,array('%d-%m-%Y',$fromd,'%d-%m-%Y',$tod,'Cancel',$branch,'WAIVER','REFERRAL','Pending')); 
 
-// $subQuery='select Name,sum(Amount) as Total,T_DayBookMaster.ID,T_Income_Outcome_Master.ID as SubID,T_Income_Outcome_Master.TypeID as OrgType,T_Income_Outcome_Master.TypeName,T_DayBookMaster.Date,Reason,T_DayBookMaster.Description,ListName from T_DayBookMaster
-// left join T_Income_Outcome_Master on  T_Income_Outcome_Master.ID = T_DayBookMaster.Type
-// join T_PickListDetails on T_PickListDetails.ListCode = T_Income_Outcome_Master.TypeID
-// where str_to_date(date,?)>=? and str_to_date(date,?)<=?  and Status!=? and T_DayBookMaster.BranchCode=?  and (T_DayBookMaster.ModeOfPayment != ? and  T_DayBookMaster.ModeOfPayment != ?and T_DayBookMaster.Status !=?) group by Type,Name';  
-// $query = $this->db->query($subQuery,array('%d-%m-%Y',$fromd,'%d-%m-%Y',$tod,'Cancel',$branch,'WAIVER','REFERRAL','Pending'));
-
-$subQuery="select Name,sum(Amount) as Total,T_DayBookMaster.ID,T_Income_Outcome_Master.ID as SubID,T_Income_Outcome_Master.TypeID as OrgType,T_Income_Outcome_Master.TypeName,T_DayBookMaster.Date,Reason,T_DayBookMaster.Description,ListName from T_DayBookMaster
-left join T_Income_Outcome_Master on  T_Income_Outcome_Master.ID = T_DayBookMaster.Type
-join T_PickListDetails on T_PickListDetails.ListCode = T_Income_Outcome_Master.TypeID
-where str_to_date(date,?)>=? and str_to_date(date,?)<=?  and Status!=? and T_DayBookMaster.BranchCode=?  and (case when ListName = 'Income' then T_DayBookMaster.ModeOfPayment != 'WAIVER' and T_DayBookMaster.ModeOfPayment != 'REFERRAL'and T_DayBookMaster.Status !='Pending' and T_Income_Outcome_Master.TypeName NOT LIKE '%BY CASH%' 
-      when ListName = 'Expense' then T_DayBookMaster.Status !='Pending' and T_Income_Outcome_Master.TypeName != 'FEES' and T_Income_Outcome_Master.TypeName NOT LIKE '%CASH TO%' end) group by Type,Name";
-$query = $this->db->query($subQuery,array('%d-%m-%Y',$fromd,'%d-%m-%Y',$tod,'Cancel',$branch)); 
-
-    //and T_DayBookMaster.Isdaybook=?
+        //and T_DayBookMaster.Isdaybook=?
+            $subQuery="select Name,sum(Amount) as Total,T_DayBookMaster.ID,T_Income_Outcome_Master.ID as SubID,T_Income_Outcome_Master.TypeID as OrgType,T_Income_Outcome_Master.TypeName,T_DayBookMaster.Date,Reason,T_DayBookMaster.Description,ListName from T_DayBookMaster
+        left join T_Income_Outcome_Master on  T_Income_Outcome_Master.ID = T_DayBookMaster.Type
+        join T_PickListDetails on T_PickListDetails.ListCode = T_Income_Outcome_Master.TypeID
+        where ".$where." Status!=? and T_DayBookMaster.BranchCode=?  and (case when ListName = 'Income' then T_DayBookMaster.ModeOfPayment != 'WAIVER' and T_DayBookMaster.ModeOfPayment != 'REFERRAL'and T_DayBookMaster.Status !='Pending' and T_Income_Outcome_Master.TypeName NOT LIKE '%BY CASH%' 
+            when ListName = 'Expense' then T_DayBookMaster.Status !='Pending' and T_Income_Outcome_Master.TypeName != 'FEES' and T_Income_Outcome_Master.TypeName NOT LIKE '%CASH TO%' end) group by Type,Name";
+        $query = $this->db->query($subQuery,array('Cancel',$branch)); 
          $expense = $query->result(); 
-
-        
-       if(count($expense)>0)
-       {
-        $results['fullexpense_detail'] = $expense;
-       }     
+        //  print_r($this->db->last_query());
+        // die();
+        if(count($expense)>0)
+        {
+            $results['fullexpense_detail'] = $expense;
+        }     
 
 
 
-$subQueryNON = 'select Name,sum(Amount) as Total,T_NonOperationalMaster.ID,T_Income_Outcome_Master.ID as SubID,T_Income_Outcome_Master.TypeID as OrgType,T_Income_Outcome_Master.TypeName,T_NonOperationalMaster.Date,Reason,T_NonOperationalMaster.Description,ListName 
-from T_NonOperationalMaster 
-left join T_Income_Outcome_Master on T_Income_Outcome_Master.ID = T_NonOperationalMaster.Type 
-join T_PickListDetails on T_PickListDetails.ListCode = T_Income_Outcome_Master.TypeID 
-where str_to_date(date,?)>=? and str_to_date(date,?)<=? 
-and Status!=? and T_NonOperationalMaster.BranchCode=? and T_NonOperationalMaster.Isdaybook=? group by Type,Name';
+        $subQueryNON = 'select Name,sum(Amount) as Total,T_NonOperationalMaster.ID,T_Income_Outcome_Master.ID as SubID,T_Income_Outcome_Master.TypeID as OrgType,T_Income_Outcome_Master.TypeName,T_NonOperationalMaster.Date,Reason,T_NonOperationalMaster.Description,ListName 
+        from T_NonOperationalMaster 
+        left join T_Income_Outcome_Master on T_Income_Outcome_Master.ID = T_NonOperationalMaster.Type 
+        join T_PickListDetails on T_PickListDetails.ListCode = T_Income_Outcome_Master.TypeID 
+        where '.$where.'
+         Status!=? and T_NonOperationalMaster.BranchCode=? and T_NonOperationalMaster.Isdaybook=? group by Type,Name';
 
 
-$queryNon = $this->db->query($subQueryNON,array('%d-%m-%Y',$fromd,'%d-%m-%Y',$tod,'Cancel',$branch,'1')); 
+        $queryNon = $this->db->query($subQueryNON,array('Cancel',$branch,'1')); 
 
     
          $expenseNon = $queryNon->result(); 
+        //  print_r($this->db->last_query());die();
+        
+            if(count($expenseNon)>0)
+            {
+                $results['fullNonOpexpense_detail'] = $expenseNon;
+            }     
 
         
-       if(count($expenseNon)>0)
-       {
-        $results['fullNonOpexpense_detail'] = $expenseNon;
-       }     
-
- 
-       return $results;   
- 
-       //return $query->result_array();
-
-
+            return $results;   
+        
+            //return $query->result_array();
     }
 
 
 
 public function GetPLexcelDetails($from,$to,$branch)
 {
-     $fromd= date("Y-m-d",strtotime($from));
-     $tod=date("Y-m-d",strtotime($to));
+     
+     $fromd= date("d-m-Y",strtotime($from));
+     $tod=date("d-m-Y",strtotime($to));
 
 //      $subQuery='select Name,ListName,Date,T_Income_Outcome_Master.ID,T_Income_Outcome_Master.TypeID as OrgType,T_Income_Outcome_Master.TypeName,
 // SUM(IF(p.Name=? ,Amount,0)) AS OperationalIncome,
@@ -1161,7 +1330,10 @@ public function GetPLexcelDetails($from,$to,$branch)
 
 
 //  $query = $this->db->query($subQuery,array('I002','I002','I001','I001','I002','I002','I001','I001','%d-%m-%Y',$fromd,'%d-%m-%Y',$tod,$branch,'%d-%m-%Y')); 
-
+if($from != null && $to != null){
+    //$where="str_to_date(Date,'%d-%m-%Y')>=str_to_date('".$fromd."','%d-%m-%Y') and str_to_date(Date,'%d-%m-%Y')<=str_to_date('".$tod."','%d-%m-%Y') and";
+      $where="str_to_date(Date,'%d-%m-%Y')>='".$from."' and str_to_date(Date,'%d-%m-%Y')<='".$to."' and";
+}else{$where="";}
 
 $subQuery='select Name,ListName,q.Date as dat,month(str_to_date(Date,?)) as month,year(str_to_date(Date,?)) as Year,
  T_Income_Outcome_Master.ID,T_Income_Outcome_Master.TypeID as OrgType,T_Income_Outcome_Master.TypeName, 
@@ -1174,19 +1346,18 @@ $subQuery='select Name,ListName,q.Date as dat,month(str_to_date(Date,?)) as mont
  from T_NonOperationalMaster as q 
  left Join T_Income_Outcome_Master on T_Income_Outcome_Master.ID= q.Type 
  left Join T_PickListDetails on T_PickListDetails.ListCode=q.Name 
- where str_to_date(Date,?)>=? and str_to_date(Date,?)<=? 
- and q.BranchCode=? group by month';  
+ where '.$where.' q.BranchCode=? group by month';  
 
- $query = $this->db->query($subQuery,array('%d-%m-%Y','%d-%m-%Y','I002','I002','I001','I001','I002','I002','I001','I001','I002','I002','I002','I002','I001','I001','I001','I001','%d-%m-%Y',$fromd,'%d-%m-%Y',$tod,$branch));      
+ $query = $this->db->query($subQuery,array('%d-%m-%Y','%d-%m-%Y','I002','I002','I001','I001','I002','I002','I001','I001','I002','I002','I002','I002','I001','I001','I001','I001',$branch));      
 
-    
-  // print_r($this->db->last_query()); die();
          $expenseNon = $query->result(); 
 
         
        if(count($expenseNon)>0)
        {
         $results['exceldetails'] = $expenseNon;
+       }else{
+        $results = array();
        }     
 
  

Apollo/api/application/models/Employee_model.php

@@ -20,11 +20,13 @@ class Employee_model extends CI_Model
 
     // get login employee profile details
     public function get_emp_prof_detail($empLoginID = null) {
+        // echo "hai i am here don't worry be happy";
+        
         $this->db->select('StaffID');
         $this->db->from(LOGIN);
         $this->db->where('ID', $empLoginID);
         $loginEmpDetail = $this->db->get()->first_row();
-        if ($loginEmpDetail) {
+        if (!empty($loginEmpDetail)) {
             $EmpId = $loginEmpDetail->StaffID;
             $this->db->select('t1.*');
             $this->db->from('' . STAFF . ' as t1');
@@ -32,9 +34,9 @@ class Employee_model extends CI_Model
             // $this->db->join('T_StaffDetails as t2', 't1.StaffID = t2.StaffID', 'LEFT');
             $responseDetails     = $this->db->get()->first_row();
             $result['empStatus'] = true;
-            // print_r($responseDetails->ListCode);exit();
+            print_r($responseDetails);exit();
         
-            if ($responseDetails->ListCode == SUPER_ADMIN) {
+            if (!empty($responseDetails) && $responseDetails->ListCode == SUPER_ADMIN) {
                 //  print_r($result['details']->ListCode);exit();
                 // get branch details for super admin
                 $responseDetails->BranchCode = 'All';
@@ -70,7 +72,7 @@ class Employee_model extends CI_Model
                 // $this->db->join('T_StaffDetails as t2', 't1.StaffID = t2.StaffID', 'LEFT');
                 $branchDetails            = $this->db->get();
                 $result['branchStatus']   = true;
-                $result['work_State'] = $responseDetails->ListCode == ADMIN ? 'Admin' : 'Staff';
+                $result['work_State'] = !empty($responseDetails) && $responseDetails->ListCode == ADMIN ? 'Admin' : 'Staff';
                 $result['branch_details'] = $branchDetails->result();
             }
         } else {

Apollo/api/application/models/Fees_status_model.php

@@ -16,17 +16,24 @@ class Fees_status_model extends CI_Model
      * */
     public function getStudentList($search=null)
     {
-        if($search['MobileNumber']!='' OR $search['Firstname']!='' OR $search['UniversityID']!='' OR $search['CourseID']!=''){ 
-            $this->db->select('ST.StudentID,ST.MobileNumber,ST.Firstname,ST.Lastname,ST.Fathername,ST.EmailID,STC.ID,US.UniversityID,US.UniversityName,CU.CourseID,CU.CourseName,ST.PermanentAddress,if(STC.EnrollmentID = "","",STC.EnrollmentID) as EnrollmentID,US.ProfilePicPath,US.MobileNumber as UnivMobileNumber,US.Address,US.EmailID,ST.MotherName,CU.Specilization1 as Specilization');
+     
+        if($search['MobileNumber']!='' OR $search['Firstname']!='' OR $search['UniversityID']!='' OR $search['CourseID']!='' OR $search['BatchCode']!=''){ 
+            $this->db->select('ST.StudentID,ST.MobileNumber,ST.Firstname,ST.Lastname,ST.Fathername,ST.EmailID,STC.ID,US.UniversityID,US.UniversityName,CU.CourseID,CU.CourseName,ST.PermanentAddress,if(STC.EnrollmentID = "","",STC.EnrollmentID) as EnrollmentID,US.ProfilePicPath,US.MobileNumber as UnivMobileNumber,US.Address,US.EmailID,ST.MotherName,CU.Specilization1 as Specilization,STC.IsActive as CourseActive, STC.Status as CourseStatus,ST.DeactiveComments,ST.IsActive');
+            if($search['BatchCode']!=''){
+                $this->db->select('BA.BatchCode,BA.BatchName');
+            }
             $this->db->from(STUDENTS.' as ST');
             $this->db->join(STUDENTCOURSE.' as STC', 'STC.StudentID = ST.StudentID');
             $this->db->join(COURSE.' as CU', 'CU.CourseID = STC.CourseID');
            // $this->db->join(SESSIONMASTER.' as SM', 'SM.SessionID = STC.SessionID');
             $this->db->join(UNIVERSITY.' as US', 'US.UniversityID = CU.UniversityID');
-            $this->db->where('ST.IsActive','1');
-            $this->db->where('STC.IsActive','1');
+            if($search['BatchCode']!=''){
+            $this->db->join(BATCH.' as BA', 'BA.UniversityID = US.UniversityID AND BA.BranchCode = STC.BranchID');
+            }
+            // $this->db->where('ST.IsActive','1');
+            // $this->db->where('STC.IsActive','1');
             if($search['requestedBranch']!='All'){
-            $this->db->where('STC.BranchID',$search['requestedBranch']);
+                $this->db->where('STC.BranchID',$search['requestedBranch']);
                 $this->db->where('US.BranchCode',$search['requestedBranch']);
                 $this->db->where('CU.BranchCode',$search['requestedBranch']);
             }
@@ -43,6 +50,9 @@ class Fees_status_model extends CI_Model
             if($search['CourseID']!=''){
                 $this->db->where('STC.CourseID',$search['CourseID']);
             }
+            if($search['BatchCode']!=''){
+                $this->db->where('BA.BatchCode',$search['BatchCode']);
+            }
            /* if($search['MobileNumber']!='' AND $search['Firstname']==''){
                 $this->db->where('ST.MobileNumber',$search['MobileNumber']);
             }
@@ -54,7 +64,7 @@ class Fees_status_model extends CI_Model
                 $this->db->where('ST.Firstname',$search['Firstname']);
             }*/
             $searchDetails = $this->db->get();
-
+// print_r($this->db->last_query());die();
             if($searchDetails->result()) {
                 $result_array['studentStatus'] = true;
                 $result_array['details'] = $searchDetails->result();
@@ -490,7 +500,10 @@ class Fees_status_model extends CI_Model
 
     public function updateFees($feesPaidDetails=null,$courseID=null,$feesName=null,$smsDetails=null)
     {
-
+        // print_r($feesPaidDetails);
+        // echo $courseID;
+        // echo $feesName;
+        // die();
 
 
         if($feesPaidDetails['UpdatedBy']=='All'){
@@ -554,7 +567,8 @@ class Fees_status_model extends CI_Model
 
                         $dayBookEntry = $this->insertDayBookMaster($feesPaidDetails,$feesPayedID,$courseID,$feesName);
                         // set message content
-                        $message='Thanks for the payment of Rs.'.$feesPaidDetails['BillAmount'].',BillNo-'. $feesPaidDetails['BillNO'].' for '. strtolower($smsDetails['FeesName']).' your balance fees is Rs.'.$smsDetails['CurrentBalance'].'.';
+                        // $message='Thanks for the payment of Rs.'.$feesPaidDetails['BillAmount'].',BillNo-'. $feesPaidDetails['BillNO'].' for '. strtolower($smsDetails['FeesName']).' your balance fees is Rs.'.$smsDetails['CurrentBalance'].'.';
+                        $message='Thanks for the payment of Rs.'.$feesPaidDetails['BillAmount'].',BillNo-'. $feesPaidDetails['BillNO'].' for '. strtolower($smsDetails['FeesName']).' your balance fees is Rs.'.$smsDetails['CurrentBalance'].'. APOLLO DEC';
                         $studentDetails = $this->get_registered_mobile($feesPaidDetails['StudentID']);
                         $this->smssend($studentDetails->MobileNumber,$message);
                     }
@@ -734,7 +748,7 @@ class Fees_status_model extends CI_Model
     * */
     public function getUniversityDetails($requestedBy=null,$requestedBranch=null)
     {
-        $this->db->select('UniversityID,UniversityName');
+        $this ->db->select('UniversityID,UniversityName');
         $this->db->where('IsActive','1');
         $this->db->where('BranchCode',$requestedBranch);
         $this->db->order_by('CreatedOn','DESC');
@@ -749,6 +763,7 @@ class Fees_status_model extends CI_Model
                 $university_array['universityID'] = $row->UniversityID;
                 $university_array['universityName'] = $row->UniversityName;
                 $university_array['courseDetails']= $this->getCourseDetails($row->UniversityID,$requestedBranch);
+                $university_array['batchDetails']= $this->getBatch($row->UniversityID,$requestedBranch);
                 $result_array[]=$university_array;
             }
             $result_university['univerSityDetails']= $result_array;
@@ -759,6 +774,7 @@ class Fees_status_model extends CI_Model
             $result_university['universityID'] = "";
             $result_university['universityName'] = "";
             $result_university['courseDetails']= "";
+            $result_university['batchDetails']="";
         }
 
 
@@ -785,12 +801,15 @@ class Fees_status_model extends CI_Model
      * created by kms
      * */
     public function getFeesStructureAssign($student=null){
-
+        // print_r($student);die();
         $this->db->select('ID,CourseID,ProgramType,FeesAmount,Sem_Year');
         $this->db->where('CourseID',$student['CourseID']);
         $this->db->order_by('ProgramType');
         $feesDetails = $this->db->get(COURSE_FEES);
         $SNoValue=0;
+        
+        // echo 'count'.count($feesDetails->result());
+        // print_r($this->db->last_query());die();
         if($feesDetails->result()){
 
             $result_array['feesStatus']=true;
@@ -798,22 +817,28 @@ class Fees_status_model extends CI_Model
                 $SNoValue=$SNoValue+1;
                 $this->db->select('SFS.FeesID,SFS.CourseFees,SFS.Comments,SFS.STFOrWR,SFS.Waiver,SFS.Others,SFS.SessionName,SFS.ToSessionName,SFS.RollNo,SFS.BatchCode,SM.SessionName as MasterSessionName,SM1.SessionName as MasterToSessionName,bm.BatchName');
                 $this->db->from(STUDENTS_FEES_STATUS.' as SFS');
-                $this->db->join(SESSIONMASTER.' as SM', 'SM.SessionID = SFS.SessionName');
+                $this->db->join(SESSIONMASTER.' as SM', 'SM.SessionID = SFS.SessionName','left');
                 $this->db->join(SESSIONMASTER.' as SM1', 'SM1.SessionID = SFS.ToSessionName','left');
                 $this->db->join(BATCH.' as bm','bm.BatchCode = SFS.BatchCode','left');
                // $this->db->join(STUDENTS_FEES_PAID.' as SFP', 'SFP.FeesId = SFS.FeesID','left');
                 $this->db->where('SFS.StudentID',$student['StudentID']);
                 $this->db->where('SFS.CourseID',$student['CourseID']);
                 $this->db->where('SFS.FeesType',$row->ID);
+                // if($student['BatchCode'] != ''){
+                //     $this->db->where('SFS.BatchCode',$student['BatchCode']);
+                // }
                 $existFeesDetails = $this->db->get();
-
-               // print_r($this->db->last_query());die();
+            //     print_r($this->db->last_query());die();
+               
+            //    echo 'check Details'.$SNoValue;
+            //    die();
                 if($existData=$existFeesDetails->result()){
                     // count the total paid fees details
                     $this->db->select('FeesId');
                     $this->db->where('FeesId',$existData[0]->FeesID);
+                    //by sanjeev due to daybook details cancel status
                     $this->db->where('IsActive','1');
-                   $countExistPaid = $this->db->get(STUDENTS_FEES_PAID);
+                    $countExistPaid = $this->db->get(STUDENTS_FEES_PAID);
                   if($countExistPaid->num_rows()<=0){
                       $fetchData['PaidStatus']=0;
                   }
@@ -906,6 +931,8 @@ class Fees_status_model extends CI_Model
                 }
 
             }
+            // print_r($fetchData);
+            // die();
            // filter data
             $KilterKey = array_search(1, array_column($CourseFeesArray, 'ExistValue'));
            if($KilterKey=='' OR $KilterKey==null){
@@ -913,8 +940,11 @@ class Fees_status_model extends CI_Model
 
            }
            else{
+               $FilterCourseArray=$CourseFeesArray;
+            
+            
+            /* // by Sanjeev  Due to Requirement Need The Changes Fees for existing Deletetion
                $FilterSNoValue=0;
-
                foreach ($CourseFeesArray as $key => $FilterRow){
                    if($KilterKey<=$key){
                        $FilterSNoValue=$FilterSNoValue+1;
@@ -922,6 +952,7 @@ class Fees_status_model extends CI_Model
                        $FilterCourseArray[]=$FilterRow;
                    }
                }
+            */
 
            }
 
@@ -940,7 +971,8 @@ class Fees_status_model extends CI_Model
         else{
             $result_array['feesStatus']=false;
         }
-
+        // die();
+        // print_r($result_array);die();
         $result_array['sessionDetails'] = $this->getSession($student);
          $result_array['feesetDetails'] = $this->GetFeeSetDetails($student);
 
@@ -1181,38 +1213,33 @@ class Fees_status_model extends CI_Model
      * */
     public function setFees($details=null,$jsonData=null){
 
-  //echo 'in';
+    //echo 'in';
     // print_r($details);
         //print_r($jsonData);
-    //die();
       $RollNo= $details['RollNo'];
 
  
+    
+      if($RollNo !='')
+      {
 
- if($RollNo !='')
- {
+            $this->db->select('*');
+            $this->db->from('T_Students_Fees_Status');
+            $this->db->where('RollNo',$RollNo);
+            $this->db->where('CourseID',$details['CourseID']);
+            $this->db->where('StudentID !=',$details['StudentID']);
+            $qry=$this->db->get();
+            $qry=$qry->result();
 
-$this->db->select('*');
-$this->db->from('T_Students_Fees_Status');
-$this->db->where('RollNo',$RollNo);
-$this->db->where('CourseID',$details['CourseID']);
-$this->db->where('StudentID !=',$details['StudentID']);
-$qry=$this->db->get();
-$qry=$qry->result();
+            if(count($qry)>0)
+            {
+                $result['setStatus'] = false;
+                $result['message'] = "RollNo Already Exists";
 
-//print_r($this->db->last_query());die();
-//echo count($qry);die();
+                return $result;
 
-if(count($qry)>0)
-{
-   $result['setStatus'] = false;
-   $result['message'] = "RollNo Already Exists";
-
-    return $result;
-
- 
-}
-}  
+            }
+       }  
 
 
 
@@ -1221,6 +1248,43 @@ if(count($qry)>0)
         $this->db->where('StudentID', $details['StudentID']);
         $this->db->where('FeesType', $details['FeesType']);
         $checkExist=$this->db->get(STUDENTS_FEES_STATUS);
+
+        // $this->db->select('SFS.FeesType,CF.Sem_Year,CF.ProgramType');
+        // $this->db->from(STUDENTS_FEES_STATUS.' as SFS');
+        // $this->db->join(COURSE_FEES.' as CF', 'CF.ID = SFS.FeesType');
+        // $this->db->where('SFS.CourseID',$details['CourseID']);
+        // $this->db->where('SFS.StudentID',$details['StudentID']);
+        // $result = $this->db->get()->result_array();    
+
+        $this->db->select('ID')->from(COURSE_FEES)->where('CourseID',$details['CourseID']);
+        $result2 = $this->db->get()->first_row();
+        $CF_FeeID = $result2->ID;
+
+        $check = 0;// id has value means Sem1 Already Exist so NewReg Set t0 0 no value in ID(which means Empty) newreg value 1;
+        // This for Fees Type
+        if($CF_FeeID ==  $details['FeesType']){
+            $check = 0;
+        }else{
+            $check++;
+        }
+        // echo count($result);
+        // for($j=0;$j<count($result);$j++)
+        // {
+        //    $a = $result[$j]['Sem_Year']; 
+        //    $b = $result[$j]['ProgramType']; 
+        //    $c = strtoupper(str_replace(' ','',$a));
+        // //    if(($c == 'SEM1' || $c == '1SEM' || $c == 'YEAR1' || $c == '1YEAR') && ($b == REGULARFEES || $b == SEMYEARFEES)){$check++;}
+        // //    if(($c == 'SEM3' || $c == '3SEM' || $c == 'YEAR2' || $c == '2YEAR') && ($b == LATERALFEES || $b == SEMYEARFEES)){$check++;}
+        //    $d = strtoupper(str_replace(' ','',$sem_year));
+        //     if($c == $d){$check++;}
+        // }
+        // select cf.Sem_Year
+        // from T_Students_Fees_Status sfs
+        // left join T_Course_Fees_Details cf on sfs.CourseID = cf.CourseID
+        // where sfs.StudentID = 4101 and cf.CourseID = 22 and cf.ID =748;
+
+        // If feesstatus table has value means Updating the Details. 
+        // No Value means Inserting (in else part)
         if($checkExist->result()){
           $feesId = $checkExist->result();
             $updateDetails['CourseFees'] = $details['CourseFees'];
@@ -1246,6 +1310,7 @@ if(count($qry)>0)
                 $insertInstallment['CreatedOn'] = $details['CreatedOn'];
                 if($jrow['ID'] =='' OR $jrow['ID'] =='undefined'){
                     $this->db->insert(FEES_INSTALLMENT, $insertInstallment);
+                    //tbl 2 Fees Installament.
                 }
                 else{
                     $updateInstallment['FeesID'] = $installmentFeesID;
@@ -1262,7 +1327,7 @@ if(count($qry)>0)
 
 
             }
-
+            //feeid Update on fees Status Table
             $this->db->where('FeesID', $feesId[0]->FeesID);
             $this->db->update(STUDENTS_FEES_STATUS, $updateDetails);
             $result['setStatus'] = true;
@@ -1270,6 +1335,7 @@ if(count($qry)>0)
 
         }
         else{
+
             $this->db->insert(STUDENTS_FEES_STATUS, $details);
 
             $this->db->select('FeesID,BatchCode,StudentID,CourseID,FeesType');
@@ -1316,44 +1382,48 @@ if(count($qry)>0)
 
         }
 
-$fromd= date("d-m-Y",strtotime($details['CreatedOn']));
-
-
-if(($details['FeesType']=='PPC') || ($details['FeesType']=='TC')|| ($details['FeesType']=='MC')
+            $fromd= date("d-m-Y",strtotime($details['CreatedOn']));
+            // 'PPC' 'TC' 'MC' 'DC' means also updated in  Applicationstatus 
+            if(($details['FeesType']=='PPC') || ($details['FeesType']=='TC')|| ($details['FeesType']=='MC')
     || ($details['FeesType'] == 'DC'))
 {
 
-        $this->db->select('ListCode');
-        $this->db->from('T_PickListDetails');
-        $this->db->where('ListName','EXPECTED'); 
-        $this->db->where('BranchCode',$details['BranchCode']);
+                $this->db->select('ListCode');
+                $this->db->from('T_PickListDetails');
+                // $this->db->where('ListName','EXPECTED'); 
+                $this->db->where('ListName','BLANK');
+                $this->db->where('IsActive',1); 
+                $this->db->where('BranchCode',$details['BranchCode']);
 
-        $searchDetails = $this->db->get();
-        $getId=$searchDetails->result();
+                $searchDetails = $this->db->get();
+                $getId=$searchDetails->result();
 
-        $listcode='';
+                $listcode='';
 
-        foreach($getId as $ge)
-        {
-           $listcode=$ge->ListCode;
-        }
+                foreach($getId as $ge)
+                {
+                $listcode=$ge->ListCode;
+                }
+                
 
-         $appstatus['StudentID'] = $details['StudentID'];
-         $appstatus['CourseID'] =  $details['CourseID'];
-         $appstatus['BranchCode'] = $details['BranchCode'];
-         $appstatus['ListCode'] = $listcode;
-         $appstatus['AppDate'] = $fromd; 
-         $appstatus['Comments'] = 'Fees for the student has been set';
-         $appstatus['CreatedBy']= $details['CreatedBy'];
-         $appstatus['CreatedOn'] = $details['CreatedOn'];
-         $appstatus['CertificationType'] =$details['FeesType'];
-         $this->db->insert('T_ApplicationStatus', $appstatus);
+                $appstatus['StudentID'] = $details['StudentID'];
+                $appstatus['CourseID'] =  $details['CourseID'];
+                $appstatus['BranchCode'] = $details['BranchCode'];
+                $appstatus['ListCode'] = $listcode;
+                $appstatus['AppDate'] = $fromd; 
+                $appstatus['Comments'] = 'Fees for the student has been set';
+                $appstatus['CreatedBy']= $details['CreatedBy'];
+                $appstatus['CreatedOn'] = $details['CreatedOn'];
+                $appstatus['CertificationType'] =$details['FeesType'];
+                $this->db->insert('T_ApplicationStatus', $appstatus);
           
 
-  }
+        }
         // update registration details
         if($jsonData){
-            $this->updateRegistrationDetails($details,$installmentFeesID);
+            //check point 1
+            //also insert the status on Help of Register tbl id  T_ApplicationFormStatus;
+            $this->updateRegistrationDetails($details,$installmentFeesID,$check);
         }
 
         return $result;
@@ -1363,29 +1433,34 @@ if(($details['FeesType']=='PPC') || ($details['FeesType']=='TC')|| ($details['Fe
      * insert registration details while set fees
      * created by kms
      * */
-    public  function updateRegistrationDetails($details=null,$feesStatusID=null){
-
-
+    public  function updateRegistrationDetails($details=null,$feesStatusID=null,$check){
         $regId='';
         $this->db->select('Student_Fee_Status_Id,RegistrationMode');
         $this->db->where('CourseID', $details['CourseID']);
         $this->db->where('StudentID', $details['StudentID']);
         $checkCourseFees=$this->db->get(REGISTRATIONDETAILS);
-        if($checkCourseFees->num_rows()<=0){
-            // insert registration details table
 
-           // $regId= $feesStatusID;
-        $inserRegistartion['Student_Fee_Status_Id']=$feesStatusID;
-        $inserRegistartion['BatchCode']=$details['BatchCode'];
-        $inserRegistartion['StudentID']=$details['StudentID'];
-        $inserRegistartion['CourseID']=$details['CourseID'];
-        $inserRegistartion['FeeType']=$details['FeesType'];
-        $inserRegistartion['RegistrationMode']=1;
-        $inserRegistartion['RegistrationType']=NEWREGISTRATION_CONST;
-        $inserRegistartion['BranchCode']=$details['BranchCode'];
-        $inserRegistartion['CreatedBy']=$details['CreatedBy'];
-        $inserRegistartion['CreatedOn']=$details['CreatedOn'];
-         $getlastid= $this->db->insert(REGISTRATIONDETAILS, $inserRegistartion);
+        // $sql = "select cf.Sem_Year
+        // from T_Students_Fees_Status sfs
+        // left join T_Course_Fees_Details cf on sfs.CourseID = cf.CourseID
+        // where sfs.StudentID = ? and cf.CourseID =  ? and cf.ID = ?" ;
+        // $late = $this->db->query($sql);
+
+        if($checkCourseFees->num_rows()<=0){
+                // insert registration details table
+
+                // $regId= $feesStatusID;
+                $inserRegistartion['Student_Fee_Status_Id']=$feesStatusID;
+                $inserRegistartion['BatchCode']=$details['BatchCode'];
+                $inserRegistartion['StudentID']=$details['StudentID'];
+                $inserRegistartion['CourseID']=$details['CourseID'];
+                $inserRegistartion['FeeType']=$details['FeesType'];
+                $inserRegistartion['RegistrationMode']=1;
+                $inserRegistartion['RegistrationType']=NEWREGISTRATION_CONST;
+                $inserRegistartion['BranchCode']=$details['BranchCode'];
+                $inserRegistartion['CreatedBy']=$details['CreatedBy'];
+                $inserRegistartion['CreatedOn']=$details['CreatedOn'];
+                $getlastid= $this->db->insert(REGISTRATIONDETAILS, $inserRegistartion);
         
 
         }
@@ -1399,32 +1474,30 @@ if(($details['FeesType']=='PPC') || ($details['FeesType']=='TC')|| ($details['Fe
                 $updateRegistration['UpdatedBy']=$details['CreatedBy'];
                 $updateRegistration['UpdatedOn']=$details['CreatedOn'];
                 $this->db->where('Student_Fee_Status_Id',$feesStatusID);
-               $getlastid= $this->db->update(REGISTRATIONDETAILS, $updateRegistration);
+                $getlastid= $this->db->update(REGISTRATIONDETAILS, $updateRegistration);
               
              
-            // $regId= $feesStatusID;
-            
-
-
+                // $regId= $feesStatusID;
             }
             else{
+
                 $reRegistartion['Student_Fee_Status_Id']=$feesStatusID;
                 $reRegistartion['BatchCode']=$details['BatchCode'];
                 $reRegistartion['StudentID']=$details['StudentID'];
                 $reRegistartion['CourseID']=$details['CourseID'];
                 $reRegistartion['FeeType']=$details['FeesType'];
-                $reRegistartion['RegistrationMode']=0;
-                $reRegistartion['RegistrationType']=RE_REGISTRATION_CONST;
+                $reRegistartion['RegistrationMode']= $check > 0 ? 0 : 1;
+                $reRegistartion['RegistrationType']= $check > 0 ? RE_REGISTRATION_CONST : NEWREGISTRATION_CONST;
                 $reRegistartion['BranchCode']=$details['BranchCode'];
                 $reRegistartion['CreatedBy']=$details['CreatedBy'];
                 $reRegistartion['CreatedOn']=$details['CreatedOn'];
-               $getlastid= $this->db->insert(REGISTRATIONDETAILS, $reRegistartion);
+                $getlastid= $this->db->insert(REGISTRATIONDETAILS, $reRegistartion);
           
                // $regId= $feesStatusID;
             }
         }
 
-$REGID='';
+        $REGID='';
         if($getlastid)
         {
             $this->db->select('max(ID) as ID'); 
@@ -1443,30 +1516,26 @@ $REGID='';
         }
 
 
-// print_r($getlastid);
-
-
-  //      echo 'in';
-// die();
         $this->db->select('ListCode');
         $this->db->from('T_PickListDetails');
-        $this->db->where('ListName','EXPECTED'); 
+        // $this->db->where('ListName','EXPECTED');
+        $this->db->where('ListName','BLANK');
+        $this->db->where('IsActive',1);  
         $this->db->where('BranchCode',$details['BranchCode']);
 
         $searchDetails = $this->db->get();
         $getId=$searchDetails->result();
 
         $listcode='';
-
+        // Expected Remove because mentioned ON Apollo XL sheet(30.11.2020)
         foreach($getId as $ge)
         {
            $listcode=$ge->ListCode;
         }
-
+        
         
 
-
-         $fromd= date("d-m-Y",strtotime($details['CreatedOn']));
+        $fromd= date("d-m-Y",strtotime($details['CreatedOn']));
        
           $upappform['BranchCode']=$details['BranchCode'];
           $upappform['AppFormDate']=$fromd; 
@@ -1536,6 +1605,10 @@ $REGID='';
                 $insertArray['Type'] = $getIncome->ID;
                 $checkInsertIn=$this->add_dayBook($insertArray);
                 if($checkInsertIn['addDayBookStatus']==true AND $data['ModeOfPayment']!='CASH'){
+                    //online daybook entry with only INCOME
+                    if($data['ModeOfPayment']!='REFERRAL' AND $data['ModeOfPayment']!='WAIVER'){
+                        $checkInsertOut=$this->add_dayBook_online($insertArray);
+                    }
                     // this is for expense come entry
                     $now1 = new DateTime();
                     $now1->setTimezone(new DateTimezone('Asia/Kolkata'));
@@ -1568,7 +1641,7 @@ $REGID='';
                         $expenseArray['Type'] = $getOutcome->ID;
                        /* $this->db->insert(DAYBOOKMASTER, $expenseArray);*/
                         $checkInsertOut=$this->add_dayBook($expenseArray);
-
+                        
                     }
 
                 }
@@ -1582,6 +1655,7 @@ $REGID='';
             return false;
         }
     }
+
     /*
     * send notification for student
     * created by kms
@@ -1611,7 +1685,7 @@ $REGID='';
 
                if($row->Amount > $getStudentPaiDetails[0]->BillAmount){
                    $studentDetails = $this->get_registered_mobile($row->StudentID);
-                   $message ="Dear ". strtolower($studentDetails->Firstname)." your ". strtolower($row->Name)." installment due is on $row->DueDate.Please clear the dues.";
+                   $message ="Dear ". strtolower($studentDetails->Firstname)." your ". strtolower($row->Name)." installment due is on $row->DueDate.Please clear the dues. APOLLO DEC";
 
                   $this->smssend($studentDetails->MobileNumber,$message);
               }
@@ -1639,7 +1713,7 @@ $REGID='';
                 $getStudentPaiDetails1 = $this->db->get()->result();
                 if($row1->Amount > $getStudentPaiDetails1[0]->BillAmount){
                     $studentDetails1 = $this->get_registered_mobile($row1->StudentID);
-                    $message1 ="Dear ". strtolower($studentDetails1->Firstname)." your ". strtolower($row1->Name)." installment due is on $row1->DueDate.Please clear the dues.";
+                    $message1 ="Dear ". strtolower($studentDetails1->Firstname)." your ". strtolower($row1->Name)." installment due is on $row1->DueDate.Please clear the dues. APOLLO DEC";
 
                     $this->smssend($studentDetails1->MobileNumber,$message1);
                 }
@@ -1674,7 +1748,8 @@ $REGID='';
                    $this->updateFeesStatusInCallTrack($row2->StudentID,$row2->CourseID);
                    // send notification to student
                     $getStudentPaiDetails2 = $this->get_registered_mobile($row2->StudentID);
-                    $message2 ="Dear ". strtolower($getStudentPaiDetails2->Firstname)." your ". strtolower($row2->Name)." installment date is overdue.Please clear this immediately.Ignore if already paid.";
+                    // $message2 ="Dear ". strtolower($getStudentPaiDetails2->Firstname)." your ". strtolower($row2->Name)." installment date is overdue.Please clear this immediately.Ignore if already paid.";
+                    $message2 ="Dear ". strtolower($getStudentPaiDetails2->Firstname)." your ". strtolower($row2->Name)." installment date is overdue.Please clear this immediately.Ignore if already paid. APOLLO DEC";
                     $this->smssend($getStudentPaiDetails2->MobileNumber,$message2);
 
                 }
@@ -1955,7 +2030,10 @@ $REGID='';
             $this->db->where('ListName','NOT APPLICABLE');
         }
         else{
-            $this->db->where('ListName','EXPECTED');
+            // Status 
+            // $this->db->where('ListName','Fees update Status');
+            // $this->db->where('ListName','EXPECTED');
+            $this->db->where('ListName','BLANK');
         }
 
         $this->db->where('BranchCode',$feesDetails['UpdatedBy']);
@@ -1971,7 +2049,7 @@ $REGID='';
             $this->db->where('SFP.FeesId',$feesDetails['FeesId']);
             $this->db->where('SFP.IsActive','1');
             $existDetails = $this->db->get();
-            if($existDetails->num_rows()>1){
+            if($existDetails->num_rows()>0){
                 return true;
             }
             else{
@@ -2175,6 +2253,53 @@ $REGID='';
         }
         return $result;
     }
+
+    public function add_dayBook_online($Arr)
+    {
+        // print_r($Arr);
+        // exit;
+        $branch = $Arr['BranchCode'];
+        $sql = "SELECT * FROM ".DAYBOOKMASTERONLINE." WHERE BranchCode = '$branch'
+            ORDER BY  ID DESC";
+             $prevBalance = 0;
+        $latestUpdate = $this->db->query($sql);
+        $latestUpdateDetails = $latestUpdate->result();
+// print_r($latestUpdateDetails);
+// exit;
+          If(is_array($latestUpdateDetails) && count($latestUpdateDetails)>0)
+        {
+        $prevBalance = $latestUpdateDetails[0]->Balance;
+
+        $vNo = count($latestUpdateDetails)  + 1;
+        $Arr['VoucherNumber'] = $branch.'-O'.$vNo;
+        }else{
+            $prevBalance = 0;
+            $Arr['VoucherNumber'] = $branch.'-O'. 1;
+        }
+        
+        if($Arr['Name'] == 'I002') {
+            //Income
+            $Arr['Balance'] = $prevBalance + $Arr['Amount'];
+        }else if ($Arr['Name'] == 'I001') {
+            //Expense
+            $Arr['Balance'] = $prevBalance - $Arr['Amount'];
+        } else {
+            $Arr['Balance'] = 0;
+        }
+        // $Arr['VoucherNumber'] =>  $vNo_format = $branch.'O'.'-'.$vNo;
+        // print_r($Arr);
+        // exit;
+        $this->db->insert(DAYBOOKMASTERONLINE, $Arr);
+        if ($this->db->affected_rows() == '1') {
+                    $result['addDayBookStatus'] = true;
+                    $result['message']      = "Successfully DayBook Details Added";
+        } else {
+            $result['addDayBookStatus'] = false;
+            $result['message']      = "Something went wrong.please try again";
+        }
+        return $result;
+    }
+
         /*delete set fees details
         created by kms
         */
@@ -2321,4 +2446,15 @@ $REGID='';
             }
         }
 
+        public function getBatch($universityID=null,$br=null)
+    {
+        $this->db->select('BatchCode,BatchName,str_to_date(BatchDate, "%d-%m-%Y") BatchDate');
+        $this->db->where('UniversityID',$universityID);
+        //$this->db->where('IsActive','1');
+        $this->db->where('BranchCode',$br);
+        $this->db->order_by('BatchDate','DESC');
+        $batchDetails = $this->db->get(BATCH);
+        return $batchDetails->result();
+    }
+
 }

Apollo/api/application/models/Forgot_model.php

@@ -89,7 +89,8 @@ class Forgot_model extends CI_Model {
         // echo $mobile;
         // echo $messa;
         // die();
-        $message ="Your new password for logging into Apollo student portal is $messa. Please change the password as soon as you login.";
+        // $message ="Your new password for logging into Apollo student portal is $messa. Please change the password as soon as you login.";
+        $message ="Your new password for logging into Apollo student portal is $messa. Please change the password as soon as you login. APOLLO DEC";
         $mobile = "91$mobile";
    
         $message = urlencode($message);

Apollo/api/application/models/Login_model.php

@@ -204,12 +204,14 @@ class Login_model extends CI_Model
             foreach($searchDetails->result() as $mo)
             {
                 $contact = $mo->MobileNumber;
+                // $contact = "9092279559";
+                // $contact = "6369084112";
             }
 
           
                 $string2 = str_shuffle('1234567890');   
                 $otp = substr($string2,0,6);
-                 //$otp = '431528';
+                // $otp = '431528';
                 
                  $save['OTP'] = $otp;
                  $save['UpdatedOn'] = date('Y-m-d H:i:s');
@@ -222,6 +224,7 @@ class Login_model extends CI_Model
               
                  if($query == 1)
                  { 
+
                      $sms = $this->smssend($mobileno,$otp);
                  }
 
@@ -765,7 +768,8 @@ class Login_model extends CI_Model
         
         //echo $mobile;
         
-         $message ="Your One Time Password to Login to apollodec.com is $OTP. This is valid for 10 minutes.";
+        //  $message ="Your One Time Password to Login to apollodec.com is $OTP. This is valid for 10 minutes.";
+         $message ="Your One Time Password to Login to apollodec.com is $OTP. This is valid for 10 minutes. APOLLO DEC";
          $mobile = "91$mobile";
         $message = urlencode($message);
        // echo $message;die;

Apollo/api/application/models/Reports_model.php

@@ -7,7 +7,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
 
 class Reports_model extends CI_Model
 {
-    public function status($bat=null,$br=null,$u=null){
+    public function status($bat=null,$br=null,$u=null,$s=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(bal.balpayable,0) as Balance_fee,ifnull(sfp.bdate,'-') as Initial_paid_date, ifnull(std.AlternateNumber,'-') as AlternateNumber,ifnull(std.address,'-') as address,cm.uid as univID,ifnull(apdate.appdate,'-') as appdate
         from 
@@ -56,11 +56,15 @@ group by sid,sem) as apdate on apdate.sid=sms.sid and apdate.sem=sms.sem
             $sql.=" and cm.uid = '".$u."'";
           
           }
+          if($s != ''){
+                if($s=="all"){ $sql.=""; }
+                else{ $sql.="and list.lcode = '".$s."'"; }
+          }
           $sql.=" group by Student_id,Course_id,Branch,Batch_code,Sem,univID";
           
         $leadDet=$this->db->query($sql);
         $statusDetails = $leadDet->result();
-		//print_r($this->db->last_query());die();
+		// print_r($this->db->last_query());die();
 		
         if (count($statusDetails) > 0) {
             $results['statusList']      = true;
@@ -74,7 +78,6 @@ group by sid,sem) as apdate on apdate.sid=sms.sid and apdate.sem=sms.sem
     
     }
     public function filters($br){
-       
         //University name
         $sql = "SELECT distinct UniversityID as uid,UniversityName as university FROM T_UniversityMaster
         where BranchCode = '".$br."'";
@@ -122,16 +125,18 @@ 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,bal.balpayable as Balance_Fee,ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber,ifnull(appdate,'-') as appdate,ifnull(ansdate,'-') as ansdate  
+    public function markcard($bat=null,$br=null,$u=null,$st=null,$from=null,$to=null){
+        $sql_old = "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,ifnull(appdate,'-') as appdate,ifnull(ansdate,'-') as ansdate  
+        ,scd.coursestatus as Course_Status,ifnull(andate.courierdetails,'-') as Courier_Details,IFNULL(sfs.batchname, '-') AS Batch_Name
         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
+        (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,c.CreatedOn FROM T_CertificationStatus c
  left join T_PickListDetails p on p.ListCode=c.ListCode
 WHERE c.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 FeesID as fid,BatchCode as batch,StudentID as sid,RollNO as rollno,CourseID as cid,FeesType as ftype,sum(CourseFees) as cf,Sum(STFOrWR) as stf,sum(Others) as others FROM T_Students_Fees_Status
+        (SELECT FeesID as fid,T_Students_Fees_Status.BatchCode AS batch,T_BatchMaster.BatchName as batchname,StudentID as sid,RollNO as rollno,CourseID as cid,FeesType as ftype,sum(CourseFees) as cf,Sum(STFOrWR) as stf,sum(Others) as others 
+        FROM T_Students_Fees_Status
+        left join T_BatchMaster on T_BatchMaster.BatchCode = T_Students_Fees_Status.BatchCode
         group by sid,fid,cid,batch) as sfs on sfs.sid=sms.sid and sms.cid=sfs.ftype
         left join
         (SELECT StudentID as sid,FeesId as fid,BillDate as bdate,sum(BillAmount) as bamount,BillNO as billno FROM T_Students_Fees_PaidDetails
@@ -151,9 +156,9 @@ order by CourseID) as cm
         on cm.cid=cfd.ccid
         left join 
         (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,concat(FirstName,' ',Lastname) 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 (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,EnrollmentID as eid,BranchID as branch,ifnull(Status,'-') as coursestatus FROM T_Student_CourseDetails) as scd on scd.sid=sms.sid
 left join (select ID,StudentID as sid,Sem,
-if(ListName = 'SENT TO UNIVERSITY', AnsDate,'-') as ansdate
+if(ListName = 'SENT TO UNIVERSITY', AnsDate,'-') as ansdate,CourierDetails as courierdetails
 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)
@@ -167,8 +172,86 @@ 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."'  
         ";
-       
-        if ($bat!= ''){
+        $sql = "SELECT sfs.fid,
+        ifnull(sfs.sid,'-') AS Student_id,
+        if(scd.eid = '','-',ifnull(scd.eid,'-')) as Enrollment_id,
+        if(sfs.rollno = '','-',ifnull(sfs.rollno, '-')) as Roll_NO,
+        if(std.name = '','-',ifnull(std.name,'-')) AS Student_name,
+        if(std.father = '','-',ifnull(std.father,'-')) AS Father_name,
+        if(std.phone = '','-',ifnull(std.phone,'-')) AS Phone_number,
+        if(sfs.ftype = '','-',ifnull(sfs.ftype,'-')) AS Course_id,
+        if(sms.cdate = '','-',ifnull(sms.cdate,'-')) AS Date,
+        if(cfd.syear = '','-',ifnull(cfd.syear,'-')) AS Sem_year,
+        if(sms.sem = '','-',ifnull(sms.sem,'-')) AS Sem,
+        if(sfs.batch = '','-',ifnull(sfs.batch,'-')) AS Batch_code,
+        if(sms.branch = '','-',ifnull(sms.branch,'-')) AS Branch_code,
+        if(cm.course = '','-',ifnull(cm.course,'-')) AS Course_name,
+        if(cm.uname = '','-',ifnull(cm.uname,'-')) AS University,
+        if(list.status = '','-',ifnull(list.status,'-')) AS Status,
+        if(sfp.bdate = '','-',ifnull(sfp.bdate,'-')) AS Initial_paid_date,
+        bal.balpayable AS Balance_Fee,
+        if(std.address = '','-',ifnull(std.address,'-')) AS address,
+        if(std.AlternateNumber = '','-',ifnull(std.AlternateNumber,'')) AS AlternateNumber,
+        if(appdate = '','-',ifnull(appdate,'-')) AS appdate,
+        if(ansdate = '','-',ifnull(ansdate,'-')) AS ansdate  ,
+        scd.coursestatus AS Course_Status,
+        if(andate.Comments = '','-',ifnull(andate.Comments,'-')) AS AnswerbookSerialNo,
+        if(andate.courierdetails = '','-',ifnull(andate.courierdetails,'-')) AS Courier_Details,
+        if(sfs.batchname = '','-',IFNULL(sfs.batchname, '-')) AS Batch_Name
+        FROM (SELECT FeesID AS fid,T_Students_Fees_Status.BatchCode AS batch,T_BatchMaster.BatchName AS batchname,StudentID AS sid,RollNO AS rollno,CourseID AS cid,FeesType AS ftype,sum(CourseFees) AS cf,Sum(STFOrWR) AS stf,sum(Others) AS others , T_Students_Fees_Status.BranchCode AS branch
+              FROM T_Students_Fees_Status
+              LEFT JOIN T_BatchMaster ON T_BatchMaster.BatchCode = T_Students_Fees_Status.BatchCode
+              GROUP BY sid,fid,cid,batch) AS sfs 
+        LEFT JOIN
+            (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,c.CreatedOn 
+            FROM T_CertificationStatus c
+            LEFT JOIN T_PickListDetails p ON p.ListCode=c.ListCode
+            WHERE c.ID IN (SELECT max(ID) FROM T_CertificationStatus GROUP BY StudentID,CourseID,BranchCode,Sem)
+            GROUP BY sid,sem,cid,lcode,branch) AS sms 
+         ON sfs.sid=sms.sid AND sms.cid=sfs.ftype and sms.branch ='".$br."'  
+        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) 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=sfs.ftype 
+        LEFT JOIN 
+            (SELECT ListCode AS lcode,ListName AS STATUS FROM T_PickListDetails) AS list
+         ON list.lcode=sms.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
+        LEFT JOIN 
+            (SELECT StudentID AS sid,MobileNumber AS phone,IsActive AS active,concat(FirstName,' ',Lastname) AS NAME,Fathername AS father,PermanentAddress AS address,AlternateNumber  FROM T_StudentDetails) AS std  
+         ON std.sid=sfs.sid 
+        LEFT JOIN 
+            (SELECT StudentID AS sid,UniversityID AS uid,CourseID AS cid,EnrollmentID AS eid,BranchID AS branch,ifnull(STATUS,'-') AS coursestatus FROM T_Student_CourseDetails) AS scd 
+         ON scd.sid=sfs.sid AND scd.cid = sfs.cid
+        LEFT JOIN 
+            (SELECT ID,StudentID AS sid,Sem,CourseID,Comments,
+            IF(ListName = 'SENT TO UNIVERSITY', AnsDate,'-') AS ansdate,CourierDetails AS courierdetails
+            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,CourseID)
+            GROUP BY sid,Sem,CourseID) AS andate 
+         ON andate.sid = sfs.sid AND andate.Sem = cfd.syear AND andate.CourseID = sfs.ftype
+        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 
+            FROM T_Registration_Details rd
+            LEFT JOIN T_ApplicationFormStatus afs ON afs.Registration_Details_ID=rd.ID
+            LEFT JOIN T_PickListDetails `list` ON list.ListCode=afs.ListCode 
+            LEFT JOIN T_Course_Fees_Details cf ON cf.ID=rd.FeeType
+            GROUP BY sid,sem) AS apdate 
+        ON apdate.sid=sfs.sid AND apdate.sem=cfd.syear
+        LEFT JOIN BalFees bal ON bal.student=sfs.sid AND bal.feestype=sfs.ftype AND bal.semyr=cfd.syear  AND bal.totalpayable is not null
+        where std.active = 1  and sfs.branch = '".$br."'  ";
+ 
+          if ($bat!= ''){
       
             $sql.=" and sfs.batch = '".$bat."'";
           
@@ -178,8 +261,28 @@ left join BalFees bal on bal.student=sms.sid and bal.feestype=sms.cid and bal.se
             $sql.=" and cm.uid = '".$u."'";
           
           }
+          if ($st != ''){
+            if($st=="all"){ $sql.="";}
+            else{ 
+                $getStatusName =$this->db->query("Select ListName from T_PickListDetails where ListCode = '".$st."' and BranchCode = '".$br."' and IsActive ='1'")->row();
+                if($getStatusName->ListName == "BLANK"){
+                    $sql.="and ((list.lcode IS null) OR (list.status = 'BLANK'))"; 
+                }else{
+                    $sql.="and list.lcode = '".$st."'"; }
+                }
+          }
+          if ($from != ''){
+            $fromd= date("Y-m-d",strtotime($from));
+            $sql.="and sms.CreatedOn >= '".$fromd."'";
+          }
+          if ($to != ''){
+            $tod=date("Y-m-d",strtotime($to));
+            $sql.=" and sms.CreatedOn <= '".$tod."'";
+          }   
+          $sql.=" and sfs.fid IS not null";
+          $sql.=" AND (scd.coursestatus IS NULL OR (scd.coursestatus != 'Refund_issued' AND scd.coursestatus != 'Discontinued' AND scd.coursestatus != 'Cancelled'))";
           $sql.=" group by Student_id,Course_id,Batch_code,Branch_code,Sem,Sem_year";
-          
+        // print_r($sql);die();
         $leadDet=$this->db->query($sql);
         $mstatusDetails = $leadDet->result();
         if (count($mstatusDetails) > 0) {
@@ -193,7 +296,7 @@ left join BalFees bal on bal.student=sms.sid and bal.feestype=sms.cid and bal.se
         return $results;
     
     }
-    public function certificate_status($bat=null,$br=null,$u=null,$from=null,$to=null){
+    public function certificate_status($bat=null,$br=null,$u=null,$from=null,$to=null,$st=null){
        
         // $sql = "select sms.sid as Student_id,sms.cid,ifnull(sms.status,'-') as status,ifnull(sms.adate,'-') as adate,ifnull(sms.acmts,'-') as acmts,ifnull(sms.ctype,'-') as ctype,ifnull(sms.certname,'-') as certname,ifnull(balance,'-') as balance,ifnull(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 
@@ -237,10 +340,11 @@ left join BalFees bal on bal.student=sms.sid and bal.feestype=sms.cid and bal.se
         // (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,concat(FirstName,' ',Lastname) 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
-       $sql ="SELECT sms.sid AS Student_id,sms.cid,ifnull(sms.status,'-') AS STATUS,ifnull(sms.adate,'-') AS adate,ifnull(sms.acmts,'-') AS acmts,ifnull(sms.ctype,'-') AS ctype,ifnull(sms.certname,'-') AS certname,ifnull(balance,'-') AS balance,ifnull(sfb.bdate,'-') 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
+       $sql1 ="SELECT sms.sid AS Student_id,sms.cid,ifnull(sms.status,'-') AS STATUS,ifnull(DATE_FORMAT(sms.adate, '%d-%m-%Y'),'-') AS adate,ifnull(sms.acmts,'-') AS acmts,ifnull(sms.ctype,'-') AS ctype,ifnull(sms.certname,'-') AS certname,ifnull(balance,'-') AS balance,ifnull(sfb.bdate,'-') 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,sfs.batch as Batch,IFNULL(sfs.batchname, '-') AS Batch_Name,
+       scd.coursestatus as Course_Status
 FROM 
 (  
-SELECT app.ID,app.StudentID AS sid,app.CourseID AS cid,app.BranchCode AS branch,app.ListCode AS lcode,p.ListName AS STATUS,STR_TO_DATE('AppDate', '%d-%m-%Y' 
+SELECT app.ID,app.StudentID AS sid,app.CourseID AS cid,app.BranchCode AS branch,app.ListCode AS lcode,p.ListName AS STATUS,STR_TO_DATE(AppDate, '%d-%m-%Y' 
 )
 AS adate,app.Comments AS acmts,CertificationType AS ctype,app.CertificationType AS certname,sum(bal.balpayable) AS balance
 		FROM T_ApplicationStatus AS app
@@ -249,8 +353,9 @@ AS adate,app.Comments AS acmts,CertificationType AS ctype,app.CertificationType
        WHERE  app.CertificationType NOT LIKE 'CERT%' AND app.ID IN (SELECT max(ID) FROM T_ApplicationStatus GROUP BY        StudentID,CourseID,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,T_Students_Fees_Status.BatchCode AS batch,StudentID AS sid,CourseID AS cid,FeesType AS ftype,sum(CourseFees) AS cf,Sum(STFOrWR) AS stf,sum(Others) AS others,T_BatchMaster.BatchName as batchname
         FROM T_Students_Fees_Status
+        left join T_BatchMaster on T_BatchMaster.BatchCode = T_Students_Fees_Status.BatchCode
         GROUP BY sid,cid,fid) 
     AS sfs ON sfs.sid=sms.sid AND sfs.cid=sms.cid AND sfs.ftype=sms.ctype
 LEFT JOIN
@@ -270,11 +375,165 @@ LEFT JOIN
 LEFT JOIN 
         (SELECT StudentID AS sid,MobileNumber AS phone,IsActive AS active,concat(FirstName,' ',Lastname) AS NAME,Fathername AS father,PermanentAddress AS address,AlternateNumber FROM T_StudentDetails) AS std ON std.sid=sms.sid
 LEFT JOIN 
-       (SELECT StudentID AS sid,UniversityID AS uid,CourseID AS cid,EnrollmentID AS eid,BranchID AS branch FROM T_Student_CourseDetails) AS scd ON scd.sid=sms.sid AND scd.cid=sms.cid
-       
-	   where sms.branch = '".$br."'";
-        
-       
+       (SELECT StudentID AS sid,UniversityID AS uid,CourseID AS cid,EnrollmentID AS eid,BranchID AS branch,ifnull(Status,'-') as coursestatus 
+          FROM T_Student_CourseDetails) AS scd ON scd.sid=sms.sid AND scd.cid=sms.cid 
+	   where sms.branch = '".$br."'";		
+$sql = "SELECT 
+sms.sid AS Student_id,
+sms.cid,
+sfs.fid,sms.lcode,
+IF(sms.status = '',
+    '-',
+    IFNULL(sms.status, '-')) AS STATUS,
+IFNULL(DATE_FORMAT(sms.adate, '%d-%m-%Y'), '-') AS adate,
+IF(sms.acmts = '',
+    '-',
+    IFNULL(sms.acmts, '-')) AS acmts,
+IF(sfs.ftype = '',
+    '-',
+    IFNULL(sfs.ftype, '-')) AS ctype,
+IF(sms.certname = '',
+    '-',
+    IFNULL(sms.certname, '-')) AS certname,
+balance,
+totalpaid,
+totalpayable,
+IF(sfb.bdate = '',
+    '-',
+    IFNULL(sfb.bdate, '-')) AS initialPaid,
+IF(scd.eid = '',
+    '-',
+    IFNULL(scd.eid, '-')) AS Enrollment_id,
+IF(std.name = '',
+    '-',
+    IFNULL(std.name, '-')) AS Student_name,
+IF(std.father = '',
+    '-',
+    IFNULL(std.father, '-')) AS Father_name,
+IF(std.phone = '',
+    '-',
+    IFNULL(std.phone, '-')) AS Phone_number,
+IF(cm.course = '',
+    '-',
+    IFNULL(cm.course, '-')) AS Course_name,
+IF(cm.uname = '',
+    '-',
+    IFNULL(cm.uname, '-')) AS University,
+IF(cm.uid = '', '-', cm.uid) AS univID,
+IF(std.address = '',
+    '-',
+    IFNULL(std.address, '-')) AS address,
+IF(std.AlternateNumber = '',
+    '-',
+    IFNULL(std.AlternateNumber, '')) AS AlternateNumber,
+IF(sfs.batch = '', '-', sfs.batch) AS Batch,
+IF(sfs.batchname = '',
+    '-',
+    IFNULL(sfs.batchname, '-')) AS Batch_Name,
+IF(scd.coursestatus = '',
+    '-',
+    scd.coursestatus) AS Course_Status,
+IF(sms.courierdetails = '',
+    '-',
+    IFNULL(sms.courierdetails, '-')) AS Courier_Details
+FROM (SELECT 
+    app.ID,
+        app.StudentID AS sid,
+        app.CourseID AS cid,
+        app.BranchCode AS branch,
+        app.ListCode AS lcode,
+        p.ListName AS STATUS,
+        STR_TO_DATE(AppDate, '%d-%m-%Y') AS adate,
+        app.Comments AS acmts,
+        CertificationType AS ctype,
+        app.CertificationType AS certname,
+        SUM(bal.balpayable) AS balance,
+        bal.totalpaid,
+        bal.totalpayable,
+        app.CourierDetails AS courierdetails
+FROM
+    T_ApplicationStatus AS app
+LEFT JOIN T_PickListDetails p ON p.ListCode = app.ListCode
+LEFT JOIN BalFees bal ON bal.student = app.StudentID
+    AND bal.course = app.CourseID
+    AND bal.feestype = app.CertificationType
+    AND bal.totalpayable IS NOT NULL
+WHERE
+    app.CertificationType NOT LIKE 'CERT%'
+        AND app.ID IN (SELECT 
+            MAX(ID)
+        FROM
+            T_ApplicationStatus
+        GROUP BY StudentID , CourseID , BranchCode , CertificationType)
+GROUP BY app.ID) AS sms 
+LEFT JOIN (SELECT 
+    FeesID AS fid,
+        T_Students_Fees_Status.BatchCode AS batch,
+        T_BatchMaster.BatchName AS batchname,
+        T_Students_Fees_Status.BranchCode AS branch,
+        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
+LEFT JOIN T_BatchMaster ON T_BatchMaster.BatchCode = T_Students_Fees_Status.BatchCode
+GROUP BY sid , cid , fid) AS sfs ON sfs.sid = sms.sid AND sfs.cid = sms.cid
+    AND sfs.ftype = sms.ctype
+LEFT JOIN
+(SELECT 
+    sfp.StudentID AS sid,
+        sfp.FeesId AS fid,
+        sfs.CourseID AS cid,
+        STR_TO_DATE(BillDate, '%d-%m-%Y') 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 , cid , fid) AS sfb ON sfb.sid = sms.sid AND sfb.fid = sfs.fid
+    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 = sms.cid
+LEFT JOIN
+(SELECT 
+    StudentID AS sid,
+        MobileNumber AS phone,
+        IsActive AS active,
+        CONCAT(FirstName, ' ', Lastname) AS NAME,
+        Fathername AS father,
+        PermanentAddress AS address,
+        AlternateNumber
+FROM
+    T_StudentDetails) AS std ON std.sid = sfs.sid
+LEFT JOIN
+(SELECT 
+    StudentID AS sid,
+        UniversityID AS uid,
+        CourseID AS cid,
+        EnrollmentID AS eid,
+        BranchID AS branch,
+        IFNULL(Status, '-') AS coursestatus
+FROM
+    T_Student_CourseDetails) AS scd ON scd.sid = sfs.sid AND scd.cid = sfs.cid
+WHERE
+sfs.branch = '".$br."'";
+
+       $sql.=" AND (scd.coursestatus IS NULL OR (scd.coursestatus != 'Refund_issued' AND scd.coursestatus != 'Discontinued' AND scd.coursestatus != 'Cancelled'))";
         if ($bat!= ''){
       
             $sql.=" and sfs.batch = '".$bat."'";
@@ -287,10 +546,7 @@ LEFT JOIN
           }
 		  if ($from != ''){
             $fromd= date("Y-m-d",strtotime($from));
-           
-            
-            $sql.="and sfb.bdate >= '".$fromd."'
-                ";
+            $sql.="and sfb.bdate >= '".$fromd."'";
         
         }
         if ($to != ''){
@@ -299,11 +555,15 @@ LEFT JOIN
             $sql.=" and sfb.bdate <= '".$tod."'";
         
         }
-          $sql.=" group by Student_id,cid,ctype";
+        if ($st != ''){  
+            if($st=="all"){ $sql.=""; }
+            else{ $sql.=" and sms.lcode = '".$st."'"; }
+        }
+          $sql.=" and sfs.fid IS not null";
+          $sql.=" group by Student_id,cid,fid,ctype";
 		  $sql.=" ORDER BY sfb.bdate ASC";
-          //echo $sql;
+        //   echo $sql;die();
 		 
-		// print_r($sql);
 		
         $leadDet=$this->db->query($sql);
         $cert_statusDetails = $leadDet->result();
@@ -550,13 +810,14 @@ FROM T_Income_Outcome_Master exp
         return $results;
     
     }
-    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,ifnull(idate.issuedate,'-') as issuedate,ifnull(rdate.rcvedate,'-') as rcvedate,ifnull(bal.balpayable,'-') as balance
+    // public function answer_booklet($bat=null,$br=null,$u=null){
+        public function answer_booklet($bat=null,$br=null,$u=null,$s=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,ifnull(idate.issuedate,'-') as issuedate,ifnull(rdate.rcvedate,'-') as rcvedate,ifnull(bal.balpayable,'-') as balance, sms.CourierDetails as CD
 
         from 
 			 (SELECT ID,StudentID as sid,CourseID as cid,BranchCode as branch,ListCode as lcode,AnsDate as  
-             adate,Sem as sem FROM T_AnswerBookletStatus  
+             adate,Sem as sem, CourierDetails FROM T_AnswerBookletStatus  
 	         WHERE ID IN (SELECT max(ID) FROM T_AnswerBookletStatus group by StudentID,CourseID,BranchCode,Sem)
 	         group by sid,sem,cid,lcode,branch) as sms
         
@@ -614,12 +875,19 @@ left join BalFees bal on bal.student=sms.sid and bal.feestype=sms.cid and bal.se
             $sql.=" and cm.uid = '".$u."'";
           
           }
+          if($s != ''){
+            if ($s != ''){
+                if($s=="all"){ $sql.=""; }
+                else{ $sql.="and list.lcode = '".$s."'"; }
+              }
+          }
+
         $sql.=" group by Student_id,Course_id,Batch_code,Branch_code,Sem";
-        
           
           
         $leadDet=$this->db->query($sql);
         $answer = $leadDet->result();
+        // print_r($this->db->last_query());die();        
         if (count($answer) > 0) {
             $results['ans_bookletList']      = true;
             $results['ans_book_data'] = $answer;
@@ -631,30 +899,72 @@ left join BalFees bal on bal.student=sms.sid and bal.feestype=sms.cid and bal.se
         return $results;
     
     }
-    public function app_pending($bat=null,$br=null,$u=null){
+    public function app_pending($bat=null,$br=null,$u=null,$st=null,$from=null,$to=null,$udate=null){
 
 
        
-       $sql = "SELECT   
-     APFS.ID as id,
-    ifnull(APFS.Registration_Details_ID,'-') AS regid,
-      APFS.ListCode as StatusCode, 
-      ifnull(APFS.AppFormDate,'-') as StatusUpdationOn, 
-      ifnull(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,
-      ifnull(sfpd.BILL,'-') as InitialPayDate,
-      RD.Student_Fee_Status_Id as FeesStatusID,
-      ifnull(STU_COUR.EnrollmentID,'-') as EnrollmentNumber,
-      CFD.Sem_Year as Sem_Year,
-      RD.RegistrationType as FormType,
-      STU.StudentID as Student_id,ifnull(sfs.RollNo,'-') as StudentRollNo
+       $sql1 = "SELECT   
+       APFS.ID as id,
+       ifnull(APFS.Registration_Details_ID,'-') AS regid,
+        APFS.ListCode as StatusCode, 
+        ifnull(APFS.AppFormDate,'-') as StatusUpdationOn, 
+        ifnull(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,
+        ifnull(sfpd.BILL,'-') as InitialPayDate,
+        RD.Student_Fee_Status_Id as FeesStatusID,
+        ifnull(STU_COUR.EnrollmentID,'-') as EnrollmentNumber,
+        CFD.Sem_Year as Sem_Year,
+        RD.RegistrationType as FormType,
+        STU.StudentID as Student_id,ifnull(sfs.RollNo,'-') as StudentRollNo,
+        (sfs.CourseFees + sfs.STFOrWR + sfs.Others - sfs.Waiver) as CourseFees,
+        sfpd.BillAmount AS paidAmount,
+        ((sfs.CourseFees + sfs.STFOrWR + sfs.Others - sfs.Waiver) - sfpd.BillAmount) AS balance
+  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, BillAmount AS BillAmount  FROM T_Students_Fees_PaidDetails GROUP BY FeesId) AS sfpd ON sfpd.FeeID = RD.Student_Fee_Status_Id
+  LEFT JOIN T_Students_Fees_Status as sfs ON sfs.FeesID=RD.Student_Fee_Status_Id
+  WHERE STU.IsActive = '1' and APFS.ID in (select max(ID) from T_ApplicationFormStatus group by Registration_Details_ID)
+
+ ";
+
+
+$sql2 ="SELECT   
+APFS.ID as id,
+ifnull(APFS.Registration_Details_ID,'-') AS regid,
+ APFS.ListCode as StatusCode, 
+ ifnull(APFS.AppFormDate,'-') as StatusUpdationOn, 
+ ifnull(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,
+ ifnull(sfpd.BILL,'-') as InitialPayDate,
+ RD.Student_Fee_Status_Id as FeesStatusID,
+ ifnull(STU_COUR.EnrollmentID,'-') as EnrollmentNumber,
+ CFD.Sem_Year as Sem_Year,
+ RD.RegistrationType as FormType,
+ STU.StudentID as Student_id,ifnull(sfs.RollNo,'-') as StudentRollNo,
+ ifnull(STU_COUR.Status,'-') as StuCourStatus,
+ BALFEE.totalpayable as CourseFees,
+ BALFEE.totalpaid AS paidAmount,
+ BALFEE.balpayable AS balance
 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  
@@ -663,14 +973,62 @@ 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
-LEFT JOIN T_Students_Fees_Status as sfs ON sfs.FeesID=RD.Student_Fee_Status_Id
-where  STU.IsActive = '1' and APFS.ID in (select max(ID) from T_ApplicationFormStatus group by Registration_Details_ID)
+LEFT JOIN BalFees AS BALFEE ON BALFEE.student = STU.StudentID
+LEFT JOIN (SELECT FeesId AS FeeID, min(CreatedOn), BillDate AS BILL, BillAmount AS BillAmount  FROM T_Students_Fees_PaidDetails GROUP BY FeesId) AS sfpd ON sfpd.FeeID = RD.Student_Fee_Status_Id
+LEFT JOIN T_Students_Fees_Status as sfs ON sfs.FeesID=RD.Student_Fee_Status_Id and sfs.StudentID = RD.StudentID
+WHERE STU.IsActive = '1' and APFS.ID in (select max(ID) from T_ApplicationFormStatus group by Registration_Details_ID)";
+$sql="Select 
+APFS.ID AS id,
+    IFNULL(APFS.Registration_Details_ID, '-') AS regid,
+    APFS.ListCode AS StatusCode,
+    IFNULL(APFS.AppFormDate, '-') AS StatusUpdationOn,
+    IFNULL(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,
+    IFNULL(sfpd.BILL, '-') AS InitialPayDate,
+    RD.Student_Fee_Status_Id AS FeesStatusID,
+    IFNULL(STU_COUR.EnrollmentID, '-') AS EnrollmentNumber,
+    CFD.Sem_Year AS Sem_Year,
+    RD.RegistrationType AS FormType,
+    STU.StudentID AS Student_id,
+    IF(sfs.RollNo!='',sfs.RollNo,IFNULL(sfs.RollNo,'-')) AS StudentRollNo,
+    IFNULL(STU_COUR.Status, '-') AS StuCourStatus,
+    BALFEE.totalpayable AS CourseFees,
+    BALFEE.totalpaid AS paidAmount,
+    BALFEE.balpayable AS balance,CFD.ID,sfs.CreatedOn as Created,sfs.UpdatedOn as Updated
+FROM T_Students_Fees_Status AS sfs
+LEFT JOIN T_Registration_Details AS RD ON sfs.FeesID = RD.Student_Fee_Status_Id AND sfs.StudentID = RD.StudentID
+LEFT JOIN T_ApplicationFormStatus AS APFS on APFS.Registration_Details_ID = RD.ID AND APFS.ListCode != 'S033'
+LEFT JOIN T_PickListDetails AS PKL ON PKL.ListCode = APFS.ListCode
+LEFT JOIN T_StudentDetails AS STU ON STU.StudentID = sfs.StudentID
+LEFT JOIN T_CourseMaster AS COUR ON COUR.CourseID = sfs.CourseID
+LEFT JOIN T_Student_CourseDetails AS STU_COUR ON STU_COUR.StudentID = sfs.StudentID
+        AND STU_COUR.CourseID = sfs.CourseID
+LEFT JOIN T_Course_Fees_Details AS CFD ON CFD.ID = sfs.FeesType
+LEFT JOIN T_UniversityMaster AS UNIV ON UNIV.UniversityID = COUR.UniversityID
+LEFT JOIN BalFees AS BALFEE ON BALFEE.student = sfs.StudentID AND BALFEE.feestype = sfs.FeesType AND BALFEE.totalpayable is not null
+    LEFT JOIN
+    (SELECT 
+        FeesId AS FeeID,
+            MIN(CreatedOn),
+            BillDate AS BILL,
+            BillAmount AS BillAmount
+    FROM
+        T_Students_Fees_PaidDetails
+    WHERE IsActive = '1'
+    GROUP BY FeesId) AS sfpd ON sfpd.FeeID = sfs.FeesID
+WHERE
+    STU.IsActive = '1'
+    AND APFS.ID IN (SELECT MAX(ID) FROM T_ApplicationFormStatus GROUP BY Registration_Details_ID) 
+    AND (STU_COUR.Status IS NULL OR (STU_COUR.Status != 'Refund_issued' AND STU_COUR.Status != 'Discontinued' AND STU_COUR.Status != 'Cancelled'))";
 
- ";
-
-
- //sfs.RollNo as StudentRollNo
+//sfs.RollNo as StudentRollNo
 
 // LEFT JOIN T_Students_Fees_Status as sfs ON sfs.FeesID=sfpd.FeeID
 
@@ -719,10 +1077,45 @@ where  STU.IsActive = '1' and APFS.ID in (select max(ID) from T_ApplicationFormS
           
           }
           if ($u!= ''){
-      
+            if($u=="all"){
+                $this->db->select('UniversityID');
+                $this->db->where('IsActive','1');
+                $this->db->where('BranchCode',$br);
+                $university = $this->db->get(UNIVERSITY);
+                $q = [];
+                for($i = 0 ; $i<count($university->result());$i++)
+                {
+                    $q[$i] = $university->result()[$i]->UniversityID;
+                }
+                $sql.=" and COUR.UniversityID in ('".implode("','",$q)."')";
+                
+            }
+            else{ 
             $sql.=" and COUR.UniversityID = '".$u."'";
-          
+            }            
           }
+            if($st=="all"){
+                $sql.="";
+            }
+            else if($st=="pending") { 
+                $sql.=" and (sfs.RollNo IS NULL OR sfs.RollNo = '')";
+            }            
+            else if($st=="received") { 
+                $sql.=" and sfs.RollNo != ''";
+            }            
+          if ($from != ''){
+            $fromd= date("Y-m-d",strtotime($from));
+            $sql.="and STR_TO_DATE(sfs.CreatedOn,'%d-%m-%Y') >= '".$fromd."'";
+          }
+          if ($to != ''){
+            $tod=date("Y-m-d",strtotime($to));
+            $sql.=" and STR_TO_DATE(sfs.CreatedOn,'%d-%m-%Y') <= '".$tod."'";
+          }
+          if ($udate != ''){
+            $ud=date("Y-m-d",strtotime($udate));
+            $sql.=" and STR_TO_DATE(sfs.UpdatedOn,'%d-%m-%Y') = '".$ud."'";
+          }
+        
   
         $sql.=" and STU_COUR.IsActive='1'";        
         $sql.=" and STU.BranchCode='".$br."'"; 
@@ -731,6 +1124,7 @@ where  STU.IsActive = '1' and APFS.ID in (select max(ID) from T_ApplicationFormS
 		$sql.=" ORDER BY StatusUpdationOn,InitialPayDate ASC ";
         
         $leadDet=$this->db->query($sql);
+        // print_r($sql);die();
         $answer = $leadDet->result();
         if (count($answer) > 0) {
             $results['app_pendingList']      = true;
@@ -739,10 +1133,7 @@ where  STU.IsActive = '1' and APFS.ID in (select max(ID) from T_ApplicationFormS
             $results['app_pendingList'] = false;
             $results['message']      = 'No record found';
         }
-
-
-       //print_r($this->db->last_query());die();
-       
+        // print_r($this->db->last_query());die();
         return $results;
     
     }
@@ -1013,7 +1404,7 @@ where std.active = 1 and sms.branch = '".$br."'
     }
     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,concat(FirstName,' ',Lastname) as Student_name,Fathername as Father_name,PermanentAddress as address,AlternateNumber,ifnull(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(bal.totalpaid,0) as Paid_fee,sfs.CourseFees , sfs.STFOrWR , sfs.Others,((sfs.CourseFees + sfs.STFOrWR + sfs.Others) - sfp.BillAmount) as balance,ifnull(bal.balpayable,0) as bal,ifnull(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,IF(scd.Status IS NULL,scd.IsActive,scd.Status) as course_status,sfs.CourseID as cid,std.MobileNumber as Phone_number,concat(FirstName,' ',Lastname) as Student_name,Fathername as Father_name,PermanentAddress as address,AlternateNumber,ifnull(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(bal.totalpaid,0) as Paid_fee,sfs.CourseFees , sfs.STFOrWR , sfs.Others,((sfs.CourseFees + sfs.STFOrWR + sfs.Others) - ifnull(bal.totalpaid,0)) as balance,ifnull((sfs.CourseFees + sfs.STFOrWR + sfs.Others) - ifnull(bal.totalpaid,0),0) as bal,ifnull(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,
@@ -1036,14 +1427,14 @@ where std.active = 1 and sms.branch = '".$br."'
         ifnull(MAX(CASE WHEN Installment = 10 THEN sfp.BillAmount END),0) as billamt10
         
         FROM T_Students_Fees_PaidDetails as sfp 
-        left join T_Students_Fees_Status sfs on sfs.FeesID=sfp.FeesID
+        right join T_Students_Fees_Status sfs on sfs.FeesID=sfp.FeesID
         left join T_Course_Fees_Details cfd on cfd.ID=sfs.FeesType
         left join T_CourseMaster cm on cm.CourseID=sfs.CourseID
         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_StudentDetails std on std.StudentID=sfs.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.feestype=sfs.FeesType 
-        where sfp.IsActive = 1 and sfp.UpdatedBy = '".$br."' and std.BranchCode='".$br."' 
+        where std.BranchCode='".$br."' 
 
    ";
        
@@ -1057,7 +1448,7 @@ where std.active = 1 and sms.branch = '".$br."'
             $sql.=" and u.UniversityID = '".$u."'";
           
           }
-        $sql.=" group by Student_id,fid";
+        $sql.=" group by sfs.FeesID, sfs.StudentID";
        
           
          
@@ -1075,7 +1466,7 @@ where std.active = 1 and sms.branch = '".$br."'
         }
 
 
-       // print_r($this->db->last_query());die();
+//        print_r($this->db->last_query());die();
     
         return $results;
     
@@ -1188,6 +1579,38 @@ from T_Lead_Tracking_Followup as ltf
         $this->db->order_by('BatchDate','DESC');
         $batchDetails = $this->db->get(BATCH);
         return $batchDetails->result();
+    }
+    public function getUniversity2($br=null)
+    {
+        $this->db->select('UniversityID,UniversityName');
+        $this->db->where('BranchCode',$br);
+        $this->db->order_by('CreatedOn','DESC');
+        $university = $this->db->get(UNIVERSITY);
+        if($university->result()){
+            $result = array();
+            $result['univlist'] = true;
+            foreach ($university->result() as $row)
+            {
+
+                $university_array['universityID'] = $row->UniversityID;
+                $university_array['universityName'] = $row->UniversityName;
+                $university_array['batchDetails']= $this->getBatch($row->UniversityID,$br);
+                $result_array[]=$university_array;
+            }
+            $result['university']= $result_array;
+        }
+        else {
+            $result['univlist'] = false;
+            $result['message'] = "No records found!";
+            $result['universityID'] = "";
+            $result['universityName'] = "";
+            $result['batchDetails']= "";
+        }
+// print_r( $this->db->last_query());  
+// die();
+
+        return $result;
+
     }
 	 public function GetAllUniversity($branchId)
     {
@@ -1213,7 +1636,6 @@ from T_Lead_Tracking_Followup as ltf
         return $result_array;
     }
 
-
    public function GetNewRegList($det)
     {
 
@@ -1477,5 +1899,19 @@ if($feeDetails)
         return $results;
     
     }
-    
+
+    public function getDefaultActivity($code,$reqBranch)
+    {   
+                $this->db->select('DA.StudentActivityCode,PLD.ListCode,PLD.ListName');
+                $this->db->from(DEFAULTACTIVITY .' as DA');
+                $this->db->join(PICK_LIST_DETAILS.' as PLD', 'PLD.ListCode = DA.StatusCode');
+                $this->db->where('PLD.IsActive','1');
+                $this->db->where('DA.IsActive','1');
+                $this->db->where('DA.BranchCode', $reqBranch);
+                $this->db->where('DA.StudentActivityCode',$code);
+                $result=$this->db->get()->result();
+                return $result;
+
+    }
+
 }

Apollo/api/application/models/Reregister_model.php

@@ -69,7 +69,7 @@ class Reregister_model extends CI_Model
 		
 		$tempUniversityID = $UID['universityID'];
 		
-		// Find Nxt Available Batch
+		
 		$sql = "SELECT * FROM T_BatchMaster where isActive = 1 and UniversityID = ? and BranchCode = ? and str_to_date(BatchDate,'%d-%m-%Y')  > str_to_date(?,'%d-%m-%Y')  order by str_to_date(BatchDate,'%d-%m-%Y') asc limit 1";
 		$res2  = $this->db->query($sql,array($UID['universityID'],$branchId,date_format(date_create($batchDate),'d-m-Y')));
 		
@@ -78,7 +78,6 @@ class Reregister_model extends CI_Model
 		//echo $data['nextBatch'][0]->BatchCode;
 		
 		
-		// Get STudnet List
 		$this->db->select("T_StudentDetails.StudentID,T_StudentDetails.MobileNumber,T_StudentDetails.Firstname,T_StudentDetails.Lastname,T_StudentDetails.EmailID,max(T_Course_Fees_Details.Sem_Year) as current_sem,T_CourseMaster.CourseID,T_CourseMaster.CourseCode,T_CourseMaster.CourseName,max(T_Session_Master.SessionID) as SessionID,T_Students_Fees_Status.FeesType");
 		$this->db->from("T_Students_Fees_Status");
 		$this->db->join("T_StudentDetails","T_Students_Fees_Status.StudentID = T_StudentDetails.StudentID and T_StudentDetails.IsActive = 1");
@@ -93,14 +92,11 @@ class Reregister_model extends CI_Model
 		$this->db->group_by("T_StudentDetails.StudentID");
 		$res = $this->db->get();
 		$data['studentListOne'] =  $res->result();
-		// print_r($data['studentListOne']);
+		//print_r($data['studentListOne']);
 		$data['finalStudentList'] = array();
 
-       print_r($data['studentListOne']);die();
-		 print_r($this->db->last_query());die();
-		
-		
-		// Find current sem or Year and it's feesAmount
+       // print_r($data['studentListOne']);die();
+		//print_r($this->db->last_query());die();
 		foreach($data['studentListOne'] as $student)
 		{
 			
@@ -117,13 +113,10 @@ class Reregister_model extends CI_Model
 				$this->db->trans_complete();
 				$sesstionDetails = $sesstionDetails ->result_array();
 				//print_r($sesstionDetails);die();
-			  
-
-			  //FIND OUT NEXT SEM NUMBER OR YEAR NUMBER
+			   //FIND OUT NEXT SEM NUMBER OR YEAR NUMBER
 				$string = $student->current_sem;
 				$string = str_replace(' ','',$string);
 				$string = strtoupper($string);
-				
 				$next_sem = "";
 					
 					$sempos = strpos($string,"SEM");
@@ -144,8 +137,9 @@ class Reregister_model extends CI_Model
 						}
 				//print_r($this->db->last_query());die();
 			
-			
 			//FIND OUT FEESTYPE ID 
+			
+			
 			$sem = $next_sem;
 			$sem = '%'.(substr_replace($sem, '%', -1, 0)).'%';
 			$sql = "SELECT ID,FeesAmount FROM T_Course_Fees_Details where CourseID = ? and ProgramType = 'Y001' and FeesType = 'F002' and Sem_Year like ?";
@@ -168,7 +162,7 @@ class Reregister_model extends CI_Model
 			$this->db->where('T_Students_Fees_Status.FeesType',$feesID);
 			$res = $this->db->get();
 			$res = $res->result_array();
-		   // print_r($this->db->last_query());die();
+		  // print_r($this->db->last_query());die();
 			// print_r($res);
 			if($res[0]['feescount'] == 0)
 			{
@@ -189,13 +183,11 @@ class Reregister_model extends CI_Model
 						$tempArray['SessionName']  = $sesstionDetails[0]['SessionName'];
 						$tempArray['SessionDate']  = $sesstionDetails[0]['SessionDate'];
 						
-						
-						// Find nxt session
 						$sqlquery ="SELECT SessionID,SessionName FROM T_Session_Master where BranchCode = ? 
 									and str_to_date(SessionDate,'%d-%m-%Y') > str_to_date(?,'%d-%m-%Y') order by str_to_date(SessionDate,'%d-%m-%Y') asc limit 1";
 						$tempResult = $this->db->query($sqlquery,array($branchId,$tempArray['SessionDate']));
 						$tempResult = $tempResult->result();
-						// echo $this->db->last_query();
+						//echo $this->db->last_query();
 						// print_r($tempResult[0]);die();
 						// if($tempResult[0]){
 						// $tempArray['nextSessionName']  = $tempResult[0]->SessionName;

Apollo/api/application/models/SeesionMaster_model.php

@@ -0,0 +1,197 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: karthi
+ * Date: 2/7/18
+ * Time: 10:44 AM
+ */
+defined('BASEPATH') OR exit('No direct script access allowed');
+
+class SeesionMaster_model extends CI_Model {
+
+
+    /*
+    * Add session master details
+    * created by kms
+    * */
+
+    public function addSession($arrayDetails=null,$university=null)
+    {
+
+            $this->db->select('SessionName');
+            $this->db->where('SessionName', $arrayDetails['SessionName']);
+            $this->db->where('BranchCode', $arrayDetails['BranchCode']);
+            if($this->db->get(SESSIONMASTER)->first_row()){
+                $result['sessionStatus'] = false;
+                $result['message'] ="This sessions is already exist.";
+            }
+            else{
+                $insertMaster['SessionName']=$arrayDetails['SessionName'];
+                $insertMaster['SessionDate']=$arrayDetails['SessionDate'];
+                $insertMaster['CreatedBy']=$arrayDetails['CreatedBy'];
+                $insertMaster['IsActive']=$arrayDetails['IsActive'];
+                $insertMaster['CreatedOn']=$arrayDetails['CreatedOn'];
+                $insertMaster['BranchCode']=$arrayDetails['BranchCode'];
+
+                $this->db->insert(SESSIONMASTER, $insertMaster);
+
+                if ($this->db->affected_rows() == '1') {
+                    $insertDetails['SessionID']=$this->db->insert_id();
+                    foreach ($university['UniversityID'] as $row1){
+                        $insertDetails['UniversityID']=$row1['UniversityID'];
+                        $insertDetails['CreatedBy']=$arrayDetails['CreatedBy'];
+                        $insertDetails['IsActive']=$arrayDetails['IsActive'];
+                        $insertDetails['CreatedOn']=$arrayDetails['CreatedOn'];
+                        $insertDetails['BranchID']=$arrayDetails['BranchCode'];
+                        $this->db->insert(SESSIONDETAILS, $insertDetails);
+
+                    }
+
+                    $result['sessionStatus'] = true;
+                    $result['message'] = "Sessions added successfully";
+                } else {
+                    $result['sessionStatus'] = false;
+                    $result['message'] = "Something went wrong.please try again";
+                }
+
+            }
+
+
+
+
+        return $result;
+
+    }
+
+
+    /*
+     * Get session master details
+     * created by kms
+     * */
+
+    public function getSession($requestedBy=null,$branchCode=null)
+    {
+        $this->db->select('SM.SessionID,SM.SessionDate,SM.SessionName,GROUP_CONCAT(SD.UniversityID) as UniversityID,GROUP_CONCAT(SM.SessionID) as GrpID,SM.IsActive,GROUP_CONCAT(US.UniversityName) as UniversityName');
+        $this->db->from(SESSIONMASTER.' as SM');
+        $this->db->join(SESSIONDETAILS.' as SD', 'SM.SessionID = SD.SessionID');
+        $this->db->join(UNIVERSITY.' as US', 'US.UniversityID = SD.UniversityID');
+        $this->db->where('SD.IsActive','1');
+        $this->db->where('SM.BranchCode',$branchCode);
+        $this->db->where('US.BranchCode',$branchCode);
+        $this->db->order_by('SM.SessionID','DESC');
+        $this->db->group_by('SM.SessionID','DESC');
+        $sessionDetails = $this->db->get();
+        if($sessionDetails->result()){
+
+            $result['sessionStatus'] = true;
+            $result['details'] = $sessionDetails->result();
+        }
+        else {
+            $result['sessionStatus'] = false;
+            $result['message'] = "No records found!";
+        }
+        // load batch model for get university details
+        $this->load->model('Batch_model', 'batch');
+        $result['universityDetails'] = $this->batch->getUniversityDetails($requestedBy,$branchCode);
+
+
+        return $result;
+
+    }
+
+    /*
+     * update session master details
+     * created by kms
+     * */
+    public function updateSession($arrayDetails=null,$universityDetails=null)
+    {
+        $this->db->select('SessionName');
+        $this->db->where('SessionName', $arrayDetails['SessionName']);
+        $this->db->where('BranchCode', $arrayDetails['BranchCode']);
+        $this->db->where('SessionID !=', $arrayDetails['SessionID']);
+        if($this->db->get(SESSIONMASTER)->first_row()){
+            $result['sessionStatus'] = false;
+            $result['message'] ="This sessions is already exist.";
+        }
+        else{
+            $this->db->where('SessionID', $arrayDetails['SessionID']);
+            $this->db->where('BranchCode', $arrayDetails['BranchCode']);
+            $upateStatus=$this->db->update(SESSIONMASTER, $arrayDetails);
+
+            if($upateStatus){
+                $deactiveStatus['IsActive']=false;
+                $deactiveStatus['UpdatedBy']=$arrayDetails['UpdatedBy'];
+                $deactiveStatus['UpdatedOn']=$arrayDetails['UpdatedOn'];
+                $this->db->where('SessionID ',$arrayDetails['SessionID']);
+                $updateActivityStatusDeactive = $this->db->update(SESSIONDETAILS, $deactiveStatus);
+
+                if($updateActivityStatusDeactive){
+
+                    if($universityDetails['University']){
+
+                        foreach ($universityDetails['University'] as $urow){
+                            $this->db->select('ID');
+                            $this->db->where('SessionID',$arrayDetails['SessionID']);
+                            $this->db->where('UniversityID',$urow);
+                            if($this->db->get(SESSIONDETAILS)->first_row()){
+                                $existStatusUpdate['IsActive']=true;
+                                $existStatusUpdate['UpdatedBy']=$arrayDetails['UpdatedBy'];
+                                $existStatusUpdate['UpdatedOn']=$arrayDetails['UpdatedOn'];
+                                $this->db->where('SessionID',$arrayDetails['SessionID']);
+                                $this->db->where('UniversityID',$urow);
+                                $this->db->update(SESSIONDETAILS, $existStatusUpdate);
+                            }
+                            else{
+                                $update_array["UniversityID"]=$urow;
+                                $update_array["SessionID"]=$arrayDetails['SessionID'];
+                                $update_array["IsActive"]=true;
+                                $update_array["CreatedBy"]=$arrayDetails['UpdatedBy'];
+                                $update_array["CreatedOn"]=$arrayDetails['UpdatedOn'];
+                                $this->db->insert(SESSIONDETAILS, $update_array);
+
+                            }
+
+                        }
+                    }
+                    else{
+                        $activateStatus['IsActive']=true;
+                        $this->db->where('SessionID ',$arrayDetails['SessionID']);
+                        $this->db->update(SESSIONMASTER, $activateStatus);
+
+                    }
+
+
+
+                    $result['sessionStatus'] = true;
+                    $result['message'] = "Sessions updated successfully";
+                }
+
+
+            } else {
+                $result['sessionStatus'] = false;
+                $result['message'] = "Something went wrong.please try again";
+            }
+
+        }
+
+        return $result;
+
+    }
+    /*
+     * Get university details
+     * created by kms
+     * */
+    public function getUniversityDetails($requestedBy,$branchCode)
+    {
+        $this->db->select('UniversityID,UniversityName');
+        $this->db->order_by('UniversityID','ASC');
+        $this->db->where('IsActive','1');
+        $this->db->where('BranchCode',$branchCode);
+        // $this->db->where_not_in('ID', $id);
+        $universityDetails = $this->db->get(UNIVERSITY);
+        return $universityDetails->result();
+    }
+
+
+
+}

Apollo/api/application/models/StatusUpdation_model.php

@@ -56,7 +56,11 @@ class StatusUpdation_model extends CI_Model {
 
     // update Application status
     public function update_applicationStatus($arr, $reqDetails) {
+        // echo "I am Here";
+        // echo APPLICATION_STATUS;
+        // print_r($arr);die();
         $this->db->insert_batch(APPLICATION_STATUS, $arr);
+        $msgId =  "";
         if ($this->db->affected_rows() >= 1) {
             if ($this->get_ListCode_status($arr[0]['ListCode'])) {
                 $dateToMsg = $arr[0]['AppDate'];
@@ -69,8 +73,8 @@ class StatusUpdation_model extends CI_Model {
                     $getSemYearMsg = $this->get_couser_name($arr[0]['CourseID']);
                     $getSemYearANDType = "$getSemYearMsg  $cerNamtToMsg";
                     // $mesg = "Status Update : $cerNamtToMsg $getSemYearMsg - $statuToMsg $dateToMsg.";
-                    $mesg = "$cerNamtToMsg Received - Dear $studentName, Your $getSemYearANDType had been received, Please come and collect it.";
-                    $this->smssend($arr, $mesg);
+                    $mesg = "$cerNamtToMsg Received - Dear $studentName, Your $getSemYearANDType had been received, Please come and collect it. APOLLO DEC";
+                    $msgId = $this->smssend($arr, $mesg);
                     $this->mailsend($arr, $mesg, $cerNamtToMsg);
                 } else if($statuToMsg == 'issued' || $statuToMsg == 'Issued' || $statuToMsg == 'ISSUED') {
                     // $cerNamtToMsg =  $this->get_certificate_name($arr[0]['CertificationType']);
@@ -78,8 +82,8 @@ class StatusUpdation_model extends CI_Model {
                     $getSemYearMsg = $this->get_couser_name($arr[0]['CourseID']);
                      $getSemYearANDType = "$getSemYearMsg  $cerNamtToMsg";
                     // $mesg = "Status Update : $cerNamtToMsg $getSemYearMsg - $statuToMsg $dateToMsg.";
-                    $mesg = "$cerNamtToMsg Despatch - Dear $studentName, Your $getSemYearANDType had been despatched against ($CmntToMsg $statuToMsg) on $dateToMsg.";
-                    $this->smssend($arr, $mesg);
+                    $mesg = "$cerNamtToMsg Despatch - Dear $studentName, Your $getSemYearANDType had been despatched against ($CmntToMsg $statuToMsg) on $dateToMsg. APOLLO DEC";
+                    $msgId = $this->smssend($arr, $mesg);
                     $this->mailsend($arr, $mesg, $cerNamtToMsg);
                 } else {
                 }
@@ -91,6 +95,7 @@ class StatusUpdation_model extends CI_Model {
             }
             $this->updateDocumentStatusInCallTrack($arr, $reqDetails);
             $result['addStatus'] = true;
+            $result['SMSstatus'] = $msgId;
             $result['message'] = "Successfully Documents Status Updated";
         } else {
             $result['addStatus'] = false;
@@ -99,91 +104,169 @@ class StatusUpdation_model extends CI_Model {
         return $result;
     }
     
-    // update certificate stauts
-    public function update_certificateStatus($arr) {
+    // public function update_certificateStatus($arr) {
 		
 	
+    //     $this->db->insert_batch(CERTIFICATION_STATUS, $arr);
+    //     if ($this->db->affected_rows() >= 1) {
+	// 		//If condition for Check ANSWERBOOKLET_STATUS, If it is null or 'Issued to Student' for do not send sms.
+	// 		$answerBookletStatus = $this->getAnswerBookletStatus($arr[0]['StudentID'],$arr[0]['CourseID'],$arr[0]['BranchCode'],$arr[0]['Sem']);
+	// 		//print_r($answerBookletStatus);
+    //         //echo $answerBookletStatus['ListName'];
+    //         //die();
+	// 		//echo "COURSE ====$arr[0]['CourseID']";
+	// 	    //echo "PARENT -- $answerBookletStatus";
+
+    //         $getlastansbookstatus = $this->GetLastAns_status($arr[0]['StudentID'],$arr[0]['Sem'],$arr[0]['CourseID']);
+
+    //         // $latestappstatus='';
+    //         //  if(!empty($getlastansbookstatus))
+    //         //  {
+    //         //     foreach($getlastansbookstatus as $get)
+    //         //     {
+    //         //      $latestappstatus= $get->ListCode;
+    //         //     }
+    //         //  }
+
+    //         $upperresult=strtoupper($getlastansbookstatus);
+
+    //         $WithoutspaceStatus = preg_replace('/\s+/', '',$upperresult);
+
+    //         //  echo $arr[0]['ListCode'];
+    //         // die();
+	// 		if($answerBookletStatus['isIssueToStudentExist'] == 0 && $answerBookletStatus['statusCount'] != 0)
+	// 		{
+	// 			//echo "SEND SMS";
+
+	// 			if ($this->get_ListCode_status($arr[0]['ListCode'])) {
+    //                 //echo 'in';
+	// 				$dateToMsg = $arr[0]['CDate'];
+	// 				$studentName = $this->getStudentName($arr[0]['StudentID']);
+	// 				$CmntToMsg =  $arr[0]['Comments'];
+	// 				$statuToMsg = $this->get_status_name_ListCode($arr[0]['ListCode']);
+    //                 $issuecheck = strtoupper($statuToMsg);
+    //                 $withoutspaceissue = preg_replace('/\s+/', '',$issuecheck);
+    //                 //echo $withoutspaceissue;die();
+	// 				// $cerNamtToMsg = $this->get_certificate_name($arr[0]['CertificationType']);
+	// 				// if( ($statuToMsg == 'received' || $statuToMsg == 'Received' || $statuToMsg == 'RECEIVED') && $WithoutspaceStatus == 'RECEIVEDFROMSTUDENT'){
+    //                 if(strpos($WithoutspaceStatus,'RECEIVED')){
+	// 					$cerNamtToMsg = 'Mark Card';
+	// 					$getSemYearMsg = $this->get_couser_sem_yr_msg($arr[0]['CourseID']);
+	// 					$getSemYearANDType = "$getSemYearMsg  $cerNamtToMsg";
+	// 					// $mesg = "Status Update : $cerNamtToMsg $getSemYearMsg - $statuToMsg $dateToMsg.";
+	// 					$mesg = "$cerNamtToMsg Received - Dear $studentName, Your $getSemYearANDType had been received, Please come and collect it.";
+	// 					$this->smssend($arr, $mesg);
+    //                     $this->mailsend($arr, $mesg, $cerNamtToMsg);
+    //                 } 
+    //                 else if($withoutspaceissue == 'ISSUEDTOSTUDENT' || $statuToMsg == 'Issued' || $statuToMsg == 'ISSUED') {
+	// 					$cerNamtToMsg = 'Mark Card';
+	// 					$getSemYearMsg = $this->get_couser_sem_yr_msg($arr[0]['CourseID']);
+	// 					$getSemYearANDType = "$getSemYearMsg  $cerNamtToMsg";
+	// 					// $mesg = "Status Update : $cerNamtToMsg $getSemYearMsg - $statuToMsg $dateToMsg.";
+	// 					$mesg = "$cerNamtToMsg Despatch - Dear $studentName, Your $getSemYearANDType had been despatched against ($CmntToMsg $statuToMsg) on $dateToMsg.";
+	// 					$this->smssend($arr, $mesg);
+    //                     $this->mailsend($arr, $mesg, $cerNamtToMsg);
+    //                 }
+    //                 else {}
+	// 				// $mesg = "Status Update : $cerNamtToMsg $getSemYearMsg - $statuToMsg $dateToMsg.";
+	// 				// $mesg = "Status Update : $cerNamtToMsg - $statuToMsg $dateToMsg.";
+	// 				// $this->smssend($arr, $mesg);
+	// 			}
+	// 	}///else {echo "DO NOT SEND SMS";}
+		
+    //         $result['addStatus'] = true;
+    //         $result['message'] = "Successfully Mark Card Status Updated";
+    //     } else {
+    //         $result['addStatus'] = false;
+    //         $result['message'] = "Something went wrong.please try again";
+    //     }
+    //     return $result;
+    // }
+
+    // update certificate stauts
+    public function update_certificateStatus($arr) {
+        
+        // print_r($arr);
+        // exit();
+        $msgId  = "";
         $this->db->insert_batch(CERTIFICATION_STATUS, $arr);
         if ($this->db->affected_rows() >= 1) {
-			//If condition for Check ANSWERBOOKLET_STATUS, If it is null or 'Issued to Student' for do not send sms.
-			
+			//If condition for Check ANSWERBOOKLET_STATUS, If it is null or 'Issued to Student' for do not send sms.	
 			$answerBookletStatus = $this->getAnswerBookletStatus($arr[0]['StudentID'],$arr[0]['CourseID'],$arr[0]['BranchCode'],$arr[0]['Sem']);
-			//print_r($answerBookletStatus);
+			// print_r($answerBookletStatus);
+            // echo $answerBookletStatus['ListName'];
+			// echo "COURSE ====$arr[0]['CourseID']";
+		    // echo "PARENT -- $answerBookletStatus";
 
-// echo $answerBookletStatus['ListName'];
-//             die();
-			//echo "COURSE ====$arr[0]['CourseID']";
-		   // echo "PARENT -- $answerBookletStatus";
+            $getlastansbookstatus = $this->GetLastAns_status($arr[0]['StudentID'],$arr[0]['Sem'],$arr[0]['CourseID']);
 
-$getlastansbookstatus = $this->GetLastAns_status($arr[0]['StudentID'],$arr[0]['Sem'],$arr[0]['CourseID']);
+            // $latestappstatus='';
+            //  if(!empty($getlastansbookstatus))
+            //  {
+            //     foreach($getlastansbookstatus as $get)
+            //     {
+            //      $latestappstatus= $get->ListCode;
+            //     }
+            //  }
 
-// $latestappstatus='';
-//  if(!empty($getlastansbookstatus))
-//  {
+            $upperresult=strtoupper($getlastansbookstatus);
 
-//     foreach($getlastansbookstatus as $get)
-//     {
-//      $latestappstatus= $get->ListCode;
-//     }
-//  }
-
-$upperresult=strtoupper($getlastansbookstatus);
-
-$WithoutspaceStatus = preg_replace('/\s+/', '',$upperresult);
-
- //  echo $arr[0]['ListCode'];
- // die();
-			if($answerBookletStatus['isIssueToStudentExist'] == 0 && $answerBookletStatus['statusCount'] != 0)
-			{
-				//echo "SEND SMS";
-
-				if ($this->get_ListCode_status($arr[0]['ListCode'])) {
-                    //echo 'in';
+            $WithoutspaceStatus = preg_replace('/\s+/', '',$upperresult);
+            //If condition for Check ANSWERBOOKLET_STATUS, If it is null or 'Issued to Student' for do not send sms.
+            // if($answerBookletStatus['isIssueToStudentExist'] == 0 && $answerBookletStatus['statusCount'] != 0)
+            // if($answerBookletStatus['isIssueToStudentExist'] == 0 )
+			// {
+				// if ($this->get_ListCode_status($arr[0]['ListCode'])) {
+             
 					$dateToMsg = $arr[0]['CDate'];
 					$studentName = $this->getStudentName($arr[0]['StudentID']);
 					$CmntToMsg =  $arr[0]['Comments'];
 					$statuToMsg = $this->get_status_name_ListCode($arr[0]['ListCode']);
 
-$issuecheck = strtoupper($statuToMsg);
-$withoutspaceissue = preg_replace('/\s+/', '',$issuecheck);
-//echo $withoutspaceissue;die();
+                    $issuecheck = strtoupper($statuToMsg);
+                    $withoutspaceissue = preg_replace('/\s+/', '',$issuecheck);
+                    // print_r($WithoutspaceStatus);
+                    // exit;
 					// $cerNamtToMsg = $this->get_certificate_name($arr[0]['CertificationType']);
-					if( ($statuToMsg == 'received' || $statuToMsg == 'Received' || $statuToMsg == 'RECEIVED') && $WithoutspaceStatus == 'RECEIVEDFROMSTUDENT'){
+					if( ($statuToMsg == 'received' || $statuToMsg == 'Received' || $statuToMsg == 'RECEIVED') || $WithoutspaceStatus == 'RECEIVEDFROMSTUDENT'){
+                    // if($WithoutspaceStatus == 'SENTTOUNIVERSITY'){
+                    // if condition for answerbookletstatus
+                    // if(strpos($WithoutspaceStatus,'RECEIVED')){
 
-
-                       // echo 'if';die();
 						$cerNamtToMsg = 'Mark Card';
 						$getSemYearMsg = $this->get_couser_sem_yr_msg($arr[0]['CourseID']);
 						$getSemYearANDType = "$getSemYearMsg  $cerNamtToMsg";
 						// $mesg = "Status Update : $cerNamtToMsg $getSemYearMsg - $statuToMsg $dateToMsg.";
-						$mesg = "$cerNamtToMsg Received - Dear $studentName, Your $getSemYearANDType had been received, Please come and collect it.";
-						$this->smssend($arr, $mesg);
+                        $mesg = "$cerNamtToMsg Received - Dear $studentName, Your $getSemYearANDType had been received, Please come and collect it. APOLLO DEC";
+						$msgId = $this->smssend($arr, $mesg);
                         $this->mailsend($arr, $mesg, $cerNamtToMsg);
+                        
 
 
                         // echo $statuToMsg;
                         // die();
-					} else if($withoutspaceissue == 'ISSUEDTOSTUDENT' || $statuToMsg == 'Issued' || $statuToMsg == 'ISSUED') {
+                    } 
+                    // else if($withoutspaceissue == 'ISSUEDTOSTUDENT' || $statuToMsg == 'Issued' || $statuToMsg == 'ISSUED') {
 
-                       /// echo 'else if';die();
-						$cerNamtToMsg = 'Mark Card';
-						$getSemYearMsg = $this->get_couser_sem_yr_msg($arr[0]['CourseID']);
-						$getSemYearANDType = "$getSemYearMsg  $cerNamtToMsg";
-						// $mesg = "Status Update : $cerNamtToMsg $getSemYearMsg - $statuToMsg $dateToMsg.";
-						$mesg = "$cerNamtToMsg Despatch - Dear $studentName, Your $getSemYearANDType had been despatched against ($CmntToMsg $statuToMsg) on $dateToMsg.";
-						$this->smssend($arr, $mesg);
-                        $this->mailsend($arr, $mesg, $cerNamtToMsg);
-					} else {
+                    //    /// echo 'else if';die();
+					// 	$cerNamtToMsg = 'Mark Card';
+					// 	$getSemYearMsg = $this->get_couser_sem_yr_msg($arr[0]['CourseID']);
+					// 	$getSemYearANDType = "$getSemYearMsg  $cerNamtToMsg";
+					// 	// $mesg = "Status Update : $cerNamtToMsg $getSemYearMsg - $statuToMsg $dateToMsg.";
+					// 	$mesg = "$cerNamtToMsg Despatch - Dear $studentName, Your $getSemYearANDType had been despatched against ($CmntToMsg $statuToMsg) on $dateToMsg.";
+					// 	$this->smssend($arr, $mesg);
+                    //     $this->mailsend($arr, $mesg, $cerNamtToMsg);
+                    // }
+                    else {
 					}
 					// $mesg = "Status Update : $cerNamtToMsg $getSemYearMsg - $statuToMsg $dateToMsg.";
 					// $mesg = "Status Update : $cerNamtToMsg - $statuToMsg $dateToMsg.";
 					// $this->smssend($arr, $mesg);
-				}
-			
-		}///else {echo "DO NOT SEND SMS";}
-		
+				// }//
+		    // }///else {echo "DO NOT SEND SMS";}
             $result['addStatus'] = true;
             $result['message'] = "Successfully Mark Card Status Updated";
+            $result['SMSstatus'] = $msgId;
         } else {
             $result['addStatus'] = false;
             $result['message'] = "Something went wrong.please try again";
@@ -208,6 +291,8 @@ $withoutspaceissue = preg_replace('/\s+/', '',$issuecheck);
         $this->db->where('SFS.BranchCode', $branchId);
         $cerfDetails = $this->db->get();
         $certificateDetails = $cerfDetails->result();
+        // print_r($this->db->last_query());
+        // die();
         if (count($certificateDetails) > 0) {
             $results['certificateStatus'] = true;
             $results['certificate_details'] = $certificateDetails;
@@ -242,9 +327,14 @@ $withoutspaceissue = preg_replace('/\s+/', '',$issuecheck);
         $this->db->from(PICK_LIST_DETAILS);
         $this->db->where('ListCode', $listCode);
         $statusDetails = $this->db->get()->first_row();
-        if ($statusDetails->ListName == 'RECEIVED' || $statusDetails->ListName == 'ISSUED TO STUDENT') {
+        if ($statusDetails->ListName == 'SENT TO UNIVERSITY'){
+            return false;
+        } else if ($statusDetails->ListName == 'RECEIVED' || $statusDetails->ListName == 'ISSUED TO STUDENT') {
             return true;
-        } else {
+        }else if(strpos($statusDetails->ListName,'RECEIVED')){
+            return true;
+        }
+        else{
             return false;
         }
     }
@@ -382,19 +472,17 @@ $withoutspaceissue = preg_replace('/\s+/', '',$issuecheck);
             $UpperstatusToMsg = strtoupper($statuToMsg);
 
             $WithoutspaceStatus = preg_replace('/\s+/', '', $UpperstatusToMsg);
-       // echo $WithoutspaceStatus;
                 // $cerNamtToMsg = $this->get_certificate_name($arr[0]['CertificationType']);
                 if( $WithoutspaceStatus == 'RECEIVEDFROMSTUDENT'){
 
-                   
-                    $cerNamtToMsg = 'Answer booklet';
-                    $getSemYearMsg = $this->get_couser_sem_yr_msg($arr[0]['CourseID']);
-                    $getSemYearANDType = "$getSemYearMsg";
-                    // $mesg = "Status Update : $cerNamtToMsg $getSemYearMsg - $statuToMsg $dateToMsg.";
-                    // $mesg = "$cerNamtToMsg Received - Dear $studentName, Your $getSemYearANDType had been received.";
-                    $mesg = "Answer booklet Received - Dear $studentName, Your  answer booklet for $getSemYearANDType has been received.";
-                  //  $this->smssend($arr, $mesg);
-                    $this->mailsend($arr, $mesg, $cerNamtToMsg);
+                    // $cerNamtToMsg = 'Answer booklet';
+                    // $getSemYearMsg = $this->get_couser_sem_yr_msg($arr[0]['CourseID']);
+                    // $getSemYearANDType = "$getSemYearMsg";
+                    // // $mesg = "Status Update : $cerNamtToMsg $getSemYearMsg - $statuToMsg $dateToMsg.";
+                    // // $mesg = "$cerNamtToMsg Received - Dear $studentName, Your $getSemYearANDType had been received.";
+                    // $mesg = "Answer booklet Received - Dear $studentName, Your  answer booklet for $getSemYearANDType has been received.";
+                    // $this->smssend($arr, $mesg);
+                    // $this->mailsend($arr, $mesg, $cerNamtToMsg);
                     $result['addStatus'] = true;
                     $result['message'] = "Successfully Answer Booklet Status Updated";
                 }else{
@@ -429,32 +517,35 @@ $withoutspaceissue = preg_replace('/\s+/', '',$issuecheck);
     // update study material status
     public function update_semyear($arr) {
         $this->db->insert_batch(STUDY_MATERIAL_STATUS, $arr);
+        $msgId =  "";
         if ($this->db->affected_rows() >= 1) {
             if ($this->get_ListCode_status($arr[0]['ListCode']) == true) {
                 $dateToMsg = $arr[0]['SDate'];
                 $CmntToMsg = $arr[0]['Comments'];
                 $studentName = $this->getStudentName($arr[0]['StudentID']);
                 $statuToMsg = $this->get_status_name_ListCode($arr[0]['ListCode']);
+
                 if( $statuToMsg == 'received' || $statuToMsg == 'Received' || $statuToMsg == 'RECEIVED'){
                     $cerNamtToMsg = 'Study Material';
                     $getSemYearMsg = $this->get_couser_sem_yr_msg($arr[0]['CourseID']);
                     $getSemYearANDType = "$getSemYearMsg  $cerNamtToMsg";
                     // $mesg = "Status Update : $cerNamtToMsg $getSemYearMsg - $statuToMsg $dateToMsg.";
-                    $mesg = "$cerNamtToMsg Received - Dear $studentName, Your $getSemYearANDType had been received, Please come and collect it.";
-                    $this->smssend($arr, $mesg);
+                    $mesg = "$cerNamtToMsg Received - Dear $studentName, Your $getSemYearANDType had been received, Please come and collect it. APOLLO DEC";
+                    $msgId = $this->smssend($arr, $mesg);
                     $this->mailsend($arr, $mesg, $cerNamtToMsg);
                 } else if($statuToMsg == 'issued' || $statuToMsg == 'Issued' || $statuToMsg == 'ISSUED') {
                     $cerNamtToMsg = 'Study Material';
                     $getSemYearMsg = $this->get_couser_sem_yr_msg($arr[0]['CourseID']);
                     $getSemYearANDType = "$getSemYearMsg  $cerNamtToMsg";
                     // $mesg = "Status Update : $cerNamtToMsg $getSemYearMsg - $statuToMsg $dateToMsg.";
-                    $mesg = "$cerNamtToMsg Despatch - Dear $studentName, Your $getSemYearANDType had been despatched against ($CmntToMsg $statuToMsg) on $dateToMsg.";
-                    $this->smssend($arr, $mesg);
+                    $mesg = "$cerNamtToMsg Despatch - Dear $studentName, Your $getSemYearANDType had been despatched against ($CmntToMsg $statuToMsg) on $dateToMsg. APOLLO DEC";
+                    $msgId = $this->smssend($arr, $mesg);
                     $this->mailsend($arr, $mesg, $cerNamtToMsg);
                 } else {
                 }
             }
             $result['addStatus'] = true;
+            $result['SMSstatus'] = $msgId;
             $result['message'] = "Successfully Study Material Status Updated";
         } else {
             $result['addStatus'] = false;
@@ -508,6 +599,7 @@ $withoutspaceissue = preg_replace('/\s+/', '',$issuecheck);
                 $results['searchResult'] = true;
                 $results['search_result_details'] = $queryDetails->result();
             } else if ($University != '' && $Course == '' && $Batch != '') {
+                // echo 'i am in 3';
                 $subQuery = "SELECT S.* , SC.ID as UNI_ID, SC.CourseID , C.CourseName ,C.CourseCode, U.UniversityName 
                         FROM " . STUDENTS . " as S LEFT JOIN " . STUDENTCOURSE . " as SC ON SC.StudentID = S.StudentID
                         LEFT JOIN  " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID LEFT JOIN " . COURSE . " as C ON 
@@ -521,6 +613,7 @@ $withoutspaceissue = preg_replace('/\s+/', '',$issuecheck);
                 $results['searchResult'] = true;
                 $results['search_result_details'] = $queryDetails->result();
             } else if ($University != '' && $Course != '' && $Batch != '') {
+                // echo 'i am in 4';
                 $subQuery = "SELECT S.* , SC.ID as UNI_ID, SC.CourseID , C.CourseName ,C.CourseCode, U.UniversityName 
                         FROM " . STUDENTS . " as S LEFT JOIN " . STUDENTCOURSE . " as SC ON SC.StudentID = S.StudentID
                         LEFT JOIN  " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID LEFT JOIN " . COURSE . " as C ON 
@@ -536,6 +629,7 @@ $withoutspaceissue = preg_replace('/\s+/', '',$issuecheck);
             }
         } else {
             if ($University != '' && $Course == '' && $Batch == '') {
+                // echo 'i am in 5.1';
                 $subQuery = "SELECT S.* , SC.ID as UNI_ID, SC.CourseID , C.CourseName , C.CourseCode, U.UniversityName 
                         FROM " . STUDENTS . " as S LEFT JOIN " . STUDENTCOURSE . " as SC ON SC.StudentID = S.StudentID 
                         LEFT JOIN  " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND  SC.BranchID = U.BranchCode LEFT JOIN " . COURSE . " as C ON 
@@ -549,6 +643,7 @@ $withoutspaceissue = preg_replace('/\s+/', '',$issuecheck);
                 $results['searchResult'] = true;
                 $results['search_result_details'] = $queryDetails->result();
             } else if ($University != '' && $Course != '' && $Batch == '') {
+                // echo 'i am in 5.2';
                 $subQuery = "SELECT S.* , SC.ID as UNI_ID, SC.CourseID , C.CourseName , C.CourseCode, U.UniversityName 
                         FROM " . STUDENTS . " as S LEFT JOIN " . STUDENTCOURSE . " as SC ON SC.StudentID = S.StudentID
                         LEFT JOIN  " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID  AND  SC.BranchID = U.BranchCode LEFT JOIN " . COURSE . " as C ON 
@@ -562,6 +657,7 @@ $withoutspaceissue = preg_replace('/\s+/', '',$issuecheck);
                 $results['searchResult'] = true;
                 $results['search_result_details'] = $queryDetails->result();
             } else if ($University != '' && $Course == '' && $Batch != '') {
+                // echo 'i am in 5.3';
                 $subQuery = "SELECT S.* , SC.ID as UNI_ID, SC.CourseID , C.CourseName ,C.CourseCode, U.UniversityName 
                         FROM " . STUDENTS . " as S LEFT JOIN " . STUDENTCOURSE . " as SC ON SC.StudentID = S.StudentID
                         LEFT JOIN  " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID  AND  SC.BranchID = U.BranchCode
@@ -576,6 +672,7 @@ $withoutspaceissue = preg_replace('/\s+/', '',$issuecheck);
                 $results['searchResult'] = true;
                 $results['search_result_details'] = $queryDetails->result();
             } else if ($University != '' && $Course != '' && $Batch != '') {
+                // echo 'i am in 5.4';
                 $subQuery = "SELECT S.* , SC.ID as UNI_ID, SC.CourseID , C.CourseName , C.CourseCode, U.UniversityName 
                         FROM " . STUDENTS . " as S LEFT JOIN " . STUDENTCOURSE . " as SC ON SC.StudentID = S.StudentID
                         LEFT JOIN  " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID  AND  SC.BranchID = U.BranchCode LEFT JOIN " . COURSE . " as C ON 
@@ -650,7 +747,8 @@ $withoutspaceissue = preg_replace('/\s+/', '',$issuecheck);
 
         
         $ch = curl_init();
-        curl_setopt($ch, CURLOPT_URL, "https://smsapi.24x7sms.com/api_2.0/SendSMS.aspx?APIKEY=xegCdYUIMf3&MobileNo=" . $mobile . "&SenderID=APODEC&Message=" . $message . "&ServiceName=TEMPLATE_BASED");
+        curl_setopt($ch, CURLOPT_URL, "https://smsapi.24x7sms.com/api_2.0/SendSMS.aspx?APIKEY=xegCdYUIMf3&MobileNo=".$mobile."&SenderID=APODEC&Message=".$message."&ServiceName=TEMPLATE_BASED");
+        // echo "https://smsapi.24x7sms.com/api_2.0/SendSMS.aspx?APIKEY=xegCdYUIMf3&MobileNo=".$mobile."&SenderID=APODEC&Message=".$message."&ServiceName=TEMPLATE_BASED";
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, TRUE);
         $output = curl_exec($ch);
         curl_close($ch);
@@ -683,10 +781,31 @@ $withoutspaceissue = preg_replace('/\s+/', '',$issuecheck);
               }
 
 
-        $this->db->insert_batch('T_BroadcastStatus', $data);
+        // $this->db->insert_batch('T_BroadcastStatus', $data);
 
 
-        return $output;
+        // return $output;
+        if($msgId){
+            $res = $this->db->insert_batch('T_BroadcastStatus', $data);
+            if(!$res)
+            {
+                $error = $this->db->error();
+                return $error; 
+            return $error; 
+                return $error; 
+            return $error; 
+                return $error; 
+            return $error; 
+                return $error; 
+            }else{
+                return ($msgId ? true : false);
+            }
+        }else{
+            return false;
+        }
+        
+    
+        
     }
 
     public function mailsend($arr, $msg, $sub) {
@@ -1010,19 +1129,48 @@ $this->db->insert_batch('T_BroadcastStatus', $data);
         // die();
 		 return $data; 
 	}
+	
+	function getFinalSemAnswerBookletStatus($CourseID,$StudentID,$BranchCode)
+	{
+	    //echo "MODEL - $StudentID,$CourseID,$BranchCode,$Sem";
+	    $this->db->select("CourierDetails, ListCode, AnsDate, Comments");
+	    $this->db->from("T_AnswerBookletStatus");
+	    $this->db->where("T_AnswerBookletStatus.BranchCode",$BranchCode);
+	    $this->db->where("T_AnswerBookletStatus.StudentID",$StudentID);
+	    $this->db->where("T_AnswerBookletStatus.CourseID",$CourseID);
+	    $this->db->order_by('T_AnswerBookletStatus.CreatedOn', 'DESC');
+	    $res = $this->db->get();
+	    // print_r($res->result());
+	    $finalSemDetails = $res->result();
+	    if($finalSemDetails){
+	        // print_r($formTypeDetails);exit();
+	        $resultArr['finalSemDetails'] = $finalSemDetails;
+	        $resultArr['message'] = "Successfully data generated";
+	    } else {
+	        // print_r($formTypeDetails);exit();
+	        $resultArr['finalSemDetails'] = [];
+	        $resultArr['message'] = "No record found";
+	    }
+	    return $resultArr;
+	}
 
     //get application form details
     public function get_applicationFrom_details($reqData, $reqBranch) {
         $studentId =  $reqData['studId'];
         $courseId = $reqData['courseId'];
         // $searchTableFor = APPLICATION_FORM;
-        $this->db->select('t1.ID, t1.Student_Fee_Status_Id, t1.BatchCode, t1.FeeType as SemID, CFD.Sem_Year as Sem_Year, t1.RegistrationMode, t1.RegistrationType');
+        $this->db->select('t1.ID, t1.Student_Fee_Status_Id, t1.BatchCode, t1.FeeType as SemID, CFD.Sem_Year as Sem_Year, t1.RegistrationMode, t1.RegistrationType,BM.BatchName,t1.CreatedOn');
         $this->db->from('T_Registration_Details as t1');
+        $this->db->join('T_Students_Fees_Status as SFS', 'SFS.FeesID = t1.Student_Fee_Status_Id');
         $this->db->join('T_Course_Fees_Details as CFD', 'CFD.ID = t1.FeeType');
+        $this->db->join('T_BatchMaster as BM', 'BM.BatchCode = t1.BatchCode');
         $this->db->where('t1.StudentID', $studentId);
         $this->db->where('t1.CourseID', $courseId);
+        $this->db->group_by('t1.ID');
         $fromTypes = $this->db->get();
         $formTypeDetails = $fromTypes->result();
+        // print_r($this->db->last_query());
+        // die();
         if($formTypeDetails){
             // print_r($formTypeDetails);exit();
             $resultArr['formTypeDetails'] = $formTypeDetails;
@@ -1066,12 +1214,12 @@ $this->db->insert_batch('T_BroadcastStatus', $data);
         $courseId = $reqData['courseId'];
         // echo $studentId;exit();
         // $searchTableFor = APPLICATION_FORM;
-        $this->db->select('t1.ID, t2.BatchCode, t2.FeeType as SemID, CFD.Sem_Year as Sem_Year, t2.RegistrationMode, t2.RegistrationType, t1.AppFormDate as StatusUpdateDate,t3.ListName ,t1.Comments');
+        $this->db->select('t1.ID, t2.BatchCode, t2.FeeType as SemID, CFD.Sem_Year as Sem_Year, t2.RegistrationMode, t2.RegistrationType, t1.AppFormDate as StatusUpdateDate,if(t3.ListCode = "U001","-",t3.ListName) as ListName ,t1.Comments');
         $this->db->from('T_ApplicationFormStatus as t1');
         $this->db->join('T_Registration_Details as t2', 't2.ID = t1.Registration_Details_ID');
         $this->db->join('T_Course_Fees_Details as CFD', 'CFD.ID = t2.FeeType');
         $this->db->join('' . PICK_LIST_DETAILS . ' as t3', 't3.ListCode = t1.ListCode', 'LEFT');
-           
+        $this->db->join('T_Students_Fees_Status as SFS','SFS.FeesID = t2.Student_Fee_Status_Id');      
         $this->db->where('t2.StudentID', $studentId);
         $this->db->where('t2.CourseID', $courseId);
         $this->db->group_by('t1.ID');

Apollo/api/application/models/Student_model.php

@@ -37,7 +37,8 @@ class Student_model extends CI_Model {
     }
 	public function get_student_tracking_details($universityid,$courseid,$MobileNumber,$loginBranch,$userType,$createdBy)
 	{
-	
+    // echo $universityid.'-'.$courseid.'-'.$MobileNumber.'-'.$loginBranch.'-'.$userType.'-'.$createdBy;
+    // die();
 	$sql="SELECT LTF.FollowupOn,LD.LeadID,LTF.InteractionId, LD.LeadName,LD.MobileNumber,LD.IsNewEnquiry, LT.TrackingID, LT.ActivityStatus,LT.AssignedTo, LT.StatusCode, LT.University, LT.Course, LT.AlternateMobile, LT.Address,LT.Flag, ST.StaffID, ST.Firstname, PLD1.ListCode as statusListCode, PLD1.ListName as statusListName, AV.ActivityID ,AV.ActivityName, LTF.FollowupComments 
 	FROM T_Lead_Tracking_Followup as LTF 
 	JOIN T_Lead_Tracking as LT ON LT.TrackingID=LTF.TrackingID
@@ -48,7 +49,7 @@ class Student_model extends CI_Model {
 	JOIN T_PickListDetails as PLD1 ON PLD1.ListCode = LT.StatusCode
 	JOIN T_UniversityMaster as UM ON UM.UniversityName=LT.University
 	JOIN T_CourseMaster as CM ON CM.CourseName=LT.Course 
-	WHERE LD.MobileNumber = '".$MobileNumber."' AND PLD1.BranchCode= '".$loginBranch."' AND UM.UniversityID = '".$universityid."'  AND CM.CourseID = '".$courseid."'    AND LTF.InteractionId in (select max(InteractionId) from T_Lead_Tracking_Followup  GROUP BY TrackingID)";
+	WHERE LD.MobileNumber = '".$MobileNumber."' AND PLD1.BranchCode= '".$loginBranch."' AND UM.UniversityID = '".$universityid."'   AND LTF.InteractionId in (select max(InteractionId) from T_Lead_Tracking_Followup  GROUP BY TrackingID)";
 	
 	// if($loginBranch !='All' AND $userType != EMPLOYEE){
             // $this->db->where('LT.CreatedBranch', $loginBranch);
@@ -73,18 +74,22 @@ class Student_model extends CI_Model {
 
       // }
       $sql.=" group by LTF.TrackingID";
+    //   print_r($sql);
+    //   die();
 	$b=$this->db->query($sql);
 	$trackingDetails = $b->result();
-	$result =$trackingDetails;
+    $result = $trackingDetails;
+    // print_r($result);
+    // die();
     return $result;
 	}
     // get student list based on login user
-    public function get_student_list($loginUserId, $loginUserBranchId, $loginUserType, $getSearchData,$batchcode) {
+    public function get_student_list($loginUserId, $loginUserBranchId, $loginUserType, $getSearchData,$batchcode=null) {
         if ($loginUserType == SUPER_ADMIN) {
             // list for super admin based on branch
   
             if ($getSearchData["University"] === '' && $getSearchData["Course"] === '' && $getSearchData["Status"] === '') {
-                $this->db->select('S.*, SC.id as Student_Course_id , U.UniversityName,U.UniversityID, C.CourseName,C.CourseCode,C.CourseID,SC.IsActive as CourseActive');
+                $this->db->select('S.*, SC.id as Student_Course_id, U.UniversityName, U.UniversityID, C.CourseName, C.CourseCode, C.CourseID, SC.IsActive as CourseActive, SC.Status CourseStatus ');
                 $this->db->from('' . STUDENTCOURSE . ' as SC');
                 $this->db->join('' . STUDENTS . ' as S', 'S.StudentID = SC.StudentID', 'LEFT');
                 $this->db->join('' . UNIVERSITY . ' as U', 'SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode', 'LEFT');
@@ -109,7 +114,7 @@ class Student_model extends CI_Model {
                 $StuStatus = $getSearchData['Status'];
                 if ($StuStatus == '') {
                     if ($University != '' && $Course == '' && $batchcode=='') {
-                        $subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName,U.UniversityID, C.CourseName,C.CourseCode,C.CourseID,SC.IsActive as CourseActive
+                        $subQuery = "SELECT S.*, SC.id as Student_Course_id, U.UniversityName, U.UniversityID, C.CourseName, C.CourseCode, C.CourseID, SC.IsActive as CourseActive, SC.Status CourseStatus "."
                                         FROM " . STUDENTCOURSE . " as SC 
 										LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID 
                                         LEFT JOIN  " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode
@@ -125,7 +130,7 @@ class Student_model extends CI_Model {
                                         ORDER BY S.CreatedOn";
                                         //  GROUP BY SC.StudentID 
                     } else if ($University != '' && $Course != '' && $batchcode=='') {
-                        $subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName,U.UniversityID, C.CourseCode,C.CourseName,C.CourseID,SC.IsActive as CourseActive
+                        $subQuery = "SELECT S.*, SC.id as Student_Course_id, U.UniversityName, U.UniversityID, C.CourseName, C.CourseCode, C.CourseID, SC.IsActive as CourseActive, SC.Status CourseStatus "."
                                         FROM " . STUDENTCOURSE . " as SC 
 										LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID
                                         LEFT JOIN  " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode
@@ -149,7 +154,7 @@ class Student_model extends CI_Model {
 
                     else if($University !='' && $Course == '' && $batchcode!='') 
                     {
-                           $subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName, U.UniversityID,C.CourseCode,C.CourseName,C.CourseID,SC.IsActive as CourseActive
+                        $subQuery = "SELECT S.*, SC.id as Student_Course_id, U.UniversityName, U.UniversityID, C.CourseName, C.CourseCode, C.CourseID, SC.IsActive as CourseActive, SC.Status CourseStatus "."
                                         FROM " . STUDENTCOURSE . " as SC 
                                         LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID 
                                         LEFT JOIN  " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode
@@ -171,7 +176,7 @@ class Student_model extends CI_Model {
 
                     else if($University !=''&&$Course != '' && $batchcode !='')
                     {
-                              $subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName,C.CourseCode, U.UniversityID,C.CourseName,C.CourseID,SC.IsActive as CourseActive
+                        $subQuery = "SELECT S.*, SC.id as Student_Course_id, U.UniversityName, U.UniversityID, C.CourseName, C.CourseCode, C.CourseID, SC.IsActive as CourseActive, SC.Status CourseStatus "."
                                         FROM " . STUDENTCOURSE . " as SC 
                                         LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID
                                         LEFT JOIN  " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode
@@ -197,7 +202,7 @@ class Student_model extends CI_Model {
                 else 
                 {
                     if ($University != '' && $Course == '' && $batchcode=='' ) {
-                        $subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName,C.CourseCode,U.UniversityID, C.CourseName,C.CourseID,SC.IsActive as CourseActive
+                        $subQuery = "SELECT S.*, SC.id as Student_Course_id, U.UniversityName, U.UniversityID, C.CourseName, C.CourseCode, C.CourseID, SC.IsActive as CourseActive, SC.Status CourseStatus "."
                                         FROM " . STUDENTCOURSE . " as SC LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID
                                         LEFT JOIN  " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID LEFT JOIN " . COURSE . " as C ON 
                                         SC.CourseID = C.CourseID
@@ -212,7 +217,7 @@ class Student_model extends CI_Model {
                                         group by Student_Course_id,StudentID    
                                         ORDER BY S.CreatedOn";
                     } else if ($University != '' && $Course != ''  && $batchcode=='') {
-                        $subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName, C.CourseCode,C.CourseName,C.CourseID,U.UniversityID,SC.IsActive as CourseActive
+                        $subQuery = "SELECT S.*, SC.id as Student_Course_id, U.UniversityName, U.UniversityID, C.CourseName, C.CourseCode, C.CourseID, SC.IsActive as CourseActive, SC.Status CourseStatus "."
                                         FROM " . STUDENTCOURSE . " as SC 
 										LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID
                                         LEFT JOIN  " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode
@@ -232,7 +237,7 @@ class Student_model extends CI_Model {
 
 
                           if ($University != '' && $Course == ''&& $batchcode=='' ) {
-                        $subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName,U.UniversityID, C.CourseCode,C.CourseName,C.CourseID,SC.IsActive as CourseActive
+                              $subQuery = "SELECT S.*, SC.id as Student_Course_id, U.UniversityName, U.UniversityID, C.CourseName, C.CourseCode, C.CourseID, SC.IsActive as CourseActive, SC.Status CourseStatus "."
                                         FROM " . STUDENTCOURSE . " as SC LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID
                                         LEFT JOIN  " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID LEFT JOIN " . COURSE . " as C ON 
                                         SC.CourseID = C.CourseID
@@ -248,7 +253,7 @@ class Student_model extends CI_Model {
                                         group by Student_Course_id,StudentID    
                                         ORDER BY S.CreatedOn";
                     } else if ($University != '' && $Course != '' && $batchcode=='') {
-                        $subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName,U.UniversityID, C.CourseCode,C.CourseName,C.CourseID,SC.IsActive as CourseActive
+                        $subQuery = "SELECT S.*, SC.id as Student_Course_id, U.UniversityName, U.UniversityID, C.CourseName, C.CourseCode, C.CourseID, SC.IsActive as CourseActive, SC.Status CourseStatus "."
                                         FROM " . STUDENTCOURSE . " as SC 
                                         LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID
                                         LEFT JOIN  " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode
@@ -269,7 +274,7 @@ class Student_model extends CI_Model {
 
                     else if($University != '' && $Course == ''  && $batchcode !='' )
                     {
-                            $subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName, U.UniversityID,C.CourseCode,C.CourseName,C.CourseID,SC.IsActive as CourseActive
+                        $subQuery = "SELECT S.*, SC.id as Student_Course_id, U.UniversityName, U.UniversityID, C.CourseName, C.CourseCode, C.CourseID, SC.IsActive as CourseActive, SC.Status CourseStatus "."
                                         FROM " . STUDENTCOURSE . " as SC LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID
                                         LEFT JOIN  " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID LEFT JOIN " . COURSE . " as C ON 
                                         SC.CourseID = C.CourseID
@@ -296,7 +301,7 @@ class Student_model extends CI_Model {
                     {   
 
 
-                          $subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName,C.CourseCode, U.UniversityID,C.CourseName,C.CourseID,SC.IsActive as CourseActive
+                        $subQuery = "SELECT S.*, SC.id as Student_Course_id, U.UniversityName, U.UniversityID, C.CourseName, C.CourseCode, C.CourseID, SC.IsActive as CourseActive, SC.Status CourseStatus "."
                                         FROM " . STUDENTCOURSE . " as SC 
                                         LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID
                                         LEFT JOIN  " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode
@@ -323,7 +328,7 @@ class Student_model extends CI_Model {
 
 
                         else{
-                        $subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName,C.CourseCode, C.CourseName,C.CourseID,U.UniversityID,SC.IsActive as CourseActive
+                            $subQuery = "SELECT S.*, SC.id as Student_Course_id, U.UniversityName, U.UniversityID, C.CourseName, C.CourseCode, C.CourseID, SC.IsActive as CourseActive, SC.Status CourseStatus "."
                                         FROM " . STUDENTCOURSE . " as SC 
 										LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID
                                         LEFT JOIN  " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode
@@ -347,10 +352,6 @@ class Student_model extends CI_Model {
                 $stuDetails = $this->db->query($subQuery);
                 $checkArr = $stuDetails->result();
 
-
-//print_r( $this->db->last_query());  
-//die();
-
                 if (count($checkArr) > 0) {
                     $results['studentList'] = true;
                     $results['student_details'] = $stuDetails->result();
@@ -361,7 +362,7 @@ class Student_model extends CI_Model {
         } else if ($loginUserType == ADMIN) {
             // list for admin
             if ($getSearchData["University"] === '' && $getSearchData["Course"] === '' && $getSearchData["Status"] === '') {
-                 $this->db->select('S.*, SC.id as Student_Course_id , U.UniversityName, U.UniversityID, C.CourseCode,C.CourseName,C.CourseID,SC.IsActive as CourseActive');
+                $this->db->select('S.*, SC.id as Student_Course_id, U.UniversityName, U.UniversityID, C.CourseName, C.CourseCode, C.CourseID, SC.IsActive as CourseActive, SC.Status CourseStatus ');
                 $this->db->from('' . STUDENTCOURSE . ' as SC');
                 $this->db->join('' . STUDENTS . ' as S', 'S.StudentID = SC.StudentID', 'LEFT');
                 $this->db->join('' . UNIVERSITY . ' as U', 'SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode', 'LEFT');
@@ -384,7 +385,7 @@ class Student_model extends CI_Model {
                 $StuStatus = $getSearchData['Status'];
                 if ($StuStatus == '') {
                     if ($University != '' && $Course == ''  && $batchcode=='') {
-                        $subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName,U.UniversityID,C.CourseCode, C.CourseName,C.CourseID,SC.IsActive as CourseActive
+                        $subQuery = "SELECT S.*, SC.id as Student_Course_id, U.UniversityName, U.UniversityID, C.CourseName, C.CourseCode, C.CourseID, SC.IsActive as CourseActive, SC.Status CourseStatus "."
                                         FROM " . STUDENTCOURSE . " as SC 
 										LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID
                                         LEFT JOIN  " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode 
@@ -397,7 +398,7 @@ class Student_model extends CI_Model {
                                         
                                         ORDER BY S.CreatedOn";
                     } else if ($University != '' && $Course != ''  && $batchcode=='') {
-                        $subQuery = "SELECT S.* , SC.id as Student_Course_id , U.UniversityName,U.UniversityID,C.CourseCode, C.CourseName,C.CourseID,SC.IsActive as CourseActive
+                        $subQuery = "SELECT S.*, SC.id as Student_Course_id, U.UniversityName, U.UniversityID, C.CourseName, C.CourseCode, C.CourseID, SC.IsActive as CourseActive, SC.Status CourseStatus "."
                                         FROM " . STUDENTCOURSE . " as SC
 										LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID
                                         LEFT JOIN  " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode
@@ -413,7 +414,7 @@ class Student_model extends CI_Model {
 
                     else if($University !='' && $Course == '' && $batchcode!='') 
                     {
-                           $subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName,U.UniversityID, C.CourseCode,C.CourseName,C.CourseID,SC.IsActive as CourseActive
+                        $subQuery = "SELECT S.*, SC.id as Student_Course_id, U.UniversityName, U.UniversityID, C.CourseName, C.CourseCode, C.CourseID, SC.IsActive as CourseActive, SC.Status CourseStatus "."
                                         FROM " . STUDENTCOURSE . " as SC 
                                         LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID
                                         LEFT JOIN  " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode 
@@ -436,7 +437,7 @@ class Student_model extends CI_Model {
                     else if($University !=''&&$Course != '' && $batchcode !='')
                     {
 
-                          $subQuery = "SELECT S.* , SC.id as Student_Course_id , U.UniversityName,C.CourseCode,U.UniversityID, C.CourseName,C.CourseID,SC.IsActive as CourseActive
+                        $subQuery = "SELECT S.*, SC.id as Student_Course_id, U.UniversityName, U.UniversityID, C.CourseName, C.CourseCode, C.CourseID, SC.IsActive as CourseActive, SC.Status CourseStatus "."
                                         FROM " . STUDENTCOURSE . " as SC
                                         LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID
                                         LEFT JOIN  " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode
@@ -459,7 +460,7 @@ class Student_model extends CI_Model {
                  else 
                  {
                     if ($University != '' && $Course == '' && $batchcode =='') {
-                        $subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName,C.CourseCode, U.UniversityID,C.CourseName,C.CourseID,SC.IsActive as CourseActive
+                        $subQuery = "SELECT S.*, SC.id as Student_Course_id, U.UniversityName, U.UniversityID, C.CourseName, C.CourseCode, C.CourseID, SC.IsActive as CourseActive, SC.Status CourseStatus "."
                                         FROM " . STUDENTCOURSE . " as SC 
 										LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID
                                         LEFT JOIN  " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode
@@ -474,7 +475,7 @@ class Student_model extends CI_Model {
                     } 
                     else if ($University != '' && $Course != '' && $batchcode =='') 
                     {
-                        $subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName,C.CourseCode,U.UniversityID, C.CourseName,C.CourseID,SC.IsActive as CourseActive
+                        $subQuery = "SELECT S.*, SC.id as Student_Course_id, U.UniversityName, U.UniversityID, C.CourseName, C.CourseCode, C.CourseID, SC.IsActive as CourseActive, SC.Status CourseStatus "."
                                         FROM " . STUDENTCOURSE . " as SC 
 										LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID
                                         LEFT JOIN  " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode
@@ -493,7 +494,7 @@ class Student_model extends CI_Model {
                     else if($University != '' && $Course == '' && $batchcode !='')
                     {
                           
-                           $subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName,U.UniversityID, C.CourseCode,C.CourseName,C.CourseID,SC.IsActive as CourseActive
+                        $subQuery = "SELECT S.*, SC.id as Student_Course_id, U.UniversityName, U.UniversityID, C.CourseName, C.CourseCode, C.CourseID, SC.IsActive as CourseActive, SC.Status CourseStatus "."
                                         FROM " . STUDENTCOURSE . " as SC 
                                         LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID
                                         LEFT JOIN  " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode
@@ -519,7 +520,7 @@ class Student_model extends CI_Model {
                     {
                            
 
-                           $subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName,C.CourseCode,U.UniversityID, C.CourseName,C.CourseID,SC.IsActive as CourseActive
+                        $subQuery = "SELECT S.*, SC.id as Student_Course_id, U.UniversityName, U.UniversityID, C.CourseName, C.CourseCode, C.CourseID, SC.IsActive as CourseActive, SC.Status CourseStatus "."
                                         FROM " . STUDENTCOURSE . " as SC 
                                         LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID
                                         LEFT JOIN  " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode
@@ -544,7 +545,7 @@ class Student_model extends CI_Model {
 
                     else 
                     {
-                        $subQuery = "SELECT S.*, SC.id as Student_Course_id , U.UniversityName,C.CourseCode,U.UniversityID, C.CourseName,C.CourseID,SC.IsActive as CourseActive
+                        $subQuery = "SELECT S.*, SC.id as Student_Course_id, U.UniversityName, U.UniversityID, C.CourseName, C.CourseCode, C.CourseID, SC.IsActive as CourseActive, SC.Status CourseStatus "."
                                         FROM " . STUDENTCOURSE . " as SC 
 										LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID
                                         LEFT JOIN  " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode
@@ -573,7 +574,7 @@ class Student_model extends CI_Model {
         } else if ($loginUserType == EMPLOYEE || $loginUserType == TRAINEE) {
             // list for staff
             if ($getSearchData["University"] === '' && $getSearchData["Course"] === '' && $getSearchData["Status"] === '') {
-                $this->db->select("S.*, IF(SFP.ID > 0, '1' , '0') as Fee_paid_exist ,  SC.id as Student_Course_id , U.UniversityName,U.UniversityID, C.CourseName,C.CourseCode,C.CourseID,SC.IsActive as CourseActive");
+                $this->db->select("S.*, IF(SFP.ID > 0, '1' , '0') as Fee_paid_exist ,  SC.id as Student_Course_id , U.UniversityName,U.UniversityID, C.CourseName,C.CourseCode,C.CourseID,SC.IsActive as CourseActive, SC.Status CourseStatus ");
                  $this->db->from('' . STUDENTCOURSE . ' as SC');
                 $this->db->join('' . STUDENTS . ' as S', 'S.StudentID = SC.StudentID', 'LEFT');
                 $this->db->join('' . UNIVERSITY . ' as U', 'SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode', 'LEFT');
@@ -597,7 +598,7 @@ class Student_model extends CI_Model {
                 $StuStatus = $getSearchData['Status'];
                 if ($StuStatus == '') {
                     if ($University != '' && $Course == '' && $batchcode=='') {
-                        $subQuery = "SELECT S.*, IF(SFP.ID > 0, '1' , '0') as Fee_paid_exist , SC.id as Student_Course_id , U.UniversityName,U.UniversityID, C.CourseName,C.CourseCode,C.CourseID,SC.IsActive as CourseActive
+                        $subQuery = "SELECT S.*, IF(SFP.ID > 0, '1' , '0') as Fee_paid_exist , SC.id as Student_Course_id , U.UniversityName,U.UniversityID, C.CourseName,C.CourseCode,C.CourseID,SC.IsActive as CourseActive, SC.Status CourseStatus 
                                         FROM " . STUDENTCOURSE . " as SC 
 										LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID
                                         LEFT JOIN  " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode
@@ -611,7 +612,7 @@ class Student_model extends CI_Model {
                                         GROUP BY SC.id 
                                         ORDER BY S.CreatedOn";
                     } else if ($University != '' && $Course != '' && $batchcode=='') {
-                        $subQuery = "SELECT S.*, IF(SFP.ID > 0, '1' , '0') as Fee_paid_exist , SC.id as Student_Course_id , U.UniversityName,U.UniversityID, C.CourseName,C.CourseCode,C.CourseID,SC.IsActive as CourseActive
+                        $subQuery = "SELECT S.*, IF(SFP.ID > 0, '1' , '0') as Fee_paid_exist , SC.id as Student_Course_id , U.UniversityName,U.UniversityID, C.CourseName,C.CourseCode,C.CourseID,SC.IsActive as CourseActive, SC.Status CourseStatus 
                                         FROM " . STUDENTCOURSE . " as SC 
 										LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID
                                         LEFT JOIN  " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode 
@@ -630,7 +631,7 @@ class Student_model extends CI_Model {
 
                    else if ($University != '' && $Course == '' && $batchcode !='') 
                    {
-                        $subQuery = "SELECT S.*, IF(SFP.ID > 0, '1' , '0') as Fee_paid_exist , SC.id as Student_Course_id , U.UniversityName,U.UniversityID, C.CourseName,C.CourseCode,C.CourseID,SC.IsActive as CourseActive
+                        $subQuery = "SELECT S.*, IF(SFP.ID > 0, '1' , '0') as Fee_paid_exist , SC.id as Student_Course_id , U.UniversityName,U.UniversityID, C.CourseName,C.CourseCode,C.CourseID,SC.IsActive as CourseActive, SC.Status CourseStatus 
                                         FROM " . STUDENTCOURSE . " as SC 
                                         LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID
                                         LEFT JOIN  " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode
@@ -654,7 +655,7 @@ class Student_model extends CI_Model {
 
 
                     else if ($University != '' && $Course != '' && $batchcode !='') {
-                        $subQuery = "SELECT S.*, IF(SFP.ID > 0, '1' , '0') as Fee_paid_exist , SC.id as Student_Course_id , U.UniversityName,U.UniversityID, C.CourseName,C.CourseCode,C.CourseID,SC.IsActive as CourseActive
+                        $subQuery = "SELECT S.*, IF(SFP.ID > 0, '1' , '0') as Fee_paid_exist , SC.id as Student_Course_id , U.UniversityName,U.UniversityID, C.CourseName,C.CourseCode,C.CourseID,SC.IsActive as CourseActive, SC.Status CourseStatus 
                                         FROM " . STUDENTCOURSE . " as SC 
                                         LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID
                                         LEFT JOIN  " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode 
@@ -693,7 +694,7 @@ class Student_model extends CI_Model {
                     //         OR (SC.CourseID = '$Course' AND SC.UniversityID = '$University'))
                 } else {
                     if ($University != '' && $Course == '' && $batchcode=='') {
-                        $subQuery = "SELECT  S.*, IF(SFP.ID > 0, '1' , '0') as Fee_paid_exist , SC.id as Student_Course_id , U.UniversityName,U.UniversityID, C.CourseName,C.CourseCode,C.CourseID,SC.IsActive as CourseActive
+                        $subQuery = "SELECT  S.*, IF(SFP.ID > 0, '1' , '0') as Fee_paid_exist , SC.id as Student_Course_id , U.UniversityName,U.UniversityID, C.CourseName,C.CourseCode,C.CourseID,SC.IsActive as CourseActive, SC.Status CourseStatus 
                                         FROM " . STUDENTCOURSE . " as SC 
 										LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID
                                         LEFT JOIN  " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode 
@@ -709,7 +710,7 @@ class Student_model extends CI_Model {
                                         GROUP BY SC.id 
                                         ORDER BY S.CreatedOn";
                     } else if ($University != '' && $Course != '' && $batchcode=='') {
-                        $subQuery = "SELECT  S.*, IF(SFP.ID > 0, '1' , '0') as Fee_paid_exist , SC.id as Student_Course_id , U.UniversityName,U.UniversityID, C.CourseName,C.CourseCode,C.CourseID,SC.IsActive as CourseActive
+                        $subQuery = "SELECT  S.*, IF(SFP.ID > 0, '1' , '0') as Fee_paid_exist , SC.id as Student_Course_id , U.UniversityName,U.UniversityID, C.CourseName,C.CourseCode,C.CourseID,SC.IsActive as CourseActive, SC.Status CourseStatus 
                                         FROM " . STUDENTCOURSE . " as SC 
 										LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID
                                         LEFT JOIN  " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode  
@@ -729,7 +730,7 @@ class Student_model extends CI_Model {
 
 
                else if ($University != '' && $Course == '' && $batchcode !='') {
-                        $subQuery = "SELECT  S.*, IF(SFP.ID > 0, '1' , '0') as Fee_paid_exist , SC.id as Student_Course_id , U.UniversityName,U.UniversityID, C.CourseName,C.CourseCode,C.CourseID,SC.IsActive as CourseActive
+                        $subQuery = "SELECT  S.*, IF(SFP.ID > 0, '1' , '0') as Fee_paid_exist , SC.id as Student_Course_id , U.UniversityName,U.UniversityID, C.CourseName,C.CourseCode,C.CourseID,SC.IsActive as CourseActive, SC.Status CourseStatus 
                                         FROM " . STUDENTCOURSE . " as SC 
                                         LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID
                                         LEFT JOIN  " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode 
@@ -755,7 +756,7 @@ class Student_model extends CI_Model {
 
 
                     else if ($University != '' && $Course != '' && $batchcode!='') {
-                        $subQuery = "SELECT  S.*, IF(SFP.ID > 0, '1' , '0') as Fee_paid_exist , SC.id as Student_Course_id , U.UniversityName,U.UniversityID, C.CourseName,C.CourseCode,C.CourseID,SC.IsActive as CourseActive
+                        $subQuery = "SELECT  S.*, IF(SFP.ID > 0, '1' , '0') as Fee_paid_exist , SC.id as Student_Course_id , U.UniversityName,U.UniversityID, C.CourseName,C.CourseCode,C.CourseID,SC.IsActive as CourseActive, SC.Status CourseStatus 
                                         FROM " . STUDENTCOURSE . " as SC 
                                         LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID
                                         LEFT JOIN  " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode  
@@ -777,24 +778,8 @@ class Student_model extends CI_Model {
                                         ORDER BY S.CreatedOn";
                     } 
 
-  
-
-                        
-
-
-
-
-
-
-
-
-
-
-
-
-
                     else {
-                        $subQuery = "SELECT  S.*, IF(SFP.ID > 0, '1' , '0') as Fee_paid_exist , SC.id as Student_Course_id , U.UniversityName,U.UniversityID, C.CourseName,C.CourseCode,C.CourseID,SC.IsActive as CourseActive
+                        $subQuery = "SELECT  S.*, IF(SFP.ID > 0, '1' , '0') as Fee_paid_exist , SC.id as Student_Course_id , U.UniversityName,U.UniversityID, C.CourseName,C.CourseCode,C.CourseID,SC.IsActive as CourseActive, SC.Status CourseStatus 
                                         FROM " . STUDENTCOURSE . " as SC 
 										LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID
                                         LEFT JOIN  " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode  
@@ -820,6 +805,9 @@ class Student_model extends CI_Model {
         } else {
             $results['studentList'] = false;
         }
+//         print_r( $this->db->last_query());  
+// die();
+
         return $results;
     }
 
@@ -834,7 +822,7 @@ class Student_model extends CI_Model {
         $this->db->join('' . STUDENTS_FEES_PAID . ' as t6', 't6.FeesId = t5.FeesID', 'LEFT');
         $this->db->where('t1.BranchID', $req['localBranchID']);
         $this->db->where('t1.StudentID', $studentId);
-        $this->db->where('t1.IsActive', '1');
+//         $this->db->where('t1.IsActive', '1'); //commented check since they wanted to activate the deactivated cources
         $this->db->group_by('t1.CourseID');
         $courseDetails = $this->db->get();
         $checkArr = $courseDetails->result();
@@ -1089,43 +1077,40 @@ if(count($qry)>0)
     public function add_student($Arr, $courseArr, $imagename, $imageSource, $size) {
        // print_r($courseArr);die();
 
-$Enrollment = $courseArr['EnrollmentID'];
+        $Enrollment = $courseArr['EnrollmentID'];
 
 
  
 
- if($Enrollment !='')
- {
+            if($Enrollment !='')
+            {
 
-$this->db->select('*');
-$this->db->from('T_Student_CourseDetails');
-$this->db->where('EnrollmentID',$Enrollment);
-$this->db->where('UniversityID',$courseArr['UniversityID']);
-$qry=$this->db->get();
-$qry=$qry->result();
+                $this->db->select('*');
+                $this->db->from('T_Student_CourseDetails');
+                $this->db->where('EnrollmentID',$Enrollment);
+                $this->db->where('UniversityID',$courseArr['UniversityID']);
+                $qry=$this->db->get();
+                $qry=$qry->result();
 
-//print_r($this->db->last_query());die();
+                //print_r($this->db->last_query());die();
 
-//echo count($qry);die();
+                //echo count($qry);die();
 
-if(count($qry)>0)
-{
-   $result['addStudentStatus'] = false;
-   $result['message'] = "EnrollmentID Already Exists";
+                if(count($qry)>0)
+                {
+                    $result['addStudentStatus'] = false;
+                    $result['message'] = "EnrollmentID Already Exists";
 
-    return $result;
+                    return $result;
 
- 
-}
-}
+                }
+            }
 
 
-
-
-        // echo $this->getBranchActiveStatusforStuAdd($courseArr['BranchID'])['branch_active_status'];exit();
-        if ($this->getBranchActiveStatusforStuAdd($courseArr['BranchID']) ['branch_active_status'] === '1') {
+            // echo $this->getBranchActiveStatusforStuAdd($courseArr['BranchID'])['branch_active_status'];exit();
+            if ($this->getBranchActiveStatusforStuAdd($courseArr['BranchID']) ['branch_active_status'] === '1') {
             //    echo 'in';exit();
-            if ($imageSource == '') { // add employee without image
+             if ($imageSource == '') { // add employee without image
                 $imageNameDb = 'default.jpeg';
                 $Arr['ProfilePicPath'] = "student/" . $imageNameDb;
                 // print_r($Arr);
@@ -1156,7 +1141,7 @@ if(count($qry)>0)
                                 $userId = $Arr['MobileNumber'];
                                 $getUnivName = $this->getUnivName($courseArr['UniversityID'], $courseArr['BranchID']);
                                 $getCourseName = $this->getCourseName($courseArr['CourseID'], $courseArr['BranchID']);
-                                $msg = "Thanks for registering with us for Course $getCourseName -$getUnivName. For more details, please login to www.apollodec.com. User ID :$userId, Password :abc123";
+                                $msg = "Thanks for registering with us for Course $getCourseName -$getUnivName. For more details, please login to www.apollodec.com. User ID :$userId, Password :abc123. APOLLO DEC";
                                 $arr = $userId;
                                 $this->smssend($arr, $msg);
                                 $emailId = $Arr['EmailID'];
@@ -1209,7 +1194,7 @@ if(count($qry)>0)
                                 
                                 $getUnivName = $this->getUnivName($courseArr['UniversityID'], $courseArr['BranchID']);
                                 $getCourseName = $this->getCourseName($courseArr['CourseID'], $courseArr['BranchID']);
-                                $msg = "Thanks for registering with us for Course $getCourseName -$getUnivName. For more details, please login to www.apollodec.com. User ID :$userId, Password :abc123";
+                                $msg = "Thanks for registering with us for Course $getCourseName -$getUnivName. For more details, please login to www.apollodec.com. User ID :$userId, Password :abc123 APOLLO DEC";
                                 $arr = $userId;
                                 $this->smssend($arr, $msg);
                                 $emailId = $Arr['EmailID'];
@@ -1240,7 +1225,15 @@ if(count($qry)>0)
 
      
     }
-
+public function testsmsandmailflow(){
+    $msg = "Thanks for registering with us for Course";
+    $arr = "6369084112";
+    $result['message'] = $this->smssend($arr, $msg);
+    $emailId = "sanjeev.p@venbainfotech.com";
+    $sub = ' Apollo - test';
+    $result['message2'] = $this->mailsend($emailId, $msg, $sub);
+    return $result;
+}
     // check existing data while update
     public function check_update_exist($exceptId, $datas, $checkFor) {
         if ($checkFor == 'mobileNumber') {
@@ -1570,26 +1563,25 @@ if(count($qry)>0)
       // print_r($reqArr);die();
 
 
-       if($reqArr['IsActive'] == 0)
-       {
-            $this->db->select('*');
-            $this->db->from('T_Students_Fees_Status');
-            $this->db->where('StudentID',$reqArr['StudentID']);
-            $this->db->where('CourseID',$reqArr['CourseID']);
+    //    if($reqArr['IsActive'] == 0)
+    //    {
+    //         $this->db->select('*');
+    //         $this->db->from('T_Students_Fees_Status');
+    //         $this->db->where('StudentID',$reqArr['StudentID']);
+    //         $this->db->where('CourseID',$reqArr['CourseID']);
 
-            $qry=$this->db->get();
-            $qry=$qry->result(); 
-            //print_r($this->db->last_query());die();
+    //         $qry=$this->db->get();
+    //         $qry=$qry->result(); 
 
-            if(count($qry)>0)
-                {
+    //         if(count($qry)>0)
+    //             {
+    //              $result['StudentStatus'] = false;
+    //              $result['message'] = "Fees Satus are active";
                 
-                $result['StudentStatus'] = false;
-                $result['message'] = "Fees Satus are active";
-                return $result;
+    //             }
+    //             return $result;
 
-                }
-       }
+    //    }
 
 
        if($Enrollment !='')
@@ -1818,8 +1810,6 @@ if(count($qry)>0)
         $output = curl_exec($ch);
         curl_close($ch);
 
-
-
           $arrss = explode('<br>', $output);
 
                 $time = date('Y-m-d H:i:s');
@@ -1845,10 +1835,18 @@ if(count($qry)>0)
                 }
               }
 
+        $this->db->db_debug = false;
+        $res = $this->db->insert_batch('T_BroadcastStatus', $data);
+    
+        if(!$res)
+        {
+            $error = $this->db->error();
+            return $error; 
 
-              $this->db->insert_batch('T_BroadcastStatus', $data);
-              
-        return $output;
+        }else{
+            return $output;
+        }
+        
     }
 
     public function mailsend($arr, $msg, $sub) {
@@ -1932,7 +1930,7 @@ if(count($qry)>0)
         $this->db->from('T_BroadcastStatus');
         $this->db->like('MobileNumber', $det['Phone'], 'before');
         $messagedet = $this->db->get();
-       
+        
         if($messagedet ->result())
         {
 
@@ -1950,7 +1948,7 @@ if(count($qry)>0)
         $this->db->from('T_BroadcastStatus');
         $this->db->where('MobileNumber', $det['Email']);
         $maildet = $this->db->get();
-
+        
 
          if($maildet ->result())
         {
@@ -1997,7 +1995,7 @@ if(count($qry)>0)
        
         $this->db->insert('T_Student_PhoneHistory',$mobileHistory);
         $r = $this->db->affected_rows();
-        if(count($r)>0)
+        if($r>0)
         {
             return $r;
         }

Apollo/api/application/models/Studentview_model.php

@@ -17,11 +17,9 @@ class Studentview_model extends CI_Model
 
     // get student list based on login user
     public function getStudentInfo($requestedBy=null,$requestFrom=null,$requestedBranch=null, $accessFrom=null)
-    {
-		
-		
+    {	
         if($requestFrom =='2'){
-			//echo '2';
+			// echo '2';die();
             //$this->db->select('ST.*');
 			$this->db->select('LO.ID,ST.*,concat(SF.Firstname," ",SF.Lastname) as fname,STC.DOJ');
             $this->db->from( LOGIN . ' as LO');
@@ -43,7 +41,7 @@ class Studentview_model extends CI_Model
             }
         }
         else if($requestFrom =='1'){
-				//echo '1';die();
+				// echo '1';die();
             $this->db->select('ST.*,concat(SF.Firstname," ",SF.Lastname) as fname,STC.DOJ');
             $this->db->from( LOGIN . ' as LO');
             $this->db->join( STUDENTS .' as ST', 'LO.StaffID = ST.StudentID');
@@ -64,17 +62,18 @@ class Studentview_model extends CI_Model
             }
         }
        else if ($requestFrom =='3'){
-		   //	echo '3';
+		   	// echo '3';die();
            $this->db->select('ST.*,min(BillDate)');
            $this->db->from( LOGIN . ' as LO');
            $this->db->join( STUDENTS . ' as ST', 'LO.StaffID = ST.StudentID');
            $this->db->join( STUDENTCOURSE . ' as STC', 'STC.StudentID = ST.StudentID');
-		   $this->db->join(STUDENTS_FEES_PAID . ' as SFP','SFP.StudentID = ST.StudentID ');
-		
-		$this->db->join(STUDENTS_FEES_STATUS . ' as SFS','SFS.FeesID = SFP.FeesId  and  SFS.StudentID = SFP.StudentID');
+		   $this->db->join(STUDENTS_FEES_PAID . ' as SFP','SFP.StudentID = ST.StudentID ','left');
+		   $this->db->join(STUDENTS_FEES_STATUS . ' as SFS','SFS.FeesID = SFP.FeesId  and  SFS.StudentID = SFP.StudentID','left');
            $this->db->where('ST.MobileNumber', $requestedBy);
            $this->db->where('STC.BranchID', $requestedBranch);
            $studentDetails  = $this->db->get()->first_row();
+        //    print_r($studentDetails);
+        //    print_r($this->db->last_query());die();
            if($studentDetails){
                $result['studentStatus'] = true;
                $result['studentDetails'] = $studentDetails;
@@ -88,7 +87,7 @@ class Studentview_model extends CI_Model
        }
        // requestedFrom 4 for based on form get student details
        else if ($requestFrom =='4'){
-		   	//echo '4';
+		   	// echo '4';die();
            $this->db->select('ST.*');
            $this->db->from( LOGIN . ' as LO');
            $this->db->join( STUDENTS . ' as ST', 'LO.StaffID = ST.StudentID');
@@ -150,10 +149,11 @@ class Studentview_model extends CI_Model
 
                 }
                     $fetchData['certificateDetails']=$this->getStudentCertificateDetails($studentId,$row->CourseID);
-                        $fetchData['markCardDetails']=$this->getMarkcardDetails($studentId,$row->CourseID);
-
-            $CourseArray[]=$fetchData;
+                    $fetchData['markCardDetails']=$this->getMarkcardDetails($studentId,$row->CourseID);
+                    $fetchData['batchHistory']=$this->getbatchHistory($studentId,$row->CourseID,$requestedBranch);
+                    $fetchData['applicationHistory']=$this->get_ApplicationFormStatusDetails($studentId,$row->CourseID,$requestedBranch);
 
+                    $CourseArray[]=$fetchData;
 
             }
             $studentCourseStatus['courseStatus'] = $CourseArray;
@@ -211,8 +211,7 @@ class Studentview_model extends CI_Model
                 $fetchData['studyMaterialDetails']=$this->getStudentMaterialDetails($studentId,$row->CourseID);
                 // get application details
                 if($requestFrom!='2'){
-                    //$fetchData['applicationDetails']=$this->getStudentApplicationDetails($studentId,$row->CourseID);
-
+                    // $fetchData['applicationDetails']=$this->getStudentApplicationDetails($studentId,$row->CourseID);
                     $fetchData['applicationDetails']=$this->getStudentLatestAppStatus($studentId,$row->CourseID); 
                     $fetchData['answerbookletDetails']=$this->getStudentAnswerbookletDetails($studentId,$row->CourseID);
 
@@ -222,6 +221,8 @@ class Studentview_model extends CI_Model
 
                 // get student Mark crad details
                 $fetchData['markCardDetails']=$this->getMarkcardDetails($studentId,$row->CourseID);
+                $fetchData['batchHistory']=$this->getbatchHistory($studentId,$row->CourseID,$requestedBranch);
+                $fetchData['applicationHistory']=$this->get_ApplicationFormStatusDetails($studentId,$row->CourseID,$requestedBranch);
 
                 $CourseArray[]=$fetchData;
 
@@ -506,8 +507,12 @@ class Studentview_model extends CI_Model
         $this->db->join(PICK_LIST_DETAILS.' as PLD', 'PLD.ListCode = SMS.ListCode');
         $this->db->where('CU.CourseID', $courseID);
         $this->db->where('SMS.StudentID', $studentID);
+        $this->db->where('PLD.ListName !=','BLANK');
+        $this->db->where('SMS.ListCode !=','');
+        // $this->db->group_by('SMS.ID');
         $this->db->order_by('SMS.ID', 'DESC');
         $getMaterialDetails = $this->db->get();
+        // print_r($this->db->last_query());die();
        if ($getMaterialDetails->result()){
            return $getMaterialDetails->result();
        }
@@ -532,6 +537,8 @@ class Studentview_model extends CI_Model
         $this->db->where('CU.CourseID', $courseID);
         $this->db->where('AS.StudentID', $studentID);
         $this->db->where('CM.CertificateName !=', APPLICATION_CONST);
+        $this->db->where('PLD.ListName !=','BLANK');
+        $this->db->group_by('AS.ID');
         $this->db->order_by('AS.ID', 'DESC');
         $getCertDetails = $this->db->get();
 
@@ -560,9 +567,11 @@ class Studentview_model extends CI_Model
         $this->db->where('CU.CourseID', $courseID);
         $this->db->where('AS.StudentID', $studentID);
         $this->db->where('CM.CertificateName', APPLICATION_CONST);
+        $this->db->where('PLD.ListName !=','BLANK');
+        $this->db->where('AS.ListCode !=','');
         $this->db->order_by('AS.ID', 'DESC');
         $getCertDetails = $this->db->get();
-
+        // print_r($this->db->last_query());die();
         if($getCertDetails->result()){
             return $getCertDetails->result();
         }
@@ -587,9 +596,12 @@ class Studentview_model extends CI_Model
 		$this->db->join(PICK_LIST_DETAILS.' as PLD2', 'PLD2.ListCode = ASBK.ListCode','LEFT');
         $this->db->where('CU.CourseID', $courseID);
         $this->db->where('CS.StudentID', $studentID);
+        $this->db->where('PLD.ListName !=','BLANK');
         $this->db->where_in('CS.CertificationType', 'MARK CARD');
+        $this->db->group_by('CS.ID');
         $this->db->order_by('CS.ID', 'DESC');
         $getMarkDetails = $this->db->get();
+        // print_r($this->db->last_query());die();
         if ($getMarkDetails->result()){
             return $getMarkDetails->result();
         }
@@ -609,6 +621,8 @@ class Studentview_model extends CI_Model
         $this->db->join(PICK_LIST_DETAILS.' as PLD', 'PLD.ListCode = ABT.ListCode');
         $this->db->where('CU.CourseID', $courseID);
         $this->db->where('ABT.StudentID', $studentID);
+        $this->db->where('PLD.ListName !=','BLANK');
+        // $this->db->group_by('ABT.ID');
         $this->db->order_by('ABT.ID', 'DESC');
         $getBookletDetails = $this->db->get();
         if ($getBookletDetails->result()){
@@ -672,16 +686,26 @@ class Studentview_model extends CI_Model
         // }
 
 
-
-        $subquery='SELECT t1.ID, t2.BatchCode, t2.FeeType as SemID, CFD.Sem_Year as Sem_Year,t2.RegistrationMode,t2.RegistrationType,t1.AppFormDate as StatusUpdateDate, t3.ListName,t1.Comments FROM T_ApplicationFormStatus as t1 JOIN T_Registration_Details as t2 ON t2.ID = t1.Registration_Details_ID JOIN T_Course_Fees_Details as CFD ON CFD.ID = t2.FeeType LEFT JOIN T_PickListDetails as t3 ON t3.ListCode = t1.ListCode WHERE t2.StudentID =? AND t2.CourseID = ? and t1.ID in (select max(ID) from T_ApplicationFormStatus group by Registration_Details_ID)';
+        
+        $subquery='SELECT t1.ID, t2.BatchCode,t4.BatchName,t2.FeeType as SemID, CFD.Sem_Year as Sem_Year,t2.RegistrationMode,t2.RegistrationType,t1.AppFormDate as StatusUpdateDate, t3.ListName,t1.Comments 
+        FROM T_ApplicationFormStatus as t1 
+        JOIN T_Registration_Details as t2 ON t2.ID = t1.Registration_Details_ID 
+        JOIN T_Course_Fees_Details as CFD ON CFD.ID = t2.FeeType 
+        LEFT JOIN T_PickListDetails as t3 ON t3.ListCode = t1.ListCode 
+        LEFT JOIN T_BatchMaster as t4 on t4.BatchCode = t2.BatchCode
+        WHERE t2.StudentID =? AND t2.CourseID = ? and t1.ID in (select max(ID) from T_ApplicationFormStatus group by Registration_Details_ID)
+        and t1.ListCode  != "" and t3.ListName !="BLANK"
+        ORDER BY t1.AppFormDate DESC, CFD.Sem_Year ASC';
+        $subquery_old='SELECT t1.ID, t2.BatchCode, t2.FeeType as SemID, CFD.Sem_Year as Sem_Year,t2.RegistrationMode,t2.RegistrationType,t1.AppFormDate as StatusUpdateDate, t3.ListName,t1.Comments FROM T_ApplicationFormStatus as t1 JOIN T_Registration_Details as t2 ON t2.ID = t1.Registration_Details_ID JOIN T_Course_Fees_Details as CFD ON CFD.ID = t2.FeeType LEFT JOIN T_PickListDetails as t3 ON t3.ListCode = t1.ListCode WHERE t2.StudentID =? AND t2.CourseID = ?';
 
         $query = $this->db->query($subquery,array($studentid,$courseid)); 
 
         $fromTypes = $query->result();  
 
-        if(count($query)>0)
+        if(count($fromTypes)>0)
        {
           return $fromTypes; 
+        //   return $this->db->last_query(); 
        }  
 
        else
@@ -692,4 +716,88 @@ class Studentview_model extends CI_Model
 
     }
 
+    public function s(){
+        $subquery_old='SELECT t1.ID, t2.BatchCode, t2.FeeType as SemID, CFD.Sem_Year as Sem_Year,t2.RegistrationMode,t2.RegistrationType,t1.AppFormDate as StatusUpdateDate, t3.ListName,t1.Comments FROM T_ApplicationFormStatus as t1 JOIN T_Registration_Details as t2 ON t2.ID = t1.Registration_Details_ID JOIN T_Course_Fees_Details as CFD ON CFD.ID = t2.FeeType LEFT JOIN T_PickListDetails as t3 ON t3.ListCode = t1.ListCode WHERE t2.StudentID =? AND t2.CourseID = ?';
+
+        $query = $this->db->query($subquery,array($studentid,$courseid)); 
+
+        $fromTypes = $query->result();  
+
+        if(count($fromTypes)>0)
+       {
+          return $fromTypes; 
+       }  
+
+       else
+       {
+            return false;
+       } 
+
+    }
+
+    public function updateStudentComment($id,$value){
+    
+        $Arr = array('Comments'=>$value);
+        $this->db->trans_start();
+        $this->db->where('StudentID',$id);
+        $this->db->update(STUDENTS, $Arr);
+        $affectedRows=$this->db->affected_rows();
+        $this->db->trans_complete();            
+        if ($this->db->trans_status() === false) {
+            $result = array( 'message' => 'Unable to Update details!','studCommentUpdateStatus' => false );
+        } else if ($this->db->trans_status() === true) {
+            if($affectedRows > 0 ) {
+            $result = array( 'message' => 'Successfully Updated!','studCommentUpdateStatus' => true );
+            } else {
+            $result = array( 'message' => 'No Changes, Try Again!.','studCommentUpdateStatus' => true );
+            }
+        }
+        else{
+            $result = array( 'message' => 'Haven`t Updated Anything,Try Again','studCommentUpdateStatus' => false );
+        }
+        return $result;
+    }
+
+    public function getbatchHistory($studentID=null,$courseID=null,$requestedBranch=null){
+        $this->db->select("CS.StudentID,CS.CourseID, ifnull(B1.BatchName,'-') as ExistValue,ifnull(B2.BatchName,'-') as NewValue,ST.Firstname as UpdatedBy,DATE_FORMAT(CS.UpdatedOn, '%d-%m-%Y %h:%i %p') as UpdatedOn,CS.Sem");
+        $this->db->from('T_Student_BatchHistory as CS');
+        $this->db->join(BATCH.' as B1', 'B1.BatchCode = CS.ExistValue and B1.BranchCode = "'.$requestedBranch.'"','left');
+        $this->db->join(BATCH.' as B2', 'B2.BatchCode = CS.NewValue and B2.BranchCode = "'.$requestedBranch.'"','left');
+        $this->db->join(LOGIN.' as LO', 'LO.ID = CS.UpdatedBy','left');
+        $this->db->join(STAFF.' as ST', 'ST.StaffID = LO.StaffID','left');
+        $this->db->where('CS.CourseID', $courseID);
+        $this->db->where('CS.StudentID', $studentID);
+        $this->db->where('CS.FieldName',"Batch");
+        $getbatchHistory = $this->db->get();
+        // print_r($this->db->last_query());die();
+        if ($getbatchHistory->result()){
+            return $getbatchHistory->result();
+        }
+        else{
+            return false;
+        }
+    }
+
+    public function get_ApplicationFormStatusDetails($studentId,$courseId,$reqBranch){
+    
+        $this->db->select('t1.ID, t5.BatchName, t2.FeeType as SemID, CFD.Sem_Year as Sem_Year, t2.RegistrationMode, t2.RegistrationType, t1.AppFormDate as StatusUpdateDate,t3.ListName ,t1.Comments');
+        $this->db->from('T_ApplicationFormStatus as t1');
+        $this->db->join('T_Registration_Details as t2', 't2.ID = t1.Registration_Details_ID');
+        $this->db->join('T_Course_Fees_Details as CFD', 'CFD.ID = t2.FeeType');
+        $this->db->join('' . PICK_LIST_DETAILS . ' as t3', 't3.ListCode = t1.ListCode', 'LEFT');
+        $this->db->join('T_Students_Fees_Status as SFS','SFS.FeesID = t2.Student_Fee_Status_Id');      
+        $this->db->join('T_BatchMaster as t5','t5.BatchCode = t2.BatchCode','LEFT');      
+        $this->db->where('t2.StudentID', $studentId);
+        $this->db->where('t2.CourseID', $courseId);
+        $this->db->group_by('t1.ID');
+        $fromTypes = $this->db->get();
+        $formTypeDetails = $fromTypes->result();
+        if($formTypeDetails){
+            return $formTypeDetails;
+        } else {
+            return false;
+        }
+    }
+
+
 }

Apollo/api/system/libraries/Upload.php

@@ -1104,7 +1104,7 @@ class CI_Upload {
 			}
 
 			$memory_limit = (int) ceil(filesize($file) + $memory_limit[0]);
-			ini_set('memory_limit', $memory_limit); // When an integer is used, the value is measured in bytes. - PHP.net
+			ini_set('memory_limit', '512M'); // ini_set('memory_limit', $memory_limit); // When an integer is used, the value is measured in bytes. - PHP.net
 		}
 
 		// If the file being uploaded is an image, then we should have no problem with XSS attacks (in theory), but

Apollo/assets/i18n/en.json

@@ -115,7 +115,8 @@
           "ANSWERBOOKLET": "Answer Booklet",
           "MARKCARD": "Mark Cards",
           "CERTIFICATE" : "Certificates",
-          "APPLICATION": "Application"
+          "APPLICATION": "Application",
+          "ONLINETRANSACTION": "Online Transaction"
         }
       },
       "formupload": {
@@ -157,6 +158,7 @@
         "DAYBOOK": "DAY BOOK",
         "APPROVAL": "Approve Expense",
         "DAYBOOKDETAILS": "Daybook Details",
+        "ONLINEDAYBOOK": "Online Daybook",
         "DAYBOOKAPPROVAL": "Approve Expenses",
         "INCOMEEXPENSEREPORT" : "Proft/Loss Statement",
         "DATACORRECTION" : "Bills Correction",

Apollo/assets/js/BatchmomentCtrl.js

@@ -0,0 +1,15 @@
+'use strict';
+/**
+ * controllers for ng-table
+ * Simple table with sorting and filtering on AngularJS
+ */
+app.controller('BatchmomentCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableParams", "API_POINTS", "$localStorage", "$http", "$state","$modal","$log", function ($scope,$rootScope,toaster, $filter, ngTableParams, apiPoint, $localStorage, $http, $state,$modal,$log) {
+    $scope.myModel = {
+        "universityName":"",
+		"courseName":"",
+		"batchName":""
+    };
+	
+	
+
+}]);

Apollo/assets/js/config.constant.js

@@ -190,9 +190,11 @@ app.constant('JS_REQUIRES', {
         * */
         'certificateStatusCtrl': 'assets/js/controllers/certificateStatusCtrl.js',
          /*
+         
         * Certificate Type 
         * */
         'certificateCtrl': 'assets/js/controllers/certificateCtrl.js',
+        'onlinetransactionStatusCtrl': 'assets/js/controllers/onlinetransactionStatusCtrl.js',
         /*
         * daybook details
         * */
@@ -202,6 +204,7 @@ app.constant('JS_REQUIRES', {
         'daybookapprovalCtrl': 'assets/js/controllers/daybookapprovalCtrl.js',
         'daybookadminapprovalCtrl': 'assets/js/controllers/daybookadminapprovalCtrl.js',
         'daybooksuperadminapprovalCtrl': 'assets/js/controllers/daybooksuperadminapprovalCtrl.js',
+        'daybookonlineCtrl': 'assets/js/controllers/daybookonlineCtrl.js',
 
         'studentStatusUpdateCtrl':'assets/js/controllers/studentStatusUpdateCtrl.js',
         'studentViewCtrl':'assets/js/controllers/studentViewCtrl.js',

Apollo/assets/js/config.router.js

@@ -425,6 +425,23 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com
                 title: 'application',
                 ncyBreadcrumb: {
                     label: 'application'
+                },
+                                // resolve: loadSequence('wizardCtrl')
+            }).state('app.student.status.onlinetransaction', {
+                url: '/onlinetransaction',
+                templateUrl: "assets/views/status-update/onlinetransaction_status.html",
+                title: 'Online Transaction Status',
+                resolve: loadSequence('ui.select','spin', 'ui.mask', 'spin', 'ladda', 'angular-ladda', 'ngTable', 'onlinetransactionStatusCtrl'),
+                ncyBreadcrumb: {
+                    label: 'Online Transaction Status'
+                },
+                // resolve: loadSequence('wizardCtrl')
+            }).state('app.status.onlinetransaction', {
+                url: '/onlinetransaction',
+                templateUrl: "assets/views/onlinetransaction.html",
+                title: 'onlinetransaction',
+                ncyBreadcrumb: {
+                    label: 'onlinetransaction'
                 },
                 // resolve: loadSequence('ui.select', 'monospaced.elastic', 'ui.mask', 'touchspin-plugin', 'selectCtrl')
             }).state('app.student.status.fees', {
@@ -532,6 +549,14 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com
                 ncyBreadcrumb: {
                     label: 'Daybook Approval'
                 } 
+            }).state('app.daybook.onlinedaybook', {
+                url: '/onlinedaybook',
+                templateUrl: "assets/views/daybook/daybookOnline.html",
+                title: 'Online Daybook',
+                resolve: loadSequence('spin', 'ladda', 'angular-ladda', 'daybookonlineCtrl','ngTable'),
+                ncyBreadcrumb: {
+                    label: 'Online Daybook'
+                } 
             }).state('app.daybookadmin', {
                 url: '/daybookadmin',
                 template: '<div ui-view class="fade-in-up"> <div style="margin: auto; width: 50%;padding: 10px;"> STUDENT STATUS UPDATE </div> </div>',
@@ -581,6 +606,15 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com
                     label: 'Daybook Approval'
                 } 
             })
+            .state('app.daybooksuperadmin.onlinedaybook', {
+                url: '/onlinedaybook',
+                templateUrl: "assets/views/daybook/daybookOnline.html",
+                title: 'Online Daybook',
+                resolve: loadSequence('spin', 'ladda', 'angular-ladda', 'daybookonlineCtrl','ngTable'),
+                ncyBreadcrumb: {
+                    label: 'Online Daybook'
+                } 
+            })
             // .state('app.daybooksuperadmin', {
             //     url: '/daybooksuperadmin',
             //     templateUrl: "assets/views/daybook/daybooksuperadmin.html",

Apollo/assets/js/controllers/answerBookletStatusCtrl.js

@@ -104,7 +104,9 @@ app.controller('answerBookletStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
         'staus': '',
         'dateOn': '',
         'comment': '',
-        'sem': ''
+        'courierDetails': '',
+        'sem': '',
+        'SameAsFinalSemCourier':false
     }
 
     $scope.universityData = '';
@@ -270,7 +272,9 @@ app.controller('answerBookletStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
                 'staus': '',
                 'dateOn': '',
                 'comment': '',
-                'sem': ''
+                'courierDetails': '',
+                'sem': '',
+                'SameAsFinalSemCourier':false
             }
         } else {
             $scope.OpenWindowStatus = false;
@@ -350,6 +354,7 @@ app.controller('answerBookletStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
     $scope.statusUpdate = {
         submit: function (form, myStatusModel, localBranchDetails) {
             var firstError = null;
+            // alert('------->', $scope.myStatusModel.courierDetails, $scope.myStatusModel.comment);
             if (form.$invalid) {
                 var field = null, firstError = null;
                 for (field in form) {
@@ -363,7 +368,9 @@ app.controller('answerBookletStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
                     }
                 }
                 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");
+                
+                
+                swal("The form cannot be submitted because it contains validation errors!", "Errors are marked with a red, dashed border!", "error");
             } else {
                 localDetails.localBranchID = localBranchDetails !== '' ? localBranchDetails : localDetails.localBranchID ;
                 localDetail.localBranchID = localBranchDetails !== '' ? localBranchDetails : localDetail.localBranchID ;
@@ -374,7 +381,9 @@ app.controller('answerBookletStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
                 var ItemsSelected = $scope.searchResultDetails.filter(function (item) {
                     if (item.Selected === true) {
                         let getStudentID = new getStudentForUpdateDetails(item.StudentID, item.BranchCode);
+                        // getStudentID.courierDetails.replace('/\n\r?/g', '<br />');
                         studentForUpdate.push(getStudentID);
+                        // console.log(studentForUpdate);
                         return true;
                     }
                 });
@@ -389,8 +398,12 @@ app.controller('answerBookletStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
                     this.ListCode = $scope.myStatusModel.staus;
                     this.SDate = $scope.myStatusModel.dateOn;
                     this.Coursedetail = id;
-                    this.Comments = $scope.myStatusModel.comment;
-                     this.Sem = $scope.myStatusModel.sem === '' ? courseID.Sem_Year : $scope.myStatusModel.sem;
+                    this.Comments = $scope.myStatusModel.comment.replace('/\n\r?/g', '<br />');
+                    this.CourierDetails = $scope.myStatusModel.courierDetails.replace('/\n\r?/g', '<br />');
+                    // alert($scope.myStatusModel.courierDetails);
+                    this.Sem = $scope.myStatusModel.sem === '' ? courseID.Sem_Year : $scope.myStatusModel.sem;
+
+                    
                    }
         
                 var updateStudyMaterial = {
@@ -426,9 +439,72 @@ app.controller('answerBookletStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
                 'staus': '',
                 'dateOn': '',
                 'comment': '',
-                'sem': ''
+                'courierDetails': '',
+                'sem': '',
+                'SameAsFinalSemCourier':false
             }
+        },
+        // get final sem courier if available based on the course selected for user
+        updateSameAsFinalSemCourier: function (myStatusModel, courseCode, StuId) {
+        	
+           
+//                var courseID = JSON.parse(myStatusModel.semYear);
+        	var courseID=$scope.semYearList[$scope.semYearList.length-1].ID;
+//                console.log($scope.myStatusModel.SameAsFinalSemCourier+"====$scope.myStatusModel.semYear--"+$scope.myStatusModel.semYear);
+//                var val = courseID.ID;
+//        	$scope.myStatusModel.courierDetails = 'tttttttttttttttt'+courseID.ID+"--"+StuId;
+            if($scope.myStatusModel.semYear ===''){
+            	alert("Please select Sem/Year to copy the courier details!");
+            	$scope.myStatusModel.SameAsFinalSemCourier=false;
+                return;
+            }
+        	if($scope.myStatusModel.SameAsFinalSemCourier){
+            if (courseID !== '' && courseID !== undefined) {
+                var getFinalSemCourier= {
+                    method: 'POST',
+                    url: apiPoint.url + 'getFinalSemCourier/',
+                    headers: {
+                        'Content-Type': 'application/json'
+                    },
+                    data: {
+                        data: courseID,
+                        stuFor: StuId,
+                        branchID:localDetails.localBranchID
+                    }
+                };
+                $http(getFinalSemCourier).then(function (response) {
+                    if (response.data.finalSemDetails) {
+                    	$scope.myStatusModel.courierDetails = response.data.finalSemDetails[0].CourierDetails;
+                    	$scope.myStatusModel.staus = response.data.finalSemDetails[0].ListCode;
+                    	$scope.myStatusModel.dateOn = response.data.finalSemDetails[0].AnsDate;
+                    	$scope.myStatusModel.comment = response.data.finalSemDetails[0].Comments;
+                    } else {
+                    	$scope.myStatusModel = {
+                                'semYear': '',
+                                'staus': '',
+                                'dateOn': '',
+                                'comment': '',
+                                'courierDetails': '',
+                                'sem': '',
+                                'SameAsFinalSemCourier':false
+                            }
+                    }
+                });
+    
+            } 
+        }else{
+        	$scope.myStatusModel = {
+                    'semYear': '',
+                    'staus': '',
+                    'dateOn': '',
+                    'comment': '',
+                    'courierDetails': '',
+                    'sem': '',
+                    'SameAsFinalSemCourier':false
+                }
         }
+        }
+     
     }
 
     // check unchek for table values
@@ -469,7 +545,7 @@ app.controller('answerBookletStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
 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';
-
+    $scope.userType=JSON.parse(sessionStorage.getItem('localObj')).localType;
 
 
     //  $scope.items = ['item1', 'item2', 'item3'];
@@ -525,7 +601,62 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
 
 
     };
-    $scope.open1 = function (values,type) {
+    $scope.open1 = function (arr,type,filterby) {
+        var values = arr;
+        if(type == '1' || type == '2'){ var result = values;} 
+        if(type == '3' || type == '5' || type == '7' || type == '8'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].Sem === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
+        if(type == '4'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].Sem_Year === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
+        if(type == '6'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].CertificateName === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
+        var modalInstance1 = $modal.open({
+            templateUrl: 'assets/views/student/studentPaymentModal.html',
+            controller: 'ModalInstanceCtrl1',
+            // size: size,
+            resolve: {
+                items1: function () {
+                    var myvalues =
+                        {
+                            "values":result,
+                            "type":type
+                        };
+                    return  myvalues;
+                }
+            }
+        });
+
+        modalInstance1.result.then(function (selectedItem) {
+            $scope.selected = selectedItem;
+        }, function () {
+            $log.info('Modal dismissed at: ' + new Date());
+        });
+    };
+    $scope.open2 = function (values,type) {
 
         var modalInstance1 = $modal.open({
             templateUrl: 'assets/views/student/studentPaymentModal.html',

Apollo/assets/js/controllers/applicationStatusCtrl.js

@@ -495,6 +495,7 @@ $scope.editStatusID = id;
 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';
+    $scope.userType=JSON.parse(sessionStorage.getItem('localObj')).localType;
 
 
 
@@ -551,8 +552,39 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
 
 
     };
-    $scope.open1 = function (values,type) {
-
+    $scope.open1 = function (values,type,filterby) {
+        if(type == '1' || type == '2'){ var result = values;} 
+        if(type == '3' || type == '5' || type == '7' || type == '8'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].Sem === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
+        if(type == '4'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].Sem_Year === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
+        if(type == '6'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].CertificateName === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
+        
         var modalInstance1 = $modal.open({
             templateUrl: 'assets/views/student/studentPaymentModal.html',
             controller: 'ModalInstanceCtrl1',
@@ -561,7 +593,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
                 items1: function () {
                     var myvalues =
                         {
-                            "values":values,
+                            "values":result,
                             "type":type
                         };
                     return  myvalues;

Apollo/assets/js/controllers/callTrackingCtrl.js

@@ -3,7 +3,7 @@
  * controllers for ng-table
  * Simple table with sorting and filtering on AngularJS
  */
-app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableParams", "API_POINTS", "$sessionStorage", "$http", "$state", function ($scope,$rootScope,toaster, $filter, ngTableParams, apiPoint, $sessionStorage, $http, $state) {
+app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableParams", "API_POINTS", "$sessionStorage", "$http", "$state","$modal", function ($scope,$rootScope,toaster, $filter, ngTableParams, apiPoint, $sessionStorage, $http, $state,$modal) {
     sessionStorage.setItem('searchName','');
     sessionStorage.setItem('searchMobile','');
     $scope.userType=JSON.parse(sessionStorage.getItem('localObj')).localType;
@@ -104,7 +104,6 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter",
 
     }
 
-
     /*
     * make a search date array
     */
@@ -359,7 +358,103 @@ if(checkresult != -1)
             };
         }
     };
+    $scope.trackForm2 = {
+        submit: function (form, myModel,loading,selectedStudents) {
+            //  console.log(form);
+            //  console.log(myModel);
+            //  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(sessionStorage.getItem('localObj')).localBranchID;
+                    $scope.updateAssignTo = myModel.assignedTo;
+
+                }
+                else{
+                    $scope.updateBranchID = myModel.branch.BranchCode;
+                    $scope.updateAssignTo = myModel.assignedTo;
+
+                }*/
+                   
+                var updateFollowupDetails2 = {
+                    method: 'POST',
+                    url: apiPoint.url + 'updateFollowupDetails2/',
+                    headers: {
+                        'Content-Type': 'application/json'
+                    },
+                    data: {
+                        student:selectedStudents,
+                        date: $scope.nextFollowupDate,
+                        assignedTo: myModel.assignedTo,
+                        status: myModel.status,
+                        comments:myModel.comments,
+                        createdBy: JSON.parse(sessionStorage.getItem('localObj')).localUserID,
+                        branchId: JSON.parse(sessionStorage.getItem('localObj')).localBranchID
+
+                    }
+                };
+                $http(updateFollowupDetails2).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":''
+            };
+        }
+    };
 
     /*
     * get student exist or not for add lead details
@@ -465,6 +560,7 @@ $scope.trackingTodayno=0;
 
 
         $scope.data = [];
+        $scope.dCopy = [];
         if(myModel!='' && myModel!=undefined){
             $scope.finalSearchArry=myModel;
            
@@ -515,6 +611,7 @@ $scope.trackingTodayno=0;
                     $scope.dbFollowDate = getYear+'-'+getMonth+'-'+getDay;
                     if (($scope.currentDate) > ( $scope.dbFollowDate) && (value.statusName!='CLOSE')) {
                         $scope.data.push(value);
+                        $scope.dCopy.push(value);
                     }
 
 
@@ -524,6 +621,7 @@ $scope.trackingTodayno=0;
                 angular.forEach(response.data.trackingDetails, function (value1, key1) {
 
                     $scope.data.push(value1);
+                    $scope.dCopy.push(value1);
                 });
 
 
@@ -542,6 +640,7 @@ $scope.trackingTodayno=0;
                 $rootScope.trackingStatus = response.data.statusDetails;
 
                 $scope.data = response.data.trackingDetails;
+                $scope.dCopy= response.data.trackingDetails;
 
                 sessionStorage.setItem('trackingList', JSON.stringify($scope.data));
             }
@@ -564,6 +663,7 @@ $scope.trackingTodayno=0;
                     if (($scope.currentDate) > ($scope.dbFollowDate) && (value.statusName!='CLOSE')) {
 
                         $scope.data.push(value);
+                        $scope.dCopy.push(value);
                     }
                 });
                 sessionStorage.setItem('trackingList', JSON.stringify($scope.data));
@@ -578,6 +678,7 @@ $scope.trackingTodayno=0;
 
                 $scope.branchInfo = '';
                 $scope.data='';
+                $scope.dCopy='';
 
             }
 
@@ -717,8 +818,296 @@ $scope.GetstaffwiseDetails($scope.tod);
 
     }
 
-}]);
+    $scope.searchableChange = function(search2,search3,search4,search5) { 
+        $scope.search2_details = search2 != '' ? search2 : '';
+        $scope.search3_activity = search3 != '' ? search3 : '';
+        $scope.search4_assigned = search4 != '' ? search4 : '';
+        $scope.search5_status = search5 != '' ? search5 : '';
+        console.log($scope.search2_details,$scope.search3_activity,$scope.search4_assigned,$scope.search5_status);
+        $scope.myModel.all = false;
+    }; 
 
+    $scope.arrayReturn = function(search2,search3,search4,search5) { 
+        
+        console.log('Initial',$scope.data);
+        $scope.searchedData1=[];
+        $scope.selectedLeadID = [];
+        $scope.disable = false;
+        if(search2!='' && search2!=null && search2!=undefined){
+
+            $scope.regInteger = /^\d+$/;
+            if($scope.regInteger.test(search2)){
+                $scope.searchText = search2;
+                angular.forEach($scope.data, function(item) {
+                    if( item.MobileNumber.indexOf($scope.searchText) >= 0 ){
+                        $scope.searchedData1.push(item);
+                    }
+
+                });
+            }
+            else{
+                $scope.search2 = search2.toLowerCase();
+                angular.forEach($scope.data, function(item) {
+                    if( item.LeadName.toLowerCase().indexOf($scope.search2) >= 0 ){
+                        $scope.searchedData1.push(item);
+                    }
+                });
+            }
+        }
+        else{
+            angular.forEach($scope.data,function (value,key) {$scope.searchedData1.push(value);});
+        }
+        // console.log('Step1 output',$scope.searchedData1);
+        // console.log('search',search3);
+        $scope.searchedData2=[];
+        if(search3!='' && search3!=null && search3!=undefined){
+            // console.log('hai i have value',search3);
+            angular.forEach($scope.searchedData1, function(item) {
+                if( item.ActivityName.toLowerCase().indexOf(search3.toLowerCase()) >= 0 ){
+                    $scope.searchedData2.push(item);
+                }
+
+            });
+
+        }
+        else{
+            angular.forEach($scope.searchedData1,function (value,key) {
+
+                $scope.searchedData2.push(value);
+            });
+
+        }
+
+        // serach assigned to in array list
+        // console.log('Step2 output',$scope.searchedData2);
+        $scope.searchedData3=[];
+        if(search4!='' && search4!=null && search4!=undefined){
+
+            angular.forEach($scope.searchedData2, function(item) {
+
+                if(item.Firstname.toLowerCase().indexOf(search4.toLowerCase()) >= 0 ){
+                    $scope.searchedData3.push(item);
+
+                }
+
+
+            });
+
+        }
+        else{
+            angular.forEach($scope.searchedData2,function (value,key) {
+
+                $scope.searchedData3.push(value);
+            });
+
+        }
+        // console.log('Step3 output',$scope.searchedData3);
+        // // search status in array list
+
+        
+        $scope.searchedData4=[];
+        if(search5!='' && search5!=null && search5!=undefined){
+
+            angular.forEach($scope.searchedData3, function(item) {
+
+                if( item.statusName.toLowerCase().indexOf(search5.toLowerCase()) >= 0 ){
+                    $scope.searchedData4.push(item);
+                }
+
+            });
+
+        }
+        else{
+            angular.forEach($scope.searchedData3,function (value,key) {
+                $scope.searchedData4.push(value);
+            });
+
+        }
+        console.log('Step4 output',$scope.searchedData4);
+        $scope.disable = false;
+     }; 
+
+     
+    // $scope.$watch(function () {
+    //     // $scope.filteredItems = $scope.$eval(" data |filter:search2 ");
+    //     $scope.filteredItems = $scope.$eval(" data | filter:"+$scope.search3_activity);
+    //     // console.log($scope.filteredItems);
+    //     // console.log($scope.search3_activity);
+    // });
+
+      /**
+     * Auto Call Tracking Sriram
+     */
+    $scope.selectedLeadID = [];
+    $scope.isCheckAll = function(e){
+
+        var val = (e.target.checked ? true : false);
+
+        console.log('$scope.search2_details',$scope.search2_details);
+        console.log('$scope.search3_activity',$scope.search3_activity);
+        console.log('$scope.search4_assigned',$scope.search4_assigned);
+        console.log('$scope.search5_status',$scope.search5_status);
+        console.log('$scope.searchedData4',$scope.searchedData4);
+        $scope.arrayReturn($scope.search2_details,$scope.search3_activity,$scope.search4_assigned,$scope.search5_status);
+        // alert(val);
+        // return true;
+        if(val)
+        {
+            // $scope.disable = false;
+            // var len2 =  $scope.data.length;
+            var len = $scope.searchedData4.length;
+            console.log("len filter",len);
+            var i = 0;
+            for(i=0;i<len;i++)
+            {
+                if($scope.selectedLeadID.indexOf($scope.searchedData4[i]) === -1)
+                {
+                    $scope.selectedLeadID.push($scope.searchedData4[i]);
+                }
+            }
+        }
+        else
+        {
+            // $scope.disable = true;
+            $scope.selectedLeadID = [];
+        }
+        if($scope.selectedLeadID !=''){
+            $scope.disable = false;
+        }else{
+            $scope.disable = true;
+        }
+        console.log("$scope.selectedLeadID",$scope.selectedLeadID);
+    }
+    $scope.isClick = function(e){
+        var ide = e.target;
+    var val = (ide.checked ? true : false);
+    var sid = e.target.id;
+    
+    
+    angular.forEach($scope.data,function(value,key){
+        // console.log(value);
+        if(sid == value.LeadID)
+        {
+            sid = value;
+        }
+    });
+    var pos = $scope.selectedLeadID.indexOf(sid);
+    if(val)
+    {
+        if( pos == -1)
+        {
+           
+            console.log("PUSH");
+            $scope.selectedLeadID.push(sid);
+        }
+        
+    }
+    else
+    {
+       
+        //console.log("POP");
+        $scope.selectedLeadID.splice(pos,1);
+    }
+    //
+    if(val){
+        $scope.disable = false;
+    }else{
+        $scope.disable = true;
+    }
+    console.log("donedon",$scope.selectedLeadID);
+    }
+    
+    $scope.calltracking = function(){
+        console.log('CALL',$scope.selectedLeadID);
+        // swal('testing','','warning');
+        // return true;
+        //$rootScope.student = $scope.selectedStudentsID;
+        $scope.filteredList=[];
+        if($scope.selectedLeadID ==''){
+            swal('Select Check box','','warning');
+			return false;
+        }else{
+            if($scope.search3_activity!='' && $scope.search3_activity!=null && $scope.search3_activity!=undefined){
+                angular.forEach($scope.selectedLeadID, function(item) {                
+                    if(item.ActivityName.toLowerCase().indexOf($scope.search3_activity.toLowerCase()) >= 0 ){
+                        $scope.filteredList.push(item);
+                    }
+                });      
+                var ActivityID = $scope.filteredList[0].ActivityID;
+            }else{
+                var keys = [];
+                var ActivityID = '';
+                angular.forEach($scope.selectedLeadID, function(item) {
+                    var key = item['ActivityStatus'];
+                    if(keys.indexOf(key) === -1) { keys.push(key); /*keys.push(item); */}
+                });
+                if(keys.length === 1){ ActivityID = keys[0]; }
+            }
+            // console.log(ActivityID,'ActivityID');
+        $scope.controller = 'ng-controller="callTrackingCtrl"';
+        var lead = {
+            method: 'POST',
+            url: apiPoint.url + 'getTrackingLeadDetails2/',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            data: {
+                requestedBy: JSON.parse(sessionStorage.getItem('localObj')).localUserID,
+                branchID:JSON.parse(sessionStorage.getItem('localObj')).localBranchID,
+                userType:JSON.parse(sessionStorage.getItem('localObj')).localType,
+                activity:ActivityID
+            }
+        };
+        $http(lead).then(function (response) {
+            console.log('i got the response');
+            
+            if (response.data.status==200) {        
+                        // if($scope.search3_activity){
+                        //     $scope.fS = $filter('filter')(response.data.activityDetails, {'activityName':$scope.search3_activity});
+                        //     console.log($scope.fS);
+                        //     console.log($scope.fS['activityStatus']);
+                        // }else{
+                        //     $scope.fS = response.data.activityDetails;
+                        // }
+                        // var filteredList = $filter('filter')(response.data.activityDetails, function (i) {
+                        //     return (i.activityName == $scope.search3_activity);
+                        //   });
+                        // $scope.filteredList = [];
+                        // if($scope.search3_activity!='' && $scope.search3_activity!=null && $scope.search3_activity!=undefined){
+                        // }
+                    // console.log($scope.filteredList);
+                    $rootScope.activity = $scope.search3_activity;
+                    $rootScope.statusDetails = response.data.statusDetails;
+                    $rootScope.staffDetails = response.data.staffDetails;
+                    $rootScope.studentDetails = $scope.selectedLeadID;
+                 // $scope.modalopen($scope.activity);
+                $rootScope.modalInstance = $modal.open({
+            templateUrl: 'assets/views/autoCalltracking2.html',
+            controller: 'callTrackingCtrl',
+            // 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());
+            console.log('Call track Modal dismissed at: ' + new Date());
+        });
+        
+    }
+    
+    });
+        }
+    }
+    
+}]);
 /*
 * lead controller
 * */
@@ -837,7 +1226,6 @@ app.controller('callTrackingLeadCtrl', ["$scope","$rootScope","toaster", "$filte
     }
 
 
-
     /*
    *get tracking list
    * created by kms
@@ -1709,6 +2097,7 @@ app.controller('callTrackingCtrl2', ["$scope","$rootScope","toaster", "$filter",
     * created by kms
     * */
     $rootScope.updateFollowup = function (form,followupDetails,myModel1, loading) {
+        console.clear();
         // alert('com');
         // return false;
         var firstError = null;
@@ -2074,6 +2463,7 @@ app.filter('unique', function() {
 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';
+    $scope.userType=JSON.parse(sessionStorage.getItem('localObj')).localType;
 
 
 
@@ -2130,8 +2520,38 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
 
 
     };
-    $scope.open1 = function (values,type) {
-
+    $scope.open1 = function (values,type,filterby) {
+        if(type == '1' || type == '2'){ var result = values;} 
+        if(type == '3' || type == '5' || type == '7' || type == '8'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].Sem === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
+        if(type == '4'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].Sem_Year === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
+        if(type == '6'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].CertificateName === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
         var modalInstance1 = $modal.open({
             templateUrl: 'assets/views/student/studentPaymentModal.html',
             controller: 'ModalInstanceCtrl1',
@@ -2140,7 +2560,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
                 items1: function () {
                     var myvalues =
                         {
-                            "values":values,
+                            "values":result,
                             "type":type
                         };
                     return  myvalues;
@@ -2210,5 +2630,3 @@ app.controller('ModalInstanceCtrl1', ["$scope", "$modalInstance", "items1","Word
 }]);
 
 
-
-

Apollo/assets/js/controllers/certificateStatusCtrl.js

@@ -128,6 +128,7 @@ app.controller('certificateStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
         'staus': '',
         'dateOn': '',
         'comment': '',
+        'CourierDetails': '',
         'certificatetype': '',
         'certificateNumber': ''
     }
@@ -298,6 +299,7 @@ app.controller('certificateStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
                 'staus': '',
                 'dateOn': '',
                 'comment': '',
+                'CourierDetails': '',
                 'certificatetype': '',
                 'certificateNumber': ''
             }
@@ -398,6 +400,7 @@ app.controller('certificateStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
                     this.SDate = $scope.myStatusModel.dateOn;
                     this.Coursedetail = id;
                     this.Comments = $scope.myStatusModel.comment;
+                    this.CourierDetails = $scope.myStatusModel.CourierDetails.replace('/\n\r?/g', '<br />');
                     this.CertificateType = $scope.myStatusModel.certificatetype;
                     this.CertificateNumber = $scope.myStatusModel.certificateNumber;
                 }
@@ -442,6 +445,7 @@ app.controller('certificateStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
                 'staus': '',
                 'dateOn': '',
                 'comment': '',
+                'CourierDetails': '',
                 'certificatetype': '',
                 'certificateNumber': ''
             }
@@ -492,6 +496,7 @@ app.controller('certificateStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
 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';
+    $scope.userType=JSON.parse(sessionStorage.getItem('localObj')).localType;
 
 
 
@@ -548,8 +553,38 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
 
 
     };
-    $scope.open1 = function (values,type) {
-
+    $scope.open1 = function (values,type,filterby) {
+        if(type == '1' || type == '2'){ var result = values;} 
+        if(type == '3' || type == '5' || type == '7' || type == '8'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].Sem === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
+        if(type == '4'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].Sem_Year === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
+        if(type == '6'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].CertificateName === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
         var modalInstance1 = $modal.open({
             templateUrl: 'assets/views/student/studentPaymentModal.html',
             controller: 'ModalInstanceCtrl1',
@@ -558,7 +593,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
                 items1: function () {
                     var myvalues =
                         {
-                            "values":values,
+                            "values":result,
                             "type":type
                         };
                     return  myvalues;

Apollo/assets/js/controllers/certificationStatusCtrl.js

@@ -0,0 +1,684 @@
+'use strict';
+/*** controller for Wizard Form example***/
+app.controller('certificationStatusCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "API_POINTS", "$http", "SweetAlert", "$state", 'md5', 'ipCookie', 'dateListDescService', function ($scope, toaster, $filter, ngTableParams, apiPoint, $http, SweetAlert, $state, md5, ipCookie, dateListDescService) {
+
+    /**
+    * Certification status update search / Mark card status update
+    * by : kdk
+    */
+
+    $scope.sort = function (keyname) {
+        $scope.sortKey = keyname;   //set the sortKey to the param passed
+        $scope.reverse = !$scope.reverse; //if true make it false and vice versa
+    }
+
+    $scope.editId = -1;
+    $scope.setEditId = function (P) {
+        // alert(P);
+        $scope.statusUpdationId = -1;
+        $scope.editId = P;
+    }
+    $scope.cancel = function () {
+        $scope.editId = -1;
+    } 
+
+
+    // get local client details
+    var localDetail = JSON.parse(localStorage.getItem('localObj'));
+    var localDetails = ipCookie('cookiechk');
+    const localUpdateStatus = 'CERTIFICATION_STATUS';
+         $scope.localTypeSuperAdmin = false;
+        $scope.localBranchDetails = '';
+
+    $scope.init = function () {
+
+
+
+ const LOCALTYPE = localDetail.localType;
+        if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { 
+            console.log("if");
+        }else {
+            if(localDetail != 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');
+            }
+        }
+
+
+
+
+
+
+          if (localDetail != null) {
+                if (localDetails.localType === 'R004') {
+                    $scope.localTypeSuperAdmin = true;
+                    $scope.getUniversityList();
+                    $scope.getBranchList();
+                } else {
+                    $scope.getUniversityList();
+                }
+            } else {
+            }
+    }
+
+         $scope.getBranchList = function () {
+            $scope.loader = true;
+            var empListreq = {
+                method: 'POST',
+                url: apiPoint.url + 'getBranchListDetails/',
+                headers: {
+                    'Content-Type': 'application/json'
+                },
+                data: {
+                    data: localDetails
+                }
+            };
+            $http(empListreq).then(function (response) {
+                if (response.data.branDetailstatus) {
+                    $scope.loader = false;
+                    $scope.branchList_data = response.data.branch_details;
+                } else {
+                }
+            });
+        }
+
+
+    $scope.searchData = {
+        'University': '',
+        'Course': '',
+        'Batch': '',
+        'Mobile': '',
+        'Name': ''
+    }
+
+    $scope.myStatusModel = {
+        'semYear': '',
+        'staus': '',
+        'dateOn': '',
+        'comment': '',
+        'certificatetype': '',
+        'certificateNumber': '',
+        'sem':''
+    }
+
+    // get University List
+    $scope.universityData = '';
+    $scope.getUniversityList = function () {
+        var empListreq = {
+            method: 'POST',
+            url: apiPoint.url + 'getUniveCourseBratch/',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            data: {
+                data: localDetails
+            }
+        };
+        $http(empListreq).then(function (response) {
+            if (response.data.univList) {
+                $scope.universityData = response.data.university_details;
+            } else {
+            }
+        });
+    };
+
+    //get certificates List
+    $scope.getCertificateList = function () {
+        var getCerfreg = {
+            method: 'POST',
+            url: apiPoint.url + 'getCertificateList/',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            data: {
+                data: localDetails
+            }
+        };
+        $http(getCerfreg).then(function (response) {
+            if (response.data.certificateStatus) {
+                $scope.certificateData = response.data.certificate_details;
+                // alert(JSON.stringify($scope.certificateData));
+            } else {
+            }
+        });
+    };
+
+    $scope.getUniveId = function (univ) {
+        let name = JSON.parse(univ);
+        $scope.searchData.University = name.UniversityID;
+        $scope.searchData.Course = '';
+        $scope.searchData.Batch = '';
+        $scope.courseData = name.Course;
+        $scope.batchData = name.Batch;
+        //call service for array list in desc order based on date
+        angular.forEach($scope.batchData,function (values,key) {
+            var parts = values.BatchDate.split("-");
+            values.givenDateObject=new Date(parts[2], parts[1] - 1, parts[0]);
+        });
+        $scope.batchData=dateListDescService.getOrderByList($scope.batchData);
+        // end
+        $scope.OpenWindowStatus = false;
+        $scope.getSearch();
+    };
+
+    $scope.getValueChange = function () {
+        $scope.getSearch();
+    }
+
+    $scope.searchResultDetails = '';
+    $scope.searchLoading = false;
+    $scope.searchResultLength = 0;
+    // get student list based on search data
+    $scope.getSearch = function () {
+        $scope.OpenWindowStatus = false;
+        $scope.searchLoading = true;
+        var getSearchDetails = {
+            method: 'POST',
+            url: apiPoint.url + 'getSearchAutoDetails/',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            data: {
+                data: $scope.searchData,
+                requestDetails: localDetails
+            }
+        };
+        $http(getSearchDetails).then(function (response) {
+            if (response.data.searchResult) {
+                $scope.searchResultStatus = response.data.searchResult;
+                $scope.searchLoading = false;
+                let searchResultDetailsBef = response.data.search_result_details;
+                const filterAddSelect = searchResultDetailsBef.filter(val => {
+                    val['Selected'] = false;
+                    return val;
+                });
+                $scope.searchResultDetails = filterAddSelect;
+                $scope.searchResultLength = Object.keys($scope.searchResultDetails).length;
+            } else {
+                $scope.searchLoading = false;
+            }
+        });
+    }
+
+    // mobile number search functionlity
+    $scope.mySearchChangeFunc = function (val) {
+        // if (val > 0) {
+        //     $scope.allSelectedHide = true;
+        //     $scope.allSelected('undefined');
+        //     $scope.OpenWindowStatus = false;
+        // } else {
+        //     $scope.allSelected('undefined');
+        //     $scope.allSelectedHide = false;
+        // }
+    }
+    // End: mobile number search functionlity
+
+    // select all or individual functionality
+
+    // var getAllSelected = function () {
+    //     var selectedItems = $scope.searchResultDetails.filter(function (item) {
+    //         return item.Selected;
+    //     });
+
+    //     return selectedItems.length === $scope.searchResultDetails.length;
+    // }
+
+    // var setAllSelected = function (value) {
+    //     alert(value);
+    //     angular.forEach($scope.searchResultDetails, function (item) {
+    //         item.Selected = value;
+    //     });
+    // }
+
+    // $scope.allSelected = function (value) {
+    //     alert(value);
+    //     if (value !== undefined) {
+    //         return setAllSelected(value);
+    //     } else {
+    //         return getAllSelected();
+    //     }
+    // }
+
+    //--------------------------------------------------->
+
+    // Select one row in a table once
+    $scope.setOneSelect = function (value) {
+        // alert();
+        angular.forEach($scope.searchResultDetails, function (item) {
+            item.Selected = false;
+        });
+        // alert( value.UNI_ID);
+        $scope.editId = -1;
+        $scope.statusUpdationId = value.UNI_ID;
+        value.Selected = true;
+        $scope.OpenWindowStatus = true;
+        $scope.openUpdateWind();
+    }
+
+    // End: select all or individual functionality
+
+    // unselect all the items
+    $scope.unSelect = function () {
+        angular.forEach($scope.searchResultDetails, function (item) {
+            item.Selected = false;
+        });
+            $scope.statusUpdationId = -1;
+        $scope.openUpdateWind();
+    }
+
+
+    // open popup window onselct checkbox or close unselect all the items
+    $scope.OpenWindowStatus = false;
+    $scope.openUpdateWind = function () {
+        var ItemsSelected = $scope.searchResultDetails.filter(function (item) {
+            if (item.Selected === true) { return true; }
+        });
+
+        if (ItemsSelected.length !== 0) {
+            const courseLocal = ItemsSelected[0].CourseID;
+            const selectedStuId = ItemsSelected[0].StudentID;
+            $scope.getSemYearList(courseLocal, selectedStuId);
+            $scope.getStatusList();
+            $scope.OpenWindowStatus = true;
+            $scope.myStatusModel = {
+                'semYear': '',
+                'staus': '',
+                'dateOn': '',
+                'comment': '',
+                'certificatetype': '',
+                'certificateNumber': '',
+                'sem':''
+            }
+        } else {
+            $scope.OpenWindowStatus = false;
+        }
+    }
+
+    // get status list for this activity
+    $scope.getStatusList = function () {
+        var getStatusL = {
+            method: 'POST',
+            url: apiPoint.url + 'getStatusListForUpdate/',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            data: {
+                statusFor: 'studyMaterial',
+                data: localUpdateStatus,
+                    reqBranch: localDetails.localBranchID
+            }
+        };
+        $http(getStatusL).then(function (response) {
+            if (response.data.statusList) {
+                $scope.statusDetailsList = response.data.statusList_details;
+                // $scope.searchLoading = false;
+            } else {
+                // $scope.searchLoading = false;
+            }
+        });
+    }
+
+    // get Sem/Year based on the course select
+    $scope.getSemYearList = function (courseID, StuId) {
+        $scope.semYearList = '';
+        if (courseID !== '' && courseID !== undefined) {
+            var getSemYear = {
+                method: 'POST',
+                url: apiPoint.url + 'getSemYearForCourse/',
+                headers: {
+                    'Content-Type': 'application/json'
+                },
+                data: {
+                    data: courseID,
+                    stuFor: StuId
+                }
+            };
+            $http(getSemYear).then(function (response) {
+                if (response.data.semYearResult) {
+                    $scope.semYearList = response.data.semYear_result_details;
+                } else {
+                    $scope.semYearList = '';
+                }
+            });
+
+        } else {
+
+        }
+    }
+
+
+              $scope.showSingleLateralSemType = false;
+
+        // sem year show when REGULAR or LATER ENTRY
+        $scope.getSemYearDropShowMethod = function(type) {
+           if(JSON.parse(type).SEM_YEAR_TYPE == "0"){
+               // type is semester mode
+               $scope.showSingleLateralSemType = false;
+           } else {
+               $scope.showSingleLateralSemType = true;
+           }
+        }
+
+   $scope.semDetails =[{"id": 1, "type": "SEM 1"}, {"id": 2, "type": "SEM 2"},
+        {"id": 3, "type": "SEM 3"}, {"id": 4, "type": "SEM 4"}, {"id": 5, "type": "SEM 5"},
+        {"id": 6, "type": "SEM 6"}, {"id": 7, "type": "SEM 7"}, {"id": 8, "type": "SEM 8"}
+        , {"id": 9, "type": "YEAR 1"}, {"id": 10, "type": "YEAR 2"}, {"id": 11, "type": "YEAR 3"}, {"id": 12, "type": "YEAR 4"}]
+
+    // Update the status For Certification
+    $scope.statusUpdate = {
+        submit: function (form, myStatusModel, localBranchDetails) {
+            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 {
+                     localDetails.localBranchID = localBranchDetails !== '' ? localBranchDetails : localDetails.localBranchID ;
+                localDetail.localBranchID = localBranchDetails !== '' ? localBranchDetails : localDetail.localBranchID ;
+           $scope.disableButton = true;
+                var studentForUpdate = [];
+                let formate = "dd-MM-yyyy";
+                $scope.myStatusModel.dateOn = $filter('date')(new Date($scope.myStatusModel.dateOn), formate);
+                var ItemsSelected = $scope.searchResultDetails.filter(function (item) {
+                    if (item.Selected === true) {
+                        let getStudentID = new getStudentForUpdateDetails(item.StudentID, item.BranchCode);
+                        studentForUpdate.push(getStudentID);
+                        return true;
+                    }
+                });
+                function getStudentForUpdateDetails(id, bCode) {
+                    this.StudentID = id;
+                     // alert($scope.myStatusModel.semYear);
+                    var courseID = JSON.parse($scope.myStatusModel.semYear);
+                    var val = courseID.ID;
+                    // alert(val);
+                    this.CourseID = val;
+                    this.BranchCode = bCode;
+                    this.ListCode = $scope.myStatusModel.staus;
+                    this.SDate = $scope.myStatusModel.dateOn;
+                    this.Coursedetail = id;
+                    this.Comments = $scope.myStatusModel.comment;
+                    this.CertificateType = $scope.myStatusModel.certificatetype;
+                    this.CertificateNumber = $scope.myStatusModel.certificateNumber;
+                   this.Sem = $scope.myStatusModel.sem === '' ? courseID.Sem_Year : $scope.myStatusModel.sem;
+                   }
+                var updateCertificateStatus = {
+                    method: 'POST',
+                    url: apiPoint.url + 'updateCertificationStatus/',
+                    headers: {
+                        'Content-Type': 'application/json'
+                    },
+                    data: {
+                        data: studentForUpdate,
+                        requestDetails: localDetails
+                    }
+                };
+                $http(updateCertificateStatus).then(function (response) {
+                    if (response.data.addStatus) {
+                        swal(" ", "Updated Successfully.", "success");
+                        $scope.disableButton = false;
+                        // for success state
+                        // $scope.allSelected('undefined');
+                        angular.forEach($scope.searchResultDetails, function (item) {
+                            item.Selected = false;
+                        });
+                        $scope.OpenWindowStatus = false;
+                    } else {
+                        swal(" ", response.data.message, "error");
+                        $scope.disableButton = false;
+                    }
+                });
+            }
+        },
+        reset: function (form) {
+            form.$setPristine(true);
+            $scope.myStatusModel = {
+                'semYear': '',
+                'staus': '',
+                'dateOn': '',
+                'comment': '',
+                'certificatetype': '',
+                'certificateNumber': '',
+                'sem':''
+            }
+        }
+    }
+
+    // check unchek for table values
+
+    $scope.prevStatusListForStudentCourse = '';
+    // get previous status details for the student
+    $scope.getPrevStatus = function (p) {
+        $scope.prevStatusListForStudentCourseLoading = true;
+        $scope.prevStatusListForStudentCourseNoRecord = false;
+        $scope.prevStatusListForStudentCourse = '';
+        var getPrevStatus = {
+            method: 'POST',
+            url: apiPoint.url + 'getPrevStatusDetailsForStu/',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            data: {
+                statusFor: localUpdateStatus,
+                getDetailsFor: { "student": p.StudentID, "CourseID": p.CourseID },
+                data: localDetail
+            }
+        };
+        $http(getPrevStatus).then(function (response) {
+            if (response.data.preStatusDetails) {
+                $scope.prevStatusListForStudentCourseLoading = false;
+                $scope.prevStatusListForStudentCourse = response.data.preStatus_details_list;
+                $scope.prevNoRecordFound = false;
+            } else {
+                $scope.prevStatusListForStudentCourseLoading = false;
+                $scope.prevStatusListForStudentCourseNoRecord = true;
+                $scope.prevNoRecordFound = true;
+            }
+        });
+    }
+}]);
+/*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';
+    $scope.userType=JSON.parse(sessionStorage.getItem('localObj')).localType;
+
+
+
+    //  $scope.items = ['item1', 'item2', 'item3'];
+
+    $scope.open = function (studentDetails) {
+
+
+        // get student view details
+        var getcourse = {
+            method: 'POST',
+            url: apiPoint.url + 'getStudentBasicInfo/',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            data: {
+                requestedBy  :studentDetails.MobileNumber,
+                requestedFrom: 3,
+                branchCode:JSON.parse(localStorage.getItem('localObj')).localBranchID
+            }
+        };
+        $http(getcourse).then(function (response) {
+
+            if (response.data.status == 200 && response.data.studentStatus== true) {
+                $scope.courseEditLoading = false;
+                // $scope.studentDetails = response.data.studentDetails;
+                $scope.studentDetails = response.data;
+                // $scope.courseDetails = response.data.courseDetails;
+                var modalInstance = $modal.open({
+                    templateUrl: 'assets/views/student/studentDetailsModal.html',
+                    controller: 'ModalInstanceCtrl',
+                    // size: size,
+                    resolve: {
+                        items: function () {
+                            return  $scope.studentDetails;
+                        }
+                    }
+                });
+
+                modalInstance.result.then(function (selectedItem) {
+                    $scope.selected = selectedItem;
+                }, function () {
+                    $log.info('Modal dismissed at: ' + new Date());
+                });
+
+            } else {
+                swal("Failed!", "This student is not registerd", "warning");
+                $scope.courseEditLoading = false;
+                $scope.studentDetails = "";
+                $scope.courseDetails = "";
+
+            }
+        });
+        $scope.printStudentDetails = function (details) {
+            $rootScope.pdfItems = details;
+
+            var printInstance = $modal.open({
+                templateUrl: 'assets/views/student/studentPdf.html',
+                controller: 'studentModalDemoCtrl',
+            });
+        };
+
+        // generate pdf for student view
+        $scope.export = function(getName) {
+            kendo.drawing.drawDOM($("#exportthis")).then(function(group) {
+                kendo.drawing.pdf.saveAs(group, getName+".pdf");
+            });
+        }
+
+
+    };
+    $scope.open1 = function (values,type,filterby) {
+        // if(type == '1' || type == '2' || type == '3'){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
+        if(type == '1' || type == '2'){ var result = values;} 
+        if(type == '3' || type == '5' || type == '7' || type == '8'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].Sem === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
+        if(type == '4'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].Sem_Year === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
+        if(type == '6'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].CertificateName === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
+        var modalInstance1 = $modal.open({
+            templateUrl: 'assets/views/student/studentPaymentModal.html',
+            controller: 'ModalInstanceCtrl1',
+            // size: size,
+            resolve: {
+                items1: function () {
+                    var myvalues =
+                        {
+                            "values":result,
+                            "type":type
+                        };
+                    return  myvalues;
+                }
+            }
+        });
+
+        modalInstance1.result.then(function (selectedItem) {
+            $scope.selected = selectedItem;
+        }, function () {
+            $log.info('Modal dismissed at: ' + new Date());
+        });
+    };
+
+
+}]);
+
+// Please note that $modalInstance represents a modal window (instance) dependency.
+// It is not the same as the $modal service used above.
+
+app.controller('ModalInstanceCtrl', ["$scope", "$modalInstance", "items","WordsService", function ($scope, $modalInstance, items,WordsService) {
+
+    $scope.items = items;
+    $scope.selected = {
+        item: $scope.items[0]
+    };
+
+    $scope.ok = function () {
+        $modalInstance.close($scope.selected.item);
+    };
+
+    $scope.cancel = function () {
+        $modalInstance.dismiss('cancel');
+    };
+
+
+}]);
+app.controller('ModalInstanceCtrl1', ["$scope", "$modalInstance", "items1","WordsService", function ($scope, $modalInstance, items1,WordsService) {
+
+    $scope.items1 = items1.values;
+    $scope.selectedtype = items1.type;
+
+    $scope.ok = function () {
+        $modalInstance.close($scope.selected.item);
+    };
+
+    $scope.cancel = function () {
+        $modalInstance.dismiss('cancel');
+    };
+
+
+}]);
+app.filter('unique', function() {
+    return function(collection, primaryKey, secondaryKey) { //optional secondary key
+        var output = [],
+            keys = [];
+
+        angular.forEach(collection, function(item) {
+            var key;
+            secondaryKey === undefined ? key = item[primaryKey] : key = item[primaryKey][secondaryKey];
+
+            if(keys.indexOf(key) === -1) {
+                keys.push(key);
+                output.push(item);
+            }
+        });
+
+        return output;
+    };
+});

Apollo/assets/js/controllers/dashboardCtrl.js

@@ -2011,7 +2011,7 @@ app.filter('unique', function () {
 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';
-
+    $scope.userType=JSON.parse(sessionStorage.getItem('localObj')).localType;
 
 
     //  $scope.items = ['item1', 'item2', 'item3'];
@@ -2066,8 +2066,39 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
 
 
     };
-    $scope.open1 = function (values, type) {
-
+    $scope.open1 = function (values, type,filterby) {
+        // if(type == '1' || type == '2' || type == '3'){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} }
+        if(type == '1' || type == '2'){ var result = values;} 
+        if(type == '3' || type == '5' || type == '7' || type == '8'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].Sem === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
+        if(type == '4'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].Sem_Year === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
+        if(type == '6'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].CertificateName === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
         var modalInstance1 = $modal.open({
             templateUrl: 'assets/views/student/studentPaymentModal.html',
             controller: 'ModalInstanceCtrl1',
@@ -2076,7 +2107,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
                 items1: function () {
                     var myvalues =
                         {
-                            "values": values,
+                            "values":result,
                             "type": type
                         };
                     return myvalues;

Apollo/assets/js/controllers/daybookCtrl.js

@@ -1023,7 +1023,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
     //Tooltip for print button
 
      $scope.studentDetails='';$scope.studentDetails
-
+     $scope.userType=JSON.parse(sessionStorage.getItem('localObj')).localType;
 $scope.searchResultDetails ='';
         $scope.open = function (studentDetails) {
 

Apollo/assets/js/controllers/daybookadminCtrl.js

@@ -883,7 +883,7 @@ else
 
      $scope.studentDetails='';$scope.studentDetails
      $scope.searchResultDetails ='';
-
+     $scope.userType=JSON.parse(sessionStorage.getItem('localObj')).localType;
 
              $scope.open = function (studentDetails) {
 

Apollo/assets/js/controllers/daybooksuperadminCtrl.js

@@ -1053,7 +1053,7 @@ else
     }
 
     $scope.studentDetails='';$scope.studentDetails
-
+    $scope.userType=JSON.parse(sessionStorage.getItem('localObj')).localType;
 $scope.searchResultDetails ='';
         $scope.open = function (studentDetails) {
 
@@ -1174,7 +1174,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
     //Tooltip for print button
 
      $scope.studentDetails='';$scope.studentDetails
-
+     $scope.userType=JSON.parse(sessionStorage.getItem('localObj')).localType;
 $scope.searchResultDetails ='';
         $scope.open = function (studentDetails) {
 

Apollo/assets/js/controllers/feesStatusCtrl.js

@@ -8,6 +8,7 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n
         "studentName": "",
         "mobileNumber": "",
         "universityName":"",
+        "batch":"",
         "courseName":""
     };
     // bill date restrict
@@ -197,6 +198,7 @@ console.log($scope.paymentOptions);
                     mobileNumber: myModel.mobileNumber,
                     university: $scope.univId,
                     course:myModel.courseName,
+                    batch:myModel.batch,
                     requestedtBy: JSON.parse(sessionStorage.getItem('localObj')).localUserID,
                     branchId: JSON.parse(sessionStorage.getItem('localObj')).localBranchID,
                     requestedDept: JSON.parse(sessionStorage.getItem('localObj')).localType,
@@ -246,6 +248,7 @@ console.log($scope.paymentOptions);
         $scope.BatchDate ='';
 
         $scope.editId=-1;
+        // var Batch = p.BatchCode ? p.BatchCode : '';
         $scope.getStudentSetFees(p.ID,p.CourseID,p.StudentID);
         $scope.viewId=p.ID;
   
@@ -313,7 +316,7 @@ console.log($scope.paymentOptions);
 
           var role = JSON.parse(sessionStorage.getItem('localObj')).localType;
 
-       if($scope.setfeedetails.length != 0)
+       /* if($scope.setfeedetails.length != 0)
        {
           angular.forEach($scope.setfeedetails,function (setfeedetails,key) {
 
@@ -339,7 +342,7 @@ console.log($scope.paymentOptions);
             
 
          });
-     }
+     } */
 
 
         if(details.SessionName!=undefined && details.SessionName!='')
@@ -1425,7 +1428,24 @@ console.log($scope.paymentOptions);
 
       });
 
+// check user role and set fee to disable batch field
+      var role = JSON.parse(sessionStorage.getItem('localObj')).localType;
+      
+       $scope.readonlycheck =false;
 
+       if($scope.setfeedetails.length != 0)
+       {
+           if(role=='R002' || role == 'R005')
+           {
+               
+           $scope.readonlycheck =true;
+           }
+       }
+       else
+       {
+           
+           $scope.readonlycheck =false;
+       }
 
 
     }
@@ -2625,7 +2645,7 @@ app.directive('visible', function() {
 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';
-
+    $scope.userType=JSON.parse(sessionStorage.getItem('localObj')).localType;
 
 
     //  $scope.items = ['item1', 'item2', 'item3'];
@@ -2682,8 +2702,38 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
 
 
     };
-    $scope.open1 = function (values,type) {
-
+    $scope.open1 = function (values,type,filterby) {
+        if(type == '1' || type == '2'){ var result = values;} 
+        if(type == '3' || type == '5' || type == '7' || type == '8'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].Sem === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
+        if(type == '4'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].Sem_Year === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
+        if(type == '6'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].CertificateName === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
         var modalInstance1 = $modal.open({
             templateUrl: 'assets/views/student/studentPaymentModal.html',
             controller: 'ModalInstanceCtrl1',
@@ -2692,7 +2742,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
                 items1: function () {
                     var myvalues =
                         {
-                            "values":values,
+                            "values":result,
                             "type":type
                         };
                     return  myvalues;
@@ -2702,6 +2752,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
         });
 
         modalInstance1.result.then(function (selectedItem) {
+            console.log("selectedItem",selectedItem);
             $scope.selected = selectedItem;
         }, function () {
             $log.info('Modal dismissed at: ' + new Date());

Apollo/assets/js/controllers/generateHallTicketCtrl.js

@@ -518,7 +518,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$modal", "$log", "API_POINTS"
 
     $scope.open = function (studentDetails) {
 
-      
+		$scope.userType=JSON.parse(sessionStorage.getItem('localObj')).localType;
 
  $scope.Currentdate = new Date();
 
@@ -571,8 +571,38 @@ app.controller('studentModalDemoCtrl', ["$scope", "$modal", "$log", "API_POINTS"
 
 
     };
-    $scope.open1 = function (values,type) {
-
+    $scope.open1 = function (values,type,filterby) {
+		if(type == '1' || type == '2'){ var result = values;} 
+        if(type == '3' || type == '5' || type == '7' || type == '8'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].Sem === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
+        if(type == '4'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].Sem_Year === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
+        if(type == '6'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].CertificateName === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
         var modalInstance1 = $modal.open({
             templateUrl: 'assets/views/student/studentPaymentModal.html',
             controller: 'ModalInstanceCtrl1',
@@ -581,7 +611,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$modal", "$log", "API_POINTS"
                 items1: function () {
                     var myvalues =
                         {
-                            "values":values,
+                            "values":result,
                             "type":type
                         };
                     return  myvalues;

Apollo/assets/js/controllers/income_reportCtrl.js

@@ -58,8 +58,8 @@ app.controller('income_reportCtrl', ["$scope","$rootScope","toaster", "$filter",
         //             'Content-Type': 'application/json'
         //         },
         //         data: {
-        //             branch : JSON.parse(sessionStorage.getItem('localObj')).localBranchID
-                   
+        //             branch : JSON.parse(sessionStorage.getItem('localObj')).localBranchID,
+        //    constant:""
         //         }
 
         //     };
@@ -111,8 +111,8 @@ app.controller('income_reportCtrl', ["$scope","$rootScope","toaster", "$filter",
             $scope.PLexceldetails='';
             $scope.expense ='';
             $scope.alldata='';
-            
-  
+            // from : $filter('date')(new Date($scope.filters.from_date), "dd-MM-yyyy"),
+            // to : $filter('date')(new Date($scope.filters.to_date), "dd-MM-yyyy")    
             var response_data = {
                 method: 'POST',
                 url: apiPoint.url + 'IncomeExpenseDetails/',

Apollo/assets/js/controllers/markcardStatusCtrl.js

@@ -501,7 +501,7 @@ app.controller('markcardStatusCtrl', ["$scope", "toaster", "$filter", "ngTablePa
 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';
-
+    $scope.userType=JSON.parse(sessionStorage.getItem('localObj')).localType;
 
 
     //  $scope.items = ['item1', 'item2', 'item3'];
@@ -572,8 +572,38 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
 
 
     };
-    $scope.open1 = function (values,type) {
-
+    $scope.open1 = function (values,type,filterby) {
+        if(type == '1' || type == '2'){ var result = values;} 
+        if(type == '3' || type == '5' || type == '7' || type == '8'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].Sem === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
+        if(type == '4'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].Sem_Year === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
+        if(type == '6'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].CertificateName === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
         var modalInstance1 = $modal.open({
             templateUrl: 'assets/views/student/studentPaymentModal.html',
             controller: 'ModalInstanceCtrl1',
@@ -582,7 +612,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
                 items1: function () {
                     var myvalues =
                         {
-                            "values":values,
+                            "values":result,
                             "type":type
                         };
                     return  myvalues;

Apollo/assets/js/controllers/newreg_reportCtrl.js

@@ -259,7 +259,7 @@ $scope.tod = to_dt;
 $scope.fdate ='';
 $scope.tdate ='';
 //$scope.Subtypes = '';
-
+$scope.userType=JSON.parse(sessionStorage.getItem('localObj')).localType;
 
 
 
@@ -349,7 +349,7 @@ app.controller('ModalInstanceCtrl', ["$scope", "$modalInstance", "items", "Words
 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';
-
+    $scope.userType=JSON.parse(sessionStorage.getItem('localObj')).localType;
 
 
     //  $scope.items = ['item1', 'item2', 'item3'];
@@ -404,8 +404,38 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
 
 
     };
-    $scope.open1 = function (values,type) {
-
+    $scope.open1 = function (values,type,filterby) {
+        if(type == '1' || type == '2'){ var result = values;} 
+        if(type == '3' || type == '5' || type == '7' || type == '8'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].Sem === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
+        if(type == '4'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].Sem_Year === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
+        if(type == '6'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].CertificateName === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
         var modalInstance1 = $modal.open({
             templateUrl: 'assets/views/student/studentPaymentModal.html',
             controller: 'ModalInstanceCtrl1',
@@ -414,7 +444,7 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
                 items1: function () {
                     var myvalues =
                         {
-                            "values":values,
+                            "values":result,
                             "type":type
                         };
                     return  myvalues;

Apollo/assets/js/controllers/nonoperationalCtrl.js

@@ -1012,7 +1012,7 @@ $scope.loadStaring = true;
     }
 
     $scope.studentDetails='';$scope.studentDetails
-
+    $scope.userType=JSON.parse(sessionStorage.getItem('localObj')).localType;
 $scope.searchResultDetails ='';
         $scope.open = function (studentDetails) {
 
@@ -1133,7 +1133,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
     //Tooltip for print button
 
      $scope.studentDetails='';$scope.studentDetails
-
+     $scope.userType=JSON.parse(sessionStorage.getItem('localObj')).localType;
 $scope.searchResultDetails ='';
         $scope.open = function (studentDetails) {
 

Apollo/assets/js/controllers/onlinetransactionStatusCtrl.js

@@ -0,0 +1,12 @@
+'use strict';
+/**
+ * onlinetransactionStatusCtrl details capturing
+ * 
+ */
+app.controller('onlinetransactionStatusCtrl', function () {
+console.log('hai');
+});
+
+
+
+

Apollo/assets/js/controllers/reportCtrl.js

@@ -0,0 +1,215 @@
+'use strict';
+/*** controller for Wizard Form example***/
+app.controller('reportCtrl', ["$scope", "API_POINTS", "$http", "SweetAlert", "$state", 'md5', 'ipCookie', '$window',
+    function ($scope, apiPoint, $http, SweetAlert, $state, md5, ipCookie, $window) {
+
+        
+            
+      
+       
+        $scope.batch = {
+            "name": "",
+            "brname": "",
+            "univ": "",
+            "from_date": "",
+            "to_date": "",
+        };
+    //      // change from date(from date)
+    // $scope.changeDate = function () {
+    //     if($scope.batch.from_date !== undefined) {
+    //         var formate = "dd-MM-yyyy";
+    //         $scope.batch.from_date = $filter('date')(new Date($scope.batch.from_date), formate);
+            
+    //     } else {
+    //         $scope.searchData.date = '';
+            
+    //     }
+    // }
+
+    // // change to date(to date)
+    // $scope.changeToDate = function () {
+    //     if($scope.batch.to_date !== undefined) {
+    //         var formate = "dd-MM-yyyy";
+    //         $scope.batch.to_date = $filter('date')(new Date($scope.batch.to_date), formate);
+    //         //$scope.getDayBookList();
+    //     } else {
+    //         $scope.batch.to_date = '';
+    //        // $scope.getDayBookList();
+    //     }
+    // }
+    
+        $scope.batch = function () {
+          var bat = {
+                method: 'POST',
+                url: apiPoint.url + 'reportbatchlist/',
+                headers: {
+                    'Content-Type': 'application/json'
+                }
+                
+            };
+           
+            $http(bat).then(function (response) {
+                if (response.data) {
+                    $scope.batch = response.data.batch;
+                    $scope.branch = response.data.branch;
+                    $scope.univ = response.data.univ;
+                   //console.log($scope.branch);
+                } else {
+                }
+            });
+        } 
+          
+ $scope.onSubmit = function() {
+     //alert($scope.batch.name);
+     $scope.statusr = '';
+     $scope.message = '';
+        var sta = {
+            method: 'POST',
+            url: apiPoint.url + 'reportstatus/',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            data: {
+                bname : $scope.batch.name,
+                brname : $scope.batch.brname,
+                univ : $scope.batch.univ
+            }
+            
+        };
+      
+        $http(sta).then(function (response) {
+            if (response.data.statusList == true) {
+               $scope.statusr = response.data.statusr;
+              
+            } else {
+                $scope.message = response.data.message;
+            }
+            
+        });
+    
+ }
+ $scope.mSubmit = function() {
+    //alert($scope.batch.name);
+    $scope.mstatusr = '';
+    $scope.mmessage = '';
+       var msta = {
+           method: 'POST',
+           url: apiPoint.url + 'reportmstatus/',
+           headers: {
+               'Content-Type': 'application/json'
+           },
+           data: {
+               bname : $scope.batch.name,
+               brname : $scope.batch.brname,
+               univ : $scope.batch.univ
+           }
+           
+       };
+     
+       $http(msta).then(function (response) {
+           if (response.data.mstatusList == true) {
+              $scope.mstatusr = response.data.mstatusr;
+             
+           } else {
+               $scope.mmessage = response.data.mmessage;
+           }
+           
+       });
+   
+}
+$scope.cert_Submit = function() {
+    //alert($scope.batch.name);
+    $scope.cert_status = '';
+    $scope.cert_message = '';
+       var msta = {
+           method: 'POST',
+           url: apiPoint.url + 'reportcert_status/',
+           headers: {
+               'Content-Type': 'application/json'
+           },
+           data: {
+               bname : $scope.batch.name,
+               brname : $scope.batch.brname,
+               univ : $scope.batch.univ
+           }
+           
+       };
+     
+       $http(msta).then(function (response) {
+           if (response.data.cert_statusList == true) {
+              $scope.cert_status = response.data.cert_status;
+             
+           } else {
+               $scope.cert_message = response.data.cert_message;
+           }
+           
+       });
+   
+}
+$scope.mark_cert_Submit = function() {
+    //alert($scope.batch.name);
+    console.log($scope.batch);
+    $scope.markcert_status = '';
+    $scope.markcert_message = '';
+       var msta = {
+           method: 'POST',
+           url: apiPoint.url + 'reportmark_cert_status/',
+           headers: {
+               'Content-Type': 'application/json'
+           },
+           data: {
+               bname : $scope.batch.name,
+               brname : $scope.batch.brname,
+               univ : $scope.batch.univ,
+               from : $scope.batch.from_date,
+               to : $scope.batch.to_date
+           }
+           
+       };
+     
+       $http(msta).then(function (response) {
+           if (response.data.markcert_statusList == true) {
+              $scope.markcert_status = response.data.markcert_status;
+             
+           } else {
+               $scope.markcert_message = response.data.markcert_message;
+           }
+           
+       });
+   
+}
+$scope.expense_Submit = function() {
+  
+    $scope.expense = '';
+    $scope.expense_message = '';
+       var msta = {
+           method: 'POST',
+           url: apiPoint.url + 'reportexpense/',
+           headers: {
+               'Content-Type': 'application/json'
+           },
+           data: {
+               
+               from : $scope.batch.from_date,
+               to : $scope.batch.to_date
+           }
+           
+       };
+     
+       $http(msta).then(function (response) {
+           if (response.data.expense_list == true) {
+              $scope.expense = response.data.expense;
+             
+           } else {
+               $scope.expense_message = response.data.expense_message;
+           }
+           
+       });
+   
+}
+
+    }]);
+    
+
+    
+

Apollo/assets/js/controllers/report_ans_bookletCtrl.js

@@ -51,8 +51,7 @@ $scope.generateButtonStatus = false;
             "branch": "",
             "university": "",
             "batch": "",
-            
-
+            "status":"",
         };
 
         $scope.filters = function () {
@@ -63,8 +62,8 @@ $scope.generateButtonStatus = false;
                     'Content-Type': 'application/json'
                 },
                 data: {
-                    branch : JSON.parse(sessionStorage.getItem('localObj')).localBranchID
-                   
+                    branch : JSON.parse(sessionStorage.getItem('localObj')).localBranchID,
+                    activity :'B001'
                 }
 
             };
@@ -73,6 +72,7 @@ $scope.generateButtonStatus = false;
                     $scope.batch=[];
                     $scope.batchlist = response.data.batch;
                     $scope.university = response.data.university;
+                    $scope.statuslist = response.data.statusList;
                     //Desc order Batchlist
                     angular.forEach($scope.batchlist,function (values,key) {
                         var parts = values.BatchDate.split("-");
@@ -135,8 +135,8 @@ $scope.generateButtonStatus = false;
                 data: {
                     branch: JSON.parse(sessionStorage.getItem('localObj')).localBranchID,
                     university: $scope.filterUniv.universityID,
-                    batch: $scope.univModel.batch
-                   
+                    batch: $scope.univModel.batch,
+                   status:$scope.univModel.status
                 }
 
             };
@@ -425,7 +425,7 @@ $scope.generateButtonStatus = false;
 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';
-
+    $scope.userType=JSON.parse(sessionStorage.getItem('localObj')).localType;
 
 
     //  $scope.items = ['item1', 'item2', 'item3'];
@@ -481,8 +481,38 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
 
 
     };
-    $scope.open1 = function (values,type) {
-
+    $scope.open1 = function (values,type,filterby) {
+        if(type == '1' || type == '2'){ var result = values;} 
+        if(type == '3' || type == '5' || type == '7' || type == '8'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].Sem === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
+        if(type == '4'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].Sem_Year === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
+        if(type == '6'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].CertificateName === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
         var modalInstance1 = $modal.open({
             templateUrl: 'assets/views/student/studentPaymentModal.html',
             controller: 'ModalInstanceCtrl1',
@@ -491,7 +521,7 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
                 items1: function () {
                     var myvalues =
                         {
-                            "values":values,
+                            "values":result,
                             "type":type
                         };
                     return  myvalues;

Apollo/assets/js/controllers/report_app_pendingCtrl.js

@@ -51,12 +51,16 @@ $scope.generateButtonStatus = false;
             "branch": "",
             "university": "",
             "batch": "",
+            "status":"",
+            "from_date":"",
+            "to_date":"",
+            "updated_date":""
         };
 
         $scope.filters = function () {
             var filterlist = {
                 method: 'POST',
-                url: apiPoint.url + 'report_filters/',
+                url: apiPoint.url + 'report_app_pending_filter/',
                 headers: {
                     'Content-Type': 'application/json'
                 },
@@ -71,6 +75,7 @@ $scope.generateButtonStatus = false;
                     $scope.batch=[];
                     $scope.batchlist = response.data.batch;
                     $scope.university = response.data.university;
+                    $scope.statuslist = response.data.rollnostatus;
                     //Desc order Batchlist
                     angular.forEach($scope.batchlist,function (values,key) {
                         var parts = values.BatchDate.split("-");
@@ -92,14 +97,25 @@ $scope.generateButtonStatus = false;
 		$scope.$watch('univModel.university', function (newValue,oldValue) {
             if(newValue==undefined || newValue==''){
                 $scope.filterBatchDetails="";
+                $scope.disableSubmit=true;
 				console.log($scope.filterBatchDetails);
             }
             else{
                 if(angular.isString(newValue)){
+                    $scope.disableSubmit=false;
                     $scope.filterBatchDetails=angular.fromJson(newValue);
                 }
             }
 
+        });
+        $scope.$watchCollection('univModel.status', function (newValue,oldValue) {
+            if(newValue==undefined || newValue=='' || newValue==null){
+                $scope.disableSubmit=true;
+            }
+            else{
+                $scope.disableSubmit=false;
+            }
+
         });
 		//Response data
         $scope.show = false;
@@ -116,16 +132,17 @@ $scope.generateButtonStatus = false;
                 var field = null, firstError = null;
 				$scope.show = true;
                 for (field in form) {
+                    console.log('field',field);
                     if (field[0] != '$') {
                         if (firstError === null && !form[field].$valid) {
-                            firstError = form[field].$batch;
+                            firstError = form[field].$name;
                         }
                         if (form[field].$pristine) {
                             form[field].$dirty = true;
                         }
                     }
                 }
-                angular.element('.ng-invalid[batch=' + firstError + ']').focus();
+                angular.element('.ng-invalid[name=' + firstError + ']').focus();
             }else {
             //alert($scope.batch.name);
             $scope.app_pending_data = '';
@@ -139,7 +156,11 @@ $scope.generateButtonStatus = false;
                 data: {
                     branch: JSON.parse(sessionStorage.getItem('localObj')).localBranchID,
                     university: $scope.filterUniv.universityID,
-                    batch: $scope.univModel.batch
+                    batch: $scope.univModel.batch,
+                    status:$scope.univModel.status,
+		            from:$scope.univModel.from_date,
+                    to:$scope.univModel.to_date,
+                    updateddate:$scope.univModel.updated_date
                    
                 }
 
@@ -182,7 +203,7 @@ $scope.generateButtonStatus = false;
         
         
         $scope.exportData = function () {
-            alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,InitialPayDate as InititalPaymentDate,EnrollmentNumber as EnrollmentID,StudentRollNo as RollNo,Student_name as StudentName,FatherName as FatherName,Course_name as CourseName,Sem_Year as SemYear,University as University,FormType as FormType,StatusName as ApplicationPendingStatus,StatusUpdationOn as Date INTO XLS("New_RegFormStatusReport.xls",?) FROM ?',[mystyle,$scope.app_pending_data]);
+            alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,InitialPayDate as InititalPaymentDate,EnrollmentNumber as EnrollmentID,StudentRollNo as RollNo,Student_name as StudentName,FatherName as FatherName,Course_name as CourseName,Sem_Year as SemYear, CourseFees || 0 as TotalFee, paidAmount || 0 as PaidFee, balance || 0 as Balance, University as University,FormType as FormType,StatusName as ApplicationPendingStatus,StatusUpdationOn as Date INTO XLS("New_RegFormStatusReport.xls",?) FROM ?',[mystyle,$scope.app_pending_data]);
         };
 
         $scope.$watch(function () {
@@ -449,7 +470,7 @@ $scope.generateButtonStatus = false;
 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';
-
+    $scope.userType=JSON.parse(sessionStorage.getItem('localObj')).localType;
 
 
     //  $scope.items = ['item1', 'item2', 'item3'];
@@ -505,8 +526,38 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
 
 
     };
-    $scope.open1 = function (values,type) {
-
+    $scope.open1 = function (values,type,filterby) {
+        if(type == '1' || type == '2'){ var result = values;} 
+        if(type == '3' || type == '5' || type == '7' || type == '8'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].Sem === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
+        if(type == '4'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].Sem_Year === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
+        if(type == '6'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].CertificateName === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
         var modalInstance1 = $modal.open({
             templateUrl: 'assets/views/student/studentPaymentModal.html',
             controller: 'ModalInstanceCtrl1',
@@ -515,7 +566,7 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
                 items1: function () {
                     var myvalues =
                         {
-                            "values":values,
+                            "values":result,
                             "type":type
                         };
                     return  myvalues;

Apollo/assets/js/controllers/report_app_pending_oldDataCtrl.js

@@ -61,8 +61,8 @@ $scope.generateButtonStatus = false;
                     'Content-Type': 'application/json'
                 },
                 data: {
-                    branch : JSON.parse(sessionStorage.getItem('localObj')).localBranchID
-                   
+                    branch : JSON.parse(sessionStorage.getItem('localObj')).localBranchID,
+                    activity  : ""
                 }
 
             };
@@ -425,7 +425,7 @@ $scope.generateButtonStatus = false;
 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';
-
+    $scope.userType=JSON.parse(sessionStorage.getItem('localObj')).localType;
 
 
     //  $scope.items = ['item1', 'item2', 'item3'];
@@ -481,8 +481,38 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
 
 
     };
-    $scope.open1 = function (values,type) {
-
+    $scope.open1 = function (values,type,filterby) {
+        if(type == '1' || type == '2'){ var result = values;} 
+        if(type == '3' || type == '5' || type == '7' || type == '8'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].Sem === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
+        if(type == '4'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].Sem_Year === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
+        if(type == '6'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].CertificateName === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
         var modalInstance1 = $modal.open({
             templateUrl: 'assets/views/student/studentPaymentModal.html',
             controller: 'ModalInstanceCtrl1',
@@ -491,7 +521,7 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
                 items1: function () {
                     var myvalues =
                         {
-                            "values":values,
+                            "values":result,
                             "type":type
                         };
                     return  myvalues;

Apollo/assets/js/controllers/report_balfeeCtrl.js

@@ -72,8 +72,8 @@ $scope.generateButtonStatus = false;
                     'Content-Type': 'application/json'
                 },
                 data: {
-                    branch : JSON.parse(sessionStorage.getItem('localObj')).localBranchID
-                   
+                    branch : JSON.parse(sessionStorage.getItem('localObj')).localBranchID,
+                    activity:""
                 }
 
             };
@@ -499,7 +499,7 @@ $scope.generateButtonStatus = false;
 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';
-
+    $scope.userType=JSON.parse(sessionStorage.getItem('localObj')).localType;
 
 
     //  $scope.items = ['item1', 'item2', 'item3'];
@@ -555,8 +555,38 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
 
 
     };
-    $scope.open1 = function (values,type) {
-
+    $scope.open1 = function (values,type,filterby) {
+        if(type == '1' || type == '2'){ var result = values;} 
+        if(type == '3' || type == '5' || type == '7' || type == '8'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].Sem === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
+        if(type == '4'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].Sem_Year === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
+        if(type == '6'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].CertificateName === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
         var modalInstance1 = $modal.open({
             templateUrl: 'assets/views/student/studentPaymentModal.html',
             controller: 'ModalInstanceCtrl1',
@@ -565,7 +595,7 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
                 items1: function () {
                     var myvalues =
                         {
-                            "values":values,
+                            "values":result,
                             "type":type
                         };
                     return  myvalues;

Apollo/assets/js/controllers/report_certificateCtrl.js

@@ -52,6 +52,7 @@ $scope.generateButtonStatus = false;
             "branch": "",
             "university": "",
             "batch": "",
+            "status":"",
             "from_date": "",
             "to_date": "",
 
@@ -60,7 +61,7 @@ $scope.generateButtonStatus = false;
         $scope.filters = function () {
             var filterlist = {
                 method: 'POST',
-                url: apiPoint.url + 'report_filters/',
+                url: apiPoint.url + 'report_certificate_filter/',
                 headers: {
                     'Content-Type': 'application/json'
                 },
@@ -75,6 +76,7 @@ $scope.generateButtonStatus = false;
                     $scope.batch=[];
                     $scope.batchlist = response.data.batch;
                     $scope.university = response.data.university;
+                    $scope.certificatestatus = response.data.certificatestatus;
                     //Desc order Batchlist
                     angular.forEach($scope.batchlist,function (values,key) {
                         var parts = values.BatchDate.split("-");
@@ -108,7 +110,7 @@ $scope.generateButtonStatus = false;
 
         });
         // disable submit
-        $scope.$watchCollection('univModel.from_date', function (newValue,oldValue) {
+        $scope.$watchCollection('univModel.status', function (newValue,oldValue) {
             if(newValue==undefined || newValue=='' || newValue==null){
                 $scope.disableSubmit=true;
             }
@@ -119,13 +121,32 @@ $scope.generateButtonStatus = false;
 
         });
 
-        $scope.onSubmit = function () {
-			$scope.isLoaderShow1 =true;
-			 if($scope.univModel.university !== null && $scope.univModel.university !== '' ){
-               $scope.filterUniv = angular.fromJson($scope.univModel.university);
-            }else {
-                $scope.filterUniv = '';
-            }
+        $scope.onSubmit = function (form) {
+            $scope.isLoaderShow1 =true;
+            if($scope.univModel.university !== null && $scope.univModel.university !== '' ){
+                $scope.filterUniv = angular.fromJson($scope.univModel.university);
+             }else {
+                 $scope.filterUniv = '';
+             }
+			var firstError = null;
+            if (form.$invalid) {
+                var field = null, firstError = null;
+				$scope.show = true;
+                for (field in form) {
+                    console.log('field',field);
+                    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();
+            }else{
+
+			 
             //alert($scope.batch.name);
             $scope.cert_data = '';
             $scope.message = '';
@@ -139,6 +160,7 @@ $scope.generateButtonStatus = false;
                     branch: JSON.parse(sessionStorage.getItem('localObj')).localBranchID,
                     university:  $scope.filterUniv.universityID,
                     batch: $scope.univModel.batch,
+                    status:$scope.univModel.status,
 					from : $scope.univModel.from_date,
                     to : $scope.univModel.to_date
                 }
@@ -164,7 +186,7 @@ $scope.generateButtonStatus = false;
                 }
 
             });
-
+        }
         }
         var mystyle = {
             sheetid: 'CERTIFICATE STATUS REPORT',
@@ -184,7 +206,8 @@ $scope.generateButtonStatus = false;
         
         
         $scope.exportData = function () {
-            alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,initialPaid as CertificateFeePaidDate,Enrollment_id as EnrollmentID,Student_name as StudentName,Father_name as FatherName,Course_name as Course,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]);
+        	
+            alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,initialPaid as CertificateFeePaidDate,Enrollment_id as EnrollmentID,Student_name as StudentName,Father_name as FatherName,Course_name as Course,University as University,CAST(balance AS NUMBER) as Balance,certname as CertificateName,STATUS as CertificateStatus,acmts as Comments, adate as Date,Batch_Name as Batch,Courier_Details as CertificateCourierDetails INTO XLS("Certificate_status.xls",?) FROM ?',[mystyle,$scope.cert_data]);
         };
         $scope.$watch(function () {
             $scope.filteredItems = $scope.$eval(" cert_data | filter: search ");
@@ -356,7 +379,7 @@ $scope.generateButtonStatus = false;
 
             var firstError = null;
             if (form.$invalid) {
-
+                console.log('field',field);
                 var field = null, firstError = null;
                 for (field in form) {
                     if (field[0] != '$') {
@@ -453,7 +476,7 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
     //Tooltip for print button
     $scope.dynamicTooltip = 'Student View';
 
-
+    $scope.userType=JSON.parse(sessionStorage.getItem('localObj')).localType;
 
     //  $scope.items = ['item1', 'item2', 'item3'];
 
@@ -508,8 +531,39 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
 
 
     };
-    $scope.open1 = function (values,type) {
-
+    $scope.open1 = function (values,type,filterby) {
+        if(type == '1' || type == '2'){ var result = values;} 
+        if(type == '3' || type == '5' || type == '7' || type == '8'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].Sem === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
+        if(type == '4'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].Sem_Year === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
+        if(type == '6'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].CertificateName === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
+        
         var modalInstance1 = $modal.open({
             templateUrl: 'assets/views/student/studentPaymentModal.html',
             controller: 'ModalInstanceCtrl1',
@@ -518,7 +572,7 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
                 items1: function () {
                     var myvalues =
                         {
-                            "values":values,
+                            "values":result,
                             "type":type
                         };
                     return  myvalues;

Apollo/assets/js/controllers/report_doc_pendingCtrl.js

@@ -63,8 +63,8 @@ $scope.generateButtonStatus = false;
                     'Content-Type': 'application/json'
                 },
                 data: {
-                    branch : JSON.parse(sessionStorage.getItem('localObj')).localBranchID
-                   
+                    branch : JSON.parse(sessionStorage.getItem('localObj')).localBranchID,
+                    activity:""
                 }
 
             };
@@ -420,7 +420,7 @@ $scope.generateButtonStatus = false;
 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';
-
+    $scope.userType=JSON.parse(sessionStorage.getItem('localObj')).localType;
 
 
     //  $scope.items = ['item1', 'item2', 'item3'];
@@ -476,8 +476,39 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
 
 
     };
-    $scope.open1 = function (values,type) {
-
+    $scope.open1 = function (values,type,filterby) {
+        if(type == '1' || type == '2'){ var result = values;} 
+        if(type == '3' || type == '5' || type == '7' || type == '8'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].Sem === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
+        if(type == '4'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].Sem_Year === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
+        if(type == '6'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].CertificateName === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
+        
         var modalInstance1 = $modal.open({
             templateUrl: 'assets/views/student/studentPaymentModal.html',
             controller: 'ModalInstanceCtrl1',
@@ -486,7 +517,7 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
                 items1: function () {
                     var myvalues =
                         {
-                            "values":values,
+                            "values":result,
                             "type":type
                         };
                     return  myvalues;

Apollo/assets/js/controllers/report_examfeeCtrl.js

@@ -63,8 +63,8 @@ $scope.generateButtonStatus = false;
                     'Content-Type': 'application/json'
                 },
                 data: {
-                    branch : JSON.parse(sessionStorage.getItem('localObj')).localBranchID
-                   
+                    branch : JSON.parse(sessionStorage.getItem('localObj')).localBranchID,
+                    activity:""
                 }
 
             };
@@ -424,7 +424,7 @@ $scope.generateButtonStatus = false;
 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';
-
+    $scope.userType=JSON.parse(sessionStorage.getItem('localObj')).localType;
 
 
     //  $scope.items = ['item1', 'item2', 'item3'];
@@ -480,8 +480,39 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
 
 
     };
-    $scope.open1 = function (values,type) {
-
+    $scope.open1 = function (values,type,filterby) {
+        if(type == '1' || type == '2'){ var result = values;} 
+        if(type == '3' || type == '5' || type == '7' || type == '8'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].Sem === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
+        if(type == '4'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].Sem_Year === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
+        if(type == '6'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].CertificateName === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
+        
         var modalInstance1 = $modal.open({
             templateUrl: 'assets/views/student/studentPaymentModal.html',
             controller: 'ModalInstanceCtrl1',
@@ -490,7 +521,7 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
                 items1: function () {
                     var myvalues =
                         {
-                            "values":values,
+                            "values":result,
                             "type":type
                         };
                     return  myvalues;

Apollo/assets/js/controllers/report_expenseCtrl.js

@@ -52,8 +52,8 @@ $scope.generateButtonStatus = false;
                     'Content-Type': 'application/json'
                 },
                 data: {
-                    branch: JSON.parse(sessionStorage.getItem('localObj')).localBranchID
-
+                    branch: JSON.parse(sessionStorage.getItem('localObj')).localBranchID,
+                    activity:""
                 }
 
             };

Apollo/assets/js/controllers/report_leadCtrl.js

@@ -218,7 +218,7 @@ $scope.generateButtonStatus = false;
     //Tooltip for print button
     $scope.dynamicTooltip = 'Student View';
 
-
+    $scope.userType=JSON.parse(sessionStorage.getItem('localObj')).localType;
 
     //  $scope.items = ['item1', 'item2', 'item3'];
 
@@ -273,8 +273,39 @@ $scope.generateButtonStatus = false;
 
 
     };
-    $scope.open1 = function (values,type) {
-
+    $scope.open1 = function (values,type,filterby) {
+        if(type == '1' || type == '2'){ var result = values;} 
+        if(type == '3' || type == '5' || type == '7' || type == '8'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].Sem === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
+        if(type == '4'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].Sem_Year === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
+        if(type == '6'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].CertificateName === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
+        
         var modalInstance1 = $modal.open({
             templateUrl: 'assets/views/student/studentPaymentModal.html',
             controller: 'ModalInstanceCtrl1',
@@ -283,7 +314,7 @@ $scope.generateButtonStatus = false;
                 items1: function () {
                     var myvalues =
                         {
-                            "values":values,
+                            "values":result,
                             "type":type
                         };
                     return  myvalues;

Apollo/assets/js/controllers/report_markcard_certificateCtrl.js

@@ -67,8 +67,8 @@ $scope.generateButtonStatus = false;
                     'Content-Type': 'application/json'
                 },
                 data: {
-                    branch : JSON.parse(sessionStorage.getItem('localObj')).localBranchID
-                   
+                    branch : JSON.parse(sessionStorage.getItem('localObj')).localBranchID,
+                    activity:""
                 }
 
             };
@@ -445,7 +445,7 @@ $scope.generateButtonStatus = false;
 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';
-
+    $scope.userType=JSON.parse(sessionStorage.getItem('localObj')).localType;
 
 
     //  $scope.items = ['item1', 'item2', 'item3'];
@@ -501,8 +501,39 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
 
 
     };
-    $scope.open1 = function (values,type) {
-
+    $scope.open1 = function (values,type,filterby) {
+        if(type == '1' || type == '2'){ var result = values;} 
+        if(type == '3' || type == '5' || type == '7' || type == '8'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].Sem === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
+        if(type == '4'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].Sem_Year === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
+        if(type == '6'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].CertificateName === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
+        
         var modalInstance1 = $modal.open({
             templateUrl: 'assets/views/student/studentPaymentModal.html',
             controller: 'ModalInstanceCtrl1',
@@ -511,7 +542,7 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
                 items1: function () {
                     var myvalues =
                         {
-                            "values":values,
+                            "values":result,
                             "type":type
                         };
                     return  myvalues;

Apollo/assets/js/controllers/report_markcard_statusCtrl.js

@@ -7,39 +7,38 @@ app.controller('report_markcard_statusCtrl', ["$scope", "$filter","$rootScope",
          */
         $scope.userType=JSON.parse(sessionStorage.getItem('localObj')).localType;
 		$scope.isTblShow = false;
-$scope.isLoader = false;
-$scope.isLoaderShow = false;
-$scope.isLoaderShow1 =false;
-$scope.isLoaderTxt = "Loading...";
-$scope.generateButtonTxt = "GENERATE";
-$scope.generateButtonStatus = false;
-  $scope.currentPage = 1;
-    $scope.myModel = {
-        
-        "date": new Date(),
-        "activity": "",
-        "assignedTo": "",
-        "status": "",
-        "referedBy": '',
-        "comments":'',
-        "enquiryStatus":'',
-        
-        "important":false,
-        "branch":"",
-        
-    };
+        $scope.isLoader = false;
+        $scope.isLoaderShow = false;
+        $scope.isLoaderShow1 =false;
+        $scope.isLoaderTxt = "Loading...";
+        $scope.generateButtonTxt = "GENERATE";
+        $scope.generateButtonStatus = false;
+        $scope.currentPage = 1;
+        $scope.myModel = {
+            
+            "date": new Date(),
+            "activity": "",
+            "assignedTo": "",
+            "status": "",
+            "referedBy": '',
+            "comments":'',
+            "enquiryStatus":'',            
+            "important":false,
+            "branch":"",
+            
+        };
 
-    //get current date
-    $scope.hideDateSearch=true;
-    $scope.modifyMinDate = moment();
-    //$scope.minDate = $filter('date')($scope.modifyMinDate, 'MM-dd-yyyy');
-    $scope.currentDate=$filter('date')(new Date(), 'dd-MM-yyyy');
-    // get 30 plus date for follwup details
-    $scope.modifyDate = moment();
-    $scope.modifyDate.add(30, 'days');
-    $scope.futureDate = $filter('date')($scope.modifyDate, 'dd-MM-yyyy');
-    $scope.myModel.date=$scope.currentDate;
-   // console.log($scope.currentDate);
+        //get current date
+        $scope.hideDateSearch=true;
+        $scope.modifyMinDate = moment();
+        //$scope.minDate = $filter('date')($scope.modifyMinDate, 'MM-dd-yyyy');
+        $scope.currentDate=$filter('date')(new Date(), 'dd-MM-yyyy');
+        // get 30 plus date for follwup details
+        $scope.modifyDate = moment();
+        $scope.modifyDate.add(30, 'days');
+        $scope.futureDate = $filter('date')($scope.modifyDate, 'dd-MM-yyyy');
+        $scope.myModel.date=$scope.currentDate;
+        // console.log($scope.currentDate);
          /**
           * End of the call tracking
           */
@@ -50,19 +49,20 @@ $scope.generateButtonStatus = false;
             "branch": "",
             "university": "",
             "batch": "",
-
+            "status":"",
+            "from_date": "",
+            "to_date": ""
         };
 
         $scope.filters = function () {
             var filterlist = {
                 method: 'POST',
-                url: apiPoint.url + 'report_filters/',
+                url: apiPoint.url + 'report_markcard_filter/',
                 headers: {
                     'Content-Type': 'application/json'
                 },
                 data: {
                     branch : JSON.parse(sessionStorage.getItem('localObj')).localBranchID
-                   
                 }
 
             };
@@ -71,6 +71,7 @@ $scope.generateButtonStatus = false;
                     $scope.batch=[];
                     $scope.batchlist = response.data.batch;
                     $scope.university = response.data.university;
+                    $scope.markcardstatus = response.data.markcardstatus;
                     //Desc order Batchlist
                     angular.forEach($scope.batchlist,function (values,key) {
                         var parts = values.BatchDate.split("-");
@@ -84,6 +85,7 @@ $scope.generateButtonStatus = false;
                     // call service for make a list in desc order based on date
                     $scope.batch=dateListDescService.getOrderByList($scope.batch);
                     console.log(response.data.batch);
+                    // console.log('89',response.data.markcardstatus);
                     console.log($scope.batch);
                 } else {
                 }
@@ -94,19 +96,31 @@ $scope.generateButtonStatus = false;
         $scope.$watch('univModel.university', function (newValue,oldValue) {
             if(newValue==undefined || newValue==''){
                 $scope.filterBatchDetails="";
+                $scope.disableSubmit=true;
             }
             else{
                 if(angular.isString(newValue)){
                     $scope.filterBatchDetails=angular.fromJson(newValue);
+                    $scope.disableSubmit=false;
                 }
             }
 
+        });
+        // disable submit
+        $scope.$watchCollection('univModel.status', function (newValue,oldValue) {
+            if(newValue==undefined || newValue=='' || newValue==null){
+                $scope.disableSubmit=true;
+            }
+            else{
+                    $scope.disableSubmit=false;
+
+            }
+
         });
 
         $scope.show = false;
         $scope.onSubmit = function (form) {
 			$scope.isLoaderShow1 =true;
-			
 			var firstError = null;
             if (form.$invalid) {
                 var field = null, firstError = null;
@@ -114,14 +128,14 @@ $scope.generateButtonStatus = false;
                 for (field in form) {
                     if (field[0] != '$') {
                         if (firstError === null && !form[field].$valid) {
-                            firstError = form[field].$batch;
+                            firstError = form[field].$name;
                         }
                         if (form[field].$pristine) {
                             form[field].$dirty = true;
                         }
                     }
                 }
-                angular.element('.ng-invalid[batch=' + firstError + ']').focus();
+                angular.element('.ng-invalid[name=' + firstError + ']').focus();
             }else {
             //alert($scope.batch.name);
 			$scope.filterUniv = angular.fromJson($scope.univModel.university);
@@ -136,7 +150,11 @@ $scope.generateButtonStatus = false;
                 data: {
                     branch:  JSON.parse(sessionStorage.getItem('localObj')).localBranchID,
                     university: $scope.filterUniv.universityID,
-                    batch: $scope.univModel.batch
+                    batch: $scope.univModel.batch,
+                    status: $scope.univModel.status,
+                    from_date: $scope.univModel.from_date,
+                    to_date: $scope.univModel.to_date
+
                 }
 
             };
@@ -175,10 +193,11 @@ $scope.generateButtonStatus = false;
         
         
         $scope.exportData = function () {
-            alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Initial_paid_date as InitialPaymentPaidDate,Enrollment_id as EnrollmentID,Roll_NO as RollNO,Student_name as StudentName,Father_name as FatherName,Course_name as Course,Sem_year as SemYear,University as University,CAST(Balance_Fee AS NUMBER) as BalanceFee,appdate as ApplicationSenttoUnivDate,ansdate as AnswerBookletUnivDate,Status as MarkCardStatus,Date as Date INTO XLS("Markcard_status.xls",?) FROM ?',[mystyle,$scope.markcard_data]);
+            alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Initial_paid_date as InitialPaymentPaidDate,Enrollment_id as EnrollmentID,Roll_NO as RollNO,Student_name as StudentName,Father_name as FatherName,Course_name as Course,Sem_year as SemYear,University as University,CAST(Balance_Fee AS NUMBER) as BalanceFee,appdate as ApplicationSenttoUnivDate,ansdate as AnswerBookletUnivDate,Status as MarkCardStatus,Date as Date,Batch_Name as Batch,AnswerbookSerialNo,Courier_Details as AnswerBooksCourierDetails INTO XLS("Markcard_status.xls",?) FROM ?',[mystyle,$scope.markcard_data]);
         };
         $scope.$watch(function () {
             $scope.filteredItems = $scope.$eval(" markcard_data | filter: search ");
+            console.log('Watch',$scope.filteredItems);
         });
       /**
      * Auto Call Tracking Sriram
@@ -189,6 +208,7 @@ $scope.generateButtonStatus = false;
         if(val)
     {
        // $scope.disable = false;
+        console.log('$scope.filteredItems',$scope.filteredItems);
         var len =  $scope.filteredItems.length;
         var i = 0;
         for(i=0;i<len;i++)
@@ -210,9 +230,12 @@ $scope.generateButtonStatus = false;
     }else{
         $scope.disable = true;
     }
-    console.log($scope.selectedStudentsID);
+    console.log("filterItem",$scope.filteredItems);
+    console.log('WholeData',$scope.markcard_data);
+    console.log('$scope.selectedStudentsID',$scope.selectedStudentsID);
     }
     $scope.isClick = function(e){
+        console.log($scope.markcard_data);
         var ide = e.target;
     var val = (ide.checked ? true : false);
     var sid = e.target.id;
@@ -252,7 +275,9 @@ $scope.generateButtonStatus = false;
     console.log($scope.selectedStudentsID);
     }
     $scope.calltracking = function(){
-        
+        // console.log($scope.selectedStudentsID);
+        // swal('testing','','warning');
+        // return true;
         //$rootScope.student = $scope.selectedStudentsID;
         if($scope.selectedStudentsID ==''){
             swal('Select Check box','','warning');
@@ -420,7 +445,7 @@ $scope.generateButtonStatus = false;
 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';
-
+    $scope.userType=JSON.parse(sessionStorage.getItem('localObj')).localType;
 
 
     //  $scope.items = ['item1', 'item2', 'item3'];
@@ -476,8 +501,39 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
 
 
     };
-    $scope.open1 = function (values,type) {
-
+    $scope.open1 = function (values,type,filterby) {
+        if(type == '1' || type == '2'){ var result = values;} 
+        if(type == '3' || type == '5' || type == '7' || type == '8'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].Sem === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
+        if(type == '4'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].Sem_Year === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
+        if(type == '6'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].CertificateName === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
+        
         var modalInstance1 = $modal.open({
             templateUrl: 'assets/views/student/studentPaymentModal.html',
             controller: 'ModalInstanceCtrl1',
@@ -486,7 +542,7 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
                 items1: function () {
                     var myvalues =
                         {
-                            "values":values,
+                            "values":result,
                             "type":type
                         };
                     return  myvalues;

Apollo/assets/js/controllers/report_study_material_statusCtrl.js

@@ -53,7 +53,7 @@ $scope.generateButtonStatus = false;
             "branch": "",
             "university": "",
             "batch": "",
-            
+            "status":""
         };
    
         $scope.filters = function () { 
@@ -64,14 +64,15 @@ $scope.generateButtonStatus = false;
                     'Content-Type': 'application/json'
                 },
                 data: {
-                    branch : JSON.parse(sessionStorage.getItem('localObj')).localBranchID
-                   
+                    branch : JSON.parse(sessionStorage.getItem('localObj')).localBranchID,
+                    activity:"M001"
                 }
                 
             };
             $http(filterlist).then(function (response) { 
                 if (response.data) {
                     $scope.university = response.data.university;
+                    $scope.statuslist = response.data.statusList;
                     //Desc order Batchlist
                    
                     // call service for make a list in desc order based on date
@@ -136,7 +137,8 @@ $scope.generateButtonStatus = false;
             data: {
                 branch : JSON.parse(sessionStorage.getItem('localObj')).localBranchID,
                 university : $scope.filterUniv.universityID,
-                batch : $scope.univModel.batch
+                batch : $scope.univModel.batch,
+                status:$scope.univModel.status
             }
             
         };
@@ -418,7 +420,7 @@ $scope.$watch(function () {
 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';
-
+    $scope.userType=JSON.parse(sessionStorage.getItem('localObj')).localType;
 
 
     //  $scope.items = ['item1', 'item2', 'item3'];
@@ -474,8 +476,39 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
 
 
     };
-    $scope.open1 = function (values,type) {
-
+    $scope.open1 = function (values,type,filterby) {
+        if(type == '1' || type == '2'){ var result = values;} 
+        if(type == '3' || type == '5' || type == '7' || type == '8'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].Sem === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
+        if(type == '4'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].Sem_Year === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
+        if(type == '6'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].CertificateName === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
+        
         var modalInstance1 = $modal.open({
             templateUrl: 'assets/views/student/studentPaymentModal.html',
             controller: 'ModalInstanceCtrl1',
@@ -484,7 +517,7 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
                 items1: function () {
                     var myvalues =
                         {
-                            "values":values,
+                            "values":result,
                             "type":type
                         };
                     return  myvalues;

Apollo/assets/js/controllers/report_waiver_referalCtrl.js

@@ -31,7 +31,8 @@ $scope.generateButtonStatus = false;
                     'Content-Type': 'application/json'
                 },
                 data: {
-                    branch : JSON.parse(sessionStorage.getItem('localObj')).localBranchID
+                    branch : JSON.parse(sessionStorage.getItem('localObj')).localBranchID,
+                    activity:""
                    
                 }
 
@@ -164,7 +165,7 @@ $scope.generateButtonStatus = false;
   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';
-
+    $scope.userType=JSON.parse(sessionStorage.getItem('localObj')).localType;
 
 
     //  $scope.items = ['item1', 'item2', 'item3'];
@@ -220,8 +221,39 @@ $scope.generateButtonStatus = false;
 
 
     };
-    $scope.open1 = function (values,type) {
-
+    $scope.open1 = function (values,type,filterby) {
+        if(type == '1' || type == '2'){ var result = values;} 
+        if(type == '3' || type == '5' || type == '7' || type == '8'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].Sem === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
+        if(type == '4'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].Sem_Year === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
+        if(type == '6'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].CertificateName === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
+        
         var modalInstance1 = $modal.open({
             templateUrl: 'assets/views/student/studentPaymentModal.html',
             controller: 'ModalInstanceCtrl1',
@@ -230,7 +262,7 @@ $scope.generateButtonStatus = false;
                 items1: function () {
                     var myvalues =
                         {
-                            "values":values,
+                            "values":result,
                             "type":type
                         };
                     return  myvalues;

Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js

@@ -980,7 +980,7 @@ app.filter('unique', function() {
 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';
-
+    $scope.userType=JSON.parse(sessionStorage.getItem('localObj')).localType;
 
 
     //  $scope.items = ['item1', 'item2', 'item3'];
@@ -1036,8 +1036,39 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
 
 
     };
-    $scope.open1 = function (values,type) {
-
+    $scope.open1 = function (values,type,filterby) {
+        if(type == '1' || type == '2'){ var result = values;} 
+        if(type == '3' || type == '5' || type == '7' || type == '8'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].Sem === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
+        if(type == '4'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].Sem_Year === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
+        if(type == '6'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].CertificateName === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
+        
         var modalInstance1 = $modal.open({
             templateUrl: 'assets/views/student/studentPaymentModal.html',
             controller: 'ModalInstanceCtrl1',
@@ -1046,7 +1077,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
                 items1: function () {
                     var myvalues =
                         {
-                            "values":values,
+                            "values":result,
                             "type":type
                         };
                     return  myvalues;

Apollo/assets/js/controllers/staffleadCtrl.js

@@ -147,7 +147,7 @@ $scope.GetstaffwiseCounts = function (date)
          
          $http(getcountDetails).then(function (response) {
 
-           // console.log(response.data.details);
+          //  console.log('response.data.details',response.data.details);
 
              if (response.data.status == 200 && response.data.details !='No records found!' ) {
 
@@ -192,6 +192,7 @@ $scope.AssignedStaff_id ='';
 
  $scope.getLeadDetails = function (staff)
  {
+    $scope.trackingEditLoading = true;
       var assignedstaffid = staff.AssignedStaff;
 
       var checkdate = $scope.tod;
@@ -221,6 +222,8 @@ $scope.AssignedStaff_id ='';
                        $scope.SatffCallDetails=response.data.details;
                        $scope.calldetnodata=true;
                        $scope.calldetdata=false;
+                       $scope.trackingdetails=true;
+                       $scope.trackingEditLoading=false;
                       // console.log(response.data.details);
 
                       // console.log($scope.SatffCallDetails)
@@ -235,10 +238,12 @@ $scope.AssignedStaff_id ='';
                
 
             } else {
-               // swal("Failed!", "No details Availble", "warning");
+               swal("Failed!", "No details Availble", "warning");
 
                 $scope.calldetdata=true;
                 $scope.calldetnodata=false;
+                $scope.trackingdetails=false;
+                $scope.trackingEditLoading=false;
 
             }
 
@@ -251,7 +256,3 @@ $scope.AssignedStaff_id ='';
  
 
     }]);
-
-
-
-

Apollo/assets/js/controllers/studentCtrl.js

@@ -1241,6 +1241,7 @@ $scope.getPhoneNoHistoy = function(studentId)
                 data: {
                     data: datas,
                     updatedBy: localDetails.localUserID,
+                    updatedUserType: localDetails.localType
                 }
             };
             $http(req).then(function (response) {
@@ -2668,6 +2669,7 @@ $scope.getPhoneNoHistoy = function(studentId)
                 data: {
                     data: datas,
                     updatedBy: localDetails.localUserID,
+                    updatedUserType: localDetails.localType
                 }
             };
             $http(req).then(function (response) {
@@ -3803,7 +3805,7 @@ app.filter('unique', function () {
 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';
-
+    $scope.userType=JSON.parse(sessionStorage.getItem('localObj')).localType;
 
 
     //  $scope.items = ['item1', 'item2', 'item3'];
@@ -3858,8 +3860,40 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
 
 
     };
-    $scope.open1 = function (values,type) {
-
+    $scope.open1 = function (values,type,filterby) {
+        if(type == '1' || type == '2'){ var result = values;} 
+        if(type == '3' || type == '5' || type == '7' || type == '8'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].Sem === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
+        if(type == '4'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].Sem_Year === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
+        if(type == '6'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].CertificateName === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
+        
+        
         var modalInstance1 = $modal.open({
             templateUrl: 'assets/views/student/studentPaymentModal.html',
             controller: 'ModalInstanceCtrl1',
@@ -3868,7 +3902,7 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
                 items1: function () {
                     var myvalues =
                         {
-                            "values":values,
+                            "values":result,
                             "type":type
                         };
                     return  myvalues;
@@ -3883,6 +3917,32 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
         });
     };
 
+    $scope.updateComments = function (form,details,loading) {
+var stud = details.StudentID;
+var cmts = details.Comments;
+console.log('stud',stud,'cmts',cmts);
+            var update = {
+                method: 'POST',
+                url: apiPoint.url + 'updateStudentCommentDetails/',
+                headers: {
+                    'Content-Type': 'application/json'
+                },
+                data: {studentID: stud,comments: cmts}
+            };
+            $http(update).then(function (response) {
+                // console.log(response);
+                if (response.data.status==200 && response.data.studCommentUpdateStatus) {
+                    // $scope.ldloading2[loading.replace('-', '_')] = false;
+                    swal("",response.data.message, "success");
+                    // $scope.getStudentList();
+                    
+                } else {
+                    // $scope.ldloading[loading.replace('-', '_')] = false;
+                    swal("Failed!", response.data.message, "error");
+                }
+            });
+    };
+
     $scope.printStudentDetails = function (details) {
         $rootScope.pdfItems = details;
 
@@ -3899,7 +3959,6 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
         });
     }
 
-
 }]);
 
 // Please note that $modalInstance represents a modal window (instance) dependency.

Apollo/assets/js/controllers/studentUnivFormIdFeeDetailsCtrl.js

@@ -728,7 +728,7 @@ $scope.exportDataTab3 = function () {
 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';
-
+    $scope.userType=JSON.parse(sessionStorage.getItem('localObj')).localType;
 
 
     //  $scope.items = ['item1', 'item2', 'item3'];
@@ -781,7 +781,39 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
             }
         });
     };
-    $scope.open1 = function (values,type) {
+    $scope.open1 = function (values,type,filterby) {
+        if(type == '1' || type == '2'){ var result = values;} 
+        if(type == '3' || type == '5' || type == '7' || type == '8'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].Sem === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
+        if(type == '4'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].Sem_Year === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
+        if(type == '6'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].CertificateName === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
+    
 
         var modalInstance1 = $modal.open({
             templateUrl: 'assets/views/student/studentPaymentModal.html',
@@ -791,7 +823,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
                 items1: function () {
                     var myvalues =
                         {
-                            "values":values,
+                            "values":result,
                             "type":type
                         };
                     return  myvalues;

Apollo/assets/js/controllers/student_university_fee_compare.js

@@ -498,7 +498,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
     //Tooltip for print button
     $scope.dynamicTooltip = 'Student View';
 
-
+    $scope.userType=JSON.parse(sessionStorage.getItem('localObj')).localType;
 
     //  $scope.items = ['item1', 'item2', 'item3'];
 
@@ -550,8 +550,39 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
             }
         });
     };
-    $scope.open1 = function (values,type) {
-
+    $scope.open1 = function (values,type,filterby) {
+        if(type == '1' || type == '2'){ var result = values;} 
+        if(type == '3' || type == '5' || type == '7' || type == '8'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].Sem === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
+        if(type == '4'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].Sem_Year === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
+        if(type == '6'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].CertificateName === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
+        
         var modalInstance1 = $modal.open({
             templateUrl: 'assets/views/student/studentPaymentModal.html',
             controller: 'ModalInstanceCtrl1',
@@ -560,7 +591,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
                 items1: function () {
                     var myvalues =
                         {
-                            "values":values,
+                            "values":result,
                             "type":type
                         };
                     return  myvalues;

Apollo/assets/js/controllers/studyMaterialStatusCtrl.js

@@ -489,7 +489,7 @@ app.controller('studyMaterialStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
 app.controller('studentModalDemoCtrl', ["$scope", "$modal", "$log", "API_POINTS", "$http", function ($scope, $modal, $log,apiPoint,$http) {
     //Tooltip for print button
     $scope.dynamicTooltip = 'Student View';
-
+    $scope.userType=JSON.parse(sessionStorage.getItem('localObj')).localType;
 
 
     //  $scope.items = ['item1', 'item2', 'item3'];
@@ -549,8 +549,39 @@ app.controller('studentModalDemoCtrl', ["$scope", "$modal", "$log", "API_POINTS"
 
 
     };
-    $scope.open1 = function (values,type) {
-
+    $scope.open1 = function (values,type,filterby) {
+        if(type == '1' || type == '2'){ var result = values;} 
+        if(type == '3' || type == '5' || type == '7' || type == '8'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].Sem === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
+        if(type == '4'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].Sem_Year === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
+        if(type == '6'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].CertificateName === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
+        
         var modalInstance1 = $modal.open({
             templateUrl: 'assets/views/student/studentPaymentModal.html',
             controller: 'ModalInstanceCtrl1',
@@ -559,7 +590,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$modal", "$log", "API_POINTS"
                 items1: function () {
                     var myvalues =
                         {
-                            "values":values,
+                            "values":result,
                             "type":type
                         };
                     return  myvalues;

Apollo/assets/js/controllers/univFormPaymentCtrl.js

@@ -498,7 +498,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
     //Tooltip for print button
     $scope.dynamicTooltip = 'Student View';
 
-
+    $scope.userType=JSON.parse(sessionStorage.getItem('localObj')).localType;
 
     //  $scope.items = ['item1', 'item2', 'item3'];
 
@@ -550,8 +550,39 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
             }
         });
     };
-    $scope.open1 = function (values,type) {
-
+    $scope.open1 = function (values,type,filterby) {
+        if(type == '1' || type == '2'){ var result = values;} 
+        if(type == '3' || type == '5' || type == '7' || type == '8'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].Sem === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
+        if(type == '4'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].Sem_Year === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
+        if(type == '6'){ 
+            var result = [];
+            for (var i = 0; i < values.length; i++)
+            {
+                if (values[i].CertificateName === filterby)
+                {
+                    result.push(values[i]);
+                }
+            }
+        }
+        
         var modalInstance1 = $modal.open({
             templateUrl: 'assets/views/student/studentPaymentModal.html',
             controller: 'ModalInstanceCtrl1',
@@ -560,7 +591,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
                 items1: function () {
                     var myvalues =
                         {
-                            "values":values,
+                            "values":result,
                             "type":type
                         };
                     return  myvalues;

Apollo/assets/views/StaffLeadDetails.html

@@ -28,8 +28,9 @@
         <th>Follow up Comments</th>
         <th>Status</th>
     </tr> 
+</thead>
 <tbody>
-    <tr dir-paginate="p in SatffCallDetails|filter:search:strict|itemsPerPage:10">
+    <tr dir-paginate="p in SatffCallDetails|filter:search:strict|itemsPerPage:100">
         <td>{{p.SL_NO}}</td>
         <td>{{p.Firstname}}{{p.Lastname}}</td>
         <td>{{p.University}}</td>
@@ -41,8 +42,6 @@
         <td>{{p.ListName}}</td>
     </tr>
 </tbody>
-
-</thead>
 </table>
                     <div class="row">
                         <div class="col-md-12">

Apollo/assets/views/autoCalltracking2.html

@@ -0,0 +1,142 @@
+<div class="container-fluid container-fullw bg-white" controller>
+    <form name="Form" id="form" novalidate ng-submit="trackForm2.submit(Form, myModel, 'zoom-in',studentDetails)" method="post">
+        <div class="row">
+            <div class="col-md-12">
+                <fieldset>
+                    <legend>
+                        Update Call Tracking Details
+                    </legend>
+
+                    
+                    <div class="row">
+
+                        <div data-ng-controller="DatepickerDemoCtrl">
+                            <div class="col-md-4 form-group"
+                                 ng-class="{'has-error':Form.date.$dirty && Form.date.$invalid, 'has-success':Form.date.$valid}">
+                                <label> Followup Date <span class="symbol required"></span></label>
+                                <input type="text"
+                                       class="form-control "
+                                       ng-click="startOpen = !startOpen"
+                                       datepicker-popup="dd-MM-yyyy"
+                                       ng-model="myModel.date"
+                                       is-open="startOpen"
+                                       ng-init="startOpen = false"
+                                       name="date"
+                                       datepicker-options="dateOptions"
+                                       placeholder="Select Date"
+                                       min-date="minDate"
+                                       max-date="futureDate"
+                                       close-text="Close" required="required" ng-readonly="true"/>
+                                <span class="error text-small block"
+                                      ng-if="Form.date.$dirty && Form.date.$error.required">Followup date is required.</span>
+                                
+                            </div>
+                        </div>
+                        
+                        <!-- <div class="col-md-3" ng-if="loading==true">
+                            <spinner name="html5spinner">
+                                <div class="overlay"></div>
+                                <div class="spinner">
+                                    <div class="double-bounce1"></div>
+                                    <div class="double-bounce2"></div>
+                                </div>
+                                <div class="please-wait">Please Wait...</div>
+                            </spinner>
+
+                        </div> -->
+<!-- {{statusDetails | json}} -->
+                        <div class="col-md-4 form-group" ng-class="{'has-error':Form.status.$dirty && Form.status.$invalid, 'has-success':Form.status.$valid}">
+                            <label> Status Name  </label>
+                            
+                            <select class="form-control" name="status" id="Box3" tabindex="7"
+                                                    ng-model="myModel.status" 
+                                                    ng-options="sts.ListCode as sts.ListName for sts in statusDetails" >
+                                               <option value="">Select Status</option>
+                                            </select>
+                        </div>
+                            <!-- <span class="error text-small block"
+                                  ng-if="Form.status.$dirty && Form.status.$error.required && myModel.status.length==0">Status is required</span> -->
+                            <!--<span class="success text-small block"-->
+                            <!--ng-if="Form.assigned.$valid && myModel.assigned.length!=0">Thank You</span>-->
+                        <!-- </div> -->
+
+
+                        <!--<div class="col-md-3" ng-if="loading==true && userType !='R004'">
+                            <spinner name="html5spinner">
+                                <div class="overlay"></div>
+                                <div class="spinner">
+                                    <div class="double-bounce1"></div>
+                                    <div class="double-bounce2"></div>
+                                </div>
+                                <div class="please-wait">Please Wait...</div>
+                            </spinner>
+
+                        </div>
+                        && userType !='R004'-->
+
+                        <div class="col-md-4 form-group" 
+                             ng-class="{'has-error':Form.assigned.$dirty && Form.assigned.$invalid, 'has-success':Form.assigned.$valid}">
+                            <label >
+                                Assigned To <span
+                                    class="symbol required"></span>
+                            </label>
+
+                            <select class="form-control" name="assigned" id="Box2" tabindex="8"
+                                    ng-model="myModel.assignedTo"
+                                    ng-options="emp.loginId as emp.staffName for emp in staffDetails" 
+                                    required>
+
+                                <option value=""> Select Assigned To</option>
+
+                            </select>
+                            <span class="error text-small block"
+                                  ng-if="Form.assigned.$dirty && Form.assigned.$error.required && myModel.assignedTo.length==0">Assigned to is required</span>
+                            <!--<span class="success text-small block"-->
+                            <!--ng-if="Form.assigned.$valid && myModel.assigned.length!=0">Thank You</span>-->
+                        </div>
+                    </div>
+
+                    <div class="row">
+                        <div class="col-md-12 form-group" >
+                            <label >Comments</label>
+                            <textarea tabindex="12" class="form-control text-dark" placeholder="Enter a comments" rows="2" ng-model="myModel.comments"></textarea>
+                            <!-- <span class="error text-small block"
+                                  ng-if="Form.assigned.$dirty && Form.assigned.$error.required">Assigned to is required</span> -->
+                        </div>
+
+
+                        <div class="col-md-12" ng-if="loading==true && userType =='R004'">
+                            <spinner name="html5spinner">
+                                <div class="overlay"></div>
+                                <div class="spinner">
+                                    <div class="double-bounce1"></div>
+                                    <div class="double-bounce2"></div>
+                                </div>
+                                <div class="please-wait">Please Wait...</div>
+                            </spinner>
+
+                        </div>
+                    </div>
+                    
+
+
+
+
+                    <div class="col-md-12">
+                        <div class="pull-right">
+                            <button tabindex="13" type="submit" ladda="ldloading1.zoom_in" class="btn btn-wide btn-success" data-style="zoom-in">
+                                Submit
+                            </button>
+                            
+                            <!-- <button type="reset" class="btn btn-warning btn-wide" tabindex="14"
+                                    ng-click="trackForm2.reset(Form);Form.$setPristine()">
+                                Reset
+                            </button> -->
+
+                        </div>
+                    </div>
+                </fieldset>
+            </div>
+        </div>
+    </form>
+</div>

Apollo/assets/views/callTrackingDetails.html

@@ -99,19 +99,19 @@
                                     </div>
 
                                     <div class="col-md-2">
-                                        <input class="form-control" type="text" ng-model="search2" id="search2" autofocus tabindex="2" placeholder="Search anything" />
+                                        <input class="form-control" type="text" ng-model="search2" id="search2" autofocus tabindex="2" placeholder="Search Name/Mobile" ng-change="searchableChange(search2,search3.ActivityName,search4.Firstname,search5.statusName)"/>
                                     </div>
                                     <!-- Search By Activity-->
                                      <div class="col-md-2 col-md">
-                                        <input class="form-control" type="text" ng-model="search3.ActivityName" id="search3" autofocus tabindex="3" placeholder=" Activity" />
+                                        <input class="form-control" type="text" ng-model="search3.ActivityName" id="search3" autofocus tabindex="3" placeholder=" Activity" ng-change="searchableChange(search2,search3.ActivityName,search4.Firstname,search5.statusName)"/>
                                     </div>  
                                     <!-- Search By Assign To-->
                                     <div class="col-md-2">
-                                        <input class="form-control" type="text" ng-model="search4.Firstname" id="search4" autofocus tabindex="4" placeholder=" Assigned To" />
+                                        <input class="form-control" type="text" ng-model="search4.Firstname" id="search4" autofocus tabindex="4" placeholder=" Assigned To" ng-change="searchableChange(search2,search3.ActivityName,search4.Firstname,search5.statusName)"/>
                                     </div> 
                                     <!-- Search By Status-->
                                     <div class="col-md-2">
-                                        <input class="form-control" type="text" ng-model="search5.statusName" id="search5" autofocus tabindex="5" placeholder="Status" />
+                                        <input class="form-control" type="text" ng-model="search5.statusName" id="search5" autofocus tabindex="5" placeholder="Status" ng-change="searchableChange(search2,search3.ActivityName,search4.Firstname,search5.statusName)"/>
                                     </div> 
                                     <br><br>
 
@@ -162,11 +162,15 @@
                             <div class="table-responsive" ng-if="loader == false">
 
                                 <fieldset>
+                                    <div class="col-md-1 col-md-offset-10">
+                                        <button class="btn btn-success btn-o" ng-click="calltracking()">Update</button>
+                                    </div>
 
 
                                     <table class="table table-hover" ng-controller="studentModalDemoCtrl">
                                         <thead>
                                         <tr>
+                                            <th><input type="checkbox" ng-model="myModel.all" id="all" name="all" ng-click="isCheckAll($event);"></th>
                                             <th></th>
                                             <th ng-click="sort('TrackingID')"> ID
                                                 <span class="glyphicon sort-icon" ng-show="sortKey=='TrackingID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
@@ -189,11 +193,13 @@
                                             <th>ReferredBy</th>
                                             <th>Comments</th>
                                             <th>Status</th>
+                                            <th>CreatedDate</th>
 
                                         </tr>
                                         </thead>
                                         <tbody dir-paginate="p in data|unique:'TrackingID' |orderBy:sortKey:reverse|filter:search2:strict| filter:search3:strict| filter:search4:strict| filter:search5:strict|itemsPerPage:10">
                                         <tr>
+                                            <td><input type="checkbox" ng-checked="myModel.all" id="{{p.LeadID}}" name="{{p.LeadID}}" class="form-control" ng-click="isClick($event);" /></td>
                                             <td ng-if="p.Flag==false">
                                                 <a class="glyphicon ng-scope fa margin-right-5  fa-flag text-grey text-extra-large"  tooltip="Potential" ng-click="markAsImportant(p.TrackingID,true);"></a>
                                             </td>
@@ -231,6 +237,7 @@
                                                     <span class="label label-sm label-success"> {{p.statusName}} </span>
                                                 </a>
                                                 <!--<span class="label label-sm label-success">{{p.statusName}}</span>--></td>
+                                            <td>{{p.trackingDetailsCreatedOn}}</td>
 
 
                                         </tr>
@@ -482,7 +489,6 @@
 
                                             <select class="form-control" name="assigned" id="Box2" tabindex="8"
                                                     ng-model="myModel.assignedTo"
-												
                                                     ng-options="emp.loginId as emp.staffName for emp in staffDetails"
                                                     required>
 

Apollo/assets/views/callTrackingFollowup.html

@@ -234,6 +234,11 @@
 
                                                 </td>
                                             </tr>
+                                            <tr>
+                                                <td>Created Date</td>
+                                                <td>{{followupDetails.trackingDetailsCreatedOn}}</td>
+                                            </tr>
+                                            
                                             </tbody>
                                         </table>
                                     </div>

Apollo/assets/views/certificate/certificate.html

@@ -111,7 +111,7 @@
                 <th ng-click="sort('CertificationID')">Certification ID
                     <span class="glyphicon sort-icon" ng-show="sortKey=='CertificationID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"> </span>
                 </th>
-                <th ng-click="sort('CertificateName')">Certificate Nmae
+                <th ng-click="sort('CertificateName')">Certificate Name
                     <span class="glyphicon sort-icon" ng-show="sortKey=='CertificateName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"> </span>
                 </th>
                 <th>Status</th>

Apollo/assets/views/daybook/daybookOnline.html

@@ -0,0 +1,353 @@
+<!-- start: PAGE TITLE -->
+<section id="page-title">
+    <div class="row">
+        <div class="col-sm-8">
+            <h1 class="mainTitle" translate="sidebar.nav.daybook.ONLINEDAYBOOK">{{ mainTitle }}</h1>
+        </div>
+        <!-- <div ncy-breadcrumb></div>-->
+    </div>
+</section>
+<!-- end: PAGE TITLE -->
+<!-- start: DAY BOOK -->
+
+<div class="container-fluid container-fullw bg-white">
+    <div ng-controller="daybookonlineCtrl" ng-init="init()" >
+        <div>
+      <tabset class="tabbable">
+            <tab heading="View" id="viewDayBook">
+                <div class="container-fluid container-fullw">
+                    <div class="row">
+                        <div class="col-md-12">
+                            <div class="row">
+                                <div class="col-md-4">
+                                    <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="searchData.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-4">
+                                    <!--<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="searchData.dateTo"
+                                            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-4">
+                      <label for="form-field-select-2">
+                                               Search
+                        </label>
+                                    <input class="form-control" type="text" ng-model="search" id="search" autofocus tabindex="1" placeholder="Search" /><br><br>
+
+                                </div>
+                            </div>
+                            <!--<div class="col-md-12" ng-if="noRecordFound == true" style="min-height: 281px;">
+                            <p style="color: red;" align="center"><strong><h3 class="text-center">No
+                                records found... </h3></strong></p>
+                        </div>-->
+                            <style>
+                                .listCoutShow {
+                                    margin: 12px;
+                                    padding: 4px;
+                                    padding-left: 10px;
+                                    padding-right: 10px;
+                                    border: 1px solid #59b176;
+                                    border-radius: 7px;
+                                    color: #FFF;
+                                    background-color: #5fba7d;
+                                    text-align: center;
+                                }
+                                   .containersPara {
+                                                display: flex;
+                                                flex-direction: column;
+                                                max-height: 220px;
+                                                max-width: 140px;
+                                                overflow: auto;
+                                                background: #ddd;
+                                                white-space: pre;
+                                            }
+
+                        
+
+                        
+                            </style>
+<div class="row">
+    <!--{{loadStaring}}-->
+    <div ng-if="loadStaring" align='center' style="font-size: 14px;color: blue;">Generating...</div>
+    <!--<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-disabled="loadStaring"  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;">
+                                        <div style="width: 45px; display: initial;">
+                                            <span style="font-size: 14px;
+    color: black;">Total Count:</span> <span class="listCoutShow">{{ dataLength }}</span>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="table-responsive">
+                         <style>
+                             table tbody:hover {
+                                background: lightgray;
+                                /*font-size: 16px;*/
+                             }
+
+                            
+
+
+                             </style>
+                                <table class="table table-bordered export-table">
+                                    <thead>
+                                        <tr>
+
+                                        <th>S.No</th>
+                                            <th ng-click="sort('Date')" style="width: 20%;padding-right:5%">Date
+                                                <!--<span class="glyphicon sort-icon" ng-show="sortKey=='Date'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
+                                            </th>
+                                            <th class="th" ng-click="sort('ListName')" style="width: 5%">Income/</br>Expense
+                                                <!--<span class="glyphicon sort-icon" ng-show="sortKey=='ListName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
+                                            </th>
+                                            <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 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>
+                                            <th>
+                                                Course
+                                            </th> -->
+                                            <th style="width: 7.5%">
+                                               University,</br>Course,</br>Sem
+                                            </th>
+                                            <th ng-click="sort('TypeName')" style="width: 7.5%">Type
+                                                
+                                            </th>
+                                             <th style="width: 7.5%"> 
+                                                Receipt No
+                                            </th>
+                                            <!-- <th style="width: 7.5%"> 
+                                                Comments
+                                            </th> -->
+                                            <th style="width: 7.5%">Mode of Payment
+                                               
+                                            </th>
+                                            <th style="width: 5%">Amount
+                                                
+                                            </th>
+                                            <!-- <th style="width: 7%">Balance
+                                              
+                                            </th> -->
+
+                                            <th style="width: 7.5%"> 
+                                                Comments
+                                            </th>
+                                            <th style="width: 7%">Reason</th>
+
+                                            <th>Fee Collected by</th>
+                                            <th class="center" ng-click="sort('Status')" style="width: 7.5%">Status
+                                               
+                                            </th>
+<!--                                             <th class="center" style="width: 7.5%">Action
+                                            </th> -->
+                                        </tr>
+                                    </thead>
+         
+                                    <tbody dir-paginate="p in data | filter:search:strict | itemsPerPage:10">
+                                        <tr>
+                                        <td>{{p.ORDER_ID}}</td>
+                                            <td>{{p.Date}}</td>
+                                            <td>{{p.ListName}}</td>
+                                             <td ng-click="billDetails(p.VoucherNumber)">
+                                                <span tooltip="Click to view bill details">{{p.VoucherNumber}}</span>
+                                            </td>
+                                            <td><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.PaidTo}} {{ p.Lastname}}</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>
+                                            <td>{{p.ReceiptNo}}</td>
+                                            <!-- <td>
+                                                <div class="containersPara"><span style="white-space:pre-wrap;">{{p.ReceiptNoComments}}</span></div> </td> -->
+                                            <td>{{p.ModeOfPayment}}</td>
+                                            <td>{{p.Amount}}</td>
+                                            <!-- <td>{{p.Balance}}</td> -->
+                                            <td>
+                                                <div class="containersPara"><span style="white-space:pre-wrap;">{{p.ReceiptNoComments}}{{p.Description}}</span></div> </td>
+                                            <td>{{p.Reason}}</td>
+                                            <td>{{p.Fname}}</td>
+                                            <!--<td class="center" tooltip="{{p.Approval_Comments}}" ng-if="p.ListName == 'Income'">
+                                                - </td>-->
+                                            <td class="center" tooltip="{{p.Approval_Comments}}"><span ng-if="p.Status == 'Pending'" style="text-transform: uppercase; text-shadow: 1px 1px #286d5f; color: #55d4bb ">{{p.Status}}</span>
+                                                <span ng-if="p.Status == 'Approved'" style="text-transform: uppercase; text-shadow: 1px 1px #166307; color: #2be209 ">{{p.Status}}</span>
+                                                <span ng-if="p.Status == 'Rejected'" style="text-transform: uppercase; text-shadow: 1px 1px rgb(167, 88, 15); color: rgba(236, 24, 24, 0.98823529);">{{p.Status}}</span>
+                                                 <span ng-if="p.Status == 'Cancel'" style="text-transform: uppercase; text-shadow: 1px 1px rgb(167, 99, 15); color: rgba(236, 28, 28, 0.98823529);">{{p.Status}}</span>
+                                            </td>
+                                            <!-- <td class="center" ng-if="p.Status != 'Pending' && p.ListName != 'Income' && p.Status == 'Cancel' ">-</td>
+                                            <td class="center" ng-if="p.ListName == 'Income' && p.Status != 'Cancel' ">
+                                                <span ng-if=" p.PaymentStatus == 1 "> <i  tooltip="EDIT" class="glyphicon glyphicon-pencil"  ng-click="setEditId(p.ID)"></i> </span>
+                                                <span ng-if=" p.PaymentStatus == 0 "> 
+                                                    <i  tooltip="DELETE" class="glyphicon glyphicon-remove"  ng-click="deleted1(p.ID)"></i> 
+                                                    </span>
+                                            </td>
+                                            <td class="center" ng-if="p.Status == 'Pending'  && p.Status != 'Cancel'">
+                                                  <span ng-if=" p.PaymentStatus == 1 ">
+                                                <span> <i  tooltip="EDIT" class="glyphicon glyphicon-pencil"  ng-click="setEditId(p.ID)"></i> </span>
+                                                <span> <i tooltip="DELETE" class="glyphicon glyphicon-remove" ng-click="deleted(p.ID)"></i> </span>
+                                                  </span>
+                                            </td> -->
+                                        </tr>
+                                        <tr ng-show="editId === p.ID" ng-if="editId === p.ID">
+                                            <!--<pre>{{ p }}</pre>-->
+                                            <td colspan="15">
+                                                <form name="Form" id="form" novalidate ng-submit="daybookeditUpdate.submit(Form, myModel)" method="post">
+                                                    <div ng-init="copyModel(p)" class="container" style="background-color: rgb(248, 248, 248);
+                                        border-radius: 6px;padding: 22px;">
+                                                        <div class="row">
+                                        <div class="col-md-4 form-group" ng-class="{'has-error':Form.editvoucherNumber.$dirty && Form.editvoucherNumber.$invalid, 'has-success':Form.editvoucherNumber.$valid}">
+                                                                <label>
+                                                Voucher Number 
+                                            </label>
+                                                                <input type="text" name="editvoucherNumber" tabindex="1" placeholder="Enter Voucher Number" class="form-control" ng-model="myModel.voucherNumber"
+                                                              required    ng-pattern="/^[a-zA-Z0-9-]*$/"  />
+                                                              
+                                                                <span class="error text-small block" ng-if="Form.editvoucherNumber.$error.pattern">Enter a Valid Voucher Number.</span>
+                                                                <span class="error text-small block" ng-if="Form.editvoucherNumber.$dirty && Form.editvoucherNumber.$invalid" ng-hide="Form.editvoucherNumber.$error.maxlength || Form.editvoucherNumber.$error.minlength || Form.editvoucherNumber.$error.pattern">Voucher Number is required.</span>
+                                                            </div>
+                                                            <div class="col-md-4 form-group" ng-class="{'has-error':Form.editpaidTo.$dirty && Form.editpaidTo.$invalid, 'has-success':Form.editpaidTo.$valid}">
+                                                                <label>
+                                                Paid To / Received From
+                                            </label>
+                                                                <input type="text" name="editpaidTo" tabindex="1" placeholder="Enter Paid To / Received From" class="form-control" ng-model="myModel.paidTo"
+                                                                required/>
+                                                                <span class="error text-small block" ng-if="Form.editpaidTo.$dirty && Form.editpaidTo.$invalid" ng-hide="Form.editpaidTo.$error.maxlength || Form.editpaidTo.$error.minlength || Form.editpaidTo.$error.pattern">Paid To / Received From is required.</span>
+                                                            </div>
+                                                            <div class="col-md-4" ng-class="{'has-error':Form.editdescription_paid.$dirty && Form.editdescription_paid.$invalid, 'has-success':Form.editdescription_paid.$valid}">
+                                                                <label>
+                                               Description
+                                            </label>
+
+                                                                <textarea type="text" placeholder="Enter Description" tabindex="3" class="form-control" name="editdescription_paid" ng-model="myModel.description_paid"
+                                                                   required maxlength="100" />
+                                                                <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.editdescription_paid.$dirty && Form.editdescription_paid.$invalid" ng-hide="Form.editdescription_paid.$error.maxlength || Form.editdescription_paid.$error.minlength || Form.editdescription_paid.$error.pattern">Description required.</span>
+                                                           
+
+                                                            </div>
+
+                                                        </div>
+                                                        <div class="row">
+                                                            <div class="col-md-4" ng-class="{'has-error':Form.editType.$dirty && Form.editType.$invalid, 'has-success':Form.editType.$valid}">
+                                                                <label for="form-field-select-2">
+                                               Type <span class="symbol required"></span>
+                                                </label>
+
+                                           <!--  {{myModel.TypeID}} -->
+                                                 <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"  ng-if="(typeName.ListCode == myModel.TypeID)"  label="{{typeName.ListName}}">
+                                                 <option  ng-repeat="incexpType in incomeExpenseType" ng-if="incexpType.TypeID==myModel.TypeID" value="{{incexpType.ID}}" ng-selected="incexp.ID == incexpType.ID">{{incexpType.TypeName}}</option>
+
+                                    </optgroup> 
+                                                
+                                                </select>
+                                                
+                                                <span class="error text-small block" ng-if="Form.editType.$dirty && Form.editType.$error.required">Type is Required</span>
+
+                                                            </div>
+                                                            <div class="col-md-4" ng-class="{'has-error':Form.editAmount.$dirty && Form.editAmount.$invalid, 'has-success':Form.editAmount.$valid}">
+                                                                <label>
+                                               Amount <span class="symbol required"></span>
+                                                    
+                                            </label>
+                                                                <input type="text" name="editAmount" tabindex="2" placeholder="Enter Amount" class="form-control" ng-model="myModel.amount"
+                                                                    required/>
+                                                                <span class="error text-small block" ng-if="Form.editAmount.$dirty && Form.editAmount.$error.required">Amount is Required </span>
+
+                                                            </div>
+                                                            <div class="col-md-4"  ng-class="{'has-error':Form.editComments.$dirty && Form.editComments.$invalid, 'has-success':Form.editComments.$valid}">
+                                                                <label>
+                                               Comments
+                                            </label>
+
+                                                                <textarea type="text" placeholder="Enter Comments" tabindex="3" class="form-control" name="editComments" ng-model="myModel.description"
+                                                                 required   maxlength="100" />
+                                                                <span class="text-small block" style="color: rgba(128, 128, 128, 0.64)">Max 100 Charactes.</span>
+                                                                <span class="error text-small block" ng-if="Form.editComments.$dirty && Form.editComments.$invalid" ng-hide="Form.editComments.$error.maxlength || Form.editComments.$error.minlength || Form.editComments.$error.pattern">Comments required.</span>
+                                                           
+                                                            </div>
+                                                        </div>
+                                                        <div class="row">
+                                                        </div>
+                                                        <div class="row">
+                                                            <div class="center">
+                                                                <button type="submit" ng-disabled="disableEditButton" tabindex="4" ladda="ldloading1.zoom_in" class="btn btn-sm btn-success"
+                                                                    data-style="zoom-in">
+                                              <i class='fa fa-spinner fa-spin' ng-if="disableEditButton"> </i>    Submit
+                                            </button>
+                                                                <button type="cancel" ng-click="editClose()" tabindex="5" class="btn btn-warning btn-sm" ng-click="employeeForm.resetCourse(Form)">
+                                                Cancel
+                                            </button>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </form>
+                                            </td>
+
+                                        </tr>
+                                    </tbody>
+                                </table>
+                                <dir-pagination-controls max-size="10" direction-links="true" boundary-links="true">
+                                </dir-pagination-controls>
+                            </div>
+
+                        </div>
+                    </div>
+                </div>
+            </tab>
+            
+            <!--<tab heading="Approve Income/Expense" id="addDayBook"  ng-if="dayBookApprovalAccess == '1'">
+<div ng-init="getApproveLoad()">
+</div>
+        </tab>-->
+        </tabset>
+        </div>
+    </div>
+</div>
+<!-- end: DAY BOOK -->
+<section id="page-title">
+    <div class="row">
+        <!--<div class="col-sm-8">
+            <h1 class="mainTitle" translate="sidebar.nav.profile.MAIN">{{ mainTitle }}</h1>
+        </div>
+        <div ncy-breadcrumb></div>-->
+    </div>
+</section>

Apollo/assets/views/daybook/nonoperational.html

@@ -123,7 +123,7 @@
             <table class="table table-bordered export-table">
                 <thead>
                   <tr>
-                    <!-- <th>S.No</th> -->
+                   <!--  <th>S.No</th> -->
                     <th ng-click="sort('Date')" style="width: 20%;padding-right:5%">Date</th>
                     <th class="th" ng-click="sort('ListName')" style="width: 5%">Income/</br>Expense</th>
                     <th style="width: 5%">Voucher No / Bill No</th>
@@ -141,7 +141,7 @@
          
                     <tbody dir-paginate="p in data | filter:search:strict | itemsPerPage:10">
                     <tr>
-                        <!-- <td>{{p.SL_NO}}</td>  -->
+                       <!--  <td>{{p.SL_NO}}</td>  -->
                         <td>{{p.Date}}</td>
                         <td>{{p.ListName}}</td>
                         <td ng-click="billDetails(p.VoucherNumber)">

Apollo/assets/views/hallticket/batchshedule.html

@@ -159,7 +159,7 @@
 						
 						<ui-select multiple ng-model="selectedCourseNameC.list" tabindex="2" 
                         ng-change="check(selectedCourseNameC.list);">
-						
+						  
                                         <ui-select-match placeholder="Select Courses" >
                                             {{$item.CourseName}} 
                                         </ui-select-match>

Apollo/assets/views/hallticket/batchshedule1.html

@@ -1,334 +0,0 @@
-<style>
-    b.fa {
-        display: inline-block;
-        border-radius: 60px;
-        box-shadow: 0px 0px 2px #FF6600;
-        padding: 0.5em 0.6em;
-
-
-    }
-    b.fa1 {
-        display: inline-block;
-        border-radius: 60px;
-        box-shadow: 0px 0px 2px green;
-        padding: 0.5em 0.6em;
-
-
-    }
-    a {
-        color: #007AFF;                
-    }
-
-</style>
-<!-- start: PAGE TITLE -->
-<section id="page-title">
-    <div class="row">
-        <div class="col-sm-8">
-             
-            <h1 class="mainTitle" translate="Batch Schedule">{{ mainTitle }}</h1>
-
-            <span class="mainDescription">Allocate Batch schedule </span>
-
-        </div>
-        <!-- <div ncy-breadcrumb></div>-->
-    </div>
-</section>
-<!-- end: PAGE TITLE -->
-<!-- start: LIST GROUP -->
- 
-<div class="container-fluid container-fullw bg-white" ng-controller="schCtrl" data-ng-init="init()">
-    
-           <tabset class="tabbable">
-            <tab heading="View Schedule" id="semDetails">
-			 <fieldset>
-				<div class="row" ng-if="semDetailsLoadingStatus">  
-					<!-- <div class="col-md-12"> 
-					<center><h1>{{semDetailsLoadingTxt}}</h1></center>
-					</div> -->
-                     
-
-                    <div class="table-responsive">
-                    <table class="table table-hover" id="batchsch">
-                    <thead>
-                    <tr>
-                    <!-- <th></th> -->
-					
-                    <th>University Name</th>
-					<th>Course Name</th>
-					<th>Action</th>
-                    </tr>
-                    </thead>
-					<!--<pre>{{universitycourse |json}} </pre>-->
-                     <tbody dir-paginate="c in universitycourse | filter:search:strict | itemsPerPage:10">
-                      <tr>
-                      
-                      
-					  
-					   
-                       
-                        <td>{{c.UniversityName}}</td>
-					    <td>{{c.CourseName}}</td>
-						 <td ng-if="p.IsDefault==true" id="{{c.SubjectID}}">
-						 <td ng-if="p.IsDefault==true" id="{{c.UniversityID}}">
-                          <td ng-if="p.IsDefault==true" id="{{c.CourseID}}">
-                          <td ng-if="p.IsDefault==true" id="{{c.SchId}}">
-                                                   
-                                               
-                       <td>
-                                            
-                                            <a class="text-azure" id="editRowBtn{{c.SchId}}" ng-click="setEditId(c.UniversityID,c.CourseID,c.SchId,c.SubjectID,c);"><b class="fa fa-hover fa-pencil " aria-hidden="true"></b>
-                                            </a>
-
-                                           </td>  
-                        
-						                      </tr>		
-                                             <tr ng-show="editId === c.UniversityID && courseCode ===c.CourseID" ng-if="editId === c.UniversityID && courseCode ===c.CourseID">
-                                        <td colspan="6" ng-include src="'assets/views/hallticket/editShedule.html'"></td>
-                                    </tr>
-                                    <div class="row" ng-if="semDropDownShowLoading1">
-										<div class="col-md-12 form-group">
-											<center><h1>Loading...</h1></center>
-										</div>
-				
-									</div>
-					  
-                     
-
-                     </tbody>
-                     
-                    </table>
-                     <dir-pagination-controls max-size="10" direction-links="true" boundary-links="true">
-                                </dir-pagination-controls>
-                    </div>
-
-
-
-
-
-
-				</div>
-			 </fieldset>
-			</tab>
-			 <tab heading="Add Schedule" id="addSem">
-        <div class="row">
-		<!-- <form name="Form" id="form" novalidate method="post"> -->
-
-        <form name="Form" id="form" novalidate ng-submit="batchschedule.submit(Form, myModelAdd,'zoom-in')" method="post">
-            <fieldset>
-                <legend>Search</legend>
-                <div class="row">
-                    <div class="col-md-3 form-group">
-                        <label>
-                            University
-                        </label>
-                        <select class="form-control" name="university" tabindex="1" id="university" 
-                                ng-model="myModel.universityName"
-                                ng-options="i.universityName for i in university" ng-change="getuniversity();">
-                            <option value="-1"> Select University</option>
-                        </select>
-						 <!-- <pre>{{myModel.universityName | json}}</pre>  -->
-
-                    </div>
-                    <div class="col-md-3 form-group">
-                        <label>
-                            Course
-                        </label>
-                        <!-- <select class="form-control" name="course" tabindex="4" id="course" -->
-                                <!-- ng-model="myModel.courseName" -->
-                                <!-- ng-options="courseDetails.CourseID as courseDetails.CourseName for courseDetails in myModel.universityName.courseDetails" ng-change="getStudentDetails(Form,myModel);getSubjectDetails(myModel.universityName,myModel.courseName);"> -->
-                            <!-- <option value=""> Select Course</option> -->
-                        <!-- </select> -->
-						
-						<ui-select multiple ng-model="selectedCourseNameC.list" tabindex="2" ng-change="check(selectedCourseNameC.list);" >
-						
-                                        <ui-select-match placeholder="Select Courses" >
-                                            {{$item.CourseName}} 
-                                        </ui-select-match>
-                                        <ui-select-choices
-                                                repeat="x.CourseID as x in selectedUniversityCourseName | filter:$select.search" >
-                                            {{x.CourseName}}
-                                        </ui-select-choices>
-                                    </ui-select>     
-							 <!-- <pre>{{selectedCourseNameC.list | json}}</pre>  -->
-  
-                    </div>
-
-                <!--  </div>
-                 
-                 <div>    -->
-
-
-
-
-
-                  <div class="col-md-3 form-group">
-                        <label>
-                          Sem/Year
-                        </label>
-                        <select class="form-control" name="Sem_Year" tabindex="1" id="Sem_Year" 
-                                ng-model="myModel.Sem_Year"  placeholder="Select Batch/Sem">
-                          <!--   <option value="-1"> Select Sem/Year</option> -->
-
-                             <option  ng-repeat="sem_yr in Sem_Year_Details"  value="{{sem_yr.Sem_Year}}">{{sem_yr.Sem_Year}}</option>
-                        </select>
-                         
-
-                    </div>
-
-
-
-
-
-                        
-					<div class="col-md-3 form-group">
-                                        <br>                   
-                                       <button type="button" ladda="ldloading1.zoom_in" tabindex="3" class="btn btn-wide btn-success" data-style="zoom-in" ng-click="getSemSubDetails(myModel.universityName.universityID,selectedCourseNameC);">MANUAL SCHDULE</button>
-                                                           
-                             </div>
-
-                <!-- </div> -->
-                 
-                 <div>   
-                             <div class="col-md-3 form group">
-                                 <br>
-                                 <br>
-                                 <lable style="color:green ;font-size:14px"> (OR) </lable>
-                            </div>
-					 <div class="col-md-3 form-group">
-                                <fieldset>
-                                    <js-xls onread="readUploadBatchDetails" onerror="error"></js-xls>
-                                    <br>
-                                  <!-- <a href="C:\xampp\htdocs\apollodec\Apollo\images\Batchschedule.xlsx">Sample Format</a>-->
-                                   <a href="images/Sampleformat/Batchschedule.xlsx">Sample Format</a>
-                                    <button type="button" class="btn btn-success btn-o" style="float: right" ng-click="UploadFileData(extractFileDetails,myModel,selectedCourseNameC)"> Submit</button>
-                                
-                                </fieldset>
-                            </div>
-
-                </div>
-				<div class="row" ng-if="semDropDownShowLoading">
-					<div class="col-md-12 form-group">
-						<center><h1>Loading...</h1></center>
-					</div>
-				
-				</div>
-			
-					
-					<div class="row" ng-if="semDropDownShow">
-                        <div class="panel panel-white" id="sub">
-                            <div class="panel-heading border-light">
-                                <!--<h4 class="panel-title text-pink">Schedule Details</h4>
-                                <paneltool class="panel-tools" tool-collapse="tool-collapse" tool-refresh="load1" tool-dismiss="tool-dismiss"></paneltool>-->
-                                <div class="col-md-3">
-                                    <h4 class="panel-title text-green">Subject</h4>
-                                </div>
-                                <div class="col-md-3">
-                                    <h4 class="panel-title text-green">Date</h4>
-                                </div>
-                                <div class="col-md-3">
-                                    <h4 class="panel-title text-green">Start Time</h4>
-                                </div>
-                                <div class="col-md-3">
-                                    <h4 class="panel-title text-green">End Time</h4>
-                                </div>
-                            </div>
-
-                        <div collapse="panel2" ng-init="panel2=false" class="panel-wrapper">
-                            <div class="panel-body panel-scroll height-250" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true">
-
-                                <div class="row" ng-repeat="p in subjects">
-
-                                    <div class="col-md-3 form-group">
-                                        <label class="text-blue"> <b><!--Subject {{$index+1}}--></b>
-                                        </label>
-                       
-                                        <input type="text"  placeholder="Enter Subject"
-                                               class="form-control" name="scheduleSubject{{$index}}" id="scheduleSubject{{$index}}" tabindex="4"
-                                               ng-model="p.Subject.SubjectName" ng-pattern="/^[a-zA-Z0-9-./\s]*$/" readonly/>
-                                    </div>
-
-
-                                    <div data-ng-controller="DatepickerDemoCtrl">
-                                        <div class="col-md-3 form-group">
-                                            <label class="text-blue"> <!--<b>Date</b>-->
-                                            </label>
-                                            <input type="text" tabindex="4" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="p.ScheduleDate"
-                                                is-open="startOpen" ng-init="startOpen = false" name="scheduleDate{{$index+1}}" id="scheduleDate{{$index+1}}" datepicker-options="dateOptions"
-                                                placeholder="Select Date" close-text="Close"
-                                                show-button-bar="true"/>
-                                        </div>
-                                <div class="col-md-3" style="margin-top: 17px;">
-                                    <div class="form-group">
-                                       <!-- <label class="text-blue"> <b>Start Time</b>
-                                        </label>-->
-                                        <!-- <timepicker class="control-label" -->
-                                                    <!-- ng-model="p.ScheduleStartTime" -->
-                                                    <!-- hour-step="hstep" -->
-                                                    <!-- minute-step="hstep" -->
-                                                    <!-- show-meridian="ismeridian"></timepicker> -->
-													<input type="text"  placeholder="09:00AM"
-                                               class="form-control" name="scheduleFromTime{{$index}}" id="scheduleFromTime{{$index}}" tabindex="4"
-                                               ng-model="p.ScheduleStartTime" ng-pattern="" size="10" ng-blur="validateTime(p.ScheduleStartTime,$event);">
-                                    </div>
-                                </div>
-                                <div class="col-md-3" style="margin-top: 17px;">
-                                    <div class="form-group">
-                                      <!--  <label class="text-blue"> <b>End Time</b>
-                                        </label>-->
-                                        <!--<timepicker class="control-label"
-                                                    ng-model="p.ScheduleEndTime"
-                                                    hour-step="hstep"
-                                                    minute-step="hstep"
-                                                    show-meridian="ismeridian"></timepicker>-->
-
-                                        <!-- <timepicker class="control-label" -->
-                                                    <!-- ng-model="p.ScheduleEndTime" -->
-                                                    <!-- ng-change="changed()" -->
-                                                    <!-- hour-step="hstep" -->
-                                                    <!-- minute-step="hstep" -->
-                                                    <!-- show-meridian="ismeridian"></timepicker> -->
-													
-													<input type="text"  placeholder="10:00PM"
-                                               class="form-control" name="scheduleEndTime{{$index}}" id="scheduleEndTime{{$index}}" tabindex="4"
-                                               ng-model="p.ScheduleEndTime" ng-pattern="" size="10" ng-blur="validateTime(p.ScheduleEndTime,$event);">
-                                    </div>
-                                </div>
-
-                                    </div>
-
-
-
-                                </div>
-
-
-                            </div>
-                        </div>
-                        </div>
-                    <div class="col-md-12 form-group" ng-if="semDropDownShow">
-					  <div class="pull-right">
-                                        <br> 
-                                     <button type="button" ladda="ldloading1.zoom_in" tabindex="" class="btn btn-wide btn-success" data-style="zoom-in" ng-disabled="saveButtonDisabled" ng-click="saveAll(myModel,selectedCourseNameC,subjects);">{{saveButtonTxt}}</button>                  
-                                    <input type="button" class="btn btn-warning btn-wide" tabindex="3" value="Cancel"
-                                   ng-click="remove();">
-                                   
-                               
-                        </div>
-					</div>
-					</div>
-            </fieldset>
-        </form>
-        </div>
-		</tab>
-   
-</tabset>
-</div>
-<div class="table-responsive">
-
-                                   
-                               
-<!-- end: LIST GROUP -->
-
-
-
-
-

Apollo/assets/views/income_expense_report.html

@@ -315,8 +315,7 @@
           <label style="color: black; font-size: 17px">Net Profit/Loss</label></b> 
         </div>
         <div class="col-md-offset-10" style="color: black; font-size: 17px"><b>
-         <!--  {{expense_data[1].Total - expense_data[0].Total}}
- -->
+         <!--  {{expense_data[1].Total - expense_data[0].Total}}-->
       {{Net_Total}}
         </b></div>
 

Apollo/assets/views/login_login.html

@@ -1020,7 +1020,7 @@ List of universities that have authorized Apollo college to function as the cent
 					<li class="selected" style="height: 80px;">
 						<a href="#" id ="ku">
                           <strong>KU</strong><br>
-                          <span style="font-size: 10px;">Kalinga University</span>
+                          <!-- <span style="font-size: 10px;">Kalinga University</span> -->
 						</a>
 					</li>
 					<li style="height: 80px;">
@@ -1034,7 +1034,7 @@ List of universities that have authorized Apollo college to function as the cent
 				<div class="content" id="ku1">
 						<div class="span7">
             <div style="margin-top:10px;"><ul class="media-list">
-              <li class="media"> <a style="padding: 10px 0 10px 19px;margin: 0px;" class="pull-left" href="#"><img class="media-object" src="assets/images/ku1.jpg" alt="KU College Courses" width="86" height="84"></a>
+              <li class="media"> <!--<a style="padding: 10px 0 10px 19px;margin: 0px;" class="pull-left" href="#"><img class="media-object" src="assets/images/ku1.jpg" alt="KU College Courses" width="86" height="84"></a> -->
                 <div class="media-body">
                   <h4 class="margin-top media-heading">KU College<br></h4>               
                 </div>

Apollo/assets/views/onlinetransaction.html

@@ -0,0 +1,18 @@
+<section id="page-title">
+    <div class="row">
+        <div class="col-sm-8">
+            <h1 class="mainTitle" translate="sidebar.nav.student.status.ONLINETRANSACTION">{{ mainTitle }}</h1>
+            <span class="mainDescription">Update Online transaction status.</span>
+        </div>
+        <!--  <div ncy-breadcrumb></div>-->
+    </div>
+</section>
+<div class="container-fluid container-fullw bg-white">
+    <div class="row">
+        <div class="col-md-12">
+            <!-- /// controller:  'UserCtrl' -  localtion: assets/js/controllers/onlinetransactionStatusCtrl.js /// -->
+            <div ng-controller="onlinetransactionStatusCtrl">
+            </div>
+        </div>
+    </div>
+</div>

Apollo/assets/views/partials/nav.html

@@ -216,6 +216,11 @@
 							Application
 						</a>
 					</li>
+					<li ui-sref-active="active">
+						<a ui-sref="app.student.status.onlinetransaction" translate="sidebar.nav.student.status.ONLINETRANSACTION" ng-click="checkSuperAdmin()">
+							Online transaction
+						</a>
+					</li>
 				</ul>
 			</li>
 		</ul>
@@ -311,6 +316,7 @@
 					<span class="title" translate="sidebar.nav.daybook.DAYBOOKDETAILS"> DAY BOOK</span>
 				</a>
 			</li>
+			
 			<li ui-sref-active="active">
 				<a ui-sref="app.daybooksuperadmin.approval"  ng-click="checkSuperAdmin()">
 					<span class="title" translate="sidebar.nav.daybook.DAYBOOKAPPROVAL"> DAY BOOK</span>
@@ -318,7 +324,6 @@
 			</li>
 
 
-
          <li ui-sref-active="active">
 				<a ui-sref="app.daybooksuperadmin.incomeexpensereport"  ng-click="checkSuperAdmin()">
 					<span class="title" translate="sidebar.nav.daybook.INCOMEEXPENSEREPORT"> DAY BOOK PROFIT-LOSS STATEMENT</span>
@@ -340,7 +345,11 @@
 					<span class="title" translate="sidebar.nav.daybook.DATACORRECTION"> DATA CORRECTION</span>
 				</a>
 			</li> -->
-
+            <li ui-sref-active="active">
+				<a ui-sref="app.daybooksuperadmin.onlinedaybook"  ng-click="checkSuperAdmin()">
+					<span class="title" translate="sidebar.nav.daybook.ONLINEDAYBOOK"> ONLINE DAYBOOK </span>
+				</a>
+			</li>
 
 
 		</ul>
@@ -969,7 +978,11 @@
 			<span class="title" translate="sidebar.nav.daybook.NonOperational"> DAY BOOK</span>
 				</a>
 			</li>
-
+			<li ui-sref-active="active">
+				<a ui-sref="app.daybooksuperadmin.onlinedaybook">
+					<span class="title" translate="sidebar.nav.daybook.ONLINEDAYBOOK"> ONLINE DAYBOOK </span>
+				</a>
+			</li>
 
 		<!-- 	<li ui-sref-active="active">
 				<a ui-sref="app.daybooksuperadmin.datacorrection"  ng-click="checkAdmin()">
@@ -1470,6 +1483,11 @@
 					<span class="title" translate="sidebar.nav.daybook.DAYBOOKDETAILS"> DAY BOOK</span>
 				</a>
 			</li>
+			<li ui-sref-active="active">
+				<a ui-sref="app.daybooksuperadmin.onlinedaybook">
+					<span class="title" translate="sidebar.nav.daybook.ONLINEDAYBOOK"> ONLINE DAYBOOK </span>
+				</a>
+			</li>
 			<!-- <li ui-sref-active="active" ng-if="is_active_DayBookAprlAccess == '1'">
 				<a ui-sref="app.daybook.approval"  ng-click="checkStaff()">
 					<span class="title" translate="sidebar.nav.daybook.DAYBOOKAPPROVAL"> DAY BOOK</span>
@@ -1985,6 +2003,11 @@
 					<span class="title" translate="sidebar.nav.daybook.DAYBOOKDETAILS"> DAY BOOK</span>
 				</a>
 			</li>
+			<li ui-sref-active="active">
+				<a ui-sref="app.daybooksuperadmin.onlinedaybook">
+					<span class="title" translate="sidebar.nav.daybook.ONLINEDAYBOOK"> ONLINE DAYBOOK </span>
+				</a>
+			</li>
 			<!-- <li ui-sref-active="active" ng-if="is_active_DayBookAprlAccess == '1'">
 				<a ui-sref="app.daybook.approval"  ng-click="checkStaff()">
 					<span class="title" translate="sidebar.nav.daybook.DAYBOOKAPPROVAL"> DAY BOOK</span>
@@ -2108,4 +2131,4 @@
 		<span translate="sidebar.heading.DOCUMENTATION">Documentation</span>
 	</a>
 </div>-->
-<!-- end: DOCUMENTATION BUTTON
+<!-- end: DOCUMENTATION BUTTON -->

Apollo/assets/views/report_answer_booklets.html

@@ -62,6 +62,16 @@ td,th {
                                 </select>
                              <span style="color:red;" ng-if="show" ng-show="Form.batch.$dirty && Form.batch.$error.required">Please select Batch.</span>
                             </div>
+
+                            <div class="col-md-3">
+                                <label> Status </label><br>
+                                    <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="status" ng-model="univModel.status">
+                                        <option value="" selected>Select Status</option>
+                                        <option ng-repeat="details in statuslist"  value="{{details.ListCode}}">{{details.ListName}}</option>
+                                    </select>
+                            </div>
+
+
                             <div class="col-md-2" style="padding-top: 2.3%;">
                                 <div >
 
@@ -108,6 +118,7 @@ td,th {
 						<th style=" white-space: pre-wrap;text-align:left;width: 100px;"!important>Issued To Student Date</th>
 						<th style=" white-space: pre-wrap;text-align:left;width: 100px;"!important>Received From Student Date</th>
                         <th style=" white-space: pre-wrap;text-align:left;width: 100px;"!important>Answer Booklet Status</th>
+                        <th style=" white-space: pre-wrap;text-align:left;width: 100px;"!important>Courier Details</th>
                         <th>Date</th>
                         
                  
@@ -127,6 +138,7 @@ td,th {
 						<td>{{p.issuedate}}</td>
 						<td>{{p.rcvedate}}</td>
                         <td>{{p.Status}}</td>
+                        <td>{{p.CD}}</td>
                         <td>{{p.Date}}</td>
                         
                     </tr>

Apollo/assets/views/report_application_pending.html

@@ -9,13 +9,18 @@
     </div>
 </section>
 <style>
-      td,th {
-	  white-space: nowrap;
-	  }
-	  th{
-	  text-align:center;
-	  }
-	   .table>tbody>tr>td { padding: 2px; }
+    td,
+    th {
+        white-space: nowrap;
+    }
+    
+    th {
+        text-align: center;
+    }
+    
+    .table>tbody>tr>td {
+        padding: 2px;
+    }
     /* .sort-icon {
         font-size: 9px;
         margin-left: 5px;
@@ -26,8 +31,6 @@
     } */
 </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="report_app_pendingCtrl" ng-init="filters()">
@@ -37,36 +40,83 @@
                     <div class="col-md-12">
 
                         <div class="row">
-                            
+
                             <div class="col-md-3">
                                 <label>
-                                    University
+                                    University<span style="color:red;"> *</span>
                                 </label><br>
 
-                                <select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" required>
+                                <select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" ng-required="true">
                                     <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>
+                                <span style="color:red;" ng-if="show" ng-show="Form.university.$dirty && Form.university.$error.required">Please select University.</span>
                             </div>
-
                             <div class="col-md-3">
                                 <label>
                                     Batch
                                 </label><br>
 
-                                <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" required>
+                                <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch">
                                     <option value="" selected>Select Batch</option>
                                     <option ng-repeat="batchDetails in filterBatchDetails.batchDetails"  value="{{batchDetails.BatchCode}}">{{batchDetails.BatchName}}</option>
 
                                 </select>
-                             <span style="color:red;" ng-if="show" ng-show="Form.batch.$dirty && Form.batch.$error.required">Please select Batch.</span>
+                                <!-- <span style="color:red;" ng-if="show" ng-show="Form.batch.$dirty && Form.batch.$error.required">Please select Batch.</span> -->
                             </div>
-                            <div class="col-md-2" style="padding-top: 2.3%;">
-                                <div >
+                            <div class="col-md-3">
+                                <label>Status<span style="color:red;"> *</span></label><br>
 
-                                    <button type="submit" class="btn btn-success btn-o" tabindex="8">
+                                <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="status" ng-model="univModel.status"  ng-required="true">
+                                    <option value="" selected>Select Status</option>
+                                    <option ng-repeat="details in statuslist"  value="{{details.ListCode}}">{{details.ListName}}</option>
+                                </select>
+                                <span style="color:red;" ng-if="show" ng-show="Form.status.$dirty && Form.status.$error.required">Please select Status.</span>
+                            </div>
+                        </div>
+
+                        <div class="row">
+                            <div class="col-md-3">
+                                <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="univModel.from_date"
+                                        is-open="startOpen" ng-init="startOpen = false" name="addDate" datepicker-options="dateOptions"
+                                        placeholder="Select Date" close-text="Close"  ng-change="changeDate()" 
+                                        ng-keydown="$event.preventDefault(); startOpen = true;"
+                                        show-button-bar="true" />
+                                </div>
+                            </div>
+                            <div class="col-md-3">
+                                <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="univModel.to_date"
+                                        is-open="startOpen" ng-init="startOpen = false" name="addDate" datepicker-options="dateOptions"
+                                        placeholder="Select Date" close-text="Close"  ng-change="changeToDate()"
+                                        ng-keydown="$event.preventDefault(); startOpen = true;"
+                                        show-button-bar="true" />
+                                </div>
+                            </div>                            
+                            <div class="col-md-3">
+                                <div data-ng-controller="DatepickerDemoCtrl">
+                                    <label>
+                                            Updated Date   
+                                        </label>
+                                    <input type="text" tabindex="1" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="univModel.updated_date"
+                                        is-open="startOpen" ng-init="startOpen = false" name="addDate" datepicker-options="dateOptions"
+                                        placeholder="Select Date" close-text="Close" show-button-bar="true" 
+                                        ng-keydown="$event.preventDefault(); startOpen = true;"
+                                        />
+                                </div>
+                            </div>                            
+                            <div class="col-md-2" style="padding-top: 2.3%;">
+                                <div>
+
+                                    <button type="submit" class="btn btn-success btn-o" tabindex="8" ng-disabled="disableSubmit==true">
                                         Submit
                                     </button>
 
@@ -79,48 +129,51 @@
 
         </form>
         <!-- <pre>{{statusr | json}}</pre> -->
-         <div class="row" style="text-align: right;">
-                <div class="col-md-6">
-                <input class="form-control"  type="text" ng-model="search" id="searchIn" autofocus tabindex="2" placeholder="Search" />
-                </div>
-                <div class="col-md-6" style="align:right">
-				<button class="btn btn-success btn-o" ng-click="sendingsms()">Send SMS</button>
-                        <button class="btn btn-success btn-o" ng-click="calltracking()">Call Tracking</button>
-						
-                           
+        <div class="row" style="text-align: right;">
+            <div class="col-md-6">
+                <input class="form-control" type="text" ng-model="search" id="searchIn" autofocus tabindex="2" placeholder="Search" />
+            </div>
+            <div class="col-md-6" >
+                <button class="btn btn-success btn-o" ng-click="sendingsms()">Send SMS</button>
+                <button class="btn btn-success btn-o" ng-click="calltracking()">Call Tracking</button>
+
+
                 <button class="btn btn-success btn-o" ng-click="exportData()">Export to Excel</button>
-             </div>
+            </div>
         </div>
         <div class="table-responsive" style="margin-top: 20px;">
-            <table  id="datatable"   class="table table-striped table-bordered table-hover table-condensed" style="font-size:0.9em;" ng-controller="studentModalDemoCtrl">
-                  
-                           
-                         
+            <table id="datatable" class="table table-striped table-bordered table-hover table-condensed" style="font-size:0.9em;" ng-controller="studentModalDemoCtrl">
+
+
+
                 <thead>
-                   
+
                     <tr>
-                            <th><input type="checkbox" ng-model="myModel.all" id="all" name="all" ng-click="isCheckAll($event);"></th>
+                        <th><input type="checkbox" ng-model="myModel.all" id="all" name="all" ng-click="isCheckAll($event);"></th>
                         <th>SL.No</th>
-                        <th style=" white-space: pre-wrap;text-align:left;width: 100px;"!important>Initital Payment Date</th>
+                        <th style=" white-space: pre-wrap;text-align:left;width: 100px;" !important>Initital Payment Date</th>
                         <th>Enrollment ID</th>
                         <th>RollNo</th>
                         <th>Student Name</th>
                         <th>Father Name</th>
                         <th>Course</th>
                         <th>Sem/Year</th>
+                        <th>Total Fee</th>
+                        <th>Paid Fee</th>
+                        <th>Balance Fee</th>
                         <!--<th>Phone No</th>-->
                         <th>University</th>
                         <th>Form Type</th>
-                        <th style=" white-space: pre-wrap;text-align:left;width: 100px;"!important>Application Pending Status</th>
-						<th>Date</th>
-                        
-                        
-                 
+                        <th style=" white-space: pre-wrap;text-align:left;width: 100px;" !important>Application Pending Status</th>
+                        <th>Date</th>
+
+
+
                     </tr>
                 </thead>
                 <tbody>
-                    <tr  dir-paginate="p in app_pending_data|filter:search:strict|itemsPerPage:10"  current-page="currentPage">
-                            <td><input type="checkbox" ng-checked="myModel.all" id="{{p.Student_id}}" name="{{p.Student_id}}" class="form-control" ng-click="isClick($event);" /></td>
+                    <tr dir-paginate="p in app_pending_data|filter:search:strict|itemsPerPage:10" current-page="currentPage">
+                        <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>{{10 * (currentPage-1)+$index+1}}</td>
                         <td>{{p.InitialPayDate}}</td>
                         <td>{{p.EnrollmentNumber}}</td>
@@ -129,29 +182,33 @@
                         <td>{{p.FatherName}}</td>
                         <td>{{p.Course_name}}</td>
                         <td>{{p.Sem_Year}}</td>
+                        <td>{{p.CourseFees}}</td>
+                        <td>{{p.paidAmount}}</td>
+                        <td>{{p.balance}}</td>
                         <!--<td><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.Phone_number}}</a></td>-->
                         <td>{{p.University}}</td>
                         <td>{{p.FormType}}</td>
-                        <td>{{p.StatusName}}</td>
-                        
+                        <td>{{p.StatusCode === "U001" ? "-" : p.StatusName}}</td>
                         <td>{{p.StatusUpdationOn}}</td>
-                        
-                        
+
+
                     </tr>
-                
+
                 </tbody>
 
             </table>
-			<div class="row">
-				<div class="col-md-12" ng-if="isLoaderShow1">
-					<center> <h1>{{isLoaderTxt}}</h1> </center>
-				</div>
-			</div>
+            <div class="row">
+                <div class="col-md-12" ng-if="isLoaderShow1">
+                    <center>
+                        <h1>{{isLoaderTxt}}</h1>
+                    </center>
+                </div>
+            </div>
             <h3 style="text-align:center;">{{message}}</h3>
 
         </div>
 
-        <dir-pagination-controls  direction-links="true" boundary-links="true">
+        <dir-pagination-controls direction-links="true" boundary-links="true">
         </dir-pagination-controls>
     </div>
 </div>

Apollo/assets/views/report_balance_fee.html

@@ -107,7 +107,7 @@
                              
                     <thead>
                         <tr>
-                            <th colspan="9"></th>
+                            <th colspan="10"></th>
                             <th nowrap style="text-align:center;">Sum of Total Fee</th>
 							<th nowrap style="text-align:center;">Sum of Fee Paid</th>
 							<th nowrap style="text-align:center;">Sum of Balance Fee</th>
@@ -134,6 +134,7 @@
                             <th nowrap style="text-align:center;">Course</th>
                             <th nowrap style="text-align:center;">Sem/Year</th>
                             <th nowrap style="text-align:center;">University</th>
+                            <th nowrap style="text-align:center;">Course Status</th>
 							<th style=" white-space: pre-wrap;text-align:left;width: 100px;text-align:center;">Initial Payment Date</th>
                             <th nowrap style="text-align:center;">Total Fee</th>
                             <th nowrap style="text-align:center;">Fees Paid</th>
@@ -176,6 +177,16 @@
                             <td nowrap>{{p.Course_name}}</td>
                             <td nowrap>{{p.Sem_year}}</td>
                              <td nowrap>{{p.University}}</td>
+                            <!-- <td nowrap style="text-align:right;" >
+                                <span ng-if="p.course_status == 1" >Active</span> 
+                                <span ng-elseif="p.course_status == 0" >Deactive</span> 
+                                <span ng-else>{{p.course_status}}</span> 
+                            </td> -->
+                            <td nowrap style="text-align:right;" ng-switch="p.course_status">
+                                <span ng-switch-when="1">Active</span> 
+                                <span ng-switch-when="0">Deactive</span> 
+                                <span ng-switch-default>{{p.course_status}}</span> 
+                            </td>
 							<td nowrap>{{p.regdate}}</td>
                             <td nowrap style="text-align:right;">{{p.Total}}</td>
                             <td nowrap style="text-align:right;">{{p.Paid_fee}}</td>