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,

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

File diff suppressed because it is too large Load Diff

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

39
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');
@ -814,30 +814,33 @@ $query = $this->db->query($subQuery,array('%d-%m-%Y',$fromd,'%d-%m-%Y',$tod,'Can
$time = date('Y-m-d H:i:s');
$dateTime = $time;
// echo $dateTime;
// die();
// echo $dateTime;
//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'];

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

File diff suppressed because it is too large Load Diff

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

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

File diff suppressed because it is too large Load Diff

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

@ -76,9 +76,9 @@ td,th {
<th>Student Name</th>
<th>Mobile Number</th>
<th>Course Name</th>
<th>University</th>
<th>Action</th>
<th>Course Name</th>
<th>Action</th>
@ -89,9 +89,9 @@ td,th {
<td>{{p.Student_name}}</td>
<td>{{p.Phone_number}}</td>
<td>{{p.Course_name}}</td>
<td>{{p.University}}</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>
<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>
</tr>

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

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

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

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

@ -1,158 +1,158 @@
<form name="Form" id="form" novalidate>
<div class="row">
<div class="col-md-12">
<div class="col-md-12">
<fieldset>
<legend>
Update Schedule Details
</legend>
<div class="row" >
<div class="panel panel-white" id="sub">
<div class="panel-heading border-light">
<!--<h4 class="panel-title text-pink">Schedule Details</h4>
<paneltool class="panel-tools" tool-collapse="tool-collapse" tool-refresh="load1" tool-dismiss="tool-dismiss"></paneltool>-->
<div class="col-md-3">
<h4 class="panel-title text-green">Subject</h4>
</div>
<div class="col-md-3">
<h4 class="panel-title text-green">Date</h4>
</div>
<div class="col-md-3">
<h4 class="panel-title text-green">Start Time</h4>
</div>
<div class="col-md-3">
<h4 class="panel-title text-green">End Time</h4>
</div>
</div>
<div collapse="panel2" ng-init="panel2=false" class="panel-wrapper">
<div class="panel-body panel-scroll height-250" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true">
<!--<pre>{{unsheduledetails | json}}</pre>-->
<div class="row" ng-repeat="s in unsheduledetails" style="margin-top:30px;">
<div class="col-md-3 form-group"
ng-class="{'has-error':Form.SubjectName.$dirty && Form.SubjectName.$invalid, 'has-success':Form.batchcode.$valid}">
<!--<label>
Subject Name <span class="symbol required"></span>
</label>-->
<input type="text" placeholder="Enter Batch Name"
tabindex="1" class="form-control" name="SubjectName"
ng-model="s.SubjectName" readonly/>
</div>
<div data-ng-controller="DatepickerDemoCtrl">
<div class="col-md-3 form-group"
ng-class="{'has-error':Form.date.$dirty && Form.date.$invalid, 'has-success':Form.date.$valid}">
<!--<label>
Shedule Date <span
class="symbol required"></span>
</label>-->
<input type="text"
tabindex="1"
class="form-control "
ng-click="startOpen = !startOpen"
datepicker-popup="dd-MM-yyyy"
ng-model="s.ScheduleDate"
is-open="startOpen"
ng-init="startOpen = false"
name="date"
datepicker-options="dateOptions"
placeholder="Select Date"
close-text="Close" required="required" ng-readonly="true"/>
<span class="error text-small block"
ng-if="Form.date.$dirty && Form.date.$error.required">Shedule Date is required.</span>
<!--<span class="success text-small block"-->
<!--ng-if="Form.date.$valid ">Thank You</span>-->
</div>
</div>
<div class="col-md-3 form-group" style="margin-top: -34px;"
ng-class="{'has-error':Form.FromTime.$dirty && Form.FromTime.$invalid, 'has-success':Form.batchcode.$valid}">
<!--<label>
Shedule Starting Time <span class="symbol required"></span>
</label>-->
<div style="margin-top: 35px;">
<div class="form-group">
<!-- <label class="text-blue"> <b>Start Time</b>
</label>-->
<!-- <timepicker class="control-label" -->
<!-- ng-model="s.FromTime" -->
<!-- hour-step="hstep" -->
<!-- minute-step="hstep" -->
<!-- show-meridian="ismeridian"></timepicker> -->
<input type="text" placeholder="09:00AM"
class="form-control" name="scheduleFromTime{{$index}}" id="scheduleFromTime{{$index}}" tabindex="1"
ng-model="s.FromTime" ng-pattern="" size="10" ng-blur="validateTime(s.FromTime,$event);">
</div>
</div>
</div>
<div style="margin-top: -34px;"
ng-class="{'has-error':Form.ToTime.$dirty && Form.ToTime.$invalid, 'has-success':Form.batchcode.$valid}">
<!--<label>
Shedule Ending Time <span class="symbol required"></span>
</label>-->
<div class="col-md-3" style="margin-top: 0px;">
<div class="form-group">
<!-- <label class="text-blue"> <b>Start Time</b>
</label>-->
<!-- <timepicker class="control-label" -->
<!-- ng-model="s.ToTime" -->
<!-- hour-step="hstep" -->
<!-- minute-step="hstep" -->
<!-- show-meridian="ismeridian"></timepicker> -->
<input type="text" placeholder="09:00AM"
class="form-control" name="scheduleEndTime{{$index}}" id="scheduleEndTime{{$index}}" tabindex="1"
ng-model="s.ToTime" ng-pattern="" size="10" ng-blur="validateTime(s.ToTime,$event);">
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-12">
<div class="pull-right">
<button type="submit" ladda="ldloading.zoom_in" tabindex="2" class="btn btn-wide btn-success" data-style="zoom-in" ng-click="updateShedule(unsheduledetails);">
Save
</button>
<input type="button" class="btn btn-warning btn-wide" tabindex="3" value="Cancel"
ng-click="cancel();">
</input>
</div>
</div>
</div>
</fieldset>
</div>
</div>
</div>
</div>
</form>
<!-- class="editRowTd" -->
<form name="Form" id="form" novalidate>
<div class="row">
<div class="col-md-12">
<div class="col-md-12">
<fieldset>
<legend>
Update Schedule Details
</legend>
<div class="row" >
<div class="panel panel-white" id="sub">
<div class="panel-heading border-light">
<!--<h4 class="panel-title text-pink">Schedule Details</h4>
<paneltool class="panel-tools" tool-collapse="tool-collapse" tool-refresh="load1" tool-dismiss="tool-dismiss"></paneltool>-->
<div class="col-md-3">
<h4 class="panel-title text-green">Subject</h4>
</div>
<div class="col-md-3">
<h4 class="panel-title text-green">Date</h4>
</div>
<div class="col-md-3">
<h4 class="panel-title text-green">Start Time</h4>
</div>
<div class="col-md-3">
<h4 class="panel-title text-green">End Time</h4>
</div>
</div>
<div collapse="panel2" ng-init="panel2=false" class="panel-wrapper">
<div class="panel-body panel-scroll height-250" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true">
<!--<pre>{{unsheduledetails | json}}</pre>-->
<div class="row" ng-repeat="s in unsheduledetails" style="margin-top:30px;">
<div class="col-md-3 form-group"
ng-class="{'has-error':Form.SubjectName.$dirty && Form.SubjectName.$invalid, 'has-success':Form.batchcode.$valid}">
<!--<label>
Subject Name <span class="symbol required"></span>
</label>-->
<input type="text" placeholder="Enter Batch Name"
tabindex="1" class="form-control" name="SubjectName"
ng-model="s.SubjectName" readonly/>
</div>
<div data-ng-controller="DatepickerDemoCtrl">
<div class="col-md-3 form-group"
ng-class="{'has-error':Form.date.$dirty && Form.date.$invalid, 'has-success':Form.date.$valid}">
<!--<label>
Shedule Date <span
class="symbol required"></span>
</label>-->
<input type="text"
tabindex="1"
class="form-control "
ng-click="startOpen = !startOpen"
datepicker-popup="dd-MM-yyyy"
ng-model="s.ScheduleDate"
is-open="startOpen"
ng-init="startOpen = false"
name="date"
datepicker-options="dateOptions"
placeholder="Select Date"
close-text="Close" required="required" ng-readonly="true"/>
<span class="error text-small block"
ng-if="Form.date.$dirty && Form.date.$error.required">Shedule Date is required.</span>
<!--<span class="success text-small block"-->
<!--ng-if="Form.date.$valid ">Thank You</span>-->
</div>
</div>
<div class="col-md-3 form-group" style="margin-top: -34px;"
ng-class="{'has-error':Form.FromTime.$dirty && Form.FromTime.$invalid, 'has-success':Form.batchcode.$valid}">
<!--<label>
Shedule Starting Time <span class="symbol required"></span>
</label>-->
<div style="margin-top: 35px;">
<div class="form-group">
<!-- <label class="text-blue"> <b>Start Time</b>
</label>-->
<!-- <timepicker class="control-label" -->
<!-- ng-model="s.FromTime" -->
<!-- hour-step="hstep" -->
<!-- minute-step="hstep" -->
<!-- show-meridian="ismeridian"></timepicker> -->
<input type="text" placeholder="09:00AM"
class="form-control" name="scheduleFromTime{{$index}}" id="scheduleFromTime{{$index}}" tabindex="1"
ng-model="s.FromTime" ng-pattern="" size="10" ng-blur="validateTime(s.FromTime,$event);">
</div>
</div>
</div>
<div style="margin-top: -34px;"
ng-class="{'has-error':Form.ToTime.$dirty && Form.ToTime.$invalid, 'has-success':Form.batchcode.$valid}">
<!--<label>
Shedule Ending Time <span class="symbol required"></span>
</label>-->
<div class="col-md-3" style="margin-top: 0px;">
<div class="form-group">
<!-- <label class="text-blue"> <b>Start Time</b>
</label>-->
<!-- <timepicker class="control-label" -->
<!-- ng-model="s.ToTime" -->
<!-- hour-step="hstep" -->
<!-- minute-step="hstep" -->
<!-- show-meridian="ismeridian"></timepicker> -->
<input type="text" placeholder="09:00AM"
class="form-control" name="scheduleEndTime{{$index}}" id="scheduleEndTime{{$index}}" tabindex="1"
ng-model="s.ToTime" ng-pattern="" size="10" ng-blur="validateTime(s.ToTime,$event);">
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-12">
<div class="pull-right">
<button type="submit" ladda="ldloading.zoom_in" tabindex="2" class="btn btn-wide btn-success" data-style="zoom-in" ng-click="updateShedule(unsheduledetails);">
Save
</button>
<input type="button" class="btn btn-warning btn-wide" tabindex="3" value="Cancel"
ng-click="cancel();">
</input>
</div>
</div>
</div>
</fieldset>
</div>
</div>
</div>
</div>
</form>
<!-- class="editRowTd" -->

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> -->
@ -560,6 +560,12 @@
<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="checkSuperAdmin()">
<span class="title" translate="sidebar.nav.entry.DATACORRECTION"> DATA CORRECTION</span>
</a>
</li>
</ul>
</li>
@ -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 -->