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

common files changes university enrolment details

Browse Source
This commit is contained in:
gandhimathi 2018-09-06 12:22:45 +05:30
parent edfd242001
commit cf911771b2
6 changed files with 48 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php
View File

@ -760,7 +760,7 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model {
$universityResult=array();
if($universityDetails->result()){
$universityResult['status']=true;
foreach ($universityDetails->result() as $row){
/* foreach ($universityDetails->result() as $row){
$this->db->select('SM.SessionID,SM.SessionName');
$this->db->order_by('SM.SessionID','DESC');
$this->db->where('SM.IsActive','1');
@ -778,8 +778,8 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model {
$fetchArray['SessionDetails']="";
}
$getResult[]=$fetchArray;
}
$universityResult['details']=$getResult;
}*/
$universityResult['details']=$universityDetails->result();
}
else{
$universityResult['status']=false;

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

@ -108,6 +108,7 @@
"STUDENTDETAILSADDEDIT": "Manage Details",
"STUDENTFEEDETAILCOMPARE": "University Form Enrolment",
"STUDENTFROMIDFEEDETAILS": "Student FormId Fee Details",
"UNIVERSITYFORMPAYMENT": "University Form Payment",
"status" : {
"MAIN": "Update Status",
"STUDYMATERIAL": "Study Material",

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

@ -308,7 +308,7 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com
label: 'Manage Details'
}
}).state('app.student.UnivFormEnroment', {
url: '/UnivFormEnrolment',
url: '/univformenrolment',
templateUrl: "assets/views/student/studentUnivFeeCompareDetails.html",
resolve: loadSequence('ui.select', 'spin', 'ui.mask', 'monospaced.elastic', 'ladda', 'touchspin-plugin', 'angular-ladda', 'student_university_fee_compareCtrl', 'ngTable'),
title: 'University Form Enrolment',
@ -323,6 +323,14 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com
ncyBreadcrumb: {
label: 'Student FormId Fees Details'
}
}).state('app.student.universityformpayment', {
url: '/univformpayment',
templateUrl: "assets/views/student/UnivFormPaymentDetails.html",
resolve: loadSequence('ui.select', 'spin', 'ui.mask', 'monospaced.elastic', 'ladda', 'touchspin-plugin', 'angular-ladda', 'univFormPaymentCtrl', 'ngTable'),
title: 'University Form Payment Details',
ncyBreadcrumb: {
label: 'University Form Payment Details'
}
}).state('app.student.status', {
url: '/status',
template: '<div ui-view class="fade-in-up"> <div style="margin: auto; width: 50%;padding: 10px;"> STUDENT STATUS UPDATE </div> </div>',

33
Apollo/assets/js/controllers/student_university_fee_compare.js
View File

@ -35,6 +35,7 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil
if (localDetails.localType === 'R004') {
// $scope.getUniversityList();
$scope.getUniversitySearchList();
$scope.getFileUploadUniversity();
} else {
ipCookie.remove('cookiechk');
$window.localStorage.clear();
@ -43,9 +44,33 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil
} else {
}
}
/*get university details for file upload
* */
// get University List
$scope.fileUploadUniversityData = '';
$scope.getFileUploadUniversity = function () {
var univreq = {
method: 'POST',
url: apiPoint.url + 'getUniversitySessionDetails/',
headers: {
'Content-Type': 'application/json'
},
data: {
data: localDetails
}
};
$http(univreq).then(function (response) {
if (response.data.status) {
$scope.fileUploadUniversityData = response.data.details;
} else {
$scope.fileUploadUniversityData="";
}
});
};
/* get json sem details for serach
* */
/* get json sem details for serach
* */
$scope.semDetails=["1","2","3","4","5","6","7","8"];
// get University List
@ -227,8 +252,8 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil
data: {
localDetails: localDetail,
details: details,
universityID: angular.fromJson(uploadForDetails.university).univCode,
universityName: angular.fromJson(uploadForDetails.university).univName,
universityID: angular.fromJson(uploadForDetails.university).UniversityID,
universityName: angular.fromJson(uploadForDetails.university).UniversityName,
}
};

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

@ -226,6 +226,11 @@
<span class="title" translate="sidebar.nav.student.STUDENTFROMIDFEEDETAILS"> STUDENT FORMID FEE DETAILS </span>
</a>
</li>-->
<!--<li ui-sref-active="active">
<a ui-sref="app.student.universityformpayment" ng-click="checkSuperAdmin()">
<span class="title" translate="sidebar.nav.student.STUDENTFROMIDFEEDETAILS"> STUDENT FORMID FEE DETAILS </span>
</a>
</li>-->
</ul>
</li>
<!--<li ng-class="{'active open':$state.includes('app.call')}">

2
Apollo/assets/views/student/studentUnivFeeCompareDetails.html
View File

@ -403,7 +403,7 @@
</label>
<select class="form-control" tabindex="18" name="formUniversity" ng-model="uploadModel.university" required>
<option value="" selected>Select University</option>
<option ng-repeat="univ in universitySearchData" value="{{univ}}">{{univ.univName}}</option>
<option ng-repeat="funiv in fileUploadUniversityData" value="{{funiv}}">{{funiv.UniversityName}}</option>
</select>
</div>
<div class="col-md-3 form-group" ng-if="showFile=='1'">