diff --git a/Apollo/api/application/controllers/Student_Controller.php b/Apollo/api/application/controllers/Student_Controller.php index 6f7e3641..17dc9e09 100755 --- a/Apollo/api/application/controllers/Student_Controller.php +++ b/Apollo/api/application/controllers/Student_Controller.php @@ -120,6 +120,7 @@ class Student_Controller extends REST_Controller { } public function getStudentTrackingDetails_post() { + $universityid=$this->post('universityid'); $courseid=$this->post('courseid'); $MobileNumber = $this->post('MobileNumber'); diff --git a/Apollo/api/application/models/StatusUpdation_model.php b/Apollo/api/application/models/StatusUpdation_model.php index c9f446a0..5c8f3ef5 100755 --- a/Apollo/api/application/models/StatusUpdation_model.php +++ b/Apollo/api/application/models/StatusUpdation_model.php @@ -106,6 +106,7 @@ class StatusUpdation_model extends CI_Model { public function update_certificateStatus($arr) { // echo "hai hello check me again"; // print_r($arr); + // exit(); $this->db->insert_batch(CERTIFICATION_STATUS, $arr); if ($this->db->affected_rows() >= 1) { @@ -113,18 +114,16 @@ class StatusUpdation_model extends CI_Model { $answerBookletStatus = $this->getAnswerBookletStatus($arr[0]['StudentID'],$arr[0]['CourseID'],$arr[0]['BranchCode'],$arr[0]['Sem']); // print_r($answerBookletStatus); - // echo $answerBookletStatus['ListName']; - // die(); // echo "COURSE ====$arr[0]['CourseID']"; // echo "PARENT -- $answerBookletStatus"; $getlastansbookstatus = $this->GetLastAns_status($arr[0]['StudentID'],$arr[0]['Sem'],$arr[0]['CourseID']); + // $latestappstatus=''; // if(!empty($getlastansbookstatus)) // { - // foreach($getlastansbookstatus as $get) // { // $latestappstatus= $get->ListCode; @@ -134,15 +133,11 @@ class StatusUpdation_model extends CI_Model { $upperresult=strtoupper($getlastansbookstatus); $WithoutspaceStatus = preg_replace('/\s+/', '',$upperresult); - - // echo $arr[0]['ListCode']; - // die(); + //If condition for Check ANSWERBOOKLET_STATUS, If it is null or 'Issued to Student' for do not send sms. if($answerBookletStatus['isIssueToStudentExist'] == 0 && $answerBookletStatus['statusCount'] != 0) { - //echo "SEND SMS"; - if ($this->get_ListCode_status($arr[0]['ListCode'])) { - //echo 'in'; + $dateToMsg = $arr[0]['CDate']; $studentName = $this->getStudentName($arr[0]['StudentID']); $CmntToMsg = $arr[0]['Comments']; @@ -150,20 +145,20 @@ class StatusUpdation_model extends CI_Model { $issuecheck = strtoupper($statuToMsg); $withoutspaceissue = preg_replace('/\s+/', '',$issuecheck); - //echo $withoutspaceissue;die(); // $cerNamtToMsg = $this->get_certificate_name($arr[0]['CertificationType']); // if( ($statuToMsg == 'received' || $statuToMsg == 'Received' || $statuToMsg == 'RECEIVED') && $WithoutspaceStatus == 'RECEIVEDFROMSTUDENT'){ - if($WithoutspaceStatus == 'SENTTOUNIVERSITY'){ + // if($WithoutspaceStatus == 'SENTTOUNIVERSITY'){ + // if condition for answerbookletstatus + if(strpos($WithoutspaceStatus,'RECEIVED')){ - - // echo 'if';die(); $cerNamtToMsg = 'Mark Card'; $getSemYearMsg = $this->get_couser_sem_yr_msg($arr[0]['CourseID']); $getSemYearANDType = "$getSemYearMsg $cerNamtToMsg"; // $mesg = "Status Update : $cerNamtToMsg $getSemYearMsg - $statuToMsg $dateToMsg."; - $mesg = "$cerNamtToMsg Received - Dear $studentName, Your $getSemYearANDType had been received, Please come and collect it."; + $mesg = "$cerNamtToMsg Received - Dear $studentName, Your $getSemYearANDType had been received, Please come and collect it."; $this->smssend($arr, $mesg); $this->mailsend($arr, $mesg, $cerNamtToMsg); + // echo $statuToMsg; @@ -251,9 +246,14 @@ class StatusUpdation_model extends CI_Model { $this->db->from(PICK_LIST_DETAILS); $this->db->where('ListCode', $listCode); $statusDetails = $this->db->get()->first_row(); - if ($statusDetails->ListName == 'RECEIVED' || $statusDetails->ListName == 'ISSUED TO STUDENT') { + if ($statusDetails->ListName == 'SENT TO UNIVERSITY'){ + return false; + } else if ($statusDetails->ListName == 'RECEIVED' || $statusDetails->ListName == 'ISSUED TO STUDENT') { return true; - } else { + }else if(strpos($statusDetails->ListName,'RECEIVED')){ + return true; + } + else{ return false; } } diff --git a/Apollo/api/application/models/Student_model.php b/Apollo/api/application/models/Student_model.php index bb37e0c3..5f42773a 100755 --- a/Apollo/api/application/models/Student_model.php +++ b/Apollo/api/application/models/Student_model.php @@ -49,7 +49,7 @@ class Student_model extends CI_Model { JOIN T_PickListDetails as PLD1 ON PLD1.ListCode = LT.StatusCode JOIN T_UniversityMaster as UM ON UM.UniversityName=LT.University JOIN T_CourseMaster as CM ON CM.CourseName=LT.Course - WHERE LD.MobileNumber = '".$MobileNumber."' AND PLD1.BranchCode= '".$loginBranch."' AND UM.UniversityID = '".$universityid."' AND CM.CourseID = '".$courseid."' AND LTF.InteractionId in (select max(InteractionId) from T_Lead_Tracking_Followup GROUP BY TrackingID)"; + WHERE LD.MobileNumber = '".$MobileNumber."' AND PLD1.BranchCode= '".$loginBranch."' AND UM.UniversityID = '".$universityid."' AND LTF.InteractionId in (select max(InteractionId) from T_Lead_Tracking_Followup GROUP BY TrackingID)"; // if($loginBranch !='All' AND $userType != EMPLOYEE){ // $this->db->where('LT.CreatedBranch', $loginBranch); @@ -78,7 +78,7 @@ class Student_model extends CI_Model { // die(); $b=$this->db->query($sql); $trackingDetails = $b->result(); - $result =$trackingDetails; + $result = $trackingDetails; // print_r($result); // die(); return $result; diff --git a/Apollo/api/application/models/Studentview_model.php b/Apollo/api/application/models/Studentview_model.php index 2782501a..0fab8662 100755 --- a/Apollo/api/application/models/Studentview_model.php +++ b/Apollo/api/application/models/Studentview_model.php @@ -151,7 +151,7 @@ class Studentview_model extends CI_Model $fetchData['certificateDetails']=$this->getStudentCertificateDetails($studentId,$row->CourseID); $fetchData['markCardDetails']=$this->getMarkcardDetails($studentId,$row->CourseID); $fetchData['batchHistory']=$this->getbatchHistory($studentId,$row->CourseID,$requestedBranch); - $fetchData['applicationHistory']=$this->getStudentApplicationDetails($studentId,$row->CourseID); + $fetchData['applicationHistory']=$this->get_ApplicationFormStatusDetails($studentId,$row->CourseID,$requestedBranch); $CourseArray[]=$fetchData; @@ -222,7 +222,7 @@ class Studentview_model extends CI_Model // get student Mark crad details $fetchData['markCardDetails']=$this->getMarkcardDetails($studentId,$row->CourseID); $fetchData['batchHistory']=$this->getbatchHistory($studentId,$row->CourseID,$requestedBranch); - $fetchData['applicationHistory']=$this->getStudentApplicationDetails($studentId,$row->CourseID); + $fetchData['applicationHistory']=$this->get_ApplicationFormStatusDetails($studentId,$row->CourseID,$requestedBranch); $CourseArray[]=$fetchData; @@ -767,4 +767,26 @@ class Studentview_model extends CI_Model } } + public function get_ApplicationFormStatusDetails($studentId,$courseId,$reqBranch){ + + $this->db->select('t1.ID, t5.BatchName, t2.FeeType as SemID, CFD.Sem_Year as Sem_Year, t2.RegistrationMode, t2.RegistrationType, t1.AppFormDate as StatusUpdateDate,t3.ListName ,t1.Comments'); + $this->db->from('T_ApplicationFormStatus as t1'); + $this->db->join('T_Registration_Details as t2', 't2.ID = t1.Registration_Details_ID'); + $this->db->join('T_Course_Fees_Details as CFD', 'CFD.ID = t2.FeeType'); + $this->db->join('' . PICK_LIST_DETAILS . ' as t3', 't3.ListCode = t1.ListCode', 'LEFT'); + $this->db->join('T_Students_Fees_Status as SFS','SFS.FeesID = t2.Student_Fee_Status_Id'); + $this->db->join('T_BatchMaster as t5','t5.BatchCode = t2.BatchCode','LEFT'); + $this->db->where('t2.StudentID', $studentId); + $this->db->where('t2.CourseID', $courseId); + $this->db->group_by('t1.ID'); + $fromTypes = $this->db->get(); + $formTypeDetails = $fromTypes->result(); + if($formTypeDetails){ + return $formTypeDetails; + } else { + return false; + } + } + + } \ No newline at end of file diff --git a/Apollo/assets/js/controllers/answerBookletStatusCtrl.js b/Apollo/assets/js/controllers/answerBookletStatusCtrl.js index 6ccfa8a1..c453a91a 100755 --- a/Apollo/assets/js/controllers/answerBookletStatusCtrl.js +++ b/Apollo/assets/js/controllers/answerBookletStatusCtrl.js @@ -601,8 +601,49 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log" }; - $scope.open1 = function (values,type) { - + $scope.open1 = function (arr,type,filterby) { + var values = arr; + if(type == '1' || type == '2' || type == '3'){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} } + if(type == '4'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem_Year === filterby) + { + result.push(values[i]); + } + } + } + if(type == '5'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem === filterby) + { + result.push(values[i]); + } + } + } + if(type == '6'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].CertificateName === filterby) + { + result.push(values[i]); + } + } + } + if(type == '7' || type == '8'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem === filterby) + { + result.push(values[i]); + } + } + } var modalInstance1 = $modal.open({ templateUrl: 'assets/views/student/studentPaymentModal.html', controller: 'ModalInstanceCtrl1', @@ -611,7 +652,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log" items1: function () { var myvalues = { - "values":values, + "values":result, "type":type }; return myvalues; diff --git a/Apollo/assets/js/controllers/applicationStatusCtrl.js b/Apollo/assets/js/controllers/applicationStatusCtrl.js index c68b5d3a..8fd3b824 100644 --- a/Apollo/assets/js/controllers/applicationStatusCtrl.js +++ b/Apollo/assets/js/controllers/applicationStatusCtrl.js @@ -552,8 +552,49 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log" }; - $scope.open1 = function (values,type) { - + $scope.open1 = function (values,type,filterby) { + if(type == '1' || type == '2' || type == '3'){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} } + if(type == '4'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem_Year === filterby) + { + result.push(values[i]); + } + } + } + if(type == '5'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem === filterby) + { + result.push(values[i]); + } + } + } + if(type == '6'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].CertificateName === filterby) + { + result.push(values[i]); + } + } + } + if(type == '7' || type == '8'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem === filterby) + { + result.push(values[i]); + } + } + } + var modalInstance1 = $modal.open({ templateUrl: 'assets/views/student/studentPaymentModal.html', controller: 'ModalInstanceCtrl1', @@ -562,7 +603,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log" items1: function () { var myvalues = { - "values":values, + "values":result, "type":type }; return myvalues; diff --git a/Apollo/assets/js/controllers/callTrackingCtrl.js b/Apollo/assets/js/controllers/callTrackingCtrl.js index 4997955e..b4cca9d1 100755 --- a/Apollo/assets/js/controllers/callTrackingCtrl.js +++ b/Apollo/assets/js/controllers/callTrackingCtrl.js @@ -2514,8 +2514,48 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log" }; - $scope.open1 = function (values,type) { - + $scope.open1 = function (values,type,filterby) { + if(type == '1' || type == '2' || type == '3'){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} } + if(type == '4'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem_Year === filterby) + { + result.push(values[i]); + } + } + } + if(type == '5'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem === filterby) + { + result.push(values[i]); + } + } + } + if(type == '6'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].CertificateName === filterby) + { + result.push(values[i]); + } + } + } + if(type == '7' || type == '8'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem === filterby) + { + result.push(values[i]); + } + } + } var modalInstance1 = $modal.open({ templateUrl: 'assets/views/student/studentPaymentModal.html', controller: 'ModalInstanceCtrl1', @@ -2524,7 +2564,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log" items1: function () { var myvalues = { - "values":values, + "values":result, "type":type }; return myvalues; diff --git a/Apollo/assets/js/controllers/certificateStatusCtrl.js b/Apollo/assets/js/controllers/certificateStatusCtrl.js index 3784f78b..758782dd 100644 --- a/Apollo/assets/js/controllers/certificateStatusCtrl.js +++ b/Apollo/assets/js/controllers/certificateStatusCtrl.js @@ -553,8 +553,48 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log" }; - $scope.open1 = function (values,type) { - + $scope.open1 = function (values,type,filterby) { + if(type == '1' || type == '2' || type == '3'){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} } + if(type == '4'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem_Year === filterby) + { + result.push(values[i]); + } + } + } + if(type == '5'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem === filterby) + { + result.push(values[i]); + } + } + } + if(type == '6'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].CertificateName === filterby) + { + result.push(values[i]); + } + } + } + if(type == '7' || type == '8'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem === filterby) + { + result.push(values[i]); + } + } + } var modalInstance1 = $modal.open({ templateUrl: 'assets/views/student/studentPaymentModal.html', controller: 'ModalInstanceCtrl1', @@ -563,7 +603,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log" items1: function () { var myvalues = { - "values":values, + "values":result, "type":type }; return myvalues; diff --git a/Apollo/assets/js/controllers/certificationStatusCtrl.js b/Apollo/assets/js/controllers/certificationStatusCtrl.js index 1d955caa..f65d3883 100644 --- a/Apollo/assets/js/controllers/certificationStatusCtrl.js +++ b/Apollo/assets/js/controllers/certificationStatusCtrl.js @@ -570,8 +570,48 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log" }; - $scope.open1 = function (values,type) { - + $scope.open1 = function (values,type,filterby) { + if(type == '1' || type == '2' || type == '3'){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} } + if(type == '4'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem_Year === filterby) + { + result.push(values[i]); + } + } + } + if(type == '5'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem === filterby) + { + result.push(values[i]); + } + } + } + if(type == '6'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].CertificateName === filterby) + { + result.push(values[i]); + } + } + } + if(type == '7' || type == '8'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem === filterby) + { + result.push(values[i]); + } + } + } var modalInstance1 = $modal.open({ templateUrl: 'assets/views/student/studentPaymentModal.html', controller: 'ModalInstanceCtrl1', @@ -580,7 +620,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log" items1: function () { var myvalues = { - "values":values, + "values":result, "type":type }; return myvalues; diff --git a/Apollo/assets/js/controllers/dashboardCtrl.js b/Apollo/assets/js/controllers/dashboardCtrl.js index bb9d1613..358d1cac 100644 --- a/Apollo/assets/js/controllers/dashboardCtrl.js +++ b/Apollo/assets/js/controllers/dashboardCtrl.js @@ -2066,8 +2066,48 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log" }; - $scope.open1 = function (values, type) { - + $scope.open1 = function (values, type,filterby) { + if(type == '1' || type == '2' || type == '3'){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} } + if(type == '4'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem_Year === filterby) + { + result.push(values[i]); + } + } + } + if(type == '5'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem === filterby) + { + result.push(values[i]); + } + } + } + if(type == '6'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].CertificateName === filterby) + { + result.push(values[i]); + } + } + } + if(type == '7' || type == '8'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem === filterby) + { + result.push(values[i]); + } + } + } var modalInstance1 = $modal.open({ templateUrl: 'assets/views/student/studentPaymentModal.html', controller: 'ModalInstanceCtrl1', @@ -2076,7 +2116,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log" items1: function () { var myvalues = { - "values": values, + "values":result, "type": type }; return myvalues; diff --git a/Apollo/assets/js/controllers/feesStatusCtrl.js b/Apollo/assets/js/controllers/feesStatusCtrl.js index 332d899a..afce88df 100755 --- a/Apollo/assets/js/controllers/feesStatusCtrl.js +++ b/Apollo/assets/js/controllers/feesStatusCtrl.js @@ -2702,8 +2702,48 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log" }; - $scope.open1 = function (values,type) { - + $scope.open1 = function (values,type,filterby) { + if(type == '1' || type == '2' || type == '3'){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} } + if(type == '4'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem_Year === filterby) + { + result.push(values[i]); + } + } + } + if(type == '5'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem === filterby) + { + result.push(values[i]); + } + } + } + if(type == '6'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].CertificateName === filterby) + { + result.push(values[i]); + } + } + } + if(type == '7' || type == '8'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem === filterby) + { + result.push(values[i]); + } + } + } var modalInstance1 = $modal.open({ templateUrl: 'assets/views/student/studentPaymentModal.html', controller: 'ModalInstanceCtrl1', @@ -2712,7 +2752,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log" items1: function () { var myvalues = { - "values":values, + "values":result, "type":type }; return myvalues; diff --git a/Apollo/assets/js/controllers/generateHallTicketCtrl.js b/Apollo/assets/js/controllers/generateHallTicketCtrl.js index 23155b4a..a6637b68 100644 --- a/Apollo/assets/js/controllers/generateHallTicketCtrl.js +++ b/Apollo/assets/js/controllers/generateHallTicketCtrl.js @@ -571,8 +571,48 @@ app.controller('studentModalDemoCtrl', ["$scope", "$modal", "$log", "API_POINTS" }; - $scope.open1 = function (values,type) { - + $scope.open1 = function (values,type,filterby) { + if(type == '1' || type == '2' || type == '3'){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} } + if(type == '4'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem_Year === filterby) + { + result.push(values[i]); + } + } + } + if(type == '5'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem === filterby) + { + result.push(values[i]); + } + } + } + if(type == '6'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].CertificateName === filterby) + { + result.push(values[i]); + } + } + } + if(type == '7' || type == '8'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem === filterby) + { + result.push(values[i]); + } + } + } var modalInstance1 = $modal.open({ templateUrl: 'assets/views/student/studentPaymentModal.html', controller: 'ModalInstanceCtrl1', @@ -581,7 +621,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$modal", "$log", "API_POINTS" items1: function () { var myvalues = { - "values":values, + "values":result, "type":type }; return myvalues; diff --git a/Apollo/assets/js/controllers/markcardStatusCtrl.js b/Apollo/assets/js/controllers/markcardStatusCtrl.js index 7ae8eb6d..15fc257f 100644 --- a/Apollo/assets/js/controllers/markcardStatusCtrl.js +++ b/Apollo/assets/js/controllers/markcardStatusCtrl.js @@ -572,8 +572,48 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log" }; - $scope.open1 = function (values,type) { - + $scope.open1 = function (values,type,filterby) { + if(type == '1' || type == '2' || type == '3'){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} } + if(type == '4'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem_Year === filterby) + { + result.push(values[i]); + } + } + } + if(type == '5'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem === filterby) + { + result.push(values[i]); + } + } + } + if(type == '6'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].CertificateName === filterby) + { + result.push(values[i]); + } + } + } + if(type == '7' || type == '8'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem === filterby) + { + result.push(values[i]); + } + } + } var modalInstance1 = $modal.open({ templateUrl: 'assets/views/student/studentPaymentModal.html', controller: 'ModalInstanceCtrl1', @@ -582,7 +622,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log" items1: function () { var myvalues = { - "values":values, + "values":result, "type":type }; return myvalues; diff --git a/Apollo/assets/js/controllers/newreg_reportCtrl.js b/Apollo/assets/js/controllers/newreg_reportCtrl.js index 59742dd6..54d72c61 100644 --- a/Apollo/assets/js/controllers/newreg_reportCtrl.js +++ b/Apollo/assets/js/controllers/newreg_reportCtrl.js @@ -404,8 +404,48 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log", }; - $scope.open1 = function (values,type) { - + $scope.open1 = function (values,type,filterby) { + if(type == '1' || type == '2' || type == '3'){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} } + if(type == '4'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem_Year === filterby) + { + result.push(values[i]); + } + } + } + if(type == '5'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem === filterby) + { + result.push(values[i]); + } + } + } + if(type == '6'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].CertificateName === filterby) + { + result.push(values[i]); + } + } + } + if(type == '7' || type == '8'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem === filterby) + { + result.push(values[i]); + } + } + } var modalInstance1 = $modal.open({ templateUrl: 'assets/views/student/studentPaymentModal.html', controller: 'ModalInstanceCtrl1', @@ -414,7 +454,7 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log", items1: function () { var myvalues = { - "values":values, + "values":result, "type":type }; return myvalues; diff --git a/Apollo/assets/js/controllers/report_ans_bookletCtrl.js b/Apollo/assets/js/controllers/report_ans_bookletCtrl.js index 0a628208..370d7b99 100755 --- a/Apollo/assets/js/controllers/report_ans_bookletCtrl.js +++ b/Apollo/assets/js/controllers/report_ans_bookletCtrl.js @@ -481,8 +481,48 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log", }; - $scope.open1 = function (values,type) { - + $scope.open1 = function (values,type,filterby) { + if(type == '1' || type == '2' || type == '3'){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} } + if(type == '4'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem_Year === filterby) + { + result.push(values[i]); + } + } + } + if(type == '5'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem === filterby) + { + result.push(values[i]); + } + } + } + if(type == '6'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].CertificateName === filterby) + { + result.push(values[i]); + } + } + } + if(type == '7' || type == '8'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem === filterby) + { + result.push(values[i]); + } + } + } var modalInstance1 = $modal.open({ templateUrl: 'assets/views/student/studentPaymentModal.html', controller: 'ModalInstanceCtrl1', @@ -491,7 +531,7 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log", items1: function () { var myvalues = { - "values":values, + "values":result, "type":type }; return myvalues; diff --git a/Apollo/assets/js/controllers/report_app_pendingCtrl.js b/Apollo/assets/js/controllers/report_app_pendingCtrl.js index dfbefaec..3063a878 100755 --- a/Apollo/assets/js/controllers/report_app_pendingCtrl.js +++ b/Apollo/assets/js/controllers/report_app_pendingCtrl.js @@ -526,8 +526,48 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log", }; - $scope.open1 = function (values,type) { - + $scope.open1 = function (values,type,filterby) { + if(type == '1' || type == '2' || type == '3'){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} } + if(type == '4'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem_Year === filterby) + { + result.push(values[i]); + } + } + } + if(type == '5'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem === filterby) + { + result.push(values[i]); + } + } + } + if(type == '6'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].CertificateName === filterby) + { + result.push(values[i]); + } + } + } + if(type == '7' || type == '8'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem === filterby) + { + result.push(values[i]); + } + } + } var modalInstance1 = $modal.open({ templateUrl: 'assets/views/student/studentPaymentModal.html', controller: 'ModalInstanceCtrl1', @@ -536,7 +576,7 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log", items1: function () { var myvalues = { - "values":values, + "values":result, "type":type }; return myvalues; diff --git a/Apollo/assets/js/controllers/report_app_pending_oldDataCtrl.js b/Apollo/assets/js/controllers/report_app_pending_oldDataCtrl.js index c678546d..7c5866e7 100644 --- a/Apollo/assets/js/controllers/report_app_pending_oldDataCtrl.js +++ b/Apollo/assets/js/controllers/report_app_pending_oldDataCtrl.js @@ -481,8 +481,48 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log", }; - $scope.open1 = function (values,type) { - + $scope.open1 = function (values,type,filterby) { + if(type == '1' || type == '2' || type == '3'){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} } + if(type == '4'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem_Year === filterby) + { + result.push(values[i]); + } + } + } + if(type == '5'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem === filterby) + { + result.push(values[i]); + } + } + } + if(type == '6'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].CertificateName === filterby) + { + result.push(values[i]); + } + } + } + if(type == '7' || type == '8'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem === filterby) + { + result.push(values[i]); + } + } + } var modalInstance1 = $modal.open({ templateUrl: 'assets/views/student/studentPaymentModal.html', controller: 'ModalInstanceCtrl1', @@ -491,7 +531,7 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log", items1: function () { var myvalues = { - "values":values, + "values":result, "type":type }; return myvalues; diff --git a/Apollo/assets/js/controllers/report_balfeeCtrl.js b/Apollo/assets/js/controllers/report_balfeeCtrl.js index 70001f07..60b6295a 100755 --- a/Apollo/assets/js/controllers/report_balfeeCtrl.js +++ b/Apollo/assets/js/controllers/report_balfeeCtrl.js @@ -555,8 +555,48 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log", }; - $scope.open1 = function (values,type) { - + $scope.open1 = function (values,type,filterby) { + if(type == '1' || type == '2' || type == '3'){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} } + if(type == '4'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem_Year === filterby) + { + result.push(values[i]); + } + } + } + if(type == '5'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem === filterby) + { + result.push(values[i]); + } + } + } + if(type == '6'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].CertificateName === filterby) + { + result.push(values[i]); + } + } + } + if(type == '7' || type == '8'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem === filterby) + { + result.push(values[i]); + } + } + } var modalInstance1 = $modal.open({ templateUrl: 'assets/views/student/studentPaymentModal.html', controller: 'ModalInstanceCtrl1', @@ -565,7 +605,7 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log", items1: function () { var myvalues = { - "values":values, + "values":result, "type":type }; return myvalues; diff --git a/Apollo/assets/js/controllers/report_certificateCtrl.js b/Apollo/assets/js/controllers/report_certificateCtrl.js index 1cfb4586..d06b0c11 100755 --- a/Apollo/assets/js/controllers/report_certificateCtrl.js +++ b/Apollo/assets/js/controllers/report_certificateCtrl.js @@ -531,8 +531,49 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log", }; - $scope.open1 = function (values,type) { - + $scope.open1 = function (values,type,filterby) { + if(type == '1' || type == '2' || type == '3'){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} } + if(type == '4'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem_Year === filterby) + { + result.push(values[i]); + } + } + } + if(type == '5'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem === filterby) + { + result.push(values[i]); + } + } + } + if(type == '6'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].CertificateName === filterby) + { + result.push(values[i]); + } + } + } + if(type == '7' || type == '8'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem === filterby) + { + result.push(values[i]); + } + } + } + var modalInstance1 = $modal.open({ templateUrl: 'assets/views/student/studentPaymentModal.html', controller: 'ModalInstanceCtrl1', @@ -541,7 +582,7 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log", items1: function () { var myvalues = { - "values":values, + "values":result, "type":type }; return myvalues; diff --git a/Apollo/assets/js/controllers/report_doc_pendingCtrl.js b/Apollo/assets/js/controllers/report_doc_pendingCtrl.js index 67808c9d..647ed8a2 100755 --- a/Apollo/assets/js/controllers/report_doc_pendingCtrl.js +++ b/Apollo/assets/js/controllers/report_doc_pendingCtrl.js @@ -476,8 +476,49 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log", }; - $scope.open1 = function (values,type) { - + $scope.open1 = function (values,type,filterby) { + if(type == '1' || type == '2' || type == '3'){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} } + if(type == '4'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem_Year === filterby) + { + result.push(values[i]); + } + } + } + if(type == '5'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem === filterby) + { + result.push(values[i]); + } + } + } + if(type == '6'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].CertificateName === filterby) + { + result.push(values[i]); + } + } + } + if(type == '7' || type == '8'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem === filterby) + { + result.push(values[i]); + } + } + } + var modalInstance1 = $modal.open({ templateUrl: 'assets/views/student/studentPaymentModal.html', controller: 'ModalInstanceCtrl1', @@ -486,7 +527,7 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log", items1: function () { var myvalues = { - "values":values, + "values":result, "type":type }; return myvalues; diff --git a/Apollo/assets/js/controllers/report_examfeeCtrl.js b/Apollo/assets/js/controllers/report_examfeeCtrl.js index 8f3cd71a..40639e09 100755 --- a/Apollo/assets/js/controllers/report_examfeeCtrl.js +++ b/Apollo/assets/js/controllers/report_examfeeCtrl.js @@ -480,8 +480,49 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log", }; - $scope.open1 = function (values,type) { - + $scope.open1 = function (values,type,filterby) { + if(type == '1' || type == '2' || type == '3'){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} } + if(type == '4'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem_Year === filterby) + { + result.push(values[i]); + } + } + } + if(type == '5'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem === filterby) + { + result.push(values[i]); + } + } + } + if(type == '6'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].CertificateName === filterby) + { + result.push(values[i]); + } + } + } + if(type == '7' || type == '8'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem === filterby) + { + result.push(values[i]); + } + } + } + var modalInstance1 = $modal.open({ templateUrl: 'assets/views/student/studentPaymentModal.html', controller: 'ModalInstanceCtrl1', @@ -490,7 +531,7 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log", items1: function () { var myvalues = { - "values":values, + "values":result, "type":type }; return myvalues; diff --git a/Apollo/assets/js/controllers/report_leadCtrl.js b/Apollo/assets/js/controllers/report_leadCtrl.js index b095d839..be3b49a8 100644 --- a/Apollo/assets/js/controllers/report_leadCtrl.js +++ b/Apollo/assets/js/controllers/report_leadCtrl.js @@ -273,8 +273,49 @@ $scope.generateButtonStatus = false; }; - $scope.open1 = function (values,type) { - + $scope.open1 = function (values,type,filterby) { + if(type == '1' || type == '2' || type == '3'){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} } + if(type == '4'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem_Year === filterby) + { + result.push(values[i]); + } + } + } + if(type == '5'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem === filterby) + { + result.push(values[i]); + } + } + } + if(type == '6'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].CertificateName === filterby) + { + result.push(values[i]); + } + } + } + if(type == '7' || type == '8'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem === filterby) + { + result.push(values[i]); + } + } + } + var modalInstance1 = $modal.open({ templateUrl: 'assets/views/student/studentPaymentModal.html', controller: 'ModalInstanceCtrl1', @@ -283,7 +324,7 @@ $scope.generateButtonStatus = false; items1: function () { var myvalues = { - "values":values, + "values":result, "type":type }; return myvalues; diff --git a/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js b/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js index 977b5140..fa4b9537 100755 --- a/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js +++ b/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js @@ -501,8 +501,49 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log", }; - $scope.open1 = function (values,type) { - + $scope.open1 = function (values,type,filterby) { + if(type == '1' || type == '2' || type == '3'){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} } + if(type == '4'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem_Year === filterby) + { + result.push(values[i]); + } + } + } + if(type == '5'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem === filterby) + { + result.push(values[i]); + } + } + } + if(type == '6'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].CertificateName === filterby) + { + result.push(values[i]); + } + } + } + if(type == '7' || type == '8'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem === filterby) + { + result.push(values[i]); + } + } + } + var modalInstance1 = $modal.open({ templateUrl: 'assets/views/student/studentPaymentModal.html', controller: 'ModalInstanceCtrl1', @@ -511,7 +552,7 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log", items1: function () { var myvalues = { - "values":values, + "values":result, "type":type }; return myvalues; diff --git a/Apollo/assets/js/controllers/report_markcard_statusCtrl.js b/Apollo/assets/js/controllers/report_markcard_statusCtrl.js index cebe9c2c..3be86fbb 100755 --- a/Apollo/assets/js/controllers/report_markcard_statusCtrl.js +++ b/Apollo/assets/js/controllers/report_markcard_statusCtrl.js @@ -501,8 +501,49 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log", }; - $scope.open1 = function (values,type) { - + $scope.open1 = function (values,type,filterby) { + if(type == '1' || type == '2' || type == '3'){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} } + if(type == '4'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem_Year === filterby) + { + result.push(values[i]); + } + } + } + if(type == '5'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem === filterby) + { + result.push(values[i]); + } + } + } + if(type == '6'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].CertificateName === filterby) + { + result.push(values[i]); + } + } + } + if(type == '7' || type == '8'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem === filterby) + { + result.push(values[i]); + } + } + } + var modalInstance1 = $modal.open({ templateUrl: 'assets/views/student/studentPaymentModal.html', controller: 'ModalInstanceCtrl1', @@ -511,7 +552,7 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log", items1: function () { var myvalues = { - "values":values, + "values":result, "type":type }; return myvalues; diff --git a/Apollo/assets/js/controllers/report_study_material_statusCtrl.js b/Apollo/assets/js/controllers/report_study_material_statusCtrl.js index e262fe5c..60387526 100755 --- a/Apollo/assets/js/controllers/report_study_material_statusCtrl.js +++ b/Apollo/assets/js/controllers/report_study_material_statusCtrl.js @@ -474,8 +474,49 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log", }; - $scope.open1 = function (values,type) { - + $scope.open1 = function (values,type,filterby) { + if(type == '1' || type == '2' || type == '3'){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} } + if(type == '4'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem_Year === filterby) + { + result.push(values[i]); + } + } + } + if(type == '5'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem === filterby) + { + result.push(values[i]); + } + } + } + if(type == '6'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].CertificateName === filterby) + { + result.push(values[i]); + } + } + } + if(type == '7' || type == '8'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem === filterby) + { + result.push(values[i]); + } + } + } + var modalInstance1 = $modal.open({ templateUrl: 'assets/views/student/studentPaymentModal.html', controller: 'ModalInstanceCtrl1', @@ -484,7 +525,7 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log", items1: function () { var myvalues = { - "values":values, + "values":result, "type":type }; return myvalues; diff --git a/Apollo/assets/js/controllers/report_waiver_referalCtrl.js b/Apollo/assets/js/controllers/report_waiver_referalCtrl.js index 4f49b15b..8f443e3f 100755 --- a/Apollo/assets/js/controllers/report_waiver_referalCtrl.js +++ b/Apollo/assets/js/controllers/report_waiver_referalCtrl.js @@ -220,8 +220,49 @@ $scope.generateButtonStatus = false; }; - $scope.open1 = function (values,type) { - + $scope.open1 = function (values,type,filterby) { + if(type == '1' || type == '2' || type == '3'){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} } + if(type == '4'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem_Year === filterby) + { + result.push(values[i]); + } + } + } + if(type == '5'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem === filterby) + { + result.push(values[i]); + } + } + } + if(type == '6'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].CertificateName === filterby) + { + result.push(values[i]); + } + } + } + if(type == '7' || type == '8'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem === filterby) + { + result.push(values[i]); + } + } + } + var modalInstance1 = $modal.open({ templateUrl: 'assets/views/student/studentPaymentModal.html', controller: 'ModalInstanceCtrl1', @@ -230,7 +271,7 @@ $scope.generateButtonStatus = false; items1: function () { var myvalues = { - "values":values, + "values":result, "type":type }; return myvalues; diff --git a/Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js b/Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js index bcb64453..b1ece15a 100755 --- a/Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js +++ b/Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js @@ -1036,8 +1036,49 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log" }; - $scope.open1 = function (values,type) { - + $scope.open1 = function (values,type,filterby) { + if(type == '1' || type == '2' || type == '3'){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} } + if(type == '4'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem_Year === filterby) + { + result.push(values[i]); + } + } + } + if(type == '5'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem === filterby) + { + result.push(values[i]); + } + } + } + if(type == '6'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].CertificateName === filterby) + { + result.push(values[i]); + } + } + } + if(type == '7' || type == '8'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem === filterby) + { + result.push(values[i]); + } + } + } + var modalInstance1 = $modal.open({ templateUrl: 'assets/views/student/studentPaymentModal.html', controller: 'ModalInstanceCtrl1', @@ -1046,7 +1087,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log" items1: function () { var myvalues = { - "values":values, + "values":result, "type":type }; return myvalues; diff --git a/Apollo/assets/js/controllers/studentCtrl.js b/Apollo/assets/js/controllers/studentCtrl.js index a212cd5e..174417bf 100755 --- a/Apollo/assets/js/controllers/studentCtrl.js +++ b/Apollo/assets/js/controllers/studentCtrl.js @@ -3860,8 +3860,49 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log", }; - $scope.open1 = function (values,type) { - + $scope.open1 = function (values,type,filterby) { + if(type == '1' || type == '2' || type == '3'){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} } + if(type == '4'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem_Year === filterby) + { + result.push(values[i]); + } + } + } + if(type == '5'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem === filterby) + { + result.push(values[i]); + } + } + } + if(type == '6'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].CertificateName === filterby) + { + result.push(values[i]); + } + } + } + if(type == '7' || type == '8'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem === filterby) + { + result.push(values[i]); + } + } + } + var modalInstance1 = $modal.open({ templateUrl: 'assets/views/student/studentPaymentModal.html', controller: 'ModalInstanceCtrl1', @@ -3870,7 +3911,7 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log", items1: function () { var myvalues = { - "values":values, + "values":result, "type":type }; return myvalues; diff --git a/Apollo/assets/js/controllers/studentUnivFormIdFeeDetailsCtrl.js b/Apollo/assets/js/controllers/studentUnivFormIdFeeDetailsCtrl.js index 86767cdb..e981a56c 100644 --- a/Apollo/assets/js/controllers/studentUnivFormIdFeeDetailsCtrl.js +++ b/Apollo/assets/js/controllers/studentUnivFormIdFeeDetailsCtrl.js @@ -781,7 +781,49 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log" } }); }; - $scope.open1 = function (values,type) { + $scope.open1 = function (values,type,filterby) { + if(type == '1' || type == '2' || type == '3'){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} } + if(type == '4'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem_Year === filterby) + { + result.push(values[i]); + } + } + } + if(type == '5'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem === filterby) + { + result.push(values[i]); + } + } + } + if(type == '6'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].CertificateName === filterby) + { + result.push(values[i]); + } + } + } + if(type == '7' || type == '8'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem === filterby) + { + result.push(values[i]); + } + } + } + var modalInstance1 = $modal.open({ templateUrl: 'assets/views/student/studentPaymentModal.html', @@ -791,7 +833,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log" items1: function () { var myvalues = { - "values":values, + "values":result, "type":type }; return myvalues; diff --git a/Apollo/assets/js/controllers/student_university_fee_compare.js b/Apollo/assets/js/controllers/student_university_fee_compare.js index f43951e0..bdbe29ee 100644 --- a/Apollo/assets/js/controllers/student_university_fee_compare.js +++ b/Apollo/assets/js/controllers/student_university_fee_compare.js @@ -550,8 +550,49 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log" } }); }; - $scope.open1 = function (values,type) { - + $scope.open1 = function (values,type,filterby) { + if(type == '1' || type == '2' || type == '3'){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} } + if(type == '4'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem_Year === filterby) + { + result.push(values[i]); + } + } + } + if(type == '5'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem === filterby) + { + result.push(values[i]); + } + } + } + if(type == '6'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].CertificateName === filterby) + { + result.push(values[i]); + } + } + } + if(type == '7' || type == '8'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem === filterby) + { + result.push(values[i]); + } + } + } + var modalInstance1 = $modal.open({ templateUrl: 'assets/views/student/studentPaymentModal.html', controller: 'ModalInstanceCtrl1', @@ -560,7 +601,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log" items1: function () { var myvalues = { - "values":values, + "values":result, "type":type }; return myvalues; diff --git a/Apollo/assets/js/controllers/studyMaterialStatusCtrl.js b/Apollo/assets/js/controllers/studyMaterialStatusCtrl.js index a0b632ba..ba8440b6 100755 --- a/Apollo/assets/js/controllers/studyMaterialStatusCtrl.js +++ b/Apollo/assets/js/controllers/studyMaterialStatusCtrl.js @@ -549,8 +549,49 @@ app.controller('studentModalDemoCtrl', ["$scope", "$modal", "$log", "API_POINTS" }; - $scope.open1 = function (values,type) { - + $scope.open1 = function (values,type,filterby) { + if(type == '1' || type == '2' || type == '3'){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} } + if(type == '4'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem_Year === filterby) + { + result.push(values[i]); + } + } + } + if(type == '5'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem === filterby) + { + result.push(values[i]); + } + } + } + if(type == '6'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].CertificateName === filterby) + { + result.push(values[i]); + } + } + } + if(type == '7' || type == '8'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem === filterby) + { + result.push(values[i]); + } + } + } + var modalInstance1 = $modal.open({ templateUrl: 'assets/views/student/studentPaymentModal.html', controller: 'ModalInstanceCtrl1', @@ -559,7 +600,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$modal", "$log", "API_POINTS" items1: function () { var myvalues = { - "values":values, + "values":result, "type":type }; return myvalues; diff --git a/Apollo/assets/js/controllers/univFormPaymentCtrl.js b/Apollo/assets/js/controllers/univFormPaymentCtrl.js index 86c2c65d..7a7fa52c 100644 --- a/Apollo/assets/js/controllers/univFormPaymentCtrl.js +++ b/Apollo/assets/js/controllers/univFormPaymentCtrl.js @@ -550,8 +550,49 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log" } }); }; - $scope.open1 = function (values,type) { - + $scope.open1 = function (values,type,filterby) { + if(type == '1' || type == '2' || type == '3'){ var result = []; for (var i = 0; i < values.length; i++){result.push(values[i]);} } + if(type == '4'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem_Year === filterby) + { + result.push(values[i]); + } + } + } + if(type == '5'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem === filterby) + { + result.push(values[i]); + } + } + } + if(type == '6'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].CertificateName === filterby) + { + result.push(values[i]); + } + } + } + if(type == '7' || type == '8'){ + var result = []; + for (var i = 0; i < values.length; i++) + { + if (values[i].Sem === filterby) + { + result.push(values[i]); + } + } + } + var modalInstance1 = $modal.open({ templateUrl: 'assets/views/student/studentPaymentModal.html', controller: 'ModalInstanceCtrl1', @@ -560,7 +601,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log" items1: function () { var myvalues = { - "values":values, + "values":result, "type":type }; return myvalues; diff --git a/Apollo/assets/views/callTrackingDetails.html b/Apollo/assets/views/callTrackingDetails.html index db556706..dbf1c2d7 100755 --- a/Apollo/assets/views/callTrackingDetails.html +++ b/Apollo/assets/views/callTrackingDetails.html @@ -99,7 +99,7 @@
- +
diff --git a/Apollo/assets/views/status-update/answer_booklet_status.html b/Apollo/assets/views/status-update/answer_booklet_status.html index c78f7a2d..d2545244 100755 --- a/Apollo/assets/views/status-update/answer_booklet_status.html +++ b/Apollo/assets/views/status-update/answer_booklet_status.html @@ -183,7 +183,7 @@ Sem/Year Status - Comments + Answer Booklet Serial Number Courier Details Date Updated By diff --git a/Apollo/assets/views/student/studentDetailsModal.html b/Apollo/assets/views/student/studentDetailsModal.html index 05305006..c13d3333 100755 --- a/Apollo/assets/views/student/studentDetailsModal.html +++ b/Apollo/assets/views/student/studentDetailsModal.html @@ -292,7 +292,7 @@ {{fees.FeesName}} {{fees.BatchName}} - {{fees.BatchName}} + {{fees.BatchName}} {{fees.SessionName}}/{{fees.ToSessionName}} {{fees.SessionName}} {{fees.RollNo}} @@ -307,12 +307,12 @@ {{fees.BalanceAmount}} - + - + @@ -352,7 +352,7 @@ SEM/YEAR Form Type Status - Comments + Comments @@ -376,22 +376,13 @@ {{apps.StatusUpdateDate}} {{apps.BatchName}} - {{apps.BatchName}} + {{apps.BatchName}} - {{apps.Sem_Year}} + {{apps.Sem_Year}} + {{apps.Sem_Year}} {{apps.RegistrationType}} {{apps.ListName}} {{apps.Comments}} - - - - - - - - - - @@ -418,9 +409,8 @@ Date Sem/Year Status - Comments - + @@ -429,21 +419,17 @@ {{booklet.AnsDate}} - - {{booklet.Sem}} + + {{booklet.Sem}} + + {{booklet.Sem}} + {{booklet.ListName}} {{booklet.Comments}} - - - - - - - @@ -473,21 +459,15 @@ Certificate Name Status Comments - - {{cert.AppDate}} - {{cert.CertificateName}} + {{cert.CertificateName}} + {{cert.CertificateName}} {{cert.ListName}} {{cert.Comments}} - - - - - @@ -518,7 +498,6 @@ Status Comments - {{mark.ListName}} {{mark.Comments}} - - - - - @@ -557,8 +532,6 @@ Status Comments - - @@ -567,8 +540,10 @@ {{study.SDate}} - - {{study.Sem_Year}} ({{study.Sem}}) + + + {{study.Sem_Year}} ({{study.Sem}}) + {{study.Sem_Year}} ({{study.Sem}}) @@ -576,13 +551,8 @@ - {{study.Comments}} - - - - - - + {{study.Comments}} + diff --git a/Apollo/assets/views/student/studentPaymentModal.html b/Apollo/assets/views/student/studentPaymentModal.html index e75e49fb..1311fff2 100755 --- a/Apollo/assets/views/student/studentPaymentModal.html +++ b/Apollo/assets/views/student/studentPaymentModal.html @@ -85,7 +85,7 @@ Date Sem/Year Status - Comments + Answer Book Serial No diff --git a/Apollo/assets/views/student/student_details.html b/Apollo/assets/views/student/student_details.html index dc033e0c..84007110 100755 --- a/Apollo/assets/views/student/student_details.html +++ b/Apollo/assets/views/student/student_details.html @@ -261,6 +261,7 @@ + {{p}}