Apollo-DEC/apollodec
Apollo-DEC/apollodec
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
dineshkumarkannan 2018-09-08 18:39:37 +05:30
commit 5cae2f1535
54 changed files with 3494 additions and 3368 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Apollo/api/application/config/database.php
View File

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

7
Apollo/api/application/controllers/HallTickets_Controller.php Executable file → Normal file
View File

@ -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)
{

5
Apollo/api/application/models/Data_correction.php
View File

@ -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']);

37
Apollo/api/application/models/DayBook_model.php
View File

@ -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['Reason'] = $up_details['Reason'];
// $daybookarr['UpdatedOn'] = $dateTime;
// $daybookarr['UpdatedBy'] =$up_details['requestedtBy'];
$daybookarr['IsActive'] = $up_details['IsActive'];
$daybookarr['Reason'] = $up_details['Reason'];
$daybookarr['UpdatedOn'] = $dateTime;
$daybookarr['UpdatedBy'] =$up_details['requestedtBy'];
// if($up_details['IsActive'] == 0)
// {
// $daybookarr['Status'] = 'Cancel';
// }
if($up_details['IsActive'] == 0)
{
$daybookarr['Status'] = 'Cancel';
}
// else
// {
// $daybookarr['Status'] = 'Approved';
// }
else
{
$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'];

36
Apollo/api/application/models/Hallticket_model.php Executable file → Normal file
View File

@ -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->from('T_SubjectMaster SM');
$this->db->join('T_Batch_Schedule_Child','T_Batch_Schedule_Child.SubjectID=SM.SubjectID');
$this->db->where('SM.BranchCode',$branchcode);
$this->db->where('T_Batch_Schedule_Child.SchId',$mapid);
$result = $this->db->get();
if($result->result()){
// $this->db->where('T_SemSubMap_Master.UniversityID',$universityID);
// $this->db->where('T_SemSubMap_Master.CourseID',$CourseID);
////////////
public function get_unShedules($mapid,$subid,$branchcode,$CourseID,$universityID)
{
//echo $mapid;
$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())
{

9
Apollo/api/application/models/Student_model.php
View File

@ -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();

3
Apollo/assets/i18n/en.json
View File

@ -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",

2
Apollo/assets/js/config.router.js
View File

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

43
Apollo/assets/js/controllers/entrycorrectionCtrl.js
View File

@ -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";
}
});
});

4
Apollo/assets/js/controllers/schCtrl.js Executable file → Normal file
View File

@ -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
}
};

4
Apollo/assets/views/StudentMerge.html
View File

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

2
Apollo/assets/views/activity.html
View File

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

2
Apollo/assets/views/add_income_expense.html
View File

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

2
Apollo/assets/views/announcement/Announcement.html
View File

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

2
Apollo/assets/views/batch.html
View File

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

2
Apollo/assets/views/branchDetails.html
View File

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

2
Apollo/assets/views/callTrackingCloseDetails.html
View File

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

2
Apollo/assets/views/callTrackingDetails.html
View File

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

2
Apollo/assets/views/callTrackingLeadDetails.html
View File

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

2
Apollo/assets/views/callTrackingPendingDetails.html
View File

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

2
Apollo/assets/views/centerMaster.html
View File

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

2
Apollo/assets/views/certificate/certificate.html
View File

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

2
Apollo/assets/views/changePassword.html
View File

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

2
Apollo/assets/views/charts.html
View File

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

2
Apollo/assets/views/courseDetails.html
View File

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

2
Apollo/assets/views/daybook/dayBookApproval.html
View File

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

2
Apollo/assets/views/daybook/dayBookMaster.html
View File

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

2
Apollo/assets/views/daybook/dayBookadminApproval.html
View File

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

2
Apollo/assets/views/daybook/daybook.html
View File

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

2
Apollo/assets/views/daybook/daybookadmin.html
View File

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

2
Apollo/assets/views/daybook/daybooksuperAdminApproval.html
View File

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

2
Apollo/assets/views/daybook/daybooksuperadmin.html
View File

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

2
Apollo/assets/views/documentation.html
View File

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

2
Apollo/assets/views/employeeDetails.html
View File

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

2
Apollo/assets/views/feesNotification.html
View File

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

2
Apollo/assets/views/generateHallTicket.html
View File

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

2
Apollo/assets/views/hallticket/batchshedule.html Executable file → Normal file
View File

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

0
Apollo/assets/views/hallticket/editShedule.html Executable file → Normal file
View File

2
Apollo/assets/views/hallticket/examAttendance.html
View File

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

2
Apollo/assets/views/hallticket/generatehallticket.html
View File

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

2
Apollo/assets/views/hallticket/semcoursemap.html
View File

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

2
Apollo/assets/views/maps.html
View File

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

2
Apollo/assets/views/myProfile/myProfile.html
View File

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

59
Apollo/assets/views/partials/nav.html
View File

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

2
Apollo/assets/views/reregistration/promotebatch.html
View File

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

2
Apollo/assets/views/reregistration/reregistrationform.html
View File

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

2
Apollo/assets/views/sendSMS/sendSMSDetailssuperadmin.html
View File

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

2
Apollo/assets/views/sendSMS/sendSMSsuperadmin.html
View File

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

2
Apollo/assets/views/sessionMaster.html
View File

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

2
Apollo/assets/views/sessionSchedule.html
View File

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

2
Apollo/assets/views/status.html
View File

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

2
Apollo/assets/views/studentStatusUpdate.html
View File

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

2
Apollo/assets/views/subjectMaster.html
View File

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

2
Apollo/assets/views/university.html
View File

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