From b8d36ae5785cca06efca0a2164a4f2fe3cf435e1 Mon Sep 17 00:00:00 2001 From: resicovenba Date: Tue, 26 Dec 2017 19:45:17 +0530 Subject: [PATCH] status updation previous status listing : kdk --- Apollo/api/application/config/routes.php | 6 +- .../controllers/StatusUpdation_Controller.php | 25 ++++- .../api/application/models/DayBook_model.php | 16 +++- .../models/StatusUpdation_model.php | 93 ++++++++++++++++++- .../js/controllers/answerBookletStatusCtrl.js | 44 +++++++++ .../js/controllers/applicationStatusCtrl.js | 48 +++++++++- .../js/controllers/certificationStatusCtrl.js | 43 ++++++++- Apollo/assets/js/controllers/daybookCtrl.js | 12 ++- .../assets/js/controllers/daybookadminCtrl.js | 11 ++- .../js/controllers/daybooksuperadminCtrl.js | 11 ++- .../js/controllers/studyMaterialStatusCtrl.js | 42 ++++++++- Apollo/assets/views/daybook/daybook.html | 10 +- Apollo/assets/views/daybook/daybookadmin.html | 8 +- .../views/daybook/daybooksuperadmin.html | 8 +- .../status-update/answer_booklet_status.html | 43 +++++++++ .../status-update/application_status.html | 45 ++++++++- .../status-update/certification_status.html | 45 +++++++++ .../status-update/study_material_status.html | 67 ++++++++++--- 18 files changed, 534 insertions(+), 43 deletions(-) diff --git a/Apollo/api/application/config/routes.php b/Apollo/api/application/config/routes.php index afc49acd..c4ea9aa2 100755 --- a/Apollo/api/application/config/routes.php +++ b/Apollo/api/application/config/routes.php @@ -166,6 +166,7 @@ $route['getCertificateList'] = 'StatusUpdation_Controller/getCertificateList'; $route['updateCertificationStatus'] = 'StatusUpdation_Controller/updateCertificationStatus'; $route['updateApplicationStatus'] = 'StatusUpdation_Controller/updateApplicationStatus'; $route['getStatusListForUpdate'] = 'StatusUpdation_Controller/getStatusListForUpdate'; +$route['getPrevStatusDetailsForStu'] = 'StatusUpdation_Controller/getPrevStatusDetailsForStu'; /*get student view details*/ $route['getStudentBasicInfo'] = 'StudentView_Controller/getStudentInfo'; @@ -185,7 +186,10 @@ $route['getIncomeExpenseTypeState'] = 'DayBook_Controller/getIncomeExpenseTypeSt $route['addDayBook'] = 'DayBook_Controller/adddaybook'; $route['updateDayBookStatusAdmin'] = 'DayBook_Controller/updateDayBookStatusAdmin'; $route['getDayBookDetailsSuperAdmin'] = 'DayBook_Controller/getDayBookDetailsSuperAdmin'; - +/* * day book master * */ +$route['getDayBookMasterDetails'] = 'DayBookMaster_Controller/getDayBookMasterDetails'; +$route['addDaybookMasterDetails'] = 'DayBookMaster_Controller/addDaybookMasterDetails'; +$route['updateDayBookMasterDetails'] = 'DayBookMaster_Controller/updateDayBookMasterDetails'; diff --git a/Apollo/api/application/controllers/StatusUpdation_Controller.php b/Apollo/api/application/controllers/StatusUpdation_Controller.php index 6f68efed..c2a32aea 100644 --- a/Apollo/api/application/controllers/StatusUpdation_Controller.php +++ b/Apollo/api/application/controllers/StatusUpdation_Controller.php @@ -266,7 +266,7 @@ class StatusUpdation_Controller extends REST_Controller { for($i=0; $i < $count; $i++) { $data[] = array( 'StudentID' => $reqData[$i]['StudentID'], - 'CourseID' => $reqData[$i]['StudentID'], + 'CourseID' => $reqData[$i]['CourseID'], 'BranchCode' => $reqData[$i]['BranchCode'], 'ListCode' => $reqData[$i]['ListCode'], 'AppDate' => $reqData[$i]['SDate'], @@ -315,4 +315,27 @@ class StatusUpdation_Controller extends REST_Controller { } } + public function getPrevStatusDetailsForStu_post() { + $reqData = $this->post('data'); + $reqDetailsFor = $this->post('statusFor'); + $reqDetails = $this->post('getDetailsFor'); + + $getPrevStatusList = $this->statusupdation_model->get_prev_status_list($reqDetailsFor, $reqDetails);// Check if the employee exist + if ($getPrevStatusList) + { + $getPrevStatusList['status'] = REST_Controller::HTTP_OK; + // Set the response and exit + $this->response($getPrevStatusList, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code + } + else + { + // Set the response and exit + $this->response([ + 'message' => 'No list were found', + 'status' => REST_Controller::HTTP_NOT_FOUND + ], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code + } + + } + } diff --git a/Apollo/api/application/models/DayBook_model.php b/Apollo/api/application/models/DayBook_model.php index cd363afe..e637863a 100644 --- a/Apollo/api/application/models/DayBook_model.php +++ b/Apollo/api/application/models/DayBook_model.php @@ -37,6 +37,8 @@ class DayBook_model extends CI_Model } public function get_Daybook_Details_List($reqData, $reqDataBy) { + + if($reqData['date'] != '') { $this->db->select('t1.*, t2.ListName, t3.TypeName'); $this->db->from(''.DAYBOOKMASTER. ' as t1'); $this->db->join('' . PICK_LIST_DETAILS . ' as t2', 't2.ListCode = t1.Name', 'LEFT'); @@ -44,6 +46,16 @@ class DayBook_model extends CI_Model $this->db->where('t1.Date', $reqData['date']); $this->db->order_by('CreatedOn', 'DESC'); $this->db->where('t1.BranchCode', $reqDataBy['localBranchID']); + } else { + $this->db->select('t1.*, t2.ListName, t3.TypeName'); + $this->db->from(''.DAYBOOKMASTER. ' as t1'); + $this->db->join('' . PICK_LIST_DETAILS . ' as t2', 't2.ListCode = t1.Name', 'LEFT'); + $this->db->join('' . INCOMEOUTCOMEMASTER . ' as t3', 't3.ID = t1.Type', 'LEFT'); + // $this->db->where('t1.Date', $reqData['date']); + $this->db->order_by('CreatedOn', 'DESC'); + $this->db->where('t1.BranchCode', $reqDataBy['localBranchID']); + } + // $this->db->join('' . COURSE . ' as t2', 't2.UniversityID = t1.UniversityID', 'LEFT'); $dayBookDetails = $this->db->get(); $dayBookDetailsList = $dayBookDetails->result(); @@ -60,7 +72,7 @@ class DayBook_model extends CI_Model // update branch to staff_branch table if ($this->db->query($sql1) == '1') { $result['deletedStatus'] = true; - $result['message'] = "DayBook Details Deleted"; + $result['message'] = "Entry is Deleted"; } else { $result['deletedStatus'] = false; $result['message'] = "Something went wrong.please try again"; @@ -118,7 +130,7 @@ class DayBook_model extends CI_Model // echo $this->db->affected_rows(); exit(); if ($this->db->affected_rows() >= 1) { $result['addStatus'] = true; - $result['message'] = "Successfully Study Material Status Updated"; + $result['message'] = "Successfully Details Updated"; } else { $result['addStatus'] = false; $result['message'] = "Something went wrong.please try again"; diff --git a/Apollo/api/application/models/StatusUpdation_model.php b/Apollo/api/application/models/StatusUpdation_model.php index b723d5c2..8d024479 100644 --- a/Apollo/api/application/models/StatusUpdation_model.php +++ b/Apollo/api/application/models/StatusUpdation_model.php @@ -136,6 +136,97 @@ class StatusUpdation_model extends CI_Model } } + public function get_prev_status_list($reqDetailsFor, $reqDetails){ + if( $reqDetailsFor == 'STUDY_MATERIAL') { + $searchFor = 'M001'; + $searchTableFor = STUDY_MATERIAL_STATUS; + $this->db->select('t1.*, t4.Firstname, t5.ListName'); + $this->db->from(''. $searchTableFor . ' as t1'); + $this->db->where('t1.StudentID', $reqDetails['student']); + $this->db->join('' . COURSE_FEES . ' as t2', 't2.ID = t1.CourseID', 'LEFT'); + $this->db->where('t2.CourseID', $reqDetails['CourseID']); + $this->db->join('' . LOGIN . ' as t3', 't3.ID = t1.CreatedBy', 'LEFT'); + $this->db->join('' . STAFF . ' as t4', 't4.StaffID = t3.StaffID', 'LEFT'); + $this->db->join('' . PICK_LIST_DETAILS . ' as t5', 't5.ListCode = t1.ListCode', 'LEFT'); + $this->db->order_by('t1.CreatedOn', 'DESC'); + $statusDetails = $this->db->get(); + $prevStatusDetails = $statusDetails->result(); + if (count($prevStatusDetails) > 0) { + $results['preStatusDetails'] = true; + $results['preStatus_details_list'] = $prevStatusDetails; + } else { + $results['preStatusDetails'] = false; + $results['message'] = 'No record found'; + } + } else if ( $reqDetailsFor == 'APPICATION_STATUS' ) { + $searchFor = 'A001'; + $searchTableFor = APPLICATION_STATUS; + $this->db->select('t1.*, t4.Firstname, t5.ListName'); + $this->db->from(''. $searchTableFor . ' as t1'); + $this->db->where('t1.StudentID', $reqDetails['student']); + // $this->db->join('' . COURSE_FEES . ' as t2', 't2.ID = t1.CourseID', 'LEFT'); + // $this->db->where('t2.CourseID', $reqDetails['CourseID']); + $this->db->join('' . LOGIN . ' as t3', 't3.ID = t1.CreatedBy', 'LEFT'); + $this->db->join('' . STAFF . ' as t4', 't4.StaffID = t3.StaffID', 'LEFT'); + $this->db->join('' . PICK_LIST_DETAILS . ' as t5', 't5.ListCode = t1.ListCode', 'LEFT'); + $this->db->order_by('t1.CreatedOn', 'DESC'); + $statusDetails = $this->db->get(); + $prevStatusDetails = $statusDetails->result(); + if (count($prevStatusDetails) > 0) { + $results['preStatusDetails'] = true; + $results['preStatus_details_list'] = $prevStatusDetails; + } else { + $results['preStatusDetails'] = false; + $results['message'] = 'No record found'; + } + } else if ( $reqDetailsFor == 'CERTIFICATION_STATUS' ) { + $searchFor = 'C001'; + $searchTableFor = CERTIFICATION_STATUS; + $this->db->select('t1.*, t4.Firstname, t5.ListName, t6.CertificateName'); + $this->db->from(''. $searchTableFor . ' as t1'); + $this->db->where('t1.StudentID', $reqDetails['student']); + $this->db->join('' . COURSE_FEES . ' as t2', 't2.ID = t1.CourseID', 'LEFT'); + $this->db->where('t2.CourseID', $reqDetails['CourseID']); + $this->db->join('' . LOGIN . ' as t3', 't3.ID = t1.CreatedBy', 'LEFT'); + $this->db->join('' . STAFF . ' as t4', 't4.StaffID = t3.StaffID', 'LEFT'); + $this->db->join('' . PICK_LIST_DETAILS . ' as t5', 't5.ListCode = t1.ListCode', 'LEFT'); + $this->db->join('' . CERTIFICATION . ' as t6', 't6.CertificationID = t1.CertificationType', 'LEFT'); + $this->db->order_by('t1.CreatedOn', 'DESC'); + $statusDetails = $this->db->get(); + $prevStatusDetails = $statusDetails->result(); + if (count($prevStatusDetails) > 0) { + $results['preStatusDetails'] = true; + $results['preStatus_details_list'] = $prevStatusDetails; + } else { + $results['preStatusDetails'] = false; + $results['message'] = 'No record found'; + } + } else if ( $reqDetailsFor == 'ANSWERBOOKLET_STATUS' ) { + $searchFor = 'B001'; + $searchTableFor = ANSWER_BOOKLET; + $this->db->select('t1.*, t4.Firstname, t5.ListName'); + $this->db->from(''. $searchTableFor . ' as t1'); + $this->db->where('t1.StudentID', $reqDetails['student']); + $this->db->join('' . COURSE_FEES . ' as t2', 't2.ID = t1.CourseID', 'LEFT'); + $this->db->where('t2.CourseID', $reqDetails['CourseID']); + $this->db->join('' . LOGIN . ' as t3', 't3.ID = t1.CreatedBy', 'LEFT'); + $this->db->join('' . STAFF . ' as t4', 't4.StaffID = t3.StaffID', 'LEFT'); + $this->db->join('' . PICK_LIST_DETAILS . ' as t5', 't5.ListCode = t1.ListCode', 'LEFT'); + $this->db->order_by('t1.CreatedOn', 'DESC'); + $statusDetails = $this->db->get(); + $prevStatusDetails = $statusDetails->result(); + if (count($prevStatusDetails) > 0) { + $results['preStatusDetails'] = true; + $results['preStatus_details_list'] = $prevStatusDetails; + } else { + $results['preStatusDetails'] = false; + $results['message'] = 'No record found'; + } + } + + return $results; + } + public function get_status_name_ListCode($listCode) { $this->db->select('ListName'); $this->db->from(PICK_LIST_DETAILS); @@ -216,7 +307,7 @@ class StatusUpdation_model extends CI_Model $Course = $reqData['Course']; $Batch = $reqData['Batch']; - $subQuery = "SELECT S.* , C.CourseName , U.UniversityName + $subQuery = "SELECT S.* , SC.CourseID , C.CourseName , U.UniversityName FROM ".STUDENTS." as S LEFT JOIN ".STUDENTCOURSE." as SC ON SC.StudentID = S.StudentID LEFT JOIN ".UNIVERSITY." as U ON SC.UniversityID = U.UniversityID LEFT JOIN ".COURSE." as C ON SC.CourseID = C.CourseID diff --git a/Apollo/assets/js/controllers/answerBookletStatusCtrl.js b/Apollo/assets/js/controllers/answerBookletStatusCtrl.js index 112794bb..e0b19cf8 100644 --- a/Apollo/assets/js/controllers/answerBookletStatusCtrl.js +++ b/Apollo/assets/js/controllers/answerBookletStatusCtrl.js @@ -12,6 +12,16 @@ app.controller('answerBookletStatusCtrl', ["$scope", "toaster", "$filter", "ngTa $scope.reverse = !$scope.reverse; //if true make it false and vice versa } + $scope.editId = -1; + $scope.setEditId = function (P) { + // alert(P); + $scope.editId = P; + } + $scope.cancel = function() { + $scope.editId = -1; + } + + // get local client details var localDetail = JSON.parse(localStorage.getItem('localObj')); @@ -316,8 +326,42 @@ app.controller('answerBookletStatusCtrl', ["$scope", "toaster", "$filter", "ngTa } + // check unchek for table values + $scope.prevStatusListForStudentCourse = ''; + // get previous status details for the student + $scope.getPrevStatus = function(p) { + // alert(JSON.stringify(p)); + $scope.prevStatusListForStudentCourseLoading = true; + $scope.prevStatusListForStudentCourseNoRecord = false; + $scope.prevStatusListForStudentCourse = ''; + var getPrevStatus = { + method: 'POST', + url: apiPoint.url + 'getPrevStatusDetailsForStu/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + statusFor: localUpdateStatus, + getDetailsFor: { "student": p.StudentID, "CourseID": p.CourseID} , + data: localDetail + } + }; + $http(getPrevStatus).then(function (response) { + if (response.data.preStatusDetails) { + $scope.prevStatusListForStudentCourseLoading = false; + $scope.prevStatusListForStudentCourse = response.data.preStatus_details_list; + $scope.prevNoRecordFound = false; + } else { + $scope.prevStatusListForStudentCourseLoading = false; + $scope.prevStatusListForStudentCourseNoRecord = true; + $scope.prevNoRecordFound = true; + } + }); + } + + // $scope.CheckUncheckAll = function () { diff --git a/Apollo/assets/js/controllers/applicationStatusCtrl.js b/Apollo/assets/js/controllers/applicationStatusCtrl.js index d1339685..061036c7 100644 --- a/Apollo/assets/js/controllers/applicationStatusCtrl.js +++ b/Apollo/assets/js/controllers/applicationStatusCtrl.js @@ -12,6 +12,16 @@ app.controller('applicationStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl $scope.reverse = !$scope.reverse; //if true make it false and vice versa } + $scope.editId = -1; + $scope.setEditId = function (P) { + // alert(P); + $scope.editId = P; + } + $scope.cancel = function() { + $scope.editId = -1; + } + + // get local client details var localDetail = JSON.parse(localStorage.getItem('localObj')); @@ -264,14 +274,14 @@ app.controller('applicationStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl $scope.myStatusModel.dateOn = $filter('date')(new Date($scope.myStatusModel.dateOn), formate); var ItemsSelected = $scope.searchResultDetails.filter(function (item) { if (item.Selected === true) { - let getStudentID = new getStudentForUpdateDetails(item.StudentID); + let getStudentID = new getStudentForUpdateDetails(item.StudentID, item.CourseID); studentForUpdate.push(getStudentID); return true; } }); - function getStudentForUpdateDetails(id) { + function getStudentForUpdateDetails(id, courseId) { this.StudentID = id; - this.CourseID = $scope.myStatusModel.semYear; + this.CourseID = courseId; this.BranchCode = localDetails.localBranchID; this.ListCode = $scope.myStatusModel.staus; this.SDate = $scope.myStatusModel.dateOn; @@ -318,6 +328,38 @@ app.controller('applicationStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl // check unchek for table values + $scope.prevStatusListForStudentCourse = ''; + // get previous status details for the student + $scope.getPrevStatus = function(p) { + // alert(JSON.stringify(p)); + $scope.prevStatusListForStudentCourseLoading = true; + $scope.prevStatusListForStudentCourseNoRecord = false; + $scope.prevStatusListForStudentCourse = ''; + var getPrevStatus = { + method: 'POST', + url: apiPoint.url + 'getPrevStatusDetailsForStu/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + statusFor: localUpdateStatus, + getDetailsFor: { "student": p.StudentID, "CourseID": p.CourseID} , + data: localDetail + } + }; + $http(getPrevStatus).then(function (response) { + if (response.data.preStatusDetails) { + $scope.prevStatusListForStudentCourseLoading = false; + $scope.prevStatusListForStudentCourse = response.data.preStatus_details_list; + $scope.prevNoRecordFound = false; + } else { + $scope.prevStatusListForStudentCourseLoading = false; + $scope.prevStatusListForStudentCourseNoRecord = true; + $scope.prevNoRecordFound = true; + } + }); + } + // $scope.CheckUncheckAll = function () { diff --git a/Apollo/assets/js/controllers/certificationStatusCtrl.js b/Apollo/assets/js/controllers/certificationStatusCtrl.js index 11f38412..859f50d7 100644 --- a/Apollo/assets/js/controllers/certificationStatusCtrl.js +++ b/Apollo/assets/js/controllers/certificationStatusCtrl.js @@ -12,6 +12,16 @@ app.controller('certificationStatusCtrl', ["$scope", "toaster", "$filter", "ngTa $scope.reverse = !$scope.reverse; //if true make it false and vice versa } + $scope.editId = -1; + $scope.setEditId = function (P) { + // alert(P); + $scope.editId = P; + } + $scope.cancel = function() { + $scope.editId = -1; + } + + // get local client details var localDetail = JSON.parse(localStorage.getItem('localObj')); var localDetails = ipCookie('cookiechk'); @@ -365,8 +375,39 @@ app.controller('certificationStatusCtrl', ["$scope", "toaster", "$filter", "ngTa } } +// check unchek for table values - // check unchek for table values + $scope.prevStatusListForStudentCourse = ''; + // get previous status details for the student + $scope.getPrevStatus = function(p) { + // alert(JSON.stringify(p)); + $scope.prevStatusListForStudentCourseLoading = true; + $scope.prevStatusListForStudentCourseNoRecord = false; + $scope.prevStatusListForStudentCourse = ''; + var getPrevStatus = { + method: 'POST', + url: apiPoint.url + 'getPrevStatusDetailsForStu/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + statusFor: localUpdateStatus, + getDetailsFor: { "student": p.StudentID, "CourseID": p.CourseID} , + data: localDetail + } + }; + $http(getPrevStatus).then(function (response) { + if (response.data.preStatusDetails) { + $scope.prevStatusListForStudentCourseLoading = false; + $scope.prevStatusListForStudentCourse = response.data.preStatus_details_list; + $scope.prevNoRecordFound = false; + } else { + $scope.prevStatusListForStudentCourseLoading = false; + $scope.prevStatusListForStudentCourseNoRecord = true; + $scope.prevNoRecordFound = true; + } + }); + } diff --git a/Apollo/assets/js/controllers/daybookCtrl.js b/Apollo/assets/js/controllers/daybookCtrl.js index 338243d3..66353cc1 100644 --- a/Apollo/assets/js/controllers/daybookCtrl.js +++ b/Apollo/assets/js/controllers/daybookCtrl.js @@ -22,9 +22,15 @@ app.controller('daybookCtrl', ["$scope", "$rootScope", "toaster", "$filter", "ng } $scope.changeDate = function () { - var formate = "dd-MM-yyyy"; - $scope.searchData.date = $filter('date')(new Date($scope.searchData.date), formate); - $scope.getDayBookList(); + + if($scope.searchData.date !== undefined) { + var formate = "dd-MM-yyyy"; + $scope.searchData.date = $filter('date')(new Date($scope.searchData.date), formate); + $scope.getDayBookList(); + } else { + $scope.searchData.date = ''; + $scope.getDayBookList(); + } } $scope.noRecordFound = true; diff --git a/Apollo/assets/js/controllers/daybookadminCtrl.js b/Apollo/assets/js/controllers/daybookadminCtrl.js index 362b21fe..abfce0e8 100644 --- a/Apollo/assets/js/controllers/daybookadminCtrl.js +++ b/Apollo/assets/js/controllers/daybookadminCtrl.js @@ -49,9 +49,14 @@ app.controller('daybookadminCtrl', ["$scope", "$rootScope", "toaster", "$filter" } $scope.changeDate = function () { - var formate = "dd-MM-yyyy"; - $scope.searchData.date = $filter('date')(new Date($scope.searchData.date), formate); - $scope.getDayBookList(); + if($scope.searchData.date !== undefined) { + var formate = "dd-MM-yyyy"; + $scope.searchData.date = $filter('date')(new Date($scope.searchData.date), formate); + $scope.getDayBookList(); + } else { + $scope.searchData.date = ''; + $scope.getDayBookList(); + } } diff --git a/Apollo/assets/js/controllers/daybooksuperadminCtrl.js b/Apollo/assets/js/controllers/daybooksuperadminCtrl.js index 5159d5bb..092678cc 100644 --- a/Apollo/assets/js/controllers/daybooksuperadminCtrl.js +++ b/Apollo/assets/js/controllers/daybooksuperadminCtrl.js @@ -43,9 +43,14 @@ app.controller('daybooksuperadminCtrl', ["$scope", "$rootScope", "toaster", "$fi } $scope.changeDate = function () { - var formate = "dd-MM-yyyy"; - $scope.searchData.date = $filter('date')(new Date($scope.searchData.date), formate); - $scope.getDayBookList(); + if($scope.searchData.date !== undefined) { + var formate = "dd-MM-yyyy"; + $scope.searchData.date = $filter('date')(new Date($scope.searchData.date), formate); + $scope.getDayBookList(); + } else { + $scope.searchData.date = ''; + $scope.getDayBookList(); + } } diff --git a/Apollo/assets/js/controllers/studyMaterialStatusCtrl.js b/Apollo/assets/js/controllers/studyMaterialStatusCtrl.js index 69cc7e9a..7e765d3a 100755 --- a/Apollo/assets/js/controllers/studyMaterialStatusCtrl.js +++ b/Apollo/assets/js/controllers/studyMaterialStatusCtrl.js @@ -12,6 +12,15 @@ app.controller('studyMaterialStatusCtrl', ["$scope", "toaster", "$filter", "ngTa $scope.reverse = !$scope.reverse; //if true make it false and vice versa } + $scope.editId = -1; + $scope.setEditId = function (P) { + // alert(P); + $scope.editId = P; + } + $scope.cancel = function() { + $scope.editId = -1; + } + // get local client details var localDetail = JSON.parse(localStorage.getItem('localObj')); var localDetails = ipCookie('cookiechk'); @@ -75,7 +84,7 @@ app.controller('studyMaterialStatusCtrl', ["$scope", "toaster", "$filter", "ngTa // alert(JSON.stringify(item)); // } - $scope.searchResultDetails = ''; + $scope.searchResultDetails = []; $scope.searchLoading = false; $scope.searchResultLength = 0; $scope.getSearch = function () { @@ -318,6 +327,37 @@ app.controller('studyMaterialStatusCtrl', ["$scope", "toaster", "$filter", "ngTa // check unchek for table values + $scope.prevStatusListForStudentCourse = ''; + // get previous status details for the student + $scope.getPrevStatus = function(p) { + // alert(JSON.stringify(p)); + $scope.prevStatusListForStudentCourseLoading = true; + $scope.prevStatusListForStudentCourseNoRecord = false; + $scope.prevStatusListForStudentCourse = ''; + var getPrevStatus = { + method: 'POST', + url: apiPoint.url + 'getPrevStatusDetailsForStu/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + statusFor: localUpdateStatus, + getDetailsFor: { "student": p.StudentID, "CourseID": p.CourseID} , + data: localDetail + } + }; + $http(getPrevStatus).then(function (response) { + if (response.data.preStatusDetails) { + $scope.prevStatusListForStudentCourseLoading = false; + $scope.prevStatusListForStudentCourse = response.data.preStatus_details_list; + $scope.prevNoRecordFound = false; + } else { + $scope.prevStatusListForStudentCourseLoading = false; + $scope.prevStatusListForStudentCourseNoRecord = true; + $scope.prevNoRecordFound = true; + } + }); + } // $scope.CheckUncheckAll = function () { diff --git a/Apollo/assets/views/daybook/daybook.html b/Apollo/assets/views/daybook/daybook.html index 3e98dca4..e978a056 100644 --- a/Apollo/assets/views/daybook/daybook.html +++ b/Apollo/assets/views/daybook/daybook.html @@ -79,7 +79,7 @@ Description - Status + Status Activity @@ -93,14 +93,16 @@ {{p.TypeName}} {{p.Amount}} {{p.Description}} - {{p.Status}} + + - + {{p.Status}} {{p.Status}} {{p.Status}} - - - + + diff --git a/Apollo/assets/views/daybook/daybookadmin.html b/Apollo/assets/views/daybook/daybookadmin.html index 1b6c07ed..8915a2bf 100644 --- a/Apollo/assets/views/daybook/daybookadmin.html +++ b/Apollo/assets/views/daybook/daybookadmin.html @@ -78,9 +78,9 @@ Description - Status + @@ -91,10 +91,10 @@ {{p.TypeName}} {{p.Amount}} {{p.Description}} - {{p.Status}} + diff --git a/Apollo/assets/views/daybook/daybooksuperadmin.html b/Apollo/assets/views/daybook/daybooksuperadmin.html index ddfbcd23..eeb693d6 100644 --- a/Apollo/assets/views/daybook/daybooksuperadmin.html +++ b/Apollo/assets/views/daybook/daybooksuperadmin.html @@ -81,9 +81,9 @@ Description - Status + @@ -94,10 +94,10 @@ {{p.TypeName}} {{p.Amount}} {{p.Description}} - {{p.Status}} + diff --git a/Apollo/assets/views/status-update/answer_booklet_status.html b/Apollo/assets/views/status-update/answer_booklet_status.html index 5479f1a2..6c075f81 100644 --- a/Apollo/assets/views/status-update/answer_booklet_status.html +++ b/Apollo/assets/views/status-update/answer_booklet_status.html @@ -155,6 +155,49 @@ {{p.MobileNumber}} {{p.EmailID}} {{p.CourseName}} + + + + + + + + +
+
+

