ReRegister Issues Fixed By Sriram

Apollo/api/application/config/routes.php

@@ -332,3 +332,7 @@ $route['report_balfee'] = 'Report/balfee';
 $route['report_lead'] = 'Report/lead';
 $route['insertUniversityfile'] = 'UniversityFile_Controller/insertUniversityfile'; 
 
+//Application Form Details
+$route['getApplicationFromDetails'] = 'StatusUpdation_Controller/getApplicationFromDetails';
+$route['updateApplicationFormStatus'] = 'StatusUpdation_Controller/updateApplicationFormStatus';
+$route['getApplicationFormStatusList'] = 'StatusUpdation_Controller/getApplicationFormStatusList';

Apollo/api/application/controllers/StatusUpdation_Controller.php

@@ -232,7 +232,6 @@ class StatusUpdation_Controller extends REST_Controller {
     public function getApplicationFromDetails_post(){
         $reqData = $this->post('data');
         $reqBranch = $this->post('reqBranch');
-        // print_r($reqData);exit();
         $getApplicationFormDetails = $this->statusupdation_model->get_applicationFrom_details($reqData, $reqBranch); // Check if the employee exist
         if ($getApplicationFormDetails) {
             $getApplicationFormDetails['status'] = REST_Controller::HTTP_OK;
@@ -245,4 +244,38 @@ class StatusUpdation_Controller extends REST_Controller {
             
         }
     }
-}
+
+    public function updateApplicationFormStatus_post(){
+        $reqData = $this->post('data');
+        $reqBranch = $this->post('requestDetails');
+        $updateApplicationFormStatus = $this->statusupdation_model->update_applicationForm_status($reqData, $reqBranch); // Check if the employee exist
+        if ($updateApplicationFormStatus) {
+            $updateApplicationFormStatus['status'] = REST_Controller::HTTP_OK;
+            // Set the response and exit
+            $this->response($updateApplicationFormStatus, 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
+            
+        }
+    }
+
+      public function getApplicationFormStatusList_post(){
+        $reqData = $this->post('data');
+        $reqBranch = $this->post('reqBranch');
+        $getApplicationFormStatusList = $this->statusupdation_model->get_ApplicationFormStatusDetails($reqData, $reqBranch); // Check if the employee exist
+        if ($getApplicationFormStatusList) {
+            $getApplicationFormStatusList['status'] = REST_Controller::HTTP_OK;
+            // Set the response and exit
+            $this->response($getApplicationFormStatusList, 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
+            
+        }
+    }
+
+
+    }

Apollo/api/application/models/Fees_status_model.php

@@ -507,6 +507,7 @@ class Fees_status_model extends CI_Model
 
             $this->db->select('ReceiptNo');
             $this->db->where('ReceiptNo', $feesPaidDetails['ReceiptNo']);
+            $this->db->where('IsActive', '1');
             if($this->db->get(STUDENTS_FEES_PAID)->first_row() AND $feesPaidDetails['ReceiptNo']!=''){
                 $result['paidStatus'] = false;
                 $result['message'] = "This receipt number is already exist!";

Apollo/api/application/models/Reports_model.php

@@ -360,7 +360,7 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen
     }
     public function answer_booklet($bat=null,$br=null,$u=null){
        
-        $sql = "select ifnull(sms.sid,'-') as Student_id,ifnull(scd.eid,'-') as Enrollment_id,ifnull(std.name,'-') as Student_name,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(sms.cid,'-') as Course_id,ifnull(sfs.batch,'-') as Batch_code,ifnull(sms.branch,'-') as Branch_code,ifnull(sms.adate,'-') as Date,ifnull(cfd.syear,'-') as Sem_year,ifnull(sms.sem,'-') as Sem,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(list.status,'-') as Status,ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber,listdate.issuedate as issuedate,listdate.rcvedate as rcvedate,ifnull(((sfs.cf + sfs.stf + sfs.others)-sum(sfp.bamount)),0) as balance
+        $sql = "select ifnull(sms.sid,'-') as Student_id,ifnull(scd.eid,'-') as Enrollment_id,ifnull(std.name,'-') as Student_name,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(sms.cid,'-') as Course_id,ifnull(sfs.batch,'-') as Batch_code,ifnull(sms.branch,'-') as Branch_code,ifnull(sms.adate,'-') as Date,ifnull(cfd.syear,'-') as Sem_year,ifnull(sms.sem,'-') as Sem,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(list.status,'-') as Status,ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber,listdate.issuedate as issuedate,listdate.rcvedate as rcvedate,ifnull(((sfs.cf + sfs.stf + sfs.others)-(sfp.bamount)),0) as balance
 
         from 
 			 (SELECT ID,StudentID as sid,CourseID as cid,BranchCode as branch,ListCode as lcode,AnsDate as  
@@ -379,7 +379,7 @@ left join
         group by sid,fid,billno) 
     as sfp on sfp.sid=sfs.sid and sfp.fid=sfs.fid
 left join
-        (SELECT ID as cid,CourseID as ccid,FeesType as ftype,Sem_Year as syear FROM T_Course_Fees_Details)    as cfd on cfd.cid=sms.cid
+        (SELECT ID as cid,CourseID as ccid,FeesType as ftype,Sem_Year as syear FROM T_Course_Fees_Details)    as cfd on cfd.ccid=sfs.cid and cfd.cid=sfs.ftype
 left join 
         (SELECT ListCode as lcode,ListName as status FROM T_PickListDetails) 
     as list on list.lcode=sms.lcode
@@ -394,13 +394,13 @@ left join
         (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,FirstName as name,Fathername as father,PermanentAddress as address,AlternateNumber FROM T_StudentDetails) as std on std.sid=sms.sid
 left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,EnrollmentID as eid,BranchID as branch FROM T_Student_CourseDetails) as scd on scd.sid=sms.sid
 left join 
-         (select ID,StudentID as sid,
+         (select ID,StudentID as sid,Sem as sem,
 max(if(ListName = 'ISSUED TO STUDENT', AnsDate,'-')) as issuedate,
 max(if(ListName = 'RECEIVED FROM STUDENT', AnsDate,'-')) as rcvedate
 from T_AnswerBookletStatus abs
 left join T_PickListDetails list on list.ListCode=abs.ListCode where AnsDate is not null
-group by sid
+group by sid,Sem
-) as listdate on listdate.sid=sms.sid     
+) as listdate on listdate.sid=sms.sid and listdate.sem=sms.sem    
        where std.active = 1  and sms.branch = '".$br."'  
         ";
        
@@ -414,7 +414,7 @@ group by sid
             $sql.=" and cm.uid = '".$u."'";
           
           }
-        $sql.=" group by Student_id,Course_id,Batch_code,Branch_code,Sem,Sem_year";
+        $sql.=" group by Student_id,Course_id,Batch_code,Branch_code,Sem";
         
           
           
@@ -537,7 +537,7 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen
             $sql.=" and cm.uid = '".$u."'";
           
           }
-        $sql.="group by Student_id,Course_id,Batch_code,Branch_code";
+        $sql.="group by Student_id,Course_id,Batch_code,Branch_code,certname";
         
           
           
@@ -563,16 +563,15 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen
         IF(ModeOfPayment = 'WAIVER', sum(BillAmount), 0) AS waiver,
         IF(ModeOfPayment = 'REFERRAL', BillNO,'-') AS referal_bill,
         IF(ModeOfPayment = 'REFERRAL', sum(BillAmount), 0) AS referal FROM T_Students_Fees_PaidDetails
-        where IsActive = 1 
+        where IsActive = 1 and ModeOfPayment = 'WAIVER' or ModeOfPayment = 'REFERRAL'
-        group by waiver_bill,referal_bill) as sms
+        group by fid,waiver_bill,referal_bill) as sms
 left join 
         (SELECT FeesID as fid,BatchCode as batch,StudentID as sid,CourseID as cid,FeesType as ftype FROM T_Students_Fees_Status
-        group by sid,cid,batch) as sfs on sfs.sid=sms.sid and sfs.fid=sms.fid
+        group by sid,cid,fid,batch) as sfs on sfs.sid=sms.sid and sfs.fid=sms.fid
+        left join
+        (SELECT ID as cid,CourseID as ccid,FeesType as ftype,Sem_Year as syear FROM T_Course_Fees_Details)    as cfd on cfd.ccid=sfs.cid and cfd.cid=sfs.ftype
 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=sfs.cid
