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

Apollo/api/application/config/database.php

@@ -79,6 +79,7 @@ $db['default'] = array(
     'username' => 'apollod4_DEV',
     'password' => 'apollo1234',
 	'database' => 'apollod4_ApolloDECDev',
+	
 	'dbdriver' => 'mysqli',
 	'dbprefix' => '',
 	'pconnect' => FALSE,

Apollo/api/application/controllers/HallTickets_Controller.php

@@ -67,11 +67,16 @@ class HallTickets_Controller extends REST_Controller {
 	 public function getSheduleDetails_post()
     {
 		
+		$courseDetails =$this->post('courseDetails');
+		//print_r($courseDetails);
+	    $CourseID =  $courseDetails['CourseID'];
+		$universityID= $courseDetails['UniversityID'];
+		//print_r($courseDetails);
 		$mapid = $this->post('mapid');
        	$subid = $this->post('subid');
 		$branchcode = $this->post('branchcode');
         //$getSheduleData = $this->Hallticket_model->getShedules($mapid);
-		$get_unShedules = $this->Hallticket_model->get_unShedules($mapid,$subid,$branchcode);
+		$get_unShedules = $this->Hallticket_model->get_unShedules($mapid,$subid,$branchcode,$CourseID,$universityID);
 		//print_r($get_unShedules);
         if ($get_unShedules)
         {

Apollo/api/application/models/Data_correction.php

@@ -136,7 +136,12 @@ group by Student_id,cid";
 
         $coursearr['IsActive'] = $search['IsActive'];
         $coursearr['DeactiveComments'] =$search['Reason'];
+
+          if( $search['IsActive'] ==0)
+        {
         $coursearr['Deactive'] = '0';
+        }
+       
         $this->db->where('StudentID', $search['studentId']);
         $this->db->where('UniversityID', $search['University']);
         $this->db->where('CourseID', $search['courseId']);

Apollo/api/application/models/DayBook_model.php

@@ -74,7 +74,7 @@ class DayBook_model extends CI_Model
         LEFT JOIN ".STAFF." as t5 ON t5.StaffID = t4.StaffID
         LEFT JOIN ".COURSE." as t6 ON t6.CourseID = t1.CourseID AND t6.BranchCode = t1.BranchCode
         LEFT JOIN ".UNIVERSITY." as t7 ON t7.UniversityID = t6.UniversityID AND t7.BranchCode = t1.BranchCode
-        WHERE STR_TO_DATE(t1.Date, '%d-%m-%Y') BETWEEN '$fromDate' 
+        WHERE date_format(t1.CreatedOn,'%Y-%m-%d') BETWEEN '$fromDate' 
         AND '$toDate' AND t1.BranchCode = '$reqpayType' ORDER BY ORDER_ID DESC";
 // echo $querys;exit();
         // $this->db->where(' STR_TO_DATE(t1.Date, %d-%m-%Y) >=', $fromDate);
@@ -760,7 +760,7 @@ $query = $this->db->query($subQuery,array('%d-%m-%Y',$fromd,'%d-%m-%Y',$tod,'Can
     {
          //if($search['MobileNumber']!='' && $search['Firstname']!='' && $search['receipt']!='')
          //{
-        $this->db->select('T_Students_Fees_PaidDetails.ID,T_Students_Fees_PaidDetails.StudentID,T_StudentDetails.Firstname,T_Students_Fees_PaidDetails.FeesID,T_Students_Fees_PaidDetails.BillNO,T_Students_Fees_PaidDetails.BillDate,T_Students_Fees_PaidDetails.BillAmount,T_Students_Fees_PaidDetails.InternalComments,T_Students_Fees_PaidDetails.IsActive,T_Students_Fees_PaidDetails.ReceiptNo');
+        $this->db->select('T_Students_Fees_PaidDetails.ID,T_Students_Fees_PaidDetails.StudentID,T_StudentDetails.Firstname,T_Students_Fees_PaidDetails.FeesID,T_Students_Fees_PaidDetails.BillNO,T_Students_Fees_PaidDetails.BillDate,T_Students_Fees_PaidDetails.BillAmount,T_Students_Fees_PaidDetails.InternalComments as Reason,T_Students_Fees_PaidDetails.IsActive,T_Students_Fees_PaidDetails.ReceiptNo');
         $this->db->from('T_Students_Fees_PaidDetails');
         $this->db->join('T_StudentDetails','T_StudentDetails.StudentID=T_Students_Fees_PaidDetails.StudentID','left');
         
@@ -815,29 +815,32 @@ $query = $this->db->query($subQuery,array('%d-%m-%Y',$fromd,'%d-%m-%Y',$tod,'Can
         $dateTime = $time;
 
        // echo $dateTime;
-        // die();
+         //die();
          
          //$daybookarr['ID'] = $up_details['ID'];
-        // $daybookarr['IsActive'] = $up_details['IsActive']; 
+        $daybookarr['IsActive'] = $up_details['IsActive']; 
-        // $daybookarr['Reason'] = $up_details['Reason'];
+        $daybookarr['Reason'] = $up_details['Reason'];
-        // $daybookarr['UpdatedOn'] = $dateTime;
+        $daybookarr['UpdatedOn'] = $dateTime;
-        // $daybookarr['UpdatedBy'] =$up_details['requestedtBy'];
+        $daybookarr['UpdatedBy'] =$up_details['requestedtBy'];
 
 
-         // if($up_details['IsActive'] == 0)
+         if($up_details['IsActive'] == 0)
-         // {
+         {
-            // $daybookarr['Status'] = 'Cancel';
+            $daybookarr['Status'] = 'Cancel';
-         // }
+         }
 
-         // else
+         else
-         // {
+         {
-            // $daybookarr['Status'] = 'Approved';
+            $daybookarr['Status'] = 'Approved';
-         // }
+         }
 
 
+//print_r($daybookarr);
+//die();
          
-         // $this->db->where('ID', $daybookarr['ID']);
+
-         // $this->db->update('T_DayBookMaster', $daybookarr);
+         $this->db->where('FeesPaymentID', $up_details['ID']);
+         $this->db->update('T_DayBookMaster', $daybookarr);
 
 
          //$feearr['ID'] = $up_details['FeesPaymentID'];

Apollo/api/application/models/Hallticket_model.php

@@ -103,19 +103,33 @@ class Hallticket_model extends CI_Model
      * for edit/view shedule
      * created by TamilBala
      * */
-		public function get_unShedules($mapid,$subid,$branchcode)
+	 ////////////
-		{
+    //    $this->db->join('T_Batch_Schedule_Child','T_Batch_Schedule_Child.SchId = SCM.SchId');
+	// 	$this->db->join('T_SemSubMap_Master','T_SemSubMap_Master.UniversityID=SCM.UniversityID and T_SemSubMap_Master.CourseID=SCM.CourseID');
+	// 	$this->db->join('T_SemSubMap_Child','T_SemSubMap_Child.MapID=T_SemSubMap_Master.MapID');
+	// 	$this->db->join('T_SubjectMaster','T_SubjectMaster.SubjectID=T_SemSubMap_Child.SubjectID');
 
-		$this->db->select('SM.SubjectName,SM.SubjectID');
+	// 	$this->db->where('T_SemSubMap_Master.UniversityID',$universityID);
-		$this->db->from('T_SubjectMaster SM');
+    //     $this->db->where('T_SemSubMap_Master.CourseID',$CourseID);
-		$this->db->join('T_Batch_Schedule_Child','T_Batch_Schedule_Child.SubjectID=SM.SubjectID');
+		////////////
-		$this->db->where('SM.BranchCode',$branchcode);
+		public function get_unShedules($mapid,$subid,$branchcode,$CourseID,$universityID)
-		$this->db->where('T_Batch_Schedule_Child.SchId',$mapid);
+		{
-        $result = $this->db->get();	
+		//echo $mapid;
-		if($result->result()){
+	$sql="SELECT semchild.SubjectID,semchild.MapID,bsc.ScheduleDate,bsc.FromTime,bsc.ToTime,sm.SubjectName
+           FROM T_SemSubMap_Child  semchild 
+          LEFT JOIN T_SemSubMap_Master semmaster ON semmaster.MapID = semchild.MapID
+          LEFT JOIN T_Batch_Schedule_Master bsm ON bsm.UniversityID = semmaster.UniversityID
+and bsm.CourseID=semmaster.CourseID
+LEFT JOIN T_Batch_Schedule_Child bsc ON bsc.SchId = bsm.SchId and bsc.SubjectID=semchild.SubjectID
+LEFT JOIN T_SubjectMaster sm ON sm.SubjectID=semchild.SubjectID
+WHERE semchild.isActive = '1' and bsm.SchId='".$mapid."'
+group by semchild.SubjectID,semchild.MapID";
+  $b=$this->db->query($sql);
+     //print_r($b);	
+		if($b->result()){
 			$resultShedule['status']=true;
 			$mastScheduleID="";
-			foreach($result->result() as $row)
+			foreach($b->result() as $row)
 		{
 	
 		$this->db->select('T_Batch_Schedule_Child.SchId,T_Batch_Schedule_Child.SubjectID,T_Batch_Schedule_Child.ScheduleDate,T_Batch_Schedule_Child.FromTime,T_Batch_Schedule_Child.ToTime,T_Batch_Schedule_Child.SchChildId,T_Batch_Schedule_Child.SchId');
@@ -125,7 +139,7 @@ class Hallticket_model extends CI_Model
        // $this->db->where('T_Batch_Schedule_Child.SchId',$mapid);
 		$this->db->where('T_Batch_Schedule_Child.SubjectID',$row->SubjectID);
         $existsheduledetails = $this->db->get();
-		
+		//print_r($existsheduledetails);
         if($existData=$existsheduledetails->result())
 		{
 		

Apollo/api/application/models/Student_model.php

@@ -413,7 +413,12 @@ class Student_model extends CI_Model {
         $this->db->where('IsActive', 1);
         $this->db->where('BranchCode', $branch);
         $courseDetails = $this->db->get();
+ // print_r($courseDetails->result());
+ // die();
+
         if ($courseDetails->result()) {
+
+
             $this->db->select('B.SessionID, B.SessionName');
             $this->db->from(SESSIONMASTER . ' as B');
             $this->db->join(SESSIONDETAILS . ' SD', 'SD.SessionID = B.SessionID');
@@ -421,6 +426,10 @@ class Student_model extends CI_Model {
             $this->db->where('B.IsActive', 1);
             $this->db->where('SD.IsActive', 1);
             $batchDetails = $this->db->get();
+
+//print_r($batchDetails->result());
+//die();
+
             if ($batchDetails->result()) {
                 $result['courseStatus'] = true;
                 $result['course_details'] = $courseDetails->result();

Apollo/assets/i18n/en.json

@@ -158,7 +158,8 @@
       "entry": {
         "MAIN": "My Details",
         "coursecorrection": "Course Details",
-		"stud_merge": "Student Merge"
+		"stud_merge": "Student Merge",
+    "DATACORRECTION" : "Bills Correction"
       },
       "announcement": {
         "MAIN": "ANNOUNCEMENT",

Apollo/assets/js/config.router.js

@@ -178,7 +178,7 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com
                 ncyBreadcrumb: {
                     label: 'income_expense'
                 },
-            }).state('app.daybooksuperadmin.datacorrection', {
+            }).state('app.entry.datacorrection', {
                 url: '/datacorrection',
                 templateUrl: "assets/views/data_correction.html",
                 resolve: loadSequence('datacorrectionCtrl','ngTable', 'ladda', 'angular-ladda'),

Apollo/assets/js/controllers/entrycorrectionCtrl.js

@@ -76,6 +76,8 @@ $scope.universitySearchData = '';
 
 
      $scope.studentInfo="";
+      $scope.mobileNo='';
+     $scope.student_Name='';
     $scope.getStudentDetails = function (form,myModel)
     {
        
@@ -85,6 +87,8 @@ $scope.universitySearchData = '';
           var studentName = myModel.studentName;
           var receipt = myModel.receipt;
           $scope.universityId = myModel.myUnivSearch;
+          $scope.mobileNo=myModel.mobileNumber;
+           $scope.student_Name=myModel.studentName;
           // console.log($scope.universityId);
           // return false;
 
@@ -249,7 +253,44 @@ $scope.universitySearchData = '';
              $http(updatecourse).then(function (response) {
                  swal('Change Saved Successfully', response.data.message, "success");
                  $scope.close();
-                 $scope.getStudentDetails(form,myModel);
+                // $scope.getStudentDetails(form,myModel);
+
+                   $scope.isLoaderShow= false
+
+          var getdetail = {
+                method: 'POST',
+                url: apiPoint.url + 'getAllstudentcoursedetail/',
+                headers: {
+                    'Content-Type': 'application/json'
+                },
+                data :{
+                    studentName: $scope.student_Name,
+                    mobileNumber: $scope.mobileNo,
+                    receipt: myModel.receipt,
+                    University:$scope.universityId,
+                    requestedtBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
+                    branchId: JSON.parse(localStorage.getItem('localObj')).localBranchID,
+                    requestedDept: JSON.parse(localStorage.getItem('localObj')).localType,
+                }
+
+          };
+
+            $http(getdetail).then(function (response) {
+
+                //console.log(response)
+                 if (response.data.status==200 && response.data.studentStatus) {
+                    $scope.studentInfo=response.data.details;
+                   console.log($scope.studentInfo);
+
+                } else {
+                    $scope.studentInfo="";
+
+                     $scope.isLoaderShow = true;
+                     $scope.load = "No Records Found";
+
+                }
+               
+            });
 
             });
 

Apollo/assets/js/controllers/schCtrl.js

@@ -51,6 +51,8 @@ app.controller('schCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableP
         $scope.editId = pid;
 		$scope.courseCode = cid;
 		$scope.mappingid = schid;
+		//$scope.sample=subid;
+		$scope.sample1=c;
 		//alert(mappingid+'n');
 		 var getsheduledetails = {
             method: 'POST',
@@ -63,7 +65,7 @@ app.controller('schCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableP
 				mapid:$scope.mappingid,
 				subid:subid,
 				branchcode:branchid,
-				
+			    courseDetails:$scope.sample1
 				
 				}
         };

Apollo/assets/views/StudentMerge.html

@@ -76,8 +76,8 @@ td,th {
                            
                         <th>Student Name</th>
                         <th>Mobile Number</th>
-                        <th>Course Name</th>
                         <th>University</th>
+                        <th>Course Name</th>
                         <th>Action</th>
                        
                         
@@ -89,8 +89,8 @@ td,th {
                            
                         <td>{{p.Student_name}}</td>
                         <td>{{p.Phone_number}}</td>
-                        <td>{{p.Course_name}}</td>
                         <td>{{p.University}}</td>
+                        <td>{{p.Course_name}}</td>
                         <td style="text-align:center;"><input type="checkbox" ng-checked="myModel.all" id="{{p.Phone_number}}" name="{{p.Phone_number}}" class="form-control" ng-click="isClick($event);" style="width:17px" /></td>
                         
                         

Apollo/assets/views/activity.html

@@ -16,7 +16,7 @@
                         <span class="mainDescription">Add / Edit Activity list used for call tracking. </span>
 
         </div>
-        <div ncy-breadcrumb></div>
+        <!-- <div ncy-breadcrumb></div>-->
     </div>
 </section>
 <div class="container-fluid container-fullw bg-white">

Apollo/assets/views/add_income_expense.html

@@ -14,7 +14,7 @@
             <span class="mainDescription">Add New Income Expense Types. </span>
 
         </div>
-        <div ncy-breadcrumb></div>
+       <!-- <div ncy-breadcrumb></div>-->
     </div>
 </section>
 <div class="container-fluid container-fullw bg-white">

Apollo/assets/views/announcement/Announcement.html

@@ -15,7 +15,7 @@
 			<h1 class="mainTitle" translate="Announcement ">{{ mainTitle }}</h1>
               <span class="mainDescription">Add/View Announcement Details. </span> 
 		</div>
-		<div ncy-breadcrumb></div>
+		<!-- <div ncy-breadcrumb></div>-->
 	</div>
 </section>
 <!-- end: PAGE TITLE -->

Apollo/assets/views/batch.html

@@ -21,7 +21,7 @@
                         <span class="mainDescription">Add/View Batch Details. </span>
            
         </div>
-        <div ncy-breadcrumb></div>
+        <!-- <div ncy-breadcrumb></div>-->
     </div>
 </section>
 <!-- end: PAGE TITLE -->

Apollo/assets/views/branchDetails.html

@@ -25,7 +25,7 @@
                         <span class="mainDescription">Add/View Branch Details. </span>
            
         </div>
-        <div ncy-breadcrumb></div>
+       <!-- <div ncy-breadcrumb></div>-->
     </div>
 </section>
 <!-- end: PAGE TITLE -->

Apollo/assets/views/callTrackingCloseDetails.html

@@ -37,7 +37,7 @@
              <span class="mainDescription">View all closed leads. </span>
            
         </div>
-        <div ncy-breadcrumb></div>
+       <!-- <div ncy-breadcrumb></div>-->
     </div>
 </section>
 <!-- end: PAGE TITLE -->

Apollo/assets/views/callTrackingDetails.html

@@ -38,7 +38,7 @@
                         <span class="mainDescription">Manage new leads. </span>
            
         </div>
-        <div ncy-breadcrumb></div>
+        <!-- <div ncy-breadcrumb></div>-->
     </div>
 </section>
 <!-- end: PAGE TITLE -->

Apollo/assets/views/callTrackingLeadDetails.html

@@ -38,7 +38,7 @@
                         <span class="mainDescription">Leads created on a given date. </span>
            
         </div>
-        <div ncy-breadcrumb></div>
+        <!-- <div ncy-breadcrumb></div>-->
     </div>
 </section>
 <!-- end: PAGE TITLE -->

Apollo/assets/views/callTrackingPendingDetails.html

@@ -38,7 +38,7 @@
                         <span class="mainDescription">View all open Leads.</span>
            
         </div>
-        <div ncy-breadcrumb></div>
+        <!-- <div ncy-breadcrumb></div>-->
     </div>
 </section>
 <!-- end: PAGE TITLE -->

Apollo/assets/views/centerMaster.html

@@ -17,7 +17,7 @@
                         <span class="mainDescription">Over a dozen reusable components built to provide popovers, media objects, navigation, tooltips and much more. </span>
             -->
         </div>
-        <div ncy-breadcrumb></div>
+        <!-- <div ncy-breadcrumb></div>-->
     </div>
 </section>
 <!-- end: PAGE TITLE -->

Apollo/assets/views/certificate/certificate.html

@@ -14,7 +14,7 @@
             <h1 class="mainTitle" translate="Certificate Type"></h1>
               <span class="mainDescription">Add/Edit certificate type. </span>
         </div>
-        <div ncy-breadcrumb></div>
+        <!-- <div ncy-breadcrumb></div>-->
     </div>
 </section>
 <div class="container-fluid container-fullw bg-white">

Apollo/assets/views/changePassword.html

@@ -5,7 +5,7 @@
         <div class="col-sm-8">
             <h1 class="mainTitle">Change Password</h1>
         </div>
-        <div ncy-breadcrumb></div>
+        <!-- <div ncy-breadcrumb></div>-->
     </div>
 </section>
 <!-- end: PAGE TITLE -->

Apollo/assets/views/charts.html

@@ -5,7 +5,7 @@
 			<h1 class="mainTitle" translate="sidebar.nav.charts.MAIN">{{ mainTitle }}</h1>
 			<span class="mainDescription">Tc-angular-chartjs provides you with directives for all chartjs chart types.</span>
 		</div>
-		<div ncy-breadcrumb></div>
+		<!-- <div ncy-breadcrumb></div>-->
 	</div>
 </section>
 <!-- end: PAGE TITLE -->

Apollo/assets/views/courseDetails.html

@@ -17,7 +17,7 @@
                         <span class="mainDescription">Add/View Course Details. </span>
 
         </div>
-        <div ncy-breadcrumb></div>
+        <!-- <div ncy-breadcrumb></div>-->
     </div>
 </section>
 <!-- end: PAGE TITLE -->

Apollo/assets/views/daybook/dayBookApproval.html

@@ -4,7 +4,7 @@
         <div class="col-sm-8">
             <h1 class="mainTitle" translate="sidebar.nav.daybook.DAYBOOKAPPROVAL">{{ mainTitle }}</h1>
         </div>
-        <div ncy-breadcrumb></div>
+        <!-- <div ncy-breadcrumb></div>-->
     </div>
 </section>
 <!-- end: PAGE TITLE -->

Apollo/assets/views/daybook/dayBookMaster.html

@@ -16,7 +16,7 @@
                         <span class="mainDescription">Add/Edit Income/Expense heads. </span>
            
         </div>
-        <div ncy-breadcrumb></div>
+        <!-- <div ncy-breadcrumb></div>-->
     </div>
 </section>
 <div class="container-fluid container-fullw bg-white">

Apollo/assets/views/daybook/dayBookadminApproval.html

@@ -4,7 +4,7 @@
         <div class="col-sm-8">
             <h1 class="mainTitle" translate="sidebar.nav.daybook.DAYBOOKAPPROVAL">{{ mainTitle }}</h1>
         </div>
-        <div ncy-breadcrumb></div>
+        <!-- <div ncy-breadcrumb></div>-->
     </div>
 </section>
 <!-- end: PAGE TITLE -->

Apollo/assets/views/daybook/daybook.html

@@ -4,7 +4,7 @@
         <div class="col-sm-8">
             <h1 class="mainTitle" translate="sidebar.nav.daybook.DAYBOOKDETAILS">{{ mainTitle }}</h1>
         </div>
-        <div ncy-breadcrumb></div>
+        <!-- <div ncy-breadcrumb></div>-->
     </div>
 </section>
 <!-- end: PAGE TITLE -->

Apollo/assets/views/daybook/daybookadmin.html

@@ -4,7 +4,7 @@
         <div class="col-sm-8">
             <h1 class="mainTitle" translate="sidebar.nav.daybook.DAYBOOKDETAILS">{{ mainTitle }}</h1>
         </div>
-        <div ncy-breadcrumb></div>
+        <!-- <div ncy-breadcrumb></div>-->
     </div>
 </section>
 <!-- end: PAGE TITLE -->

Apollo/assets/views/daybook/daybooksuperAdminApproval.html

@@ -4,7 +4,7 @@
         <div class="col-sm-8">
             <h1 class="mainTitle" translate="sidebar.nav.daybook.DAYBOOKAPPROVAL">{{ mainTitle }}</h1>
         </div>
-        <div ncy-breadcrumb></div>
+        <!-- <div ncy-breadcrumb></div>-->
     </div>
 </section>
 <!-- end: PAGE TITLE -->

Apollo/assets/views/daybook/daybooksuperadmin.html

@@ -4,7 +4,7 @@
         <div class="col-sm-8">
             <h1 class="mainTitle" translate="sidebar.nav.daybook.DAYBOOKDETAILS">{{ mainTitle }}</h1>
         </div>
-        <div ncy-breadcrumb></div>
+        <!-- <div ncy-breadcrumb></div>-->
     </div>
 </section>
 <!-- end: PAGE TITLE -->

Apollo/assets/views/documentation.html

@@ -4,7 +4,7 @@
 			<h1 class="mainTitle" translate="sidebar.heading.DOCUMENTATION">{{ mainTitle }}</h1>
 			<span class="mainDescription">Getting started with {{app.name}} is easy. Whether you are a master of Sass, building a new app, or making your existing site responsive, we've got you covered.</span>
 		</div>
-		<div ncy-breadcrumb></div>
+		<!-- <div ncy-breadcrumb></div>-->
 	</div>
 </section>
 <div class="container-fluid container-fullw bg-white">

Apollo/assets/views/employeeDetails.html

@@ -7,7 +7,7 @@
                         <span class="mainDescription">View/Add Employee Details. </span>
            
         </div>
-        <div ncy-breadcrumb></div>
+        <!-- <div ncy-breadcrumb></div>-->
     </div>
 </section>
 <!-- end: EMPLOYEE TITLE -->

Apollo/assets/views/feesNotification.html

@@ -7,7 +7,7 @@
                         <span class="mainDescription">Over a dozen reusable components built to provide popovers, media objects, navigation, tooltips and much more. </span>
             -->
         </div>
-        <div ncy-breadcrumb></div>
+        <!-- <div ncy-breadcrumb></div>-->
     </div>
 </section>
 <!-- end: PAGE TITLE -->

Apollo/assets/views/generateHallTicket.html

@@ -30,7 +30,7 @@
             <span class="mainDescription">Generate halltickets. </span>
 
         </div>
-        <div ncy-breadcrumb></div>
+        <!-- <div ncy-breadcrumb></div>-->
     </div>
 </section>
 <!-- end: PAGE TITLE -->

Apollo/assets/views/hallticket/batchshedule.html

@@ -30,7 +30,7 @@
             <span class="mainDescription">Allocate Batch schedule </span>
 
         </div>
-        <div ncy-breadcrumb></div>
+        <!-- <div ncy-breadcrumb></div>-->
     </div>
 </section>
 <!-- end: PAGE TITLE -->

Apollo/assets/views/hallticket/examAttendance.html

@@ -30,7 +30,7 @@
             <span class="mainDescription">Examination Attendance  </span>
 
         </div>
-        <div ncy-breadcrumb></div>
+        <!-- <div ncy-breadcrumb></div>-->
     </div>
 </section>
 <!-- end: PAGE TITLE -->

Apollo/assets/views/hallticket/generatehallticket.html

@@ -30,7 +30,7 @@
             <span class="mainDescription">Generate Halltickets For Student  </span>
 
         </div>
-          <div ncy-breadcrumb></div>
+         <!-- <div ncy-breadcrumb></div>-->
         </div>
 </section>
 <!-- end: PAGE TITLE -->

Apollo/assets/views/hallticket/semcoursemap.html

@@ -30,7 +30,7 @@
             <span class="mainDescription">Allocate Courses to Corresponding Subjects </span>
 
         </div>
-        <div ncy-breadcrumb></div>
+        <!-- <div ncy-breadcrumb></div>-->
     </div>
 </section>
 <!-- end: PAGE TITLE -->

Apollo/assets/views/maps.html

@@ -5,7 +5,7 @@
 			<h1 class="mainTitle" translate="sidebar.nav.maps.MAIN">{{ mainTitle }}</h1>
 			<span class="mainDescription">The Simplest Way of Showing A Map</span>
 		</div>
-		<div ncy-breadcrumb></div>
+		<!-- <div ncy-breadcrumb></div>-->
 	</div>
 </section>
 <!-- end: PAGE TITLE -->

Apollo/assets/views/myProfile/myProfile.html

@@ -4,7 +4,7 @@
         <div class="col-sm-8">
             <h1 class="mainTitle" translate="sidebar.nav.profile.MAIN">{{ mainTitle }}</h1>
         </div>
-        <div ncy-breadcrumb></div>
+        <!-- <div ncy-breadcrumb></div>-->
     </div>
 </section>
 <!-- end: PAGE TITLE -->

Apollo/assets/views/partials/nav.html

@@ -1,4 +1,4 @@
-<!-- start: MAIN NAVIGATION MENU -->
+<!--start: MAIN NAVIGATION MENU -->
 
 <!-- start: Super Admin -->
 
@@ -328,11 +328,11 @@
 			</li>
 
 
-			<li ui-sref-active="active">
+			<!-- <li ui-sref-active="active">
 				<a ui-sref="app.daybooksuperadmin.datacorrection"  ng-click="checkSuperAdmin()">
 					<span class="title" translate="sidebar.nav.daybook.DATACORRECTION"> DATA CORRECTION</span>
 				</a>
-			</li>
+			</li> -->
 
 
 
@@ -561,6 +561,12 @@
 				</a>
 			</li>
 
+			<li ui-sref-active="active">
+				<a ui-sref="app.entry.datacorrection"  ng-click="checkSuperAdmin()">
+					<span class="title" translate="sidebar.nav.entry.DATACORRECTION"> DATA CORRECTION</span>
+				</a>
+			</li>
+			
 		</ul>
 	</li>
 </ul>
@@ -849,11 +855,11 @@
 			</li>
 
 
-			<li ui-sref-active="active">
+		<!-- 	<li ui-sref-active="active">
 				<a ui-sref="app.daybooksuperadmin.datacorrection"  ng-click="checkAdmin()">
 					<span class="title" translate="sidebar.nav.daybook.DATACORRECTION"> DATA CORRECTION</span>
 				</a>
-			</li>
+			</li> -->
 
 
 
@@ -1038,7 +1044,7 @@
 
 			  
 				<li ui-sref-active="active">
-						<a ui-sref="app.reports.feeCollect" ng-click="checkSuperAdmin()">
+						<a ui-sref="app.reports.feeCollect" ng-click="checkAdmin()">
 							<span class="title" translate="sidebar.nav.report.feeCollect">Report For Fees Collection</span>
 						</a>
 				</li>		
@@ -1059,6 +1065,45 @@
 		</a>
 
 	</li>-->
+
+
+
+   <li ng-class="{'active open':$state.includes('app.entry')}">
+			<a href="javascript:void(0)">
+			<div class="item-content">
+				<div class="item-media">
+					<i class="ti-pencil"></i>
+				</div>
+				<div class="item-inner">
+					<span class="title" translate="sidebar.nav.master.ENTRY"> ENTRY </span><i class="icon-arrow"></i>
+				</div>
+			</div>
+		</a>
+		
+		<ul class="sub-menu">
+			
+			<li ui-sref-active="active">
+				<a ui-sref="app.entry.coursecorrection" ng-click="checkAdmin()">
+					<span class="title" translate="sidebar.nav.entry.coursecorrection">COURSECORRECTION</span>
+				</a>
+			</li>
+			<li ui-sref-active="active">
+				<a ui-sref="app.entry.stud_merge" ng-click="checkAdmin()">
+					<span class="title" translate="sidebar.nav.entry.stud_merge">Student Merge</span>
+				</a>
+			</li>
+
+			<li ui-sref-active="active">
+				<a ui-sref="app.entry.datacorrection"  ng-click="checkAdmin()">
+					<span class="title" translate="sidebar.nav.entry.DATACORRECTION"> DATA CORRECTION</span>
+				</a>
+			</li>
+			
+		</ul>
+	</li>
+
+
+
 </ul>
 
 <!-- end: Admin -->
@@ -1613,4 +1658,4 @@
 		<span translate="sidebar.heading.DOCUMENTATION">Documentation</span>
 	</a>
 </div>-->
-<!-- end: DOCUMENTATION BUTTON -->
+<!-- end: DOCUMENTATION BUTTON

Apollo/assets/views/reregistration/promotebatch.html

@@ -30,7 +30,7 @@
             <span class="mainDescription">Promote Students From One Batch To Next Batch</span>
 
         </div>
-        <div ncy-breadcrumb></div>
+        <!-- <div ncy-breadcrumb></div>-->
     </div>
 </section>
 <!-- end: PAGE TITLE -->

Apollo/assets/views/reregistration/reregistrationform.html

@@ -30,7 +30,7 @@
             <span class="mainDescription">Re Registration Per Semesters </span>
 
         </div>
-        <div ncy-breadcrumb></div>
+        <!-- <div ncy-breadcrumb></div>-->
     </div>
 </section>
 <!-- end: PAGE TITLE -->

Apollo/assets/views/sendSMS/sendSMSDetailssuperadmin.html

@@ -4,7 +4,7 @@
         <div class="col-sm-8">
             <h1 class="mainTitle" translate="sidebar.nav.sendSMSPage.MAIN">{{ mainTitle }}</h1>
         </div>
-        <div ncy-breadcrumb></div>
+        <!-- <div ncy-breadcrumb></div>-->
     </div>
 </section>
 <!-- end: PAGE TITLE -->

Apollo/assets/views/sendSMS/sendSMSsuperadmin.html

@@ -4,7 +4,7 @@
         <div class="col-sm-8">
             <h1 class="mainTitle" translate="sidebar.nav.sendSMSPage.MAIN">{{ mainTitle }}</h1>
         </div>
-        <div ncy-breadcrumb></div>
+       <!-- <div ncy-breadcrumb></div>-->
     </div>
 </section>
 <!-- end: PAGE TITLE -->

Apollo/assets/views/sessionMaster.html

@@ -17,7 +17,7 @@
             <span class="mainDescription">Add/View Session Details. </span>
 
         </div>
-        <div ncy-breadcrumb></div>
+        <!-- <div ncy-breadcrumb></div>-->
     </div>
 </section>
 <!-- end: PAGE TITLE -->

Apollo/assets/views/sessionSchedule.html

@@ -17,7 +17,7 @@
             <span class="mainDescription">Add/View Session Schedule. </span>
 
         </div>
-        <div ncy-breadcrumb></div>
+        <!-- <div ncy-breadcrumb></div>-->
     </div>
 </section>
 <!-- end: PAGE TITLE -->

Apollo/assets/views/status.html

@@ -14,7 +14,7 @@
             <span class="mainDescription">Manage various status for the entire application. </span>
 
         </div>
-        <div ncy-breadcrumb></div>
+       <!-- <div ncy-breadcrumb></div>-->
     </div>
 </section>
 <div class="container-fluid container-fullw bg-white">

Apollo/assets/views/studentStatusUpdate.html

@@ -16,7 +16,7 @@
                         <span class="mainDescription">Manage statuses for each activity. </span>
 
         </div>
-        <div ncy-breadcrumb></div>
+        <!-- <div ncy-breadcrumb></div>-->
     </div>
 </section>
 <div class="container-fluid container-fullw bg-white">

Apollo/assets/views/subjectMaster.html

@@ -17,7 +17,7 @@
                             <span class="mainDescription">Over a dozen reusable components built to provide popovers, media objects, navigation, tooltips and much more. </span>
                 -->
             </div>
-            <div ncy-breadcrumb></div>
+            <!-- <div ncy-breadcrumb></div>-->
         </div>
     </section>
     <!-- end: PAGE TITLE -->

Apollo/assets/views/university.html

@@ -7,7 +7,7 @@
                         <span class="mainDescription">View/Add University Details. </span>
            
         </div>
-        <div ncy-breadcrumb></div>
+        <!-- <div ncy-breadcrumb></div>-->
     </div>
 </section>
 <!-- end: UNIVERSITY TITLE -->