From 35f3e52f800954c94ccd544b0a994edf7249053d Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Fri, 24 Aug 2018 16:21:37 +0530
Subject: [PATCH] edit course master changes for duplication validations

---
 Apollo/assets/js/controllers/dashboardCtrl.js      |  1 -
 Apollo/assets/js/controllers/feesStatusCtrl.js     |  6 +++---
 Apollo/assets/views/dashboard.html                 | 14 +++++++-------
 Apollo/assets/views/status-update/fees_status.html |  4 ++--
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/Apollo/assets/js/controllers/dashboardCtrl.js b/Apollo/assets/js/controllers/dashboardCtrl.js
index 56cc608f..9098144b 100755
--- a/Apollo/assets/js/controllers/dashboardCtrl.js
+++ b/Apollo/assets/js/controllers/dashboardCtrl.js
@@ -353,7 +353,6 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
 
     $scope.open = function (studentDetails) {
 
-
         // get student view details
         var getcourse = {
             method: 'POST',
diff --git a/Apollo/assets/js/controllers/feesStatusCtrl.js b/Apollo/assets/js/controllers/feesStatusCtrl.js
index 99e94d3b..2ef1749e 100755
--- a/Apollo/assets/js/controllers/feesStatusCtrl.js
+++ b/Apollo/assets/js/controllers/feesStatusCtrl.js
@@ -2387,7 +2387,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log"
 
     //  $scope.items = ['item1', 'item2', 'item3'];
 
-    $scope.openStudentView = function (studentDetails) {
+    $scope.open = function (studentDetails) {
 
 
         // get student view details
@@ -2515,7 +2515,7 @@ $scope.reregisterPDF = function(student){
                   //     console.log(subkey);
                   //         $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);
       //$rootScope.Student = PDFdata;
diff --git a/Apollo/assets/views/dashboard.html b/Apollo/assets/views/dashboard.html
index 6e35d5ad..81f47706 100755
--- a/Apollo/assets/views/dashboard.html
+++ b/Apollo/assets/views/dashboard.html
@@ -17,7 +17,7 @@
 <div ng-controller="dashboardCtrl">
 	<div class="container-fluid container-fullw padding-bottom-10">
 		<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-body no-padding">
@@ -36,7 +36,7 @@
 											view more
 										</a>
 									</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>
 										<tr><!--<td colspan="5" style="background:#1FBBA6;color:#fff !important">Total Entries :{{todayFolloupDetails.length}}</td></tr>-->
 										<tr>
@@ -72,7 +72,7 @@
 											view more
 										</a>
 									</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>
 										<tr><!--<td colspan="5" style="background:#1FBBA6;color:#fff !important">Total Entries :{{todayFolloupDetails.length}}</td></tr>-->
 										<tr>
@@ -113,7 +113,7 @@
 											view more
 										</a>
 									</div>
-									<table class="table table-hover" ng-if="emptyDataPending==false" ng-controller="studentModalDemoCtrl">
+									<table class="table table-hover" ng-if="emptyDataPending==false">
 										<thead>
 										<!-- <tr> -->
 										<!-- <td colspan="6" style="background:#C82E29;color:#fff !important">Total Entries :{{pendingFolloupDetails.length}}</td></tr> -->
@@ -153,7 +153,7 @@
 											view more
 										</a>
 									</div>
-									<table class="table table-hover" ng-if="emptyDataPending==false" ng-controller="studentModalDemoCtrl">
+									<table class="table table-hover" ng-if="emptyDataPending==false">
 										<thead>
 										<!-- <tr> -->
 										<!-- <td colspan="6" style="background:#C82E29;color:#fff !important">Total Entries :{{pendingFolloupDetails.length}}</td></tr> -->
@@ -196,7 +196,7 @@
 											view more
 										</a>
 									</div>
-									<table class="table table-hover" ng-if="emptyDataLead==false" ng-controller="studentModalDemoCtrl">
+									<table class="table table-hover" ng-if="emptyDataLead==false">
 										<thead>
 										<!-- <tr><td colspan="6" style="background:#DD5A82;color:#fff !important">Total Entries :{{leadDetails.length}}</td></tr> -->
 										<tr>
@@ -235,7 +235,7 @@
 											view more
 										</a>
 									</div>
-									<table class="table table-hover" ng-if="emptyDataLead==false" ng-controller="studentModalDemoCtrl">
+									<table class="table table-hover" ng-if="emptyDataLead==false">
 										<thead>
 										<!-- <tr><td colspan="6" style="background:#DD5A82;color:#fff !important">Total Entries :{{leadDetails.length}}</td></tr> -->
 										<tr>
diff --git a/Apollo/assets/views/status-update/fees_status.html b/Apollo/assets/views/status-update/fees_status.html
index 31c99c09..416f8ab2 100755
--- a/Apollo/assets/views/status-update/fees_status.html
+++ b/Apollo/assets/views/status-update/fees_status.html
@@ -126,9 +126,9 @@
             </thead>
             <tbody dir-paginate="user in studentInfo|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10">
             <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><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.CourseName}}</td>
               <!--  <td>{{user.SessionName}}</td>-->