From cba4708dcd1092da6a47682cecdd0e59f9ee1aa4 Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Sat, 13 Oct 2018 18:09:55 +0530
Subject: [PATCH] set fee for year

---
 .../api/application/models/Student_model.php  |  4 +-
 .../assets/js/controllers/feesStatusCtrl.js   | 53 +++++++++++++------
 Apollo/assets/js/controllers/studentCtrl.js   |  2 +-
 3 files changed, 40 insertions(+), 19 deletions(-)

diff --git a/Apollo/api/application/models/Student_model.php b/Apollo/api/application/models/Student_model.php
index 2ed7d541..eb1349a7 100755
--- a/Apollo/api/application/models/Student_model.php
+++ b/Apollo/api/application/models/Student_model.php
@@ -1799,14 +1799,14 @@ class Student_model extends CI_Model {
             $result_array['maildetails'] = 'No Records Found';
         }
 
-
+///print_r($this->db->last_query());die();
 
         $this->db->select('StudentID');
         $this->db->from('T_StudentDetails');
         $this->db->where('MobileNumber', $det['Phone']);
         $studentID = $this->db->get();
 
-
+ 
          if($studentID ->result())
         {
 
diff --git a/Apollo/assets/js/controllers/feesStatusCtrl.js b/Apollo/assets/js/controllers/feesStatusCtrl.js
index f4073165..7b976b96 100755
--- a/Apollo/assets/js/controllers/feesStatusCtrl.js
+++ b/Apollo/assets/js/controllers/feesStatusCtrl.js
@@ -337,19 +337,23 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n
      }
 
 
-        if(details.SessionName!=undefined && details.SessionName!=''){
+        if(details.SessionName!=undefined && details.SessionName!='')
+        {
 
-            //console.log('if');
+            console.log('if');
             $scope.sessionDetails=[];
             $scope.sessionDetailsTo=[];
-            if(type==1){
+            if(type==1)
+            {
                 $scope.setModel.feesType.ToSessionName="";
             }
-            else{
+            else
+            {
                 $scope.setModel.feesType.ToSessionName=details.ToSessionName;
             }
 
-            if(details.ProgramType=='Y001' && details.SNo=='1'){
+            if(details.ProgramType=='Y001' && details.SNo=='1')
+            {
 
 //console.log('if1')
                 // get session details
@@ -371,11 +375,13 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n
                 });
 
             }
-            else if(details.ProgramType=='Y001' && details.SNo!='1'){
+            else if(details.ProgramType=='Y001' && details.SNo!='1')
+            {
 
                // console.log('if else1')
 
-                if($scope.feesStructureInfo[0].SessionName!=''){
+                if($scope.feesStructureInfo[0].SessionName!='')
+                {
 
                   //  console.log('else if if')
                     // get session details
@@ -403,7 +409,8 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n
                 }
 
                 // after branch changes
-                else{
+                else
+                {
 
                    // console.log('else if else')
                     angular.forEach($scope.masterSessionDetails,function (svalues,skey) {
@@ -424,7 +431,8 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n
 
 
             }
-            else{
+            else
+            {
 
                // console.log('else')
                 // get session details
@@ -453,12 +461,16 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n
                 });
             }
         }
-        else{
 
 
+
+        else
+        {
            // console.log('function else')
            // alert("function else");
-            if(details.ProgramType=='Y001' && details.SNo!='1'){
+            if(details.ProgramType=='Y001' && details.SNo!='1')
+            {
+               // console.log('else if')
                // alert("else if");
                 $scope.sessionDetails=[];
                 $scope.sessionDetailsTo=[];
@@ -487,7 +499,7 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n
 
                     });
                   
-$scope.setModel.feesType.SessionName = $scope.sessionDetails[0].SessionID;
+               $scope.setModel.feesType.SessionName = $scope.sessionDetails[0].SessionID;
                 }
                 else{
 
@@ -509,13 +521,17 @@ $scope.setModel.feesType.SessionName = $scope.sessionDetails[0].SessionID;
 
 
             }
-            else{
+            else
+            {
+
+              //  console.log('else else')
                 //alert("else else");
                 $scope.sessionDetails=[];
                 $scope.sessionDetailsTo=[];
 
-                if(details.SessionName=='' || details.SessionName==null || details.SessionName==undefined){
-
+                if(details.SessionName=='' || details.SessionName==null || details.SessionName==undefined)
+                {
+                      //console.log('else else if')
                     angular.forEach($scope.masterSessionDetails,function (svalues,skey) {
 
                         if(svalues.IsActive=='1' ){
@@ -528,8 +544,13 @@ $scope.setModel.feesType.SessionName = $scope.sessionDetails[0].SessionID;
 
 
                     });
+
+                    $scope.setModel.feesType.SessionName = $scope.sessionDetails[0].SessionID;
                 }
-                else{
+                else
+                {
+
+                    //console.log('else else else')
                     // get session details
                     var found = $filter('getById')($scope.masterSessionDetails, details.SessionName);
                     $scope.ExistSessionDate = new Date(found.SessionDate.substring(6,10)+'-'+found.SessionDate.substring(3,5)+'-'+found.SessionDate.substring(0,2));
diff --git a/Apollo/assets/js/controllers/studentCtrl.js b/Apollo/assets/js/controllers/studentCtrl.js
index 0fa01391..0e11a04c 100755
--- a/Apollo/assets/js/controllers/studentCtrl.js
+++ b/Apollo/assets/js/controllers/studentCtrl.js
@@ -832,7 +832,7 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams",
                           $scope.StudentIDDet = response.data.StudentID;
                           $scope.msgdetID = $scope.StudentIDDet[0].StudentID;
 
-                          //console.log($scope.msgdetID);
+                         // console.log($scope.MailDetails);
                        
                     }