Apollo-DEC/apollodec
Apollo-DEC/apollodec
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

status updation previous status listing : kdk

Browse Source
This commit is contained in:
resicovenba 2017-12-26 19:45:17 +05:30
parent 990d343c6e
commit b8d36ae578
18 changed files with 534 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Apollo/api/application/config/routes.php
View File

@ -166,6 +166,7 @@ $route['getCertificateList'] = 'StatusUpdation_Controller/getCertificateList';
$route['updateCertificationStatus'] = 'StatusUpdation_Controller/updateCertificationStatus'; $route['updateCertificationStatus'] = 'StatusUpdation_Controller/updateCertificationStatus';
$route['updateApplicationStatus'] = 'StatusUpdation_Controller/updateApplicationStatus'; $route['updateApplicationStatus'] = 'StatusUpdation_Controller/updateApplicationStatus';
$route['getStatusListForUpdate'] = 'StatusUpdation_Controller/getStatusListForUpdate'; $route['getStatusListForUpdate'] = 'StatusUpdation_Controller/getStatusListForUpdate';
$route['getPrevStatusDetailsForStu'] = 'StatusUpdation_Controller/getPrevStatusDetailsForStu';
/*get student view details*/ /*get student view details*/
$route['getStudentBasicInfo'] = 'StudentView_Controller/getStudentInfo'; $route['getStudentBasicInfo'] = 'StudentView_Controller/getStudentInfo';
@ -185,7 +186,10 @@ $route['getIncomeExpenseTypeState'] = 'DayBook_Controller/getIncomeExpenseTypeSt
$route['addDayBook'] = 'DayBook_Controller/adddaybook'; $route['addDayBook'] = 'DayBook_Controller/adddaybook';
$route['updateDayBookStatusAdmin'] = 'DayBook_Controller/updateDayBookStatusAdmin'; $route['updateDayBookStatusAdmin'] = 'DayBook_Controller/updateDayBookStatusAdmin';
$route['getDayBookDetailsSuperAdmin'] = 'DayBook_Controller/getDayBookDetailsSuperAdmin'; $route['getDayBookDetailsSuperAdmin'] = 'DayBook_Controller/getDayBookDetailsSuperAdmin';
/* * day book master * */
$route['getDayBookMasterDetails'] = 'DayBookMaster_Controller/getDayBookMasterDetails';
$route['addDaybookMasterDetails'] = 'DayBookMaster_Controller/addDaybookMasterDetails';
$route['updateDayBookMasterDetails'] = 'DayBookMaster_Controller/updateDayBookMasterDetails';

25
Apollo/api/application/controllers/StatusUpdation_Controller.php
View File

