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

edit course master changes for duplication validations

Browse Source
This commit is contained in:
gandhimathi 2018-08-24 16:21:37 +05:30
parent 43c225e730
commit 35f3e52f80
4 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Apollo/assets/js/controllers/dashboardCtrl.js
View File

@ -353,7 +353,6 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
$scope.open = function (studentDetails) { $scope.open = function (studentDetails) {
// get student view details // get student view details
var getcourse = { var getcourse = {
method: 'POST', method: 'POST',

6
Apollo/assets/js/controllers/feesStatusCtrl.js
View File

@ -2387,7 +2387,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
// $scope.items = ['item1', 'item2', 'item3']; // $scope.items = ['item1', 'item2', 'item3'];
$scope.openStudentView = function (studentDetails) { $scope.open = function (studentDetails) {
// get student view details // get student view details
@ -2515,7 +2515,7 @@ $scope.reregisterPDF = function(student){
// console.log(subkey); // console.log(subkey);
// $scope.subjectDetails.push(subjectdata); // $scope.subjectDetails.push(subjectdata);
// }); // });
$scope.open(coursefiltered,response.data.SubjectDetails,student); $scope.openReregistration(coursefiltered,response.data.SubjectDetails,student);
//}); //});
} }
@ -2530,7 +2530,7 @@ $scope.reregisterPDF = function(student){
} }
$scope.open = function(coursefiltered,Subjects,sem){ $scope.openReregistration = function(coursefiltered,Subjects,sem){
// console.log(PDFdata); // console.log(PDFdata);
//$rootScope.Student = PDFdata; //$rootScope.Student = PDFdata;

14
Apollo/assets/views/dashboard.html
View File

@ -17,7 +17,7 @@
<div ng-controller="dashboardCtrl"> <div ng-controller="dashboardCtrl">
<div class="container-fluid container-fullw padding-bottom-10"> <div class="container-fluid container-fullw padding-bottom-10">
<div class="row" data-ng-init="initCallTracking()"> <div class="row" data-ng-init="initCallTracking()">
<div class="col-sm-12"> <div class="col-sm-12" ng-controller="studentModalDemoCtrl">
<div class="panel panel-white no-radius"> <div class="panel panel-white no-radius">
<div class="panel-body no-padding"> <div class="panel-body no-padding">
@ -36,7 +36,7 @@
view more view more
</a> </a>
</div> </div>
<table class="table table-hover no-margin" ng-if="emptyDataToday==false" ng-controller="studentModalDemoCtrl"> <table class="table table-hover no-margin" ng-if="emptyDataToday==false">
<thead> <thead>
<tr><!--<td colspan="5" style="background:#1FBBA6;color:#fff !important">Total Entries :{{todayFolloupDetails.length}}</td></tr>--> <tr><!--<td colspan="5" style="background:#1FBBA6;color:#fff !important">Total Entries :{{todayFolloupDetails.length}}</td></tr>-->
<tr> <tr>
@ -72,7 +72,7 @@
view more view more
</a> </a>
</div> </div>
<table class="table table-hover no-margin" ng-if="emptyDataToday==false" ng-controller="studentModalDemoCtrl"> <table class="table table-hover no-margin" ng-if="emptyDataToday==false">
<thead> <thead>
<tr><!--<td colspan="5" style="background:#1FBBA6;color:#fff !important">Total Entries :{{todayFolloupDetails.length}}</td></tr>--> <tr><!--<td colspan="5" style="background:#1FBBA6;color:#fff !important">Total Entries :{{todayFolloupDetails.length}}</td></tr>-->
<tr> <tr>
@ -113,7 +113,7 @@
view more view more
</a> </a>
</div> </div>
<table class="table table-hover" ng-if="emptyDataPending==false" ng-controller="studentModalDemoCtrl"> <table class="table table-hover" ng-if="emptyDataPending==false">
<thead> <thead>
<!-- <tr> --> <!-- <tr> -->
<!-- <td colspan="6" style="background:#C82E29;color:#fff !important">Total Entries :{{pendingFolloupDetails.length}}</td></tr> --> <!-- <td colspan="6" style="background:#C82E29;color:#fff !important">Total Entries :{{pendingFolloupDetails.length}}</td></tr> -->
@ -153,7 +153,7 @@
view more view more
</a> </a>
</div> </div>
<table class="table table-hover" ng-if="emptyDataPending==false" ng-controller="studentModalDemoCtrl"> <table class="table table-hover" ng-if="emptyDataPending==false">
<thead> <thead>
<!-- <tr> --> <!-- <tr> -->
<!-- <td colspan="6" style="background:#C82E29;color:#fff !important">Total Entries :{{pendingFolloupDetails.length}}</td></tr> --> <!-- <td colspan="6" style="background:#C82E29;color:#fff !important">Total Entries :{{pendingFolloupDetails.length}}</td></tr> -->
@ -196,7 +196,7 @@
view more view more
</a> </a>
</div> </div>
<table class="table table-hover" ng-if="emptyDataLead==false" ng-controller="studentModalDemoCtrl"> <table class="table table-hover" ng-if="emptyDataLead==false">
<thead> <thead>
<!-- <tr><td colspan="6" style="background:#DD5A82;color:#fff !important">Total Entries :{{leadDetails.length}}</td></tr> --> <!-- <tr><td colspan="6" style="background:#DD5A82;color:#fff !important">Total Entries :{{leadDetails.length}}</td></tr> -->
<tr> <tr>
@ -235,7 +235,7 @@
view more view more
</a> </a>
</div> </div>
<table class="table table-hover" ng-if="emptyDataLead==false" ng-controller="studentModalDemoCtrl"> <table class="table table-hover" ng-if="emptyDataLead==false">
<thead> <thead>
<!-- <tr><td colspan="6" style="background:#DD5A82;color:#fff !important">Total Entries :{{leadDetails.length}}</td></tr> --> <!-- <tr><td colspan="6" style="background:#DD5A82;color:#fff !important">Total Entries :{{leadDetails.length}}</td></tr> -->
<tr> <tr>

4
Apollo/assets/views/status-update/fees_status.html
View File

@ -126,9 +126,9 @@
</thead> </thead>
<tbody dir-paginate="user in studentInfo|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10"> <tbody dir-paginate="user in studentInfo|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10">
<tr> <tr>
<td><a tooltip="View Student" class="text-dark" ng-click="openStudentView(user);">{{user.Firstname}}</a></td> <td><a tooltip="View Student" class="text-dark" ng-click="open(user);">{{user.Firstname}}</a></td>
<td>{{user.Lastname}}</td> <td>{{user.Lastname}}</td>
<td><a tooltip="View Student" class="text-dark" ng-click="openStudentView(user);">{{user.MobileNumber}}</a></td> <td><a tooltip="View Student" class="text-dark" ng-click="open(user);">{{user.MobileNumber}}</a></td>
<td>{{user.UniversityName}}</td> <td>{{user.UniversityName}}</td>
<td>{{user.CourseName}}</td> <td>{{user.CourseName}}</td>
<!-- <td>{{user.SessionName}}</td>--> <!-- <td>{{user.SessionName}}</td>-->