+        (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=sfs.sid and scd.cid=sfs.cid
-
-left join
-        (SELECT ID as cid,CourseID as ccid,FeesType as ftype,Sem_Year as syear FROM T_Course_Fees_Details)    as cfd on cfd.ccid=scd.cid and cfd.cid=sfs.ftype
 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 
@@ -671,7 +670,7 @@ left join
     }
     public function balfee($bat=null,$br=null,$u=null){
        
-        $sql = "SELECT  ifnull(sfp.StudentID,'-') as Student_id,ifnull(scd.eid,'-') as eid,ifnull(std.name,'-') as Student_name,date_format(std.regdate,'%d-%m-%Y') as regdate,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(sfs.batch,'-') as Batch_code,ifnull(sfs.cid,'-') as Course_id,ifnull(cm.course,'-') as Course_name,ifnull(u.uname,'-') as University,ifnull(sfs.branch,'-') as Branch_code,ifnull(cfd.syear,'-') as Sem_year,ifnull((sfs.cf + sfs.stf + sfs.others),0) as Total,ifnull((sfb.bamount),0) as Paid_fee,ifnull(((sfs.cf + sfs.stf + sfs.others) - (sfb.bamount)),0) as balance,
+        $sql = "SELECT  ifnull(sfp.StudentID,'-') as Student_id,scd.EnrollmentID as eid,sfs.CourseID as cid,std.MobileNumber as Phone_number,FirstName as Student_name,Fathername as Father_name,PermanentAddress as address,AlternateNumber,date_format(std.CreatedOn,'%d-%m-%Y') as regdate,cm.CourseName as Course_name,u.UniversityName as University,sfp.FeesID as fid,(CourseFees + STFOrWR + Others) as Total,ifnull((sfp.BillAmount),0) as Paid_fee,((CourseFees + STFOrWR + Others) - sfp.BillAmount) as balance,cfd.Sem_Year as Sem_year,std.PermanentAddress as address,std.AlternateNumber as AlternateNumber,
         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,
@@ -691,45 +690,30 @@ left join
         ifnull(MAX(CASE WHEN Installment = 9 THEN sfp.BillNO END),'-') as billno9,
         ifnull(MAX(CASE WHEN Installment = 9 THEN sfp.BillAmount END),0) as billamt9,
         ifnull(MAX(CASE WHEN Installment = 10 THEN sfp.BillNO END),'-') as billno10,
-        ifnull(MAX(CASE WHEN Installment = 10 THEN sfp.BillAmount END),0) as billamt10,
+        ifnull(MAX(CASE WHEN Installment = 10 THEN sfp.BillAmount END),0) as billamt10
-        ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber 
+        
         FROM T_Students_Fees_PaidDetails as sfp 
-        left join (SELECT FeesID as fid,BatchCode as batch,BranchCode as branch,StudentID as sid,CourseID as cid,FeesType as ftype,sum(CourseFees) as cf,Sum(STFOrWR) as stf,sum(Others) as others,Comments as cmts FROM T_Students_Fees_Status
+        left join T_Students_Fees_Status sfs on sfs.FeesID=sfp.FeesID
-         group by fid,sid,batch,branch) as sfs on sfs.fid=sfp.FeesID and sfs.sid=sfp.StudentID
+        left join T_Course_Fees_Details cfd on cfd.ID=sfs.FeesType
-        left join
+        left join T_CourseMaster cm on cm.CourseID=sfs.CourseID
-                    (SELECT ID as cid,CourseID as ccid,FeesType as ftype,Sem_Year as syear FROM T_Course_Fees_Details) as cfd 
+        left join T_UniversityMaster u on u.UniversityID=cm.UniversityID
-                    on cfd.ccid=sfs.cid
+        left join T_StudentDetails std on std.StudentID=sfp.StudentID and std.IsActive = 1
-        left join
+        left join T_Student_CourseDetails scd on scd.StudentID=sfs.StudentID and scd.CourseID=sfs.CourseID
-                    (SELECT CourseID as cid,UniversityID as uid,CourseName as course FROM T_CourseMaster) as cm
+        where sfp.IsActive = 1 and sfp.UpdatedBy = '".$br."' 
-                    on cm.cid=sfs.cid
-            left join
-                    (SELECT UniversityID as uid,UniversityName as uname FROM T_UniversityMaster) as u 
-                    on u.uid=cm.uid
-        left join 
-                    (SELECT StudentID as sid,MobileNumber as phone,FirstName as name,Fathername as father,IsActive as active,PermanentAddress as address,AlternateNumber,CreatedOn as regdate  FROM T_StudentDetails where IsActive = 1) as std on std.sid=sfp.StudentID
-                    left join
-                     (SELECT BatchCode as bcode,BatchName as batchname FROM T_BatchMaster) as b on b.bcode=sfs.batch
-                    left join
-                   (SELECT BranchCode as brcode,BranchName as bname FROM T_BranchMaster) as br on br.brcode=sfp.UpdatedBy
-        left join
-        (SELECT  StudentID as sid,FeesID as fid,BillNo as billno,sum(BillAmount) as bamount FROM T_Students_Fees_PaidDetails where IsActive = 1  
-        group by sid,fid) as sfb on sfb.sid=sfp.StudentID and sfb.fid=sfp.FeesID
-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=sfs.sid
-        where sfp.IsActive = 1 and br.brcode = '".$br."' 
 
    ";
        
         if ($bat!= ''){
       
-            $sql.=" and sfs.batch = '".$bat."'";
+            $sql.=" and sfs.BatchCode = '".$bat."'";
           
           }
           if ($u!= ''){
       
-            $sql.=" and u.uid = '".$u."'";
+            $sql.=" and u.UniversityID = '".$u."'";
           
           }
-        $sql.=" group by Student_id,Batch_code,Course_id,Branch_code";
+        $sql.=" group by Student_id,fid";
        
           
          

Apollo/api/application/models/StatusUpdation_model.php

@@ -19,6 +19,8 @@ class StatusUpdation_model extends CI_Model {
             $searchFor = 'C001';
         } else if ($reqDetails == 'ANSWERBOOKLET_STATUS') {
             $searchFor = 'B001';
+        } else if ($reqDetails == 'APPICATIONFORM_STATUS') {
+            $searchFor = 'L001';
         }
         return $searchFor;
     }
