Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
b0a0b3792a
@ -105,6 +105,9 @@ class DayBook_Controller extends REST_Controller {
|
|||||||
$req['Amount'] = $reqData['amount'];
|
$req['Amount'] = $reqData['amount'];
|
||||||
$req['Description'] = $reqData['description'];
|
$req['Description'] = $reqData['description'];
|
||||||
$req['UpdatedBy'] = $reqbyData['localUserID'];
|
$req['UpdatedBy'] = $reqbyData['localUserID'];
|
||||||
|
$req['PaidTo'] = $reqData['paidTo'];
|
||||||
|
$req['PaidDescription'] = $reqData['description_paid'];
|
||||||
|
$req['VoucherNumber'] = $reqData['voucherNumber'];
|
||||||
$date = date('Y-m-d H:i:s');
|
$date = date('Y-m-d H:i:s');
|
||||||
$req['UpdatedOn'] = $date;
|
$req['UpdatedOn'] = $date;
|
||||||
$updatedayBookDetails = $this->daybook_model->update_dayBookDetails($req , $updateFor);// Check if the employee exist
|
$updatedayBookDetails = $this->daybook_model->update_dayBookDetails($req , $updateFor);// Check if the employee exist
|
||||||
@ -126,19 +129,25 @@ class DayBook_Controller extends REST_Controller {
|
|||||||
|
|
||||||
// add details daybook
|
// add details daybook
|
||||||
public function adddaybook_post() {
|
public function adddaybook_post() {
|
||||||
|
|
||||||
$reqData = $this->post('data');
|
$reqData = $this->post('data');
|
||||||
$reqbyData = $this->post('localReqDetails');
|
$reqbyData = $this->post('localReqDetails');
|
||||||
|
|
||||||
$req['Name'] = $reqData['name'];
|
$req['Name'] = $reqData['name'];
|
||||||
$req['Type'] = $reqData['type'];
|
$req['Type'] = $reqData['type'];
|
||||||
$req['Amount'] = $reqData['amount'];
|
$req['Amount'] = $reqData['amount'];
|
||||||
|
// $d = new DateTime($reqData['date']);
|
||||||
$req['Date'] = $reqData['date'];
|
$req['Date'] = $reqData['date'];
|
||||||
$req['Status'] = $reqData['status'];
|
$req['Status'] = $reqData['status'];
|
||||||
$req['Description'] = $reqData['description'];
|
$req['Description'] = $reqData['description'];
|
||||||
$req['BranchCode'] = $reqbyData['localBranchID'];
|
$req['BranchCode'] = $reqbyData['localBranchID'];
|
||||||
$req['CreatedBy'] = $reqbyData['localUserID'];
|
$req['CreatedBy'] = $reqbyData['localUserID'];
|
||||||
|
$req['PaidTo'] = $reqData['paidTo'];
|
||||||
|
$req['PaidDescription'] = $reqData['description_paid'];
|
||||||
|
$req['VoucherNumber'] = $reqData['voucherNumber'];
|
||||||
$date = date('Y-m-d H:i:s');
|
$date = date('Y-m-d H:i:s');
|
||||||
$req['CreatedOn'] = $date;
|
$req['CreatedOn'] = $date;
|
||||||
|
// print_r($req);exit();
|
||||||
$addDayBookDetails = $this->daybook_model->add_dayBook($req);// Check if the employee exist
|
$addDayBookDetails = $this->daybook_model->add_dayBook($req);// Check if the employee exist
|
||||||
if ($addDayBookDetails)
|
if ($addDayBookDetails)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -256,7 +256,7 @@ class Employee_Controller extends REST_Controller {
|
|||||||
$req['BranchCode'] = $temp['homeBranch'];
|
$req['BranchCode'] = $temp['homeBranch'];
|
||||||
$req['IsActive'] = $temp['switchsetting'];
|
$req['IsActive'] = $temp['switchsetting'];
|
||||||
$req['DOJ'] = $temp['dateofjoining'];
|
$req['DOJ'] = $temp['dateofjoining'];
|
||||||
$req['JobResponsibility'] = $data['jobResponsibility'];
|
$req['JobResponsibility'] = $temp['jobResponsibility'];
|
||||||
// $req['DOJ'] = $data['dateofjoining'];
|
// $req['DOJ'] = $data['dateofjoining'];
|
||||||
$req['ListCode'] = $temp['role'];
|
$req['ListCode'] = $temp['role'];
|
||||||
$req['CreatedBy'] = $createdBy;
|
$req['CreatedBy'] = $createdBy;
|
||||||
|
|||||||
@ -83,8 +83,9 @@ class StatusUpdation_Controller extends REST_Controller {
|
|||||||
// get Sem/year for the respective course
|
// get Sem/year for the respective course
|
||||||
public function getSemYearForCourse_post() {
|
public function getSemYearForCourse_post() {
|
||||||
$reqData = $this->post('data');
|
$reqData = $this->post('data');
|
||||||
|
$stuFor = $this->post('stuFor');
|
||||||
|
|
||||||
$getSemYeatList = $this->statusupdation_model->get_semyear_result($reqData);// Check if the employee exist
|
$getSemYeatList = $this->statusupdation_model->get_semyear_result($reqData, $stuFor);// Check if the employee exist
|
||||||
if ($getSemYeatList)
|
if ($getSemYeatList)
|
||||||
{
|
{
|
||||||
$getSemYeatList['status'] = REST_Controller::HTTP_OK;
|
$getSemYeatList['status'] = REST_Controller::HTTP_OK;
|
||||||
|
|||||||
@ -39,33 +39,46 @@ 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'] != '' && $reqData['dateTo'] != '') {
|
if($reqData['date'] != '' && $reqData['dateTo'] != '') {
|
||||||
$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');
|
||||||
$this->db->join('' . INCOMEOUTCOMEMASTER . ' as t3', 't3.ID = t1.Type', 'LEFT');
|
// $this->db->join('' . INCOMEOUTCOMEMASTER . ' as t3', 't3.ID = t1.Type', 'LEFT');
|
||||||
$this->db->where('t1.Date >=', $reqData['date']);
|
|
||||||
$this->db->where('t1.Date <=', $reqData['dateTo']);
|
$d = new DateTime($reqData['date']);
|
||||||
|
$dTo = new DateTime($reqData['dateTo']);
|
||||||
|
$fromDate = $d->format('Y-m-d');
|
||||||
|
$toDate = $dTo->format('Y-m-d');
|
||||||
|
$reqpayType = $reqDataBy['localBranchID'];
|
||||||
|
|
||||||
|
$querys = "SELECT t1.*, t2.ListName, t3.TypeName FROM ".DAYBOOKMASTER." as t1 LEFT JOIN ".PICK_LIST_DETAILS." as t2 ON t2.ListCode = t1.Name LEFT JOIN ".INCOMEOUTCOMEMASTER." as t3 ON t3.ID = t1.Type
|
||||||
|
WHERE STR_TO_DATE(t1.Date, '%d-%m-%Y') BETWEEN '$fromDate'
|
||||||
|
AND '$toDate' AND t1.BranchCode = '$reqpayType' ORDER BY CreatedOn DESC";
|
||||||
|
|
||||||
|
// $this->db->where(' STR_TO_DATE(t1.Date, %d-%m-%Y) >=', $fromDate);
|
||||||
|
// $this->db->where(' STR_TO_DATE(t1.Date, %d-%m-%Y) >=', $toDate);
|
||||||
// $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 {
|
} else {
|
||||||
$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');
|
||||||
$this->db->join('' . INCOMEOUTCOMEMASTER . ' as t3', 't3.ID = t1.Type', 'LEFT');
|
// $this->db->join('' . INCOMEOUTCOMEMASTER . ' as t3', 't3.ID = t1.Type', 'LEFT');
|
||||||
// $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']);
|
||||||
|
$reqpayType = $reqDataBy['localBranchID'];
|
||||||
|
$querys = "SELECT t1.*, t2.ListName, t3.TypeName FROM ".DAYBOOKMASTER." as t1 LEFT JOIN ".PICK_LIST_DETAILS." as t2 ON t2.ListCode = t1.Name LEFT JOIN ".INCOMEOUTCOMEMASTER." as t3 ON t3.ID = t1.Type
|
||||||
|
WHERE t1.BranchCode = '$reqpayType' ORDER BY CreatedOn DESC";
|
||||||
}
|
}
|
||||||
|
|
||||||
// $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->query($querys);
|
||||||
$dayBookDetailsList = $dayBookDetails->result();
|
$dayBookDetailsList = $dayBookDetails->result();
|
||||||
|
|
||||||
$results['dayBookListStatus'] = true;
|
$results['dayBookListStatus'] = true;
|
||||||
$results['dayBookListDetails'] = $dayBookDetailsList;
|
$results['dayBookListDetails'] = $dayBookDetailsList;
|
||||||
return $results;
|
return $results;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public function delete_dayBookDetails($id) {
|
public function delete_dayBookDetails($id) {
|
||||||
|
|||||||
@ -150,7 +150,7 @@ class StatusUpdation_model extends CI_Model
|
|||||||
if( $reqDetailsFor == 'STUDY_MATERIAL') {
|
if( $reqDetailsFor == 'STUDY_MATERIAL') {
|
||||||
$searchFor = 'M001';
|
$searchFor = 'M001';
|
||||||
$searchTableFor = STUDY_MATERIAL_STATUS;
|
$searchTableFor = STUDY_MATERIAL_STATUS;
|
||||||
$this->db->select('t1.*, t4.Firstname, t5.ListName');
|
$this->db->select('t1.*, t4.Firstname, t5.ListName, t2.Sem_Year');
|
||||||
$this->db->from(''. $searchTableFor . ' as t1');
|
$this->db->from(''. $searchTableFor . ' as t1');
|
||||||
$this->db->where('t1.StudentID', $reqDetails['student']);
|
$this->db->where('t1.StudentID', $reqDetails['student']);
|
||||||
$this->db->join('' . COURSE_FEES . ' as t2', 't2.ID = t1.CourseID', 'LEFT');
|
$this->db->join('' . COURSE_FEES . ' as t2', 't2.ID = t1.CourseID', 'LEFT');
|
||||||
@ -193,7 +193,7 @@ class StatusUpdation_model extends CI_Model
|
|||||||
} else if ( $reqDetailsFor == 'CERTIFICATION_STATUS' ) {
|
} else if ( $reqDetailsFor == 'CERTIFICATION_STATUS' ) {
|
||||||
$searchFor = 'C001';
|
$searchFor = 'C001';
|
||||||
$searchTableFor = CERTIFICATION_STATUS;
|
$searchTableFor = CERTIFICATION_STATUS;
|
||||||
$this->db->select('t1.*, t4.Firstname, t5.ListName');
|
$this->db->select('t1.*, t4.Firstname, t5.ListName, t2.Sem_Year');
|
||||||
$this->db->from(''. $searchTableFor . ' as t1');
|
$this->db->from(''. $searchTableFor . ' as t1');
|
||||||
$this->db->where('t1.StudentID', $reqDetails['student']);
|
$this->db->where('t1.StudentID', $reqDetails['student']);
|
||||||
$this->db->join('' . COURSE_FEES . ' as t2', 't2.ID = t1.CourseID', 'LEFT');
|
$this->db->join('' . COURSE_FEES . ' as t2', 't2.ID = t1.CourseID', 'LEFT');
|
||||||
@ -215,7 +215,7 @@ class StatusUpdation_model extends CI_Model
|
|||||||
} else if ( $reqDetailsFor == 'ANSWERBOOKLET_STATUS' ) {
|
} else if ( $reqDetailsFor == 'ANSWERBOOKLET_STATUS' ) {
|
||||||
$searchFor = 'B001';
|
$searchFor = 'B001';
|
||||||
$searchTableFor = ANSWER_BOOKLET;
|
$searchTableFor = ANSWER_BOOKLET;
|
||||||
$this->db->select('t1.*, t4.Firstname, t5.ListName');
|
$this->db->select('t1.*, t4.Firstname, t5.ListName, t2.Sem_Year');
|
||||||
$this->db->from(''. $searchTableFor . ' as t1');
|
$this->db->from(''. $searchTableFor . ' as t1');
|
||||||
$this->db->where('t1.StudentID', $reqDetails['student']);
|
$this->db->where('t1.StudentID', $reqDetails['student']);
|
||||||
$this->db->join('' . COURSE_FEES . ' as t2', 't2.ID = t1.CourseID', 'LEFT');
|
$this->db->join('' . COURSE_FEES . ' as t2', 't2.ID = t1.CourseID', 'LEFT');
|
||||||
@ -294,11 +294,13 @@ class StatusUpdation_model extends CI_Model
|
|||||||
}
|
}
|
||||||
|
|
||||||
// get sem/Year for the course
|
// get sem/Year for the course
|
||||||
public function get_semyear_result($reqData) {
|
public function get_semyear_result($reqData, $stuFor) {
|
||||||
$subQuery = "SELECT CF.Sem_Year, CF.ID
|
// echo $stuFor;exit();
|
||||||
FROM ".COURSE_FEES." as CF
|
$subQuery = "SELECT CF.Sem_Year, CF.ID
|
||||||
|
FROM ".COURSE_FEES." as CF LEFT JOIN ".STUDENTS_FEES_STATUS." as SFS ON SFS.FeesType = CF.ID
|
||||||
WHERE
|
WHERE
|
||||||
CF.CourseID = '$reqData'
|
SFS.CourseID = '$reqData'
|
||||||
|
AND SFS.StudentID = '$stuFor'
|
||||||
AND CF.ProgramType ='Y001'";
|
AND CF.ProgramType ='Y001'";
|
||||||
|
|
||||||
$queryDetails = $this->db->query($subQuery);
|
$queryDetails = $this->db->query($subQuery);
|
||||||
|
|||||||
@ -12,17 +12,14 @@ 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.editId = -1;
|
||||||
$scope.setEditId = function (P) {
|
$scope.setEditId = function (P) {
|
||||||
// alert(P);
|
|
||||||
$scope.editId = P;
|
$scope.editId = P;
|
||||||
}
|
}
|
||||||
$scope.cancel = function() {
|
$scope.cancel = function () {
|
||||||
$scope.editId = -1;
|
$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');
|
||||||
@ -48,6 +45,7 @@ app.controller('answerBookletStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
|
|||||||
}
|
}
|
||||||
|
|
||||||
$scope.universityData = '';
|
$scope.universityData = '';
|
||||||
|
// get university list when the page is loading
|
||||||
$scope.getUniversityList = function () {
|
$scope.getUniversityList = function () {
|
||||||
var empListreq = {
|
var empListreq = {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
@ -82,16 +80,12 @@ app.controller('answerBookletStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
|
|||||||
$scope.getSearch();
|
$scope.getSearch();
|
||||||
}
|
}
|
||||||
|
|
||||||
// $scope.dealWithItem = function (item) {
|
|
||||||
// alert(JSON.stringify(item));
|
|
||||||
// }
|
|
||||||
|
|
||||||
$scope.searchResultDetails = '';
|
$scope.searchResultDetails = '';
|
||||||
$scope.searchLoading = false;
|
$scope.searchLoading = false;
|
||||||
$scope.searchResultLength = 0;
|
$scope.searchResultLength = 0;
|
||||||
|
// get student list based on the searched data
|
||||||
$scope.getSearch = function () {
|
$scope.getSearch = function () {
|
||||||
$scope.OpenWindowStatus = false;
|
$scope.OpenWindowStatus = false;
|
||||||
// alert(JSON.stringify($scope.searchData));
|
|
||||||
$scope.searchLoading = true;
|
$scope.searchLoading = true;
|
||||||
var getSearchDetails = {
|
var getSearchDetails = {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
@ -122,56 +116,73 @@ app.controller('answerBookletStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
|
|||||||
}
|
}
|
||||||
|
|
||||||
// mobile number search functionlity
|
// mobile number search functionlity
|
||||||
$scope.mySearchChangeFunc = function(val) {
|
$scope.mySearchChangeFunc = function (val) {
|
||||||
if( val > 0) {
|
if (val > 0) {
|
||||||
$scope.allSelectedHide = true;
|
$scope.allSelectedHide = true;
|
||||||
$scope.allSelected('undefined');
|
$scope.allSelected('undefined');
|
||||||
$scope.OpenWindowStatus = false;
|
$scope.OpenWindowStatus = false;
|
||||||
} else {
|
} else {
|
||||||
$scope.allSelected('undefined');
|
$scope.allSelected('undefined');
|
||||||
$scope.allSelectedHide = false;
|
$scope.allSelectedHide = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// End: mobile number search functionlity
|
// End: mobile number search functionlity
|
||||||
|
|
||||||
// select all or individual functionality
|
// select all or individual functionality
|
||||||
|
|
||||||
var getAllSelected = function () {
|
// var getAllSelected = function () {
|
||||||
var selectedItems = $scope.searchResultDetails.filter(function (item) {
|
// var selectedItems = $scope.searchResultDetails.filter(function (item) {
|
||||||
return item.Selected;
|
// return item.Selected;
|
||||||
});
|
// });
|
||||||
|
|
||||||
return selectedItems.length === $scope.searchResultDetails.length;
|
// return selectedItems.length === $scope.searchResultDetails.length;
|
||||||
}
|
// }
|
||||||
|
|
||||||
var setAllSelected = function (value) {
|
// var setAllSelected = function (value) {
|
||||||
|
// angular.forEach($scope.searchResultDetails, function (item) {
|
||||||
|
// item.Selected = value;
|
||||||
|
// });
|
||||||
|
// }
|
||||||
|
|
||||||
|
// $scope.allSelected = function (value) {
|
||||||
|
// if (value !== undefined) {
|
||||||
|
// return setAllSelected(value);
|
||||||
|
// } else {
|
||||||
|
// return getAllSelected();
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
|
||||||
|
// Select one row in a table once
|
||||||
|
$scope.setOneSelect = function (value) {
|
||||||
angular.forEach($scope.searchResultDetails, function (item) {
|
angular.forEach($scope.searchResultDetails, function (item) {
|
||||||
item.Selected = value;
|
item.Selected = value;
|
||||||
});
|
});
|
||||||
}
|
value.Selected = true;
|
||||||
|
$scope.OpenWindowStatus = true;
|
||||||
$scope.allSelected = function (value) {
|
$scope.openUpdateWind();
|
||||||
if (value !== undefined) {
|
|
||||||
return setAllSelected(value);
|
|
||||||
} else {
|
|
||||||
return getAllSelected();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// End: select all or individual functionality
|
// End: select all or individual functionality
|
||||||
|
|
||||||
|
// unselect all the selected items
|
||||||
|
$scope.unSelect = function () {
|
||||||
|
angular.forEach($scope.searchResultDetails, function (item) {
|
||||||
|
item.Selected = false;
|
||||||
|
});
|
||||||
|
$scope.openUpdateWind();
|
||||||
|
}
|
||||||
|
|
||||||
// open popup window onselct checkbox
|
// open popup window onselct checkbox / close the popup all selected items unchecked
|
||||||
$scope.OpenWindowStatus = false;
|
$scope.OpenWindowStatus = false;
|
||||||
$scope.openUpdateWind = function () {
|
$scope.openUpdateWind = function () {
|
||||||
var ItemsSelected = $scope.searchResultDetails.filter(function (item) {
|
var ItemsSelected = $scope.searchResultDetails.filter(function (item) {
|
||||||
if (item.Selected === true) { return true; }
|
if (item.Selected === true) { return true; }
|
||||||
});
|
})
|
||||||
const courseLocal = $scope.searchData.Course;
|
if (ItemsSelected.length !== 0) {
|
||||||
$scope.getSemYearList(courseLocal);
|
const courseLocal = ItemsSelected[0].CourseID;
|
||||||
$scope.getStatusList();
|
const selectedStuId = ItemsSelected[0].StudentID;
|
||||||
// alert($scope.searchData.Course);
|
$scope.getSemYearList(courseLocal, selectedStuId);
|
||||||
if (ItemsSelected.length) {
|
$scope.getStatusList();
|
||||||
$scope.OpenWindowStatus = true;
|
$scope.OpenWindowStatus = true;
|
||||||
$scope.myStatusModel = {
|
$scope.myStatusModel = {
|
||||||
'semYear': '',
|
'semYear': '',
|
||||||
@ -184,7 +195,7 @@ app.controller('answerBookletStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// get status list for this activity
|
// get status list for this activity
|
||||||
$scope.getStatusList = function () {
|
$scope.getStatusList = function () {
|
||||||
var getStatusL = {
|
var getStatusL = {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
@ -208,7 +219,7 @@ app.controller('answerBookletStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
|
|||||||
}
|
}
|
||||||
|
|
||||||
// get Sem/Year based on the course select
|
// get Sem/Year based on the course select
|
||||||
$scope.getSemYearList = function (courseID) {
|
$scope.getSemYearList = function (courseID, StuId) {
|
||||||
$scope.semYearList = '';
|
$scope.semYearList = '';
|
||||||
if (courseID !== '' && courseID !== undefined) {
|
if (courseID !== '' && courseID !== undefined) {
|
||||||
var getSemYear = {
|
var getSemYear = {
|
||||||
@ -218,7 +229,8 @@ app.controller('answerBookletStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
|
|||||||
'Content-Type': 'application/json'
|
'Content-Type': 'application/json'
|
||||||
},
|
},
|
||||||
data: {
|
data: {
|
||||||
data: courseID
|
data: courseID,
|
||||||
|
stuFor: StuId
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
$http(getSemYear).then(function (response) {
|
$http(getSemYear).then(function (response) {
|
||||||
@ -234,23 +246,6 @@ app.controller('answerBookletStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// $scope.updateItems = function () {
|
|
||||||
// var studentForUpdate = [];
|
|
||||||
// var ItemsSelected = $scope.searchResultDetails.filter(function (item) {
|
|
||||||
// if (item.Selected === true) {
|
|
||||||
// let getStudentID = new getStudentForUpdateDetails(item.StudentID);
|
|
||||||
// studentForUpdate.push(getStudentID);
|
|
||||||
// return true;
|
|
||||||
// }
|
|
||||||
// });
|
|
||||||
// function getStudentForUpdateDetails(id) {
|
|
||||||
// this.iD = id;
|
|
||||||
// }
|
|
||||||
// alert(JSON.stringify($scope.myStatusModel));
|
|
||||||
// alert(JSON.stringify(studentForUpdate));
|
|
||||||
// }
|
|
||||||
|
|
||||||
$scope.statusUpdate = {
|
$scope.statusUpdate = {
|
||||||
submit: function (form, myStatusModel) {
|
submit: function (form, myStatusModel) {
|
||||||
var firstError = null;
|
var firstError = null;
|
||||||
@ -269,7 +264,7 @@ app.controller('answerBookletStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
|
|||||||
angular.element('.ng-invalid[name=' + firstError + ']').focus();
|
angular.element('.ng-invalid[name=' + firstError + ']').focus();
|
||||||
// swal("The form cannot be submitted because it contains validation errors!", "Errors are marked with a red, dashed border!", "error");
|
// swal("The form cannot be submitted because it contains validation errors!", "Errors are marked with a red, dashed border!", "error");
|
||||||
} else {
|
} else {
|
||||||
$scope.disableButton = true;
|
$scope.disableButton = true;
|
||||||
var studentForUpdate = [];
|
var studentForUpdate = [];
|
||||||
let formate = "dd-MM-yyyy";
|
let formate = "dd-MM-yyyy";
|
||||||
$scope.myStatusModel.dateOn = $filter('date')(new Date($scope.myStatusModel.dateOn), formate);
|
$scope.myStatusModel.dateOn = $filter('date')(new Date($scope.myStatusModel.dateOn), formate);
|
||||||
@ -289,9 +284,7 @@ app.controller('answerBookletStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
|
|||||||
this.Coursedetail = id;
|
this.Coursedetail = id;
|
||||||
this.Comments = $scope.myStatusModel.comment;
|
this.Comments = $scope.myStatusModel.comment;
|
||||||
}
|
}
|
||||||
// alert(JSON.stringify($scope.myStatusModel));
|
|
||||||
// alert(JSON.stringify(studentForUpdate));
|
|
||||||
|
|
||||||
var updateStudyMaterial = {
|
var updateStudyMaterial = {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
url: apiPoint.url + 'updateAnswerBookLetStatus/',
|
url: apiPoint.url + 'updateAnswerBookLetStatus/',
|
||||||
@ -300,42 +293,39 @@ app.controller('answerBookletStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
|
|||||||
},
|
},
|
||||||
data: {
|
data: {
|
||||||
data: studentForUpdate,
|
data: studentForUpdate,
|
||||||
requestDetails : localDetails
|
requestDetails: localDetails
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
$http(updateStudyMaterial).then(function (response) {
|
$http(updateStudyMaterial).then(function (response) {
|
||||||
if (response.data.addStatus) {
|
if (response.data.addStatus) {
|
||||||
swal("Success!", response.data.message, "success");
|
swal("Success!", response.data.message, "success");
|
||||||
$scope.disableButton = false;
|
$scope.disableButton = false;
|
||||||
// for success state
|
angular.forEach($scope.searchResultDetails, function (item) {
|
||||||
$scope.allSelected('undefined');
|
item.Selected = false;
|
||||||
$scope.OpenWindowStatus = false;
|
});
|
||||||
|
$scope.OpenWindowStatus = false;
|
||||||
} else {
|
} else {
|
||||||
swal("Failed!", response.data.message, "error");
|
swal("Failed!", response.data.message, "error");
|
||||||
$scope.disableButton = false;
|
$scope.disableButton = false;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
reset: function (form) {
|
reset: function (form) {
|
||||||
form.$setPristine(true);
|
form.$setPristine(true);
|
||||||
$scope.myStatusModel = {
|
$scope.myStatusModel = {
|
||||||
'semYear': '',
|
'semYear': '',
|
||||||
'staus': '',
|
'staus': '',
|
||||||
'dateOn': '',
|
'dateOn': '',
|
||||||
'comment': ''
|
'comment': ''
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// check unchek for table values
|
// check unchek for table values
|
||||||
|
$scope.prevStatusListForStudentCourse = '';
|
||||||
$scope.prevStatusListForStudentCourse = '';
|
|
||||||
// get previous status details for the student
|
// get previous status details for the student
|
||||||
$scope.getPrevStatus = function(p) {
|
$scope.getPrevStatus = function (p) {
|
||||||
// alert(JSON.stringify(p));
|
|
||||||
$scope.prevStatusListForStudentCourseLoading = true;
|
$scope.prevStatusListForStudentCourseLoading = true;
|
||||||
$scope.prevStatusListForStudentCourseNoRecord = false;
|
$scope.prevStatusListForStudentCourseNoRecord = false;
|
||||||
$scope.prevStatusListForStudentCourse = '';
|
$scope.prevStatusListForStudentCourse = '';
|
||||||
@ -347,7 +337,7 @@ app.controller('answerBookletStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
|
|||||||
},
|
},
|
||||||
data: {
|
data: {
|
||||||
statusFor: localUpdateStatus,
|
statusFor: localUpdateStatus,
|
||||||
getDetailsFor: { "student": p.StudentID, "CourseID": p.CourseID} ,
|
getDetailsFor: { "student": p.StudentID, "CourseID": p.CourseID },
|
||||||
data: localDetail
|
data: localDetail
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@ -364,25 +354,4 @@ app.controller('answerBookletStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// $scope.CheckUncheckAll = function () {
|
|
||||||
|
|
||||||
// for (var i = 0; i < $scope.searchResultDetails.length; i++) {
|
|
||||||
// $scope.searchResultDetails[i].Selected = $scope.IsAllChecked;
|
|
||||||
// }
|
|
||||||
// };
|
|
||||||
|
|
||||||
// $scope.CheckUncheckHeader = function () {
|
|
||||||
// $scope.IsAllChecked = true;
|
|
||||||
// for (var i = 0; i < $scope.searchResultDetails.length; i++) {
|
|
||||||
// if (!$scope.searchResultDetails[i].Selected) {
|
|
||||||
// $scope.IsAllChecked = false;
|
|
||||||
// break;
|
|
||||||
// }
|
|
||||||
// };
|
|
||||||
// };
|
|
||||||
|
|
||||||
// $scope.CheckUncheckHeader();
|
|
||||||
}]);
|
}]);
|
||||||
|
|||||||
@ -3,7 +3,7 @@
|
|||||||
app.controller('applicationStatusCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "API_POINTS", "$http", "SweetAlert", "$state", 'md5', 'ipCookie', function ($scope, toaster, $filter, ngTableParams, apiPoint, $http, SweetAlert, $state, md5, ipCookie) {
|
app.controller('applicationStatusCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "API_POINTS", "$http", "SweetAlert", "$state", 'md5', 'ipCookie', function ($scope, toaster, $filter, ngTableParams, apiPoint, $http, SweetAlert, $state, md5, ipCookie) {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Application status update search
|
* Application status update search / Document status update
|
||||||
* by : kdk
|
* by : kdk
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@ -12,13 +12,13 @@ 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.editId = -1;
|
||||||
$scope.setEditId = function (P) {
|
$scope.setEditId = function (P) {
|
||||||
// alert(P);
|
// alert(P);
|
||||||
$scope.editId = P;
|
$scope.editId = P;
|
||||||
}
|
}
|
||||||
$scope.cancel = function() {
|
$scope.cancel = function () {
|
||||||
$scope.editId = -1;
|
$scope.editId = -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -26,15 +26,17 @@ app.controller('applicationStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
|
|||||||
// 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');
|
||||||
|
|
||||||
const localUpdateStatus = 'APPICATION_STATUS';
|
const localUpdateStatus = 'APPICATION_STATUS';
|
||||||
|
|
||||||
$scope.init = function () {
|
$scope.init = function () {
|
||||||
$scope.getUniversityList();
|
$scope.getUniversityList();
|
||||||
getCertificateDetailsList();
|
getCertificateDetailsList();
|
||||||
}
|
}
|
||||||
|
|
||||||
var getCertificateDetailsList = function() {
|
// get certificate or application list
|
||||||
var getCerfreg = {
|
var getCertificateDetailsList = function () {
|
||||||
|
var getCerfreg = {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
url: apiPoint.url + 'getCertificateList/',
|
url: apiPoint.url + 'getCertificateList/',
|
||||||
headers: {
|
headers: {
|
||||||
@ -52,7 +54,7 @@ app.controller('applicationStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
$scope.searchData = {
|
$scope.searchData = {
|
||||||
'University': '',
|
'University': '',
|
||||||
@ -71,6 +73,7 @@ app.controller('applicationStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
|
|||||||
'certificateNumber': ''
|
'certificateNumber': ''
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// get university list while page is loading
|
||||||
$scope.universityData = '';
|
$scope.universityData = '';
|
||||||
$scope.getUniversityList = function () {
|
$scope.getUniversityList = function () {
|
||||||
var empListreq = {
|
var empListreq = {
|
||||||
@ -106,16 +109,12 @@ app.controller('applicationStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
|
|||||||
$scope.getSearch();
|
$scope.getSearch();
|
||||||
}
|
}
|
||||||
|
|
||||||
// $scope.dealWithItem = function (item) {
|
|
||||||
// alert(JSON.stringify(item));
|
|
||||||
// }
|
|
||||||
|
|
||||||
$scope.searchResultDetails = '';
|
$scope.searchResultDetails = '';
|
||||||
$scope.searchLoading = false;
|
$scope.searchLoading = false;
|
||||||
$scope.searchResultLength = 0;
|
$scope.searchResultLength = 0;
|
||||||
|
// get student list From the searching data
|
||||||
$scope.getSearch = function () {
|
$scope.getSearch = function () {
|
||||||
$scope.OpenWindowStatus = false;
|
$scope.OpenWindowStatus = false;
|
||||||
// alert(JSON.stringify($scope.searchData));
|
|
||||||
$scope.searchLoading = true;
|
$scope.searchLoading = true;
|
||||||
var getSearchDetails = {
|
var getSearchDetails = {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
@ -146,15 +145,15 @@ app.controller('applicationStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
|
|||||||
}
|
}
|
||||||
|
|
||||||
// mobile number search functionlity
|
// mobile number search functionlity
|
||||||
$scope.mySearchChangeFunc = function(val) {
|
$scope.mySearchChangeFunc = function (val) {
|
||||||
if( val > 0) {
|
if (val > 0) {
|
||||||
$scope.allSelectedHide = true;
|
$scope.allSelectedHide = true;
|
||||||
$scope.allSelected('undefined');
|
$scope.allSelected('undefined');
|
||||||
$scope.OpenWindowStatus = false;
|
$scope.OpenWindowStatus = false;
|
||||||
} else {
|
} else {
|
||||||
$scope.allSelected('undefined');
|
$scope.allSelected('undefined');
|
||||||
$scope.allSelectedHide = false;
|
$scope.allSelectedHide = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// End: mobile number search functionlity
|
// End: mobile number search functionlity
|
||||||
|
|
||||||
@ -184,9 +183,8 @@ app.controller('applicationStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
|
|||||||
|
|
||||||
// End: select all or individual functionality
|
// End: select all or individual functionality
|
||||||
|
|
||||||
// Select one row in a table once
|
// Select one row in a table once
|
||||||
$scope.setOneSelect = function (value) {
|
$scope.setOneSelect = function (value) {
|
||||||
// alert(value.Selected);
|
|
||||||
angular.forEach($scope.searchResultDetails, function (item) {
|
angular.forEach($scope.searchResultDetails, function (item) {
|
||||||
item.Selected = value;
|
item.Selected = value;
|
||||||
});
|
});
|
||||||
@ -195,19 +193,24 @@ app.controller('applicationStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
|
|||||||
$scope.openUpdateWind();
|
$scope.openUpdateWind();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// unselect all the selected item
|
||||||
|
$scope.unSelect = function () {
|
||||||
|
angular.forEach($scope.searchResultDetails, function (item) {
|
||||||
|
item.Selected = false;
|
||||||
|
});
|
||||||
|
$scope.openUpdateWind();
|
||||||
|
}
|
||||||
|
|
||||||
|
// open popup window onselct checkbox clicked or close popup window all the clicked items unchecked
|
||||||
// open popup window onselct checkbox
|
|
||||||
$scope.OpenWindowStatus = false;
|
$scope.OpenWindowStatus = false;
|
||||||
$scope.openUpdateWind = function () {
|
$scope.openUpdateWind = function () {
|
||||||
var ItemsSelected = $scope.searchResultDetails.filter(function (item) {
|
var ItemsSelected = $scope.searchResultDetails.filter(function (item) {
|
||||||
if (item.Selected === true) { return true; }
|
if (item.Selected === true) { return true; }
|
||||||
});
|
});
|
||||||
const courseLocal = $scope.searchData.Course;
|
if (ItemsSelected.length !== 0) {
|
||||||
$scope.getSemYearList(courseLocal);
|
const courseLocal = $scope.searchData.Course;
|
||||||
$scope.getStatusList();
|
$scope.getSemYearList(courseLocal);
|
||||||
// alert($scope.searchData.Course);
|
$scope.getStatusList();
|
||||||
if (ItemsSelected.length) {
|
|
||||||
$scope.OpenWindowStatus = true;
|
$scope.OpenWindowStatus = true;
|
||||||
$scope.myStatusModel = {
|
$scope.myStatusModel = {
|
||||||
'semYear': '',
|
'semYear': '',
|
||||||
@ -238,7 +241,6 @@ app.controller('applicationStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
|
|||||||
$http(getStatusL).then(function (response) {
|
$http(getStatusL).then(function (response) {
|
||||||
if (response.data.statusList) {
|
if (response.data.statusList) {
|
||||||
$scope.statusDetailsList = response.data.statusList_details;
|
$scope.statusDetailsList = response.data.statusList_details;
|
||||||
// $scope.searchLoading = false;
|
|
||||||
} else {
|
} else {
|
||||||
// $scope.searchLoading = false;
|
// $scope.searchLoading = false;
|
||||||
}
|
}
|
||||||
@ -272,23 +274,6 @@ app.controller('applicationStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// $scope.updateItems = function () {
|
|
||||||
// var studentForUpdate = [];
|
|
||||||
// var ItemsSelected = $scope.searchResultDetails.filter(function (item) {
|
|
||||||
// if (item.Selected === true) {
|
|
||||||
// let getStudentID = new getStudentForUpdateDetails(item.StudentID);
|
|
||||||
// studentForUpdate.push(getStudentID);
|
|
||||||
// return true;
|
|
||||||
// }
|
|
||||||
// });
|
|
||||||
// function getStudentForUpdateDetails(id) {
|
|
||||||
// this.iD = id;
|
|
||||||
// }
|
|
||||||
// alert(JSON.stringify($scope.myStatusModel));
|
|
||||||
// alert(JSON.stringify(studentForUpdate));
|
|
||||||
// }
|
|
||||||
|
|
||||||
$scope.statusUpdate = {
|
$scope.statusUpdate = {
|
||||||
submit: function (form, myStatusModel) {
|
submit: function (form, myStatusModel) {
|
||||||
var firstError = null;
|
var firstError = null;
|
||||||
@ -329,9 +314,6 @@ app.controller('applicationStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
|
|||||||
this.CertificateType = $scope.myStatusModel.certificatetype;
|
this.CertificateType = $scope.myStatusModel.certificatetype;
|
||||||
this.CertificateNumber = $scope.myStatusModel.certificateNumber;
|
this.CertificateNumber = $scope.myStatusModel.certificateNumber;
|
||||||
}
|
}
|
||||||
// alert(JSON.stringify($scope.myStatusModel));
|
|
||||||
// alert(JSON.stringify(studentForUpdate));
|
|
||||||
|
|
||||||
var updateStudyMaterial = {
|
var updateStudyMaterial = {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
url: apiPoint.url + 'updateApplicationStatus/',
|
url: apiPoint.url + 'updateApplicationStatus/',
|
||||||
@ -340,51 +322,50 @@ app.controller('applicationStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
|
|||||||
},
|
},
|
||||||
data: {
|
data: {
|
||||||
data: studentForUpdate,
|
data: studentForUpdate,
|
||||||
requestDetails : localDetails
|
requestDetails: localDetails
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
$http(updateStudyMaterial).then(function (response) {
|
$http(updateStudyMaterial).then(function (response) {
|
||||||
if (response.data.addStatus) {
|
if (response.data.addStatus) {
|
||||||
swal("Success!", response.data.message, "success");
|
swal("Success!", response.data.message, "success");
|
||||||
$scope.disableButton = false;
|
$scope.disableButton = false;
|
||||||
// for success state
|
// for success state
|
||||||
angular.forEach($scope.searchResultDetails, function (item) {
|
angular.forEach($scope.searchResultDetails, function (item) {
|
||||||
item.Selected = false;
|
item.Selected = false;
|
||||||
});
|
});
|
||||||
// $scope.OpenWindowStatus = false;
|
// $scope.OpenWindowStatus = false;
|
||||||
$scope.OpenWindowStatus = false;
|
$scope.OpenWindowStatus = false;
|
||||||
} else {
|
} else {
|
||||||
swal("Failed!", response.data.message, "error");
|
swal("Failed!", response.data.message, "error");
|
||||||
$scope.disableButton = false;
|
$scope.disableButton = false;
|
||||||
// for success state
|
// for success state
|
||||||
angular.forEach($scope.searchResultDetails, function (item) {
|
angular.forEach($scope.searchResultDetails, function (item) {
|
||||||
item.Selected = false;
|
item.Selected = false;
|
||||||
});
|
});
|
||||||
// $scope.OpenWindowStatus = false;
|
// $scope.OpenWindowStatus = false;
|
||||||
$scope.OpenWindowStatus = false;
|
$scope.OpenWindowStatus = false;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
reset: function (form) {
|
reset: function (form) {
|
||||||
form.$setPristine(true);
|
form.$setPristine(true);
|
||||||
$scope.myStatusModel = {
|
$scope.myStatusModel = {
|
||||||
'semYear': '',
|
'semYear': '',
|
||||||
'staus': '',
|
'staus': '',
|
||||||
'dateOn': '',
|
'dateOn': '',
|
||||||
'comment': '',
|
'comment': '',
|
||||||
'certificatetype': '',
|
'certificatetype': '',
|
||||||
'certificateNumber': ''
|
'certificateNumber': ''
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// check unchek for table values
|
// check unchek for table values
|
||||||
|
$scope.prevStatusListForStudentCourse = '';
|
||||||
$scope.prevStatusListForStudentCourse = '';
|
|
||||||
// get previous status details for the student
|
// get previous status details for the student
|
||||||
$scope.getPrevStatus = function(p) {
|
$scope.getPrevStatus = function (p) {
|
||||||
// alert(JSON.stringify(p));
|
// alert(JSON.stringify(p));
|
||||||
$scope.prevStatusListForStudentCourseLoading = true;
|
$scope.prevStatusListForStudentCourseLoading = true;
|
||||||
$scope.prevStatusListForStudentCourseNoRecord = false;
|
$scope.prevStatusListForStudentCourseNoRecord = false;
|
||||||
@ -397,7 +378,7 @@ app.controller('applicationStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
|
|||||||
},
|
},
|
||||||
data: {
|
data: {
|
||||||
statusFor: localUpdateStatus,
|
statusFor: localUpdateStatus,
|
||||||
getDetailsFor: { "student": p.StudentID, "CourseID": p.CourseID} ,
|
getDetailsFor: { "student": p.StudentID, "CourseID": p.CourseID },
|
||||||
data: localDetail
|
data: localDetail
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@ -413,25 +394,4 @@ app.controller('applicationStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// $scope.CheckUncheckAll = function () {
|
|
||||||
|
|
||||||
// for (var i = 0; i < $scope.searchResultDetails.length; i++) {
|
|
||||||
// $scope.searchResultDetails[i].Selected = $scope.IsAllChecked;
|
|
||||||
// }
|
|
||||||
// };
|
|
||||||
|
|
||||||
// $scope.CheckUncheckHeader = function () {
|
|
||||||
// $scope.IsAllChecked = true;
|
|
||||||
// for (var i = 0; i < $scope.searchResultDetails.length; i++) {
|
|
||||||
// if (!$scope.searchResultDetails[i].Selected) {
|
|
||||||
// $scope.IsAllChecked = false;
|
|
||||||
// break;
|
|
||||||
// }
|
|
||||||
// };
|
|
||||||
// };
|
|
||||||
|
|
||||||
// $scope.CheckUncheckHeader();
|
|
||||||
}]);
|
}]);
|
||||||
|
|||||||
@ -3,7 +3,7 @@
|
|||||||
app.controller('certificationStatusCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "API_POINTS", "$http", "SweetAlert", "$state", 'md5', 'ipCookie', function ($scope, toaster, $filter, ngTableParams, apiPoint, $http, SweetAlert, $state, md5, ipCookie) {
|
app.controller('certificationStatusCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "API_POINTS", "$http", "SweetAlert", "$state", 'md5', 'ipCookie', function ($scope, toaster, $filter, ngTableParams, apiPoint, $http, SweetAlert, $state, md5, ipCookie) {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Certification status update search
|
* Certification status update search / Mark card status update
|
||||||
* by : kdk
|
* by : kdk
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@ -12,13 +12,13 @@ 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.editId = -1;
|
||||||
$scope.setEditId = function (P) {
|
$scope.setEditId = function (P) {
|
||||||
// alert(P);
|
// alert(P);
|
||||||
$scope.editId = P;
|
$scope.editId = P;
|
||||||
}
|
}
|
||||||
$scope.cancel = function() {
|
$scope.cancel = function () {
|
||||||
$scope.editId = -1;
|
$scope.editId = -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -48,7 +48,7 @@ app.controller('certificationStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
|
|||||||
'certificatetype': '',
|
'certificatetype': '',
|
||||||
'certificateNumber': ''
|
'certificateNumber': ''
|
||||||
}
|
}
|
||||||
|
|
||||||
// get University List
|
// get University List
|
||||||
$scope.universityData = '';
|
$scope.universityData = '';
|
||||||
$scope.getUniversityList = function () {
|
$scope.getUniversityList = function () {
|
||||||
@ -69,7 +69,7 @@ app.controller('certificationStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
//get certificates List
|
//get certificates List
|
||||||
$scope.getCertificateList = function () {
|
$scope.getCertificateList = function () {
|
||||||
var getCerfreg = {
|
var getCerfreg = {
|
||||||
@ -106,16 +106,12 @@ app.controller('certificationStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
|
|||||||
$scope.getSearch();
|
$scope.getSearch();
|
||||||
}
|
}
|
||||||
|
|
||||||
// $scope.dealWithItem = function (item) {
|
|
||||||
// alert(JSON.stringify(item));
|
|
||||||
// }
|
|
||||||
|
|
||||||
$scope.searchResultDetails = '';
|
$scope.searchResultDetails = '';
|
||||||
$scope.searchLoading = false;
|
$scope.searchLoading = false;
|
||||||
$scope.searchResultLength = 0;
|
$scope.searchResultLength = 0;
|
||||||
|
// get student list based on search data
|
||||||
$scope.getSearch = function () {
|
$scope.getSearch = function () {
|
||||||
$scope.OpenWindowStatus = false;
|
$scope.OpenWindowStatus = false;
|
||||||
// alert(JSON.stringify($scope.searchData));
|
|
||||||
$scope.searchLoading = true;
|
$scope.searchLoading = true;
|
||||||
var getSearchDetails = {
|
var getSearchDetails = {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
@ -146,15 +142,15 @@ app.controller('certificationStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
|
|||||||
}
|
}
|
||||||
|
|
||||||
// mobile number search functionlity
|
// mobile number search functionlity
|
||||||
$scope.mySearchChangeFunc = function(val) {
|
$scope.mySearchChangeFunc = function (val) {
|
||||||
if( val > 0) {
|
if (val > 0) {
|
||||||
$scope.allSelectedHide = true;
|
$scope.allSelectedHide = true;
|
||||||
$scope.allSelected('undefined');
|
$scope.allSelected('undefined');
|
||||||
$scope.OpenWindowStatus = false;
|
$scope.OpenWindowStatus = false;
|
||||||
} else {
|
} else {
|
||||||
$scope.allSelected('undefined');
|
$scope.allSelected('undefined');
|
||||||
$scope.allSelectedHide = false;
|
$scope.allSelectedHide = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// End: mobile number search functionlity
|
// End: mobile number search functionlity
|
||||||
|
|
||||||
@ -185,10 +181,9 @@ app.controller('certificationStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
|
|||||||
// }
|
// }
|
||||||
|
|
||||||
//--------------------------------------------------->
|
//--------------------------------------------------->
|
||||||
|
|
||||||
// Select one row in a table once
|
// Select one row in a table once
|
||||||
$scope.setOneSelect = function (value) {
|
$scope.setOneSelect = function (value) {
|
||||||
// alert(value.Selected);
|
|
||||||
angular.forEach($scope.searchResultDetails, function (item) {
|
angular.forEach($scope.searchResultDetails, function (item) {
|
||||||
item.Selected = value;
|
item.Selected = value;
|
||||||
});
|
});
|
||||||
@ -199,20 +194,29 @@ app.controller('certificationStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
|
|||||||
|
|
||||||
// End: select all or individual functionality
|
// End: select all or individual functionality
|
||||||
|
|
||||||
|
// unselect all the items
|
||||||
|
$scope.unSelect = function () {
|
||||||
|
angular.forEach($scope.searchResultDetails, function (item) {
|
||||||
|
item.Selected = false;
|
||||||
|
});
|
||||||
|
$scope.openUpdateWind();
|
||||||
|
}
|
||||||
|
|
||||||
// open popup window onselct checkbox
|
|
||||||
|
// open popup window onselct checkbox or close unselect all the items
|
||||||
$scope.OpenWindowStatus = false;
|
$scope.OpenWindowStatus = false;
|
||||||
$scope.openUpdateWind = function () {
|
$scope.openUpdateWind = function () {
|
||||||
var ItemsSelected = $scope.searchResultDetails.filter(function (item) {
|
var ItemsSelected = $scope.searchResultDetails.filter(function (item) {
|
||||||
if (item.Selected === true) { return true; }
|
if (item.Selected === true) { return true; }
|
||||||
});
|
});
|
||||||
const courseLocal = $scope.searchData.Course;
|
|
||||||
$scope.getSemYearList(courseLocal);
|
if (ItemsSelected.length !== 0) {
|
||||||
$scope.getStatusList();
|
const courseLocal = ItemsSelected[0].CourseID;
|
||||||
// alert($scope.searchData.Course);
|
const selectedStuId = ItemsSelected[0].StudentID;
|
||||||
if (ItemsSelected.length) {
|
$scope.getSemYearList(courseLocal, selectedStuId);
|
||||||
|
$scope.getStatusList();
|
||||||
$scope.OpenWindowStatus = true;
|
$scope.OpenWindowStatus = true;
|
||||||
$scope.myStatusModel = {
|
$scope.myStatusModel = {
|
||||||
'semYear': '',
|
'semYear': '',
|
||||||
'staus': '',
|
'staus': '',
|
||||||
'dateOn': '',
|
'dateOn': '',
|
||||||
@ -249,7 +253,7 @@ app.controller('certificationStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
|
|||||||
}
|
}
|
||||||
|
|
||||||
// get Sem/Year based on the course select
|
// get Sem/Year based on the course select
|
||||||
$scope.getSemYearList = function (courseID) {
|
$scope.getSemYearList = function (courseID, StuId) {
|
||||||
$scope.semYearList = '';
|
$scope.semYearList = '';
|
||||||
if (courseID !== '' && courseID !== undefined) {
|
if (courseID !== '' && courseID !== undefined) {
|
||||||
var getSemYear = {
|
var getSemYear = {
|
||||||
@ -259,7 +263,8 @@ app.controller('certificationStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
|
|||||||
'Content-Type': 'application/json'
|
'Content-Type': 'application/json'
|
||||||
},
|
},
|
||||||
data: {
|
data: {
|
||||||
data: courseID
|
data: courseID,
|
||||||
|
stuFor: StuId
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
$http(getSemYear).then(function (response) {
|
$http(getSemYear).then(function (response) {
|
||||||
@ -275,23 +280,6 @@ app.controller('certificationStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// $scope.updateItems = function () {
|
|
||||||
// var studentForUpdate = [];
|
|
||||||
// var ItemsSelected = $scope.searchResultDetails.filter(function (item) {
|
|
||||||
// if (item.Selected === true) {
|
|
||||||
// let getStudentID = new getStudentForUpdateDetails(item.StudentID);
|
|
||||||
// studentForUpdate.push(getStudentID);
|
|
||||||
// return true;
|
|
||||||
// }
|
|
||||||
// });
|
|
||||||
// function getStudentForUpdateDetails(id) {
|
|
||||||
// this.iD = id;
|
|
||||||
// }
|
|
||||||
// alert(JSON.stringify($scope.myStatusModel));
|
|
||||||
// alert(JSON.stringify(studentForUpdate));
|
|
||||||
// }
|
|
||||||
|
|
||||||
// Update the status For Certification
|
// Update the status For Certification
|
||||||
$scope.statusUpdate = {
|
$scope.statusUpdate = {
|
||||||
submit: function (form, myStatusModel) {
|
submit: function (form, myStatusModel) {
|
||||||
@ -311,7 +299,7 @@ app.controller('certificationStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
|
|||||||
angular.element('.ng-invalid[name=' + firstError + ']').focus();
|
angular.element('.ng-invalid[name=' + firstError + ']').focus();
|
||||||
// swal("The form cannot be submitted because it contains validation errors!", "Errors are marked with a red, dashed border!", "error");
|
// swal("The form cannot be submitted because it contains validation errors!", "Errors are marked with a red, dashed border!", "error");
|
||||||
} else {
|
} else {
|
||||||
$scope.disableButton = true;
|
$scope.disableButton = true;
|
||||||
var studentForUpdate = [];
|
var studentForUpdate = [];
|
||||||
let formate = "dd-MM-yyyy";
|
let formate = "dd-MM-yyyy";
|
||||||
$scope.myStatusModel.dateOn = $filter('date')(new Date($scope.myStatusModel.dateOn), formate);
|
$scope.myStatusModel.dateOn = $filter('date')(new Date($scope.myStatusModel.dateOn), formate);
|
||||||
@ -322,7 +310,6 @@ app.controller('certificationStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
// alert(JSON.stringify(studentForUpdate));
|
|
||||||
function getStudentForUpdateDetails(id) {
|
function getStudentForUpdateDetails(id) {
|
||||||
this.StudentID = id;
|
this.StudentID = id;
|
||||||
this.CourseID = $scope.myStatusModel.semYear;
|
this.CourseID = $scope.myStatusModel.semYear;
|
||||||
@ -334,9 +321,6 @@ app.controller('certificationStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
|
|||||||
this.CertificateType = $scope.myStatusModel.certificatetype;
|
this.CertificateType = $scope.myStatusModel.certificatetype;
|
||||||
this.CertificateNumber = $scope.myStatusModel.certificateNumber;
|
this.CertificateNumber = $scope.myStatusModel.certificateNumber;
|
||||||
}
|
}
|
||||||
// alert(JSON.stringify($scope.myStatusModel));
|
|
||||||
// alert(JSON.stringify(studentForUpdate));
|
|
||||||
|
|
||||||
var updateCertificateStatus = {
|
var updateCertificateStatus = {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
url: apiPoint.url + 'updateCertificationStatus/',
|
url: apiPoint.url + 'updateCertificationStatus/',
|
||||||
@ -345,45 +329,44 @@ app.controller('certificationStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
|
|||||||
},
|
},
|
||||||
data: {
|
data: {
|
||||||
data: studentForUpdate,
|
data: studentForUpdate,
|
||||||
requestDetails : localDetails
|
requestDetails: localDetails
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
$http(updateCertificateStatus).then(function (response) {
|
$http(updateCertificateStatus).then(function (response) {
|
||||||
if (response.data.addStatus) {
|
if (response.data.addStatus) {
|
||||||
swal("Success!", response.data.message, "success");
|
swal("Success!", response.data.message, "success");
|
||||||
$scope.disableButton = false;
|
$scope.disableButton = false;
|
||||||
// for success state
|
// for success state
|
||||||
// $scope.allSelected('undefined');
|
// $scope.allSelected('undefined');
|
||||||
angular.forEach($scope.searchResultDetails, function (item) {
|
angular.forEach($scope.searchResultDetails, function (item) {
|
||||||
item.Selected = false;
|
item.Selected = false;
|
||||||
});
|
});
|
||||||
$scope.OpenWindowStatus = false;
|
$scope.OpenWindowStatus = false;
|
||||||
} else {
|
} else {
|
||||||
swal("Failed!", response.data.message, "error");
|
swal("Failed!", response.data.message, "error");
|
||||||
$scope.disableButton = false;
|
$scope.disableButton = false;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
reset: function (form) {
|
reset: function (form) {
|
||||||
form.$setPristine(true);
|
form.$setPristine(true);
|
||||||
$scope.myStatusModel = {
|
$scope.myStatusModel = {
|
||||||
'semYear': '',
|
'semYear': '',
|
||||||
'staus': '',
|
'staus': '',
|
||||||
'dateOn': '',
|
'dateOn': '',
|
||||||
'comment': '',
|
'comment': '',
|
||||||
'certificatetype': '',
|
'certificatetype': '',
|
||||||
'certificateNumber': ''
|
'certificateNumber': ''
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// check unchek for table values
|
// check unchek for table values
|
||||||
|
|
||||||
$scope.prevStatusListForStudentCourse = '';
|
$scope.prevStatusListForStudentCourse = '';
|
||||||
// get previous status details for the student
|
// get previous status details for the student
|
||||||
$scope.getPrevStatus = function(p) {
|
$scope.getPrevStatus = function (p) {
|
||||||
// alert(JSON.stringify(p));
|
|
||||||
$scope.prevStatusListForStudentCourseLoading = true;
|
$scope.prevStatusListForStudentCourseLoading = true;
|
||||||
$scope.prevStatusListForStudentCourseNoRecord = false;
|
$scope.prevStatusListForStudentCourseNoRecord = false;
|
||||||
$scope.prevStatusListForStudentCourse = '';
|
$scope.prevStatusListForStudentCourse = '';
|
||||||
@ -395,7 +378,7 @@ app.controller('certificationStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
|
|||||||
},
|
},
|
||||||
data: {
|
data: {
|
||||||
statusFor: localUpdateStatus,
|
statusFor: localUpdateStatus,
|
||||||
getDetailsFor: { "student": p.StudentID, "CourseID": p.CourseID} ,
|
getDetailsFor: { "student": p.StudentID, "CourseID": p.CourseID },
|
||||||
data: localDetail
|
data: localDetail
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@ -411,25 +394,4 @@ app.controller('certificationStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// $scope.CheckUncheckAll = function () {
|
|
||||||
|
|
||||||
// for (var i = 0; i < $scope.searchResultDetails.length; i++) {
|
|
||||||
// $scope.searchResultDetails[i].Selected = $scope.IsAllChecked;
|
|
||||||
// }
|
|
||||||
// };
|
|
||||||
|
|
||||||
// $scope.CheckUncheckHeader = function () {
|
|
||||||
// $scope.IsAllChecked = true;
|
|
||||||
// for (var i = 0; i < $scope.searchResultDetails.length; i++) {
|
|
||||||
// if (!$scope.searchResultDetails[i].Selected) {
|
|
||||||
// $scope.IsAllChecked = false;
|
|
||||||
// break;
|
|
||||||
// }
|
|
||||||
// };
|
|
||||||
// };
|
|
||||||
|
|
||||||
// $scope.CheckUncheckHeader();
|
|
||||||
}]);
|
}]);
|
||||||
|
|||||||
@ -14,6 +14,7 @@ app.controller('daybookCtrl', ["$scope", "$rootScope", "toaster", "$filter", "ng
|
|||||||
"dateTo": ""
|
"dateTo": ""
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// get the data while page loading functions goes here
|
||||||
$scope.init = function () {
|
$scope.init = function () {
|
||||||
$scope.currentDate = new Date();
|
$scope.currentDate = new Date();
|
||||||
var formate = "dd-MM-yyyy";
|
var formate = "dd-MM-yyyy";
|
||||||
@ -23,8 +24,8 @@ app.controller('daybookCtrl', ["$scope", "$rootScope", "toaster", "$filter", "ng
|
|||||||
$scope.getIncomeExpenseType_Status();
|
$scope.getIncomeExpenseType_Status();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// change from date, update and call search functionality
|
||||||
$scope.changeDate = function () {
|
$scope.changeDate = function () {
|
||||||
|
|
||||||
if($scope.searchData.date !== undefined) {
|
if($scope.searchData.date !== undefined) {
|
||||||
var formate = "dd-MM-yyyy";
|
var formate = "dd-MM-yyyy";
|
||||||
$scope.searchData.date = $filter('date')(new Date($scope.searchData.date), formate);
|
$scope.searchData.date = $filter('date')(new Date($scope.searchData.date), formate);
|
||||||
@ -35,8 +36,8 @@ app.controller('daybookCtrl', ["$scope", "$rootScope", "toaster", "$filter", "ng
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// change to date, update and call search functionality
|
||||||
$scope.changeToDate = function () {
|
$scope.changeToDate = function () {
|
||||||
|
|
||||||
if($scope.searchData.dateTo !== undefined) {
|
if($scope.searchData.dateTo !== undefined) {
|
||||||
var formate = "dd-MM-yyyy";
|
var formate = "dd-MM-yyyy";
|
||||||
$scope.searchData.dateTo = $filter('date')(new Date($scope.searchData.dateTo), formate);
|
$scope.searchData.dateTo = $filter('date')(new Date($scope.searchData.dateTo), formate);
|
||||||
@ -47,17 +48,16 @@ app.controller('daybookCtrl', ["$scope", "$rootScope", "toaster", "$filter", "ng
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// sorting function for table params
|
// sorting function for table params
|
||||||
$scope.sort = function (keyname) {
|
$scope.sort = function (keyname) {
|
||||||
// alert();
|
|
||||||
$scope.sortKey = keyname; //set the sortKey to the param passed
|
$scope.sortKey = keyname; //set the sortKey to the param passed
|
||||||
$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.noRecordFound = true;
|
$scope.noRecordFound = true;
|
||||||
|
$scope.dataLength = 0;
|
||||||
|
// get day book type name list
|
||||||
$scope.getDayBookList = function () {
|
$scope.getDayBookList = function () {
|
||||||
|
|
||||||
var getDatBookListDetails = {
|
var getDatBookListDetails = {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
url: apiPoint.url + 'getDayBookDetails/',
|
url: apiPoint.url + 'getDayBookDetails/',
|
||||||
@ -73,6 +73,7 @@ app.controller('daybookCtrl', ["$scope", "$rootScope", "toaster", "$filter", "ng
|
|||||||
if (response.data.dayBookListStatus) {
|
if (response.data.dayBookListStatus) {
|
||||||
|
|
||||||
$scope.data = response.data.dayBookListDetails;
|
$scope.data = response.data.dayBookListDetails;
|
||||||
|
$scope.dataLength = $scope.data.length;
|
||||||
if ($scope.data.length !== 0) {
|
if ($scope.data.length !== 0) {
|
||||||
$scope.noRecordFound = false;
|
$scope.noRecordFound = false;
|
||||||
} else {
|
} else {
|
||||||
@ -86,6 +87,7 @@ app.controller('daybookCtrl', ["$scope", "$rootScope", "toaster", "$filter", "ng
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// income expense type status list
|
||||||
$scope.getIncomeExpenseType_Status = function () {
|
$scope.getIncomeExpenseType_Status = function () {
|
||||||
var getIncomeExpenseType = {
|
var getIncomeExpenseType = {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
@ -106,6 +108,7 @@ app.controller('daybookCtrl', ["$scope", "$rootScope", "toaster", "$filter", "ng
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// parse the income and expense type from the list
|
||||||
$scope.getType = function (type) {
|
$scope.getType = function (type) {
|
||||||
$scope.getIncomeTypes = $scope.incomeExpenseType.filter(function (val) {
|
$scope.getIncomeTypes = $scope.incomeExpenseType.filter(function (val) {
|
||||||
return val.TypeID === 'I002' ? 1 : 0;
|
return val.TypeID === 'I002' ? 1 : 0;
|
||||||
@ -132,7 +135,10 @@ app.controller('daybookCtrl', ["$scope", "$rootScope", "toaster", "$filter", "ng
|
|||||||
"type": "",
|
"type": "",
|
||||||
"amount": "",
|
"amount": "",
|
||||||
"status": "",
|
"status": "",
|
||||||
"description": ""
|
"description": "",
|
||||||
|
"paidTo": "",
|
||||||
|
"description_paid": "",
|
||||||
|
"voucherNumber": ""
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -143,7 +149,10 @@ app.controller('daybookCtrl', ["$scope", "$rootScope", "toaster", "$filter", "ng
|
|||||||
"type": "",
|
"type": "",
|
||||||
"amount": "",
|
"amount": "",
|
||||||
"status": "",
|
"status": "",
|
||||||
"description": ""
|
"description": "",
|
||||||
|
"paidTo": "",
|
||||||
|
"description_paid": "",
|
||||||
|
"voucherNumber": ""
|
||||||
}
|
}
|
||||||
|
|
||||||
$scope.copyModel = function (p) {
|
$scope.copyModel = function (p) {
|
||||||
@ -155,10 +164,14 @@ app.controller('daybookCtrl', ["$scope", "$rootScope", "toaster", "$filter", "ng
|
|||||||
"type": p.Type,
|
"type": p.Type,
|
||||||
"amount": p.Amount,
|
"amount": p.Amount,
|
||||||
"status": p.Status,
|
"status": p.Status,
|
||||||
"description": p.Description
|
"description": p.Description,
|
||||||
|
"paidTo": p.PaidTo,
|
||||||
|
"description_paid": p.PaidDescription,
|
||||||
|
"voucherNumber": p.VoucherNumber
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// delete the income/expense list row
|
||||||
$scope.deleEditEntry = function (id) {
|
$scope.deleEditEntry = function (id) {
|
||||||
swal({
|
swal({
|
||||||
title: "Are you sure?",
|
title: "Are you sure?",
|
||||||
@ -202,9 +215,13 @@ app.controller('daybookCtrl', ["$scope", "$rootScope", "toaster", "$filter", "ng
|
|||||||
"type": "",
|
"type": "",
|
||||||
"amount": "",
|
"amount": "",
|
||||||
"status": "",
|
"status": "",
|
||||||
"description": ""
|
"description": "",
|
||||||
|
"paidTo": "",
|
||||||
|
"description_paid": "",
|
||||||
|
"voucherNumber": ""
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// add a new daybook entry
|
||||||
$scope.daybookAdd = {
|
$scope.daybookAdd = {
|
||||||
submit: function (form, myModelAdd) {
|
submit: function (form, myModelAdd) {
|
||||||
var firstError = null;
|
var firstError = null;
|
||||||
@ -251,6 +268,7 @@ app.controller('daybookCtrl', ["$scope", "$rootScope", "toaster", "$filter", "ng
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// update a daybook entry details
|
||||||
$scope.daybookeditUpdate = {
|
$scope.daybookeditUpdate = {
|
||||||
submit: function (form, myModel) {
|
submit: function (form, myModel) {
|
||||||
var firstError = null;
|
var firstError = null;
|
||||||
|
|||||||
@ -11,23 +11,13 @@ app.controller('daybookadminCtrl', ["$scope", "$rootScope", "toaster", "$filter"
|
|||||||
$scope.localTypeViewAdmin = false;
|
$scope.localTypeViewAdmin = false;
|
||||||
$scope.localTypeViewSuperAdmin = false;
|
$scope.localTypeViewSuperAdmin = false;
|
||||||
|
|
||||||
// $scope.init = function () {
|
$scope.searchData = {
|
||||||
// const LOCALTYPE = localDetail.localType;
|
|
||||||
// if (LOCALTYPE === 'R003') {
|
|
||||||
// $scope.localTypeViewAdmin = true;
|
|
||||||
// $scope.getDayBookList();
|
|
||||||
// } else {
|
|
||||||
// $scope.localTypeViewSuperAdmin = true;
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
|
|
||||||
$scope.searchData = {
|
|
||||||
"date": "",
|
"date": "",
|
||||||
"dateTo": ""
|
"dateTo": ""
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// load functionality when page get loaded
|
||||||
$scope.init = function () {
|
$scope.init = function () {
|
||||||
|
|
||||||
const LOCALTYPE = localDetail.localType;
|
const LOCALTYPE = localDetail.localType;
|
||||||
if (LOCALTYPE === 'R003') {
|
if (LOCALTYPE === 'R003') {
|
||||||
$scope.showTheRefValue = 'I001';
|
$scope.showTheRefValue = 'I001';
|
||||||
@ -51,9 +41,8 @@ app.controller('daybookadminCtrl', ["$scope", "$rootScope", "toaster", "$filter"
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// change from date, update and call search functionality
|
||||||
$scope.changeDate = function () {
|
$scope.changeDate = function () {
|
||||||
|
|
||||||
if($scope.searchData.date !== undefined) {
|
if($scope.searchData.date !== undefined) {
|
||||||
var formate = "dd-MM-yyyy";
|
var formate = "dd-MM-yyyy";
|
||||||
$scope.searchData.date = $filter('date')(new Date($scope.searchData.date), formate);
|
$scope.searchData.date = $filter('date')(new Date($scope.searchData.date), formate);
|
||||||
@ -64,8 +53,8 @@ app.controller('daybookadminCtrl', ["$scope", "$rootScope", "toaster", "$filter"
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// change to date, update and call search functionality
|
||||||
$scope.changeToDate = function () {
|
$scope.changeToDate = function () {
|
||||||
|
|
||||||
if($scope.searchData.dateTo !== undefined) {
|
if($scope.searchData.dateTo !== undefined) {
|
||||||
var formate = "dd-MM-yyyy";
|
var formate = "dd-MM-yyyy";
|
||||||
$scope.searchData.dateTo = $filter('date')(new Date($scope.searchData.dateTo), formate);
|
$scope.searchData.dateTo = $filter('date')(new Date($scope.searchData.dateTo), formate);
|
||||||
@ -83,6 +72,7 @@ app.controller('daybookadminCtrl', ["$scope", "$rootScope", "toaster", "$filter"
|
|||||||
$scope.reverse = !$scope.reverse; //if true make it false and vice versa
|
$scope.reverse = !$scope.reverse; //if true make it false and vice versa
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// income expense type status list
|
||||||
$scope.getIncomeExpenseType_Status = function () {
|
$scope.getIncomeExpenseType_Status = function () {
|
||||||
var getIncomeExpenseType = {
|
var getIncomeExpenseType = {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
@ -103,12 +93,11 @@ app.controller('daybookadminCtrl', ["$scope", "$rootScope", "toaster", "$filter"
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
$scope.noRecordFound = true;
|
$scope.noRecordFound = true;
|
||||||
|
$scope.dataLengthIncome = 0;
|
||||||
|
$scope.dataLengthExpense = 0;
|
||||||
|
// day book entry list
|
||||||
$scope.getDayBookList = function () {
|
$scope.getDayBookList = function () {
|
||||||
|
|
||||||
var getDatBookListDetails = {
|
var getDatBookListDetails = {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
url: apiPoint.url + 'getDayBookDetails/',
|
url: apiPoint.url + 'getDayBookDetails/',
|
||||||
@ -122,7 +111,6 @@ app.controller('daybookadminCtrl', ["$scope", "$rootScope", "toaster", "$filter"
|
|||||||
};
|
};
|
||||||
$http(getDatBookListDetails).then(function (response) {
|
$http(getDatBookListDetails).then(function (response) {
|
||||||
if (response.data.dayBookListStatus) {
|
if (response.data.dayBookListStatus) {
|
||||||
|
|
||||||
// $scope.data = response.data.dayBookListDetails;
|
// $scope.data = response.data.dayBookListDetails;
|
||||||
let datas = response.data.dayBookListDetails;
|
let datas = response.data.dayBookListDetails;
|
||||||
let searchResultDetailsBef = datas.filter(val => {
|
let searchResultDetailsBef = datas.filter(val => {
|
||||||
@ -131,14 +119,15 @@ app.controller('daybookadminCtrl', ["$scope", "$rootScope", "toaster", "$filter"
|
|||||||
$scope.IncomeData = datas.filter(val => {
|
$scope.IncomeData = datas.filter(val => {
|
||||||
return val.Name == 'I002' ? 1 : 0;
|
return val.Name == 'I002' ? 1 : 0;
|
||||||
});
|
});
|
||||||
|
$scope.dataLengthIncome = $scope.IncomeData.length;
|
||||||
const filterAddSelect = searchResultDetailsBef.filter(val => {
|
const filterAddSelect = searchResultDetailsBef.filter(val => {
|
||||||
val['Selected'] = false;
|
val['Selected'] = false;
|
||||||
return val;
|
return val;
|
||||||
});
|
});
|
||||||
$scope.searchResultDetails = filterAddSelect;
|
$scope.searchResultDetails = filterAddSelect;
|
||||||
|
$scope.dataLengthExpense = $scope.searchResultDetails.length;
|
||||||
// alert(JSON.stringify($scope.searchResultDetails));
|
// alert(JSON.stringify($scope.searchResultDetails));
|
||||||
$scope.searchResultLength = Object.keys($scope.searchResultDetails).length;
|
$scope.searchResultLength = Object.keys($scope.searchResultDetails).length;
|
||||||
|
|
||||||
// if ($scope.data.length !== 0) {
|
// if ($scope.data.length !== 0) {
|
||||||
// $scope.OpenWindowStatus = false;
|
// $scope.OpenWindowStatus = false;
|
||||||
// $scope.noRecordFound = false;
|
// $scope.noRecordFound = false;
|
||||||
@ -154,20 +143,7 @@ app.controller('daybookadminCtrl', ["$scope", "$rootScope", "toaster", "$filter"
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// $scope.getDayBookList = function() {
|
|
||||||
// let searchResultDetailsBef = $scope.data;
|
|
||||||
// const filterAddSelect = searchResultDetailsBef.filter(val => {
|
|
||||||
// val['Selected'] = false;
|
|
||||||
// return val;
|
|
||||||
// });
|
|
||||||
// $scope.searchResultDetails = filterAddSelect;
|
|
||||||
// $scope.searchResultLength = Object.keys($scope.searchResultDetails).length;
|
|
||||||
// }
|
|
||||||
|
|
||||||
|
|
||||||
// select all or individual functionality
|
// select all or individual functionality
|
||||||
|
|
||||||
var getAllSelected = function () {
|
var getAllSelected = function () {
|
||||||
var selectedItems = $scope.searchResultDetails.filter(function (item) {
|
var selectedItems = $scope.searchResultDetails.filter(function (item) {
|
||||||
return item.Selected;
|
return item.Selected;
|
||||||
@ -198,6 +174,7 @@ app.controller('daybookadminCtrl', ["$scope", "$rootScope", "toaster", "$filter"
|
|||||||
// End: select all or individual functionality
|
// End: select all or individual functionality
|
||||||
|
|
||||||
$scope.OpenWindowStatus = false;
|
$scope.OpenWindowStatus = false;
|
||||||
|
// open popup window when checkbox get selected / close popup window uncheck the selected items
|
||||||
$scope.openUpdateWind = function () {
|
$scope.openUpdateWind = function () {
|
||||||
var ItemsSelected = $scope.searchResultDetails.filter(function (item) {
|
var ItemsSelected = $scope.searchResultDetails.filter(function (item) {
|
||||||
if (item.Selected === true) { return true; }
|
if (item.Selected === true) { return true; }
|
||||||
@ -215,6 +192,7 @@ app.controller('daybookadminCtrl', ["$scope", "$rootScope", "toaster", "$filter"
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// update the status details
|
||||||
$scope.statusUpdate = {
|
$scope.statusUpdate = {
|
||||||
submit: function (form, myStatusModel) {
|
submit: function (form, myStatusModel) {
|
||||||
var firstError = null;
|
var firstError = null;
|
||||||
@ -246,8 +224,6 @@ app.controller('daybookadminCtrl', ["$scope", "$rootScope", "toaster", "$filter"
|
|||||||
this.ListCodeStatus = $scope.myStatusModel.staus;
|
this.ListCodeStatus = $scope.myStatusModel.staus;
|
||||||
this.comments = $scope.myStatusModel.description;
|
this.comments = $scope.myStatusModel.description;
|
||||||
}
|
}
|
||||||
// alert(JSON.stringify($scope.myStatusModel));
|
|
||||||
// alert(JSON.stringify(selectedItems));
|
|
||||||
var updateStudyMaterial = {
|
var updateStudyMaterial = {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
url: apiPoint.url + 'updateDayBookStatusAdmin/',
|
url: apiPoint.url + 'updateDayBookStatusAdmin/',
|
||||||
@ -320,9 +296,6 @@ app.controller('daybookadminCtrl', ["$scope", "$rootScope", "toaster", "$filter"
|
|||||||
"description": "income type income type income type"
|
"description": "income type income type income type"
|
||||||
}];
|
}];
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
$scope.incomeExpenseType = [{
|
$scope.incomeExpenseType = [{
|
||||||
"type_id": 1,
|
"type_id": 1,
|
||||||
"type": "Income",
|
"type": "Income",
|
||||||
@ -412,6 +385,7 @@ app.controller('daybookadminCtrl', ["$scope", "$rootScope", "toaster", "$filter"
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// delete the entry row from the daybook list
|
||||||
$scope.deleEditEntry = function (id) {
|
$scope.deleEditEntry = function (id) {
|
||||||
swal({
|
swal({
|
||||||
title: "Are you sure?",
|
title: "Are you sure?",
|
||||||
@ -451,6 +425,7 @@ app.controller('daybookadminCtrl', ["$scope", "$rootScope", "toaster", "$filter"
|
|||||||
"description": ""
|
"description": ""
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// add a new entry to the day book list
|
||||||
$scope.daybookAdd = {
|
$scope.daybookAdd = {
|
||||||
submit: function (form, myModelAdd) {
|
submit: function (form, myModelAdd) {
|
||||||
var firstError = null;
|
var firstError = null;
|
||||||
@ -477,8 +452,7 @@ app.controller('daybookadminCtrl', ["$scope", "$rootScope", "toaster", "$filter"
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// update daybook entry data from the list
|
||||||
|
|
||||||
$scope.daybookeditUpdate = {
|
$scope.daybookeditUpdate = {
|
||||||
submit: function (form, myModel) {
|
submit: function (form, myModel) {
|
||||||
var firstError = null;
|
var firstError = null;
|
||||||
|
|||||||
@ -11,23 +11,13 @@ app.controller('daybooksuperadminCtrl', ["$scope", "$rootScope", "toaster", "$fi
|
|||||||
$scope.localTypeViewAdmin = false;
|
$scope.localTypeViewAdmin = false;
|
||||||
$scope.localTypeViewSuperAdmin = false;
|
$scope.localTypeViewSuperAdmin = false;
|
||||||
|
|
||||||
// $scope.init = function () {
|
$scope.searchData = {
|
||||||
// const LOCALTYPE = localDetail.localType;
|
|
||||||
// if (LOCALTYPE === 'R003') {
|
|
||||||
// $scope.localTypeViewAdmin = true;
|
|
||||||
// $scope.getDayBookList();
|
|
||||||
// } else {
|
|
||||||
// $scope.localTypeViewSuperAdmin = true;
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
|
|
||||||
$scope.searchData = {
|
|
||||||
"date": "",
|
"date": "",
|
||||||
"dateTo": ""
|
"dateTo": ""
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// get details functionality when page get loaded
|
||||||
$scope.init = function () {
|
$scope.init = function () {
|
||||||
|
|
||||||
const LOCALTYPE = localDetail.localType;
|
const LOCALTYPE = localDetail.localType;
|
||||||
if(LOCALTYPE === 'R004') {
|
if(LOCALTYPE === 'R004') {
|
||||||
$scope.localTypeViewSuperAdmin = true;
|
$scope.localTypeViewSuperAdmin = true;
|
||||||
@ -44,8 +34,8 @@ app.controller('daybooksuperadminCtrl', ["$scope", "$rootScope", "toaster", "$fi
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$scope.changeDate = function () {
|
// change from date, update and call search functionality
|
||||||
|
$scope.changeDate = function () {
|
||||||
if($scope.searchData.date !== undefined) {
|
if($scope.searchData.date !== undefined) {
|
||||||
var formate = "dd-MM-yyyy";
|
var formate = "dd-MM-yyyy";
|
||||||
$scope.searchData.date = $filter('date')(new Date($scope.searchData.date), formate);
|
$scope.searchData.date = $filter('date')(new Date($scope.searchData.date), formate);
|
||||||
@ -56,8 +46,8 @@ app.controller('daybooksuperadminCtrl', ["$scope", "$rootScope", "toaster", "$fi
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// change to date, update and call search functionality
|
||||||
$scope.changeToDate = function () {
|
$scope.changeToDate = function () {
|
||||||
|
|
||||||
if($scope.searchData.dateTo !== undefined) {
|
if($scope.searchData.dateTo !== undefined) {
|
||||||
var formate = "dd-MM-yyyy";
|
var formate = "dd-MM-yyyy";
|
||||||
$scope.searchData.dateTo = $filter('date')(new Date($scope.searchData.dateTo), formate);
|
$scope.searchData.dateTo = $filter('date')(new Date($scope.searchData.dateTo), formate);
|
||||||
@ -70,12 +60,11 @@ app.controller('daybooksuperadminCtrl', ["$scope", "$rootScope", "toaster", "$fi
|
|||||||
|
|
||||||
// sorting function for table params
|
// sorting function for table params
|
||||||
$scope.sort = function (keyname) {
|
$scope.sort = function (keyname) {
|
||||||
// alert();
|
|
||||||
$scope.sortKey = keyname; //set the sortKey to the param passed
|
$scope.sortKey = keyname; //set the sortKey to the param passed
|
||||||
$scope.reverse = !$scope.reverse; //if true make it false and vice versa
|
$scope.reverse = !$scope.reverse; //if true make it false and vice versa
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// income expense type status list
|
||||||
$scope.getIncomeExpenseType_Status = function () {
|
$scope.getIncomeExpenseType_Status = function () {
|
||||||
var getIncomeExpenseType = {
|
var getIncomeExpenseType = {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
@ -99,7 +88,9 @@ app.controller('daybooksuperadminCtrl', ["$scope", "$rootScope", "toaster", "$fi
|
|||||||
|
|
||||||
|
|
||||||
$scope.noRecordFound = true;
|
$scope.noRecordFound = true;
|
||||||
|
$scope.dataLengthIncome = 0;
|
||||||
|
$scope.dataLengthExpense = 0;
|
||||||
|
// day book entry list
|
||||||
$scope.getDayBookList = function () {
|
$scope.getDayBookList = function () {
|
||||||
|
|
||||||
var getDatBookListDetails = {
|
var getDatBookListDetails = {
|
||||||
@ -124,11 +115,13 @@ app.controller('daybooksuperadminCtrl', ["$scope", "$rootScope", "toaster", "$fi
|
|||||||
$scope.IncomeData = datas.filter(val => {
|
$scope.IncomeData = datas.filter(val => {
|
||||||
return val.Name == 'I002' ? 1 : 0;
|
return val.Name == 'I002' ? 1 : 0;
|
||||||
});
|
});
|
||||||
|
$scope.dataLengthIncome = $scope.IncomeData.length;
|
||||||
const filterAddSelect = searchResultDetailsBef.filter(val => {
|
const filterAddSelect = searchResultDetailsBef.filter(val => {
|
||||||
val['Selected'] = false;
|
val['Selected'] = false;
|
||||||
return val;
|
return val;
|
||||||
});
|
});
|
||||||
$scope.searchResultDetails = filterAddSelect;
|
$scope.searchResultDetails = filterAddSelect;
|
||||||
|
$scope.dataLengthExpense = $scope.searchResultDetails.length;
|
||||||
// alert(JSON.stringify($scope.searchResultDetails));
|
// alert(JSON.stringify($scope.searchResultDetails));
|
||||||
$scope.searchResultLength = Object.keys($scope.searchResultDetails).length;
|
$scope.searchResultLength = Object.keys($scope.searchResultDetails).length;
|
||||||
|
|
||||||
@ -148,17 +141,6 @@ app.controller('daybooksuperadminCtrl', ["$scope", "$rootScope", "toaster", "$fi
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// $scope.getDayBookList = function() {
|
|
||||||
// let searchResultDetailsBef = $scope.data;
|
|
||||||
// const filterAddSelect = searchResultDetailsBef.filter(val => {
|
|
||||||
// val['Selected'] = false;
|
|
||||||
// return val;
|
|
||||||
// });
|
|
||||||
// $scope.searchResultDetails = filterAddSelect;
|
|
||||||
// $scope.searchResultLength = Object.keys($scope.searchResultDetails).length;
|
|
||||||
// }
|
|
||||||
|
|
||||||
|
|
||||||
// select all or individual functionality
|
// select all or individual functionality
|
||||||
|
|
||||||
var getAllSelected = function () {
|
var getAllSelected = function () {
|
||||||
@ -191,6 +173,7 @@ app.controller('daybooksuperadminCtrl', ["$scope", "$rootScope", "toaster", "$fi
|
|||||||
// End: select all or individual functionality
|
// End: select all or individual functionality
|
||||||
|
|
||||||
$scope.OpenWindowStatus = false;
|
$scope.OpenWindowStatus = false;
|
||||||
|
// open popup window when checkbox get selected / close popup window uncheck the selected items
|
||||||
$scope.openUpdateWind = function () {
|
$scope.openUpdateWind = function () {
|
||||||
var ItemsSelected = $scope.searchResultDetails.filter(function (item) {
|
var ItemsSelected = $scope.searchResultDetails.filter(function (item) {
|
||||||
if (item.Selected === true) { return true; }
|
if (item.Selected === true) { return true; }
|
||||||
@ -208,6 +191,7 @@ app.controller('daybooksuperadminCtrl', ["$scope", "$rootScope", "toaster", "$fi
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// update the status details
|
||||||
$scope.statusUpdate = {
|
$scope.statusUpdate = {
|
||||||
submit: function (form, myStatusModel) {
|
submit: function (form, myStatusModel) {
|
||||||
var firstError = null;
|
var firstError = null;
|
||||||
@ -404,7 +388,8 @@ app.controller('daybooksuperadminCtrl', ["$scope", "$rootScope", "toaster", "$fi
|
|||||||
"description": p.description
|
"description": p.description
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// delete the entry row from the daybook list
|
||||||
$scope.deleEditEntry = function (id) {
|
$scope.deleEditEntry = function (id) {
|
||||||
swal({
|
swal({
|
||||||
title: "Are you sure?",
|
title: "Are you sure?",
|
||||||
@ -444,6 +429,7 @@ app.controller('daybooksuperadminCtrl', ["$scope", "$rootScope", "toaster", "$fi
|
|||||||
"description": ""
|
"description": ""
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// add a new entry to the day book list
|
||||||
$scope.daybookAdd = {
|
$scope.daybookAdd = {
|
||||||
submit: function (form, myModelAdd) {
|
submit: function (form, myModelAdd) {
|
||||||
var firstError = null;
|
var firstError = null;
|
||||||
@ -470,8 +456,7 @@ app.controller('daybooksuperadminCtrl', ["$scope", "$rootScope", "toaster", "$fi
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// update daybook entry data from the list
|
||||||
|
|
||||||
$scope.daybookeditUpdate = {
|
$scope.daybookeditUpdate = {
|
||||||
submit: function (form, myModel) {
|
submit: function (form, myModel) {
|
||||||
var firstError = null;
|
var firstError = null;
|
||||||
|
|||||||
@ -1,384 +1,369 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
/*** controller for Wizard Form example***/
|
/*** controller for Wizard Form example***/
|
||||||
app.controller('studyMaterialStatusCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "API_POINTS", "$http", "SweetAlert", "$state", 'md5', 'ipCookie', function ($scope, toaster, $filter, ngTableParams, apiPoint, $http, SweetAlert, $state, md5, ipCookie) {
|
app.controller('studyMaterialStatusCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "API_POINTS", "$http", "SweetAlert", "$state", 'md5', 'ipCookie', '$window',
|
||||||
|
function ($scope, toaster, $filter, ngTableParams, apiPoint, $http, SweetAlert, $state, md5, ipCookie, $window) {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Study material status update search
|
* Study material status update search
|
||||||
* by : kdk
|
* by : kdk
|
||||||
*/
|
*/
|
||||||
|
|
||||||
$scope.sort = function (keyname) {
|
$scope.sort = function (keyname) {
|
||||||
$scope.sortKey = keyname; //set the sortKey to the param passed
|
$scope.sortKey = keyname; //set the sortKey to the param passed
|
||||||
$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
|
|
||||||
var localDetail = JSON.parse(localStorage.getItem('localObj'));
|
|
||||||
var localDetails = ipCookie('cookiechk');
|
|
||||||
const localUpdateStatus = 'STUDY_MATERIAL';
|
|
||||||
|
|
||||||
$scope.init = function () {
|
|
||||||
$scope.getUniversityList();
|
|
||||||
}
|
|
||||||
|
|
||||||
$scope.searchData = {
|
|
||||||
'University': '',
|
|
||||||
'Course': '',
|
|
||||||
'Batch': '',
|
|
||||||
'Mobile': '',
|
|
||||||
'Name': ''
|
|
||||||
}
|
|
||||||
|
|
||||||
$scope.myStatusModel = {
|
|
||||||
'semYear': '',
|
|
||||||
'staus': '',
|
|
||||||
'dateOn': '',
|
|
||||||
'comment': ''
|
|
||||||
}
|
|
||||||
|
|
||||||
$scope.universityData = '';
|
|
||||||
$scope.getUniversityList = function () {
|
|
||||||
var empListreq = {
|
|
||||||
method: 'POST',
|
|
||||||
url: apiPoint.url + 'getUniveCourseBratch/',
|
|
||||||
headers: {
|
|
||||||
'Content-Type': 'application/json'
|
|
||||||
},
|
|
||||||
data: {
|
|
||||||
data: localDetails
|
|
||||||
}
|
|
||||||
};
|
|
||||||
$http(empListreq).then(function (response) {
|
|
||||||
if (response.data.univList) {
|
|
||||||
$scope.universityData = response.data.university_details;
|
|
||||||
} else {
|
|
||||||
}
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
$scope.getUniveId = function (univ) {
|
|
||||||
let name = JSON.parse(univ);
|
|
||||||
$scope.searchData.University = name.UniversityID;
|
|
||||||
$scope.searchData.Course = '';
|
|
||||||
$scope.searchData.Batch = '';
|
|
||||||
$scope.courseData = name.Course;
|
|
||||||
$scope.batchData = name.Batch;
|
|
||||||
$scope.OpenWindowStatus = false;
|
|
||||||
$scope.getSearch();
|
|
||||||
};
|
|
||||||
|
|
||||||
$scope.getValueChange = function () {
|
|
||||||
$scope.getSearch();
|
|
||||||
}
|
|
||||||
|
|
||||||
// $scope.dealWithItem = function (item) {
|
|
||||||
// alert(JSON.stringify(item));
|
|
||||||
// }
|
|
||||||
|
|
||||||
$scope.searchResultDetails = [];
|
|
||||||
$scope.searchLoading = false;
|
|
||||||
$scope.searchResultLength = 0;
|
|
||||||
$scope.getSearch = function () {
|
|
||||||
$scope.OpenWindowStatus = false;
|
|
||||||
// alert(JSON.stringify($scope.searchData));
|
|
||||||
$scope.searchLoading = true;
|
|
||||||
var getSearchDetails = {
|
|
||||||
method: 'POST',
|
|
||||||
url: apiPoint.url + 'getSearchAutoDetails/',
|
|
||||||
headers: {
|
|
||||||
'Content-Type': 'application/json'
|
|
||||||
},
|
|
||||||
data: {
|
|
||||||
data: $scope.searchData,
|
|
||||||
requestDetails: localDetails
|
|
||||||
}
|
|
||||||
};
|
|
||||||
$http(getSearchDetails).then(function (response) {
|
|
||||||
if (response.data.searchResult) {
|
|
||||||
$scope.searchResultStatus = response.data.searchResult;
|
|
||||||
$scope.searchLoading = false;
|
|
||||||
let searchResultDetailsBef = response.data.search_result_details;
|
|
||||||
const filterAddSelect = searchResultDetailsBef.filter(val => {
|
|
||||||
val['Selected'] = false;
|
|
||||||
return val;
|
|
||||||
});
|
|
||||||
$scope.searchResultDetails = filterAddSelect;
|
|
||||||
$scope.searchResultLength = Object.keys($scope.searchResultDetails).length;
|
|
||||||
} else {
|
|
||||||
$scope.searchLoading = false;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
// mobile number search functionlity
|
|
||||||
$scope.mySearchChangeFunc = function(val) {
|
|
||||||
if( val > 0) {
|
|
||||||
$scope.allSelectedHide = true;
|
|
||||||
$scope.allSelected('undefined');
|
|
||||||
$scope.OpenWindowStatus = false;
|
|
||||||
} else {
|
|
||||||
$scope.allSelected('undefined');
|
|
||||||
$scope.allSelectedHide = false;
|
|
||||||
$scope.OpenWindowStatus = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// End: mobile number search functionlity
|
|
||||||
|
|
||||||
// select all or individual functionality
|
|
||||||
|
|
||||||
var getAllSelected = function () {
|
|
||||||
var selectedItems = $scope.searchResultDetails.filter(function (item) {
|
|
||||||
return item.Selected;
|
|
||||||
});
|
|
||||||
|
|
||||||
return selectedItems.length === $scope.searchResultDetails.length;
|
|
||||||
}
|
|
||||||
|
|
||||||
var setAllSelected = function (value) {
|
|
||||||
angular.forEach($scope.searchResultDetails, function (item) {
|
|
||||||
item.Selected = value;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
$scope.allSelected = function (value) {
|
|
||||||
if (value !== undefined) {
|
|
||||||
return setAllSelected(value);
|
|
||||||
} else {
|
|
||||||
return getAllSelected();
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
// End: select all or individual functionality
|
$scope.editId = -1;
|
||||||
|
$scope.setEditId = function (P) {
|
||||||
|
$scope.editId = P;
|
||||||
// open popup window onselct checkbox
|
}
|
||||||
$scope.OpenWindowStatus = false;
|
$scope.cancel = function () {
|
||||||
$scope.openUpdateWind = function () {
|
$scope.editId = -1;
|
||||||
var ItemsSelected = $scope.searchResultDetails.filter(function (item) {
|
|
||||||
if (item.Selected === true) { return true; }
|
|
||||||
});
|
|
||||||
const courseLocal = $scope.searchData.Course;
|
|
||||||
$scope.getSemYearList(courseLocal);
|
|
||||||
$scope.getStatusList();
|
|
||||||
// alert($scope.searchData.Course);
|
|
||||||
if (ItemsSelected.length) {
|
|
||||||
$scope.OpenWindowStatus = true;
|
|
||||||
$scope.myStatusModel = {
|
|
||||||
'semYear': '',
|
|
||||||
'staus': '',
|
|
||||||
'dateOn': '',
|
|
||||||
'comment': ''
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
$scope.OpenWindowStatus = false;
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
// get status list for this activity
|
// get local client details
|
||||||
$scope.getStatusList = function () {
|
var localDetail = JSON.parse(localStorage.getItem('localObj'));
|
||||||
var getStatusL = {
|
var localDetails = ipCookie('cookiechk');
|
||||||
method: 'POST',
|
const localUpdateStatus = 'STUDY_MATERIAL';
|
||||||
url: apiPoint.url + 'getStatusListForUpdate/',
|
|
||||||
headers: {
|
|
||||||
'Content-Type': 'application/json'
|
|
||||||
},
|
|
||||||
data: {
|
|
||||||
statusFor: 'studyMaterial',
|
|
||||||
data: localUpdateStatus
|
|
||||||
}
|
|
||||||
};
|
|
||||||
$http(getStatusL).then(function (response) {
|
|
||||||
if (response.data.statusList) {
|
|
||||||
$scope.statusDetailsList = response.data.statusList_details;
|
|
||||||
// $scope.searchLoading = false;
|
|
||||||
} else {
|
|
||||||
// $scope.searchLoading = false;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
// get Sem/Year based on the course select
|
$scope.init = function () {
|
||||||
$scope.getSemYearList = function (courseID) {
|
$scope.getUniversityList();
|
||||||
$scope.semYearList = '';
|
}
|
||||||
if (courseID !== '' && courseID !== undefined) {
|
|
||||||
var getSemYear = {
|
$scope.searchData = {
|
||||||
|
'University': '',
|
||||||
|
'Course': '',
|
||||||
|
'Batch': '',
|
||||||
|
'Mobile': '',
|
||||||
|
'Name': ''
|
||||||
|
}
|
||||||
|
|
||||||
|
$scope.myStatusModel = {
|
||||||
|
'semYear': '',
|
||||||
|
'staus': '',
|
||||||
|
'dateOn': '',
|
||||||
|
'comment': ''
|
||||||
|
}
|
||||||
|
|
||||||
|
$scope.universityData = '';
|
||||||
|
// get university list while the page is load
|
||||||
|
$scope.getUniversityList = function () {
|
||||||
|
var empListreq = {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
url: apiPoint.url + 'getSemYearForCourse/',
|
url: apiPoint.url + 'getUniveCourseBratch/',
|
||||||
headers: {
|
headers: {
|
||||||
'Content-Type': 'application/json'
|
'Content-Type': 'application/json'
|
||||||
},
|
},
|
||||||
data: {
|
data: {
|
||||||
data: courseID
|
data: localDetails
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
$http(getSemYear).then(function (response) {
|
$http(empListreq).then(function (response) {
|
||||||
if (response.data.semYearResult) {
|
if (response.data.univList) {
|
||||||
$scope.semYearList = response.data.semYear_result_details;
|
$scope.universityData = response.data.university_details;
|
||||||
} else {
|
} else {
|
||||||
$scope.semYearList = '';
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
};
|
||||||
|
|
||||||
} else {
|
$scope.getUniveId = function (univ) {
|
||||||
|
let name = JSON.parse(univ);
|
||||||
|
$scope.searchData.University = name.UniversityID;
|
||||||
|
$scope.searchData.Course = '';
|
||||||
|
$scope.searchData.Batch = '';
|
||||||
|
$scope.courseData = name.Course;
|
||||||
|
$scope.batchData = name.Batch;
|
||||||
|
$scope.OpenWindowStatus = false;
|
||||||
|
$scope.getSearch();
|
||||||
|
};
|
||||||
|
|
||||||
|
$scope.getValueChange = function () {
|
||||||
|
$scope.getSearch();
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
|
$scope.searchResultDetails = [];
|
||||||
// $scope.updateItems = function () {
|
$scope.searchLoading = false;
|
||||||
// var studentForUpdate = [];
|
$scope.searchResultLength = 0;
|
||||||
// var ItemsSelected = $scope.searchResultDetails.filter(function (item) {
|
// get student list based on the search data
|
||||||
// if (item.Selected === true) {
|
$scope.getSearch = function () {
|
||||||
// let getStudentID = new getStudentForUpdateDetails(item.StudentID);
|
$scope.OpenWindowStatus = false;
|
||||||
// studentForUpdate.push(getStudentID);
|
$scope.searchLoading = true;
|
||||||
// return true;
|
var getSearchDetails = {
|
||||||
// }
|
method: 'POST',
|
||||||
// });
|
url: apiPoint.url + 'getSearchAutoDetails/',
|
||||||
// function getStudentForUpdateDetails(id) {
|
headers: {
|
||||||
// this.iD = id;
|
'Content-Type': 'application/json'
|
||||||
// }
|
},
|
||||||
// alert(JSON.stringify($scope.myStatusModel));
|
data: {
|
||||||
// alert(JSON.stringify(studentForUpdate));
|
data: $scope.searchData,
|
||||||
// }
|
requestDetails: localDetails
|
||||||
|
|
||||||
$scope.statusUpdate = {
|
|
||||||
submit: function (form, myStatusModel) {
|
|
||||||
var firstError = null;
|
|
||||||
if (form.$invalid) {
|
|
||||||
var field = null, firstError = null;
|
|
||||||
for (field in form) {
|
|
||||||
if (field[0] != '$') {
|
|
||||||
if (firstError === null && !form[field].$valid) {
|
|
||||||
firstError = form[field].$name;
|
|
||||||
}
|
|
||||||
if (form[field].$pristine) {
|
|
||||||
form[field].$dirty = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
angular.element('.ng-invalid[name=' + firstError + ']').focus();
|
};
|
||||||
// swal("The form cannot be submitted because it contains validation errors!", "Errors are marked with a red, dashed border!", "error");
|
$http(getSearchDetails).then(function (response) {
|
||||||
|
if (response.data.searchResult) {
|
||||||
|
$scope.searchResultStatus = response.data.searchResult;
|
||||||
|
$scope.searchLoading = false;
|
||||||
|
let searchResultDetailsBef = response.data.search_result_details;
|
||||||
|
const filterAddSelect = searchResultDetailsBef.filter(val => {
|
||||||
|
val['Selected'] = false;
|
||||||
|
return val;
|
||||||
|
});
|
||||||
|
$scope.searchResultDetails = filterAddSelect;
|
||||||
|
$scope.searchResultLength = Object.keys($scope.searchResultDetails).length;
|
||||||
|
} else {
|
||||||
|
$scope.searchLoading = false;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// mobile number search functionlity
|
||||||
|
$scope.mySearchChangeFunc = function (val) {
|
||||||
|
if (val > 0) {
|
||||||
|
$scope.allSelectedHide = true;
|
||||||
|
$scope.allSelected('undefined');
|
||||||
|
$scope.OpenWindowStatus = false;
|
||||||
} else {
|
} else {
|
||||||
$scope.disableButton = true;
|
$scope.allSelected('undefined');
|
||||||
var studentForUpdate = [];
|
$scope.allSelectedHide = false;
|
||||||
let formate = "dd-MM-yyyy";
|
$scope.OpenWindowStatus = false;
|
||||||
$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);
|
|
||||||
studentForUpdate.push(getStudentID);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
function getStudentForUpdateDetails(id) {
|
|
||||||
this.StudentID = id;
|
|
||||||
this.CourseID = $scope.myStatusModel.semYear;
|
|
||||||
this.BranchCode = localDetails.localBranchID;
|
|
||||||
this.ListCode = $scope.myStatusModel.staus;
|
|
||||||
this.SDate = $scope.myStatusModel.dateOn;
|
|
||||||
this.Coursedetail = id;
|
|
||||||
this.Comments = $scope.myStatusModel.comment;
|
|
||||||
}
|
|
||||||
// alert(JSON.stringify($scope.myStatusModel));
|
|
||||||
// alert(JSON.stringify(studentForUpdate));
|
|
||||||
|
|
||||||
var updateStudyMaterial = {
|
|
||||||
method: 'POST',
|
|
||||||
url: apiPoint.url + 'updateStudentMaterialStatus/',
|
|
||||||
headers: {
|
|
||||||
'Content-Type': 'application/json'
|
|
||||||
},
|
|
||||||
data: {
|
|
||||||
data: studentForUpdate,
|
|
||||||
requestDetails : localDetails
|
|
||||||
}
|
|
||||||
};
|
|
||||||
$http(updateStudyMaterial).then(function (response) {
|
|
||||||
if (response.data.addStatus) {
|
|
||||||
swal("Success!", response.data.message, "success");
|
|
||||||
$scope.disableButton = false;
|
|
||||||
// for success state
|
|
||||||
$scope.allSelected('undefined');
|
|
||||||
$scope.OpenWindowStatus = false;
|
|
||||||
} else {
|
|
||||||
swal("Failed!", response.data.message, "error");
|
|
||||||
$scope.disableButton = false;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
},
|
}
|
||||||
reset: function (form) {
|
// End: mobile number search functionlity
|
||||||
form.$setPristine(true);
|
|
||||||
$scope.myStatusModel = {
|
// select all or individual functionality
|
||||||
|
|
||||||
|
// var getAllSelected = function () {
|
||||||
|
// var selectedItems = $scope.searchResultDetails.filter(function (item) {
|
||||||
|
// return item.Selected;
|
||||||
|
// });
|
||||||
|
|
||||||
|
// return selectedItems.length === $scope.searchResultDetails.length;
|
||||||
|
// }
|
||||||
|
|
||||||
|
// var setAllSelected = function (value) {
|
||||||
|
// angular.forEach($scope.searchResultDetails, function (item) {
|
||||||
|
// item.Selected = value;
|
||||||
|
// });
|
||||||
|
// }
|
||||||
|
|
||||||
|
// $scope.allSelected = function (value) {
|
||||||
|
// if (value !== undefined) {
|
||||||
|
// return setAllSelected(value);
|
||||||
|
// } else {
|
||||||
|
// return getAllSelected();
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
|
||||||
|
// Select one row in a table once
|
||||||
|
$scope.setOneSelect = function (value) {
|
||||||
|
angular.forEach($scope.searchResultDetails, function (item) {
|
||||||
|
item.Selected = value;
|
||||||
|
});
|
||||||
|
value.Selected = true;
|
||||||
|
$scope.OpenWindowStatus = true;
|
||||||
|
$scope.openUpdateWind();
|
||||||
|
}
|
||||||
|
|
||||||
|
// End: select all or individual functionality
|
||||||
|
|
||||||
|
// unselect all the selected items
|
||||||
|
$scope.unSelect = function () {
|
||||||
|
// alert(value.Selected);
|
||||||
|
angular.forEach($scope.searchResultDetails, function (item) {
|
||||||
|
item.Selected = false;
|
||||||
|
});
|
||||||
|
$scope.openUpdateWind();
|
||||||
|
}
|
||||||
|
|
||||||
|
// open popup window onselct checkbox / close popup window uncheck all the selected items
|
||||||
|
$scope.OpenWindowStatus = false;
|
||||||
|
$scope.openUpdateWind = function () {
|
||||||
|
// $location.hash('bottom');
|
||||||
|
// call $anchorScroll()
|
||||||
|
// alert(document.getElementById('bottom1'));
|
||||||
|
$window.scrollTo(0, 1800);
|
||||||
|
// $window.scrollTo(0, angular.element(document.getElementById('bottom1')).offsetTop);
|
||||||
|
var ItemsSelected = $scope.searchResultDetails.filter(function (item) {
|
||||||
|
if (item.Selected === true) { return true; }
|
||||||
|
});
|
||||||
|
|
||||||
|
if (ItemsSelected.length !== 0) {
|
||||||
|
const courseLocal = ItemsSelected[0].CourseID;
|
||||||
|
const selectedStuId = ItemsSelected[0].StudentID;
|
||||||
|
$scope.getSemYearList(courseLocal, selectedStuId);
|
||||||
|
$scope.getStatusList();
|
||||||
|
$scope.OpenWindowStatus = true;
|
||||||
|
$scope.myStatusModel = {
|
||||||
'semYear': '',
|
'semYear': '',
|
||||||
'staus': '',
|
'staus': '',
|
||||||
'dateOn': '',
|
'dateOn': '',
|
||||||
'comment': ''
|
'comment': ''
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// 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 {
|
} else {
|
||||||
$scope.prevStatusListForStudentCourseLoading = false;
|
$scope.OpenWindowStatus = false;
|
||||||
$scope.prevStatusListForStudentCourseNoRecord = true;
|
|
||||||
$scope.prevNoRecordFound = true;
|
|
||||||
}
|
}
|
||||||
});
|
}
|
||||||
}
|
|
||||||
|
// get status list for this activity
|
||||||
|
$scope.getStatusList = function () {
|
||||||
|
var getStatusL = {
|
||||||
|
method: 'POST',
|
||||||
|
url: apiPoint.url + 'getStatusListForUpdate/',
|
||||||
|
headers: {
|
||||||
|
'Content-Type': 'application/json'
|
||||||
|
},
|
||||||
|
data: {
|
||||||
|
statusFor: 'studyMaterial',
|
||||||
|
data: localUpdateStatus
|
||||||
|
}
|
||||||
|
};
|
||||||
|
$http(getStatusL).then(function (response) {
|
||||||
|
if (response.data.statusList) {
|
||||||
|
$scope.statusDetailsList = response.data.statusList_details;
|
||||||
|
// $scope.searchLoading = false;
|
||||||
|
} else {
|
||||||
|
// $scope.searchLoading = false;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// get Sem/Year based on the course select
|
||||||
|
$scope.getSemYearList = function (courseID, StuId) {
|
||||||
|
$scope.semYearList = '';
|
||||||
|
if (courseID !== '' && courseID !== undefined) {
|
||||||
|
var getSemYear = {
|
||||||
|
method: 'POST',
|
||||||
|
url: apiPoint.url + 'getSemYearForCourse/',
|
||||||
|
headers: {
|
||||||
|
'Content-Type': 'application/json'
|
||||||
|
},
|
||||||
|
data: {
|
||||||
|
data: courseID,
|
||||||
|
stuFor: StuId
|
||||||
|
}
|
||||||
|
};
|
||||||
|
$http(getSemYear).then(function (response) {
|
||||||
|
if (response.data.semYearResult) {
|
||||||
|
$scope.semYearList = response.data.semYear_result_details;
|
||||||
|
} else {
|
||||||
|
$scope.semYearList = '';
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
} else {
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$scope.statusUpdate = {
|
||||||
|
submit: function (form, myStatusModel) {
|
||||||
|
var firstError = null;
|
||||||
|
if (form.$invalid) {
|
||||||
|
var field = null, firstError = null;
|
||||||
|
for (field in form) {
|
||||||
|
if (field[0] != '$') {
|
||||||
|
if (firstError === null && !form[field].$valid) {
|
||||||
|
firstError = form[field].$name;
|
||||||
|
}
|
||||||
|
if (form[field].$pristine) {
|
||||||
|
form[field].$dirty = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
angular.element('.ng-invalid[name=' + firstError + ']').focus();
|
||||||
|
// swal("The form cannot be submitted because it contains validation errors!", "Errors are marked with a red, dashed border!", "error");
|
||||||
|
} else {
|
||||||
|
$scope.disableButton = true;
|
||||||
|
var studentForUpdate = [];
|
||||||
|
let formate = "dd-MM-yyyy";
|
||||||
|
$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);
|
||||||
|
studentForUpdate.push(getStudentID);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
function getStudentForUpdateDetails(id) {
|
||||||
|
this.StudentID = id;
|
||||||
|
this.CourseID = $scope.myStatusModel.semYear;
|
||||||
|
this.BranchCode = localDetails.localBranchID;
|
||||||
|
this.ListCode = $scope.myStatusModel.staus;
|
||||||
|
this.SDate = $scope.myStatusModel.dateOn;
|
||||||
|
this.Coursedetail = id;
|
||||||
|
this.Comments = $scope.myStatusModel.comment;
|
||||||
|
}
|
||||||
|
var updateStudyMaterial = {
|
||||||
|
method: 'POST',
|
||||||
|
url: apiPoint.url + 'updateStudentMaterialStatus/',
|
||||||
|
headers: {
|
||||||
|
'Content-Type': 'application/json'
|
||||||
|
},
|
||||||
|
data: {
|
||||||
|
data: studentForUpdate,
|
||||||
|
requestDetails: localDetails
|
||||||
|
}
|
||||||
|
};
|
||||||
|
$http(updateStudyMaterial).then(function (response) {
|
||||||
|
if (response.data.addStatus) {
|
||||||
|
swal("Success!", response.data.message, "success");
|
||||||
|
$scope.disableButton = false;
|
||||||
|
// for success state
|
||||||
|
// $scope.allSelected('undefined');
|
||||||
|
angular.forEach($scope.searchResultDetails, function (item) {
|
||||||
|
item.Selected = false;
|
||||||
|
});
|
||||||
|
$scope.OpenWindowStatus = false;
|
||||||
|
} else {
|
||||||
|
swal("Failed!", response.data.message, "error");
|
||||||
|
$scope.disableButton = false;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
},
|
||||||
|
reset: function (form) {
|
||||||
|
form.$setPristine(true);
|
||||||
|
$scope.myStatusModel = {
|
||||||
|
'semYear': '',
|
||||||
|
'staus': '',
|
||||||
|
'dateOn': '',
|
||||||
|
'comment': ''
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
// $scope.CheckUncheckAll = function () {
|
// check unchek for table values
|
||||||
|
|
||||||
// for (var i = 0; i < $scope.searchResultDetails.length; i++) {
|
$scope.prevStatusListForStudentCourse = '';
|
||||||
// $scope.searchResultDetails[i].Selected = $scope.IsAllChecked;
|
// get previous status details for the student
|
||||||
// }
|
$scope.getPrevStatus = function (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.CheckUncheckHeader = function () {
|
}]);
|
||||||
// $scope.IsAllChecked = true;
|
|
||||||
// for (var i = 0; i < $scope.searchResultDetails.length; i++) {
|
|
||||||
// if (!$scope.searchResultDetails[i].Selected) {
|
|
||||||
// $scope.IsAllChecked = false;
|
|
||||||
// break;
|
|
||||||
// }
|
|
||||||
// };
|
|
||||||
// };
|
|
||||||
|
|
||||||
// $scope.CheckUncheckHeader();
|
|
||||||
}]);
|
|
||||||
|
|||||||
@ -72,7 +72,32 @@
|
|||||||
<p style="color: red;" align="center"><strong><h3 class="text-center">No
|
<p style="color: red;" align="center"><strong><h3 class="text-center">No
|
||||||
records found... </h3></strong></p>
|
records found... </h3></strong></p>
|
||||||
</div>-->
|
</div>-->
|
||||||
|
<style>
|
||||||
|
.listCoutShow {
|
||||||
|
margin: 12px;
|
||||||
|
padding: 4px;
|
||||||
|
padding-left: 10px;
|
||||||
|
padding-right: 10px;
|
||||||
|
border: 1px solid #59b176;
|
||||||
|
border-radius: 7px;
|
||||||
|
color: #FFF;
|
||||||
|
background-color: #5fba7d;
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<div class="row">
|
||||||
|
<div class="pull-right">
|
||||||
|
<div style="margin: 8px;">
|
||||||
|
<div style="width: 45px; display: initial;">
|
||||||
|
<span style="font-size: 14px;
|
||||||
|
color: black;">Total Count:</span> <span class="listCoutShow">{{ dataLength }}</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
<div class="table-responsive">
|
<div class="table-responsive">
|
||||||
|
|
||||||
<table class="table table-hover">
|
<table class="table table-hover">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
@ -82,15 +107,19 @@
|
|||||||
<th ng-click="sort('ListName')">Income/Expense
|
<th ng-click="sort('ListName')">Income/Expense
|
||||||
<span class="glyphicon sort-icon" ng-show="sortKey=='ListName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
|
<span class="glyphicon sort-icon" ng-show="sortKey=='ListName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
|
||||||
</th>
|
</th>
|
||||||
|
<th>Voucher Number
|
||||||
|
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
|
||||||
|
</th>
|
||||||
|
<th>Paid To
|
||||||
|
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
|
||||||
|
</th>
|
||||||
<th ng-click="sort('TypeName')">Type
|
<th ng-click="sort('TypeName')">Type
|
||||||
<span class="glyphicon sort-icon" ng-show="sortKey=='TypeName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
|
<span class="glyphicon sort-icon" ng-show="sortKey=='TypeName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
|
||||||
</th>
|
</th>
|
||||||
<th >Amount
|
<th>Amount
|
||||||
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='Amount'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
|
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='Amount'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
|
||||||
</th>
|
</th>
|
||||||
<th>Description
|
|
||||||
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
|
|
||||||
</th>
|
|
||||||
<th class="center" ng-click="sort('Status')">Status
|
<th class="center" ng-click="sort('Status')">Status
|
||||||
<span class="glyphicon sort-icon" ng-show="sortKey=='Status'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
|
<span class="glyphicon sort-icon" ng-show="sortKey=='Status'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
|
||||||
</th>
|
</th>
|
||||||
@ -102,9 +131,11 @@
|
|||||||
<tr>
|
<tr>
|
||||||
<td>{{p.Date}}</td>
|
<td>{{p.Date}}</td>
|
||||||
<td>{{p.ListName}}</td>
|
<td>{{p.ListName}}</td>
|
||||||
|
<td>{{p.VoucherNumber}}</td>
|
||||||
|
<td>{{p.PaidTo}}</td>
|
||||||
<td>{{p.TypeName}}</td>
|
<td>{{p.TypeName}}</td>
|
||||||
<td>{{p.Amount}}</td>
|
<td>{{p.Amount}}</td>
|
||||||
<td style="width: 275px;">{{p.Description}}</td>
|
|
||||||
<!--<td class="center" tooltip="{{p.Approval_Comments}}" ng-if="p.ListName == 'Income'">
|
<!--<td class="center" tooltip="{{p.Approval_Comments}}" ng-if="p.ListName == 'Income'">
|
||||||
- </td>-->
|
- </td>-->
|
||||||
<td class="center" 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}}"><span ng-if="p.Status == 'Pending'" style="text-transform: uppercase; text-shadow: 1px 1px #286d5f; color: #55d4bb ">{{p.Status}}</span>
|
||||||
@ -122,10 +153,40 @@
|
|||||||
</tr>
|
</tr>
|
||||||
<tr ng-show="editId === p.ID" ng-if="editId === p.ID">
|
<tr ng-show="editId === p.ID" ng-if="editId === p.ID">
|
||||||
<!--<pre>{{ p }}</pre>-->
|
<!--<pre>{{ p }}</pre>-->
|
||||||
<td colspan="7">
|
<td colspan="9">
|
||||||
<form name="Form" id="form" novalidate ng-submit="daybookeditUpdate.submit(Form, myModel)" method="post">
|
<form name="Form" id="form" novalidate ng-submit="daybookeditUpdate.submit(Form, myModel)" method="post">
|
||||||
<div ng-init="copyModel(p)" class="container" style="background-color: rgb(248, 248, 248);
|
<div ng-init="copyModel(p)" class="container" style="background-color: rgb(248, 248, 248);
|
||||||
border-radius: 6px;padding: 22px;">
|
border-radius: 6px;padding: 22px;">
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-md-4 form-group">
|
||||||
|
<label>
|
||||||
|
Voucher Number
|
||||||
|
</label>
|
||||||
|
<input type="text" name="editvoucherNumber" tabindex="1" placeholder="Enter Voucher Number" class="form-control" ng-model="myModel.voucherNumber"
|
||||||
|
/>
|
||||||
|
<span class="error text-small block" ng-if="Form.editvoucherNumber.$dirty && Form.editvoucherNumber.$invalid" ng-hide="Form.editvoucherNumber.$error.maxlength || Form.editvoucherNumber.$error.minlength || Form.editvoucherNumber.$error.pattern">Voucher Number is required.</span>
|
||||||
|
</div>
|
||||||
|
<div class="col-md-4 form-group" ng-class="{'has-error':Form.editpaidTo.$dirty && Form.editpaidTo.$invalid, 'has-success':Form.editpaidTo.$valid}">
|
||||||
|
<label>
|
||||||
|
Paid To / Received To
|
||||||
|
</label>
|
||||||
|
<input type="text" name="editpaidTo" tabindex="1" placeholder="Enter Paid To / Received To" class="form-control" ng-model="myModel.paidTo"
|
||||||
|
/>
|
||||||
|
<span class="error text-small block" ng-if="Form.editpaidTo.$dirty && Form.editpaidTo.$invalid" ng-hide="Form.editpaidTo.$error.maxlength || Form.editpaidTo.$error.minlength || Form.editpaidTo.$error.pattern">Paid To / Received To is required.</span>
|
||||||
|
</div>
|
||||||
|
<div class="col-md-4">
|
||||||
|
<label>
|
||||||
|
Description
|
||||||
|
</label>
|
||||||
|
|
||||||
|
<textarea type="text" placeholder="Enter Description" tabindex="3" class="form-control" name="editdescription_paid" ng-model="myModel.description_paid"
|
||||||
|
maxlength="100" />
|
||||||
|
<span class="text-small block" style="color: rgba(128, 128, 128, 0.64)">Description Should be Less than 100 Characters.</span>
|
||||||
|
<span class="error text-small block" ng-if="Form.editdescription_paid.$dirty && Form.editdescription_paid.$error.pattern">Invalid Description</span>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-md-4" ng-class="{'has-error':Form.editType.$dirty && Form.editType.$invalid, 'has-success':Form.editType.$valid}">
|
<div class="col-md-4" ng-class="{'has-error':Form.editType.$dirty && Form.editType.$invalid, 'has-success':Form.editType.$valid}">
|
||||||
<label for="form-field-select-2">
|
<label for="form-field-select-2">
|
||||||
@ -157,7 +218,7 @@
|
|||||||
|
|
||||||
<textarea type="text" placeholder="Enter Comments" tabindex="3" class="form-control" name="editComments" ng-model="myModel.description"
|
<textarea type="text" placeholder="Enter Comments" tabindex="3" class="form-control" name="editComments" ng-model="myModel.description"
|
||||||
maxlength="100" />
|
maxlength="100" />
|
||||||
<span class="text-small block">Comments Should be Less than 100 Charactes.</span>
|
<span class="text-small block" style="color: rgba(128, 128, 128, 0.64)">Comments Should be Less than 100 Charactes.</span>
|
||||||
<span class="error text-small block" ng-if="Form.description.$dirty && Form.description.$error.pattern">Invalid Comments</span>
|
<span class="error text-small block" ng-if="Form.description.$dirty && Form.description.$error.pattern">Invalid Comments</span>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
@ -197,7 +258,7 @@
|
|||||||
<div>
|
<div>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div data-ng-controller="DatepickerDemoCtrl">
|
<div data-ng-controller="DatepickerDemoCtrl">
|
||||||
<div class="col-md-4 form-group" ng-class="{'has-error':Form.addDate.$dirty && Form.addDate.$invalid, 'has-success':Form.addDate.$valid}">
|
<div class="col-md-6 form-group" ng-class="{'has-error':Form.addDate.$dirty && Form.addDate.$invalid, 'has-success':Form.addDate.$valid}">
|
||||||
<label>
|
<label>
|
||||||
Date <span
|
Date <span
|
||||||
class="symbol required"></span>
|
class="symbol required"></span>
|
||||||
@ -212,7 +273,7 @@
|
|||||||
<span class="error text-small block" ng-if="Form.addDate.$error.maxlength">Enter a Valid Date </span>
|
<span class="error text-small block" ng-if="Form.addDate.$error.maxlength">Enter a Valid Date </span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-4 form-group" ng-class="{'has-error':Form.gender.$dirty && Form.addName.$invalid , 'has-success':Form.addName.$valid}">
|
<div class="col-md-6 form-group" ng-class="{'has-error':Form.gender.$dirty && Form.addName.$invalid , 'has-success':Form.addName.$valid}">
|
||||||
<label for="form-field-select-2">
|
<label for="form-field-select-2">
|
||||||
Income/Expense <span class="symbol required"></span>
|
Income/Expense <span class="symbol required"></span>
|
||||||
</label>
|
</label>
|
||||||
@ -225,6 +286,38 @@
|
|||||||
<span class="error text-small block" ng-if="Form.addName.$dirty && Form.addName.$error.required">Type is Required</span>
|
<span class="error text-small block" ng-if="Form.addName.$dirty && Form.addName.$error.required">Type is Required</span>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-md-4 form-group">
|
||||||
|
<label>
|
||||||
|
Voucher Number
|
||||||
|
</label>
|
||||||
|
<input type="text" name="voucherNumber" tabindex="1" placeholder="Enter Voucher Number" class="form-control" ng-model="myModelAdd.voucherNumber"
|
||||||
|
/>
|
||||||
|
<span class="error text-small block" ng-if="Form.paidTo.$dirty && Form.paidTo.$invalid" ng-hide="Form.voucherNumber.$error.maxlength || Form.voucherNumber.$error.minlength || Form.voucherNumber.$error.pattern">Voucher Number is required.</span>
|
||||||
|
</div>
|
||||||
|
<div class="col-md-4 form-group">
|
||||||
|
<label>
|
||||||
|
Paid To / Received To
|
||||||
|
</label>
|
||||||
|
<input type="text" name="paidTo" tabindex="1" placeholder="Enter Paid To / Received To" class="form-control" ng-model="myModelAdd.paidTo"
|
||||||
|
/>
|
||||||
|
<span class="error text-small block" ng-if="Form.paidTo.$dirty && Form.paidTo.$invalid" ng-hide="Form.paidTo.$error.maxlength || Form.paidTo.$error.minlength || Form.paidTo.$error.pattern">Paid To / Reveived To is required.</span>
|
||||||
|
</div>
|
||||||
|
<div class="col-md-4">
|
||||||
|
<label>
|
||||||
|
Description
|
||||||
|
</label>
|
||||||
|
|
||||||
|
<textarea type="text" placeholder="Enter Description" tabindex="3" class="form-control" name="description_paid" ng-model="myModelAdd.description_paid"
|
||||||
|
maxlength="100" />
|
||||||
|
<span class="text-small block" style="color: rgba(128, 128, 128, 0.64)">Description Should be Less than 100 Characters.</span>
|
||||||
|
<span class="error text-small block" ng-if="Form.description_paid.$dirty && Form.description_paid.$error.pattern">Invalid Description</span>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
<div class="row">
|
||||||
<div class="col-md-4" ng-class="{'has-error':Form.addType.$dirty && Form.addType.$invalid, 'has-success':Form.addType.$valid}">
|
<div class="col-md-4" ng-class="{'has-error':Form.addType.$dirty && Form.addType.$invalid, 'has-success':Form.addType.$valid}">
|
||||||
<label for="form-field-select-2">
|
<label for="form-field-select-2">
|
||||||
Type <span class="symbol required"></span>
|
Type <span class="symbol required"></span>
|
||||||
@ -236,9 +329,6 @@
|
|||||||
<span class="error text-small block" ng-if="Form.addType.$dirty && Form.addType.$error.required">Type is Required</span>
|
<span class="error text-small block" ng-if="Form.addType.$dirty && Form.addType.$error.required">Type is Required</span>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
<div class="row">
|
|
||||||
|
|
||||||
<div class="col-md-4" ng-class="{'has-error':Form.addAmount.$dirty && Form.addAmount.$invalid, 'has-success':Form.addAmount.$valid}">
|
<div class="col-md-4" ng-class="{'has-error':Form.addAmount.$dirty && Form.addAmount.$invalid, 'has-success':Form.addAmount.$valid}">
|
||||||
<label>
|
<label>
|
||||||
Amount <span class="symbol required"></span>
|
Amount <span class="symbol required"></span>
|
||||||
@ -256,7 +346,7 @@
|
|||||||
|
|
||||||
<textarea type="text" placeholder="Enter Comments" tabindex="3" class="form-control" name="addComments" ng-model="myModelAdd.description"
|
<textarea type="text" placeholder="Enter Comments" tabindex="3" class="form-control" name="addComments" ng-model="myModelAdd.description"
|
||||||
maxlength="100" />
|
maxlength="100" />
|
||||||
<span class="text-small block">Comments Should be Less than 100 Characters.</span>
|
<span class="text-small block" style="color: rgba(128, 128, 128, 0.64)">Comments Should be Less than 100 Characters.</span>
|
||||||
<span class="error text-small block" ng-if="Form.addComments.$dirty && Form.addComments.$error.pattern">Invalid Comments</span>
|
<span class="error text-small block" ng-if="Form.addComments.$dirty && Form.addComments.$error.pattern">Invalid Comments</span>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -12,7 +12,28 @@
|
|||||||
<div class="container-fluid container-fullw bg-white">
|
<div class="container-fluid container-fullw bg-white">
|
||||||
<div ng-controller="daybookadminCtrl">
|
<div ng-controller="daybookadminCtrl">
|
||||||
<div ng-init="init()">
|
<div ng-init="init()">
|
||||||
|
<style>
|
||||||
|
/*#wrapper {
|
||||||
|
width: 200px;
|
||||||
|
height: 110px;
|
||||||
|
}*/
|
||||||
|
|
||||||
|
#containersPara {
|
||||||
|
/*background-color: #fff;*/
|
||||||
|
width: 160px;
|
||||||
|
height: 85px;
|
||||||
|
/*overflow-x: scroll;*/
|
||||||
|
color: rgba(7, 21, 176, 0.7);
|
||||||
|
overflow: auto
|
||||||
|
}
|
||||||
|
/*.square {
|
||||||
|
background-color: #00b;
|
||||||
|
float: left;
|
||||||
|
height: 90px;
|
||||||
|
width: 90px;
|
||||||
|
margin: 5px;
|
||||||
|
}*/
|
||||||
|
</style>
|
||||||
<div ng-if="localTypeViewAdmin">
|
<div ng-if="localTypeViewAdmin">
|
||||||
<tabset class="tabbable">
|
<tabset class="tabbable">
|
||||||
<tab heading="View" id="viewDayBook">
|
<tab heading="View" id="viewDayBook">
|
||||||
@ -29,33 +50,33 @@
|
|||||||
<input class="form-control" type="text" ng-model="search" id="search" autofocus tabindex="1" placeholder="Search" /><br><br>
|
<input class="form-control" type="text" ng-model="search" id="search" autofocus tabindex="1" placeholder="Search" /><br><br>
|
||||||
</div>-->
|
</div>-->
|
||||||
|
|
||||||
<div class="col-md-4">
|
<div class="col-md-4">
|
||||||
<!--<pre>{{searchData.date}}</pre>-->
|
<!--<pre>{{searchData.date}}</pre>-->
|
||||||
<div data-ng-controller="DatepickerDemoCtrl">
|
<div data-ng-controller="DatepickerDemoCtrl">
|
||||||
<label>
|
<label>
|
||||||
From Date
|
From Date
|
||||||
</label>
|
</label>
|
||||||
<input type="text" tabindex="1" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="searchData.date"
|
<input type="text" tabindex="1" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="searchData.date"
|
||||||
is-open="startOpen" ng-init="startOpen = false" name="addDate" datepicker-options="dateOptions"
|
is-open="startOpen" ng-init="startOpen = false" name="addDate" datepicker-options="dateOptions"
|
||||||
placeholder="Select Date" close-text="Close" required="required" ng-change="changeDate()"
|
placeholder="Select Date" close-text="Close" required="required" ng-change="changeDate()"
|
||||||
show-button-bar="true" />
|
show-button-bar="true" />
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-4">
|
<div class="col-md-4">
|
||||||
<!--<pre>{{searchData.date}}</pre>-->
|
<!--<pre>{{searchData.date}}</pre>-->
|
||||||
<div data-ng-controller="DatepickerDemoCtrl">
|
<div data-ng-controller="DatepickerDemoCtrl">
|
||||||
<label>
|
<label>
|
||||||
To Date
|
To Date
|
||||||
</label>
|
</label>
|
||||||
<input type="text" tabindex="1" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="searchData.dateTo"
|
<input type="text" tabindex="1" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="searchData.dateTo"
|
||||||
is-open="startOpen" ng-init="startOpen = false" name="addDate" datepicker-options="dateOptions"
|
is-open="startOpen" ng-init="startOpen = false" name="addDate" datepicker-options="dateOptions"
|
||||||
placeholder="Select Date" close-text="Close" required="required" ng-change="changeToDate()"
|
placeholder="Select Date" close-text="Close" required="required" ng-change="changeToDate()"
|
||||||
show-button-bar="true" />
|
show-button-bar="true" />
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-4 form-group" ng-class="{'has-error':Form.gender.$dirty && Form.addName.$invalid , 'has-success':Form.addName.$valid}">
|
<div class="col-md-4 form-group" ng-class="{'has-error':Form.gender.$dirty && Form.addName.$invalid , 'has-success':Form.addName.$valid}">
|
||||||
<label for="form-field-select-2">
|
<label for="form-field-select-2">
|
||||||
Income/Expense
|
Income/Expense
|
||||||
</label>
|
</label>
|
||||||
@ -83,99 +104,203 @@
|
|||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>-->
|
</div>-->
|
||||||
<div class="table-responsive" ng-if="showTheRefValue == 'I002'">
|
<div ng-if="showTheRefValue == 'I002'">
|
||||||
<table class="table table-hover" ng-if="searchResultLength > 0">
|
<style>
|
||||||
<thead>
|
.listCoutShow {
|
||||||
<tr>
|
margin: 12px;
|
||||||
|
padding: 4px;
|
||||||
<th ng-click="sort('Date')">Date
|
padding-left: 10px;
|
||||||
<span class="glyphicon sort-icon" ng-show="sortKey=='Date'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
|
padding-right: 10px;
|
||||||
</th>
|
border: 1px solid #59b176;
|
||||||
<th ng-click="sort('ListName')">Income/Expense
|
border-radius: 7px;
|
||||||
<span class="glyphicon sort-icon" ng-show="sortKey=='ListName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
|
color: #FFF;
|
||||||
</th>
|
background-color: #5fba7d;
|
||||||
<th ng-click="sort('TypeName')">Type
|
text-align: center;
|
||||||
<span class="glyphicon sort-icon" ng-show="sortKey=='TypeName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
|
}
|
||||||
</th>
|
</style>
|
||||||
<th>Amount
|
|
||||||
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
|
<div class="row">
|
||||||
</th>
|
<div class="pull-right">
|
||||||
<th ng-click="sort('amount')">Description
|
<div style="margin: 8px;">
|
||||||
<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
|
<div style="width: 45px; display: initial;">
|
||||||
</th>
|
<span style="font-size: 14px;
|
||||||
<!--<th ng-click="sort('amount')">Status
|
color: black;">Total Count:</span>
|
||||||
|
<span class="listCoutShow">{{ dataLengthIncome }}</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="table-responsive">
|
||||||
|
<table style="width: 1200px;" class="table table-hover" ng-if="searchResultLength > 0">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
|
||||||
|
<th ng-click="sort('Date')">Date
|
||||||
|
<span class="glyphicon sort-icon" ng-show="sortKey=='Date'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
|
||||||
|
</th>
|
||||||
|
<th ng-click="sort('ListName')">Income/Expense
|
||||||
|
<span class="glyphicon sort-icon" ng-show="sortKey=='ListName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
|
||||||
|
</th>
|
||||||
|
<th>Voucher Number
|
||||||
|
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
|
||||||
|
</th>
|
||||||
|
<th ng-click="sort('PaidTo')">Paid To
|
||||||
|
<span class="glyphicon sort-icon" ng-show="sortKey=='PaidTo'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
|
||||||
|
</th>
|
||||||
|
<th>Description
|
||||||
|
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='PaidTo'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
|
||||||
|
</th>
|
||||||
|
<th ng-click="sort('TypeName')">Type
|
||||||
|
<span class="glyphicon sort-icon" ng-show="sortKey=='TypeName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
|
||||||
|
</th>
|
||||||
|
<th>Amount
|
||||||
|
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
|
||||||
|
</th>
|
||||||
|
<th>Comments
|
||||||
|
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
|
||||||
|
</th>
|
||||||
|
<!--<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">
|
||||||
<tr>
|
<tr>
|
||||||
|
|
||||||
<td>{{p.Date}}</td>
|
<td>{{p.Date}}</td>
|
||||||
<td>{{p.ListName}}</td>
|
<td>{{p.ListName}}</td>
|
||||||
<td>{{p.TypeName}}</td>
|
<td>{{p.VoucherNumber}}</td>
|
||||||
<td>{{p.Amount}}</td>
|
<td>{{p.PaidTo}}</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>
|
||||||
|
<div id="containersPara">
|
||||||
|
<div id="wrapper">
|
||||||
|
{{p.PaidDescription}}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
<td>{{p.TypeName}}</td>
|
||||||
|
<td>{{p.Amount}}</td>
|
||||||
|
<td>
|
||||||
|
<div id="containersPara">
|
||||||
|
<div id="wrapper">
|
||||||
|
{{p.Description}}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</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>
|
||||||
<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>
|
||||||
<dir-pagination-controls max-size="10" direction-links="true" boundary-links="true">
|
<dir-pagination-controls max-size="10" direction-links="true" boundary-links="true">
|
||||||
</dir-pagination-controls>
|
</dir-pagination-controls>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="table-responsive" ng-if="showTheRefValue == 'I001'">
|
<div ng-if="showTheRefValue == 'I001'">
|
||||||
<table class="table table-hover" ng-if="searchResultLength > 0">
|
<style>
|
||||||
<thead>
|
.listCoutShow {
|
||||||
<tr>
|
margin: 12px;
|
||||||
<th>
|
padding: 4px;
|
||||||
<input type="checkbox" ng-hide="allSelectedHide" ng-model="allSelected" ng-change="openUpdateWind()" ng-model-options="{getterSetter: true}"
|
padding-left: 10px;
|
||||||
/>
|
padding-right: 10px;
|
||||||
</th>
|
border: 1px solid #59b176;
|
||||||
<th ng-click="sort('Date')">Date
|
border-radius: 7px;
|
||||||
<span class="glyphicon sort-icon" ng-show="sortKey=='Date'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
|
color: #FFF;
|
||||||
</th>
|
background-color: #5fba7d;
|
||||||
<th ng-click="sort('ListName')">Income/Expense
|
text-align: center;
|
||||||
<span class="glyphicon sort-icon" ng-show="sortKey=='ListName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
|
}
|
||||||
</th>
|
</style>
|
||||||
<th ng-click="sort('TypeName')">Type
|
|
||||||
<span class="glyphicon sort-icon" ng-show="sortKey=='TypeName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
|
<div class="row">
|
||||||
</th>
|
<div class="pull-right">
|
||||||
<th>Amount
|
<div style="margin: 8px;">
|
||||||
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
|
<div style="width: 45px; display: initial;">
|
||||||
</th>
|
<span style="font-size: 14px;
|
||||||
<th>Description
|
color: black;">Total Count:</span>
|
||||||
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
|
<span class="listCoutShow">{{ dataLengthExpense }}</span>
|
||||||
</th>
|
</div>
|
||||||
<th ng-click="sort('Status')">Status
|
</div>
|
||||||
<span class="glyphicon sort-icon" ng-show="sortKey=='Status'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
|
</div>
|
||||||
</th>
|
</div>
|
||||||
</tr>
|
<div class="table-responsive">
|
||||||
</thead>
|
<table style="width: 1200px;" class="table table-hover" ng-if="searchResultLength > 0">
|
||||||
<tbody dir-paginate="p in searchResultDetails|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10">
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
<td>
|
<th>
|
||||||
<label>
|
<input type="checkbox" ng-hide="allSelectedHide" ng-model="allSelected" ng-change="openUpdateWind()" ng-model-options="{getterSetter: true}"
|
||||||
|
/>
|
||||||
|
</th>
|
||||||
|
<th ng-click="sort('Date')">Date
|
||||||
|
<span class="glyphicon sort-icon" ng-show="sortKey=='Date'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
|
||||||
|
</th>
|
||||||
|
<th ng-click="sort('ListName')">Income/Expense
|
||||||
|
<span class="glyphicon sort-icon" ng-show="sortKey=='ListName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
|
||||||
|
</th>
|
||||||
|
<th>Voucher Number
|
||||||
|
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
|
||||||
|
</th>
|
||||||
|
<th ng-click="sort('PaidTo')">Paid To
|
||||||
|
<span class="glyphicon sort-icon" ng-show="sortKey=='PaidTo'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
|
||||||
|
</th>
|
||||||
|
<th>Description
|
||||||
|
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='PaidTo'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
|
||||||
|
</th>
|
||||||
|
<th ng-click="sort('TypeName')">Type
|
||||||
|
<span class="glyphicon sort-icon" ng-show="sortKey=='TypeName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
|
||||||
|
</th>
|
||||||
|
<th>Amount
|
||||||
|
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
|
||||||
|
</th>
|
||||||
|
<th>Comments
|
||||||
|
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
|
||||||
|
</th>
|
||||||
|
<th ng-click="sort('Status')">Status
|
||||||
|
<span class="glyphicon sort-icon" ng-show="sortKey=='Status'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
|
||||||
|
</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody dir-paginate="p in searchResultDetails|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10">
|
||||||
|
|
||||||
|
<tr>
|
||||||
|
<td>
|
||||||
|
<label>
|
||||||
<input type="checkbox" ng-model="p.Selected" ng-change="openUpdateWind()" />
|
<input type="checkbox" ng-model="p.Selected" ng-change="openUpdateWind()" />
|
||||||
<!--{{p.StudentID}}-->
|
<!--{{p.StudentID}}-->
|
||||||
</label>
|
</label>
|
||||||
</td>
|
</td>
|
||||||
<td>{{p.Date}}</td>
|
<td>{{p.Date}}</td>
|
||||||
<td>{{p.ListName}}</td>
|
<td>{{p.ListName}}</td>
|
||||||
<td>{{p.TypeName}}</td>
|
<td>{{p.VoucherNumber}}</td>
|
||||||
<td>{{p.Amount}}</td>
|
<td>{{p.PaidTo}}</td>
|
||||||
<td style="width: 275px;">{{p.Description}}</td>
|
<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>
|
<div id="containersPara">
|
||||||
<span ng-if="p.Status == 'Approved'" style="text-transform: uppercase; text-shadow: 1px 1px #166307; color: #2be209 ">{{p.Status}}</span>
|
<div id="wrapper">
|
||||||
<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>
|
{{p.PaidDescription}}
|
||||||
</td>
|
</div>
|
||||||
</tr>
|
</div>
|
||||||
</tbody>
|
</td>
|
||||||
</table>
|
<td>{{p.TypeName}}</td>
|
||||||
<dir-pagination-controls max-size="10" direction-links="true" boundary-links="true">
|
<td>{{p.Amount}}</td>
|
||||||
</dir-pagination-controls>
|
<td>
|
||||||
|
<div id="containersPara">
|
||||||
|
<div id="wrapper">
|
||||||
|
{{p.Description}}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</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>
|
||||||
|
<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>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
<dir-pagination-controls max-size="10" direction-links="true" boundary-links="true">
|
||||||
|
</dir-pagination-controls>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -12,7 +12,28 @@
|
|||||||
<div class="container-fluid container-fullw bg-white">
|
<div class="container-fluid container-fullw bg-white">
|
||||||
<div ng-controller="daybooksuperadminCtrl">
|
<div ng-controller="daybooksuperadminCtrl">
|
||||||
<div ng-init="init()">
|
<div ng-init="init()">
|
||||||
|
<style>
|
||||||
|
/*#wrapper {
|
||||||
|
width: 200px;
|
||||||
|
height: 110px;
|
||||||
|
}*/
|
||||||
|
|
||||||
|
#containersPara {
|
||||||
|
/*background-color: #fff;*/
|
||||||
|
width: 180px;
|
||||||
|
height: 75px;
|
||||||
|
/*overflow-x: scroll;*/
|
||||||
|
color: rgba(7, 21, 176, 0.7);
|
||||||
|
overflow: auto
|
||||||
|
}
|
||||||
|
/*.square {
|
||||||
|
background-color: #00b;
|
||||||
|
float: left;
|
||||||
|
height: 90px;
|
||||||
|
width: 90px;
|
||||||
|
margin: 5px;
|
||||||
|
}*/
|
||||||
|
</style>
|
||||||
<div ng-if="localTypeViewSuperAdmin">
|
<div ng-if="localTypeViewSuperAdmin">
|
||||||
<tabset class="tabbable">
|
<tabset class="tabbable">
|
||||||
<tab heading="View" id="viewDayBook">
|
<tab heading="View" id="viewDayBook">
|
||||||
@ -29,33 +50,33 @@
|
|||||||
<input class="form-control" type="text" ng-model="search" id="search" autofocus tabindex="1" placeholder="Search" /><br><br>
|
<input class="form-control" type="text" ng-model="search" id="search" autofocus tabindex="1" placeholder="Search" /><br><br>
|
||||||
</div>-->
|
</div>-->
|
||||||
|
|
||||||
<div class="col-md-4">
|
<div class="col-md-4">
|
||||||
<!--<pre>{{searchData.date}}</pre>-->
|
<!--<pre>{{searchData.date}}</pre>-->
|
||||||
<div data-ng-controller="DatepickerDemoCtrl">
|
<div data-ng-controller="DatepickerDemoCtrl">
|
||||||
<label>
|
<label>
|
||||||
From Date
|
From Date
|
||||||
</label>
|
</label>
|
||||||
<input type="text" tabindex="1" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="searchData.date"
|
<input type="text" tabindex="1" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="searchData.date"
|
||||||
is-open="startOpen" ng-init="startOpen = false" name="addDate" datepicker-options="dateOptions"
|
is-open="startOpen" ng-init="startOpen = false" name="addDate" datepicker-options="dateOptions"
|
||||||
placeholder="Select Date" close-text="Close" required="required" ng-change="changeDate()"
|
placeholder="Select Date" close-text="Close" required="required" ng-change="changeDate()"
|
||||||
show-button-bar="true" />
|
show-button-bar="true" />
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-4">
|
<div class="col-md-4">
|
||||||
<!--<pre>{{searchData.date}}</pre>-->
|
<!--<pre>{{searchData.date}}</pre>-->
|
||||||
<div data-ng-controller="DatepickerDemoCtrl">
|
<div data-ng-controller="DatepickerDemoCtrl">
|
||||||
<label>
|
<label>
|
||||||
To Date
|
To Date
|
||||||
</label>
|
</label>
|
||||||
<input type="text" tabindex="1" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="searchData.dateTo"
|
<input type="text" tabindex="1" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="searchData.dateTo"
|
||||||
is-open="startOpen" ng-init="startOpen = false" name="addDate" datepicker-options="dateOptions"
|
is-open="startOpen" ng-init="startOpen = false" name="addDate" datepicker-options="dateOptions"
|
||||||
placeholder="Select Date" close-text="Close" required="required" ng-change="changeToDate()"
|
placeholder="Select Date" close-text="Close" required="required" ng-change="changeToDate()"
|
||||||
show-button-bar="true" />
|
show-button-bar="true" />
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-4 form-group" ng-class="{'has-error':Form.gender.$dirty && Form.addName.$invalid , 'has-success':Form.addName.$valid}">
|
<div class="col-md-4 form-group" ng-class="{'has-error':Form.gender.$dirty && Form.addName.$invalid , 'has-success':Form.addName.$valid}">
|
||||||
<label for="form-field-select-2">
|
<label for="form-field-select-2">
|
||||||
Income/Expense
|
Income/Expense
|
||||||
</label>
|
</label>
|
||||||
@ -83,96 +104,198 @@
|
|||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>-->
|
</div>-->
|
||||||
<div class="table-responsive" ng-if="showTheRefValue == 'I002'">
|
<div ng-if="showTheRefValue == 'I002'">
|
||||||
<table class="table table-hover" ng-if="searchResultLength > 0">
|
<style>
|
||||||
<thead>
|
.listCoutShow {
|
||||||
<tr>
|
margin: 12px;
|
||||||
<th ng-click="sort('BranchName')">Branch
|
padding: 4px;
|
||||||
<span class="glyphicon sort-icon" ng-show="sortKey=='BranchName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
|
padding-left: 10px;
|
||||||
</th>
|
padding-right: 10px;
|
||||||
|
border: 1px solid #59b176;
|
||||||
<th ng-click="sort('Date')">Date
|
border-radius: 7px;
|
||||||
<span class="glyphicon sort-icon" ng-show="sortKey=='Date'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
|
color: #FFF;
|
||||||
</th>
|
background-color: #5fba7d;
|
||||||
<th ng-click="sort('ListName')">Income/Expense
|
text-align: center;
|
||||||
<span class="glyphicon sort-icon" ng-show="sortKey=='ListName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
|
}
|
||||||
</th>
|
</style>
|
||||||
<th ng-click="sort('TypeName')">Type
|
|
||||||
<span class="glyphicon sort-icon" ng-show="sortKey=='TypeName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
|
<div class="row">
|
||||||
</th>
|
<div class="pull-right">
|
||||||
<th >Amount
|
<div style="margin: 8px;">
|
||||||
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
|
<div style="width: 45px; display: initial;">
|
||||||
</th>
|
<span style="font-size: 14px;
|
||||||
<th >Description
|
color: black;">Total Count:</span>
|
||||||
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
|
<span class="listCoutShow">{{ dataLengthIncome }}</span>
|
||||||
</th>
|
</div>
|
||||||
<!--<th ng-click="sort('amount')">Status
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="table-responsive">
|
||||||
|
<table style="width: 1200px;" class="table table-hover" ng-if="searchResultLength > 0">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th ng-click="sort('BranchName')">Branch
|
||||||
|
<span class="glyphicon sort-icon" ng-show="sortKey=='BranchName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
|
||||||
|
</th>
|
||||||
|
|
||||||
|
<th ng-click="sort('Date')">Date
|
||||||
|
<span class="glyphicon sort-icon" ng-show="sortKey=='Date'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
|
||||||
|
</th>
|
||||||
|
<th ng-click="sort('ListName')">Income/Expense
|
||||||
|
<span class="glyphicon sort-icon" ng-show="sortKey=='ListName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
|
||||||
|
</th>
|
||||||
|
<th>Voucher Number
|
||||||
|
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
|
||||||
|
</th>
|
||||||
|
<th ng-click="sort('PaidTo')">Paid To
|
||||||
|
<span class="glyphicon sort-icon" ng-show="sortKey=='PaidTo'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
|
||||||
|
</th>
|
||||||
|
<th>Description
|
||||||
|
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='PaidTo'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
|
||||||
|
</th>
|
||||||
|
<th ng-click="sort('TypeName')">Type
|
||||||
|
<span class="glyphicon sort-icon" ng-show="sortKey=='TypeName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
|
||||||
|
</th>
|
||||||
|
<th>Amount
|
||||||
|
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
|
||||||
|
</th>
|
||||||
|
<th>Description
|
||||||
|
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
|
||||||
|
</th>
|
||||||
|
<!--<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">
|
||||||
<tr>
|
<tr>
|
||||||
<td>{{p.BranchName}}</td>
|
<td>{{p.BranchName}}</td>
|
||||||
<td>{{p.Date}}</td>
|
<td>{{p.Date}}</td>
|
||||||
<td>{{p.ListName}}</td>
|
<td>{{p.ListName}}</td>
|
||||||
<td>{{p.TypeName}}</td>
|
<td>{{p.VoucherNumber}}</td>
|
||||||
<td>{{p.Amount}}</td>
|
<td>{{p.PaidTo}}</td>
|
||||||
<td style="width: 275px;">{{p.Description}}</td>
|
<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>
|
<div id="containersPara">
|
||||||
|
<div id="wrapper">
|
||||||
|
{{p.PaidDescription}}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
<td>{{p.TypeName}}</td>
|
||||||
|
<td>{{p.Amount}}</td>
|
||||||
|
<td>
|
||||||
|
<div id="containersPara">
|
||||||
|
<div id="wrapper">
|
||||||
|
{{p.Description}}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</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>
|
||||||
<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>
|
||||||
<dir-pagination-controls max-size="10" direction-links="true" boundary-links="true">
|
<dir-pagination-controls max-size="10" direction-links="true" boundary-links="true">
|
||||||
</dir-pagination-controls>
|
</dir-pagination-controls>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="table-responsive" ng-if="showTheRefValue == 'I001'">
|
<div ng-if="showTheRefValue == 'I001'">
|
||||||
<table class="table table-hover" ng-if="searchResultLength > 0">
|
<style>
|
||||||
<thead>
|
.listCoutShow {
|
||||||
<tr>
|
margin: 12px;
|
||||||
<th ng-click="sort('BranchName')">Branch
|
padding: 4px;
|
||||||
<span class="glyphicon sort-icon" ng-show="sortKey=='BranchName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
|
padding-left: 10px;
|
||||||
</th>
|
padding-right: 10px;
|
||||||
<th ng-click="sort('Date')">Date
|
border: 1px solid #59b176;
|
||||||
<span class="glyphicon sort-icon" ng-show="sortKey=='Date'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
|
border-radius: 7px;
|
||||||
</th>
|
color: #FFF;
|
||||||
<th ng-click="sort('ListName')">Income/Expense
|
background-color: #5fba7d;
|
||||||
<span class="glyphicon sort-icon" ng-show="sortKey=='ListName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
|
text-align: center;
|
||||||
</th>
|
}
|
||||||
<th ng-click="sort('TypeName')">Type
|
</style>
|
||||||
<span class="glyphicon sort-icon" ng-show="sortKey=='TypeName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
|
|
||||||
</th>
|
<div class="row">
|
||||||
<th>Amount
|
<div class="pull-right">
|
||||||
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
|
<div style="margin: 8px;">
|
||||||
</th>
|
<div style="width: 45px; display: initial;">
|
||||||
<th>Description
|
<span style="font-size: 14px;
|
||||||
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
|
color: black;">Total Count:</span>
|
||||||
</th>
|
<span class="listCoutShow">{{ dataLengthExpense }}</span>
|
||||||
<th ng-click="sort('Status')">Status
|
</div>
|
||||||
<span class="glyphicon sort-icon" ng-show="sortKey=='Status'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
|
</div>
|
||||||
</th>
|
</div>
|
||||||
</tr>
|
</div>
|
||||||
</thead>
|
<div class="table-responsive">
|
||||||
<tbody dir-paginate="p in searchResultDetails|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10">
|
<table style="width: 1200px;" class="table table-hover" ng-if="searchResultLength > 0">
|
||||||
<tr>
|
<thead>
|
||||||
<td>{{p.BranchName}}</td>
|
<tr>
|
||||||
<td>{{p.Date}}</td>
|
<th ng-click="sort('BranchName')">Branch
|
||||||
<td>{{p.ListName}}</td>
|
<span class="glyphicon sort-icon" ng-show="sortKey=='BranchName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
|
||||||
<td>{{p.TypeName}}</td>
|
</th>
|
||||||
<td>{{p.Amount}}</td>
|
<th ng-click="sort('Date')">Date
|
||||||
<td style="width: 275px;">{{p.Description}}</td>
|
<span class="glyphicon sort-icon" ng-show="sortKey=='Date'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></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>
|
</th>
|
||||||
<span ng-if="p.Status == 'Approved'" style="text-transform: uppercase; text-shadow: 1px 1px #166307; color: #2be209 ">{{p.Status}}</span>
|
<th ng-click="sort('ListName')">Income/Expense
|
||||||
<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 class="glyphicon sort-icon" ng-show="sortKey=='ListName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
|
||||||
</td>
|
</th>
|
||||||
</tr>
|
<th>Voucher Number
|
||||||
</tbody>
|
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
|
||||||
</table>
|
</th>
|
||||||
<dir-pagination-controls max-size="10" direction-links="true" boundary-links="true">
|
<th ng-click="sort('PaidTo')">Paid To
|
||||||
</dir-pagination-controls>
|
<span class="glyphicon sort-icon" ng-show="sortKey=='PaidTo'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
|
||||||
|
</th>
|
||||||
|
<th>Description
|
||||||
|
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='PaidTo'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
|
||||||
|
</th>
|
||||||
|
<th ng-click="sort('TypeName')">Type
|
||||||
|
<span class="glyphicon sort-icon" ng-show="sortKey=='TypeName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
|
||||||
|
</th>
|
||||||
|
<th>Amount
|
||||||
|
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
|
||||||
|
</th>
|
||||||
|
<th>Description
|
||||||
|
<!--<span class="glyphicon sort-icon" ng-show="sortKey=='EmailID'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>-->
|
||||||
|
</th>
|
||||||
|
<th ng-click="sort('Status')">Status
|
||||||
|
<span class="glyphicon sort-icon" ng-show="sortKey=='Status'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
|
||||||
|
</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody dir-paginate="p in searchResultDetails|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10">
|
||||||
|
<tr>
|
||||||
|
<td>{{p.BranchName}}</td>
|
||||||
|
<td>{{p.Date}}</td>
|
||||||
|
<td>{{p.ListName}}</td>
|
||||||
|
<td>{{p.VoucherNumber}}</td>
|
||||||
|
<td>{{p.PaidTo}}</td>
|
||||||
|
<td>
|
||||||
|
<div id="containersPara">
|
||||||
|
<div id="wrapper">
|
||||||
|
{{p.PaidDescription}}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
<td>{{p.TypeName}}</td>
|
||||||
|
<td>{{p.Amount}}</td>
|
||||||
|
<td>
|
||||||
|
<div id="containersPara">
|
||||||
|
<div id="wrapper">
|
||||||
|
{{p.Description}}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</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>
|
||||||
|
<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>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
<dir-pagination-controls max-size="10" direction-links="true" boundary-links="true">
|
||||||
|
</dir-pagination-controls>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -418,10 +418,11 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="col-md-4 form-group" ng-class="{'has-error':Form.jobResponsibility.$dirty && Form.jobResponsibility.$invalid}">
|
<div class="col-md-4 form-group" ng-class="{'has-error':Form.jobResponsibility.$dirty && Form.jobResponsibility.$invalid}">
|
||||||
<label>
|
<label>
|
||||||
Job Resposibility
|
Job Responsibility
|
||||||
</label>
|
</label>
|
||||||
<textarea placeholder="Enter Job Responsibility" tabindex="20" class="form-control textdsc" name="jobResponsibility" ng-model="empRoleDetail.JobResponsibility"></textarea>
|
<textarea maxlength="1000" placeholder="Enter Job Responsibility" tabindex="20" class="form-control textdsc" name="jobResponsibility" ng-model="empRoleDetail.JobResponsibility"></textarea>
|
||||||
<span class="error text-small block" ng-if="Form.jobResponsibility.$dirty && Form.jobResponsibility.$invalid">JOB Responsibility is required</span>
|
<span class="error text-small block" ng-if="Form.jobResponsibility.$dirty && Form.jobResponsibility.$invalid">JOB Responsibility is required</span>
|
||||||
|
<span class="text-small block">Job Responsibility Should be Less than 1000 Characters.</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<!--<div class="row">
|
<!--<div class="row">
|
||||||
|
|||||||
@ -470,11 +470,11 @@
|
|||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-md-4 form-group" ng-class="{'has-error':Form.jobResponsibility.$dirty && Form.jobResponsibility.$invalid}">
|
<div class="col-md-4 form-group" ng-class="{'has-error':Form.jobResponsibility.$dirty && Form.jobResponsibility.$invalid}">
|
||||||
<label>
|
<label>
|
||||||
Job Resposibility
|
Job Responsibility
|
||||||
</label>
|
</label>
|
||||||
<textarea maxlength="100" placeholder="Enter Job Responsibility" tabindex="20" class="form-control textdsc" name="jobResponsibility" ng-model="myModel.jobResponsibility"></textarea>
|
<textarea maxlength="1000" placeholder="Enter Job Responsibility" tabindex="20" class="form-control textdsc" name="jobResponsibility" ng-model="myModel.jobResponsibility"></textarea>
|
||||||
<span class="error text-small block" ng-if="Form.jobResponsibility.$dirty && Form.jobResponsibility.$invalid">JOB Responsibility is required</span>
|
<span class="error text-small block" ng-if="Form.jobResponsibility.$dirty && Form.jobResponsibility.$invalid">JOB Responsibility is required</span>
|
||||||
<span class="text-small block">Job Responsibility Should be Less than 100 Characters.</span>
|
<span class="text-small block">Job Responsibility Should be Less than 1000 Characters.</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-4">
|
<div class="col-md-4">
|
||||||
<label>
|
<label>
|
||||||
|
|||||||
@ -121,8 +121,8 @@
|
|||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
<th>
|
<th>
|
||||||
<input type="checkbox" ng-hide="allSelectedHide" ng-model="allSelected" ng-change="openUpdateWind()" ng-model-options="{getterSetter: true}"
|
<!--<input type="checkbox" ng-hide="allSelectedHide" ng-model="allSelected" ng-change="openUpdateWind()" ng-model-options="{getterSetter: true}"-->
|
||||||
/>
|
<!--/>-->
|
||||||
</th>
|
</th>
|
||||||
<th ng-click="sort('Firstname')">First Name
|
<th ng-click="sort('Firstname')">First Name
|
||||||
<span class="glyphicon sort-icon" ng-show="sortKey=='Firstname'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
|
<span class="glyphicon sort-icon" ng-show="sortKey=='Firstname'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
|
||||||
@ -146,7 +146,7 @@
|
|||||||
<tr>
|
<tr>
|
||||||
<td>
|
<td>
|
||||||
<label>
|
<label>
|
||||||
<input type="checkbox" ng-model="p.Selected" ng-change="openUpdateWind()" />
|
<input type="checkbox" ng-model="p.Selected" ng-change="setOneSelect(p)" />
|
||||||
<!--{{p.StudentID}}-->
|
<!--{{p.StudentID}}-->
|
||||||
</label>
|
</label>
|
||||||
</td>
|
</td>
|
||||||
@ -172,12 +172,14 @@
|
|||||||
<div ng-if="!prevNoRecordFound">
|
<div ng-if="!prevNoRecordFound">
|
||||||
<table class="table">
|
<table class="table">
|
||||||
<thead style="background-color: cadetblue">
|
<thead style="background-color: cadetblue">
|
||||||
|
<th>Sem/Year</th>
|
||||||
<th>Status</th>
|
<th>Status</th>
|
||||||
<th>Comments</th>
|
<th>Comments</th>
|
||||||
<th>Date</th>
|
<th>Date</th>
|
||||||
<th>Updated By</th>
|
<th>Updated By</th>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody ng-repeat="s in prevStatusListForStudentCourse">
|
<tbody ng-repeat="s in prevStatusListForStudentCourse">
|
||||||
|
<th>{{s.Sem_Year}}</th>
|
||||||
<td>{{s.ListName}}</td>
|
<td>{{s.ListName}}</td>
|
||||||
<td>{{s.Comments}}</td>
|
<td>{{s.Comments}}</td>
|
||||||
<td>{{s.AnsDate}}</td>
|
<td>{{s.AnsDate}}</td>
|
||||||
@ -207,6 +209,19 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div ng-if="OpenWindowStatus">
|
<div ng-if="OpenWindowStatus">
|
||||||
|
<style>
|
||||||
|
#cancel_button {
|
||||||
|
/*line-height: 12px;
|
||||||
|
width: 18px;
|
||||||
|
font-size: 8pt;
|
||||||
|
font-family: tahoma;*/
|
||||||
|
margin-top: 1px;
|
||||||
|
margin-right: 2px;
|
||||||
|
position: absolute;
|
||||||
|
top: 0;
|
||||||
|
right: 0;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
<form name="Form" id="form" novalidate ng-submit="statusUpdate.submit(Form, myStatusModel)" method="post">
|
<form name="Form" id="form" novalidate ng-submit="statusUpdate.submit(Form, myStatusModel)" method="post">
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
@ -217,6 +232,11 @@
|
|||||||
<legend>
|
<legend>
|
||||||
Update Status
|
Update Status
|
||||||
</legend>
|
</legend>
|
||||||
|
<div>
|
||||||
|
<a id="cancel_button" ng-click="unSelect()" tooltip="Close">
|
||||||
|
<span class="glyphicon glyphicon-remove-circle"></span>
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-md-4 form-group" ng-class="{'has-error':Form.semYear.$dirty && Form.semYear.$invalid, 'has-success':Form.semYear.$valid}">
|
<div class="col-md-4 form-group" ng-class="{'has-error':Form.semYear.$dirty && Form.semYear.$invalid, 'has-success':Form.semYear.$valid}">
|
||||||
<label for="form-field-select-2">
|
<label for="form-field-select-2">
|
||||||
|
|||||||
@ -180,9 +180,10 @@
|
|||||||
<th>Updated By</th>
|
<th>Updated By</th>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody ng-repeat="s in prevStatusListForStudentCourse">
|
<tbody ng-repeat="s in prevStatusListForStudentCourse">
|
||||||
|
|
||||||
<td>{{s.ListName}}</td>
|
<td>{{s.ListName}}</td>
|
||||||
<td>{{s.Comments}}</td>
|
<td>{{s.Comments}}</td>
|
||||||
<td>{{s.CertificateName}}</td>
|
<td>{{s.CertificateName}}</td>
|
||||||
<td>{{s.AppDate}}</td>
|
<td>{{s.AppDate}}</td>
|
||||||
<td>{{s.Firstname}}</td>
|
<td>{{s.Firstname}}</td>
|
||||||
</tbody>
|
</tbody>
|
||||||
@ -211,6 +212,19 @@
|
|||||||
|
|
||||||
<div ng-if="OpenWindowStatus">
|
<div ng-if="OpenWindowStatus">
|
||||||
<form name="Form" id="form" novalidate ng-submit="statusUpdate.submit(Form, myStatusModel)" method="post">
|
<form name="Form" id="form" novalidate ng-submit="statusUpdate.submit(Form, myStatusModel)" method="post">
|
||||||
|
<style>
|
||||||
|
#cancel_button {
|
||||||
|
/*line-height: 12px;
|
||||||
|
width: 18px;
|
||||||
|
font-size: 8pt;
|
||||||
|
font-family: tahoma;*/
|
||||||
|
margin-top: 1px;
|
||||||
|
margin-right: 2px;
|
||||||
|
position: absolute;
|
||||||
|
top: 0;
|
||||||
|
right: 0;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-md-3">
|
<div class="col-md-3">
|
||||||
@ -220,6 +234,15 @@
|
|||||||
<legend>
|
<legend>
|
||||||
Update Status
|
Update Status
|
||||||
</legend>
|
</legend>
|
||||||
|
<div>
|
||||||
|
<!--<input id="cancel_button" type="button" value="X">-->
|
||||||
|
<!--<span id="cancel_button" class="btn btn-success btn-lg">
|
||||||
|
<i class="glyphicon glyphicon-remove-circle"></i>
|
||||||
|
</span>-->
|
||||||
|
<a id="cancel_button" ng-click="unSelect()" tooltip="Close">
|
||||||
|
<span class="glyphicon glyphicon-remove-circle"></span>
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-md-6 form-group" ng-class="{'has-error':Form.certificatetype.$dirty && Form.certificatetype.$invalid, 'has-success':Form.certificatetype.$valid}">
|
<div class="col-md-6 form-group" ng-class="{'has-error':Form.certificatetype.$dirty && Form.certificatetype.$invalid, 'has-success':Form.certificatetype.$valid}">
|
||||||
<label for="form-field-select-2">
|
<label for="form-field-select-2">
|
||||||
@ -315,7 +338,8 @@
|
|||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-md-12">
|
<div class="col-md-12">
|
||||||
<div class="pull-right">
|
<div class="pull-right">
|
||||||
<button type="submit" ng-disabled="disableButton" tabindex="8" ladda="ldloading1.zoom_in" class="btn btn-wide btn-success" data-style="zoom-in">
|
<button type="submit" ng-disabled="disableButton" tabindex="8" ladda="ldloading1.zoom_in" class="btn btn-wide btn-success"
|
||||||
|
data-style="zoom-in">
|
||||||
<i class="fa fa-circle-o-notch fa-spin" ng-if="disableButton" style="font-size:14px"></i> Submit
|
<i class="fa fa-circle-o-notch fa-spin" ng-if="disableButton" style="font-size:14px"></i> Submit
|
||||||
</button>
|
</button>
|
||||||
<button type="reset" tabindex="9" class="btn btn-warning btn-wide" tabindex="9" ng-click="employeeForm.resetCourse(Form)">
|
<button type="reset" tabindex="9" class="btn btn-warning btn-wide" tabindex="9" ng-click="employeeForm.resetCourse(Form)">
|
||||||
|
|||||||
@ -171,6 +171,7 @@
|
|||||||
<div ng-if="!prevNoRecordFound">
|
<div ng-if="!prevNoRecordFound">
|
||||||
<table class="table">
|
<table class="table">
|
||||||
<thead style="background-color: cadetblue">
|
<thead style="background-color: cadetblue">
|
||||||
|
<th>Sem/Year</th>
|
||||||
<th>Status</th>
|
<th>Status</th>
|
||||||
<th>Comments</th>
|
<th>Comments</th>
|
||||||
<th>Type</th>
|
<th>Type</th>
|
||||||
@ -179,10 +180,11 @@
|
|||||||
<th>Updated By</th>
|
<th>Updated By</th>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody ng-repeat="s in prevStatusListForStudentCourse">
|
<tbody ng-repeat="s in prevStatusListForStudentCourse">
|
||||||
|
<th>{{s.Sem_Year}}</th>
|
||||||
<td>{{s.ListName}}</td>
|
<td>{{s.ListName}}</td>
|
||||||
<td>{{s.Comments}}</td>
|
<td>{{s.Comments}}</td>
|
||||||
<td>{{s.CertificationType}}</td>
|
<td>{{s.CertificationType}}</td>
|
||||||
<td>{{s.CertificationNo}}</td>
|
<td>{{s.CertificationNo}}</td>
|
||||||
<td>{{s.CDate}}</td>
|
<td>{{s.CDate}}</td>
|
||||||
<td>{{s.Firstname}}</td>
|
<td>{{s.Firstname}}</td>
|
||||||
</tbody>
|
</tbody>
|
||||||
@ -210,6 +212,19 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div ng-if="OpenWindowStatus">
|
<div ng-if="OpenWindowStatus">
|
||||||
|
<style>
|
||||||
|
#cancel_button {
|
||||||
|
/*line-height: 12px;
|
||||||
|
width: 18px;
|
||||||
|
font-size: 8pt;
|
||||||
|
font-family: tahoma;*/
|
||||||
|
margin-top: 1px;
|
||||||
|
margin-right: 2px;
|
||||||
|
position: absolute;
|
||||||
|
top: 0;
|
||||||
|
right: 0;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
<form name="Form" id="form" novalidate ng-submit="statusUpdate.submit(Form, myStatusModel)" method="post">
|
<form name="Form" id="form" novalidate ng-submit="statusUpdate.submit(Form, myStatusModel)" method="post">
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
@ -220,6 +235,11 @@
|
|||||||
<legend>
|
<legend>
|
||||||
Update Status
|
Update Status
|
||||||
</legend>
|
</legend>
|
||||||
|
<div>
|
||||||
|
<a id="cancel_button" ng-click="unSelect()" tooltip="Close">
|
||||||
|
<span class="glyphicon glyphicon-remove-circle"></span>
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<!--<div class="col-md-6 form-group" ng-class="{'has-error':Form.certificatetype.$dirty && Form.certificatetype.$invalid, 'has-success':Form.certificatetype.$valid}">
|
<!--<div class="col-md-6 form-group" ng-class="{'has-error':Form.certificatetype.$dirty && Form.certificatetype.$invalid, 'has-success':Form.certificatetype.$valid}">
|
||||||
<label for="form-field-select-2">
|
<label for="form-field-select-2">
|
||||||
@ -234,6 +254,7 @@
|
|||||||
<span class="error text-small block" ng-if="Form.certificatetype.$dirty && Form.certificatetype.$error.required">Certificate Type is Required</span>
|
<span class="error text-small block" ng-if="Form.certificatetype.$dirty && Form.certificatetype.$error.required">Certificate Type is Required</span>
|
||||||
|
|
||||||
</div>-->
|
</div>-->
|
||||||
|
|
||||||
<div class="col-md-6 form-group" ng-class="{'has-error':Form.semYear.$dirty && Form.semYear.$invalid, 'has-success':Form.semYear.$valid}">
|
<div class="col-md-6 form-group" ng-class="{'has-error':Form.semYear.$dirty && Form.semYear.$invalid, 'has-success':Form.semYear.$valid}">
|
||||||
<label for="form-field-select-2">
|
<label for="form-field-select-2">
|
||||||
Sem/Year <span class="symbol required"></span>
|
Sem/Year <span class="symbol required"></span>
|
||||||
|
|||||||
@ -121,8 +121,8 @@
|
|||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
<th>
|
<th>
|
||||||
<input type="checkbox" ng-hide="allSelectedHide" ng-model="allSelected" ng-change="openUpdateWind()" ng-model-options="{getterSetter: true}"
|
<!--<input type="checkbox" ng-hide="allSelectedHide" ng-model="allSelected" ng-change="openUpdateWind()" ng-model-options="{getterSetter: true}"
|
||||||
/>
|
/>-->
|
||||||
</th>
|
</th>
|
||||||
<th ng-click="sort('Firstname')">First Name
|
<th ng-click="sort('Firstname')">First Name
|
||||||
<span class="glyphicon sort-icon" ng-show="sortKey=='Firstname'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
|
<span class="glyphicon sort-icon" ng-show="sortKey=='Firstname'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
|
||||||
@ -147,7 +147,7 @@
|
|||||||
<tr>
|
<tr>
|
||||||
<td>
|
<td>
|
||||||
<label>
|
<label>
|
||||||
<input type="checkbox" ng-model="p.Selected" ng-bind="values = p.StudentID" ng-change="openUpdateWind()" />
|
<input type="checkbox" ng-model="p.Selected" ng-bind="values = p.StudentID" ng-change="setOneSelect(p)" />
|
||||||
|
|
||||||
</label>
|
</label>
|
||||||
</td>
|
</td>
|
||||||
@ -174,12 +174,14 @@
|
|||||||
<div ng-if="!prevNoRecordFound">
|
<div ng-if="!prevNoRecordFound">
|
||||||
<table class="table">
|
<table class="table">
|
||||||
<thead style="background-color: cadetblue">
|
<thead style="background-color: cadetblue">
|
||||||
|
<th>Sem/Year</th>
|
||||||
<th>Status</th>
|
<th>Status</th>
|
||||||
<th>Comments</th>
|
<th>Comments</th>
|
||||||
<th>Date</th>
|
<th>Date</th>
|
||||||
<th>Updated By</th>
|
<th>Updated By</th>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody ng-repeat="s in prevStatusListForStudentCourse">
|
<tbody ng-repeat="s in prevStatusListForStudentCourse">
|
||||||
|
<th>{{s.Sem_Year}}</th>
|
||||||
<td>{{s.ListName}}</td>
|
<td>{{s.ListName}}</td>
|
||||||
<td>{{s.Comments}}</td>
|
<td>{{s.Comments}}</td>
|
||||||
<td>{{s.SDate}}</td>
|
<td>{{s.SDate}}</td>
|
||||||
@ -209,9 +211,25 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div ng-if="OpenWindowStatus">
|
<div ng-if="OpenWindowStatus">
|
||||||
|
<style>
|
||||||
|
#cancel_button {
|
||||||
|
/*line-height: 12px;
|
||||||
|
width: 18px;
|
||||||
|
font-size: 8pt;
|
||||||
|
font-family: tahoma;*/
|
||||||
|
margin-top: 1px;
|
||||||
|
margin-right: 2px;
|
||||||
|
position: absolute;
|
||||||
|
top: 0;
|
||||||
|
right: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.target>div:target {
|
||||||
|
display: block;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
<form name="Form" id="form" novalidate ng-submit="statusUpdate.submit(Form, myStatusModel)" method="post">
|
<form name="Form" id="form" novalidate ng-submit="statusUpdate.submit(Form, myStatusModel)" method="post">
|
||||||
<div class="container">
|
<div id="bottom1" class="container">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-md-2">
|
<div class="col-md-2">
|
||||||
</div>
|
</div>
|
||||||
@ -221,6 +239,15 @@
|
|||||||
<legend>
|
<legend>
|
||||||
Update Status
|
Update Status
|
||||||
</legend>
|
</legend>
|
||||||
|
<div>
|
||||||
|
<!--<input id="cancel_button" type="button" value="X">-->
|
||||||
|
<!--<span id="cancel_button" class="btn btn-success btn-lg">
|
||||||
|
<i class="glyphicon glyphicon-remove-circle"></i>
|
||||||
|
</span>-->
|
||||||
|
<a id="cancel_button" ng-click="unSelect()" tooltip="Close">
|
||||||
|
<span class="glyphicon glyphicon-remove-circle"></span>
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-md-4 form-group" ng-class="{'has-error':Form.semYear.$dirty && Form.semYear.$invalid, 'has-success':Form.semYear.$valid}">
|
<div class="col-md-4 form-group" ng-class="{'has-error':Form.semYear.$dirty && Form.semYear.$invalid, 'has-success':Form.semYear.$valid}">
|
||||||
<label for="form-field-select-2">
|
<label for="form-field-select-2">
|
||||||
@ -292,7 +319,8 @@
|
|||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-md-12">
|
<div class="col-md-12">
|
||||||
<div class="pull-right">
|
<div class="pull-right">
|
||||||
<button type="submit" ng-disabled="disableButton" tabindex="8" ladda="ldloading1.zoom_in" class="btn btn-wide btn-success" data-style="zoom-in">
|
<button type="submit" ng-disabled="disableButton" tabindex="8" ladda="ldloading1.zoom_in" class="btn btn-wide btn-success"
|
||||||
|
data-style="zoom-in">
|
||||||
<i class="fa fa-circle-o-notch fa-spin" ng-if="disableButton" style="font-size:14px"></i>
|
<i class="fa fa-circle-o-notch fa-spin" ng-if="disableButton" style="font-size:14px"></i>
|
||||||
Submit
|
Submit
|
||||||
</button>
|
</button>
|
||||||
|
|||||||
@ -72,7 +72,7 @@
|
|||||||
<td>{{p.Fathername}}</td>
|
<td>{{p.Fathername}}</td>
|
||||||
<td><span ng-if="p.IsActive == true" style="text-transform: uppercase; text-shadow: 1px 1px #166307; color: #2be209 ">ACTIVE</span>
|
<td><span ng-if="p.IsActive == true" style="text-transform: uppercase; text-shadow: 1px 1px #166307; color: #2be209 ">ACTIVE</span>
|
||||||
<span tooltip="{{p.DeactiveComments}}" ng-if="p.IsActive == false" style="text-transform: uppercase; text-shadow: 1px 1px rgb(167, 88, 15); color: rgba(236, 24, 24, 0.98823529);">DEACTIVE</span></td>
|
<span tooltip="{{p.DeactiveComments}}" ng-if="p.IsActive == false" style="text-transform: uppercase; text-shadow: 1px 1px rgb(167, 88, 15); color: rgba(236, 24, 24, 0.98823529);">DEACTIVE</span></td>
|
||||||
<td>{{p.Comments}}</td>
|
<td style="width: 275px !important;">{{p.Comments}}</td>
|
||||||
<td style="text-align: center;">
|
<td style="text-align: center;">
|
||||||
<input type=button class="btn btn-info btn-xs" ladda="ldloading1.zoom_in" id="editRowBtn{{p.StudentID}}" value="Personal Details"
|
<input type=button class="btn btn-info btn-xs" ladda="ldloading1.zoom_in" id="editRowBtn{{p.StudentID}}" value="Personal Details"
|
||||||
ng-click="setEditId(p.StudentID);">
|
ng-click="setEditId(p.StudentID);">
|
||||||
@ -584,6 +584,7 @@
|
|||||||
</fieldset>
|
</fieldset>
|
||||||
<!--<pre> {{ myModel | json }}</pre>
|
<!--<pre> {{ myModel | json }}</pre>
|
||||||
<pre> {{ myModelCourse | json }}</pre>-->
|
<pre> {{ myModelCourse | json }}</pre>-->
|
||||||
|
<!--{"isNavbarFixed":true,"isSidebarFixed":true,"isSidebarClosed":true,"isFooterFixed":false,"theme":"theme-5","logo":"assets/images/logo.png"}-->
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user