Fetching ...

+
+
+
+ + + + + + + + + + + + + +
StatusCommentsDateUpdated By
{{s.ListName}}{{s.Comments}}{{s.AnsDate}}{{s.Firstname}}
+
+
+

No + Status Details Exist ...

+
+
+ +
+
+
+ + diff --git a/Apollo/assets/views/status-update/application_status.html b/Apollo/assets/views/status-update/application_status.html index 949fe79b..e14a3c5b 100644 --- a/Apollo/assets/views/status-update/application_status.html +++ b/Apollo/assets/views/status-update/application_status.html @@ -155,7 +155,50 @@ {{p.Lastname}} {{p.MobileNumber}} {{p.EmailID}} - {{p.CourseName}} + {{p.CourseName}} + + + + + + + + +
+
+

Fetching ...

+
+
+
+ + + + + + + + + + + + + +
StatusCommentsDateUpdated By
{{s.ListName}}{{s.Comments}}{{s.AppDate}}{{s.Firstname}}
+
+
+

No + Status Details Exist ...

+
+
+ +
+
+
+ + diff --git a/Apollo/assets/views/status-update/certification_status.html b/Apollo/assets/views/status-update/certification_status.html index 156096eb..2c873294 100644 --- a/Apollo/assets/views/status-update/certification_status.html +++ b/Apollo/assets/views/status-update/certification_status.html @@ -154,6 +154,51 @@ {{p.MobileNumber}} {{p.EmailID}} {{p.CourseName}} + + + + + + + + +
+
+