@@ -316,7 +318,7 @@ class StatusUpdation_model extends CI_Model {
                 if( $statuToMsg == 'received' || $statuToMsg == 'Received' || $statuToMsg == 'RECEIVED'){
                     $cerNamtToMsg = 'Answer booklet';
                     $getSemYearMsg = $this->get_couser_sem_yr_msg($arr[0]['CourseID']);
-                    $getSemYearANDType = "$getSemYearMsg  $cerNamtToMsg";
+                    $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.";
@@ -593,7 +595,7 @@ class StatusUpdation_model extends CI_Model {
         $config = array(
             'protocol'  => 'smtp',
             'smtp_host' => 'smtp.sendgrid.net',
-            'smtp_port' => 465,
+            'smtp_port' => 587,
             'smtp_user' => 'apikey',
             'smtp_pass' => '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',
             'mailtype'  => 'html',
@@ -602,12 +604,13 @@ class StatusUpdation_model extends CI_Model {
         $this->email->initialize($config);
         $this->email->set_mailtype("html");
         $this->email->set_newline("\r\n");
+        // print_r($this->email);exit();
         //Email content
         // $htmlContent = '<h1>Sending email via SMTP server</h1>';
         $htmlContent = $msg;
         // Email body load the html template
         // $body = $this->load->view('emails/anillabs.php',$data,TRUE);
-        $this->email->to($list);
+        $this->email->to('dineshkumar.k@venbainfotech.com');
         $this->email->from('noreply@apollodec.com','Apollo');
         $subj = $sub;
         $this->email->subject($subj);
@@ -883,8 +886,80 @@ class StatusUpdation_model extends CI_Model {
 
     //get application form details
     public function get_applicationFrom_details($reqData, $reqBranch) {
-echo $reqData['studId'];
+        $studentId =  $reqData['studId'];
-echo $reqData['courseId'];
+        $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->from('T_Registration_Details as t1');
+        $this->db->join('T_Course_Fees_Details as CFD', 'CFD.ID = t1.FeeType');
+        $this->db->where('t1.StudentID', $studentId);
+        $this->db->where('t1.CourseID', $courseId);
+        $fromTypes = $this->db->get();
+        $formTypeDetails = $fromTypes->result();
+        if($formTypeDetails){
+            // print_r($formTypeDetails);exit();
+            $resultArr['formTypeDetails'] = $formTypeDetails;
+            $resultArr['formTypeStatus'] = true;
+            $resultArr['message'] = "Successfully data generated";
+        } else {
+            // print_r($formTypeDetails);exit();
+            $resultArr['formTypeDetails'] = [];
+            $resultArr['formTypeStatus'] = false;
+            $resultArr['message'] = "No record found";
+        }
+        return $resultArr;
+    }
 
+    public function update_applicationForm_status($reqData, $reqBranch){
+  
+  $arr['Registration_Details_ID'] = $reqData[0]['register_details_id'];
+  $arr['ListCode'] = $reqData[0]['ListCode'];
+  $arr['Comments'] = $reqData[0]['Comments'];
+   $arr['AppFormDate'] = $reqData[0]['SDate'];
+
+    $arr['BranchCode'] = $reqBranch['localBranchID'];
+     $arr['CreatedBy'] = $reqBranch['localUserID'];
+      $time = date('Y-m-d H:i:s');
+        $dateTime = $time;
+        $arr['CreatedOn'] = $dateTime;
+// print_r($arr);exit();
+  $this->db->insert('T_ApplicationFormStatus', $arr);
+        if ($this->db->affected_rows() >= 1) {
+            $result['addStatus'] = true;
+            $result['message'] = "Successfully Application Form Status Updated";
+        } else {
+            $result['addStatus'] = false;
+            $result['message'] = "Something went wrong.please try again";
+        }
+        return $result;
+    }
+
+    public function get_ApplicationFormStatusDetails($reqData, $reqBranch){
+        $studentId =  $reqData['studId'];
+        $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->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->where('t2.StudentID', $studentId);
+        $this->db->where('t2.CourseID', $courseId);
+        $fromTypes = $this->db->get();
+        $formTypeDetails = $fromTypes->result();
+        if($formTypeDetails){
+            // print_r($formTypeDetails);exit();
+            $resultArr['formTypeDetails'] = $formTypeDetails;
+            $resultArr['formTypeStatus'] = true;
+            $resultArr['message'] = "Successfully data generated";
+        } else {
+            // print_r($formTypeDetails);exit();
+            $resultArr['formTypeDetails'] = [];
+            $resultArr['formTypeStatus'] = false;
+            $resultArr['message'] = "No record found";
+        }
+        return $resultArr;
     }
 }   

Apollo/api/application/models/University_model.php

@@ -338,6 +338,7 @@ class University_model extends CI_Model
         $this->db->or_where('ListGroup','7');
         $this->db->or_where('ListGroup','8');
         $this->db->or_where('ListGroup','9');
+        $this->db->or_where('ListGroup','12');
         $defaultActivityDetails=$this->db->get(PICK_LIST_DETAILS);
         if($defaultActivityDetails->result()){
             $activity_result['activityStatus'] = true;

Apollo/assets/js/controllers/applicationStatusCtrl.js

@@ -22,13 +22,15 @@ app.controller('applicationStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
         $scope.editId = -1;
     }
 
+    // Student Form type list
+    $scope.studentFormTypeList = "";
 
 
     // get local client details
     var localDetail = JSON.parse(localStorage.getItem('localObj'));
     var localDetails = ipCookie('cookiechk');
     
-    const localUpdateStatus = 'APPLICATIONFORM_STATUS';
+    const localUpdateStatus = 'APPICATIONFORM_STATUS';
      $scope.localTypeSuperAdmin = false;
         $scope.localBranchDetails = '';
 
@@ -97,14 +99,7 @@ app.controller('applicationStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
         'Name': ''
     }
 
-    $scope.myStatusModel = {
+ 
-        'semYear': '',
-        'staus': '',
-        'dateOn': '',
-        'comment': '',
-        'certificatetype': '',
-        'certificateNumber': ''
-    }
 
     // get university list while page is loading
     $scope.universityData = '';
@@ -276,8 +271,6 @@ app.controller('applicationStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
     }
 
     $scope.getApplicationFromDetails = function(frm_details){
-alert(JSON.stringify(frm_details));
-
   var getStatusL = {
             method: 'POST',
             url: apiPoint.url + 'getApplicationFromDetails/',
@@ -290,8 +283,8 @@ alert(JSON.stringify(frm_details));
             }
         };
         $http(getStatusL).then(function (response) {
-            if (response.data.statusList) {
+            if (response.data.formTypeStatus) {
-                $scope.statusDetailsList = response.data.statusList_details;
+                $scope.studentFormTypeList = response.data.formTypeDetails;
             } else {
                 // $scope.searchLoading = false;
             }
@@ -349,8 +342,28 @@ alert(JSON.stringify(frm_details));
         }
     }
 
+    $scope.editStatus = false;
+    $scope.editStatusID = '';
+
+    $scope.statusUpdateView = function(id){
+$scope.editStatus = true;
+$scope.editStatusID = id;
+    $scope.myStatusModel = {
+        'id': '',
+        'staus': '',
+        'dateOn': '',
+        'comment': ''
+    }
+    }
+
+       $scope.myStatusModel = {
+        'staus': '',
+        'dateOn': '',
+        'comment': ''
+    }
+
     $scope.statusUpdate = {
-        submit: function (form, myStatusModel, localBranchDetails) {
+        submit: function (form, localBranchDetails, id) {
             var firstError = null;
             if (form.$invalid) {
                 var field = null, firstError = null;
@@ -378,25 +391,20 @@ alert(JSON.stringify(frm_details));
                 $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.CourseID, item.BranchCode);
+                        let getStudentID = new getStudentForUpdateDetails(id);
                         studentForUpdate.push(getStudentID);
                         return true;
                     }
                 });
-                function getStudentForUpdateDetails(id, courseId, dCode) {
+                function getStudentForUpdateDetails(id) {
-                    this.StudentID = id;
-                    this.CourseID = courseId;
-                    this.BranchCode = dCode;
                     this.ListCode = $scope.myStatusModel.staus;
                     this.SDate = $scope.myStatusModel.dateOn;
-                    this.Coursedetail = id;
                     this.Comments = $scope.myStatusModel.comment;
-                    this.CertificateType = $scope.myStatusModel.certificatetype;
+                    this.register_details_id = id
-                    this.CertificateNumber = $scope.myStatusModel.certificateNumber;
                 }
                 var updateStudyMaterial = {
                     method: 'POST',
-                    url: apiPoint.url + 'updateApplicationStatus/',
+                    url: apiPoint.url + 'updateApplicationFormStatus/',
                     headers: {
                         'Content-Type': 'application/json'
                     },
@@ -431,12 +439,9 @@ alert(JSON.stringify(frm_details));
         reset: function (form) {
             form.$setPristine(true);
              $scope.myStatusModel = {
-                'semYear': '',
                 'staus': '',
                 'dateOn': '',
-                'comment': '',
+                'comment': ''
-                'certificatetype': '',
-                'certificateNumber': ''
             }
         }
     }
@@ -452,20 +457,22 @@ alert(JSON.stringify(frm_details));
         $scope.prevStatusListForStudentCourse = '';
         var getPrevStatus = {
             method: 'POST',
-            url: apiPoint.url + 'getPrevStatusDetailsForStu/',
+            url: apiPoint.url + 'getApplicationFormStatusList/',
             headers: {
                 'Content-Type': 'application/json'
             },
             data: {
-                statusFor: localUpdateStatus,
+                data: {
-                getDetailsFor: { "student": p.StudentID, "CourseID": p.CourseID },
+            studId: p.StudentID,
-                data: localDetail
+            courseId: p.CourseID
+        },
+                reqBranch: localDetails.localBranchID
             }
         };
         $http(getPrevStatus).then(function (response) {
-            if (response.data.preStatusDetails) {
+            if (response.data.formTypeStatus) {
                 $scope.prevStatusListForStudentCourseLoading = false;
-                $scope.prevStatusListForStudentCourse = response.data.preStatus_details_list;
+                $scope.prevStatusListForStudentCourse = response.data.formTypeDetails;
                 $scope.prevNoRecordFound = false;
             } else {
                 $scope.prevStatusListForStudentCourseLoading = false;

Apollo/assets/js/controllers/examAttendanceCtrl.js

@@ -297,11 +297,30 @@ $scope.isLoaderTxt = "Loading...";
 				var heading1='Attendance of '+$scope.pdfExamDateToDisplay+'After Noon Session'+" - "+ 'Attendance of '+$scope.pdfExamDateToDisplay+'Fore Noon Session';
 				doc1.setFontSize(9);
 				doc1.setFontStyle('bold');
-			    doc1.text(60,30,heading);
+			   //doc1.text(60,30,heading);
-				//doc1.textAlign('CENTER',50,30,heading);
+			   var heading_length = heading.length;
+			   var heading_start_point = 0;
+			   var heading1_start_point = 0;
+			   if(heading_length <= 100)
+			   {
+				     var heading_start_point = 200;
+					 var heading1_start_point = 225;
+			   }
+			   else
+			   {
+				     var heading_start_point = 100;
+					 var heading1_start_point = 150;
+			   }
+			   // console.log(heading_length);
+			   // console.log((doc1.internal.pageSize.width/2));
+			   // console.log((doc1.internal.pageSize.width/2)-(heading_length));
+			   
+			   
+			    doc1.text(heading_start_point,30,heading);
 				doc1.setFontSize(9);
 				doc1.setFontStyle('bold');
-			    doc1.text(70,45,heading1);
+				//doc1.text(70,45,heading1);
+			    doc1.text(heading1_start_point,45,heading1);
 				
 				 }; 
 				// ctx.textAlign = "right";      
@@ -312,11 +331,23 @@ $scope.isLoaderTxt = "Loading...";
 				var heading1='Attendance of '+$scope.pdfExamDateToDisplay+'After Noon Session'+" - "+ 'Attendance of '+$scope.pdfExamDateToDisplay+'Fore Noon Session';
 				doc2.setFontSize(9);
 				doc2.setFontStyle('bold');
-			
+			   var heading_length = heading.length;
-			    doc2.text(50,30,heading);
+			   var heading_start_point = 0;
+			   var heading1_start_point = 0;
+			   if(heading_length <= 100)
+			   {
+				     var heading_start_point = 200;
+					 var heading1_start_point = 225;
+			   }
+			   else
+			   {
+				     var heading_start_point = 100;
+					 var heading1_start_point = 150;
+			   }
+			    doc2.text(heading_start_point,30,heading);
 				doc2.setFontSize(9);
 				doc2.setFontStyle('bold');
-			    doc2.text(70,45,heading1);
+			    doc2.text(heading1_start_point,45,heading1);
 				
 				 }; 
 			 

Apollo/assets/js/controllers/generateHallTicketCtrl.js

@@ -357,6 +357,8 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun
 	console.log('child');
 	$scope.localPdfUniverityDetails = pdfitems.universityDetails;
 	$scope.universityNamePDF = $scope.localPdfUniverityDetails[0].UniversityName;
+	$scope.length_of_universityNamePDF = $scope.universityNamePDF.length/2;
+	console.log('$scope.length_of_universityNamePDF'+$scope.length_of_universityNamePDF);
 	$scope.universityAddressPDF = $scope.localPdfUniverityDetails[0].Address;
 	$scope.universityEmailPDF = $scope.localPdfUniverityDetails[0].EmailID;
 	$scope.universityLogoPDF = $scope.localPdfUniverityDetails[0].ProfilePicPath;
@@ -473,20 +475,27 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun
 				fileName = value.EnrollmentID+'-'+value.Firstname+value.Lastname+$scope.courseNamePDF+semName+'.pdf';
 				doc.setDrawColor(0);
 				doc.setFillColor(245, 245, 240);
-				doc.rect(150, 30, 395, 60,'FD');
+				doc.rect(120, 30, 425, 67,'FD');
 				doc.setFontSize(12);
 				doc.setTextColor(40);
 				doc.setFontStyle('normal');
 			 
 				doc.addImage(dataURL, 'jpeg', 50, 35, 50, 50);//university logo location
 				doc.addImage(profiledataURL, 'jpeg', 470, 100, 60, 60);//student profile location
+				var uni_add_position = 0;
+				if($scope.length_of_universityNamePDF >= 20 ){
 					
+					uni_add_position = 110;console.log(uni_add_position);
+					}
+					else{
+						uni_add_position = 10;console.log(uni_add_position);
+						}
 				doc.setFontSize(10);
-				doc.text(150,50,$scope.universityNamePDF);
+				doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF+uni_add_position),45,$scope.universityNamePDF);
 				doc.setFontSize(8);
-				doc.text(170,65,$scope.universityAddressPDF);
+				doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF),55,$scope.universityAddressPDF);
 				doc.setFontSize(8);
-				doc.text(280,80,$scope.universityEmailPDF);
+				doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF),93,$scope.universityEmailPDF);
 				
 				doc.rect(45, 100, 400, 60);
 				doc.rect(445, 100, 100, 60);
@@ -697,20 +706,27 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun
 				fileName = value.EnrollmentID+'-'+value.Firstname+value.Lastname+$scope.courseNamePDF+semName+'.pdf';
 				doc.setDrawColor(0);
 				doc.setFillColor(245, 245, 240);
-				doc.rect(150, 30, 395, 60,'FD');
+				doc.rect(120, 30, 425, 67,'FD');
 				doc.setFontSize(12);
 				doc.setTextColor(40);
 				doc.setFontStyle('normal');
 		
 				doc.addImage(dataURL, 'jpeg', 50, 35, 50, 50);//university logo location
 				doc.addImage(profiledataURL, 'jpeg', 470, 100, 60, 60);//student profile location
+				var uni_add_position = 0;
+				if($scope.length_of_universityNamePDF >= 20 ){
 					
+					uni_add_position = 110;console.log(uni_add_position);
+					}
+					else{
+						uni_add_position = 10;console.log(uni_add_position);
+						}
 				doc.setFontSize(10);
-				doc.text(150,50,$scope.universityNamePDF);
+				doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF+uni_add_position),45,$scope.universityNamePDF);
 				doc.setFontSize(8);
-				doc.text(170,65,$scope.universityAddressPDF);
+				doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF),55,$scope.universityAddressPDF);
 				doc.setFontSize(8);
