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

student search University, course base, student status updation changes : kdk

Browse Source
This commit is contained in:
resicovenba 2018-01-11 16:09:13 +05:30
parent 9cb5bfff45
commit de7aeda3fc
19 changed files with 679 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Apollo/api/application/controllers/Student_Controller.php
View File

@ -59,11 +59,12 @@ class Student_Controller extends REST_Controller {
public function getStudentList_post() {
$reqData = $this->post('data');
$searchReqData = $this->post('search');
$loginUserId = $reqData['localUserID'];
$loginUserBranchId = $reqData['localBranchID'];
$loginUserType = $reqData['localType'];
$studentListDetails = $this->student_model->get_student_list( $loginUserId, $loginUserBranchId, $loginUserType );// Check if the employee exist
$studentListDetails = $this->student_model->get_student_list( $loginUserId, $loginUserBranchId, $loginUserType, $searchReqData);// Check if the employee exist
if ($studentListDetails)
{
$studentListDetails['status'] = REST_Controller::HTTP_OK;

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

@ -31,11 +31,13 @@ class Student_model extends CI_Model
// get student list based on login user
public function get_student_list($loginUserId, $loginUserBranchId, $loginUserType)
public function get_student_list($loginUserId, $loginUserBranchId, $loginUserType, $getSearchData)
{
// print_r($getSearchData);exit();
// echo $loginUserId, $loginUserBranchId, $loginUserType; exit();
if ($loginUserType == SUPER_ADMIN) {
// list for super admin based on branch
if($getSearchData["University"] === '' && $getSearchData["Course"] === '' && $getSearchData["Course"] === '') {
$this->db->select('*');
$this->db->from(STUDENTS);
$this->db->order_by('CreatedOn', 'DESC');
@ -47,6 +49,43 @@ class Student_model extends CI_Model
$results['student_details'] = $stuDetails->result();
} else {
$results['studentList'] = false;
}} else {
// print_r($getSearchData);exit();
// $this->db->select('t1.*');
// // $this->db->from(STUDENTS);
// $this->db->from('' . STUDENTS . ' as t1');
// $this->db->order_by('t1.CreatedOn', 'DESC');
// $this->db->where('t1.BranchCode', $loginUserBranchId);
// $this->db->from('' . STUDENTCOURSE . ' as t2', 't2.StudentID = t1.StudentID', 'LEFT');
// $this->db->where('t2.UniversityID', $getSearchData["University"]);
// $this->db->where('t2.CourseID', $getSearchData["Course"]);
$University = $getSearchData['University'];
$Course = $getSearchData['Course'];
$Batch = $getSearchData['Batch'];
$subQuery = "SELECT S.*
FROM ".STUDENTS." as S LEFT JOIN ".STUDENTCOURSE." as SC ON SC.StudentID = S.StudentID
LEFT JOIN ".UNIVERSITY." as U ON SC.UniversityID = U.UniversityID LEFT JOIN ".COURSE." as C ON
SC.CourseID = C.CourseID
WHERE
SC.UniversityID LIKE '%$University%'
AND SC.CourseID LIKE '%$Course%'
AND SC.BatchCode LIKE '%$Batch%'
AND S.BranchCode = '$loginUserBranchId'
GROUP BY SC.StudentID
ORDER BY S.CreatedOn";
$stuDetails = $this->db->query($subQuery);
// $stuDetails = $this->db->get();
$checkArr = $stuDetails->result();
if (count($checkArr) > 0) {
$results['studentList'] = true;
$results['student_details'] = $stuDetails->result();
} else {
$results['studentList'] = false;
}
}
// if ($loginUserBranchId == 'All') {
// // for getting all branch details
@ -88,6 +127,8 @@ class Student_model extends CI_Model
} else if ($loginUserType == ADMIN) {
// list for admin
if($getSearchData["University"] === '' && $getSearchData["Course"] === '' && $getSearchData["Course"] === '') {
// print_r($getSearchData);exit();
$this->db->select('*');
$this->db->from(STUDENTS);
$this->db->order_by('CreatedOn', 'DESC');
@ -100,6 +141,45 @@ class Student_model extends CI_Model
} else {
$results['studentList'] = false;
}
} else {
// print_r($getSearchData);exit();
// $this->db->select('t1.*');
// // $this->db->from(STUDENTS);
// $this->db->from('' . STUDENTS . ' as t1');
// $this->db->order_by('t1.CreatedOn', 'DESC');
// $this->db->where('t1.BranchCode', $loginUserBranchId);
// $this->db->from('' . STUDENTCOURSE . ' as t2', 't2.StudentID = t1.StudentID', 'LEFT');
// $this->db->where('t2.UniversityID', $getSearchData["University"]);
// $this->db->where('t2.CourseID', $getSearchData["Course"]);
$University = $getSearchData['University'];
$Course = $getSearchData['Course'];
$Batch = $getSearchData['Batch'];
$subQuery = "SELECT S.*
FROM ".STUDENTS." as S LEFT JOIN ".STUDENTCOURSE." as SC ON SC.StudentID = S.StudentID
LEFT JOIN ".UNIVERSITY." as U ON SC.UniversityID = U.UniversityID LEFT JOIN ".COURSE." as C ON
SC.CourseID = C.CourseID
WHERE
SC.UniversityID LIKE '%$University%'
AND SC.CourseID LIKE '%$Course%'
AND SC.BatchCode LIKE '%$Batch%'
AND S.BranchCode = '$loginUserBranchId'
GROUP BY SC.StudentID
ORDER BY S.CreatedOn";
$stuDetails = $this->db->query($subQuery);
// $stuDetails = $this->db->get();
$checkArr = $stuDetails->result();
if (count($checkArr) > 0) {
$results['studentList'] = true;
$results['student_details'] = $stuDetails->result();
} else {
$results['studentList'] = false;
}
}
} else if ($loginUserType == EMPLOYEE) {
// list for staff

3
Apollo/assets/js/config.constant.js
View File

@ -155,8 +155,9 @@ app.constant('JS_REQUIRES', {
'studentStatusUpdateCtrl':'assets/js/controllers/studentStatusUpdateCtrl.js',
'studentViewCtrl':'assets/js/controllers/studentViewCtrl.js',
// day book master
// day book master
'dayBookMasterCtrl':'assets/js/controllers/dayBookMasterCtrl.js',
'sendSMSsuperadminCtrl':'assets/js/controllers/sendSMSsuperadminCtrl.js',
//*** Filters

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

@ -378,7 +378,15 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com
ncyBreadcrumb: {
label: 'daybook'
}
}).state('app.daybook.income', {
}).state('app.sendSMSPage', {
url: '/sendSMS',
templateUrl: "assets/views/sendSMS/sendSMSsuperadmin.html",
title: 'send SMS',
resolve: loadSequence('spin', 'ladda', 'angular-ladda', 'sendSMSsuperadminCtrl','ngTable'),
ncyBreadcrumb: {
label: 'send SMS'
}
}).state('app.daybook.income', {
url: '/income',
templateUrl: "assets/views/utility_search_result.html",
title: 'income Results',

38
Apollo/assets/js/controllers/answerBookletStatusCtrl.js
View File

@ -24,11 +24,43 @@ app.controller('answerBookletStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
var localDetail = JSON.parse(localStorage.getItem('localObj'));
var localDetails = ipCookie('cookiechk');
const localUpdateStatus = 'ANSWERBOOKLET_STATUS';
$scope.localTypeSuperAdmin = false;
$scope.localBranchDetails = '';
$scope.init = function () {
$scope.getUniversityList();
if (localDetail != null) {
if (localDetails.localType === 'R004') {
$scope.localTypeSuperAdmin = true;
$scope.getUniversityList();
$scope.getBranchList();
} else {
$scope.getUniversityList();
}
} else {
}
}
$scope.getBranchList = function () {
$scope.loader = true;
var empListreq = {
method: 'POST',
url: apiPoint.url + 'getBranchListDetails/',
headers: {
'Content-Type': 'application/json'
},
data: {
data: localDetails
}
};
$http(empListreq).then(function (response) {
if (response.data.branDetailstatus) {
$scope.loader = false;
$scope.branchList_data = response.data.branch_details;
} else {
}
});
}
$scope.searchData = {
'University': '',
'Course': '',
@ -247,7 +279,7 @@ app.controller('answerBookletStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
}
$scope.statusUpdate = {
submit: function (form, myStatusModel) {
submit: function (form, myStatusModel, localBranchDetails) {
var firstError = null;
if (form.$invalid) {
var field = null, firstError = null;
@ -264,6 +296,8 @@ app.controller('answerBookletStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
angular.element('.ng-invalid[name=' + firstError + ']').focus();
// swal("The form cannot be submitted because it contains validation errors!", "Errors are marked with a red, dashed border!", "error");
} else {
localDetails.localBranchID = localBranchDetails;
localDetail.localBranchID = localBranchDetails;
$scope.disableButton = true;
var studentForUpdate = [];
let formate = "dd-MM-yyyy";

40
Apollo/assets/js/controllers/applicationStatusCtrl.js
View File

@ -30,10 +30,42 @@ app.controller('applicationStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
const localUpdateStatus = 'APPICATION_STATUS';
$scope.init = function () {
$scope.getUniversityList();
getCertificateDetailsList();
if (localDetail != null) {
if (localDetails.localType === 'R004') {
$scope.localTypeSuperAdmin = true;
$scope.getUniversityList();
$scope.getBranchList();
getCertificateDetailsList();
} else {
$scope.getUniversityList();
getCertificateDetailsList();
}
} else {
}
}
$scope.getBranchList = function () {
$scope.loader = true;
var empListreq = {
method: 'POST',
url: apiPoint.url + 'getBranchListDetails/',
headers: {
'Content-Type': 'application/json'
},
data: {
data: localDetails
}
};
$http(empListreq).then(function (response) {
if (response.data.branDetailstatus) {
$scope.loader = false;
$scope.branchList_data = response.data.branch_details;
} else {
}
});
}
// get certificate or application list
var getCertificateDetailsList = function () {
var getCerfreg = {
@ -275,7 +307,7 @@ app.controller('applicationStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
}
$scope.statusUpdate = {
submit: function (form, myStatusModel) {
submit: function (form, myStatusModel, localBranchDetails) {
var firstError = null;
if (form.$invalid) {
var field = null, firstError = null;
@ -292,6 +324,8 @@ app.controller('applicationStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
angular.element('.ng-invalid[name=' + firstError + ']').focus();
// swal("The form cannot be submitted because it contains validation errors!", "Errors are marked with a red, dashed border!", "error");
} else {
localDetails.localBranchID = localBranchDetails;
localDetail.localBranchID = localBranchDetails;
$scope.disableButton = true;
var studentForUpdate = [];
let formate = "dd-MM-yyyy";

40
Apollo/assets/js/controllers/certificationStatusCtrl.js
View File

@ -26,12 +26,44 @@ app.controller('certificationStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
var localDetail = JSON.parse(localStorage.getItem('localObj'));
var localDetails = ipCookie('cookiechk');
const localUpdateStatus = 'CERTIFICATION_STATUS';
$scope.localTypeSuperAdmin = false;
$scope.localBranchDetails = '';
$scope.init = function () {
$scope.getUniversityList();
// $scope.getCertificateList();
if (localDetail != null) {
if (localDetails.localType === 'R004') {
$scope.localTypeSuperAdmin = true;
$scope.getUniversityList();
$scope.getBranchList();
} else {
$scope.getUniversityList();
}
} else {
}
}
$scope.getBranchList = function () {
$scope.loader = true;
var empListreq = {
method: 'POST',
url: apiPoint.url + 'getBranchListDetails/',
headers: {
'Content-Type': 'application/json'
},
data: {
data: localDetails
}
};
$http(empListreq).then(function (response) {
if (response.data.branDetailstatus) {
$scope.loader = false;
$scope.branchList_data = response.data.branch_details;
} else {
}
});
}
$scope.searchData = {
'University': '',
'Course': '',
@ -282,7 +314,7 @@ app.controller('certificationStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
// Update the status For Certification
$scope.statusUpdate = {
submit: function (form, myStatusModel) {
submit: function (form, myStatusModel, localBranchDetails) {
var firstError = null;
if (form.$invalid) {
var field = null, firstError = null;
@ -299,6 +331,8 @@ app.controller('certificationStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
angular.element('.ng-invalid[name=' + firstError + ']').focus();
// swal("The form cannot be submitted because it contains validation errors!", "Errors are marked with a red, dashed border!", "error");
} else {
localDetails.localBranchID = localBranchDetails;
localDetail.localBranchID = localBranchDetails;
$scope.disableButton = true;
var studentForUpdate = [];
let formate = "dd-MM-yyyy";

70
Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js Normal file
View File

@ -0,0 +1,70 @@
'use strict';
/*** controller for Wizard Form example***/
app.controller('sendSMSsuperadminCtrl', ["$scope", "$filter", "ngTableParams", "API_POINTS", "$http", "SweetAlert", "$state", 'md5', 'ipCookie', function ($scope, $filter, ngTableParams, apiPoint, $http, SweetAlert, $state, md5, ipCookie) {
/**
* Send SMS Functionality
* by : kdk
*/
var localDetail = JSON.parse(localStorage.getItem('localObj'));
var localDetails = ipCookie('cookiechk');
$scope.init = function () {
if (localDetail != null) {
$scope.getProfile();
} else {
}
}
$scope.loginUser = {
'staffID': '',
'fName': '',
'lName': '',
'mobileNumber': '',
'gender': '',
'branchCode': '',
'branchList': '',
};
// client side logined details
$scope.getProfile = function () {
var req = {
method: 'POST',
url: apiPoint.url + 'employeeGetProf/',
headers: {
'Content-Type': 'application/json'
},
data: {
employeeLoginID: localDetails.localUserID
}
};
$http(req).then(function (response) {
if (response.data.empStatus == true) {
/*
* Get Top Nav user details
*/
$scope.userInfo = response.data.details;
$scope.userStatusInfo = response.data.work_State;
$scope.userBranchInfo = response.data.branch_details;
// alert(JSON.stringify($scope.userInfo));
// alert(JSON.stringify($scope.userStatusInfo));
// alert(JSON.stringify($scope.userBranchInfo));
// $scope.loginImage = $scope.resultData.ProfilePicPath;
// $scope.loginUser = {
// 'staffID': $scope.resultData.StaffID,
// 'fName': $scope.resultData.Firstname,
// 'lName': $scope.resultData.Lastname,
// 'mobileNumber': $scope.resultData.MobileNumber,
// 'gender': $scope.resultData.Gender,
// 'branchCode': $scope.resultData.BranchCode,
// 'branchList': response.data.branch_details,
// };
// var currArr = response.data.branch_details;
// $scope.getCurrentBran = currArr.find(item => item.BranchCode === localDetails.localBranchID);
} else {
}
});
};
}]);

104
Apollo/assets/js/controllers/studentCtrl.js
View File

@ -91,6 +91,7 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams",
$scope.currentDate = new Date(sixteenYearsBeforeNow);
$scope.getStudentList();
$scope.getUniversityList();
$scope.getUniversitySearchList();
$scope.myModel.dateofbirth = $filter('date')($scope.currentDate, 'dd-MM-yyyy');
} else {
ipCookie.remove('cookiechk');
@ -101,6 +102,54 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams",
}
}
// get University List
$scope.universitySearchData = '';
$scope.getUniversitySearchList = function () {
var empListreq = {
method: 'POST',
url: apiPoint.url + 'getUniveCourseBratch/',
headers: {
'Content-Type': 'application/json'
},
data: {
data: localDetails
}
};
$http(empListreq).then(function (response) {
if (response.data.univList) {
$scope.universitySearchData = response.data.university_details;
// alert()
} else {
}
});
};
$scope.searchData = {
"University": "",
"Course": "",
"Status": ""
}
$scope.myUnivSearch = "";
$scope.getUniveId = function (univ) {
let name = JSON.parse(univ);
$scope.searchData.University = name.UniversityID;
$scope.searchData.Course = '';
$scope.searchData.Batch = '';
$scope.courseData = name.Course;
$scope.batchData = name.Batch;
$scope.OpenWindowStatus = false;
$scope.getStudentList();
};
$scope.getValueChange = function () {
// $scope.searchData = {
// "University": "",
// "Course": "",
// "Status": ""
// }
$scope.getStudentList();
}
$scope.getStudentList = function () {
$scope.loader = true;
@ -111,7 +160,8 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams",
'Content-Type': 'application/json'
},
data: {
data: localDetails
data: localDetails,
search: $scope.searchData
}
};
$http(empListreq).then(function (response) {
@ -841,6 +891,7 @@ app.controller('studentSuperAdminCtrl', ["$scope", "toaster", "$filter", "ngTabl
$scope.currentDate = new Date(sixteenYearsBeforeNow);
$scope.getStudentList();
$scope.getUniversityList();
$scope.getUniversitySearchList();
$scope.myModel.dateofbirth = $filter('date')($scope.currentDate, 'dd-MM-yyyy');
$scope.viewStudentDetailsPage = true;
}
@ -914,6 +965,54 @@ app.controller('studentSuperAdminCtrl', ["$scope", "toaster", "$filter", "ngTabl
// get University List
$scope.universitySearchData = '';
$scope.getUniversitySearchList = function () {
var empListreq = {
method: 'POST',
url: apiPoint.url + 'getUniveCourseBratch/',
headers: {
'Content-Type': 'application/json'
},
data: {
data: localDetails
}
};
$http(empListreq).then(function (response) {
if (response.data.univList) {
$scope.universitySearchData = response.data.university_details;
// alert()
} else {
}
});
};
$scope.searchData = {
"University": "",
"Course": "",
"Status": ""
}
$scope.myUnivSearch = "";
$scope.getUniveId = function (univ) {
let name = JSON.parse(univ);
$scope.searchData.University = name.UniversityID;
$scope.searchData.Course = '';
$scope.searchData.Batch = '';
$scope.courseData = name.Course;
$scope.batchData = name.Batch;
$scope.OpenWindowStatus = false;
$scope.getStudentList();
};
$scope.getValueChange = function () {
// $scope.searchData = {
// "University": "",
// "Course": "",
// "Status": ""
// }
$scope.getStudentList();
}
$scope.getStudentList = function () {
$scope.loader = true;
@ -924,7 +1023,8 @@ app.controller('studentSuperAdminCtrl', ["$scope", "toaster", "$filter", "ngTabl
'Content-Type': 'application/json'
},
data: {
data: localDetails
data: localDetails,
search: $scope.searchData
}
};
$http(empListreq).then(function (response) {

40
Apollo/assets/js/controllers/studyMaterialStatusCtrl.js
View File

@ -25,9 +25,41 @@ app.controller('studyMaterialStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
var localDetail = JSON.parse(localStorage.getItem('localObj'));
var localDetails = ipCookie('cookiechk');
const localUpdateStatus = 'STUDY_MATERIAL';
$scope.localTypeSuperAdmin = false;
$scope.localBranchDetails = '';
$scope.init = function () {
$scope.getUniversityList();
if (localDetail != null) {
if (localDetails.localType === 'R004') {
$scope.localTypeSuperAdmin = true;
$scope.getUniversityList();
$scope.getBranchList();
} else {
$scope.getUniversityList();
}
} else {
}
}
$scope.getBranchList = function () {
$scope.loader = true;
var empListreq = {
method: 'POST',
url: apiPoint.url + 'getBranchListDetails/',
headers: {
'Content-Type': 'application/json'
},
data: {
data: localDetails
}
};
$http(empListreq).then(function (response) {
if (response.data.branDetailstatus) {
$scope.loader = false;
$scope.branchList_data = response.data.branch_details;
} else {
}
});
}
$scope.searchData = {
@ -256,7 +288,7 @@ app.controller('studyMaterialStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
}
$scope.statusUpdate = {
submit: function (form, myStatusModel) {
submit: function (form, myStatusModel, localBranchDetails) {
var firstError = null;
if (form.$invalid) {
var field = null, firstError = null;
@ -273,6 +305,10 @@ app.controller('studyMaterialStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
angular.element('.ng-invalid[name=' + firstError + ']').focus();
// swal("The form cannot be submitted because it contains validation errors!", "Errors are marked with a red, dashed border!", "error");
} else {
// alert(localBranchDetails);
localDetails.localBranchID = localBranchDetails;
localDetail.localBranchID = localBranchDetails;
// alert(localDetails.localBranchID);
$scope.disableButton = true;
var studentForUpdate = [];
let formate = "dd-MM-yyyy";

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

@ -129,7 +129,7 @@
}
</style>
<div class="row" ng-if="searchResultLength > 0">
<div class="row" ng-if="dataLengthIncome > 0">
<div class="pull-right">
<div style="margin: 8px;">
<div style="width: 45px; display: initial;">
@ -141,7 +141,7 @@
</div>
</div>
<div class="table-responsive">
<table style="width: 1200px;" class="table table-hover" ng-if="searchResultLength > 0">
<table style="width: 1200px;" class="table table-hover" ng-if="dataLengthIncome > 0">
<thead>
<tr>
@ -225,7 +225,7 @@
</style>
<div class="row">
<div class="pull-right" ng-if="searchResultLength > 0">
<div class="pull-right" ng-if="dataLengthExpense > 0">
<div style="margin: 8px;">
<div style="width: 45px; display: initial;">
<span style="font-size: 14px;
@ -236,7 +236,7 @@
</div>
</div>
<div class="table-responsive">
<table style="width: 1200px;" class="table table-hover" ng-if="searchResultLength > 0">
<table style="width: 1200px;" class="table table-hover" ng-if="dataLengthExpense > 0">
<thead>
<tr>
<th>

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

@ -105,7 +105,38 @@
Fess
</a>
</li>
<li>
<a href="javascript:;">
<span translate="sidebar.nav.student.status.MAIN">Status Update</span> <i class="icon-arrow"></i>
</a>
<ul class="sub-menu">
<li ui-sref-active="active">
<a ui-sref="app.student.status.studymaterial" translate="sidebar.nav.student.status.STUDYMATERIAL">
Study Material
</a>
</li>
<li ui-sref-active="active">
<a ui-sref="app.student.status.fees" translate="sidebar.nav.status.FEES">
Fess
</a>
</li>
<li ui-sref-active="active">
<a ui-sref="app.student.status.answerbooklet" translate="sidebar.nav.student.status.ANSWERBOOKLET">
Answer Booklet
</a>
</li>
<li ui-sref-active="active">
<a ui-sref="app.student.status.certificationstatus" translate="sidebar.nav.student.status.CERTIFICATION">
Certification
</a>
</li>
<li ui-sref-active="active">
<a ui-sref="app.student.status.applicationstatus" translate="sidebar.nav.student.status.APPLICATION">
Application
</a>
</li>
</ul>
</li>
</ul>
</li>
<!--<li ng-class="{'active open':$state.includes('app.call')}">
@ -173,6 +204,19 @@
</div>
</a>
</li>
<!--<li ng-class="{'active open':$state.includes('app.sendSMSPage')}">
<a ui-sref="app.sendSMSPage">
<div class="item-content">
<div class="item-media">
<i class="ti-id-badge"></i>
</div>
<div class="item-inner">
<span class="title" translate="sidebar.nav.sendSMSPage.MAIN">SEND SMS</span>
</div>
</div>
</a>
</li>-->
<li ng-class="{'active open':$state.includes('app.myprofile')}">
<a ui-sref="app.myprofile">
<div class="item-content">

32
Apollo/assets/views/sendSMS/sendSMSsuperadmin.html Normal file
View File

@ -0,0 +1,32 @@
<!-- start: PAGE TITLE -->
<section id="page-title">
<div class="row">
<div class="col-sm-8">
<h1 class="mainTitle" translate="sidebar.nav.sendSMSPage.MAIN">{{ mainTitle }}</h1>
</div>
<div ncy-breadcrumb></div>
</div>
</section>
<!-- end: PAGE TITLE -->
<!-- start: SEND SMS -->
<div class="container-fluid container-fullw bg-white">
<div class="row">
<div class="col-md-12">
<!-- /// controller: 'UserCtrl' - localtion: assets/js/controllers/sendSMSsuperadminCtrl.js /// -->
<div ng-controller="sendSMSsuperadminCtrl">
<h1>D</h1>
</div>
</div>
</div>
</div>
<!-- end: SEND SMS -->
<section id="page-title">
<div class="row">
<!--<div class="col-sm-8">
<h1 class="mainTitle" translate="sidebar.nav.profile.MAIN">{{ mainTitle }}</h1>
</div>
<div ncy-breadcrumb></div>-->
</div>
</section>

15
Apollo/assets/views/status-update/answer_booklet_status.html
View File

@ -222,7 +222,7 @@
right: 0;
}
</style>
<form name="Form" id="form" novalidate ng-submit="statusUpdate.submit(Form, myStatusModel)" method="post">
<form name="Form" id="form" novalidate ng-submit="statusUpdate.submit(Form, myStatusModel, localBranchDetails)" method="post">
<div class="container">
<div class="row">
<div class="col-md-2">
@ -303,6 +303,19 @@
<textarea type="text" placeholder="Enter Comments" tabindex="7" class="form-control" name="description" ng-model="myStatusModel.comment"
/>
<span class="error text-small block" ng-if="Form.description.$dirty && Form.description.$error.pattern">Invalid Comments</span>
</div>
<div class="col-md-6 form-group" ng-class="{'has-error':Form.branch.$dirty && Form.branch.$invalid, 'has-success':Form.branch.$valid}">
<label for="form-field-select-2">
Select Branch <span
class="symbol required"></span>
</label>
<select class="form-control" tabindex="8" class="cs-select cs-skin-elastic" name="branch" ng-model="localBranchDetails" ng-change="changeBranch()"
required>
<option value="" disabled selected>Select Branch</option>
<option ng-repeat="bdata in branchList_data" value="{{bdata.BranchCode}}">{{bdata.BranchName}}</option>
</select>
<span class="error text-small block" ng-if="Form.branch.$dirty && Form.branch.$invalid" ng-hide="Form.branch.$error.maxlength">Branch is required.</span>
</div>
</div>
<div class="row">

19
Apollo/assets/views/status-update/application_status.html
View File

@ -180,7 +180,7 @@
<th>Updated By</th>
</thead>
<tbody ng-repeat="s in prevStatusListForStudentCourse">
<td>{{s.ListName}}</td>
<td>{{s.Comments}}</td>
<td>{{s.CertificateName}}</td>
@ -211,7 +211,7 @@
</div>
<div ng-if="OpenWindowStatus">
<form name="Form" id="form" novalidate ng-submit="statusUpdate.submit(Form, myStatusModel)" method="post">
<form name="Form" id="form" novalidate ng-submit="statusUpdate.submit(Form, myStatusModel , localBranchDetails)" method="post">
<style>
#cancel_button {
/*line-height: 12px;
@ -239,7 +239,7 @@
<!--<span id="cancel_button" class="btn btn-success btn-lg">
<i class="glyphicon glyphicon-remove-circle"></i>
</span>-->
<a id="cancel_button" ng-click="unSelect()" tooltip="Close">
<a id="cancel_button" ng-click="unSelect()" tooltip="Close">
<span class="glyphicon glyphicon-remove-circle"></span>
</a>
</div>
@ -334,6 +334,19 @@
/>
<span class="error text-small block" ng-if="Form.description.$dirty && Form.description.$error.pattern">Invalid Comments</span>
</div>
<div class="col-md-6 form-group" ng-class="{'has-error':Form.branch.$dirty && Form.branch.$invalid, 'has-success':Form.branch.$valid}">
<label for="form-field-select-2">
Select Branch <span
class="symbol required"></span>
</label>
<select class="form-control" tabindex="8" class="cs-select cs-skin-elastic" name="branch" ng-model="localBranchDetails" ng-change="changeBranch()"
required>
<option value="" disabled selected>Select Branch</option>
<option ng-repeat="bdata in branchList_data" value="{{bdata.BranchCode}}">{{bdata.BranchName}}</option>
</select>
<span class="error text-small block" ng-if="Form.branch.$dirty && Form.branch.$invalid" ng-hide="Form.branch.$error.maxlength">Branch is required.</span>
</div>
</div>
<div class="row">
<div class="col-md-12">

15
Apollo/assets/views/status-update/certification_status.html
View File

@ -225,7 +225,7 @@
right: 0;
}
</style>
<form name="Form" id="form" novalidate ng-submit="statusUpdate.submit(Form, myStatusModel)" method="post">
<form name="Form" id="form" novalidate ng-submit="statusUpdate.submit(Form, myStatusModel, localBranchDetails)" method="post">
<div class="container">
<div class="row">
<div class="col-md-2">
@ -332,6 +332,19 @@
<textarea type="text" placeholder="Enter Comments" tabindex="7" class="form-control" name="description" ng-model="myStatusModel.comment"
/>
<span class="error text-small block" ng-if="Form.description.$dirty && Form.description.$error.pattern">Invalid Comments</span>
</div>
<div class="col-md-6 form-group" ng-class="{'has-error':Form.branch.$dirty && Form.branch.$invalid, 'has-success':Form.branch.$valid}">
<label for="form-field-select-2">
Select Branch <span
class="symbol required"></span>
</label>
<select class="form-control" tabindex="8" class="cs-select cs-skin-elastic" name="branch" ng-model="localBranchDetails" ng-change="changeBranch()"
required>
<option value="" disabled selected>Select Branch</option>
<option ng-repeat="bdata in branchList_data" value="{{bdata.BranchCode}}">{{bdata.BranchName}}</option>
</select>
<span class="error text-small block" ng-if="Form.branch.$dirty && Form.branch.$invalid" ng-hide="Form.branch.$error.maxlength">Branch is required.</span>
</div>
</div>
<div class="row">

15
Apollo/assets/views/status-update/study_material_status.html
View File

@ -228,7 +228,7 @@
display: block;
}
</style>
<form name="Form" id="form" novalidate ng-submit="statusUpdate.submit(Form, myStatusModel)" method="post">
<form name="Form" id="form" novalidate ng-submit="statusUpdate.submit(Form, myStatusModel, localBranchDetails)" method="post">
<div id="bottom1" class="container">
<div class="row">
<div class="col-md-2">
@ -315,6 +315,19 @@
/>
<span class="error text-small block" ng-if="Form.description.$dirty && Form.description.$error.pattern">Invalid Comments</span>
</div>
<div class="col-md-6 form-group" ng-class="{'has-error':Form.branch.$dirty && Form.branch.$invalid, 'has-success':Form.branch.$valid}">
<label for="form-field-select-2">
Select Branch <span
class="symbol required"></span>
</label>
<select class="form-control" tabindex="8" class="cs-select cs-skin-elastic" name="branch" ng-model="localBranchDetails" ng-change="changeBranch()"
required>
<option value="" disabled selected>Select Branch</option>
<option ng-repeat="bdata in branchList_data" value="{{bdata.BranchCode}}">{{bdata.BranchName}}</option>
</select>
<span class="error text-small block" ng-if="Form.branch.$dirty && Form.branch.$invalid" ng-hide="Form.branch.$error.maxlength">Branch is required.</span>
</div>
</div>
<div class="row">
<div class="col-md-12">

73
Apollo/assets/views/student/student_details.html
View File

@ -37,24 +37,80 @@
<tab heading="View Student" id="studentbranch">
<div class="container-fluid container-fullw">
<div class="row">
<div ng-if="loader == true" class="col-md-12" align="center">
<spinner name="html5spinner">
<div class="container">
<div class="row">
<!--<pre>{{searchData | json }}</pre> -->
<div class="col-md-4">
<label for="form-field-select-2">
University
</label>
<select class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="myUnivSearch"
ng-change="getUniveId(myUnivSearch)">
<option value="" disabled selected>Select University</option>
<option ng-repeat="item in universitySearchData" value="{{item}}">{{item.UniversityName}}</option>
</select>
</div>
<div class="col-md-4">
<label for="form-field-select-2">
Course
</label>
<select class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="course" ng-model="searchData.Course" ng-change="getValueChange()">
<option value="" selected>Select Course</option>
<option ng-repeat="itemCourse in courseData" value="{{itemCourse.CourseID}}">{{itemCourse.CourseName}}</option>
</select>
</div>
<div class="col-md-4">
<!--<label for="form-field-select-2">
Batch
</label>
<select class="form-control" tabindex="3" class="cs-select cs-skin-elastic" name="batch" ng-model="searchData.Batch" ng-change="getValueChange()">
<option value="" selected>Select Batch</option>
<option ng-repeat="itemBatch in batchData" value="{{itemBatch.BatchCode}}">{{itemBatch.BatchName}}</option>
</select>-->
<!--<script>
$(function () {
$("#search").focus();
});
</script>-->
<label for="form-field-select-2">
Search
</label>
<input class="form-control" type="text" ng-model="search" id="search" autofocus tabindex="1" placeholder="Search" /><br><br>
</div>
</div>
</div>
<div ng-if="loader == true" class="col-md-12" align="center">
<!--<spinner name="html5spinner">
<div class="overlay"></div>
<div class="spinner">
<div class="double-bounce1"></div>
<div class="double-bounce2"></div>
</div>
<div class="please-wait">Please Wait...</div>
</spinner>
</spinner>-->
<span style="color: #007AFF;
font-size: 16px;">Loading...</span>
</div>
<div class="col-md-12" ng-if="studentData == false" style="min-height: 281px;">
<div class="col-md-12" ng-if="studentData == false" style="min-height: 281px;">
<p style="color: red;" align="center"><strong><h3 class="text-center">No
records found... </h3></strong></p>
</div>
<div class="col-md-12" ng-if="studentData == true">
<div class="row">
<!--<div class="row">
<div class="col-md-3">
</div>
<div class="col-md-3">
<script>
$(function () {
@ -63,7 +119,8 @@
</script>
<input class="form-control" type="text" ng-model="search" id="search" autofocus tabindex="1" placeholder="Search" /><br><br>
</div>
</div>
</div>-->
<div class="table-responsive">
<table class="table table-hover">
<thead>

67
Apollo/assets/views/student/student_details_SuperAdmin.html
View File

@ -65,22 +65,77 @@
<tab active="tabactive1" ng-click="tabActive('tabactive1')" heading="View Student" id="studentbranch">
<div class="container-fluid container-fullw">
<div class="row">
<div ng-if="loader == true" class="col-md-12" align="center">
<spinner name="html5spinner">
<div class="container">
<div class="row">
<!--<pre>{{searchData | json }}</pre> -->
<div class="col-md-4">
<label for="form-field-select-2">
University
</label>
<select class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="myUnivSearch"
ng-change="getUniveId(myUnivSearch)">
<option value="" disabled selected>Select University</option>
<option ng-repeat="item in universitySearchData" value="{{item}}">{{item.UniversityName}}</option>
</select>
</div>
<div class="col-md-4">
<label for="form-field-select-2">
Course
</label>
<select class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="course" ng-model="searchData.Course" ng-change="getValueChange()">
<option value="" selected>Select Course</option>
<option ng-repeat="itemCourse in courseData" value="{{itemCourse.CourseID}}">{{itemCourse.CourseName}}</option>
</select>
</div>
<div class="col-md-4">
<!--<label for="form-field-select-2">
Batch
</label>
<select class="form-control" tabindex="3" class="cs-select cs-skin-elastic" name="batch" ng-model="searchData.Batch" ng-change="getValueChange()">
<option value="" selected>Select Batch</option>
<option ng-repeat="itemBatch in batchData" value="{{itemBatch.BatchCode}}">{{itemBatch.BatchName}}</option>
</select>-->
<!--<script>
$(function () {
$("#search").focus();
});
</script>-->
<label for="form-field-select-2">
Search
</label>
<input class="form-control" type="text" ng-model="search" id="search" autofocus tabindex="1" placeholder="Search" /><br><br>
</div>
</div>
</div>
<div ng-if="loader == true" class="col-md-12" align="center">
<!--<spinner name="html5spinner">
<div class="overlay"></div>
<div class="spinner">
<div class="double-bounce1"></div>
<div class="double-bounce2"></div>
</div>
<div class="please-wait">Please Wait...</div>
</spinner>
</spinner>-->
<span style="color: #007AFF;
font-size: 16px;">Loading...</span>
</div>
<div class="col-md-12" ng-if="studentData == false" style="min-height: 281px;">
<div class="col-md-12" ng-if="studentData == false" style="min-height: 281px;">
<p style="color: red;" align="center"><strong><h3 class="text-center">No
records found... </h3></strong></p>
</div>
<div class="col-md-12" ng-if="studentData == true">
<div class="row">
<div class="col-md-3">