@ -266,7 +266,7 @@ class StatusUpdation_Controller extends REST_Controller {
for($i=0; $i < $count; $i++) { for($i=0; $i < $count; $i++) {
$data[] = array( $data[] = array(
'StudentID' => $reqData[$i]['StudentID'], 'StudentID' => $reqData[$i]['StudentID'],
'CourseID' => $reqData[$i]['StudentID'], 'CourseID' => $reqData[$i]['CourseID'],
'BranchCode' => $reqData[$i]['BranchCode'], 'BranchCode' => $reqData[$i]['BranchCode'],
'ListCode' => $reqData[$i]['ListCode'], 'ListCode' => $reqData[$i]['ListCode'],
'AppDate' => $reqData[$i]['SDate'], '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
}
}
} }

16
Apollo/api/application/models/DayBook_model.php
View File

@ -37,6 +37,8 @@ class DayBook_model extends CI_Model
} }
public function get_Daybook_Details_List($reqData, $reqDataBy) { public function get_Daybook_Details_List($reqData, $reqDataBy) {
if($reqData['date'] != '') {
$this->db->select('t1.*, t2.ListName, t3.TypeName'); $this->db->select('t1.*, t2.ListName, t3.TypeName');
$this->db->from(''.DAYBOOKMASTER. ' as t1'); $this->db->from(''.DAYBOOKMASTER. ' as t1');
$this->db->join('' . PICK_LIST_DETAILS . ' as t2', 't2.ListCode = t1.Name', 'LEFT'); $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->where('t1.Date', $reqData['date']);
$this->db->order_by('CreatedOn', 'DESC'); $this->db->order_by('CreatedOn', 'DESC');
$this->db->where('t1.BranchCode', $reqDataBy['localBranchID']); $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'); // $this->db->join('' . COURSE . ' as t2', 't2.UniversityID = t1.UniversityID', 'LEFT');
$dayBookDetails = $this->db->get(); $dayBookDetails = $this->db->get();
$dayBookDetailsList = $dayBookDetails->result(); $dayBookDetailsList = $dayBookDetails->result();
@ -60,7 +72,7 @@ class DayBook_model extends CI_Model
// update branch to staff_branch table // update branch to staff_branch table
if ($this->db->query($sql1) == '1') { if ($this->db->query($sql1) == '1') {
$result['deletedStatus'] = true; $result['deletedStatus'] = true;
$result['message'] = "DayBook Details Deleted"; $result['message'] = "Entry is Deleted";
} else { } else {
$result['deletedStatus'] = false; $result['deletedStatus'] = false;
$result['message'] = "Something went wrong.please try again"; $result['message'] = "Something went wrong.please try again";
@ -118,7 +130,7 @@ class DayBook_model extends CI_Model
// echo $this->db->affected_rows(); exit(); // echo $this->db->affected_rows(); exit();
if ($this->db->affected_rows() >= 1) { if ($this->db->affected_rows() >= 1) {
$result['addStatus'] = true; $result['addStatus'] = true;
$result['message'] = "Successfully Study Material Status Updated"; $result['message'] = "Successfully Details Updated";
} else { } else {
$result['addStatus'] = false; $result['addStatus'] = false;
$result['message'] = "Something went wrong.please try again"; $result['message'] = "Something went wrong.please try again";

93
Apollo/api/application/models/StatusUpdation_model.php
View File

@ -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) { public function get_status_name_ListCode($listCode) {
$this->db->select('ListName'); $this->db->select('ListName');
$this->db->from(PICK_LIST_DETAILS); $this->db->from(PICK_LIST_DETAILS);
@ -216,7 +307,7 @@ class StatusUpdation_model extends CI_Model
$Course = $reqData['Course']; $Course = $reqData['Course'];
$Batch = $reqData['Batch']; $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 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 LEFT JOIN ".UNIVERSITY." as U ON SC.UniversityID = U.UniversityID LEFT JOIN ".COURSE." as C ON
SC.CourseID = C.CourseID SC.CourseID = C.CourseID

44
Apollo/assets/js/controllers/answerBookletStatusCtrl.js
View File

@ -12,6 +12,16 @@ app.controller('answerBookletStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
$scope.reverse = !$scope.reverse; //if true make it false and vice versa $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 // get local client details
var localDetail = JSON.parse(localStorage.getItem('localObj')); var localDetail = JSON.parse(localStorage.getItem('localObj'));
@ -316,8 +326,42 @@ app.controller('answerBookletStatusCtrl', ["$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;
}
});
}
// $scope.CheckUncheckAll = function () { // $scope.CheckUncheckAll = function () {

48
Apollo/assets/js/controllers/applicationStatusCtrl.js
View File

@ -12,6 +12,16 @@ app.controller('applicationStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
$scope.reverse = !$scope.reverse; //if true make it false and vice versa $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 // get local client details
var localDetail = JSON.parse(localStorage.getItem('localObj')); 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); $scope.myStatusModel.dateOn = $filter('date')(new Date($scope.myStatusModel.dateOn), formate);
var ItemsSelected = $scope.searchResultDetails.filter(function (item) { var ItemsSelected = $scope.searchResultDetails.filter(function (item) {
if (item.Selected === true) { if (item.Selected === true) {
let getStudentID = new getStudentForUpdateDetails(item.StudentID); let getStudentID = new getStudentForUpdateDetails(item.StudentID, item.CourseID);
studentForUpdate.push(getStudentID); studentForUpdate.push(getStudentID);
return true; return true;
} }
}); });
function getStudentForUpdateDetails(id) { function getStudentForUpdateDetails(id, courseId) {
this.StudentID = id; this.StudentID = id;
this.CourseID = $scope.myStatusModel.semYear; this.CourseID = courseId;
this.BranchCode = localDetails.localBranchID; this.BranchCode = localDetails.localBranchID;
this.ListCode = $scope.myStatusModel.staus; this.ListCode = $scope.myStatusModel.staus;
this.SDate = $scope.myStatusModel.dateOn; this.SDate = $scope.myStatusModel.dateOn;
@ -318,6 +328,38 @@ app.controller('applicationStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
// 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;
}
});
}
// $scope.CheckUncheckAll = function () { // $scope.CheckUncheckAll = function () {

43
Apollo/assets/js/controllers/certificationStatusCtrl.js
View File

@ -12,6 +12,16 @@ app.controller('certificationStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
$scope.reverse = !$scope.reverse; //if true make it false and vice versa $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 // get local client details
var localDetail = JSON.parse(localStorage.getItem('localObj')); var localDetail = JSON.parse(localStorage.getItem('localObj'));
var localDetails = ipCookie('cookiechk'); 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;
}
});
}

12
Apollo/assets/js/controllers/daybookCtrl.js
View File

@ -22,9 +22,15 @@ app.controller('daybookCtrl', ["$scope", "$rootScope", "toaster", "$filter", "ng
} }
$scope.changeDate = function () { $scope.changeDate = function () {
var formate = "dd-MM-yyyy";
$scope.searchData.date = $filter('date')(new Date($scope.searchData.date), formate); if($scope.searchData.date !== undefined) {
$scope.getDayBookList(); 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; $scope.noRecordFound = true;

11
Apollo/assets/js/controllers/daybookadminCtrl.js
View File

@ -49,9 +49,14 @@ app.controller('daybookadminCtrl', ["$scope", "$rootScope", "toaster", "$filter"
} }
$scope.changeDate = function () { $scope.changeDate = function () {
var formate = "dd-MM-yyyy"; if($scope.searchData.date !== undefined) {
$scope.searchData.date = $filter('date')(new Date($scope.searchData.date), formate); var formate = "dd-MM-yyyy";
$scope.getDayBookList(); $scope.searchData.date = $filter('date')(new Date($scope.searchData.date), formate);
$scope.getDayBookList();
} else {
$scope.searchData.date = '';
$scope.getDayBookList();
}
} }

11
Apollo/assets/js/controllers/daybooksuperadminCtrl.js
View File

@ -43,9 +43,14 @@ app.controller('daybooksuperadminCtrl', ["$scope", "$rootScope", "toaster", "$fi
} }
$scope.changeDate = function () { $scope.changeDate = function () {
var formate = "dd-MM-yyyy"; if($scope.searchData.date !== undefined) {
$scope.searchData.date = $filter('date')(new Date($scope.searchData.date), formate); var formate = "dd-MM-yyyy";
$scope.getDayBookList(); $scope.searchData.date = $filter('date')(new Date($scope.searchData.date), formate);
$scope.getDayBookList();
} else {
$scope.searchData.date = '';
$scope.getDayBookList();
}
} }

42
Apollo/assets/js/controllers/studyMaterialStatusCtrl.js
View File

@ -12,6 +12,15 @@ app.controller('studyMaterialStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
$scope.reverse = !$scope.reverse; //if true make it false and vice versa $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 // get local client details
var localDetail = JSON.parse(localStorage.getItem('localObj')); var localDetail = JSON.parse(localStorage.getItem('localObj'));
var localDetails = ipCookie('cookiechk'); var localDetails = ipCookie('cookiechk');
@ -75,7 +84,7 @@ app.controller('studyMaterialStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
// alert(JSON.stringify(item)); // alert(JSON.stringify(item));
// } // }
$scope.searchResultDetails = ''; $scope.searchResultDetails = [];
$scope.searchLoading = false; $scope.searchLoading = false;
$scope.searchResultLength = 0; $scope.searchResultLength = 0;
$scope.getSearch = function () { $scope.getSearch = function () {
@ -318,6 +327,37 @@ app.controller('studyMaterialStatusCtrl', ["$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;
}
});
}
// $scope.CheckUncheckAll = function () { // $scope.CheckUncheckAll = function () {

10
Apollo/assets/views/daybook/daybook.html
View File

@ -79,7 +79,7 @@
<th ng-click="sort('amount')">Description <th ng-click="sort('amount')">Description
<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span> <span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
</th> </th>
<th ng-click="sort('amount')">Status <th class="center" ng-click="sort('amount')">Status
<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span> <span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
</th> </th>
<th class="center">Activity <th class="center">Activity
@ -93,14 +93,16 @@
<td>{{p.TypeName}}</td> <td>{{p.TypeName}}</td>
<td>{{p.Amount}}</td> <td>{{p.Amount}}</td>
<td style="width: 275px;">{{p.Description}}</td> <td style="width: 275px;">{{p.Description}}</td>
<td tooltip="{{p.Approval_Comments}}"><span ng-if="p.Status == 'Pending'" style="text-transform: uppercase; text-shadow: 1px 1px #286d5f; color: #55d4bb ">{{p.Status}}</span> <td class="center" tooltip="{{p.Approval_Comments}}" ng-if="p.ListName == 'Income'">
- </td>
<td class="center" tooltip="{{p.Approval_Comments}}" ng-if="p.ListName == 'Expense'"><span ng-if="p.Status == 'Pending'" style="text-transform: uppercase; text-shadow: 1px 1px #286d5f; color: #55d4bb ">{{p.Status}}</span>
<span ng-if="p.Status == 'Approved'" style="text-transform: uppercase; text-shadow: 1px 1px #166307; color: #2be209 ">{{p.Status}}</span> <span ng-if="p.Status == 'Approved'" style="text-transform: uppercase; text-shadow: 1px 1px #166307; color: #2be209 ">{{p.Status}}</span>
<span ng-if="p.Status == 'Rejected'" style="text-transform: uppercase; text-shadow: 1px 1px rgb(167, 88, 15); color: rgba(236, 24, 24, 0.98823529);">{{p.Status}}</span> <span ng-if="p.Status == 'Rejected'" style="text-transform: uppercase; text-shadow: 1px 1px rgb(167, 88, 15); color: rgba(236, 24, 24, 0.98823529);">{{p.Status}}</span>
</td> </td>
<td class="center" ng-if="p.Status != 'Pending'">-</td> <td class="center" ng-if="p.Status != 'Pending'">-</td>
<td class="center" ng-if="p.Status == 'Pending'"> <td class="center" ng-if="p.Status == 'Pending'">
<span> <i tooltip="EDIT : {{p.ID}}" class="glyphicon glyphicon-pencil" ng-click="setEditId(p.ID)"></i> </span> <span> <i tooltip="EDIT" class="glyphicon glyphicon-pencil" ng-click="setEditId(p.ID)"></i> </span>
<span> <i tooltip="DELETE : {{p.ID}}" class="glyphicon glyphicon-remove" ng-click="deleEditEntry(p.ID)"></i> </span> <span> <i tooltip="DELETE" class="glyphicon glyphicon-remove" ng-click="deleEditEntry(p.ID)"></i> </span>
</td> </td>
</tr> </tr>

8
Apollo/assets/views/daybook/daybookadmin.html
View File

@ -78,9 +78,9 @@
<th ng-click="sort('amount')">Description <th ng-click="sort('amount')">Description
<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span> <span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
</th> </th>
<th ng-click="sort('amount')">Status <!--<th ng-click="sort('amount')">Status
<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span> <span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
</th> </th>-->
</tr> </tr>
</thead> </thead>
<tbody dir-paginate="p in IncomeData|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10"> <tbody dir-paginate="p in IncomeData|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10">
@ -91,10 +91,10 @@
<td>{{p.TypeName}}</td> <td>{{p.TypeName}}</td>
<td>{{p.Amount}}</td> <td>{{p.Amount}}</td>
<td style="width: 275px;">{{p.Description}}</td> <td style="width: 275px;">{{p.Description}}</td>
<td tooltip="{{p.Approval_Comments}}"><span ng-if="p.Status == 'Pending'" style="text-transform: uppercase; text-shadow: 1px 1px #286d5f; color: #55d4bb ">{{p.Status}}</span> <!--<td tooltip="{{p.Approval_Comments}}"><span ng-if="p.Status == 'Pending'" style="text-transform: uppercase; text-shadow: 1px 1px #286d5f; color: #55d4bb ">{{p.Status}}</span>
<span ng-if="p.Status == 'Approved'" style="text-transform: uppercase; text-shadow: 1px 1px #166307; color: #2be209 ">{{p.Status}}</span> <span ng-if="p.Status == 'Approved'" style="text-transform: uppercase; text-shadow: 1px 1px #166307; color: #2be209 ">{{p.Status}}</span>
<span ng-if="p.Status == 'Rejected'" style="text-transform: uppercase; text-shadow: 1px 1px rgb(167, 88, 15); color: rgba(236, 24, 24, 0.98823529);">{{p.Status}}</span> <span ng-if="p.Status == 'Rejected'" style="text-transform: uppercase; text-shadow: 1px 1px rgb(167, 88, 15); color: rgba(236, 24, 24, 0.98823529);">{{p.Status}}</span>
</td> </td>-->
</tr> </tr>
</tbody> </tbody>
</table> </table>

8
Apollo/assets/views/daybook/daybooksuperadmin.html
View File

@ -81,9 +81,9 @@
<th ng-click="sort('amount')">Description <th ng-click="sort('amount')">Description
<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span> <span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
</th> </th>
<th ng-click="sort('amount')">Status <!--<th ng-click="sort('amount')">Status
<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span> <span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
</th> </th>-->
</tr> </tr>
</thead> </thead>
<tbody dir-paginate="p in IncomeData|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10"> <tbody dir-paginate="p in IncomeData|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10">
@ -94,10 +94,10 @@
<td>{{p.TypeName}}</td> <td>{{p.TypeName}}</td>
<td>{{p.Amount}}</td> <td>{{p.Amount}}</td>
<td style="width: 275px;">{{p.Description}}</td> <td style="width: 275px;">{{p.Description}}</td>
<td tooltip="{{p.Approval_Comments}}"><span ng-if="p.Status == 'Pending'" style="text-transform: uppercase; text-shadow: 1px 1px #286d5f; color: #55d4bb ">{{p.Status}}</span> <!--<td tooltip="{{p.Approval_Comments}}"><span ng-if="p.Status == 'Pending'" style="text-transform: uppercase; text-shadow: 1px 1px #286d5f; color: #55d4bb ">{{p.Status}}</span>
<span ng-if="p.Status == 'Approved'" style="text-transform: uppercase; text-shadow: 1px 1px #166307; color: #2be209 ">{{p.Status}}</span> <span ng-if="p.Status == 'Approved'" style="text-transform: uppercase; text-shadow: 1px 1px #166307; color: #2be209 ">{{p.Status}}</span>
<span ng-if="p.Status == 'Rejected'" style="text-transform: uppercase; text-shadow: 1px 1px rgb(167, 88, 15); color: rgba(236, 24, 24, 0.98823529);">{{p.Status}}</span> <span ng-if="p.Status == 'Rejected'" style="text-transform: uppercase; text-shadow: 1px 1px rgb(167, 88, 15); color: rgba(236, 24, 24, 0.98823529);">{{p.Status}}</span>
</td> </td>-->
</tr> </tr>
</tbody> </tbody>
</table> </table>

43
Apollo/assets/views/status-update/answer_booklet_status.html
View File

@ -155,6 +155,49 @@
<td>{{p.MobileNumber}}</td> <td>{{p.MobileNumber}}</td>
<td>{{p.EmailID}}</td> <td>{{p.EmailID}}</td>
<td>{{p.CourseName}}</td> <td>{{p.CourseName}}</td>
<td class="center">
<span> <i tooltip="STATUS DETAILS" class="glyphicon glyphicon-list-alt" ng-click="setEditId(p.StudentID)"></i> </span>
</td>
</tr>
<tr ng-show="editId ===p.StudentID" ng-if="editId === p.StudentID">
<!--<td><pre>{{p.StudentID}}</pre></td>-->
<td colspan="7">
<div class="container" style="background-color: rgb(248, 248, 248);
border-radius: 6px;padding: 22px;" ng-init="getPrevStatus(p)">
<div ng-if="prevStatusListForStudentCourseLoading" class="text-center">
<h3>Fetching ...</h3>
</div>
<div ng-if="!prevStatusListForStudentCourseLoading">
<div ng-if="!prevNoRecordFound">
<table class="table">
<thead style="background-color: cadetblue">
<th>Status</th>
<th>Comments</th>
<th>Date</th>
<th>Updated By</th>
</thead>
<tbody ng-repeat="s in prevStatusListForStudentCourse">
<td>{{s.ListName}}</td>
<td>{{s.Comments}}</td>
<td>{{s.AnsDate}}</td>
<td>{{s.Firstname}}</td>
</tbody>
</table>
</div>
<div ng-if="prevNoRecordFound">
<p style="color: red;" align="center"><strong><h4 class="text-center">No
Status Details Exist ... </h4></strong></p>
</div>
<div class="pull-right">
<button type="reset" class="btn btn-warning btn-sm" tabindex="20" ng-click="cancel()">
Cancel
</button>
</div>
</div>
</div>
</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>

45
Apollo/assets/views/status-update/application_status.html
View File

@ -155,7 +155,50 @@
<td>{{p.Lastname}}</td> <td>{{p.Lastname}}</td>
<td>{{p.MobileNumber}}</td> <td>{{p.MobileNumber}}</td>
<td>{{p.EmailID}}</td> <td>{{p.EmailID}}</td>
<td>{{p.CourseName}}</td> <td>{{p.CourseName}}</td>
<td class="center">
<span> <i tooltip="STATUS DETAILS" class="glyphicon glyphicon-list-alt" ng-click="setEditId(p.StudentID)"></i> </span>
</td>
</tr>
<tr ng-show="editId ===p.StudentID" ng-if="editId === p.StudentID">
<!--<td><pre>{{p.StudentID}}</pre></td>-->
<td colspan="7">
<div class="container" style="background-color: rgb(248, 248, 248);
border-radius: 6px;padding: 22px;" ng-init="getPrevStatus(p)">
<div ng-if="prevStatusListForStudentCourseLoading" class="text-center">
<h3>Fetching ...</h3>
</div>
<div ng-if="!prevStatusListForStudentCourseLoading">
<div ng-if="!prevNoRecordFound">
<table class="table">
<thead style="background-color: cadetblue">
<th>Status</th>
<th>Comments</th>
<th>Date</th>
<th>Updated By</th>
</thead>
<tbody ng-repeat="s in prevStatusListForStudentCourse">
<td>{{s.ListName}}</td>
<td>{{s.Comments}}</td>
<td>{{s.AppDate}}</td>
<td>{{s.Firstname}}</td>
</tbody>
</table>
</div>
<div ng-if="prevNoRecordFound">
<p style="color: red;" align="center"><strong><h4 class="text-center">No
Status Details Exist ... </h4></strong></p>
</div>
<div class="pull-right">
<button type="reset" class="btn btn-warning btn-sm" tabindex="20" ng-click="cancel()">
Cancel
</button>
</div>
</div>
</div>
</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>

45
Apollo/assets/views/status-update/certification_status.html
View File

@ -154,6 +154,51 @@
<td>{{p.MobileNumber}}</td> <td>{{p.MobileNumber}}</td>
<td>{{p.EmailID}}</td> <td>{{p.EmailID}}</td>
<td>{{p.CourseName}}</td> <td>{{p.CourseName}}</td>
<td class="center">
<span> <i tooltip="STATUS DETAILS" class="glyphicon glyphicon-list-alt" ng-click="setEditId(p.StudentID)"></i> </span>
</td>
</tr>
<tr ng-show="editId ===p.StudentID" ng-if="editId === p.StudentID">
<!--<td><pre>{{p.StudentID}}</pre></td>-->
<td colspan="7">
<div class="container" style="background-color: rgb(248, 248, 248);
border-radius: 6px;padding: 22px;" ng-init="getPrevStatus(p)">
<div ng-if="prevStatusListForStudentCourseLoading" class="text-center">
<h3>Fetching ...</h3>
</div>
<div ng-if="!prevStatusListForStudentCourseLoading">
<div ng-if="!prevNoRecordFound">
<table class="table">
<thead style="background-color: cadetblue">
<th>Status</th>
<th>Comments</th>
<th>Certificate Name</th>
<th>Date</th>
<th>Updated By</th>
</thead>
<tbody ng-repeat="s in prevStatusListForStudentCourse">
<td>{{s.ListName}}</td>
<td>{{s.Comments}}</td>
<td>{{s.CertificateName}}</td>
<td>{{s.CDate}}</td>
<td>{{s.Firstname}}</td>
</tbody>
</table>
</div>
<div ng-if="prevNoRecordFound">
<p style="color: red;" align="center"><strong><h4 class="text-center">No
Status Details Exist ... </h4></strong></p>
</div>
<div class="pull-right">
<button type="reset" class="btn btn-warning btn-sm" tabindex="20" ng-click="cancel()">
Cancel
</button>
</div>
</div>
</div>
</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>

67
Apollo/assets/views/status-update/study_material_status.html
View File

@ -102,16 +102,16 @@
$("#search").focus(); $("#search").focus();
}); });
</script> </script>
<style> <style>
.sort-icon { .sort-icon {
font-size: 9px; font-size: 9px;
margin-left: 5px; margin-left: 5px;
} }
th { th {
cursor: pointer; cursor: pointer;
} }
</style> </style>
<input class="form-control" type="text" ng-change="mySearchChangeFunc(search.MobileNumber)" ng-model="search.MobileNumber" <input class="form-control" type="text" ng-change="mySearchChangeFunc(search.MobileNumber)" ng-model="search.MobileNumber"
id="search" autofocus tabindex="1" placeholder="Search Mobile" /><br><br> id="search" autofocus tabindex="1" placeholder="Search Mobile" /><br><br>
</div> </div>
@ -139,6 +139,7 @@
<th ng-click="sort('CourseName')">Course <th ng-click="sort('CourseName')">Course
<span class="glyphicon sort-icon" ng-show="sortKey=='CourseName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span> <span class="glyphicon sort-icon" ng-show="sortKey=='CourseName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
</th> </th>
<th></th>
</tr> </tr>
</thead> </thead>
@ -146,8 +147,8 @@
<tr> <tr>
<td> <td>
<label> <label>
<input type="checkbox" ng-model="p.Selected" ng-change="openUpdateWind()" /> <input type="checkbox" ng-model="p.Selected" ng-bind="values = p.StudentID" ng-change="openUpdateWind()" />
<!--{{p.StudentID}}-->
</label> </label>
</td> </td>
<td>{{p.Firstname}}</td> <td>{{p.Firstname}}</td>
@ -155,6 +156,50 @@
<td>{{p.MobileNumber}}</td> <td>{{p.MobileNumber}}</td>
<td>{{p.EmailID}}</td> <td>{{p.EmailID}}</td>
<td>{{p.CourseName}}</td> <td>{{p.CourseName}}</td>
<td class="center">
<span> <i tooltip="STATUS DETAILS" class="glyphicon glyphicon-list-alt" ng-click="setEditId(p.StudentID)"></i> </span>
</td>
</tr>
<!--<pre>{{ editId }}</pre>-->
<tr ng-show="editId ===p.StudentID" ng-if="editId === p.StudentID">
<!--<td><pre>{{p.StudentID}}</pre></td>-->
<td colspan="7">
<div class="container" style="background-color: rgb(248, 248, 248);
border-radius: 6px;padding: 22px;" ng-init="getPrevStatus(p)">
<div ng-if="prevStatusListForStudentCourseLoading" class="text-center">
<h3>Fetching ...</h3>
</div>
<div ng-if="!prevStatusListForStudentCourseLoading">
<div ng-if="!prevNoRecordFound">
<table class="table">
<thead style="background-color: cadetblue">
<th>Status</th>
<th>Comments</th>
<th>Date</th>
<th>Updated By</th>
</thead>
<tbody ng-repeat="s in prevStatusListForStudentCourse">
<td>{{s.ListName}}</td>
<td>{{s.Comments}}</td>
<td>{{s.SDate}}</td>
<td>{{s.Firstname}}</td>
</tbody>
</table>
</div>
<div ng-if="prevNoRecordFound">
<p style="color: red;" align="center"><strong><h4 class="text-center">No
Status Details Exist ... </h4></strong></p>
</div>
<div class="pull-right">
<button type="reset" class="btn btn-warning btn-sm" tabindex="20" ng-click="cancel()">
Cancel
</button>
</div>
</div>
</div>
</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>