-				doc.text(280,80,$scope.universityEmailPDF);
+				doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF),93,$scope.universityEmailPDF);
 				
 				doc.rect(45, 100, 400, 60);
 				doc.rect(445, 100, 100, 60);
@@ -874,7 +890,7 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun
 				fileName = value.EnrollmentID+'-'+value.Firstname+value.Lastname+$scope.courseNamePDF+semName+'.pdf';
 				doc.setDrawColor(0);
 				doc.setFillColor(245, 245, 240);
-				doc.rect(150, 30, 395, 60,'FD');
+				doc.rect(120, 30, 425, 67,'FD');
 				doc.setFontSize(12);
 				doc.setTextColor(40);
 				doc.setFontStyle('normal');
@@ -882,12 +898,20 @@ app.controller('HallTicketPDFCtrl', ["$scope", "$modalInstance", "pdfitems", fun
 				doc.addImage(dataURL, 'jpeg', 50, 35, 50, 50);//university logo location
 				doc.addImage(profiledataURL, 'jpeg', 470, 100, 60, 60);//student profile location
 				
+				var uni_add_position = 0;
+				if($scope.length_of_universityNamePDF >= 20 ){
+					
+					uni_add_position = 110;console.log(uni_add_position);
+					}
+					else{
+						uni_add_position = 10;console.log(uni_add_position);
+						}
 				doc.setFontSize(10);
-				doc.text(150,50,$scope.universityNamePDF);
+				doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF+uni_add_position),45,$scope.universityNamePDF);
 				doc.setFontSize(8);
-				doc.text(170,65,$scope.universityAddressPDF);
+				doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF),55,$scope.universityAddressPDF);
 				doc.setFontSize(8);
-				doc.text(280,80,$scope.universityEmailPDF);
+				doc.text((doc.internal.pageSize.width/2)-($scope.length_of_universityNamePDF),93,$scope.universityEmailPDF);
 				
 				doc.rect(45, 100, 400, 60);
 				doc.rect(445, 100, 100, 60);

Apollo/assets/js/controllers/report_ans_bookletCtrl.js

@@ -82,8 +82,22 @@ app.controller('report_ans_bookletCtrl', ["$scope", "$filter","$rootScope","$mod
                 }
             });
         }
+		//For batch dropdown
+		$scope.$watch('univModel.university', function (newValue,oldValue) {
+            if(newValue==undefined || newValue==''){
+                $scope.filterBatchDetails="";
+				console.log($scope.filterBatchDetails);
+            }
+            else{
+                if(angular.isString(newValue)){
+                    $scope.filterBatchDetails=angular.fromJson(newValue);
+                }
+            }
+
+        });
          $scope.show = false;
         $scope.onSubmit = function (form) {
+            $scope.filterUniv = angular.fromJson($scope.univModel.university);
 			var firstError = null;
             if (form.$invalid) {
                 var field = null, firstError = null;
@@ -111,7 +125,7 @@ app.controller('report_ans_bookletCtrl', ["$scope", "$filter","$rootScope","$mod
                 },
                 data: {
                     branch: JSON.parse(localStorage.getItem('localObj')).localBranchID,
-                    university: $scope.univModel.university.universityID,
+                    university: $scope.filterUniv.universityID,
                     batch: $scope.univModel.batch
                    
                 }

Apollo/assets/js/controllers/report_app_pendingCtrl.js

@@ -82,6 +82,20 @@ app.controller('report_app_pendingCtrl', ["$scope", "$filter","$rootScope","$mod
                 }
             });
         }
+		//For batch dropdown
+		$scope.$watch('univModel.university', function (newValue,oldValue) {
+            if(newValue==undefined || newValue==''){
+                $scope.filterBatchDetails="";
+				console.log($scope.filterBatchDetails);
+            }
+            else{
+                if(angular.isString(newValue)){
+                    $scope.filterBatchDetails=angular.fromJson(newValue);
+                }
+            }
+
+        });
+		//Response data
         $scope.show = false;
         $scope.onSubmit = function (form) {
 			var firstError = null;

Apollo/assets/js/controllers/report_balfeeCtrl.js

@@ -90,9 +90,25 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal",
                 }
             });
         }
+		//For batch dropdown
+		$scope.$watch('univModel.university', function (newValue,oldValue) {
+            if(newValue==undefined || newValue==''){
+                $scope.filterBatchDetails="";
+				console.log($scope.filterBatchDetails);
+            }
+            else{
+                if(angular.isString(newValue)){
+                    $scope.filterBatchDetails=angular.fromJson(newValue);
+                }
+            }
+
+        });
         // response data
        $scope.show = false;