Fetching ...

+
+
+
+ + + + + + + + + + + + + + + +
StatusCommentsCertificate NameDateUpdated By
{{s.ListName}}{{s.Comments}}{{s.CertificateName}}{{s.CDate}}{{s.Firstname}}
+
+
+

No + Status Details Exist ...

+
+
+ +
+
+
+ + diff --git a/Apollo/assets/views/status-update/study_material_status.html b/Apollo/assets/views/status-update/study_material_status.html index 390ae9d1..f620c779 100755 --- a/Apollo/assets/views/status-update/study_material_status.html +++ b/Apollo/assets/views/status-update/study_material_status.html @@ -102,16 +102,16 @@ $("#search").focus(); }); - + th { + cursor: pointer; + } +

@@ -139,6 +139,7 @@ Course + @@ -146,8 +147,8 @@ {{p.Firstname}} @@ -155,6 +156,50 @@ {{p.MobileNumber}} {{p.EmailID}} {{p.CourseName}} + + + + + + + + + +
+
+

Fetching ...

+
+
+
+ + + + + + + + + + + + + +
StatusCommentsDateUpdated By
{{s.ListName}}{{s.Comments}}{{s.SDate}}{{s.Firstname}}
+
+
+

No + Status Details Exist ...

+
+
+ +
+
+
+ +