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:
gayathri1990 2018-08-25 10:56:58 +05:30
commit 7d12f2362f
4 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Apollo/api/application/controllers/StatusUpdation_Controller.php
View File

@ -133,7 +133,9 @@ class StatusUpdation_Controller extends REST_Controller {
// get certification type list // get certification type list
public function getCertificateList_post() { public function getCertificateList_post() {
$reqData = $this->post('data'); $reqData = $this->post('data');
$certificateList = $this->statusupdation_model->get_certificate_list($reqData['localBranchID']); // Check if the employee exist $stuData = $this->post('studentID');
$courseData = $this->post('courseID');
$certificateList = $this->statusupdation_model->get_certificate_list($reqData['localBranchID'], $stuData, $courseData); // Check if the employee exist
if ($certificateList) { if ($certificateList) {
$certificateList['status'] = REST_Controller::HTTP_OK; $certificateList['status'] = REST_Controller::HTTP_OK;
// Set the response and exit // Set the response and exit

17
Apollo/api/application/models/StatusUpdation_model.php
View File

@ -153,12 +153,19 @@ class StatusUpdation_model extends CI_Model {
} }
// get certificate list // get certificate list
public function get_certificate_list($branchId) { public function get_certificate_list($branchId, $sutendDetail, $courseDetails) {
$this->db->select('*'); // echo $sutendDetail, $courseDetails;exit();
$this->db->select('CFR.*');
$this->db->order_by('CreatedOn', 'DESC'); $this->db->order_by('CreatedOn', 'DESC');
$this->db->from(CERTIFICATION); $this->db->from('T_Students_Fees_Status as SFS');
$this->db->where('IsActive', 1); // $this->db->join('T_Course_Fees_Details as CFD', 'CFD.ID = SFS.FeeType');
$this->db->where('BranchCode', $branchId); // $this->db->join('T_Students_Fees_Status as SFS', 'SFS.StudentID = $sutendDetail');
$this->db->join( '' . CERTIFICATION . ' as CFR', 'CFR.CertificateName = SFS.FeesType');
$this->db->where('CFR.IsActive', 1);
$this->db->where('SFS.StudentID',$sutendDetail);
$this->db->where('SFS.CourseID',$courseDetails);
$this->db->where('CFR.BranchCode', $branchId);
$this->db->where('SFS.BranchCode', $branchId);
$cerfDetails = $this->db->get(); $cerfDetails = $this->db->get();
$certificateDetails = $cerfDetails->result(); $certificateDetails = $cerfDetails->result();
if (count($certificateDetails) > 0) { if (count($certificateDetails) > 0) {

15
Apollo/assets/js/controllers/certificateStatusCtrl.js
View File

@ -57,10 +57,10 @@ app.controller('certificateStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
$scope.localTypeSuperAdmin = true; $scope.localTypeSuperAdmin = true;
$scope.getUniversityList(); $scope.getUniversityList();
$scope.getBranchList(); $scope.getBranchList();
getCertificateDetailsList(); // getCertificateDetailsList();
} else { } else {
$scope.getUniversityList(); $scope.getUniversityList();
getCertificateDetailsList(); // getCertificateDetailsList();
} }
} else { } else {
} }
@ -88,7 +88,7 @@ app.controller('certificateStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
} }
// get certificate or application list // get certificate or application list
var getCertificateDetailsList = function () { var getCertificateDetailsList = function (stu, cour) {
var getCerfreg = { var getCerfreg = {
method: 'POST', method: 'POST',
url: apiPoint.url + 'getCertificateList/', url: apiPoint.url + 'getCertificateList/',
@ -96,6 +96,8 @@ app.controller('certificateStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
'Content-Type': 'application/json' 'Content-Type': 'application/json'
}, },
data: { data: {
studentID: stu,
courseID: cour,
data: localDetails data: localDetails
} }
}; };
@ -245,7 +247,7 @@ app.controller('certificateStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
// Select one row in a table once // Select one row in a table once
$scope.setOneSelect = function (value) { $scope.setOneSelect = function (value) {
// alert(); // alert(JSON.stringify(value));
angular.forEach($scope.searchResultDetails, function (item) { angular.forEach($scope.searchResultDetails, function (item) {
item.Selected = false; item.Selected = false;
}); });
@ -253,7 +255,7 @@ app.controller('certificateStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
$scope.statusUpdationId = value.UNI_ID; $scope.statusUpdationId = value.UNI_ID;
value.Selected = true; value.Selected = true;
$scope.OpenWindowStatus = true; $scope.OpenWindowStatus = true;
$scope.openUpdateWind(); $scope.openUpdateWind(value);
} }
// unselect all the selected item // unselect all the selected item
@ -267,7 +269,7 @@ app.controller('certificateStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
// open popup window onselct checkbox clicked or close popup window all the clicked items unchecked // open popup window onselct checkbox clicked or close popup window all the clicked items unchecked
$scope.OpenWindowStatus = false; $scope.OpenWindowStatus = false;
$scope.openUpdateWind = function () { $scope.openUpdateWind = function (s) {
var ItemsSelected = $scope.searchResultDetails.filter(function (item) { var ItemsSelected = $scope.searchResultDetails.filter(function (item) {
if (item.Selected === true) { return true; } if (item.Selected === true) { return true; }
}); });
@ -275,6 +277,7 @@ app.controller('certificateStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
const courseLocal = $scope.searchData.Course; const courseLocal = $scope.searchData.Course;
$scope.getSemYearList(courseLocal); $scope.getSemYearList(courseLocal);
$scope.getStatusList(); $scope.getStatusList();
getCertificateDetailsList(s.StudentID, s.CourseID);
$scope.OpenWindowStatus = true; $scope.OpenWindowStatus = true;
$scope.myStatusModel = { $scope.myStatusModel = {
'semYear': '', 'semYear': '',

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

@ -833,7 +833,7 @@
<!-- </a> --> <!-- </a> -->
<!-- </li> --> <!-- </li> -->
<li ui-sref-active="active"> <li ui-sref-active="active">
<a ui-sref="app.hallTicket.batchSchedule" ng-click="checkSuperAdmin()"> <a ui-sref="app.hallTicket.batchSchedule" ng-click="checkAdmin()">
<span class="title" translate="sidebar.nav.hallTicket.BATCHSCHEDULE">BATCHSCHEDULE</span> <span class="title" translate="sidebar.nav.hallTicket.BATCHSCHEDULE">BATCHSCHEDULE</span>
</a> </a>
</li> </li>
@ -1209,7 +1209,7 @@
<!-- </a> --> <!-- </a> -->
<!-- </li> --> <!-- </li> -->
<li ui-sref-active="active"> <li ui-sref-active="active">
<a ui-sref="app.hallTicket.batchSchedule" ng-click="checkSuperAdmin()"> <a ui-sref="app.hallTicket.batchSchedule" ng-click="checkStaff()">
<span class="title" translate="sidebar.nav.hallTicket.BATCHSCHEDULE">BATCHSCHEDULE</span> <span class="title" translate="sidebar.nav.hallTicket.BATCHSCHEDULE">BATCHSCHEDULE</span>
</a> </a>
</li> </li>
@ -1470,7 +1470,7 @@
</a> </a>
</li> </li>
<li ui-sref-active="active"> <li ui-sref-active="active">
<a ui-sref="app.hallTicket.batchSchedule" ng-click="checkSuperAdmin()"> <a ui-sref="app.hallTicket.batchSchedule" ng-click="checkStaff()">
<span class="title" translate="sidebar.nav.hallTicket.BATCHSCHEDULE">BATCHSCHEDULE</span> <span class="title" translate="sidebar.nav.hallTicket.BATCHSCHEDULE">BATCHSCHEDULE</span>
</a> </a>
</li> </li>