+	   $scope.returnResultData = [];
         $scope.onSubmit = function (form) {
+            $scope.filterUniv = angular.fromJson($scope.univModel.university);
+			$scope.returnResultData.length=0;
 			var firstError = null;
             if (form.$invalid) {
                 var field = null, firstError = null;
@@ -119,7 +135,7 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal",
                 },
                 data: {
                     branch: JSON.parse(localStorage.getItem('localObj')).localBranchID,
-                    university: $scope.univModel.university.universityID,
+                    university: $scope.filterUniv.universityID,
                     batch: $scope.univModel.batch
                    
                 }
@@ -133,6 +149,7 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal",
                     for(var i=0;i<$scope.balfee_data.length;i++)
                     if($scope.balfee_data[i].balance !=0){
                     $scope.balfee_data[i].SL_NO = j+1;
+					$scope.returnResultData.push($scope.balfee_data[i]);
                     j++;
                     }
                
@@ -143,32 +160,40 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal",
             });
 			
 			$scope.gettotal = function(){
+				var length = $scope.returnResultData.length;
                 var totalfee = 0;
-                for(var i = 0; i < $scope.balfee_data.length; i++){
+                for(var i = 0; i < length; i++){
-                    var item = $scope.balfee_data[i];
+                    var item = $scope.returnResultData[i];
                     totalfee += parseFloat(item.Total);
                 }
+				
                 return totalfee;   }
+				
+				
            $scope.getpaid = function(){
                     var totalpaid = 0;
-                    for(var i = 0; i < $scope.balfee_data.length; i++){
+                    for(var i = 0; i < $scope.returnResultData.length; i++){
-                        var item = $scope.balfee_data[i];
+                        var item = $scope.returnResultData[i];
                         totalpaid += parseFloat(item.Paid_fee);
                     }
+					
                     return totalpaid;   }
 			
 			$scope.getbalance = function(){
                    var totalbalance=0;
-                    for(var i = 0; i < $scope.balfee_data.length; i++){
+                    for(var i = 0; i < $scope.returnResultData.length; i++){
-                        var item = $scope.balfee_data[i];
+                        var item = $scope.returnResultData[i];
                         totalbalance += parseFloat(item.balance);
 						
                     }
+					
                     return totalbalance;   }
 					
              	
 				
 				
+		   
+
         }
 		}
         //Export to excel

Apollo/assets/js/controllers/report_certificateCtrl.js

@@ -2,7 +2,6 @@
 /*** controller***/
 app.controller('report_certificateCtrl', ["$scope", "$filter","$rootScope","$modal", "API_POINTS", "$http", "SweetAlert", "$state", 'md5', 'ipCookie', '$window',"dateListDescService",
     function ($scope, $filter,$rootScope,$modal, apiPoint, $http, SweetAlert, $state, md5, ipCookie, $window, dateListDescService) {
-
         /*
          * auto call tracking
          */
@@ -83,8 +82,35 @@ app.controller('report_certificateCtrl', ["$scope", "$filter","$rootScope","$mod
                 }
             });
         }
+        /* watch university model for bind batch objects*/
+
+        $scope.$watchCollection('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('filters.from_date', function (newValue,oldValue) {
+            if(newValue==undefined || newValue=='' || newValue==null){
+                $scope.disableSubmit=true;
+            }
+            else{
+                    $scope.disableSubmit=false;
+
+            }
+
+        });
 
         $scope.onSubmit = function () {
+            $scope.filterUniv = angular.fromJson($scope.univModel.university);
             //alert($scope.batch.name);
             $scope.cert_data = '';
             $scope.message = '';
@@ -96,7 +122,7 @@ app.controller('report_certificateCtrl', ["$scope", "$filter","$rootScope","$mod
                 },
                 data: {
                     branch: JSON.parse(localStorage.getItem('localObj')).localBranchID,
-                    university: $scope.univModel.university.universityID,
+                    university: $scope.filterUniv.universityID,
                     batch: $scope.univModel.batch,
 					from : $scope.univModel.from_date,
                     to : $scope.univModel.to_date

Apollo/assets/js/controllers/report_doc_pendingCtrl.js

@@ -82,9 +82,23 @@ app.controller('report_doc_pendingCtrl', ["$scope", "$filter","$rootScope","$mod
                 }
             });
         }
+		//For batch dropdown
+		$scope.$watch('univModel.university', function (newValue,oldValue) {
+            if(newValue==undefined || newValue==''){
+                $scope.filterBatchDetails="";
+				console.log($scope.filterBatchDetails);
+            }
+            else{
+                if(angular.isString(newValue)){
+                    $scope.filterBatchDetails=angular.fromJson(newValue);
+                }
+            }
+
+        });
+		//Response data
           $scope.show = false;
         $scope.onSubmit = function (form) {
-			
+            $scope.filterUniv = angular.fromJson($scope.univModel.university);
 			var firstError = null;
             if (form.$invalid) {
                 var field = null, firstError = null;
@@ -112,7 +126,7 @@ app.controller('report_doc_pendingCtrl', ["$scope", "$filter","$rootScope","$mod
                 },
                 data: {
                     branch: JSON.parse(localStorage.getItem('localObj')).localBranchID,
-                    university: $scope.univModel.university.universityID,
+                    university: $scope.filterUniv.universityID,
                     batch: $scope.univModel.batch
                    
                 }
@@ -133,10 +147,10 @@ app.controller('report_doc_pendingCtrl', ["$scope", "$filter","$rootScope","$mod
 			}
         }
         var mystyle = {
-            sheetid: 'DOCUMENT PENDING STUDENT LIST REPORT',
+            sheetid: 'STUDENT DOCUMENTS PENDING REPORT',
             headers: true,
             caption: {
-              title:'DOCUMENT PENDING STUDENT LIST REPORT',
+              title:'STUDENT DOCUMENTS PENDING REPORT',
               width: '300px',
               style:'font-size:50px;' 
             },

Apollo/assets/js/controllers/report_examfeeCtrl.js

@@ -82,6 +82,19 @@ app.controller('report_examfeeCtrl', ["$scope", "$filter","$rootScope","$modal",
                 }
             });
         }
+		//For batch dropdown
+		$scope.$watch('univModel.university', function (newValue,oldValue) {
+            if(newValue==undefined || newValue==''){
+                $scope.filterBatchDetails="";
+				console.log($scope.filterBatchDetails);
+            }
+            else{
+                if(angular.isString(newValue)){
+                    $scope.filterBatchDetails=angular.fromJson(newValue);
+                }
+            }
+
+        });
 
         $scope.show = false;
         $scope.onSubmit = function (form) {

Apollo/assets/js/controllers/report_markcard_certificateCtrl.js

@@ -83,8 +83,34 @@ app.controller('report_markcard_certificateCtrl', ["$scope", "$filter","$rootSco
                 }
             });
         }
+        /* watch university model for bind batch objects*/
 
+        $scope.$watchCollection('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('filters.from_date', function (newValue,oldValue) {
+            if(newValue==undefined || newValue=='' || newValue==null){
+                $scope.disableSubmit=true;
+            }
+            else{
+                    $scope.disableSubmit=false;
+
+            }
+
+        });
         $scope.onSubmit = function () {
+            $scope.filterUniv = angular.fromJson($scope.univModel.university);
             //alert($scope.batch.name);
             $scope.mark_cert_data = '';
             $scope.message = '';
@@ -96,7 +122,7 @@ app.controller('report_markcard_certificateCtrl', ["$scope", "$filter","$rootSco
                 },
                 data: {
                     branch: JSON.parse(localStorage.getItem('localObj')).localBranchID,
-                    university: $scope.univModel.university.universityID,
+                    university: $scope.filterUniv.universityID,
                     batch: $scope.univModel.batch,
                     from : $scope.univModel.from_date,
                     to : $scope.univModel.to_date

Apollo/assets/js/controllers/report_markcard_statusCtrl.js

@@ -2,7 +2,6 @@
 /*** controller***/
 app.controller('report_markcard_statusCtrl', ["$scope", "$filter","$rootScope", "API_POINTS", "$http", "SweetAlert", "$state", 'md5', 'ipCookie', '$window',"dateListDescService","$modal",
     function ($scope, $filter,$rootScope, apiPoint, $http, SweetAlert, $state, md5, ipCookie, $window, dateListDescService,$modal,$log) {
-
         /**
          * auto call tracking
          */
@@ -82,9 +81,24 @@ app.controller('report_markcard_statusCtrl', ["$scope", "$filter","$rootScope",
                 }
             });
         }
+        /* watch university model for bind batch objects*/
+
+        $scope.$watch('univModel.university', function (newValue,oldValue) {
+            if(newValue==undefined || newValue==''){
+                $scope.filterBatchDetails="";
+            }
+            else{
+                if(angular.isString(newValue)){
+                    $scope.filterBatchDetails=angular.fromJson(newValue);
+                }
+            }
+
+        });
 
         $scope.show = false;
         $scope.onSubmit = function (form) {
+
+            $scope.filterUniv = angular.fromJson($scope.univModel.university);
 			var firstError = null;
             if (form.$invalid) {
                 var field = null, firstError = null;
@@ -112,7 +126,7 @@ app.controller('report_markcard_statusCtrl', ["$scope", "$filter","$rootScope",
                 },
                 data: {
                     branch:  JSON.parse(localStorage.getItem('localObj')).localBranchID,
-                    university: $scope.univModel.university.universityID,
+                    university: $scope.filterUniv.universityID,
                     batch: $scope.univModel.batch
                 }
 

Apollo/assets/js/controllers/report_study_material_statusCtrl.js

@@ -72,10 +72,24 @@ app.controller('report_study_material_statusCtrl', ["$scope", "$filter","$rootSc
                 }
             });
         }
+        /* watch university model for bind batch objects*/
+
+        $scope.$watch('univModel.university', function (newValue,oldValue) {
+            if(newValue==undefined || newValue==''){
+                $scope.filterBatchDetails="";
+            }
+            else{
+                if(angular.isString(newValue)){
+                    $scope.filterBatchDetails=angular.fromJson(newValue);
+                }
+            }
+
+        });
 		
           
   $scope.show = false;
         $scope.onSubmit = function (form) {
+            $scope.filterUniv = angular.fromJson($scope.univModel.university);
 			var firstError = null;
             if (form.$invalid) {
                 var field = null, firstError = null;
@@ -103,7 +117,7 @@ app.controller('report_study_material_statusCtrl', ["$scope", "$filter","$rootSc
             },
             data: {
                 branch : JSON.parse(localStorage.getItem('localObj')).localBranchID,
-                university : $scope.univModel.university.universityID,
+                university : $scope.filterUniv.universityID,
                 batch : $scope.univModel.batch
             }
             
@@ -480,7 +494,7 @@ app.controller('ModalInstanceCtrl1', ["$scope", "$modalInstance", "items1", "Wor
                         assignedTo: myModel.assignedTo,
                         status: myModel.status,
                         referedBy: myModel.referedBy,
-                        comments:"Call Tracking For Report MarkCard Details ",
+                        comments:"Call Tracking For Study Material Status Report ",
                         
                         enquiryStatus:myModel.enquiryStatus,
                         createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID,

Apollo/assets/js/controllers/report_waiver_referalCtrl.js

@@ -49,7 +49,19 @@ app.controller('report_waiver_referalCtrl', ["$scope", "API_POINTS", "$http", "S
                 }
             });
         }
+         //For batch dropdown
+		$scope.$watch('univModel.university', function (newValue,oldValue) {
+            if(newValue==undefined || newValue==''){
+                $scope.filterBatchDetails="";
+				console.log($scope.filterBatchDetails);
+            }
+            else{
+                if(angular.isString(newValue)){
+                    $scope.filterBatchDetails=angular.fromJson(newValue);
+                }
+            }
 
+        });
         $scope.show = false;
         $scope.onSubmit = function (form) {
 			var firstError = null;

Apollo/assets/js/main.js

@@ -14,8 +14,8 @@ function ($rootScope, $state, $stateParams) {
     // set below basic information
     $rootScope.app = {
         name: 'Apollo', // name of your project
-        author: 'Apollo Distance Education Center', // author's name or company name
+        author: 'Apollo Distance Education College', // author's name or company name
-        description: 'Distance Education Center', // brief description
+        description: 'Distance Education College', // brief description
         version: '1.0', // current version
         year: ((new Date()).getFullYear()), // automatic current year (for copyright information)
         isMobile: (function () {// true if the browser is a mobile device

Apollo/assets/views/hallticket/hallTicketPDF.html

@@ -71,7 +71,7 @@
 		<!-- END OF SEMESTER TYPE STUDENTS-->
 		<!-- FOR YEAR TYPE STUDENTS-->
 		
-		<table width="100%" border="1"  ng-if="studentObj.FeeDetails[0]"  ng-if="semDataTypePDF == 'YEAR'" id = "{{studentObj.StudentID}}year1{{$index}}">
+		<table width="100%" border="1"  ng-if="studentObj.FeeDetails[0] && semDataTypePDF == 'YEAR'" id = "{{studentObj.StudentID}}year1{{$index}}">
 			<thead>
 				
 				<tr>
@@ -88,7 +88,7 @@
 		
 		
 		
-		<table width="100%" border="1" ng-if = "studentObj.FeeDetails[1]" and ng-if="semDataTypePDF == 'YEAR'" id = "{{studentObj.StudentID}}year2{{$index}}">
+		<table width="100%" border="1" ng-if = "studentObj.FeeDetails[1] && semDataTypePDF == 'YEAR'" id = "{{studentObj.StudentID}}year2{{$index}}">
 			<thead>
 				
 				<tr>
@@ -105,7 +105,7 @@
 		
 		
 		
-		<table width="100%" border="1" ng-if ="studentObj.FeeDetails[2]" and ng-if="semDataTypePDF == 'YEAR'" id = "{{studentObj.StudentID}}year3{{$index}}">
+		<table width="100%" border="1" ng-if ="studentObj.FeeDetails[2] && semDataTypePDF == 'YEAR'" id = "{{studentObj.StudentID}}year3{{$index}}">
 			<thead>
 				
 				<tr>
@@ -122,11 +122,11 @@
 		
 		
 		
-		<table width="100%" border="1"  ng-if = "studentObj.FeeDetails[3]" and ng-if="semDataTypePDF == 'YEAR'" id = "{{studentObj.StudentID}}year4{{$index}}">
+		<table width="100%" border="1"  ng-if = "studentObj.FeeDetails[3] && semDataTypePDF == 'YEAR'" id = "{{studentObj.StudentID}}year4{{$index}}">
 			<thead>
 				
 				<tr>
-					<th width="5%">Sem/Year</th><th width="10%">Paper Code</th><th>Subject Name</th><th width="5%">Date</th><th width="15%">Time</th><th width="5%">Invigi.sign</th>
+					<th width="5%"><center>Sem/Year</center></th><th width="10%"><center>Paper Code</center></th><th><center>Subject Name</center></th><th width="15%"><center>Date</center></th><th width="20%"><center>Time</center></th><th width="5%"><center>Inv.sign</center></th>
 				</tr>
 				</thead>
 				<tbody>

Apollo/assets/views/login_login.html

@@ -614,7 +614,7 @@ ng-minlength="6" required/>
 
 				<div class="copyright">
 
-					© 2018 Apollo Distance Education Center. All rights reserved
+					© 2018 Apollo Distance Education College. All rights reserved
 
 				</div>
 

Apollo/assets/views/newreg_report.html

@@ -164,13 +164,12 @@
       <table  id="datatable"   class="table table-hover">
          <thead>
             <tr >
+              <th style="font-size: 12px;">Date Of Registration</th>
                <th style="font-size: 12px;">Student Name</th>
                <th style="font-size: 12px;">Father Name</th>
-               <th style="font-size: 12px;">Course</th>
-               <th style="font-size: 12px;">Batch</th>
-            
                <th style="font-size: 12px">University</th>
-               <th style="font-size: 12px;">Date Of Registration</th>
+                <th style="font-size: 12px;">Batch</th>
+               <th style="font-size: 12px;">Course</th>       
                <th style="font-size: 12px;">Mobile</th>
               <!-- <th style="font-size: 12px;">Amount</th>
                <th style="font-size: 12px;">Action</th> -->
@@ -178,13 +177,12 @@
          </thead>
          <tbody dir-paginate="p in newreglist|filter:search:strict|itemsPerPage:10">
             <tr>
+                 <td>{{p.DOJ}}</td>
                 <td>{{p.Firstname}}</td>
                 <td>{{p.Fathername}}</td>
-                <td>{{p.CourseName}}</td>
-                <td>{{p.BatchName}}</td>
-            
                 <td>{{p.UniversityName}}</td>
-                <td>{{p.DOJ}}</td>
+                <td>{{p.BatchName}}</td>
+                <td>{{p.CourseName}}</td>          
                  <td>{{p.MobileNumber}}</td>
                 
             </tr>

Apollo/assets/views/partials/nav.html

@@ -208,11 +208,11 @@
 							Certificate
 						</a>
 					</li>
-					<!--<li ui-sref-active="active">
+					<li ui-sref-active="active">
 						<a ui-sref="app.student.status.application" translate="sidebar.nav.student.status.APPLICATION" ng-click="checkSuperAdmin()">
 							Application
 						</a>
-					</li>-->
+					</li>
 				</ul>
 			</li>
 		</ul>
@@ -671,6 +671,11 @@
 							Certificate
 						</a>
 					</li>
+					<li ui-sref-active="active">
+						<a ui-sref="app.student.status.application" translate="sidebar.nav.student.status.APPLICATION" ng-click="checkAdmin()">
+							Application
+						</a>
+					</li>
 				</ul>
 
 			</li>
@@ -1053,6 +1058,11 @@
 							Certificate
 						</a>
 					</li>
+					<li ui-sref-active="active">
+						<a ui-sref="app.student.status.application" translate="sidebar.nav.student.status.APPLICATION" ng-click="checkStaff()">
+							Application
+						</a>
+					</li>
 				</ul>
 
 			</li>
@@ -1320,6 +1330,11 @@
 							Certificate
 						</a>
 					</li>
+					<li ui-sref-active="active">
+						<a ui-sref="app.student.status.application" translate="sidebar.nav.student.status.APPLICATION" ng-click="checkStaff()">
+							Application
+						</a>
+					</li>
 				</ul>
 
 			</li>

Apollo/assets/views/report_answer_booklets.html

@@ -41,18 +41,24 @@ td,th {
                                     University
                                 </label>
 
-                                <select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" ng-options="details.universityName for details in university" required>
+                                <select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" required>
                                     <option value="" selected>Select University</option>
+                                    <!--details.universityName for details in university-->
+                                    <option ng-repeat="details in university"  value="{{details}}">{{details.universityName}}</option>
+
                                 </select>
                                <span style="color:red;" ng-if="show" ng-show="Form.university.$dirty && Form.university.$error.required">Please select University.</span>
                             </div>
+
                             <div class="col-md-3">
                                 <label for="form-field-select-2">
                                     Batch
                                 </label>
 
-                                <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" ng-options="batchDetails.BatchCode as batchDetails.BatchName for batchDetails in univModel.university.batchDetails" required>
+                                <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" required>
                                     <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>
                             </div>

Apollo/assets/views/report_application_pending.html

@@ -43,18 +43,24 @@
                                     University
                                 </label>
 
-                                <select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" ng-options="details.universityName for details in university" required>
+                                <select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" required>
                                     <option value="" selected>Select University</option>
+                                    <!--details.universityName for details in university-->
+                                    <option ng-repeat="details in university"  value="{{details}}">{{details.universityName}}</option>
+
                                 </select>
                                <span style="color:red;" ng-if="show" ng-show="Form.university.$dirty && Form.university.$error.required">Please select University.</span>
                             </div>
+
                             <div class="col-md-3">
                                 <label for="form-field-select-2">
                                     Batch
                                 </label>
 
-                                <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" ng-options="batchDetails.BatchCode as batchDetails.BatchName for batchDetails in univModel.university.batchDetails" required>
+                                <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" required>
                                     <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>
                             </div>

Apollo/assets/views/report_balance_fee.html

@@ -35,18 +35,24 @@
                                     University
                                 </label>
 
-                                <select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" ng-options="details.universityName for details in university" required>
+                                <select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" required>
                                     <option value="" selected>Select University</option>
+                                    <!--details.universityName for details in university-->
+                                    <option ng-repeat="details in university"  value="{{details}}">{{details.universityName}}</option>
+
                                 </select>
                                <span style="color:red;" ng-if="show" ng-show="Form.university.$dirty && Form.university.$error.required">Please select University.</span>
                             </div>
+
                             <div class="col-md-3">
                                 <label for="form-field-select-2">
                                     Batch
                                 </label>
 
-                                <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" ng-options="batchDetails.BatchCode as batchDetails.BatchName for batchDetails in univModel.university.batchDetails" required>
+                                <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" required>
                                     <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>
                             </div>
@@ -71,10 +77,10 @@
                     <input class="form-control"  type="text" ng-model="search" id="searchIn" autofocus tabindex="2" placeholder="Search" />
                     </div>
 					<div class="col-md-2">
-                    <span>Total Fee:Rs.</span><span>{{gettotal()}}</span>
+                    <span>Total Fee:Rs.</span><span>{{gettotal() || "0"}}</span>
                     </div>
 					<div class="col-md-2">
-                    <span>Paid:Rs.</span><span>{{getpaid()}}</span>
+                    <span>Paid:Rs.</span><span>{{getpaid() || "0"}}</span>
                     </div>
 			
 					<div class="col-md-2">

Apollo/assets/views/report_certificate_status.html

@@ -41,18 +41,26 @@ td,th {
                                     University
                                 </label>
 
-                                <select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" ng-options="details.universityName for details in university">
+                                <select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" required>
                                     <option value="" selected>Select University</option>
+                                    <!--details.universityName for details in university-->
+                                    <option ng-repeat="details in university"  value="{{details}}">{{details.universityName}}</option>
+
                                 </select>
+                                <span style="color:red;" ng-if="show" ng-show="Form.university.$dirty && Form.university.$error.required">Please select University.</span>
                             </div>
+
                             <div class="col-md-4">
                                 <label for="form-field-select-2">
                                     Batch
                                 </label>
 
-                                <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" ng-options="batchDetails.BatchCode as batchDetails.BatchName for batchDetails in univModel.university.batchDetails">
+                                <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" required>
                                     <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>
                             </div>
                         </div>
                         <div class="row">
@@ -94,15 +102,12 @@ td,th {
                                     </div> -->
 
                             <div class="col-md-3" style="padding-top: 2.3%;">
-                                <div >
+                                    <button type="submit" class="btn btn-success btn-o" tabindex="8" ng-disabled="disableSubmit==true">
-
-                                    <button type="submit" class="btn btn-success btn-o" tabindex="8">
                                         Submit
                                     </button>
 
                             </div>
                         </div>
-                        </div>
                         
 
 

Apollo/assets/views/report_document_pending.html

@@ -41,18 +41,24 @@ td,th {
                                     University
                                 </label>
 
-                                <select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" ng-options="details.universityName for details in university" required>
+                                <select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" required>
                                     <option value="" selected>Select University</option>
+                                    <!--details.universityName for details in university-->
+                                    <option ng-repeat="details in university"  value="{{details}}">{{details.universityName}}</option>
+
                                 </select>
                                <span style="color:red;" ng-if="show" ng-show="Form.university.$dirty && Form.university.$error.required">Please select University.</span>
                             </div>
+
                             <div class="col-md-3">
                                 <label for="form-field-select-2">
                                     Batch
                                 </label>
 
-                                <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" ng-options="batchDetails.BatchCode as batchDetails.BatchName for batchDetails in univModel.university.batchDetails" required>
+                                <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" required>
-                                    <option value="" selected >Select Batch</option>
+                                    <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>
                             </div>

Apollo/assets/views/report_exam_writing_fee.html

@@ -41,18 +41,24 @@
                                     University
                                 </label>
 
-                                <select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" ng-options="details.universityName for details in university" required>
+                                <select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" required>
                                     <option value="" selected>Select University</option>
+                                    <!--details.universityName for details in university-->
+                                    <option ng-repeat="details in university"  value="{{details}}">{{details.universityName}}</option>
+
                                 </select>
                                <span style="color:red;" ng-if="show" ng-show="Form.university.$dirty && Form.university.$error.required">Please select University.</span>
                             </div>
+
                             <div class="col-md-3">
                                 <label for="form-field-select-2">
                                     Batch
                                 </label>
 
-                                <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" ng-options="batchDetails.BatchCode as batchDetails.BatchName for batchDetails in univModel.university.batchDetails" required>
+                                <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" required>
                                     <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>
                             </div>

Apollo/assets/views/report_expense.html

@@ -86,6 +86,7 @@
             
         </div>
         <div pdf-save-content="getpdf" class="table-responsive">
+		<h4 style="text-align:center;">Expense Report {{filters.from_date | date : "dd-MM-yyyy"}} To {{filters.to_date | date : "dd-MM-yyyy"}}</h4>
             <table  id="datatable"   class="table table-hover">
                   
                            
@@ -104,7 +105,7 @@
                     <tr>
                         <td>{{p.SL_NO}}</td>
                         <td>{{p.Expense_name}}</td>
-                        <td style ="text-align:center;">{{p.Amount}}</td>
+                        <td style ="text-align:right;">{{p.Amount}}</td>
                        
                     </tr>
                 

Apollo/assets/views/report_mark_certificate_status.html

@@ -41,18 +41,26 @@ td,th {
                                     University
                                 </label>
 
-                                <select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" ng-options="details.universityName for details in university">
+                                <select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" required>
                                     <option value="" selected>Select University</option>
+                                    <!--details.universityName for details in university-->
+                                    <option ng-repeat="details in university"  value="{{details}}">{{details.universityName}}</option>
+
                                 </select>
+                                <span style="color:red;" ng-if="show" ng-show="Form.university.$dirty && Form.university.$error.required">Please select University.</span>
                             </div>
+
                             <div class="col-md-4">
                                 <label for="form-field-select-2">
                                     Batch
                                 </label>
 
-                                <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" ng-options="batchDetails.BatchCode as batchDetails.BatchName for batchDetails in univModel.university.batchDetails">
+                                <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" required>
                                     <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>
                             </div>
                         </div>
                         <div class="row">
@@ -96,7 +104,7 @@ td,th {
                             <div class="col-md-3" style="padding-top: 2.3%;">
                                 <div >
 
-                                    <button type="submit" class="btn btn-success btn-o" tabindex="8">
+                                    <button type="submit" class="btn btn-success btn-o" tabindex="8"  ng-disabled="disableSubmit==true">
                                         Submit
                                     </button>
 

Apollo/assets/views/report_markcardstatus.html

@@ -15,9 +15,6 @@
 	  }
 	   .table>tbody>tr>td { padding: 2px; }
 </style>
-
-
-</script>
 <div class="container-fluid container-fullw bg-white">
     <div ng-controller="report_markcard_statusCtrl" ng-init="filters()">
         <form name="Form" id="form" novalidate ng-submit="onSubmit(Form)" method="post">
@@ -32,18 +29,24 @@
                                     University
                                 </label>
 
-                                <select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" ng-options="details.universityName for details in university" required>
+                                <select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" required>
                                     <option value="" selected>Select University</option>
+                                    <!--details.universityName for details in university-->
+                                    <option ng-repeat="details in university"  value="{{details}}">{{details.universityName}}</option>
+
                                 </select>
                                 <span style="color:red;" ng-if="show" ng-show="Form.university.$dirty && Form.university.$error.required">Please select University.</span>
                             </div>
+
                             <div class="col-md-3">
                                 <label for="form-field-select-2">
                                     Batch
                                 </label>
 
-                                <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" ng-options="batchDetails.BatchCode as batchDetails.BatchName for batchDetails in univModel.university.batchDetails" required>
+                                <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" required>
                                     <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>
                             </div>

Apollo/assets/views/report_studymaterialstatus.html

@@ -29,31 +29,27 @@
                                     University
                                 </label>
 
-                                <select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" ng-options="details.universityName for details in university" required>
+                                <select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" required>
                                     <option value="" selected>Select University</option>
+                                    <!--details.universityName for details in university-->
+                                    <option ng-repeat="details in university"  value="{{details}}">{{details.universityName}}</option>
+
                                 </select>
                                 <span style="color:red;" ng-if="show" ng-show="Form.university.$dirty && Form.university.$error.required">Please select University.</span>
                             </div>
+
                             <div class="col-md-3">
                                 <label for="form-field-select-2">
                                     Batch
                                 </label>
 
-                                <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" ng-options="batchDetails.BatchCode as batchDetails.BatchName for batchDetails in univModel.university.batchDetails" required>
+                                <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" required>
                                     <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>
                             </div>
-                            <!-- <div class="col-md-3">
-                                        <label for="form-field-select-2">
-                                                           Batch
-                                    </label>
-                                       
-                                        <select class="form-control" tabindex="3" class="cs-select cs-skin-elastic" name="batch" ng-model="searchData.Batch" ng-change="getValueChange()">
-                                    <option value="" selected>Select Batch</option>
-                                    <option ng-repeat="itemBatch in batchData"  value="{{itemBatch.BatchCode}}">{{itemBatch.BatchName}}</option>
-                                    </select>
-                                    </div> -->
 
                             <div class="col-md-2" style="padding-top: 2.3%;">
                                 <div class="pull-right">

Apollo/assets/views/report_waiver_referal.html

@@ -39,18 +39,24 @@
                                     University
                                 </label>
 
-                                <select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" ng-options="details.universityName for details in university" required>
+                                <select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" required>
                                     <option value="" selected>Select University</option>
+                                    <!--details.universityName for details in university-->
+                                    <option ng-repeat="details in university"  value="{{details}}">{{details.universityName}}</option>
+
                                 </select>
                                <span style="color:red;" ng-if="show" ng-show="Form.university.$dirty && Form.university.$error.required">Please select University.</span>
                             </div>
+
                             <div class="col-md-3">
                                 <label for="form-field-select-2">
                                     Batch
                                 </label>
 
-                                <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" ng-options="batchDetails.BatchCode as batchDetails.BatchName for batchDetails in univModel.university.batchDetails" required>
+                                <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" required>
                                     <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>
                             </div>

Apollo/assets/views/status-update/application_status.html

@@ -183,17 +183,20 @@
                                                                 <thead style="background-color: cadetblue">
                                                                     <th>Status</th>
                                                                     <th>Comments</th>
-                                                                    <th>Document Name</th>
+                                                                    <th>Batch</th>
                                                                     <th>Date</th>
-                                                                    <th>Updated By</th>
+                                                                    <th>Sem/Year</th>
+                                                                    <th>Form Type</th>
                                                                 </thead>
                                                                 <tbody ng-repeat="s in prevStatusListForStudentCourse">
 
                                                                     <td>{{s.ListName}}</td>
                                                                     <td><span style="white-space:pre-wrap;">{{s.Comments}}</span></td>
-                                                                    <td>{{s.CertificateName}}</td>
+                                                                    <td>{{s.BatchCode}}</td>
-                                                                    <td>{{s.AppDate}}</td>
+                                                                    <td>{{s.StatusUpdateDate}}</td>
-                                                                    <td>{{s.Firstname}}</td>
+                                                                  <td>{{s.Sem_Year}}</td>
+                                                                    <td>{{s.RegistrationType}}</td>
+                                                                    <!--<td>{{s.Firstname}}</td>-->
                                                                 </tbody>
                                                             </table>
                                                         </div>
@@ -214,7 +217,7 @@
                                          <tr ng-show="statusUpdationId ===p.UNI_ID" ng-if="statusUpdationId === p.UNI_ID">
                                             <td colspan="7">
 <div ng-if="OpenWindowStatus">
-                            <div  ng-if="!localTypeSuperAdmin"><form name="Form" id="form" novalidate ng-submit="statusUpdate.submit(Form, myStatusModel , localBranchDetails)" method="post">
+                            <div  ng-if="!localTypeSuperAdmin">
                                 <style>
                                     #cancel_button {
                                         margin-top: 1px;
@@ -237,8 +240,92 @@
                                                   <a id="cancel_button" ng-click="unSelect()" tooltip="Close">
                                                         <span class="glyphicon glyphicon-remove-circle"></span>
                                                         </a>
+                                                </div>
+                                                  <div ng-if="studentFormTypeList">
+                                                         <table class="table table-strip" ng-init="editStatus = false; stufmtype.ID = -1">
+                                                             <thead>
+                                                                 <tr>
+                                                                    <th>id</th>
+                                                                    <th>Batch</th>
+                                                                    <th>Sem/Year</th>
+                                                                    <th>From Type</th>
+                                                                    <th>Action</th>
+                                                                 </tr>
+                                                             </thead>
+                                                             <tbody ng-repeat="stufmtype in studentFormTypeList">
+                                                                 <tr>
+                                                                     <td>{{stufmtype.ID}}</td>
+                                                                     <td>{{stufmtype.BatchCode}}</td>
+                                                                     <td>{{stufmtype.Sem_Year}}</td>
+                                                                     <td>{{stufmtype.RegistrationType}}</td>
+                                                                     <td><i ng-click="statusUpdateView(stufmtype.ID)" tooltip="STATUS UPDATE" class="ti-slice"></i></td>
+                                                                 </tr>
+                                                             <tr ng-if="editStatusID == stufmtype.ID">
+                                                                 <td colspan="6"><form name="Form" id="form" novalidate ng-submit="statusUpdate.submit(Form, localBranchDetails, stufmtype.ID)" method="post">
+                                                                     <div class="container">
+                                                                <div class="row"> {{stufmtype.ID}}
+                                                    <div class="col-md-6 form-group" ng-class="{'has-error':Form.status.$dirty && Form.status.$invalid, 'has-success':Form.status.$valid}">
+                                                        <label for="form-field-select-2">
+                                               Status <span class="symbol required"></span>
+                                                </label>
+
+                                                        <select class="form-control" tabindex="4" class="cs-select cs-skin-elastic" name="status" ng-model="myStatusModel.staus"
+                                                            required>
+                                                <option value="" disabled selected>Select Status</option>
+                                                <option ng-repeat="itemStatus in statusDetailsList"  value="{{itemStatus.ListCode}}">{{itemStatus.ListName}}</option>
+                                                </select>
+                                                        <span class="error text-small block" ng-if="Form.status.$dirty && Form.status.$error.required">Status is Required</span>
+
+                                                    </div>
+                                                    <div data-ng-controller="DatepickerDemoCtrl">
+                                                        <div class="col-md-6 form-group" ng-class="{'has-error':Form.dateofstaus.$dirty && Form.dateofstaus.$invalid, 'has-success':Form.dateofstaus.$valid}">
+                                                            <label>
+                                                Date <span
+                                                    class="symbol required"></span>
+                                            </label>
+                                                            <input type="text" tabindex="6" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="myStatusModel.dateOn"
+                                                                is-open="startOpen" ng-init="startOpen = false" name="dateofstaus"
+                                                                datepicker-options="dateOptions" placeholder="Select Date " close-text="Close"
+                                                                required="required" ng-change="getMaxEndDate(myModel.startDate)"
+                                                            />
+
+                                                          <span class="error text-small block" ng-if="Form.dateofstaus.$dirty && Form.dateofstaus.$invalid" ng-hide="Form.dateofstaus.$error.maxlength">Date is required.</span>
+                                                            <span class="error text-small block" ng-if="Form.dateofstaus.$error.maxlength">Enter a Valid Date</span>
+                                                        </div>
+                                                    </div>
                                                 </div>
                                                   <div class="row">
+                                                    <div class="col-md-6 form-group" ng-class="{'has-error':Form.description.$dirty && Form.description.$invalid}">
+                                                        <label>
+                                               Comments
+                                            </label>
+
+                                                        <textarea type="text" placeholder="Enter Comments" tabindex="7" class="form-control" name="description" ng-model="myStatusModel.comment"
+                                                        />
+                                                        <span class="error text-small block" ng-if="Form.description.$dirty && Form.description.$error.pattern">Invalid Comments</span>
+                                                    </div>
+                                                   
+                                                </div>
+                                                <div class="row">
+                                                    <div class="col-md-12">
+                                                        <div class="pull-right">
+                                                            <button type="submit" ng-disabled="disableButton" tabindex="8" ladda="ldloading1.zoom_in" class="btn btn-wide btn-success"
+                                                                data-style="zoom-in">
+                                               <i class="fa fa-circle-o-notch fa-spin" ng-if="disableButton" style="font-size:14px"></i> Submit
+                                            </button>
+                                                            <button type="reset" tabindex="9" class="btn btn-warning btn-wide" tabindex="9" ng-click="statusUpdate.reset(Form)">
+                                                Reset
+                                            </button>
+                                                        </div>
+                                                    </div>
+                                                                     </div>
+                                                                     </form>
+                                                                 </td>
+                                                             </tr>
+                                                             </tbody>
+                                                         </table>
+                                                     </div>
+                                                <!--<div class="row">
                                                     <div class="col-md-6 form-group" ng-class="{'has-error':Form.certificatetype.$dirty && Form.certificatetype.$invalid, 'has-success':Form.certificatetype.$valid}">
                                                         <label for="form-field-select-2">
                                                Certificate Type <span class="symbol required"></span>
@@ -316,7 +403,7 @@
                                             </button>
                                                         </div>
                                                     </div>
-                                                </div>
+                                                </div>-->
                                             </fieldset>
                                         </div>
                                         <div class="col-md-3">
@@ -324,8 +411,8 @@
                                         </div>
                                     </div>
                                 </div>
-                            </form></div>
+                           </div>
-                            <div  ng-if="localTypeSuperAdmin"><form name="Form" id="form" novalidate ng-submit="statusUpdate.submit(Form, myStatusModel , localBranchDetails)" method="post">
+                            <div  ng-if="localTypeSuperAdmin">
                                 <style>
                                     #cancel_button {
                                         margin-top: 1px;
@@ -349,7 +436,92 @@
                                                         <span class="glyphicon glyphicon-remove-circle"></span>
                                                         </a>
                                                 </div>
+                                                     <!--<pre>{{studentFormTypeList | json}}</pre>-->
+                                                     <div ng-if="studentFormTypeList">
+                                                         <table class="table table-strip" ng-init="editStatus = false; stufmtype.ID = -1">
+                                                             <thead>
+                                                                 <tr>
+                                                                    <th>id</th>
+                                                                    <th>Batch</th>
+                                                                    <th>Sem/Year</th>
+                                                                    <th>From Type</th>
+                                                                    <th>Action</th>
+                                                                 </tr>
+                                                             </thead>
+                                                             <tbody ng-repeat="stufmtype in studentFormTypeList">
+                                                                 <tr>
+                                                                     <td>{{stufmtype.ID}}</td>
+                                                                     <td>{{stufmtype.BatchCode}}</td>
+                                                                     <td>{{stufmtype.Sem_Year}}</td>
+                                                                     <td>{{stufmtype.RegistrationType}}</td>
+                                                                     <td><i ng-click="statusUpdateView(stufmtype.ID)" tooltip="STATUS UPDATE" class="ti-slice"></i></td>
+                                                                 </tr>
+                                                             <tr ng-if="editStatusID == stufmtype.ID">
+                                                                 <td colspan="6"><form name="Form" id="form" novalidate ng-submit="statusUpdate.submit(Form, localBranchDetails, stufmtype.ID)" method="post">
+                                                                     <div class="container">
                                                                 <div class="row">
+                                                    <div class="col-md-6 form-group" ng-class="{'has-error':Form.status.$dirty && Form.status.$invalid, 'has-success':Form.status.$valid}">
+                                                        <label for="form-field-select-2">
+                                               Status <span class="symbol required"></span>
+                                                </label>
+
+                                                        <select class="form-control" tabindex="4" class="cs-select cs-skin-elastic" name="status" ng-model="myStatusModel.staus"
+                                                            required>
+                                                <option value="" disabled selected>Select Status</option>
+                                                <option ng-repeat="itemStatus in statusDetailsList"  value="{{itemStatus.ListCode}}">{{itemStatus.ListName}}</option>
+                                                </select>
+                                                        <span class="error text-small block" ng-if="Form.status.$dirty && Form.status.$error.required">Status is Required</span>
+
+                                                    </div>
+                                                    <div data-ng-controller="DatepickerDemoCtrl">
+                                                        <div class="col-md-6 form-group" ng-class="{'has-error':Form.dateofstaus.$dirty && Form.dateofstaus.$invalid, 'has-success':Form.dateofstaus.$valid}">
+                                                            <label>
+                                                Date <span
+                                                    class="symbol required"></span>
+                                            </label>
+                                                            <input type="text" tabindex="6" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="myStatusModel.dateOn"
+                                                                is-open="startOpen" ng-init="startOpen = false" name="dateofstaus"
+                                                                datepicker-options="dateOptions" placeholder="Select Date " close-text="Close"
+                                                                required="required" ng-change="getMaxEndDate(myModel.startDate)"
+                                                            />
+
+                                                          <span class="error text-small block" ng-if="Form.dateofstaus.$dirty && Form.dateofstaus.$invalid" ng-hide="Form.dateofstaus.$error.maxlength">Date is required.</span>
+                                                            <span class="error text-small block" ng-if="Form.dateofstaus.$error.maxlength">Enter a Valid Date</span>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                                  <div class="row">
+                                                    <div class="col-md-6 form-group" ng-class="{'has-error':Form.description.$dirty && Form.description.$invalid}">
+                                                        <label>
+                                               Comments
+                                            </label>
+
+                                                        <textarea type="text" placeholder="Enter Comments" tabindex="7" class="form-control" name="description" ng-model="myStatusModel.comment"
+                                                        />
+                                                        <span class="error text-small block" ng-if="Form.description.$dirty && Form.description.$error.pattern">Invalid Comments</span>
+                                                    </div>
+                                                   
+                                                </div>
+                                                <div class="row">
+                                                    <div class="col-md-12">
+                                                        <div class="pull-right">
+                                                            <button type="submit" ng-disabled="disableButton" tabindex="8" ladda="ldloading1.zoom_in" class="btn btn-wide btn-success"
+                                                                data-style="zoom-in">
+                                               <i class="fa fa-circle-o-notch fa-spin" ng-if="disableButton" style="font-size:14px"></i> Submit
+                                            </button>
+                                                            <button type="reset" tabindex="9" class="btn btn-warning btn-wide" tabindex="9" ng-click="statusUpdate.reset(Form)">
+                                                Reset
+                                            </button>
+                                                        </div>
+                                                    </div>
+                                                                     </div>
+                                                                     </form>
+                                                                 </td>
+                                                             </tr>
+                                                             </tbody>
+                                                         </table>
+                                                     </div>
+                                                <!--<div class="row">
                                                     <div class="col-md-6 form-group" ng-class="{'has-error':Form.certificatetype.$dirty && Form.certificatetype.$invalid, 'has-success':Form.certificatetype.$valid}">
                                                         <label for="form-field-select-2">
                                                Certificate Type <span class="symbol required"></span>
@@ -428,7 +600,7 @@
                                             </button>
                                                         </div>
                                                     </div>
-                                                </div>
+                                                </div>-->
                                             </fieldset>
                                         </div>
                                         <div class="col-md-3">
@@ -436,7 +608,7 @@
                                         </div>
                                     </div>
                                 </div>
-                            </form></div>
+                            </div>
                             
                         </div>
                                             </td>