Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec

Apollo/assets/js/controllers/entrycorrectionCtrl.js

@@ -146,6 +146,10 @@ $scope.universitySearchData = '';
 
  $scope.OpenWindowStatus = false;      
     $scope.editId = -1;
+    $scope.courselist ='';
+    $scope.loadfee='';
+    $scope.feecheck=false;
+
     $scope.setEditId = function (P) 
     {    //alert(JSON.stringify(P));
       
@@ -173,11 +177,16 @@ $scope.universitySearchData = '';
                     $scope.feeInfo=response.data.details;
                    console.log($scope.feeInfo);
                     $scope.editId = P.ID;
+                    $scope.courselist =true;
+                     $scope.feecheck=false;
+
                     
                 } else {
                     $scope.feeInfo="";
                      $scope.loadfee = "No Records Found";
-
+                     $scope.courselist =false;
+                      $scope.feecheck=true;
+                      $scope.editId = P.ID;
                 }
                
             });

Apollo/assets/js/controllers/studentCtrl.js

@@ -721,12 +721,15 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams",
     $scope.editId = -1;
     $scope.editCourseId = -1;
     $scope.setEditId = function (unique_id, id) {
+
+       // alert()
         $scope.editId = unique_id;
         $scope.editCourseId = -1;
         $scope.studentViewPage = -1;
     }
 
     $scope.setEditCourseId = function (unique_id,id) {
+
         $scope.list = false;
         $scope.getStudentCourseList(id);
         $scope.currentStudentId = id;
@@ -837,6 +840,8 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams",
 
     // get Student Course List
     $scope.getStudentCourseList = function (studentId) {
+
+        console.log('in')
         $scope.courseEditLoading = true;
         $scope.list = true;
         $scope.courseEdit = false;
@@ -1740,11 +1745,15 @@ app.controller('studentSuperAdminCtrl', ["$scope", "toaster", "$filter", "ngTabl
     $scope.editId = -1;
     $scope.editCourseId = -1;
     $scope.setEditId = function (uniqe_id ,id) {
+
+       // alert()
         $scope.editId = uniqe_id;
         $scope.editCourseId = -1;
     }
 
     $scope.setEditCourseId = function (uniqe_id ,id) {
+
+        //alert('1');
         $scope.list = false;
         $scope.getStudentCourseList(id);
         $scope.currentStudentId = id;
@@ -1752,6 +1761,7 @@ app.controller('studentSuperAdminCtrl', ["$scope", "toaster", "$filter", "ngTabl
         $scope.editCourseId = uniqe_id;
         $scope.editId = -1;
         $scope.courseEditLoading = true;
+        $scope.courselist = true;
     }
 
 
@@ -1879,6 +1889,9 @@ app.controller('studentSuperAdminCtrl', ["$scope", "toaster", "$filter", "ngTabl
                 $scope.studentCourseList = response.data.course_details;
                 // $scope.stucour =  $scope.studentCourse[0];
             } else {
+
+                $scope.courselist = false;
+                $scope.courseEditLoading='';
             }
         });
     }

Apollo/assets/views/edit_course.html

@@ -1,6 +1,8 @@
 
 <form name="Form" id="form" novalidate>
     <div class="row">
+
+
         <div class="col-md-12">
             <div class="col-md-12">
                 <fieldset>
@@ -26,7 +28,15 @@
                     
                    
 <!-- {{feeInfo}} -->
-                 <div class="col-md-12">
+<!-- <div ng-if="feecheck==true">
+<div align="center" style="font-weight: bold; font-size:20 ">
+{{loadfee}}
+</div>
+</div> -->
+<div ng-if="courselist == false" class="text-center">
+               <h3>No Records Found</h3>
+        </div>
+                 <div class="col-md-12" ng-if="courselist == true">
                  <!-- {{feeInfo}} -->
                     <div class="table-responsive">
                     <table  id="datatable"   class="table table-hover">

Apollo/assets/views/entry_correction.html

@@ -167,6 +167,8 @@
              <tr ng-show="editId === p.ID" ng-if="editId === p.ID">
                             <td colspan="12" ng-include src="'assets/views/edit_course.html'"></td>
                         </tr>
+
+        
          </tbody>
       </table>
    </div>

Apollo/assets/views/student/editStudentCourseDetails.html

@@ -6,12 +6,15 @@
             })
             </script>
         <div ng-if="courseEditLoading == true" class="text-center">
-            <!--<img src="assets/images/ajax_loader_blue.gif" style="width: 5%; height: 30%">-->
+            <!-- <img src="assets/images/ajax_loader_blue.gif" style="width: 5%; height: 30%"> -->
             <h3>Fetching ...</h3>
         </div>
+        <div ng-if="courselist == false" class="text-center">
+               <h3>No Records Found</h3>
+        </div>
         <div class="col-md-12">
 
-            <fieldset ng-if="courseEditLoading == false">
+            <fieldset ng-if="courseEditLoading == false && courselist == true">
                 <legend>
                     Course Details
                 </legend>