Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec
This commit is contained in:
gandhimathi
commit
25bba02aac
@ -104,6 +104,7 @@
|
||||
"ENROLLMENT": "Enrollment",
|
||||
"STUDENTDETAILS": "Manage",
|
||||
"STUDENTDETAILSADDEDIT": "Manage Details",
|
||||
"STUDENTFEEDETAILCOMPARE": "Student University Fee",
|
||||
"status" : {
|
||||
"MAIN": "Update Status",
|
||||
"STUDYMATERIAL": "Study Material",
|
||||
|
||||
@ -231,6 +231,14 @@ app.constant('JS_REQUIRES', {
|
||||
'report_examfeeCtrl':'assets/js/controllers/report_examfeeCtrl.js',
|
||||
'report_balfeeCtrl':'assets/js/controllers/report_balfeeCtrl.js',
|
||||
'report_leadCtrl':'assets/js/controllers/report_leadCtrl.js',
|
||||
|
||||
/**
|
||||
* univesity sutdent fee compare details
|
||||
*/
|
||||
|
||||
'student_university_fee_compareCtrl':'assets/js/controllers/student_university_fee_compare.js',
|
||||
|
||||
|
||||
},
|
||||
//*** angularJS Modules
|
||||
modules: [{
|
||||
|
||||
@ -307,6 +307,14 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com
|
||||
ncyBreadcrumb: {
|
||||
label: 'Manage Details'
|
||||
}
|
||||
}).state('app.student.studentUnivFeeCompareDetails', {
|
||||
url: '/studentUnivFeeCompare',
|
||||
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: 'Student University Fee Compare',
|
||||
ncyBreadcrumb: {
|
||||
label: 'Student University Fee Compare'
|
||||
}
|
||||
}).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>',
|
||||
|
||||
148
Apollo/assets/js/controllers/student_university_fee_compare.js
Normal file
148
Apollo/assets/js/controllers/student_university_fee_compare.js
Normal file
@ -0,0 +1,148 @@
|
||||
'use strict';
|
||||
/**
|
||||
* controllers for ng-table
|
||||
* Simple table with sorting and filtering on AngularJS
|
||||
*/
|
||||
|
||||
app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "$http", "API_POINTS", "$state", '$rootScope', '$cookies', 'md5', 'ipCookie', '$timeout', '$window', "flowFactory", "$interval", 'SweetAlert', function ($scope, toaster, $filter, ngTableParams, $http, apiPoint, $state, $rootScope, $cookies, md5, ipCookie, $timeout, $window, flowFactory, $interval, SweetAlert) {
|
||||
/**
|
||||
* student university fee details compare
|
||||
*/
|
||||
|
||||
// get local client details
|
||||
var localDetail = JSON.parse(localStorage.getItem('localObj'));
|
||||
var localDetails = ipCookie('cookiechk');
|
||||
|
||||
// load when html page load
|
||||
$scope.init = function () {
|
||||
|
||||
var logcheck = JSON.parse(localStorage.getItem('localObj'));
|
||||
|
||||
const LOCALTYPE = logcheck.localType;
|
||||
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE == 'R005')) {
|
||||
console.log("if");
|
||||
}else {
|
||||
if(logcheck != null && LOCALTYPE !='R001') {
|
||||
console.log("else if");
|
||||
$state.go('app.dashboard');
|
||||
} else {
|
||||
console.log("else else");
|
||||
window.localStorage.clear();
|
||||
$state.go('login.signin');
|
||||
}
|
||||
}
|
||||
|
||||
if (localDetail != null) {
|
||||
if (localDetails.localType === 'R004') {
|
||||
$scope.getUniversityList();
|
||||
$scope.getUniversitySearchList();
|
||||
} else {
|
||||
ipCookie.remove('cookiechk');
|
||||
$window.localStorage.clear();
|
||||
$state.go('login.signin');
|
||||
}
|
||||
} else {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
$scope.universityData = '';
|
||||
$scope.getUniversityList = function () {
|
||||
var empListreq = {
|
||||
method: 'POST',
|
||||
url: apiPoint.url + 'getStudentUniversity/',
|
||||
headers: {
|
||||
'Content-Type': 'application/json'
|
||||
},
|
||||
data: {
|
||||
data: localDetails
|
||||
}
|
||||
};
|
||||
$http(empListreq).then(function (response) {
|
||||
if (response.data.univList) {
|
||||
$scope.universityData = response.data.university_details;
|
||||
} else {
|
||||
}
|
||||
});
|
||||
}
|
||||
// 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) {
|
||||
if (univ === '') {
|
||||
$scope.myUnivSearch = "";
|
||||
$scope.searchData.University = '';
|
||||
$scope.searchData.Course = '';
|
||||
$scope.searchData.Batch = '';
|
||||
$scope.courseData = name.Course;
|
||||
$scope.batchData = name.Batch;
|
||||
$scope.OpenWindowStatus = false;
|
||||
} else {
|
||||
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.onSubmit = function(){
|
||||
if($scope.searchData.University !== '' && $scope.searchData.Course !==''){
|
||||
$scope.Searchloader = true;
|
||||
var empListreq = {
|
||||
method: 'POST',
|
||||
url: apiPoint.url + 'getStudentUnivFeeCompareDetails/',
|
||||
headers: {
|
||||
'Content-Type': 'application/json'
|
||||
},
|
||||
data: {
|
||||
data: localDetails,
|
||||
search: $scope.searchData
|
||||
}
|
||||
};
|
||||
$http(empListreq).then(function (response) {
|
||||
if (response.data.studentList) {
|
||||
$scope.Searchloader = false;
|
||||
$scope.studentData = true;
|
||||
$scope.data = response.data.student_details;
|
||||
$scope.studentListLength = $scope.data.length;
|
||||
} else {
|
||||
$scope.Searchloader = false;
|
||||
$scope.studentData = false;
|
||||
}
|
||||
});
|
||||
}else {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
}]);
|
||||
@ -25,9 +25,9 @@
|
||||
<div class="row">
|
||||
<div class="col-sm-8">
|
||||
|
||||
<h1 class="mainTitle" translate="Course Semester Mapping">{{ mainTitle }}</h1>
|
||||
<h1 class="mainTitle" translate="Course Subject Mapping">{{ mainTitle }}</h1>
|
||||
|
||||
<span class="mainDescription">Allocate Courses to Corresponding Semesters </span>
|
||||
<span class="mainDescription">Allocate Courses to Corresponding Subjects </span>
|
||||
|
||||
</div>
|
||||
<div ncy-breadcrumb></div>
|
||||
|
||||
@ -216,6 +216,11 @@
|
||||
</li>
|
||||
</ul>
|
||||
</li>
|
||||
<li ui-sref-active="active">
|
||||
<a ui-sref="app.student.studentUnivFeeCompareDetails" ng-click="checkSuperAdmin()">
|
||||
<span class="title" translate="sidebar.nav.student.STUDENTFEEDETAILCOMPARE"> STUDENT UNIV FEE COMPARE DETAILS </span>
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
</li>
|
||||
<!--<li ng-class="{'active open':$state.includes('app.call')}">
|
||||
|
||||
@ -413,7 +413,7 @@
|
||||
</a>
|
||||
</td>
|
||||
<td>
|
||||
<a ng-if="((p.Sem_Year | uppercase) !='SEM1' && (p.Sem_Year | uppercase) !='YEAR1') && feesStructureInfo[0].ProgramType=='Y001'" class="text-red" tooltip="Generate Re-registration PDF" ng-click="reregisterPDF(p);"><b class="fa fa-hover fa fa-file-pdf-o " aria-hidden="true"></b>
|
||||
<a ng-if="((p.Sem_Year | uppercase) !='SEM1' && (p.Sem_Year | uppercase) !='YEAR1') && p.ProgramType=='Y001'" class="text-red" tooltip="Generate Re-registration PDF" ng-click="reregisterPDF(p);"><b class="fa fa-hover fa fa-file-pdf-o " aria-hidden="true"></b>
|
||||
</a></td>
|
||||
|
||||
</tr>
|
||||
|
||||
105
Apollo/assets/views/student/studentUnivFeeCompareDetails.html
Normal file
105
Apollo/assets/views/student/studentUnivFeeCompareDetails.html
Normal file
@ -0,0 +1,105 @@
|
||||
<!-- start: STUDENT TITLE -->
|
||||
<section id="page-title">
|
||||
<div class="row">
|
||||
<div class="col-sm-8">
|
||||
<h1 class="mainTitle" translate="Student University Fee">{{ mainTitle }}</h1>
|
||||
<span class="mainDescription">Student University Fee Compare Details. </span>
|
||||
</div>
|
||||
<div ncy-breadcrumb></div>
|
||||
</div>
|
||||
</section>
|
||||
<!-- end: STUDENT TITLE -->
|
||||
<!-- start: LIST GROUP -->
|
||||
<div ng-controller="student_university_fee_compareCtrl" class="container-fluid container-fullw bg-white">
|
||||
<script>
|
||||
$(document).ready(function () {
|
||||
$("#selectBranch").focus();
|
||||
});
|
||||
</script>
|
||||
|
||||
<style>
|
||||
#containersPara {
|
||||
width: 180px;
|
||||
height: 75px;
|
||||
overflow: auto;
|
||||
white-space: pre;
|
||||
}
|
||||
</style>
|
||||
<style>
|
||||
.listCoutShow {
|
||||
margin: 12px;
|
||||
padding: 4px;
|
||||
padding-left: 10px;
|
||||
padding-right: 10px;
|
||||
border: 1px solid #59b176;
|
||||
border-radius: 7px;
|
||||
color: #FFF;
|
||||
background-color: #5fba7d;
|
||||
text-align: center;
|
||||
}
|
||||
</style>
|
||||
<div>
|
||||
<br>
|
||||
|
||||
<div class="row" ng-init="init()">
|
||||
<tabset id="here" class="tabbable">
|
||||
<tab tabindex="1" active="tabactive1" ng-click="tabActive('tabactive1')" heading="View Details" id="viewDetails">
|
||||
<script>
|
||||
$("#selectBranch").change(function () {
|
||||
$("#searchIn").focus();
|
||||
}); $("#selectBranch").click(function () {
|
||||
$("#searchIn").focus();
|
||||
});
|
||||
</script>
|
||||
|
||||
<div class="container-fluid container-fullw">
|
||||
<form name="Form" id="form" novalidate ng-submit="onSubmit()" method="post">
|
||||
<div class="row">
|
||||
<div class="col-md-3">
|
||||
<label for="form-field-select-2">
|
||||
University
|
||||
</label>
|
||||
|
||||
<select class="form-control" tabindex="3" 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-3">
|
||||
<label for="form-field-select-2">
|
||||
Course
|
||||
</label>
|
||||
|
||||
<select ui-select2 class="form-control" tabindex="4" 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}}<span ng-show="itemCourse.CourseCode != ''">(<strong>{{itemCourse.CourseCode}}</strong>)</span></option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="col-md-2" style="padding-top: 2.3%;">
|
||||
<div class="pull-right">
|
||||
|
||||
<button type="submit" class="btn btn-success btn-o" tabindex="8">
|
||||
Submit
|
||||
</button>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</form>
|
||||
</div>
|
||||
</tab>
|
||||
<tab tabindex="2" active="tabactive2" ng-click="tabActive('tabactive2')" heading="Upload Files" id="uploadFiles">
|
||||
|
||||
|
||||
</tab>
|
||||
</tabset>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- end: LIST GROUP -->
|
||||
Loading…
Reference in New Issue
Block a user