diff --git a/Apollo/api/application/controllers/Student_Controller.php b/Apollo/api/application/controllers/Student_Controller.php
index c42b5a76..664ee568 100755
--- a/Apollo/api/application/controllers/Student_Controller.php
+++ b/Apollo/api/application/controllers/Student_Controller.php
@@ -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;
diff --git a/Apollo/api/application/models/Student_model.php b/Apollo/api/application/models/Student_model.php
index 32212c4b..534c8d7e 100755
--- a/Apollo/api/application/models/Student_model.php
+++ b/Apollo/api/application/models/Student_model.php
@@ -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
diff --git a/Apollo/assets/i18n/en.json b/Apollo/assets/i18n/en.json
index da6279f8..069ade4c 100755
--- a/Apollo/assets/i18n/en.json
+++ b/Apollo/assets/i18n/en.json
@@ -67,7 +67,7 @@
"EMPLOYEE": "EMPLOYEE DETAILS",
"ANNOUNCEMENT": "ANNOUNCEMENT DETAILS",
"STATUS": "STATUS DETAILS",
- "STUDENTSTATUS": "DEFAULT STUDENT ACTIVITY",
+ "STUDENTSTATUS": "STUDENT ACTIVITY STATUS",
"CERTIFICATETYPE": "CERTIFICATE TYPE",
"DAYBOOKMASTER":"DAY BOOK DETAILS"
},
diff --git a/Apollo/assets/js/config.constant.js b/Apollo/assets/js/config.constant.js
index 4193e431..6e930d3e 100755
--- a/Apollo/assets/js/config.constant.js
+++ b/Apollo/assets/js/config.constant.js
@@ -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
diff --git a/Apollo/assets/js/config.router.js b/Apollo/assets/js/config.router.js
index 4ef7aadb..4ad53981 100755
--- a/Apollo/assets/js/config.router.js
+++ b/Apollo/assets/js/config.router.js
@@ -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',
diff --git a/Apollo/assets/js/controllers/answerBookletStatusCtrl.js b/Apollo/assets/js/controllers/answerBookletStatusCtrl.js
index 4e7a4cbb..e87bde88 100755
--- a/Apollo/assets/js/controllers/answerBookletStatusCtrl.js
+++ b/Apollo/assets/js/controllers/answerBookletStatusCtrl.js
@@ -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";
diff --git a/Apollo/assets/js/controllers/applicationStatusCtrl.js b/Apollo/assets/js/controllers/applicationStatusCtrl.js
index 98ff0acb..d30b91d7 100755
--- a/Apollo/assets/js/controllers/applicationStatusCtrl.js
+++ b/Apollo/assets/js/controllers/applicationStatusCtrl.js
@@ -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";
diff --git a/Apollo/assets/js/controllers/certificationStatusCtrl.js b/Apollo/assets/js/controllers/certificationStatusCtrl.js
index 07417e06..1cf38c8e 100755
--- a/Apollo/assets/js/controllers/certificationStatusCtrl.js
+++ b/Apollo/assets/js/controllers/certificationStatusCtrl.js
@@ -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";
diff --git a/Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js b/Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js
new file mode 100644
index 00000000..4102d428
--- /dev/null
+++ b/Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js
@@ -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 {
+ }
+ });
+ };
+
+}]);
diff --git a/Apollo/assets/js/controllers/studentCtrl.js b/Apollo/assets/js/controllers/studentCtrl.js
index b8e0c7c9..482123b2 100755
--- a/Apollo/assets/js/controllers/studentCtrl.js
+++ b/Apollo/assets/js/controllers/studentCtrl.js
@@ -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) {
diff --git a/Apollo/assets/js/controllers/studyMaterialStatusCtrl.js b/Apollo/assets/js/controllers/studyMaterialStatusCtrl.js
index cbde1ea5..4ca9dc8b 100755
--- a/Apollo/assets/js/controllers/studyMaterialStatusCtrl.js
+++ b/Apollo/assets/js/controllers/studyMaterialStatusCtrl.js
@@ -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";
diff --git a/Apollo/assets/views/dashboard.html b/Apollo/assets/views/dashboard.html
index 57034c99..be1b8cb0 100755
--- a/Apollo/assets/views/dashboard.html
+++ b/Apollo/assets/views/dashboard.html
@@ -32,6 +32,7 @@