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

Apollo/api/application/config/database.php

@@ -76,12 +76,12 @@ $query_builder = TRUE;
 $db['default'] = array(
 	'dsn'	=> '',
 	'hostname' => 'apollodec.com',
-	// 'username' => 'apollod4_SIT',
+	 'username' => 'apollod4_SIT',
-	// 'password' => 'apollosit1234',
+	 'password' => 'apollosit1234',
-	// 'database' => 'apollod4_ApolloDECNEWSIT',
+	 'database' => 'apollod4_ApolloDECNEWSIT',
-	'username' => 'apollod4_DEV',
+	// 'username' => 'apollod4_DEV',
-	'password' => 'apollo1234',
+	// 'password' => 'apollo1234',
-	'database' => 'apollod4_ApolloDECDev',
+	// 'database' => 'apollod4_ApolloDECDev',
 	'dbdriver' => 'mysqli',
 	'dbprefix' => '',
 	'pconnect' => FALSE,

Apollo/api/application/controllers/Call_Tracking_Controller.php

@@ -415,13 +415,14 @@ class Call_Tracking_Controller extends REST_Controller {
     */
     public function autoAddlead_post(){
         $student = $this->post('student');
-        //print_r($student);die;
+		$comments = $this->post('comments');
+        //print_r($comments);die;
         if(!empty($student)){
         $now = new DateTime();
     $now->setTimezone(new DateTimezone('Asia/Kolkata'));
     //store lead details
     $Student_Id = '';
-    foreach($student as $student){
+    foreach($student as $index =>$student){
         
         
     $lead_details['LeadName'] = $student['Student_name'];
@@ -444,11 +445,12 @@ class Call_Tracking_Controller extends REST_Controller {
     $tracking_details['CreatedBranch'] = $this->post('branchId');
     //store tracking followup details
     $tracking_followup_details['FollowupOn'] = $this->post('date');
-    $tracking_followup_details['FollowupComments'] = $this->post('comments');
+    $tracking_followup_details['FollowupComments'] = $comments[$index];
     
     $tracking_followup_details['StatusName'] = $this->post('status');
     $tracking_followup_details['AssignedStaff'] = $this->post('assignedTo');
     //print_r(array($lead_details,$tracking_details,$tracking_followup_details));
+	
     $leadDetails['leadDetails'] = $this->Calltracking_model->getaddautocall($lead_details,$tracking_details,$tracking_followup_details,$CreatedBy);// Check if the users data store contains users (in case the database result returns NULL)
         
         

Apollo/api/application/controllers/HallTickets_Controller.php

@@ -317,7 +317,8 @@ class HallTickets_Controller extends REST_Controller {
 	{
 		$schedulearray = $this->post('updatescheduledetails');
 		$updateBy = $this->post('createdBy');
-		$res = $this->Hallticket_model->scheduleUpdate($schedulearray,$updateBy);
+		$scheduleID = $this->post('scheduleID');
+		$res = $this->Hallticket_model->scheduleUpdate($schedulearray,$updateBy,$scheduleID);
 		if(count($res) > 0 )
 		{
 				

Apollo/api/application/controllers/University_Controller.php

@@ -34,7 +34,7 @@ class University_Controller extends REST_Controller {
         $this->methods['updateDefaultActivityDetails_post']['limit'] = 100;
 
         // load the university model 
-        $this->load->model('Universityfile_model', 'universityfile_model');
+        $this->load->model('University_model', 'university_model');
     }
 
     // get university details
@@ -43,7 +43,7 @@ class University_Controller extends REST_Controller {
         $loginUserId = $reqData['localUserID'];
         $loginUserBranchId = $reqData['localBranchID'];
         $loginUserType = $reqData['localType'];
-        $getUniversityListDetails = $this->universityfile_model->get_university_list($loginUserBranchId);// Check if the employee exist
+        $getUniversityListDetails = $this->university_model->get_university_list($loginUserBranchId);// Check if the employee exist
             if ($getUniversityListDetails)
             {
                 $getUniversityListDetails['status'] = REST_Controller::HTTP_OK;

Apollo/api/application/models/Hallticket_model.php

@@ -791,11 +791,12 @@ class Hallticket_model extends CI_Model
 				else if(strcasecmp($ind['Type'],'sem') == 0  && strcasecmp($ind['SubType'],'year') == 0)
 				{
 					//GET Year Based Semester
+
 					if($ind['SemID'] == 1)//First Year
 					{
-						$i = 1;
+						//$i = 1;
-						// for($i = 1;$i <= 1; $i++)
+						for($i = 1;$i <= 1; $i++)
-						// {
+						{
 							$sql = "SELECT T_SemSubMap_Child.SubjectID,T_SubjectMaster.SubjectCode,T_SubjectMaster.SubjectName,T_SemSubMap_Master.SemesterID,T_Batch_Schedule_Child.ScheduleDate,T_Batch_Schedule_Child.FromTime,T_Batch_Schedule_Child.ToTime FROM T_SemSubMap_Child
 									JOIN T_SubjectMaster on T_SemSubMap_Child.SubjectID = T_SubjectMaster.SubjectID
 									JOIN T_SemSubMap_Master on T_SemSubMap_Child.MapID = T_SemSubMap_Master.MapID and T_SemSubMap_Master.UniversityID = ? and T_SemSubMap_Master.CourseID = ? and T_SemSubMap_Master.SemesterID = ? and T_SemSubMap_Master.BranchCode = ? and T_SemSubMap_Child.IsActive = 1 
@@ -808,7 +809,7 @@ class Hallticket_model extends CI_Model
 							//array_push($id['FeeDetails'][$key2],$ind);
 							
 							
-						// }
+						}
 					array_splice($id['FeeDetails'][$key2],0,6,$in1);
 
 					}
@@ -1248,9 +1249,9 @@ class Hallticket_model extends CI_Model
 
 
 	}
-	public function scheduleUpdate($schedulearray,$up)
+	public function scheduleUpdate($schedulearray,$up,$scheduleID)
 	 {
-		
+		//print_r($schedulearray);die();
 		 $MasterID = "";
 		 foreach($schedulearray as $shed)
 		 {
@@ -1259,7 +1260,7 @@ class Hallticket_model extends CI_Model
 		 $sudate = $shed['scheduleDate'];
          $SubDate = date("Y-m-d", strtotime($sudate));	 
 		 $MasterID = $shed['SchId'];
-		 //echo $SchId;
+		
 		 $SubjectID = $shed['SubjectID'];
 		 $scheduleStart = $shed['scheduleStart'];
 		 $scheduleEnd = $shed['scheduleEnd'];
@@ -1268,17 +1269,19 @@ class Hallticket_model extends CI_Model
 		    {
 				
 			$schedulchildUpdate = array('ScheduleDate'=>$SubDate,'FromTime'=>$scheduleStart,'ToTime'=>$scheduleEnd); 
-                   //print_r($schedulchild);
+                   
             		$this->db->trans_start();
 					$this->db->where('T_Batch_Schedule_Child.SchChildId',$ChildID);
 					$this->db->where('T_Batch_Schedule_Child.SubjectID',$SubjectID);
+					$this->db->where('T_Batch_Schedule_Child.SchId',$MasterID);
 					$this->db->update('T_Batch_Schedule_Child',$schedulchildUpdate);
 					$this->db->trans_complete();
 					
 			} 
 			else
 			{
-			        $schedulchildInsert = array('SchId'=>$MasterID,'SubjectID'=>$SubjectID,'ScheduleDate'=>$SubDate,'FromTime'=>$scheduleStart,'ToTime'=>$scheduleEnd,'IsActive'=>$isactive);
+				  
+			        $schedulchildInsert = array('SchId'=>$scheduleID,'SubjectID'=>$SubjectID,'ScheduleDate'=>$SubDate,'FromTime'=>$scheduleStart,'ToTime'=>$scheduleEnd,'IsActive'=>$isactive);
                     $this->db->trans_start();
 					$this->db->insert('T_Batch_Schedule_Child',$schedulchildInsert);
 					$this->db->trans_complete();	

Apollo/api/application/models/Reports_model.php

@@ -250,49 +250,46 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen
     }
     public function mark_cert_status($bat=null,$br=null,$u=null,$from=null,$to=null){
        
-        $sql = "select ifnull(sms.sid,'-') as Student_id,ifnull(scd.eid,'-') as Enrollment_id,ifnull(std.name,'-') as Student_name,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(sms.cid,'-') as Course_id,ifnull(sfs.batch,'-') as Batch_code,ifnull(sms.branch,'-') as Branch_code,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(sfp.bdate,'-') as Document_fee_paid_date,ifnull(((sfs.cf + sfs.stf + sfs.others)-sum(sfp.bamount)),0) as Balance_fee,ifnull(cfd.syear,'-') as Sem_year,ifnull(sms.sem,'-') as Sem,ifnull(list.status,'-') as Markcard_status,ifnull(sms.mdate,'-') as Markcard_date,ifnull(sms.mcmts,'-') as Markcard_comments,ifnull(ams.certname,'-') as Certificate_name,ifnull(alist.astatus,'-') as Certificate_status,ifnull(ams.adate,'-') as Certificate_date,ifnull(ams.acmts,'-') as Certificate_comments,ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber 
+        $sql = "select ifnull(sms.sid,'-') as Student_id,ifnull(scd.eid,'-') as Enrollment_id,ifnull(std.name,'-') as Student_name,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(sms.cid,'-') as Course_id,ifnull(sfs.batch,'-') as Batch_code,ifnull(sms.branch,'-') as Branch_code,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(sfp.bdate,'-') as Document_fee_paid_date,ifnull(((sfs.cf + sfs.stf + sfs.others)-sum(sfp.bamount)),0) as Balance_fee,ifnull(cfd.syear,'-') as Sem_year,ifnull(sms.idate,'-') as idate,ifnull(sms.istatus,'-') as istatus,ifnull(sms.rdate,'-') as rdate,ifnull(sms.rstatus,'-') as rstatus,ifnull(sms.acmts,'-') as cmnts,sms.certname as Certificate_name
         from 
-		 (SELECT ID,StudentID as sid,CourseID as cid,BranchCode as branch,ListCode as lcode,             
+		 (SELECT c.ID as id,StudentID as sid,c.CourseID as cid,c.BranchCode as branch,c.ListCode as lcode,p.ListName as status,c.CertificationType as ctype,c.CDate as adate,c.Comments as acmts,c.CertificationType as certname,if(max(p.ListName)='ISSUED TO STUDENT',p.ListName,'-') as istatus,if(max(p.ListName)='ISSUED TO STUDENT',c.CDate,'-') as idate,if(max(p.ListName)='RECEIVED',p.ListName,'-') as rstatus,if(max(p.ListName)='RECEIVED',c.CDate,'-') as rdate 
-         CertificationType as ctype,CDate as mdate,Sem as sem,Comments as mcmts 
+FROM T_CertificationStatus c
-	    FROM T_CertificationStatus  
+ left join T_PickListDetails p on p.ListCode=c.ListCode
-		WHERE ID IN (SELECT max(ID) FROM T_CertificationStatus group by StudentID,CourseID,BranchCode,Sem)
+ left join T_CertificationMaster cm on cm.CertificationID=c.CertificationType
-		group by sid,sem,cid,lcode,branch) as sms
+WHERE c.ID IN (SELECT max(ID) FROM T_CertificationStatus group by StudentID,CourseID,BranchCode,Sem,CertificationType)
-left join
+ and (p.ListName like 'ISSUED TO STUDENT' or p.ListName like 'RECEIVED') 
-        (SELECT ID,StudentID as sid,CourseID as cid,app.BranchCode as branch,ListCode as lcode,AppDate as        adate,Comments as acmts,CertificationType as ctype,CertificateName as certname 
+group by sid,sem,cid,branch,ctype
+union
+SELECT app.ID as id,app.StudentID as sid,app.CourseID as cid,app.BranchCode as branch,app.ListCode as lcode,p.ListName as status,app.CertificationType as ctype,app.AppDate as adate,app.Comments as acmts,cm.CertificateName as certname,if(max(p.ListName)='ISSUED TO STUDENT',p.ListName,'-') as istatus,if(max(p.ListName)='ISSUED TO STUDENT',app.AppDate,'-') as idate,if(max(p.ListName)='RECEIVED',p.ListName,'-') as rstatus,if(max(p.ListName)='RECEIVED',app.AppDate,'-') as rdate  
 		FROM T_ApplicationStatus as app
         left join T_CertificationMaster cm on cm.CertificationID=app.CertificationType
-        where CertificationType != 'CERT024' and ID IN (SELECT max(ID) FROM T_ApplicationStatus group by        StudentID,CourseID,BranchCode)
+        left join T_PickListDetails p on p.ListCode=app.ListCode
-        group by sid,cid,lcode,branch) 
+        where CertificateName not like 'APPLICATION%' and ID IN (SELECT max(ID) FROM T_ApplicationStatus group by        StudentID,CourseID,BranchCode,CertificationType) and (p.ListName like 'ISSUED TO STUDENT' or p.ListName like 'RECEIVED') 
-    as ams on ams.branch=sms.branch and ams.sid=sms.sid
+        group by sid,cid,lcode,branch,ctype) as sms 
+
 left join 
-        (SELECT FeesID as fid,BatchCode as batch,StudentID as sid,CourseID as cid,FeesType as ftype,         sum(CourseFees) as cf,Sum(STFOrWR) as stf,sum(Others) as others 
+        (SELECT FeesID as fid,BatchCode as batch,StudentID as sid,CourseID as cid,FeesType as ftype,sum(CourseFees) as cf,Sum(STFOrWR) as stf,sum(Others) as others 
         FROM T_Students_Fees_Status
         group by sid,fid,cid,batch) 
-    as sfs on sfs.sid=sms.sid and sms.cid=sfs.ftype
+    as sfs on sfs.sid=sms.sid and sfs.cid=sms.cid
 left join
         (SELECT StudentID as sid,FeesId as fid,BillDate as bdate,sum(BillAmount) as bamount,BillNO as billno        FROM T_Students_Fees_PaidDetails
 where IsActive = 1
         group by sid,fid,billno) 
-    as sfp on sfp.sid=sfs.sid and sfp.fid=sfs.fid
+    as sfp on sfp.sid=sms.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=sms.cid
-left join 
-        (SELECT ListCode as lcode,ListName as status FROM T_PickListDetails) 
-    as list on list.lcode=sms.lcode
-left join 
-        (SELECT ListCode as lcode,ListName as astatus FROM T_PickListDetails) 
-    as alist on alist.lcode=ams.lcode
 left join
         (SELECT CourseID as cid,cm.UniversityID as cuid,u.UniversityID as uid,CourseName as course,     
         UniversityName as uname,cm.BranchCode as branch FROM T_CourseMaster as cm 
         left join T_UniversityMaster as u on u.UniversityID=cm.UniversityID 
         group by cid
         order by CourseID) 
-    as cm on cm.cid=cfd.ccid
+    as cm on cm.cid=sms.cid
 left join 
         (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,FirstName as name,Fathername as father,PermanentAddress as address,AlternateNumber FROM T_StudentDetails) as std on std.sid=sms.sid
-left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,EnrollmentID as eid,BranchID as branch FROM T_Student_CourseDetails) as scd on scd.sid=sms.sid
+left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,EnrollmentID as eid,BranchID as branch FROM T_Student_CourseDetails) as scd on scd.sid=sms.sid and scd.cid=sms.cid
-       where std.active = 1 and sms.branch = '".$br."'     
+      where std.active = 1   and sms.branch = '".$br."'     
         ";
        
         if ($bat!= ''){
@@ -314,7 +311,7 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen
         
         }
         
-          $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_year,Certificate_name";
           
           
         $leadDet=$this->db->query($sql);
@@ -498,19 +495,16 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen
     }
     public function doc_pending($bat=null,$br=null,$u=null){
        
-        $sql = "select ifnull(sms.sid,'-') as Student_id,ifnull(scd.eid,'-') as Enrollment_id,ifnull(std.name,'-') as Student_name,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(sms.cid,'-') as Course_id,ifnull(cfd.syear,'-') as Sem_year,ifnull(sfs.batch,'-') as Batch_code,ifnull(sms.branch,'-') as Branch_code,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(sms.status,'-') as Status,sms.certname as certname,ifnull(sfp.bdate,'-') as Admission_date,sms.adate,
+        $sql = "select ifnull(sms.sid,'-') as Student_id,ifnull(scd.eid,'-') as Enrollment_id,ifnull(std.name,'-') as Student_name,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(sfs.cid,'-') as Course_id,ifnull(sfs.batch,'-') as Batch_code,ifnull(sfs.branch,'-') as Branch_code,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(sms.status,'-') as Status,sms.certname as certname,ifnull(sfp.bdate,'-') as Admission_date,sms.follow_date as fdate
-        ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber
         from 
-			 (SELECT ID,StudentID as sid,CourseID as cid,app.BranchCode as branch,list.ListName as status,app.ListCode as lcode,AppDate as adate,Comments as acmts,CertificationType as ctype,CertificateName as certname FROM T_ApplicationStatus as app
+			 (select StudentID as sid,Details as certname,DocumentDate as follow_date,StatusName as status
-left join T_CertificationMaster cm on cm.CertificationID=app.CertificationType
+from T_Student_DocumentTrack_Details
-left join T_PickListDetails list on list.ListCode=app.ListCode
+where StatusName not like 'CLOSED') as sms
-where list.ListName = 'PENDING' and ID IN (SELECT max(ID) FROM T_ApplicationStatus group by StudentID,CourseID,BranchCode)
-group by sid,cid,lcode,branch) as sms
 left join 
-        (SELECT FeesID as fid,BatchCode as batch,StudentID as sid,CourseID as cid,FeesType as ftype,         sum(CourseFees) as cf,Sum(STFOrWR) as stf,sum(Others) as others 
+        (SELECT FeesID as fid,BatchCode as batch,StudentID as sid,CourseID as cid,FeesType as ftype,BranchCode as branch
         FROM T_Students_Fees_Status
         group by sid,fid,cid,batch) 
-    as sfs on sfs.sid=sms.sid and sms.cid=sfs.cid
+    as sfs on sfs.sid=sms.sid
 left join
         (SELECT ID,StudentID as sid,FeesId as fid,BillDate as bdate,sum(BillAmount) as bamount,BillNO as billno        FROM T_Students_Fees_PaidDetails
 WHERE IsActive = 1 and ID IN (SELECT min(ID) FROM T_Students_Fees_PaidDetails group by StudentID,FeesID)
@@ -527,8 +521,8 @@ left join
     as cm on cm.cid=cfd.ccid
 left join 
         (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,FirstName as name,Fathername as father,PermanentAddress as address,AlternateNumber FROM T_StudentDetails) as std on std.sid=sms.sid
-left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,EnrollmentID as eid,BranchID as branch FROM T_Student_CourseDetails) as scd on scd.sid=sms.sid and scd.cid=sms.cid and scd.branch=sms.branch
+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 
-       where std.active = 1 and sms.branch = '".$br."'
+       where std.active = 1  and sfs.branch = '".$br."'
 
         ";
       
@@ -542,7 +536,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,Sem_year ";
+        $sql.="group by Student_id,Course_id,Batch_code,Branch_code";
         
           
           

Apollo/api/application/models/StatusUpdation_model.php

@@ -222,7 +222,7 @@ class StatusUpdation_model extends CI_Model {
                 $results['preStatusDetails'] = false;
                 $results['message'] = 'No record found';
             }
-        } else if ($reqDetailsFor == 'APPICATION_STATUS') {
+        } else if ($reqDetailsFor == 'CERTIFICATE_STATUS') {
             $searchFor = 'A001';
             $searchTableFor = APPLICATION_STATUS;
             $this->db->select('t1.*, t4.Firstname, t5.ListName, t6.CertificateName');
@@ -318,7 +318,8 @@ class StatusUpdation_model extends CI_Model {
                     $getSemYearMsg = $this->get_couser_sem_yr_msg($arr[0]['CourseID']);
                     $getSemYearANDType = "$getSemYearMsg  $cerNamtToMsg";
                     // $mesg = "Status Update : $cerNamtToMsg $getSemYearMsg - $statuToMsg $dateToMsg.";
-                    $mesg = "$cerNamtToMsg Received - Dear $studentName, Your $getSemYearANDType had been received.";
+                    // $mesg = "$cerNamtToMsg Received - Dear $studentName, Your $getSemYearANDType had been received.";
+                    $mesg = "Answer booklet Received - Dear $studentName, Your  answer booklet for $getSemYearANDType has been received.";
                     $this->smssend($arr, $mesg);
                     $this->mailsend($arr, $mesg, $cerNamtToMsg);
                     $result['addStatus'] = true;
@@ -590,11 +591,11 @@ class StatusUpdation_model extends CI_Model {
         $this->load->library('email');
         //SMTP & mail configuration
         $config = array(
-            'protocol'  => 'ssmtp',
+            'protocol'  => 'smtp',
-            'smtp_host' => 'ssl://smtp.example.com',
+            'smtp_host' => 'smtp.sendgrid.net',
             'smtp_port' => 465,
-            'smtp_user' => 'noreply@apollodec.com',
+            'smtp_user' => 'apikey',
-            'smtp_pass' => 'Apollo@123',
+            'smtp_pass' => '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',
             'mailtype'  => 'html',
             'charset'   => 'utf-8'
         );
@@ -611,7 +612,7 @@ class StatusUpdation_model extends CI_Model {
         $subj = $sub;
         $this->email->subject($subj);
         $this->email->message($htmlContent);
-        //Send email
+        //Send email 1
         $result = $this->email->send();
         //  echo $this->email->print_debugger(); exit();
         return $result;

Apollo/assets/i18n/en.json

@@ -105,7 +105,8 @@
           "STUDYMATERIAL": "STUDY MATERIAL",
           "ANSWERBOOKLET": "ANSWER BOOKLET",
           "MARKCARD": "MARK CARD",
-          "CERTIFICATE" : "CERTIFICATE"
+          "CERTIFICATE" : "CERTIFICATE",
+          "APPLICATION": "APPLICATION"
         }
       },
       "status": {

Apollo/assets/js/config.constant.js

@@ -157,6 +157,10 @@ app.constant('JS_REQUIRES', {
         * student Certification status updation
         * */
         'markcardStatusCtrl': 'assets/js/controllers/markcardStatusCtrl.js',
+          /*
+        * student Application status updation
+        * */
+        'applicationStatusCtrl': 'assets/js/controllers/applicationStatusCtrl.js',
          /*
         * student Certification status updation
         * */

Apollo/assets/js/config.router.js

@@ -333,6 +333,15 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com
                     label: 'Certificate Status'
                 },
                 // resolve: loadSequence('wizardCtrl')
+            }).state('app.student.status.application', {
+                url: '/application',
+                templateUrl: "assets/views/status-update/application_status.html",
+                title: 'Application Status',
+                resolve: loadSequence('ui.select','spin', 'ui.mask', 'spin', 'ladda', 'angular-ladda', 'ngTable', 'applicationStatusCtrl'),
+                ncyBreadcrumb: {
+                    label: 'Application Status'
+                },
+                // resolve: loadSequence('wizardCtrl')
             }).state('app.status.application', {
                 url: '/application',
                 templateUrl: "assets/views/form_elements.html",

Apollo/assets/js/controllers/activityCtrl.js

@@ -170,7 +170,7 @@ swal("Warning!", "Status are required", "warning");
      var logcheck = JSON.parse(localStorage.getItem('localObj'));
 
      const LOCALTYPE = logcheck.localType;
-        if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { 
+        if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE =='R002' || LOCALTYPE =='R005' )) { 
             console.log("if");
         }else {
             if(logcheck != null && LOCALTYPE !='R001') {

Apollo/assets/js/controllers/announcementCtrl.js

@@ -199,7 +199,7 @@ app.controller("CkeditorCtrl", ["$scope", "toaster", "$filter", "ngTableParams",
           var logcheck = JSON.parse(localStorage.getItem('localObj'));
 
      const LOCALTYPE = logcheck.localType;
-        if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { 
+        if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE =='R005' )) { 
             console.log("if");
         }else {
             if(logcheck != null && LOCALTYPE !='R001') {

Apollo/assets/js/controllers/applicationStatusCtrl.js

@@ -0,0 +1,610 @@
+'use strict';
+/*** controller for Wizard Form example***/
+app.controller('applicationStatusCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "API_POINTS", "$http", "SweetAlert", "$state", 'md5', 'ipCookie', 'dateListDescService', function ($scope, toaster, $filter, ngTableParams, apiPoint, $http, SweetAlert, $state, md5, ipCookie ,dateListDescService) {
+
+    /**
+    * Application status update search / Document status update
+    * by : kdk
+    */
+
+    $scope.sort = function (keyname) {
+        $scope.sortKey = keyname;   //set the sortKey to the param passed
+        $scope.reverse = !$scope.reverse; //if true make it false and vice versa
+    }
+
+    $scope.editId = -1;
+    $scope.setEditId = function (P) {
+        // alert(P);
+         $scope.statusUpdationId = -1;
+        $scope.editId = P;
+    }
+    $scope.cancel = function () {
+        $scope.editId = -1;
+    }
+
+
+
+    // get local client details
+    var localDetail = JSON.parse(localStorage.getItem('localObj'));
+    var localDetails = ipCookie('cookiechk');
+    
+    const localUpdateStatus = 'APPLICATIONFORM_STATUS';
+     $scope.localTypeSuperAdmin = false;
+        $scope.localBranchDetails = '';
+
+    $scope.init = function () {
+
+    //     var logcheck = JSON.parse(localStorage.getItem('localObj'));
+
+    //  const LOCALTYPE = logcheck.localType;
+    //     if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { 
+    //         console.log("if");
+    //     }else {
+    //         if(logcheck != null && LOCALTYPE !='R001') {
+    //          console.log("else if");
+    //             $state.go('app.dashboard');
+    //         } else {
+
+    //             console.log("else else");
+    //             //ipCookie.remove('cookiechk');
+    //             window.localStorage.clear();
+    //             $state.go('login.signin');
+    //         }
+    //     }
+
+         if (localDetail != null) {
+                if (localDetails.localType === 'R004') {
+                    $scope.localTypeSuperAdmin = true;
+                    $scope.getUniversityList();
+                    $scope.getBranchList();
+                    getCertificateDetailsList();
+                } else {
+                    $scope.getUniversityList();
+                    getCertificateDetailsList();
+                }
+            } else {
+            }
+    }
+
+           $scope.getBranchList = function () {
+            $scope.loader = true;
+            var empListreq = {
+                method: 'POST',
+                url: apiPoint.url + 'getBranchListDetails/',
+                headers: {
+                    'Content-Type': 'application/json'
+                },
+                data: {
+                    data: localDetails
+                }
+            };
+            $http(empListreq).then(function (response) {
+                if (response.data.branDetailstatus) {
+                    $scope.loader = false;
+                    $scope.branchList_data = response.data.branch_details;
+                } else {
+                }
+            });
+        }
+
+
+
+    $scope.searchData = {
+        'University': '',
+        'Course': '',
+        'Batch': '',
+        'Mobile': '',
+        'Name': ''
+    }
+
+    $scope.myStatusModel = {
+        'semYear': '',
+        'staus': '',
+        'dateOn': '',
+        'comment': '',
+        'certificatetype': '',
+        'certificateNumber': ''
+    }
+
+    // get university list while page is loading
+    $scope.universityData = '';
+    $scope.getUniversityList = function () {
+        var empListreq = {
+            method: 'POST',
+            url: apiPoint.url + 'getUniveCourseBratch/',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            data: {
+                data: localDetails
+            }
+        };
+        $http(empListreq).then(function (response) {
+            if (response.data.univList) {
+                $scope.universityData = response.data.university_details;
+            } else {
+            }
+        });
+    };
+
+    $scope.getUniveId = function (univ) {
+        let name = JSON.parse(univ);
+        $scope.searchData.University = name.UniversityID;
+        $scope.searchData.Course = '';
+        $scope.searchData.Batch = '';
+        $scope.courseData = name.Course;
+        $scope.batchData = name.Batch;
+        //call service for array list in desc order based on date
+        angular.forEach($scope.batchData,function (values,key) {
+            var parts = values.BatchDate.split("-");
+            values.givenDateObject=new Date(parts[2], parts[1] - 1, parts[0]);
+        });
+        $scope.batchData=dateListDescService.getOrderByList($scope.batchData);
+        // end
+        $scope.OpenWindowStatus = false;
+        $scope.getSearch();
+    };
+
+    $scope.getValueChange = function () {
+        $scope.getSearch();
+    }
+
+    $scope.searchResultDetails = '';
+    $scope.searchLoading = false;
+    $scope.searchResultLength = 0;
+    // get student list From the searching data
+    $scope.getSearch = function () {
+        $scope.OpenWindowStatus = false;
+        $scope.searchLoading = true;
+        var getSearchDetails = {
+            method: 'POST',
+            url: apiPoint.url + 'getSearchAutoDetails/',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            data: {
+                data: $scope.searchData,
+                requestDetails: localDetails
+            }
+        };
+        $http(getSearchDetails).then(function (response) {
+            if (response.data.searchResult) {
+                $scope.searchResultStatus = response.data.searchResult;
+                $scope.searchLoading = false;
+                let searchResultDetailsBef = response.data.search_result_details;
+                const filterAddSelect = searchResultDetailsBef.filter(val => {
+                    val['Selected'] = false;
+                    return val;
+                });
+                $scope.searchResultDetails = filterAddSelect;
+                $scope.searchResultLength = Object.keys($scope.searchResultDetails).length;
+            } else {
+                $scope.searchLoading = false;
+            }
+        });
+    }
+
+    // mobile number search functionlity
+    $scope.mySearchChangeFunc = function (val) {
+        // if (val > 0) {
+        //     $scope.allSelectedHide = true;
+        //     $scope.allSelected('undefined');
+        //     $scope.OpenWindowStatus = false;
+        // } else {
+        //     $scope.allSelected('undefined');
+        //     $scope.allSelectedHide = false;
+        // }
+    }
+    // End: mobile number search functionlity
+
+    // select all or individual functionality
+
+    // var getAllSelected = function () {
+    //     var selectedItems = $scope.searchResultDetails.filter(function (item) {
+    //         return item.Selected;
+    //     });
+
+    //     return selectedItems.length === $scope.searchResultDetails.length;
+    // }
+
+    // var setAllSelected = function (value) {
+    //     angular.forEach($scope.searchResultDetails, function (item) {
+    //         item.Selected = value;
+    //     });
+    // }
+
+    // $scope.allSelected = function (value) {
+    //     if (value !== undefined) {
+    //         return setAllSelected(value);
+    //     } else {
+    //         return getAllSelected();
+    //     }
+    // }
+
+    // End: select all or individual functionality
+
+    // Select one row in a table once
+    $scope.setOneSelect = function (value) {
+        // alert();
+        angular.forEach($scope.searchResultDetails, function (item) {
+            item.Selected = false;
+        });
+        $scope.editId = -1;
+        $scope.statusUpdationId = value.UNI_ID;
+        value.Selected = true;
+        $scope.OpenWindowStatus = true;
+        $scope.openUpdateWind(value);
+    }
+
+    // unselect all the selected item 
+    $scope.unSelect = function () {
+        angular.forEach($scope.searchResultDetails, function (item) {
+            item.Selected = false;
+        });
+            $scope.statusUpdationId = -1;
+        $scope.openUpdateWind();
+    }
+
+    // open popup window onselct checkbox clicked or close popup window all the clicked items unchecked
+    $scope.OpenWindowStatus = false;
+    $scope.openUpdateWind = function (p) {
+        alert(JSON.stringify(p));
+        var details = {
+            studId: p.StudentID,
+            courseId: p.CourseID
+        }
+        alert(JSON.stringify(details));
+        var ItemsSelected = $scope.searchResultDetails.filter(function (item) {
+            if (item.Selected === true) { return true; }
+        });
+        if (ItemsSelected.length !== 0) {
+            const courseLocal = $scope.searchData.Course;
+            $scope.getApplicationFromDetails(courseLocal);
+            $scope.getStatusList();
+            $scope.OpenWindowStatus = true;
+            $scope.myStatusModel = {
+                'semYear': '',
+                'staus': '',
+                'dateOn': '',
+                'comment': '',
+                'certificatetype': '',
+                'certificateNumber': ''
+            }
+        } else {
+            $scope.OpenWindowStatus = false;
+        }
+    }
+
+    // get status list for this activity
+    $scope.getStatusList = function () {
+        var getStatusL = {
+            method: 'POST',
+            url: apiPoint.url + 'getStatusListForUpdate/',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            data: {
+                statusFor: 'studyMaterial',
+                data: localUpdateStatus,
+                    reqBranch: localDetails.localBranchID
+            }
+        };
+        $http(getStatusL).then(function (response) {
+            if (response.data.statusList) {
+                $scope.statusDetailsList = response.data.statusList_details;
+            } else {
+                // $scope.searchLoading = false;
+            }
+        });
+    }
+
+    // get Sem/Year based on the course select
+    $scope.getSemYearList = function (courseID) {
+        $scope.semYearList = '';
+        if (courseID !== '' && courseID !== undefined) {
+            var getSemYear = {
+                method: 'POST',
+                url: apiPoint.url + 'getSemYearForCourse/',
+                headers: {
+                    'Content-Type': 'application/json'
+                },
+                data: {
+                    data: courseID
+                }
+            };
+            $http(getSemYear).then(function (response) {
+                if (response.data.semYearResult) {
+                    $scope.semYearList = response.data.semYear_result_details;
+                } else {
+                    $scope.semYearList = '';
+                }
+            });
+
+        } else {
+
+        }
+    }
+
+    $scope.statusUpdate = {
+        submit: function (form, myStatusModel, localBranchDetails) {
+            var firstError = null;
+            if (form.$invalid) {
+                var field = null, firstError = null;
+                for (field in form) {
+                    if (field[0] != '$') {
+                        if (firstError === null && !form[field].$valid) {
+                            firstError = form[field].$name;
+                        }
+                        if (form[field].$pristine) {
+                            form[field].$dirty = true;
+                        }
+                    }
+                }
+                angular.element('.ng-invalid[name=' + firstError + ']').focus();
+                //    swal("The form cannot be submitted because it contains validation errors!", "Errors are marked with a red, dashed border!", "error");
+            } else {
+                    // alert(localDetail.localBranchID);  
+                    // alert(localBranchDetails);  
+                localDetails.localBranchID = localBranchDetails !== '' ? localBranchDetails : localDetails.localBranchID ;
+                localDetail.localBranchID = localBranchDetails !== '' ? localBranchDetails : localDetail.localBranchID ;
+            //    alert(localDetail.localBranchID);    
+                $scope.disableButton = true;
+                var studentForUpdate = [];
+                let formate = "dd-MM-yyyy";
+                $scope.myStatusModel.dateOn = $filter('date')(new Date($scope.myStatusModel.dateOn), formate);
+                var ItemsSelected = $scope.searchResultDetails.filter(function (item) {
+                    if (item.Selected === true) {
+                        let getStudentID = new getStudentForUpdateDetails(item.StudentID, item.CourseID, item.BranchCode);
+                        studentForUpdate.push(getStudentID);
+                        return true;
+                    }
+                });
+                function getStudentForUpdateDetails(id, courseId, dCode) {
+                    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.CertificateNumber = $scope.myStatusModel.certificateNumber;
+                }
+                var updateStudyMaterial = {
+                    method: 'POST',
+                    url: apiPoint.url + 'updateApplicationStatus/',
+                    headers: {
+                        'Content-Type': 'application/json'
+                    },
+                    data: {
+                        data: studentForUpdate,
+                        requestDetails: localDetails
+                    }
+                };
+                $http(updateStudyMaterial).then(function (response) {
+                    if (response.data.addStatus) {
+                        swal(" ","Updated successfully.", "success");
+                        $scope.disableButton = false;
+                        // for success state
+                        angular.forEach($scope.searchResultDetails, function (item) {
+                            item.Selected = false;
+                        });
+                        // $scope.OpenWindowStatus = false;
+                        $scope.OpenWindowStatus = false;
+                    } else {
+                        swal(" ", response.data.message, "error");
+                        $scope.disableButton = false;
+                        // for success state
+                        angular.forEach($scope.searchResultDetails, function (item) {
+                            item.Selected = false;
+                        });
+                        // $scope.OpenWindowStatus = false;
+                        $scope.OpenWindowStatus = false;
+                    }
+                });
+            }
+        },
+        reset: function (form) {
+            form.$setPristine(true);
+            $scope.myStatusModel = {
+                'semYear': '',
+                'staus': '',
+                'dateOn': '',
+                'comment': '',
+                'certificatetype': '',
+                'certificateNumber': ''
+            }
+        }
+    }
+
+
+    // check unchek for table values
+    $scope.prevStatusListForStudentCourse = '';
+    // get previous status details for the student
+    $scope.getPrevStatus = function (p) {
+        // alert(JSON.stringify(p));
+        $scope.prevStatusListForStudentCourseLoading = true;
+        $scope.prevStatusListForStudentCourseNoRecord = false;
+        $scope.prevStatusListForStudentCourse = '';
+        var getPrevStatus = {
+            method: 'POST',
+            url: apiPoint.url + 'getPrevStatusDetailsForStu/',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            data: {
+                statusFor: localUpdateStatus,
+                getDetailsFor: { "student": p.StudentID, "CourseID": p.CourseID },
+                data: localDetail
+            }
+        };
+        $http(getPrevStatus).then(function (response) {
+            if (response.data.preStatusDetails) {
+                $scope.prevStatusListForStudentCourseLoading = false;
+                $scope.prevStatusListForStudentCourse = response.data.preStatus_details_list;
+                $scope.prevNoRecordFound = false;
+            } else {
+                $scope.prevStatusListForStudentCourseLoading = false;
+                $scope.prevStatusListForStudentCourseNoRecord = true;
+                $scope.prevNoRecordFound = true;
+            }
+        });
+    }
+}]);
+/*modal controller
+   * */
+app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log", "API_POINTS", "$http", function ($scope, $rootScope, $modal, $log,apiPoint,$http) {
+    //Tooltip for print button
+    $scope.dynamicTooltip = 'Student View';
+
+
+
+    //  $scope.items = ['item1', 'item2', 'item3'];
+
+    $scope.open = function (studentDetails) {
+
+
+        // get student view details
+        var getcourse = {
+            method: 'POST',
+            url: apiPoint.url + 'getStudentBasicInfo/',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            data: {
+                requestedBy  :studentDetails.MobileNumber,
+                requestedFrom: 3,
+                branchCode:JSON.parse(localStorage.getItem('localObj')).localBranchID
+            }
+        };
+        $http(getcourse).then(function (response) {
+
+            if (response.data.status == 200 && response.data.studentStatus== true) {
+                $scope.courseEditLoading = false;
+                // $scope.studentDetails = response.data.studentDetails;
+                $scope.studentDetails = response.data;
+                // $scope.courseDetails = response.data.courseDetails;
+                var modalInstance = $modal.open({
+                    templateUrl: 'assets/views/student/studentDetailsModal.html',
+                    controller: 'ModalInstanceCtrl',
+                    // size: size,
+                    resolve: {
+                        items: function () {
+                            return  $scope.studentDetails;
+                        }
+                    }
+                });
+
+                modalInstance.result.then(function (selectedItem) {
+                    $scope.selected = selectedItem;
+                }, function () {
+                    $log.info('Modal dismissed at: ' + new Date());
+                });
+
+            } else {
+                swal("Failed!", "This student is not registerd", "warning");
+                $scope.courseEditLoading = false;
+                $scope.studentDetails = "";
+                $scope.courseDetails = "";
+
+            }
+        });
+
+
+    };
+    $scope.open1 = function (values,type) {
+
+        var modalInstance1 = $modal.open({
+            templateUrl: 'assets/views/student/studentPaymentModal.html',
+            controller: 'ModalInstanceCtrl1',
+            // size: size,
+            resolve: {
+                items1: function () {
+                    var myvalues =
+                        {
+                            "values":values,
+                            "type":type
+                        };
+                    return  myvalues;
+                }
+            }
+        });
+
+        modalInstance1.result.then(function (selectedItem) {
+            $scope.selected = selectedItem;
+        }, function () {
+            $log.info('Modal dismissed at: ' + new Date());
+        });
+    };
+    $scope.printStudentDetails = function (details) {
+        $rootScope.pdfItems = details;
+
+        var printInstance = $modal.open({
+            templateUrl: 'assets/views/student/studentPdf.html',
+            controller: 'studentModalDemoCtrl',
+        });
+    };
+
+    // generate pdf for student view
+    $scope.export = function(getName) {
+        kendo.drawing.drawDOM($("#exportthis")).then(function(group) {
+            kendo.drawing.pdf.saveAs(group, getName+".pdf");
+        });
+    }
+
+
+}]);
+
+// Please note that $modalInstance represents a modal window (instance) dependency.
+// It is not the same as the $modal service used above.
+
+app.controller('ModalInstanceCtrl', ["$scope", "$modalInstance", "items","WordsService", function ($scope, $modalInstance, items,WordsService) {
+
+    $scope.items = items;
+    $scope.selected = {
+        item: $scope.items[0]
+    };
+
+    $scope.ok = function () {
+        $modalInstance.close($scope.selected.item);
+    };
+
+    $scope.cancel = function () {
+        $modalInstance.dismiss('cancel');
+    };
+
+
+}]);
+app.controller('ModalInstanceCtrl1', ["$scope", "$modalInstance", "items1","WordsService", function ($scope, $modalInstance, items1,WordsService) {
+
+    $scope.items1 = items1.values;
+    $scope.selectedtype = items1.type;
+
+    $scope.ok = function () {
+        $modalInstance.close($scope.selected.item);
+    };
+
+    $scope.cancel = function () {
+        $modalInstance.dismiss('cancel');
+    };
+
+
+}]);
+app.filter('unique', function() {
+    return function(collection, primaryKey, secondaryKey) { //optional secondary key
+        var output = [],
+            keys = [];
+
+        angular.forEach(collection, function(item) {
+            var key;
+            secondaryKey === undefined ? key = item[primaryKey] : key = item[primaryKey][secondaryKey];
+
+            if(keys.indexOf(key) === -1) {
+                keys.push(key);
+                output.push(item);
+            }
+        });
+
+        return output;
+    };
+});

Apollo/assets/js/controllers/batchCtrl.js

@@ -244,7 +244,7 @@ app.controller('batchCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTabl
              var logcheck = JSON.parse(localStorage.getItem('localObj'));
 
      const LOCALTYPE = logcheck.localType;
-        if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { 
+        if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE == 'R005')) { 
             console.log("if");
         }else {
             if(logcheck != null && LOCALTYPE !='R001') {

Apollo/assets/js/controllers/branchCtrl.js

@@ -357,7 +357,7 @@ app.controller('branchCtrl', ["$scope","toaster", "$filter", "ngTableParams", "A
       var logcheck = JSON.parse(localStorage.getItem('localObj'));
 
      const LOCALTYPE = logcheck.localType;
-        if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { 
+        if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE =='R005')) { 
             console.log("if");
         }else {
             if(logcheck != null && LOCALTYPE !='R001') {

Apollo/assets/js/controllers/callTrackingCtrl.js

@@ -408,7 +408,7 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter",
          var logcheck = JSON.parse(localStorage.getItem('localObj'));
 
      const LOCALTYPE = logcheck.localType;
-        if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { 
+        if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE=='R005')) { 
             console.log("if");
         }else {
             if(logcheck != null && LOCALTYPE !='R001') {
@@ -686,7 +686,7 @@ app.controller('callTrackingLeadCtrl', ["$scope","$rootScope","toaster", "$filte
           var logcheck = JSON.parse(localStorage.getItem('localObj'));
 
      const LOCALTYPE = logcheck.localType;
-        if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { 
+        if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R005'  || LOCALTYPE == 'R002')) { 
             console.log("if");
         }else {
             if(logcheck != null && LOCALTYPE !='R001') {
@@ -889,7 +889,7 @@ app.controller('callTrackingCloseCtrl', ["$scope","$rootScope","toaster", "$filt
        var logcheck = JSON.parse(localStorage.getItem('localObj'));
 
      const LOCALTYPE = logcheck.localType;
-        if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { 
+        if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R005' || LOCALTYPE == 'R002' )) { 
             console.log("if");
         }else {
             if(logcheck != null && LOCALTYPE !='R001') {

Apollo/assets/js/controllers/centerCtrl.js

@@ -196,7 +196,7 @@ app.controller('centerCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab
      var logcheck = JSON.parse(localStorage.getItem('localObj'));
 
      const LOCALTYPE = logcheck.localType;
-        if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { 
+        if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE == 'R005')) { 
             console.log("if");
         }else {
             if(logcheck != null && LOCALTYPE !='R001') {

Apollo/assets/js/controllers/certificateCtrl.js

@@ -115,7 +115,7 @@ $scope.certificateForm = {
       var logcheck = JSON.parse(localStorage.getItem('localObj'));
 
      const LOCALTYPE = logcheck.localType;
-        if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { 
+        if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE == 'R005' )) { 
             console.log("if");
         }else {
             if(logcheck != null && LOCALTYPE !='R001') {

Apollo/assets/js/controllers/datacorrectionCtrl.js

@@ -22,7 +22,7 @@ app.controller('datacorrectionCtrl', ["$scope","$rootScope","toaster", "$filter"
          var logcheck = JSON.parse(localStorage.getItem('localObj'));
 
      const LOCALTYPE = logcheck.localType;
-        if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { 
+        if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE == 'R005')) { 
             console.log("if");
         }else {
             if(logcheck != null && LOCALTYPE !='R001') {

Apollo/assets/js/controllers/dayBookMasterCtrl.js

@@ -123,7 +123,7 @@ app.controller("dayBookMasterCtrl", ["$scope", "toaster", "$filter", "API_POINTS
       var logcheck = JSON.parse(localStorage.getItem('localObj'));
 
      const LOCALTYPE = logcheck.localType;
-        if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { 
+        if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE == 'R005')) { 
             console.log("if");
         }else {
             if(logcheck != null && LOCALTYPE !='R001') {

Apollo/assets/js/controllers/daybookCtrl.js

@@ -20,7 +20,7 @@ app.controller('daybookCtrl', ["$scope", "$rootScope", "toaster", "$filter", "ng
     $scope.init = function () {
          $scope.todayDate = new Date();
           const LOCALTYPE = localDetail.localType;
-        if(LOCALTYPE === 'R002') {
+        if(LOCALTYPE === 'R002' || LOCALTYPE == 'R005') {
                 $scope.currentDate = new Date();
                 var d = new Date();
                 $scope.oneMonthBefore = d.setMonth(d.getMonth()-1);
@@ -208,12 +208,19 @@ $scope.dayBookApprovalAccess = '';
     }
 
     $scope.copyModel = function (p) {
+
+         var inc = $scope.incomeExpenseType.filter((inc)=>inc.ID == p.Type);
+        console.log(inc);
+        $scope.incexp = inc[0];
+
+        console.log($scope.incexp.ID);
+
         console.log(p);
         $scope.myModel = {
             "id": p.ID,
             "date": p.Date,
             "incomeExpense": p.Name,
-            "type": p.Type,
+            "type":$scope.incexp.ID,
             "amount": p.Amount,
             "status": p.Status,
             "description": p.Description,
@@ -229,7 +236,7 @@ $scope.dayBookApprovalAccess = '';
 	$scope.deleted1 = function (id) {
       
 	 var id=id;
-	 var reason=prompt("Enter Reason!","");
+	 var reason=prompt("Reason For Deletion!","");
 	 $scope.deleteFeePayableEntry(reason,id);
 	}
     //delete the income entry From the fees payable

Apollo/assets/js/controllers/daybookadminCtrl.js

@@ -232,7 +232,7 @@ $scope.dayBookApprovalAccess = '';
 	$scope.deleted1 = function (id) {
       
 	 var id=id;
-	 var reason=prompt("Enter Reason For Delete!","");
+	 var reason=prompt("Reason For Deletion!","");
 	 $scope.deleteFeePayableEntry(reason,id);
 	}
 

Apollo/assets/js/controllers/daybooksuperadminCtrl.js

@@ -339,7 +339,7 @@ $scope.dayBookApprovalAccess = '';
 	
 	$scope.deleted1 = function (id) {
 	 var id=id;
-	 var reason=prompt("Enter Reason!","");
+	 var reason=prompt("Reason For Deletion!","");
 	 $scope.deleteFeePayableEntry(reason,id);
 	}
     //delete the income entry From the fees payable

Apollo/assets/js/controllers/employeeCtrl.js

@@ -67,7 +67,7 @@ app.controller('staffCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "$
     // load when html page load
     $scope.init = function () {
         const LOCALTYPE = localDetail.localType;
-        if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) {
+        if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE =='R002' || LOCALTYPE == 'R005')) {
             $scope.currentDate = new Date();
             $scope.localUserListCode = localDetail.localType;
             $scope.localBranchID = localDetails.localBranchID;

Apollo/assets/js/controllers/feesStatusCtrl.js

@@ -2569,8 +2569,7 @@ $scope.open = function(coursefiltered,Subjects,sem){
 
       var universityaddress = encodeURIComponent($scope.Course.Address).replace(/[%2C %20]/g,' ');
       $scope.universityAddress = universityaddress.replace("   "," ");;
-      $scope.universitydetails = "Mobile: "+$scope.Course.UnivMobileNumber+",E-mail id:"+$scope.Course.EmailID+
+      $scope.universitydetails = "Mobile: "+$scope.Course.UnivMobileNumber+",E-mail id:"+$scope.Course.EmailID;
-      ",Website:-";
       $scope.Enroll = "Enrolment No: ";
       $scope.courseDetails = "Course Name: "+$scope.Course.CourseName+" specialization: "+$scope.Course.Specilization +sem
       
@@ -2603,15 +2602,16 @@ $scope.open = function(coursefiltered,Subjects,sem){
       doc.rect(10, 10, 190, 280);
       
       doc.text(70, 20, universityCap);
+      doc.text(80, 26,$scope.universityAddress);
       doc.addImage(dataURL, 'jpeg', 50, 13, 10, 10);
       doc.setFontSize(14);
       doc.text(70,32,"RE-REGISTRATION FORM");
       doc.setFontSize(12);
-      doc.text(35,35,$scope.universityAddress);
+     
-      doc.text(20,42,$scope.universitydetails);
+      doc.text(40,42,$scope.universitydetails);
       doc.setFontSize(10);
       doc.setFontSize(10);
-      var formdetails = "The from should be complete in all respects and to be filled by student in English CAPITAL letters in blue /black ink.";
+      var formdetails = "The form should be complete in all respects and to be filled by student in English CAPITAL letters in blue /black ink.";
       var details =  doc.splitTextToSize(formdetails,200);
       doc.text(15,50,details);
       

Apollo/assets/js/controllers/incomeCtrl.js

@@ -18,7 +18,7 @@ app.controller("incomeCtrl", ["$scope", "toaster", "$filter", "API_POINTS", "$lo
     $scope.initHead = function() {
         // alert();
          const LOCALTYPE = localDetail.localType;
-        if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) {
+        if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE == 'R005')) {
         }else {
             if(localDetail != null) {
                 $state.go('app.dashboard');

Apollo/assets/js/controllers/income_reportCtrl.js

@@ -23,7 +23,7 @@ app.controller('income_reportCtrl', ["$scope","$rootScope","toaster", "$filter",
          var logcheck = JSON.parse(localStorage.getItem('localObj'));
 
      const LOCALTYPE = logcheck.localType;
-        if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { 
+        if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE == 'R005')) { 
             console.log("if");
         }else {
             if(logcheck != null && LOCALTYPE !='R001') {

Apollo/assets/js/controllers/report_ans_bookletCtrl.js

@@ -82,8 +82,24 @@ app.controller('report_ans_bookletCtrl', ["$scope", "$filter","$rootScope","$mod
                 }
             });
         }
-
+         $scope.show = false;
-        $scope.onSubmit = function () {
+        $scope.onSubmit = function (form) {
+			var firstError = null;
+            if (form.$invalid) {
+                var field = null, firstError = null;
+				$scope.show = true;
+                for (field in form) {
+                    if (field[0] != '$') {
+                        if (firstError === null && !form[field].$valid) {
+                            firstError = form[field].$batch;
+                        }
+                        if (form[field].$pristine) {
+                            form[field].$dirty = true;
+                        }
+                    }
+                }
+                angular.element('.ng-invalid[batch=' + firstError + ']').focus();
+            }else {
             //alert($scope.batch.name);
             $scope.ans_book_data = '';
             $scope.message = '';
@@ -115,6 +131,7 @@ app.controller('report_ans_bookletCtrl', ["$scope", "$filter","$rootScope","$mod
             });
 
         }
+		}
         var mystyle = {
             sheetid: 'ANSWER BOOKLET STATUS REPORT',
             headers: true,
@@ -405,7 +422,12 @@ app.controller('ModalInstanceCtrl1', ["$scope", "$modalInstance", "items1", "Wor
 
     $scope.trackForm = {
         submit: function (form, myModel,loading,selectedStudents) {
-              //console.log(selectedStudents);
+              //console.log(selectedStudents);return false;
+			  var comments = [];
+			  for(var stuid=0;stuid<=selectedStudents.length-1;stuid++){
+				  comments [stuid] ="Call Tracking For Report Answer Booklet Details - BalanceFee:"+selectedStudents[stuid].balance + " - IssuedDate:" +selectedStudents[stuid].issuedate;
+			  }
+			  
             if(isNaN(myModel.date)){
                 $scope.nextFollowupDate = myModel.date;
 
@@ -462,7 +484,7 @@ app.controller('ModalInstanceCtrl1', ["$scope", "$modalInstance", "items1", "Wor
                         assignedTo: myModel.assignedTo,
                         status: myModel.status,
                         referedBy: myModel.referedBy,
-                        comments:"Call Tracking For Report Answer Booklet Details ",
+                        comments:comments,
                         
                         enquiryStatus:myModel.enquiryStatus,
                         createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID,

Apollo/assets/js/controllers/report_app_pendingCtrl.js

@@ -82,8 +82,24 @@ app.controller('report_app_pendingCtrl', ["$scope", "$filter","$rootScope","$mod
                 }
             });
         }
-
+        $scope.show = false;
-        $scope.onSubmit = function () {
+        $scope.onSubmit = function (form) {
+			var firstError = null;
+            if (form.$invalid) {
+                var field = null, firstError = null;
+				$scope.show = true;
+                for (field in form) {
+                    if (field[0] != '$') {
+                        if (firstError === null && !form[field].$valid) {
+                            firstError = form[field].$batch;
+                        }
+                        if (form[field].$pristine) {
+                            form[field].$dirty = true;
+                        }
+                    }
+                }
+                angular.element('.ng-invalid[batch=' + firstError + ']').focus();
+            }else {
             //alert($scope.batch.name);
             $scope.app_pending_data = '';
             $scope.message = '';
@@ -115,6 +131,7 @@ app.controller('report_app_pendingCtrl', ["$scope", "$filter","$rootScope","$mod
             });
 
         }
+		}
         var mystyle = {
             sheetid: 'APPLICAITON PENDING STUDENT LIST REPORT',
             headers: true,

Apollo/assets/js/controllers/report_balfeeCtrl.js

@@ -91,8 +91,24 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal",
             });
         }
         // response data
-        $scope.onSubmit = function () {
+       $scope.show = false;
-           
+        $scope.onSubmit = function (form) {
+			var firstError = null;
+            if (form.$invalid) {
+                var field = null, firstError = null;
+				$scope.show = true;
+                for (field in form) {
+                    if (field[0] != '$') {
+                        if (firstError === null && !form[field].$valid) {
+                            firstError = form[field].$batch;
+                        }
+                        if (form[field].$pristine) {
+                            form[field].$dirty = true;
+                        }
+                    }
+                }
+                angular.element('.ng-invalid[batch=' + firstError + ']').focus();
+            }else {
             $scope.balfee_data = '';
             $scope.message = '';
             var response_data = {
@@ -154,7 +170,7 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal",
 		   
 
         }
-       
+		}
         //Export to excel
         var mystyle = {
             sheetid: 'BALANCE FEE STATUS REPORT',

Apollo/assets/js/controllers/report_certificateCtrl.js

@@ -408,6 +408,10 @@ app.controller('ModalInstanceCtrl1', ["$scope", "$modalInstance", "items1", "Wor
     $scope.trackForm = {
         submit: function (form, myModel,loading,selectedStudents) {
               //console.log(selectedStudents);
+			   var comments = [];
+			  for(var stuid=0;stuid<=selectedStudents.length-1;stuid++){
+				  comments [stuid] ="Call Tracking For Report Certificate Status - DocumentName:"+selectedStudents[stuid].Certificate_name + " - Status:" +selectedStudents[stuid].Certificate_status + " - Date:" +selectedStudents[stuid].Certificate_date;
+			  }
             if(isNaN(myModel.date)){
                 $scope.nextFollowupDate = myModel.date;
 
@@ -464,7 +468,7 @@ app.controller('ModalInstanceCtrl1', ["$scope", "$modalInstance", "items1", "Wor
                         assignedTo: myModel.assignedTo,
                         status: myModel.status,
                         referedBy: myModel.referedBy,
-                        comments:"Call Tracking For Report Certificate Details ",
+                        comments:comments,
                         
                         enquiryStatus:myModel.enquiryStatus,
                         createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID,

Apollo/assets/js/controllers/report_doc_pendingCtrl.js

@@ -82,8 +82,25 @@ app.controller('report_doc_pendingCtrl', ["$scope", "$filter","$rootScope","$mod
                 }
             });
         }
-
+          $scope.show = false;
-        $scope.onSubmit = function () {
+        $scope.onSubmit = function (form) {
+			
+			var firstError = null;
+            if (form.$invalid) {
+                var field = null, firstError = null;
+				$scope.show = true;
+                for (field in form) {
+                    if (field[0] != '$') {
+                        if (firstError === null && !form[field].$valid) {
+                            firstError = form[field].$batch;
+                        }
+                        if (form[field].$pristine) {
+                            form[field].$dirty = true;
+                        }
+                    }
+                }
+                angular.element('.ng-invalid[batch=' + firstError + ']').focus();
+            }else {
             //alert($scope.batch.name);
             $scope.doc_pending_data = '';
             $scope.message = '';
@@ -113,7 +130,7 @@ app.controller('report_doc_pendingCtrl', ["$scope", "$filter","$rootScope","$mod
                 }
 
             });
-
+			}
         }
         var mystyle = {
             sheetid: 'DOCUMENT PENDING STUDENT LIST REPORT',

Apollo/assets/js/controllers/report_examfeeCtrl.js

@@ -83,7 +83,24 @@ app.controller('report_examfeeCtrl', ["$scope", "$filter","$rootScope","$modal",
             });
         }
 
-        $scope.onSubmit = function () {
+        $scope.show = false;
+        $scope.onSubmit = function (form) {
+			var firstError = null;
+            if (form.$invalid) {
+                var field = null, firstError = null;
+				$scope.show = true;
+                for (field in form) {
+                    if (field[0] != '$') {
+                        if (firstError === null && !form[field].$valid) {
+                            firstError = form[field].$batch;
+                        }
+                        if (form[field].$pristine) {
+                            form[field].$dirty = true;
+                        }
+                    }
+                }
+                angular.element('.ng-invalid[batch=' + firstError + ']').focus();
+            }else {
             //alert($scope.batch.name);
             $scope.examfee_data = '';
             $scope.message = '';
@@ -120,7 +137,7 @@ app.controller('report_examfeeCtrl', ["$scope", "$filter","$rootScope","$modal",
                     totalf += parseFloat(item.Amount);
                 }
                 return totalf;   }
-         
+			}
         }
         var mystyle = {
             sheetid: 'EXAM WRITING FEE REPORT',

Apollo/assets/js/controllers/report_expenseCtrl.js

@@ -63,7 +63,25 @@ app.controller('report_expenseCtrl', ["$scope", "API_POINTS", "$http", "SweetAle
             });
         }
 
-        $scope.onSubmit = function () {
+        $scope.show = false;
+        $scope.onSubmit = function (form) {
+			var firstError = null;
+            if (form.$invalid) {
+                var field = null, firstError = null;
+				$scope.show = true;
+                for (field in form) {
+                    if (field[0] != '$') {
+                        if (firstError === null && !form[field].$valid) {
+                            firstError = form[field].$addDate;
+							firstError = form[field].$toDate;
+                        }
+                        if (form[field].$pristine) {
+                            form[field].$dirty = true;
+                        }
+                    }
+                }
+                angular.element('.ng-invalid[toDate=' + firstError + ']').focus();
+            }else {
             //alert($scope.batch.name);
             $scope.expense_data = '';
             $scope.message = '';
@@ -95,6 +113,7 @@ app.controller('report_expenseCtrl', ["$scope", "API_POINTS", "$http", "SweetAle
             });
 
         }
+		}
       
         var mystyle = {
             sheetid: 'EXPENSE REPORT',

Apollo/assets/js/controllers/report_leadCtrl.js

@@ -101,7 +101,25 @@ app.controller('report_leadCtrl', ["$scope", "$filter","$rootScope","$modal", "A
             });
         }
 
-        $scope.onSubmit = function () {
+        $scope.show = false;
+        $scope.onSubmit = function (form) {
+			var firstError = null;
+            if (form.$invalid) {
+                var field = null, firstError = null;
+				$scope.show = true;
+                for (field in form) {
+                    if (field[0] != '$') {
+                        if (firstError === null && !form[field].$valid) {
+                            firstError = form[field].$addDate;
+							firstError = form[field].$toDate;
+                        }
+                        if (form[field].$pristine) {
+                            form[field].$dirty = true;
+                        }
+                    }
+                }
+                angular.element('.ng-invalid[toDate=' + firstError + ']').focus();
+            }else {
             //alert($scope.batch.name);
             $scope.lead_data = '';
             $scope.message = '';
@@ -132,6 +150,7 @@ app.controller('report_leadCtrl', ["$scope", "$filter","$rootScope","$modal", "A
             });
 
         }
+		}
         var mystyle = {
             sheetid: 'Lead REPORT',
             headers: true,

Apollo/assets/js/controllers/report_markcard_certificateCtrl.js

@@ -407,6 +407,10 @@ app.controller('ModalInstanceCtrl1', ["$scope", "$modalInstance", "items1", "Wor
     $scope.trackForm = {
         submit: function (form, myModel,loading,selectedStudents) {
               //console.log(selectedStudents);
+			  var comments = [];
+			  for(var stuid=0;stuid<=selectedStudents.length-1;stuid++){
+				  comments [stuid] ="Call Tracking For Report Certificate Status - SemYear:"+selectedStudents[stuid].Sem_year + " - Balance:" +selectedStudents[stuid].Balance_fee + " - CertificateName:" +selectedStudents[stuid].Certificate_name + " - ReceivedStatus:" +selectedStudents[stuid].rstatus + " - ReceivedDate:" +selectedStudents[stuid].rdate;
+			  }
             if(isNaN(myModel.date)){
                 $scope.nextFollowupDate = myModel.date;
 
@@ -463,7 +467,7 @@ app.controller('ModalInstanceCtrl1', ["$scope", "$modalInstance", "items1", "Wor
                         assignedTo: myModel.assignedTo,
                         status: myModel.status,
                         referedBy: myModel.referedBy,
-                        comments:"Call Tracking For Report MarkCard-Certificate Details ",
+                        comments:comments,
                         
                         enquiryStatus:myModel.enquiryStatus,
                         createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID,

Apollo/assets/js/controllers/report_markcard_statusCtrl.js

@@ -83,7 +83,24 @@ app.controller('report_markcard_statusCtrl', ["$scope", "$filter","$rootScope",
             });
         }
 
-        $scope.onSubmit = function () {
+        $scope.show = false;
+        $scope.onSubmit = function (form) {
+			var firstError = null;
+            if (form.$invalid) {
+                var field = null, firstError = null;
+				$scope.show = true;
+                for (field in form) {
+                    if (field[0] != '$') {
+                        if (firstError === null && !form[field].$valid) {
+                            firstError = form[field].$batch;
+                        }
+                        if (form[field].$pristine) {
+                            form[field].$dirty = true;
+                        }
+                    }
+                }
+                angular.element('.ng-invalid[batch=' + firstError + ']').focus();
+            }else {
             //alert($scope.batch.name);
             $scope.markcard_data = '';
             $scope.message = '';
@@ -114,6 +131,7 @@ app.controller('report_markcard_statusCtrl', ["$scope", "$filter","$rootScope",
             });
 
         }
+		}
         var mystyle = {
             sheetid: 'MARKCARD STATUS REPORT',
             headers: true,

Apollo/assets/js/controllers/report_study_material_statusCtrl.js

@@ -72,35 +72,26 @@ app.controller('report_study_material_statusCtrl', ["$scope", "$filter","$rootSc
                 }
             });
         } 
-		//dropdown values for batch
+		
-		$scope.getBatch = function(Form,filters){
-			$scope.batchValue= filters.university;
-			
-			 var filterBatch = {
-                method: 'POST',
-                url: apiPoint.url + 'report_BatchName/',
-                headers: {
-                    'Content-Type': 'application/json'
-                },
-                data: {
-                    branch : JSON.parse(localStorage.getItem('localObj')).localBranchID,
-                    batch : $scope.batchValue
-                }
-                
-            };
-			//console.log($scope.batchValue);
-			$scope.batchName = "";
-			 $http(filterBatch).then(function (response) { 
-                if (response.data) {
-                   
-                    $scope.batchName = response.data.batchName;
-                    console.log($scope.batchName);
-                } else {
-                }
-            });
-		}
           
- $scope.onSubmit = function() {
+  $scope.show = false;
+        $scope.onSubmit = function (form) {
+			var firstError = null;
+            if (form.$invalid) {
+                var field = null, firstError = null;
+				$scope.show = true;
+                for (field in form) {
+                    if (field[0] != '$') {
+                        if (firstError === null && !form[field].$valid) {
+                            firstError = form[field].$batch;
+                        }
+                        if (form[field].$pristine) {
+                            form[field].$dirty = true;
+                        }
+                    }
+                }
+                angular.element('.ng-invalid[batch=' + firstError + ']').focus();
+            }else {
      //alert($scope.batch.name);
      $scope.study_mat_data = '';
      $scope.message = '';
@@ -130,7 +121,8 @@ app.controller('report_study_material_statusCtrl', ["$scope", "$filter","$rootSc
             
         });
     
- }
+        }
+	}
  //Export to excel
  var mystyle = {
     sheetid: 'STUDY MATERIAL STATUS REPORT',

Apollo/assets/js/controllers/report_waiver_referalCtrl.js

@@ -50,7 +50,24 @@ app.controller('report_waiver_referalCtrl', ["$scope", "API_POINTS", "$http", "S
             });
         }
 
-        $scope.onSubmit = function () {
+        $scope.show = false;
+        $scope.onSubmit = function (form) {
+			var firstError = null;
+            if (form.$invalid) {
+                var field = null, firstError = null;
+				$scope.show = true;
+                for (field in form) {
+                    if (field[0] != '$') {
+                        if (firstError === null && !form[field].$valid) {
+                            firstError = form[field].$batch;
+                        }
+                        if (form[field].$pristine) {
+                            form[field].$dirty = true;
+                        }
+                    }
+                }
+                angular.element('.ng-invalid[batch=' + firstError + ']').focus();
+            }else {
             //alert($scope.batch.name);
             $scope.waiver_referal_data = '';
             $scope.message = '';
@@ -95,6 +112,7 @@ app.controller('report_waiver_referalCtrl', ["$scope", "API_POINTS", "$http", "S
                     }
                     return totalf;   }
         }
+		}
 
         var mystyle = {
             sheetid: 'WAIVER AND REFERAL REPORT',

Apollo/assets/js/controllers/schCtrl.js

@@ -50,7 +50,7 @@ app.controller('schCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableP
         
         $scope.editId = pid;
 		$scope.courseCode = cid;
-		var mappingid = schid;
+		$scope.mappingid = schid;
 		//alert(mappingid+'n');
 		 var getsheduledetails = {
             method: 'POST',
@@ -60,7 +60,7 @@ app.controller('schCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableP
             },
             data: {
                 //requestedBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
-				mapid:mappingid,
+				mapid:$scope.mappingid,
 				subid:subid,
 				branchcode:branchid,
 				
@@ -449,7 +449,8 @@ app.controller('schCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableP
 							
                             updatescheduledetails : $scope.UpdatescheduledDetails,
                             //status: myModel.IsActive,
-                            createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID
+                            createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
+							scheduleID:$scope.mappingid
                         }
                     };
                     $http(update).then(function (response) {
@@ -527,7 +528,7 @@ app.controller('schCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableP
     	 var logcheck = JSON.parse(localStorage.getItem('localObj'));
 
      const LOCALTYPE = logcheck.localType;
-        if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { 
+        if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE == 'R005')) { 
             console.log("if");
         }else {
             if(logcheck != null && LOCALTYPE !='R001') {

Apollo/assets/js/controllers/semcoursemapCtrl.js

@@ -69,7 +69,7 @@ app.controller('semcoursemapCtrl', ["$scope","$rootScope","toaster", "$filter",
           var logcheck = JSON.parse(localStorage.getItem('localObj'));
 
      const LOCALTYPE = logcheck.localType;
-        if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { 
+        if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE == 'R005' )) { 
             console.log("if");
         }else {
             if(logcheck != null && LOCALTYPE !='R001') {

Apollo/assets/js/controllers/sendSMSDetailssuperadminCtrl.js

@@ -19,7 +19,7 @@ app.controller('sendSMSDetailssuperadminCtrl', ["$scope", "$filter", "ngTablePar
       var logcheck = JSON.parse(localStorage.getItem('localObj'));
 
      const LOCALTYPE = localDetail.localType;
-        if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { 
+        if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE == 'R005' )) { 
             console.log("if");
         }else {
             if(logcheck != null && LOCALTYPE !='R001') {

Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js

@@ -15,7 +15,7 @@ app.controller('sendSMSsuperadminCtrl', ["$scope", "$filter", "ngTableParams", "
        var logcheck = JSON.parse(localStorage.getItem('localObj'));
 
      const LOCALTYPE = logcheck.localType;
-        if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { 
+        if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE == 'R005')) { 
             console.log("if");
         }else {
             if(logcheck != null && LOCALTYPE !='R001') {
@@ -540,7 +540,7 @@ $scope.disableSendButton = true;
                          swal(" ", response.data.message, "success");
                       //  swal(" ", "Status added successfully.", "success");
                      $scope.initgroup()
-                        $state.go($state.current, {}, { reload: true });
+                        //$state.go($state.current, {}, { reload: true });
                     } 
                     else 
                     {
@@ -897,7 +897,8 @@ if(group == '')
                         swal(" ", response.data.message, "success");
                       //  swal(" ", "Status added successfully.", "success");
                      $scope.initgroup()
-                        $state.go($state.current, {}, { reload: true });
+                     myModel.GroupName = '';
+                      //  $state.go($state.current, {}, { reload: true });
                     } else {
                         
                          swal(" ", response.data.message, "error");

Apollo/assets/js/controllers/sessionCtrl.js

@@ -76,6 +76,8 @@ app.controller('sessionCtrl', ["$scope", "$localStorage", "$state", 'ipCookie',
         if (inlocalDetails != null) {
            
             if (inlocalDetails.localType == 'R003' && inlocalDetailss.localType == 'R003') {
+
+               // console.log('if')
             } else {
                 if (inlocalDetails.localType == '' && inlocalDetailss.localType == '') {
                     ipCookie.remove('cookiechk');
@@ -100,15 +102,22 @@ app.controller('sessionCtrl', ["$scope", "$localStorage", "$state", 'ipCookie',
     $scope.checkStaff = function () {
          var inlocalDetails = JSON.parse(localStorage.getItem('localObj'));
             var inlocalDetailss = ipCookie('cookiechk');
+       console.log(inlocalDetails);
+
         if (inlocalDetails != null) {
            
             if ((inlocalDetails.localType == 'R002' && inlocalDetailss.localType == 'R002') || (inlocalDetails.localType == 'R005' && inlocalDetailss.localType == 'R005')) {
+            console.log('if');
             } else {
+
                 if (inlocalDetails.localType == '' && inlocalDetailss.localType == '') {
+                    console.log('else if');
                     ipCookie.remove('cookiechk');
                     $window.localStorage.clear();
                     $state.go('login.signin');
                 } else {
+
+                    console.log('else else')
                     $location.url('/dashboard').replace();
                     $window.location.reload();
                     $state.go('app.dashboard');

Apollo/assets/js/controllers/sessionMasterCtrl.js

@@ -200,7 +200,7 @@ app.controller('sessionMasterCtrl', ["$scope","$rootScope","toaster", "$filter",
      var logcheck = JSON.parse(localStorage.getItem('localObj'));
 
      const LOCALTYPE = logcheck.localType;
-        if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { 
+        if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE == 'R005')) { 
             console.log("if");
         }else {
             if(logcheck != null && LOCALTYPE !='R001') {

Apollo/assets/js/controllers/sessionScheduleCtrl.js

@@ -273,10 +273,10 @@ app.controller('sessionScheduleCtrl', ["$scope","$rootScope","toaster", "$filter
 
     $rootScope.init = function () {
       
-         var logcheck = JSON.parse(localStorage.getItem('localObj'));
+         var logcheck = JSON.parse(localStorage.getItem('localObj')); 
 
      const LOCALTYPE = logcheck.localType;
-        if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { 
+        if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE == 'R005')) { 
             console.log("if");
         }else {
             if(logcheck != null && LOCALTYPE !='R001') {

Apollo/assets/js/controllers/statusCtrl.js

@@ -18,7 +18,7 @@ app.controller("statusCtrl", ["$scope", "toaster", "$filter", "API_POINTS", "$lo
     $scope.initHead = function() {
         // alert();
          const LOCALTYPE = localDetail.localType;
-        if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) {
+        if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE =='R002' || LOCALTYPE == 'R005')) {
         }else {
             if(localDetail != null && LOCALTYPE != 'R001') {
                 $state.go('app.dashboard');

Apollo/assets/js/controllers/studentCtrl.js

@@ -56,7 +56,7 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams",
      var logcheck = JSON.parse(localStorage.getItem('localObj'));
 
      const LOCALTYPE = logcheck.localType;
-        if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { 
+        if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE == 'R005')) { 
             console.log("if");
         }else {
             if(logcheck != null && LOCALTYPE !='R001') {

Apollo/assets/js/controllers/studentStatusUpdateCtrl.js

@@ -13,7 +13,7 @@ app.controller("studentStatusUpdateCtrl", ["$scope", "toaster", "$filter", "API_
        $scope.initHead = function() {
         // alert();
          const LOCALTYPE = localDetail.localType;
-        if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) {
+        if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R005' || LOCALTYPE == 'R002')) {
         }else {
             if(localDetail != null && LOCALTYPE !='R001') {
                 $state.go('app.dashboard');

Apollo/assets/js/controllers/studyMaterialStatusCtrl.js

@@ -35,7 +35,7 @@ app.controller('studyMaterialStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
              var logcheck = JSON.parse(localStorage.getItem('localObj'));
 
      const LOCALTYPE = logcheck.localType;
-        if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { 
+        if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE=='R002' || LOCALTYPE == 'R005' )) { 
             console.log("if");
         }else {
             if(logcheck != null && LOCALTYPE !='R001') {

Apollo/assets/js/controllers/subjectCtrl.js

@@ -200,7 +200,7 @@ app.controller('subjectCtrl', ["$scope", "$rootScope","toaster", "$filter", "ngT
           var logcheck = JSON.parse(localStorage.getItem('localObj'));
 
      const LOCALTYPE = logcheck.localType;
-        if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { 
+        if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE == 'R005')) { 
             console.log("if");
         }else {
             if(logcheck != null && LOCALTYPE !='R001') {

Apollo/assets/js/controllers/universityCtrl.js

@@ -31,7 +31,7 @@ app.controller('universityCtrl', ["$scope", "toaster", "$filter", "ngTableParams
     $scope.init = function() {
          // alert();
          const LOCALTYPE = localDetail.localType;
-        if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) {
+        if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE == 'R005')) {
             $scope.getUniversityList();
         }else {
             if(localDetail != null && LOCALTYPE != 'R001') {

Apollo/assets/views/addcontact.html

@@ -26,7 +26,7 @@
                             Phone Number<span class="symbol required"></span>
                             </label>
 
-                            <input type="text" placeholder="Enter Phone Number" tabindex="1" class="form-control" name="Phone" id="Phone" ng-model="p.ListName" ng-pattern="/^[0-9-+]*$/" minlength="6" maxlength="13"/>
+                            <input type="text" placeholder="Enter Phone Number" tabindex="1" class="form-control" name="Phone" id="Phone" ng-model="p.ListName" ng-pattern="/^[0-9-+]*$/" minlength="10" maxlength="13"/>
                             <!-- <span class="error text-small block" ng-if="Form.ListName.$dirty && Form.ListName.$error.required">Phone number required</span> -->
 
                             <span class="error text-small block" ng-if="Form.ListName.$dirty && Form.ListName.$error.pattern && Form.ListName.$error.minlength && Form.ListName.$error.maxlength">Phone number required </span>

Apollo/assets/views/daybook/dayBookApproval.html

@@ -76,7 +76,9 @@
                                             <select class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="addName" ng-model="showTheRefValue" ng-change="showTheResType(showTheRefValue)"
                                                 required>
                                                 <option value="" selected>Select</option>
-                                                <option ng-repeat="typeName in incomeExpenseName"  ng-selected="showTheRefValue == typeName.ListCode" value="{{typeName.ListCode}}">{{typeName.ListName}}</option>
+                                                 <option value="I001">EXPENSE</option>
+                                                <option value="I002">INCOME</option>
+                                                <!-- <option ng-repeat="typeName in incomeExpenseName"  ng-selected="showTheRefValue == typeName.ListCode" value="{{typeName.ListCode}}">{{typeName.ListName}}</option> -->
                                                 </select>
                                             <span class="error text-small block" ng-if="Form.addName.$dirty && Form.addName.$error.required">Type is Required</span>
 

Apollo/assets/views/daybook/dayBookadminApproval.html

@@ -83,7 +83,9 @@
                                             <select class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="addName" ng-model="showTheRefValue" ng-change="showTheResType(showTheRefValue)"
                                                 required>
                                                 <option value="" selected>Select</option>
-                                                <option ng-repeat="typeName in incomeExpenseName"  ng-selected="showTheRefValue == typeName.ListCode" value="{{typeName.ListCode}}">{{typeName.ListName}}</option>
+                                                 <option value="I001">EXPENSE</option>
+                                                <option value="I002">INCOME</option>
+                                                <!-- <option ng-repeat="typeName in incomeExpenseName"  ng-selected="showTheRefValue == typeName.ListCode" value="{{typeName.ListCode}}">{{typeName.ListName}}</option> -->
                                                 </select>
                                             <span class="error text-small block" ng-if="Form.addName.$dirty && Form.addName.$error.required">Type is Required</span>
 

Apollo/assets/views/daybook/daybook.html

@@ -255,12 +255,22 @@
                                                                 <label for="form-field-select-2">
                                                Type <span class="symbol required"></span>
                                                 </label>
-
+<!-- 
                                                                 <select class="form-control" ng-init="getType(p.Name)" tabindex="1" class="cs-select cs-skin-elastic" name="editType" ng-model="myModel.type"
                                                                     required>
                                                 <option value="" disabled selected>Select Type</option>
                                                 <option ng-repeat="typeItem in getTypes" ng-selected="typeItem.ID == p.Type"  value="{{typeItem.ID}}">{{typeItem.TypeName}}</option>
-                                                </select>
+                                                </select> -->
+
+<!-- {{myModel.type}} {{incomeExpenseType}} -->
+                                                  <select class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="addType" ng-model="myModel.type" required>
+
+
+                                     <optgroup ng-repeat="typeName in incomeExpenseName"  label="{{typeName.ListName}}">
+                                                 <option  ng-repeat="incexpType in incomeExpenseType" ng-if="typeName.ListCode == incexpType.TypeID" value="{{incexpType.ID}}" ng-selected="incexp.ID == incexpType.ID">{{incexpType.TypeName}}</option>
+
+                                    </optgroup> 
+                                    </select>
                                                                 <span class="error text-small block" ng-if="Form.editType.$dirty && Form.editType.$error.required">Type is Required</span>
 
                                                             </div>
@@ -344,7 +354,9 @@
                                     <select class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="addName" ng-model="myModelAdd.name" ng-change="getType(myModelAdd.name)"
                                         required>
                                                 <option value="" disabled selected>Select</option>
-                                                <option ng-repeat="typeName in incomeExpenseName" value="{{typeName.ListCode}}">{{typeName.ListName}}</option>
+                                                <!-- <option ng-repeat="typeName in incomeExpenseName" value="{{typeName.ListCode}}">{{typeName.ListName}}</option> -->
+                                                 <option value="I001">EXPENSE</option>
+                                                <option value="I002">INCOME</option>
                                                 </select>
                                     <span class="error text-small block" ng-if="Form.addName.$dirty && Form.addName.$error.required">Type is Required</span>
                                 </div>
@@ -386,10 +398,23 @@
                                     <label for="form-field-select-2">
                                               Type  <span class="symbol required"></span>
                                                 </label>
-                                    <select class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="addType" ng-model="myModelAdd.type" required>
+                                   <!--  <select class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="addType" ng-model="myModelAdd.type" required>
                                                 <option value="" disabled selected>Select Type</option>
                                                 <option ng-repeat="typeItem in getTypes"  value="{{typeItem.ID}}">{{typeItem.TypeName}}</option>
+                                                </select> -->
+                                           
+                                                <select class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="addType" ng-model="myModelAdd.type" required>
+                                     <option value="" disabled selected>Select Type</option>
+
+                                     <optgroup ng-repeat="typeName in incomeExpenseName"  label="{{typeName.ListName}}">
+                                                 <option  ng-repeat="incexpType in incomeExpenseType" ng-if="typeName.ListCode == incexpType.TypeID" value="{{incexpType.ID}}">{{incexpType.TypeName}}</option>
+
+                                    </optgroup> 
+                                                <!-- <option value="" disabled selected>Select Type</option>
+                                                <option ng-repeat="typeItem in getTypes"  value="{{typeItem.ID}}">{{typeItem.TypeName}}</option> -->
                                                 </select>
+
+
                                     <span class="error text-small block" ng-if="Form.addType.$dirty && Form.addType.$error.required">Type is Required</span>
 
                                 </div>

Apollo/assets/views/daybook/daybookadmin.html

@@ -358,7 +358,9 @@
                                     <select class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="addName" ng-model="myModelAdd.name" ng-change="getType(myModelAdd.name)"
                                         required>
                                                 <option value="" disabled selected>Select</option>
-                                                <option ng-repeat="typeName in incomeExpenseName" value="{{typeName.ListCode}}">{{typeName.ListName}}</option>
+                                                <!-- <option ng-repeat="typeName in incomeExpenseName" value="{{typeName.ListCode}}">{{typeName.ListName}}</option> -->
+                                                 <option value="I001">EXPENSE</option>
+                                                <option value="I002">INCOME</option>
                                                 </select>
                                     <span class="error text-small block" ng-if="Form.addName.$dirty && Form.addName.$error.required">Type is Required</span>
                                 </div>
@@ -400,10 +402,22 @@
                                     <label for="form-field-select-2">
                                               Type  <span class="symbol required"></span>
                                                 </label>
-                                    <select class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="addType" ng-model="myModelAdd.type" required>
+                                   <!--  <select class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="addType" ng-model="myModelAdd.type" required>
                                                 <option value="" disabled selected>Select Type</option>
                                                 <option ng-repeat="typeItem in getTypes"  value="{{typeItem.ID}}">{{typeItem.TypeName}}</option>
+                                                </select> -->
+
+                                                <select class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="addType" ng-model="myModelAdd.type" required>
+                                     <option value="" disabled selected>Select Type</option>
+
+                                     <optgroup ng-repeat="typeName in incomeExpenseName"  label="{{typeName.ListName}}">
+                                                 <option  ng-repeat="incexpType in incomeExpenseType" ng-if="typeName.ListCode == incexpType.TypeID" value="{{incexpType.ID}}">{{incexpType.TypeName}}</option>
+
+                                    </optgroup> 
+                                                <!-- <option value="" disabled selected>Select Type</option>
+                                                <option ng-repeat="typeItem in getTypes"  value="{{typeItem.ID}}">{{typeItem.TypeName}}</option> -->
                                                 </select>
+                                                
                                     <span class="error text-small block" ng-if="Form.addType.$dirty && Form.addType.$error.required">Type is Required</span>
 
                                 </div>

Apollo/assets/views/partials/nav.html

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

Apollo/assets/views/report_answer_booklets.html

@@ -13,6 +13,7 @@ td,th {
 	  th{
 	  text-align:center;
 	  }
+	   .table>tbody>tr>td { padding: 2px; }
     /* .sort-icon {
         font-size: 9px;
         margin-left: 5px;
@@ -28,7 +29,7 @@ td,th {
 </script>
 <div class="container-fluid container-fullw bg-white">
     <div ng-controller="report_ans_bookletCtrl" ng-init="filters()">
-        <form name="Form" id="form" novalidate ng-submit="onSubmit()" method="post">
+        <form name="Form" id="form" novalidate ng-submit="onSubmit(Form)" method="post">
             <fieldset>
                 <div class="row">
                     <div class="col-md-12">
@@ -40,18 +41,20 @@ 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" ng-options="details.universityName for details in university" required>
                                     <option value="" selected>Select University</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">
+                                <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>
                                     <option value="" selected>Select Batch</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-2" style="padding-top: 2.3%;">
                                 <div >

Apollo/assets/views/report_application_pending.html

@@ -15,6 +15,7 @@
 	  th{
 	  text-align:center;
 	  }
+	   .table>tbody>tr>td { padding: 2px; }
     /* .sort-icon {
         font-size: 9px;
         margin-left: 5px;
@@ -30,7 +31,7 @@
 </script>
 <div class="container-fluid container-fullw bg-white">
     <div ng-controller="report_app_pendingCtrl" ng-init="filters()">
-        <form name="Form" id="form" novalidate ng-submit="onSubmit()" method="post">
+        <form name="Form" id="form" novalidate ng-submit="onSubmit(Form)" method="post">
             <fieldset>
                 <div class="row">
                     <div class="col-md-12">
@@ -42,18 +43,20 @@
                                     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" ng-options="details.universityName for details in university" required>
                                     <option value="" selected>Select University</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">
+                                <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>
                                     <option value="" selected>Select Batch</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-2" style="padding-top: 2.3%;">
                                 <div >

Apollo/assets/views/report_balance_fee.html

@@ -7,6 +7,7 @@
         </div>
     </section>
     <style>
+	 .table>tbody>tr>td { padding: 2px; }
         /* .sort-icon {
             font-size: 9px;
             margin-left: 5px;
@@ -22,7 +23,7 @@
     </script>
     <div class="container-fluid container-fullw bg-white">
         <div ng-controller="report_balfeeCtrl" ng-init="filters()">
-            <form name="Form" id="form" novalidate ng-submit="onSubmit()" method="post">
+            <form name="Form" id="form" novalidate ng-submit="onSubmit(Form)" method="post">
                 <fieldset>
                     <div class="row">
                         <div class="col-md-12">
@@ -34,18 +35,20 @@
                                     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" ng-options="details.universityName for details in university" required>
                                     <option value="" selected>Select University</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">
+                                <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>
                                     <option value="" selected>Select Batch</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-2" style="padding-top: 2.3%;">
                                     <div >

Apollo/assets/views/report_certificate_status.html

@@ -13,6 +13,7 @@ td,th {
 	  th{
 	  text-align:center;
 	  }
+	   .table>tbody>tr>td { padding: 2px; }
     /* .sort-icon {
         font-size: 9px;
         margin-left: 5px;

Apollo/assets/views/report_document_pending.html

@@ -13,6 +13,7 @@ td,th {
 	  th{
 	  text-align:center;
 	  }
+	   .table>tbody>tr>td { padding: 2px; }
     /* .sort-icon {
         font-size: 9px;
         margin-left: 5px;
@@ -28,7 +29,7 @@ td,th {
 </script>
 <div class="container-fluid container-fullw bg-white">
     <div ng-controller="report_doc_pendingCtrl" ng-init="filters()">
-        <form name="Form" id="form" novalidate ng-submit="onSubmit()" method="post">
+        <form name="Form" id="form" novalidate ng-submit="onSubmit(Form)" method="post">
             <fieldset>
                 <div class="row">
                     <div class="col-md-12">
@@ -40,20 +41,20 @@ 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" ng-options="details.universityName for details in university" required>
                                     <option value="" selected>Select University</option>
                                   </select>
-								  <!--<p ng-show="Form.university.$error.required">Providing a username is mandatory.</p>-->
+								  <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">
+                                <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>
                                     <option value="" selected >Select Batch</option>
                                  </select>
-								<!-- <p ng-show="Form.batch.$error.required">Providing a username is mandatory.</p>-->
+								<span style="color:red;" ng-if="show" ng-show="Form.batch.$dirty && Form.batch.$error.required">Please select Batch.</span>
                             </div>
                             <div class="col-md-2" style="padding-top: 2.3%;">
                                 <div >
@@ -99,7 +100,7 @@ td,th {
                         <!-- <th>Sem/Year</th> -->
                         <th>Phone No</th>
                         <th>University</th>
-						<th>Document Applied Date</th>
+						<th>Followup Date</th>
 						<th>Pending Document</th>
                         <!-- <th>Document Status</th> -->
                         
@@ -119,7 +120,7 @@ td,th {
                         <!-- <td>{{p.Sem_year}}</td> -->
                         <td><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.Phone_number}}</a></td>
                         <td>{{p.University}}</td>
-						 <td>{{p.adate}}</td>
+						 <td>{{p.fdate}}</td>
 						 <td>{{p.certname}}</td>
                          <!-- <td>{{p.Status}}</td> -->
                         

Apollo/assets/views/report_exam_writing_fee.html

@@ -13,6 +13,7 @@
 	  th{
 	  text-align:center;
 	  }
+	   .table>tbody>tr>td { padding: 2px; }
         /* .sort-icon {
             font-size: 9px;
             margin-left: 5px;
@@ -28,7 +29,7 @@
     </script>
     <div class="container-fluid container-fullw bg-white">
         <div ng-controller="report_examfeeCtrl" ng-init="filters()">
-            <form name="Form" id="form" novalidate ng-submit="onSubmit()" method="post">
+            <form name="Form" id="form" novalidate ng-submit="onSubmit(Form)" method="post">
                 <fieldset>
                     <div class="row">
                         <div class="col-md-12">
@@ -40,18 +41,20 @@
                                     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" ng-options="details.universityName for details in university" required>
                                     <option value="" selected>Select University</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">
+                                <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>
                                     <option value="" selected>Select Batch</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-2" style="padding-top: 2.3%;">
                                     <div >

Apollo/assets/views/report_expense.html

@@ -7,14 +7,13 @@
     </div>
 </section>
 <style>
-    /* .sort-icon {
+ .table>tbody>tr>td { padding: 2px; }
-        font-size: 9px;
+ 
-        margin-left: 5px;
+   .table-responsive {
-    }
+   width:80%;
-
+   margin-left: 101px;
-    th {
+   
-        cursor: pointer;
+}
-    } */
 </style>
 <script type="text/javascript" src="bower_components/ng-table-excel-export/ng-table-excel-export.min.js">
    
@@ -22,7 +21,7 @@
 </script>
 <div class="container-fluid container-fullw bg-white">
     <div ng-controller="report_expenseCtrl" ng-init="filters()">
-        <form name="Form" id="form" novalidate ng-submit="onSubmit()" method="post">
+        <form name="Form" id="form" novalidate ng-submit="onSubmit(Form)" method="post">
             <fieldset>
                 <div class="row">
                     <div class="col-md-12">
@@ -38,7 +37,8 @@
                                     <input type="text" tabindex="1" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="filters.from_date"
                                         is-open="startOpen" ng-init="startOpen = false" name="addDate" datepicker-options="dateOptions"
                                         placeholder="Select Date" close-text="Close" required="required" ng-change="changeDate()" 
-                                        show-button-bar="true" />
+                                        show-button-bar="true" required/>
+										<span style="color:red;" ng-if="show" ng-show="Form.addDate.$dirty && Form.addDate.$error.required">Please select FromDate.</span>
 
                                 </div>
                             </div>
@@ -49,9 +49,10 @@
                                             To Date   
                                         </label>
                                     <input type="text" tabindex="1" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="filters.to_date"
-                                        is-open="startOpen" ng-init="startOpen = false" name="addDate" datepicker-options="dateOptions"
+                                        is-open="startOpen" ng-init="startOpen = false" name="toDate" datepicker-options="dateOptions"
                                         placeholder="Select Date" close-text="Close" required="required" ng-change="changeToDate()"
-                                        show-button-bar="true" />
+                                        show-button-bar="true" required/>
+										<span style="color:red;" ng-if="show" ng-show="Form.toDate.$dirty && Form.toDate.$error.required">Please select ToDate.</span>
 
                                 </div>
                             </div>
@@ -80,10 +81,11 @@
                 <div class="col-md-4">
                 <input class="form-control"  type="text" ng-model="search" id="searchIn" autofocus tabindex="2" placeholder="Search" />
                 </div>
+				<button pdf-save-button="getpdf" pdf-name="someone.pdf" class="btn btn-success btn-o">PDF</button>
                 <button class="btn btn-success btn-o" ng-click="exportData()">Export to Excel</button>
             
         </div>
-        <div class="table-responsive">
+        <div pdf-save-content="getpdf" class="table-responsive">
             <table  id="datatable"   class="table table-hover">
                   
                            
@@ -102,7 +104,7 @@
                     <tr>
                         <td>{{p.SL_NO}}</td>
                         <td>{{p.Expense_name}}</td>
-                        <td style ="text-align:right;">{{p.Amount}}</td>
+                        <td style ="text-align:center;">{{p.Amount}}</td>
                        
                     </tr>
                 

Apollo/assets/views/report_lead.html

@@ -13,6 +13,7 @@ td,th {
 	  th{
 	  text-align:center;
 	  }
+	   .table>tbody>tr>td { padding: 2px; }
     /* .sort-icon {
         font-size: 9px;
         margin-left: 5px;
@@ -28,7 +29,7 @@ td,th {
 </script>
 <div class="container-fluid container-fullw bg-white">
     <div ng-controller="report_leadCtrl" ng-init="filters()">
-        <form name="Form" id="form" novalidate ng-submit="onSubmit()" method="post">
+        <form name="Form" id="form" novalidate ng-submit="onSubmit(Form)" method="post">
             <fieldset>
                 <div class="row">
                     <div class="col-md-12">
@@ -44,7 +45,8 @@ td,th {
                                     <input type="text" tabindex="1" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="filters.from_date"
                                         is-open="startOpen" ng-init="startOpen = false" name="addDate" datepicker-options="dateOptions"
                                         placeholder="Select Date" close-text="Close" required="required" ng-change="changeDate()" 
-                                        show-button-bar="true" />
+                                        show-button-bar="true" required/>
+										<span style="color:red;" ng-if="show" ng-show="Form.addDate.$dirty && Form.addDate.$error.required">Please select FromDate.</span>
 
                                 </div>
                             </div>
@@ -55,9 +57,10 @@ td,th {
                                             To Date   
                                         </label>
                                     <input type="text" tabindex="1" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="filters.to_date"
-                                        is-open="startOpen" ng-init="startOpen = false" name="addDate" datepicker-options="dateOptions"
+                                        is-open="startOpen" ng-init="startOpen = false" name="toDate" datepicker-options="dateOptions"
                                         placeholder="Select Date" close-text="Close" required="required" ng-change="changeToDate()"
-                                        show-button-bar="true" />
+                                        show-button-bar="true" required/>
+										<span style="color:red;" ng-if="show" ng-show="Form.toDate.$dirty && Form.toDate.$error.required">Please select ToDate.</span>
 
                                 </div>
                             </div>

Apollo/assets/views/report_mark_certificate_status.html

@@ -13,6 +13,7 @@ td,th {
 	  th{
 	  text-align:center;
 	  }
+	  .table>tbody>tr>td { padding: 2px; }
     /* .sort-icon {
         font-size: 9px;
         margin-left: 5px;
@@ -131,8 +132,6 @@ td,th {
                     <tr>
                             <th><input type="checkbox" ng-model="myModel.all" id="all" name="all" ng-click="isCheckAll($event);"></th>
                         <th>SL.No</th>
-                        <th>Document Fee Paid Date</th>
-                        <th>Enrollment ID</th>
                         <th>Student Name</th>
                         <th>Father Name</th>
                         <th>Course</th>
@@ -153,21 +152,19 @@ td,th {
                     <tr>
                             <td><input type="checkbox" ng-checked="myModel.all" id="{{p.Student_id}}" name="{{p.Student_id}}" class="form-control" ng-click="isClick($event);" /></td>
                         <td>{{p.SL_NO}}</td>
-                        <td>{{p.Document_fee_paid_date}}</td>
-                        <td>{{p.Enrollment_id}}</td>
                         <td><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.Student_name}}</a></td>
                         <td>{{p.Father_name}}</td>
                         <td>{{p.course_name}}</td>
                         <td>{{p.Sem_year}}</td>
                         <td><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.Phone_number}}</a></td>
                         <td>{{p.University}}</td>
-                        <td>{{p.Balance_fee}}</td>
+                        <td style="text-align:right;">{{p.Balance_fee}}</td>
 						<td>{{p.Certificate_name}}</td>
-						<td>{{p.received_status}}</td>
+						<td>{{p.rstatus}}</td>
-                        <td>{{p.received_date}}</td>
+                        <td>{{p.rdate}}</td>
-                        <td>{{p.issued_status}}</td>
+                        <td>{{p.istatus}}</td>
-                        <td>{{p.issued_date}}</td>
+                        <td>{{p.idate}}</td>
-                        <td>{{p.issued_comments}}</td>
+                        <td>{{p.cmnts}}</td>
                         
                     </tr>
                 

Apollo/assets/views/report_markcardstatus.html

@@ -13,13 +13,14 @@
 	  th{
 	  text-align:center;
 	  }
+	   .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()" method="post">
+        <form name="Form" id="form" novalidate ng-submit="onSubmit(Form)" method="post">
             <fieldset>
                 <div class="row">
                     <div class="col-md-12">
@@ -31,18 +32,20 @@
                                     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" ng-options="details.universityName for details in university" required>
                                     <option value="" selected>Select University</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">
+                                <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>
                                     <option value="" selected>Select Batch</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">

Apollo/assets/views/report_studymaterialstatus.html

@@ -13,11 +13,12 @@
 	  th{
 	  text-align:center;
 	  }
+	   .table>tbody>tr>td { padding: 2px; }
 </style>
 
 <div class="container-fluid container-fullw bg-white">
     <div ng-controller="report_study_material_statusCtrl" ng-init="filters()">
-        <form name="Form" id="form" novalidate ng-submit="onSubmit()" method="post">
+        <form name="Form" id="form" novalidate ng-submit="onSubmit(Form)" method="post">
             <fieldset>
                 <div class="row">
                     <div class="col-md-12">
@@ -28,18 +29,20 @@
                                     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" ng-options="details.universityName for details in university" required>
                                     <option value="" selected>Select University</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">
+                                <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>
                                     <option value="" selected>Select Batch</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">

Apollo/assets/views/report_waiver_referal.html

@@ -13,6 +13,7 @@
 	  th{
 	  text-align:center;
 	  }
+	   .table>tbody>tr>td { padding: 2px; }
     /* .sort-icon {
         font-size: 9px;
         margin-left: 5px;
@@ -26,7 +27,7 @@
 </script>
 <div class="container-fluid container-fullw bg-white">
     <div ng-controller="report_waiver_referalCtrl" ng-init="filters()">
-        <form name="Form" id="form" novalidate ng-submit="onSubmit()" method="post">
+        <form name="Form" id="form" novalidate ng-submit="onSubmit(Form)" method="post">
             <fieldset>
                 <div class="row">
                     <div class="col-md-12">
@@ -38,18 +39,20 @@
                                     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" ng-options="details.universityName for details in university" required>
                                     <option value="" selected>Select University</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">
+                                <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>
                                     <option value="" selected>Select Batch</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-2" style="padding-top: 2.3%;">
                                 <div >
@@ -140,14 +143,14 @@
                 
                 </tbody>
                <tfoot>
+                   <td></td>
+                   <td></td>
+                   <td></td>
+                   <td></td>
+                   <td></td>
                    <td>Total</td>
                    <td></td>
                    <td></td>
-                   <td></td>
-                   <td></td>
-                   <td></td>
-                   <td></td>
-                   <td></td>
                    <td></td>
 				   <td></td>
                    <td style="text-align:right;">{{ getwaiver() }}</td>

Apollo/assets/views/reregistration/reregistrationformpdf.html

@@ -5,21 +5,22 @@
     <table style="height: 341px;background-color: white;" width="578" border=1>
         <tbody>
         <tr>
-        <td style="width: 185px; text-align: right;border-right-style: hidden;border-bottom-style: hidden;"><img src="images/{{Course.ProfilePicPath || university/No_Image.png}}" id="logo" style="width: 30%;"></td>
+        <td style="width: 253px; text-align: left;border-right-style: hidden;border-bottom-style: hidden;"><img src="images/{{Course.ProfilePicPath || university/No_Image.png}}" id="logo" style="width: 30%;"></td>
-        <td style="width: 185px;border-bottom-style: hidden;" colspan="2">
+        <td style="width: 150px;border-bottom-style: hidden;" colspan="2">
-        <h1 style="color:blue;"><strong>{{Course.UniversityName}}</strong></h1>
+        <h3 style="color:blue; margin-left: -150px;"><strong>{{Course.UniversityName}}</strong></h3>
+        <p style="color:blue; margin-left: -96px; margin-top: -9px;">{{Course.Address}}</p>
         </td>
         </tr>
         <tr>
         <td style="width: 185px; text-align: center;" colspan="3">
         <h5><strong>RE-REGISTRATION FORM</strong></h5>
-        <p>{{Course.Address}} &nbsp;Mob-{{Course.UnivMobileNumber}}, E-mail id:{{Course.EmailID}}, Website:-</p>
+        <p> &nbsp;Mob-{{Course.UnivMobileNumber}}, E-mail id:{{Course.EmailID}}</p>
          
         </td>
         </tr>
         <tr>
         <td style="width: 185px;" colspan="3">
-        <p style="text-align: center;">The from should be complete in all respects and to be filled by Course&nbsp;in English CAPITAL letters in blue /black ink.</p>
+        <p style="text-align: center;">The from should be complete in all respects and to be filled by Student<br>in English CAPITAL letters in blue /black ink.</p>
         <table width="80%">
             <tbody>
             <tr style="height: 3px;">
@@ -77,16 +78,20 @@
                         </tbody>
                         </table>
         <p>Pin Code: __________ Mobile No: <span style="text-decoration:underline;">{{Course.MobileNumber}}</span> E-mail ID: <span style="text-decoration:underline;">{{Course.EmailID}}</span></p>
+        <br>
+      
         </td>
         </tr>
-        
+      <br>
+      <br>
+            <tbody> 
         <tr>
-        <td style="width: 185px; text-align: center;" colspan="3">&nbsp;SUBJECT / PAPER IN WHICH CANDIDATE APPEARING&nbsp;</td>
+        <td style="width: 185px; text-align: center; color:blue;" colspan="3"><strong>&nbsp;SUBJECT / PAPER IN WHICH CANDIDATE APPEARING&nbsp;</strong></td>
         </tr>
-       
+     
         <tr>
-            
+          
-        <th style="width: 185px; text-align: center;"><strong>&nbsp;SR.NO</strong></th>
+        <th style="width: 185px; text-align: center;"><strong>&nbsp;SL.NO</strong></th>
         <th style="width: 185px; text-align: center;"><strong>&nbsp;Subject Code</strong></th>
         <th style="width: 186px; text-align: center;"><strong>&nbsp;Subject / Paper Code</strong></th>
         </tr>
@@ -96,8 +101,9 @@
         <td style="width: 185px;">{{sub.SubjectCode}}</td>
         <td style="width: 186px;">{{sub.SubjectName}}</td>
         </tr>
-        
+      
     </tbody>
+   
     <br/>
     <tfoot>
         <tr>

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

@@ -0,0 +1,693 @@
+<!-- start: PAGE TITLE -->
+<section id="page-title">
+    <div class="row">
+        <div class="col-sm-8">
+            <h1 class="mainTitle" translate="sidebar.nav.student.status.APPLICATION">{{ mainTitle }}</h1>
+            <span class="mainDescription">Update application status.</span>
+        </div>
+        <div ncy-breadcrumb></div>
+    </div>
+</section>
+<!-- end: PAGE TITLE -->
+<!-- start: STUDY MATERIAL STATUS -->
+<div class="container-fluid container-fullw bg-white">
+    <div class="row">
+        <div class="col-md-12">
+            <!-- /// controller:  'UserCtrl' -  localtion: assets/js/controllers/userCtrl.js /// -->
+            <div ng-controller="applicationStatusCtrl">
+                <!-- start: STATUS -->
+                <div class="container" ng-init="init()">
+                    <div class="row">
+                        <!--<pre>{{searchData | json }}</pre> -->
+                        <div class="col-md-4">
+                            <label for="form-field-select-2">
+                                               University 
+                        </label>
+
+                            <select class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="myModelCourseAdd"
+                                ng-change="getUniveId(myModelCourseAdd)">
+                        <option value="" disabled selected>Select University</option>
+                        <option  ng-repeat="item in universityData" value="{{item}}">{{item.UniversityName}}</option>
+                            </select>
+                        </div>
+
+                         <div class="col-md-4">
+                            <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-4">
+                         <div class="col-md-12">
+                            <div class="col-md-12">
+                            <label for="form-field-select-2">
+                                               Course 
+                        </label>
+                        </div>
+                              
+                            <div class="col-md-12">
+                            <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="course" ng-model="searchData.Course" ng-change="getValueChange()">
+                        <option value=""  selected>Select Course</option>
+                        <option ng-repeat="itemCourse in courseData"  value="{{itemCourse.CourseID}}">{{itemCourse.CourseName}}<span ng-show="itemCourse.CourseCode != ''">(<strong>{{itemCourse.CourseCode}}</strong>)</span></option>
+                        </select>
+                        </div>
+                        </div>
+                        </div>
+
+                       
+
+
+                    </div>
+                </div>
+                <div>
+                    <div class="container">
+                        <div class="row">
+                        </div>
+                    </div>
+                </div>
+
+                <!--<pre> {{ searchResultDetails | json }}</pre>-->
+
+                <div>
+                    <!--// student search result-->
+                    <div ng-if="searchLoading === true">
+                        <!--search loading start-->
+                        <div style="padding: auto 0; color: #007AFF; font-weight: bold; text-align:center; 
+                        margin-top: 25px;">
+                            <h4 style="color: inherit">fetching...</h4>
+                        </div>
+                        <!--search loading end-->
+                    </div>
+
+                    <div ng-if="searchLoading === false">
+                        <div class="col-md-12" ng-if="searchResultStatus == false" style="min-height: 281px;">
+                            <p style="color: red;" align="center"><strong><h4 class="text-center">No
+                                records found... </h4></strong></p>
+                        </div>
+
+                        <div class="col-md-12" ng-if="searchResultStatus == true">
+                            <div class="col-md-12" ng-if="searchResultLength === 0" style="min-height: 281px;">
+                                <p style="color: red;" align="center"><strong><h4 class="text-center">No
+                                records found... </h4></strong></p>
+                            </div>
+
+                            <div class="table-responsive" ng-if="searchResultLength > 0">
+                                <!--// search-->
+                                <div class="container">
+                                    <div class="row">
+                                        <div class="col-md-3">
+
+                                            <label for="form-field-select-2">
+                                               Mobile Number/Name 
+                                            </label>
+                                            <script>
+                                                $(function () {
+                                                    $("#search").focus();
+                                                });
+                                            </script>
+                                            <style>
+                                                .sort-icon {
+                                                    font-size: 9px;
+                                                    margin-left: 5px;
+                                                }
+
+                                                th {
+                                                    cursor: pointer;
+                                                }
+                                            </style>
+                                            <input class="form-control" type="text" ng-change="mySearchChangeFunc(search.MobileNumber)" ng-model="search"
+                                                id="search" autofocus tabindex="1" placeholder="Search Mobile/Name" /><br><br>
+                                        </div>
+                                    </div>
+                                </div>
+                                <table class="table table-hover" ng-controller="studentModalDemoCtrl">
+                                    <thead>
+                                        <tr>
+                                            <th>
+                                                <!--<input type="checkbox" ng-hide="allSelectedHide" ng-model="allSelected" ng-change="openUpdateWind()" ng-model-options="{getterSetter: true}"
+                                                />-->
+                                            </th>
+                                            <th ng-click="sort('Firstname')">First Name
+                                                <span class="glyphicon sort-icon" ng-show="sortKey=='Firstname'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
+                                            </th>
+                                            <th ng-click="sort('Lastname')">Last Name
+                                                <span class="glyphicon sort-icon" ng-show="sortKey=='Lastname'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
+                                            </th>
+                                            <th ng-click="sort('MobileNumber')">MobileNumber
+                                                <span class="glyphicon sort-icon" ng-show="sortKey=='MobileNumber'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
+                                            </th>
+                                            <th ng-click="sort('EmailID')">Email ID
+                                                <span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
+                                            </th>
+                                            <th ng-click="sort('CourseName')">Course
+                                                <span class="glyphicon sort-icon" ng-show="sortKey=='CourseName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
+                                            </th>
+
+                                        </tr>
+                                    </thead>
+                                    <tbody dir-paginate="p in searchResultDetails|filter:search:strict|orderBy:sortKey:reverse|itemsPerPage:10">
+                                        <tr>
+                                            <td>
+                                                <label>
+                                                    <!--<input  type="checkbox" ng-model="p.Selected" ng-click="setOneSelect(p)" />-->
+                                                        <span> <i  tooltip="STATUS UPDATE" class="ti-slice" ng-click="setOneSelect(p)" ></i> </span>
+                                                  <!--{{p.StudentID}}-->
+                                                </label>
+                                            </td>
+                                            <td><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.Firstname}}</a></td>
+                                            <td>{{p.Lastname}}</td>
+                                            <td><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.MobileNumber}}</a></td>
+                                            <td>{{p.EmailID}}</td>
+                                            <td>{{p.CourseName}}(<strong>{{p.CourseCode}}</strong>)</td>
+                                            <td class="center">
+                                                <span> <i  tooltip="STATUS DETAILS" class="glyphicon glyphicon-list-alt"  ng-click="setEditId(p.UNI_ID)"></i> </span>
+                                            </td>
+                                        </tr>
+                                        <tr ng-show="editId ===p.UNI_ID" ng-if="editId === p.UNI_ID">
+                                            <!--<td><pre>{{p.StudentID}}</pre></td>-->
+                                            <td colspan="7">
+
+                                                <div class="container" style="background-color: rgb(248, 248, 248);
+                                        border-radius: 6px;padding: 22px;" ng-init="getPrevStatus(p)">
+                                                    <div ng-if="prevStatusListForStudentCourseLoading" class="text-center">
+                                                        <h3>Fetching ...</h3>
+                                                    </div>
+                                                    <div ng-if="!prevStatusListForStudentCourseLoading">
+                                                        <div ng-if="!prevNoRecordFound">
+                                                            <table class="table">
+                                                                <thead style="background-color: cadetblue">
+                                                                    <th>Status</th>
+                                                                    <th>Comments</th>
+                                                                    <th>Document Name</th>
+                                                                    <th>Date</th>
+                                                                    <th>Updated By</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.AppDate}}</td>
+                                                                    <td>{{s.Firstname}}</td>
+                                                                </tbody>
+                                                            </table>
+                                                        </div>
+                                                        <div ng-if="prevNoRecordFound">
+                                                            <p style="color: red;" align="center"><strong><h4 class="text-center">No
+                                Status Details Exist ... </h4></strong></p>
+                                                        </div>
+                                                        <div class="pull-right">
+                                                            <button type="reset" class="btn btn-warning btn-sm" tabindex="20" ng-click="cancel()">
+                                                Cancel
+                                            </button>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </td>
+
+                                        </tr>
+                                         <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">
+                                <style>
+                                    #cancel_button {
+                                        margin-top: 1px;
+                                        margin-right: 2px;
+                                        position: absolute;
+                                        top: 0;
+                                        right: 0;
+                                    }
+                                </style>
+                                <div class="container">
+                                    <div class="row">
+                                        <div class="col-md-3">
+                                        </div>
+                                        <div class="col-md-6">
+                                            <fieldset style="background-color: #eaeaea;">
+                                                <legend>
+                                                    Update Status
+                                                </legend>
+                                                <div>
+                                                  <a id="cancel_button" ng-click="unSelect()" tooltip="Close">
+                                                        <span class="glyphicon glyphicon-remove-circle"></span>
+                                                        </a>
+                                                </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>
+                                                </label>
+
+                                                        <select class="form-control" tabindex="4" class="cs-select cs-skin-elastic" name="certificatetype" ng-model="myStatusModel.certificatetype"
+                                                            required>
+                                                <option value="" disabled selected>Select Certificate Type</option>
+                                                <option ng-repeat="itemCerf in certificateData"  value="{{itemCerf.CertificationID}}">{{itemCerf.CertificateName}}</option>
+                                                </select>
+                                                        <span class="error text-small block" ng-if="Form.certificatetype.$dirty && Form.certificatetype.$error.required">Certificate Type is Required</span>
+
+                                                    </div>
+                                                    <div class="col-md-6 form-group" ng-class="{'has-error':Form.certificateNumber.$dirty && Form.certificateNumber.$invalid }">
+                                                        <label>
+                                               Certificate Number
+                                                    
+                                            </label>
+                                                        <input type="text" name="certificateNumber" tabindex="5" placeholder="Enter Document Number" class="form-control" ng-model="myStatusModel.certificateNumber"
+                                                        />
+                                                        <span class="error text-small block" ng-if="Form.certificateNumber.$dirty && Form.certificateNumber.$error.required">Certificate Number is Required </span>
+                                                    </div>
+                                                </div>
+                                                <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>
+                                            </fieldset>
+                                        </div>
+                                        <div class="col-md-3">
+
+                                        </div>
+                                    </div>
+                                </div>
+                            </form></div>
+                            <div  ng-if="localTypeSuperAdmin"><form name="Form" id="form" novalidate ng-submit="statusUpdate.submit(Form, myStatusModel , localBranchDetails)" method="post">
+                                <style>
+                                    #cancel_button {
+                                        margin-top: 1px;
+                                        margin-right: 2px;
+                                        position: absolute;
+                                        top: 0;
+                                        right: 0;
+                                    }
+                                </style>
+                                <div class="container">
+                                    <div class="row">
+                                        <div class="col-md-3">
+                                        </div>
+                                        <div class="col-md-6">
+                                            <fieldset style="background-color: #eaeaea;">
+                                                <legend>
+                                                    Update Status
+                                                </legend>
+                                                <div>
+                                                    <a id="cancel_button" ng-click="unSelect()" tooltip="Close">
+                                                        <span class="glyphicon glyphicon-remove-circle"></span>
+                                                        </a>
+                                                </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>
+                                                </label>
+
+                                                        <select class="form-control" tabindex="4" class="cs-select cs-skin-elastic" name="certificatetype" ng-model="myStatusModel.certificatetype"
+                                                            required>
+                                                <option value="" disabled selected>Select Certificate Type</option>
+                                                <option ng-repeat="itemCerf in certificateData"  value="{{itemCerf.CertificationID}}">{{itemCerf.CertificateName}}</option>
+                                                </select>
+                                                        <span class="error text-small block" ng-if="Form.certificatetype.$dirty && Form.certificatetype.$error.required">Certificate Type is Required</span>
+
+                                                    </div>
+                                                    <div class="col-md-6 form-group" ng-class="{'has-error':Form.certificateNumber.$dirty && Form.certificateNumber.$invalid }">
+                                                        <label>
+                                               Certificate Number
+                                                    
+                                            </label>
+                                                        <input type="text" name="certificateNumber" tabindex="5" placeholder="Enter Document Number" class="form-control" ng-model="myStatusModel.certificateNumber"
+                                                        />
+                                                        <span class="error text-small block" ng-if="Form.certificateNumber.$dirty && Form.certificateNumber.$error.required">Certificate Number is Required </span>
+                                                    </div>
+                                                </div>
+                                                <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>
+                                            </fieldset>
+                                        </div>
+                                        <div class="col-md-3">
+
+                                        </div>
+                                    </div>
+                                </div>
+                            </form></div>
+                            
+                        </div>
+                                            </td>
+                                        </tr>
+                                    </tbody>
+                                </table>
+                                <dir-pagination-controls max-size="10" direction-links="true" boundary-links="true">
+                                </dir-pagination-controls>
+                            </div>
+                        </div>
+
+                        <!--<div ng-if="OpenWindowStatus">
+                            <div  ng-if="!localTypeSuperAdmin"><form name="Form" id="form" novalidate ng-submit="statusUpdate.submit(Form, myStatusModel , localBranchDetails)" method="post">
+                                <style>
+                                    #cancel_button {
+                                        margin-top: 1px;
+                                        margin-right: 2px;
+                                        position: absolute;
+                                        top: 0;
+                                        right: 0;
+                                    }
+                                </style>
+                                <div class="container">
+                                    <div class="row">
+                                        <div class="col-md-3">
+                                        </div>
+                                        <div class="col-md-6">
+                                            <fieldset style="background-color: #eaeaea;">
+                                                <legend>
+                                                    Update Status
+                                                </legend>
+                                                <div>
+                                                  <a id="cancel_button" ng-click="unSelect()" tooltip="Close">
+                                                        <span class="glyphicon glyphicon-remove-circle"></span>
+                                                        </a>
+                                                </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">
+                                               Document Type <span class="symbol required"></span>
+                                                </label>
+
+                                                        <select class="form-control" tabindex="4" class="cs-select cs-skin-elastic" name="certificatetype" ng-model="myStatusModel.certificatetype"
+                                                            required>
+                                                <option value="" disabled selected>Select Document Type</option>
+                                                <option ng-repeat="itemCerf in certificateData"  value="{{itemCerf.CertificationID}}">{{itemCerf.CertificateName}}</option>
+                                                </select>
+                                                        <span class="error text-small block" ng-if="Form.certificatetype.$dirty && Form.certificatetype.$error.required">Document Type is Required</span>
+
+                                                    </div>
+                                                    <div class="col-md-6 form-group" ng-class="{'has-error':Form.certificateNumber.$dirty && Form.certificateNumber.$invalid }">
+                                                        <label>
+                                               Document Number
+                                                    
+                                            </label>
+                                                        <input type="text" name="certificateNumber" tabindex="5" placeholder="Enter Document Number" class="form-control" ng-model="myStatusModel.certificateNumber"
+                                                        />
+                                                        <span class="error text-small block" ng-if="Form.certificateNumber.$dirty && Form.certificateNumber.$error.required">Document Number is Required </span>
+                                                    </div>
+                                                </div>
+                                                <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>
+                                            </fieldset>
+                                        </div>
+                                        <div class="col-md-3">
+
+                                        </div>
+                                    </div>
+                                </div>
+                            </form></div>
+                            <div  ng-if="localTypeSuperAdmin"><form name="Form" id="form" novalidate ng-submit="statusUpdate.submit(Form, myStatusModel , localBranchDetails)" method="post">
+                                <style>
+                                    #cancel_button {
+                                        margin-top: 1px;
+                                        margin-right: 2px;
+                                        position: absolute;
+                                        top: 0;
+                                        right: 0;
+                                    }
+                                </style>
+                                <div class="container">
+                                    <div class="row">
+                                        <div class="col-md-3">
+                                        </div>
+                                        <div class="col-md-6">
+                                            <fieldset style="background-color: #eaeaea;">
+                                                <legend>
+                                                    Update Status
+                                                </legend>
+                                                <div>
+                                                    <a id="cancel_button" ng-click="unSelect()" tooltip="Close">
+                                                        <span class="glyphicon glyphicon-remove-circle"></span>
+                                                        </a>
+                                                </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">
+                                               Document Type <span class="symbol required"></span>
+                                                </label>
+
+                                                        <select class="form-control" tabindex="4" class="cs-select cs-skin-elastic" name="certificatetype" ng-model="myStatusModel.certificatetype"
+                                                            required>
+                                                <option value="" disabled selected>Select Document Type</option>
+                                                <option ng-repeat="itemCerf in certificateData"  value="{{itemCerf.CertificationID}}">{{itemCerf.CertificateName}}</option>
+                                                </select>
+                                                        <span class="error text-small block" ng-if="Form.certificatetype.$dirty && Form.certificatetype.$error.required">Document Type is Required</span>
+
+                                                    </div>
+                                                    <div class="col-md-6 form-group" ng-class="{'has-error':Form.certificateNumber.$dirty && Form.certificateNumber.$invalid }">
+                                                        <label>
+                                               Document Number
+                                                    
+                                            </label>
+                                                        <input type="text" name="certificateNumber" tabindex="5" placeholder="Enter Document Number" class="form-control" ng-model="myStatusModel.certificateNumber"
+                                                        />
+                                                        <span class="error text-small block" ng-if="Form.certificateNumber.$dirty && Form.certificateNumber.$error.required">Document Number is Required </span>
+                                                    </div>
+                                                </div>
+                                                <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>
+                                            </fieldset>
+                                        </div>
+                                        <div class="col-md-3">
+
+                                        </div>
+                                    </div>
+                                </div>
+                            </form></div>
+                            
+                        </div>-->
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<!-- end: STUDY MATERIAL STATUS -->
+
+<section id="page-title">
+    <div class="row">
+        <div class="col-sm-8">
+            <!--<h1 class="mainTitle" translate="sidebar.nav.student.status.STUDYMATERIAL">{{ mainTitle }}</h1>
+            <span class="mainDescription"></span>-->
+        </div>
+        <!--<div ncy-breadcrumb></div>-->
+    </div>
+</section>