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

daybook new requirements

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2018-09-19 16:12:49 +05:30
parent e383e3a8b8
commit 7f6e3460bc
9 changed files with 751 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -217,6 +217,8 @@ $route['getAllstudentcoursedetail'] = 'DataCorrection_Controller/getAllstudentco
$route['getAllfeedetail'] = 'DataCorrection_Controller/getAllfeedetail';
$route['updateCourseDetailss'] = 'DataCorrection_Controller/updateCourseDetailss';
$route['getStudentAllInfo'] = 'DayBook_Controller/getStudentAllInfo';
/*
@ -245,6 +247,8 @@ $route['getPrevStatusDetailsForStu'] = 'StatusUpdation_Controller/getPrevStatusD
$route['getStudentBasicInfo'] = 'StudentView_Controller/getStudentInfo';
/*get certificate Details*/
$route['getCertificateDetails'] = 'Certificate_Controller/getCertificateDetails';
$route['addCertificateDetails'] = 'Certificate_Controller/addCertificateDetails';

33
Apollo/api/application/controllers/DayBook_Controller.php
View File

@ -497,5 +497,38 @@ class DayBook_Controller extends REST_Controller {
$updatevalue = $this->daybook_model->UpdateDayFee($up_details);
}
public function getStudentAllInfo_post()
{
$mobileNumber = $this->post('mobileNumber');
$getdetails = $this->daybook_model->GetStudentAllDetail($mobileNumber);
//print_r($getdetails);
//die();
if($getdetails)
{
$getdetails['status'] = REST_Controller::HTTP_OK;
// Set the response and exit
$this->response($getdetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
}
else
{
// Set the response and exit
$this->response([
'message' => 'No records found!',
'status' => REST_Controller::HTTP_NOT_FOUND
], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
}
}
}

35
Apollo/api/application/models/DayBook_model.php Executable file → Normal file
View File

@ -66,7 +66,7 @@ class DayBook_model extends CI_Model
$reqpayType = $reqDataBy['localBranchID'];
$querys = "SELECT t1.ID as ORDER_ID, t1.*, t2.ListName, t3.TypeName , t5.Firstname as Approved_by_name ,
t7.UniversityName as UniversityName, t6.CourseName as CourseName,t8.Lastname
t7.UniversityName as UniversityName, t6.CourseName as CourseName,t7.UniversityID,t8.Lastname,t8.MobileNumber
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 AND t3.BranchCode = t1.BranchCode
@ -855,4 +855,37 @@ $query = $this->db->query($subQuery,array('%d-%m-%Y',$fromd,'%d-%m-%Y',$tod,'Can
return TRUE;
}
public function GetStudentAllDetail($mobileNumber)
{
// echo $mobileNumber.'model';
$this->db->select('*');
$this->db->from('T_StudentDetails');
$this->db->where('MobileNumber',$mobileNumber);
$searchDetails = $this->db->get();
// /print_r($searchDetails->result());
if($searchDetails->result())
{
// $searchDetails['status'] = REST_Controller::HTTP_OK;
// $this->response($searchDetails, REST_Controller::HTTP_OK);
$studentDetails['status'] = true;
$studentDetails['details'] = $searchDetails->result();
}
else
{
$studentDetails['status'] = false;
$studentDetails['details'] = "No records found!";
}
return $studentDetails;
}
}

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

@ -3,7 +3,7 @@
* daybook details capturing
*
*/
app.controller('daybookCtrl', ["$scope", "$rootScope", "toaster", "$filter", "ngTableParams", "API_POINTS", "$localStorage", "$http", "$state", 'ipCookie', '$window','SweetAlert', function ($scope, $rootScope, toaster, $filter, ngTableParams, apiPoint, $localStorage, $http, $state, ipCookie, $window, SweetAlert) {
app.controller('daybookCtrl', ["$scope", "$rootScope","$modal","toaster", "$filter", "ngTableParams", "API_POINTS", "$localStorage", "$http", "$state", 'ipCookie', '$window','SweetAlert', function ($scope, $rootScope, $modal,toaster, $filter, ngTableParams, apiPoint, $localStorage, $http, $state, ipCookie, $window, SweetAlert) {
// get local client details
var localDetail = JSON.parse(localStorage.getItem('localObj'));
@ -773,7 +773,236 @@ $scope.dayBookApprovalAccess = '';
};
$scope.searchData = {
'University': '',
'Course': '',
'Batch': '',
'Mobile': '',
'Name': ''
}
$scope.studentDetails='';$scope.studentDetails
$scope.searchResultDetails ='';
$scope.open = function (studentDetails) {
//alert(JSON.stringify(studentDetails));
var studentallDetails = {
method: 'POST',
url: apiPoint.url + 'getStudentAllInfo/',
headers: {
'Content-Type': 'application/json'
},
data: {
mobileNumber :studentDetails.MobileNumber,
requestedFrom: 3,
branchCode:JSON.parse(localStorage.getItem('localObj')).localBranchID
}
};
$http(studentallDetails).then(function (response) {
console.log(response.data.details);
if (response.data.status == 200) {
$scope.studentDetails=response.data.details;
console.log($scope.studentDetails);
} else {
swal("Failed!", "No details Availble", "warning");
}
});
// get student view details
var getcourse = {
method: 'POST',
url: apiPoint.url + 'getStudentBasicInfo/',
headers: {
'Content-Type': 'application/json'
},
data: {
requestedBy :studentDetails.MobileNumber,
requestedFrom: 3,
branchCode:JSON.parse(localStorage.getItem('localObj')).localBranchID
}
};
$http(getcourse).then(function (response) {
if (response.data.status == 200 && response.data.studentStatus== true) {
$scope.courseEditLoading = false;
// $scope.studentDetails = response.data.studentDetails;
$scope.studentDetails = response.data;
// $scope.courseDetails = response.data.courseDetails;
console.log($scope.studentDetails.studentDetails);
var modalInstance = $modal.open({
templateUrl: 'assets/views/student/studentDetailsModal.html',
controller: 'ModalInstanceCtrl',
// size: size,
resolve: {
items: function () {
return $scope.studentDetails;
}
}
});
modalInstance.result.then(function (selectedItem) {
$scope.selected = selectedItem;
}, function () {
$log.info('Modal dismissed at: ' + new Date());
});
} else {
swal("Failed!", "This student is not registerd", "warning");
$scope.courseEditLoading = false;
$scope.studentDetails = "";
$scope.courseDetails = "";
}
});
};
}]);
app.controller('ModalInstanceCtrl', ["$scope", "$modalInstance", "items","WordsService", function ($scope, $modalInstance, items,WordsService) {
$scope.items = items;
$scope.selected = {
item: $scope.items[0]
};
$scope.ok = function () {
$modalInstance.close($scope.selected.item);
};
$scope.cancel = function () {
$modalInstance.dismiss('cancel');
};
}]);
/*modal controller
* */
app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log", "API_POINTS", "$http", function ($scope, $rootScope, $modal, $log,apiPoint,$http) {
//Tooltip for print button
$scope.studentDetails='';$scope.studentDetails
$scope.searchResultDetails ='';
$scope.open = function (studentDetails) {
//alert(JSON.stringify(studentDetails));
var studentallDetails = {
method: 'POST',
url: apiPoint.url + 'getStudentAllInfo/',
headers: {
'Content-Type': 'application/json'
},
data: {
mobileNumber :studentDetails.MobileNumber,
requestedFrom: 3,
branchCode:JSON.parse(localStorage.getItem('localObj')).localBranchID
}
};
$http(studentallDetails).then(function (response) {
console.log(response.data.details);
if (response.data.status == 200) {
$scope.studentDetails=response.data.details;
} else {
swal("Failed!", "No details Availble", "warning");
}
});
// get student view details
var getcourse = {
method: 'POST',
url: apiPoint.url + 'getStudentBasicInfo/',
headers: {
'Content-Type': 'application/json'
},
data: {
requestedBy :studentDetails.MobileNumber,
requestedFrom: 3,
branchCode:JSON.parse(localStorage.getItem('localObj')).localBranchID
}
};
$http(getcourse).then(function (response) {
if (response.data.status == 200 && response.data.studentStatus== true) {
$scope.courseEditLoading = false;
// $scope.studentDetails = response.data.studentDetails;
$scope.studentDetails = response.data;
// $scope.courseDetails = response.data.courseDetails;
console.log($scope.studentDetails.studentDetails);
var modalInstance = $modal.open({
templateUrl: 'assets/views/student/studentDetailsModal.html',
controller: 'ModalInstanceCtrl',
// size: size,
resolve: {
items: function () {
return $scope.studentDetails;
}
}
});
modalInstance.result.then(function (selectedItem) {
$scope.selected = selectedItem;
}, function () {
$log.info('Modal dismissed at: ' + new Date());
});
} else {
swal("Failed!", "This student is not registerd", "warning");
$scope.courseEditLoading = false;
$scope.studentDetails = "";
$scope.courseDetails = "";
}
});
};
}]);

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

@ -3,7 +3,7 @@
* daybook details capturing
*
*/
app.controller('daybookadminCtrl', ["$scope", "$rootScope", "toaster", "$filter", "ngTableParams", "API_POINTS", "$localStorage", "$http", "$state", 'ipCookie', '$window','SweetAlert', function ($scope, $rootScope, toaster, $filter, ngTableParams, apiPoint, $localStorage, $http, $state, ipCookie, $window, SweetAlert) {
app.controller('daybookadminCtrl', ["$scope", "$rootScope","$modal","toaster", "$filter", "ngTableParams", "API_POINTS", "$localStorage", "$http", "$state", 'ipCookie', '$window','SweetAlert', function ($scope, $rootScope,$modal,toaster, $filter, ngTableParams, apiPoint, $localStorage, $http, $state, ipCookie, $window, SweetAlert) {
// get local client details
var localDetail = JSON.parse(localStorage.getItem('localObj'));
@ -760,6 +760,228 @@ $scope.dayBookApprovalAccess = '';
alasql('SELECT Date as Date, ListName as IncomeExpense, VoucherNumber as VoucherNumberBillNumber, PaidTo as PaidToReceivedFrom,FeePaymentDetails as Sem, CourseName as Course,UniversityName as University,TypeName as Type, ReceiptNo as Receipt_No, ReceiptNoComments as Comments, ModeOfPayment as Mode_of_Payment,Amount as Amount,Balance as Balance, Reason, Activity INTO XLS("daybook_details.xls",?) FROM ?',[styleXl(),$scope.data]);
};
$scope.searchData = {
'University': '',
'Course': '',
'Batch': '',
'Mobile': '',
'Name': ''
}
$scope.studentDetails='';$scope.studentDetails
$scope.searchResultDetails ='';
$scope.open = function (studentDetails) {
// alert(JSON.stringify(studentDetails));
var studentallDetails = {
method: 'POST',
url: apiPoint.url + 'getStudentAllInfo/',
headers: {
'Content-Type': 'application/json'
},
data: {
mobileNumber :studentDetails.MobileNumber,
requestedFrom: 3,
branchCode:JSON.parse(localStorage.getItem('localObj')).localBranchID
}
};
$http(studentallDetails).then(function (response) {
console.log(response.data.details);
if (response.data.status == 200) {
$scope.studentDetails=response.data.details;
console.log($scope.studentDetails);
} else {
swal("Failed!", "No details Availble", "warning");
}
});
// get student view details
var getcourse = {
method: 'POST',
url: apiPoint.url + 'getStudentBasicInfo/',
headers: {
'Content-Type': 'application/json'
},
data: {
requestedBy :studentDetails.MobileNumber,
requestedFrom: 3,
branchCode:JSON.parse(localStorage.getItem('localObj')).localBranchID
}
};
$http(getcourse).then(function (response) {
if (response.data.status == 200 && response.data.studentStatus== true) {
$scope.courseEditLoading = false;
// $scope.studentDetails = response.data.studentDetails;
$scope.studentDetails = response.data;
// $scope.courseDetails = response.data.courseDetails;
console.log($scope.studentDetails.studentDetails);
var modalInstance = $modal.open({
templateUrl: 'assets/views/student/studentDetailsModal.html',
controller: 'ModalInstanceCtrl',
// size: size,
resolve: {
items: function () {
return $scope.studentDetails;
}
}
});
modalInstance.result.then(function (selectedItem) {
$scope.selected = selectedItem;
}, function () {
$log.info('Modal dismissed at: ' + new Date());
});
} else {
swal("Failed!", "This student is not registerd", "warning");
$scope.courseEditLoading = false;
$scope.studentDetails = "";
$scope.courseDetails = "";
}
});
};
}]);
app.controller('ModalInstanceCtrl', ["$scope", "$modalInstance", "items","WordsService", function ($scope, $modalInstance, items,WordsService) {
$scope.items = items;
$scope.selected = {
item: $scope.items[0]
};
$scope.ok = function () {
$modalInstance.close($scope.selected.item);
};
$scope.cancel = function () {
$modalInstance.dismiss('cancel');
};
}]);
/*modal controller
* */
app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log", "API_POINTS", "$http", function ($scope, $rootScope, $modal, $log,apiPoint,$http) {
//Tooltip for print button
$scope.studentDetails='';$scope.studentDetails
$scope.searchResultDetails ='';
$scope.open = function (studentDetails) {
//alert(JSON.stringify(studentDetails));
var studentallDetails = {
method: 'POST',
url: apiPoint.url + 'getStudentAllInfo/',
headers: {
'Content-Type': 'application/json'
},
data: {
mobileNumber :studentDetails.MobileNumber,
requestedFrom: 3,
branchCode:JSON.parse(localStorage.getItem('localObj')).localBranchID
}
};
$http(studentallDetails).then(function (response) {
console.log(response.data.details);
if (response.data.status == 200) {
$scope.studentDetails=response.data.details;
} else {
swal("Failed!", "No details Availble", "warning");
}
});
// get student view details
var getcourse = {
method: 'POST',
url: apiPoint.url + 'getStudentBasicInfo/',
headers: {
'Content-Type': 'application/json'
},
data: {
requestedBy :studentDetails.MobileNumber,
requestedFrom: 3,
branchCode:JSON.parse(localStorage.getItem('localObj')).localBranchID
}
};
$http(getcourse).then(function (response) {
if (response.data.status == 200 && response.data.studentStatus== true) {
$scope.courseEditLoading = false;
// $scope.studentDetails = response.data.studentDetails;
$scope.studentDetails = response.data;
// $scope.courseDetails = response.data.courseDetails;
console.log($scope.studentDetails.studentDetails);
var modalInstance = $modal.open({
templateUrl: 'assets/views/student/studentDetailsModal.html',
controller: 'ModalInstanceCtrl',
// size: size,
resolve: {
items: function () {
return $scope.studentDetails;
}
}
});
modalInstance.result.then(function (selectedItem) {
$scope.selected = selectedItem;
}, function () {
$log.info('Modal dismissed at: ' + new Date());
});
} else {
swal("Failed!", "This student is not registerd", "warning");
$scope.courseEditLoading = false;
$scope.studentDetails = "";
$scope.courseDetails = "";
}
});
};
}]);

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

@ -3,7 +3,7 @@
* daybook details capturing
*
*/
app.controller('daybooksuperadminCtrl', ["$scope", "$rootScope", "toaster", "$filter", "ngTableParams", "API_POINTS", "$localStorage", "$http", "$state", 'ipCookie', '$window', 'SweetAlert', '$timeout', function ($scope, $rootScope, toaster, $filter, ngTableParams, apiPoint, $localStorage, $http, $state, ipCookie, $window, SweetAlert, $timeout) {
app.controller('daybooksuperadminCtrl', ["$scope", "$rootScope","$modal", "toaster", "$filter", "ngTableParams", "API_POINTS", "$localStorage", "$http", "$state", 'ipCookie', '$window', 'SweetAlert', '$timeout', function ($scope, $rootScope, $modal,toaster, $filter, ngTableParams, apiPoint, $localStorage, $http, $state, ipCookie, $window, SweetAlert, $timeout) {
// get local client details
var localDetail = JSON.parse(localStorage.getItem('localObj'));
@ -929,6 +929,227 @@ $scope.loadStaring = true;
};
$scope.searchData = {
'University': '',
'Course': '',
'Batch': '',
'Mobile': '',
'Name': ''
}
$scope.studentDetails='';$scope.studentDetails
$scope.searchResultDetails ='';
$scope.open = function (studentDetails) {
//alert(JSON.stringify(studentDetails));
var studentallDetails = {
method: 'POST',
url: apiPoint.url + 'getStudentAllInfo/',
headers: {
'Content-Type': 'application/json'
},
data: {
mobileNumber :studentDetails.MobileNumber,
requestedFrom: 3,
branchCode:JSON.parse(localStorage.getItem('localObj')).localBranchID
}
};
$http(studentallDetails).then(function (response) {
console.log(response.data.details);
if (response.data.status == 200) {
$scope.studentDetails=response.data.details;
} else {
swal("Failed!", "No details Availble", "warning");
}
});
// get student view details
var getcourse = {
method: 'POST',
url: apiPoint.url + 'getStudentBasicInfo/',
headers: {
'Content-Type': 'application/json'
},
data: {
requestedBy :studentDetails.MobileNumber,
requestedFrom: 3,
branchCode:JSON.parse(localStorage.getItem('localObj')).localBranchID
}
};
$http(getcourse).then(function (response) {
if (response.data.status == 200 && response.data.studentStatus== true) {
$scope.courseEditLoading = false;
// $scope.studentDetails = response.data.studentDetails;
$scope.studentDetails = response.data;
// $scope.courseDetails = response.data.courseDetails;
console.log($scope.studentDetails.studentDetails);
var modalInstance = $modal.open({
templateUrl: 'assets/views/student/studentDetailsModal.html',
controller: 'ModalInstanceCtrl',
// size: size,
resolve: {
items: function () {
return $scope.studentDetails;
}
}
});
modalInstance.result.then(function (selectedItem) {
$scope.selected = selectedItem;
}, function () {
$log.info('Modal dismissed at: ' + new Date());
});
} else {
swal("Failed!", "This student is not registerd", "warning");
$scope.courseEditLoading = false;
$scope.studentDetails = "";
$scope.courseDetails = "";
}
});
};
}]);
app.controller('ModalInstanceCtrl', ["$scope", "$modalInstance", "items","WordsService", function ($scope, $modalInstance, items,WordsService) {
$scope.items = items;
$scope.selected = {
item: $scope.items[0]
};
$scope.ok = function () {
$modalInstance.close($scope.selected.item);
};
$scope.cancel = function () {
$modalInstance.dismiss('cancel');
};
}]);
/*modal controller
* */
app.controller('studentModalDemoCtrl', ["$scope", "$rootScope", "$modal", "$log", "API_POINTS", "$http", function ($scope, $rootScope, $modal, $log,apiPoint,$http) {
//Tooltip for print button
$scope.studentDetails='';$scope.studentDetails
$scope.searchResultDetails ='';
$scope.open = function (studentDetails) {
// alert(JSON.stringify(studentDetails));
var studentallDetails = {
method: 'POST',
url: apiPoint.url + 'getStudentAllInfo/',
headers: {
'Content-Type': 'application/json'
},
data: {
mobileNumber :studentDetails.MobileNumber,
requestedFrom: 3,
branchCode:JSON.parse(localStorage.getItem('localObj')).localBranchID
}
};
$http(studentallDetails).then(function (response) {
console.log(response.data.details);
if (response.data.status == 200) {
$scope.studentDetails=response.data.details;
} else {
swal("Failed!", "No details Availble", "warning");
}
});
// get student view details
var getcourse = {
method: 'POST',
url: apiPoint.url + 'getStudentBasicInfo/',
headers: {
'Content-Type': 'application/json'
},
data: {
requestedBy :studentDetails.MobileNumber,
requestedFrom: 3,
branchCode:JSON.parse(localStorage.getItem('localObj')).localBranchID
}
};
$http(getcourse).then(function (response) {
if (response.data.status == 200 && response.data.studentStatus== true) {
$scope.courseEditLoading = false;
// $scope.studentDetails = response.data.studentDetails;
$scope.studentDetails = response.data;
// $scope.courseDetails = response.data.courseDetails;
console.log($scope.studentDetails.studentDetails);
var modalInstance = $modal.open({
templateUrl: 'assets/views/student/studentDetailsModal.html',
controller: 'ModalInstanceCtrl',
// size: size,
resolve: {
items: function () {
return $scope.studentDetails;
}
}
});
modalInstance.result.then(function (selectedItem) {
$scope.selected = selectedItem;
}, function () {
$log.info('Modal dismissed at: ' + new Date());
});
} else {
swal("Failed!", "This student is not registerd", "warning");
$scope.courseEditLoading = false;
$scope.studentDetails = "";
$scope.courseDetails = "";
}
});
};
}]);

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

@ -192,8 +192,10 @@
<td>{{p.Date}}</td>
<td>{{p.ListName}}</td>
<td>{{p.VoucherNumber}}</td>
<td>{{p.PaidTo}} {{ p.Lastname}}</td>
<td><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.PaidTo}} {{ p.Lastname}}</td>
<td> {{p.UniversityName}},{{p.CourseName}},{{p.FeePaymentDetails}}</td>
<td>
<span ng-if=" p.PaymentStatus == 1 ">{{p.TypeName}}</span>
<span tooltip="Fees Updation" ng-if=" p.PaymentStatus == 0 " style="color:chocolate">{{p.TypeName}}</span></td>

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

@ -191,7 +191,7 @@
<td>{{p.Date}}</td>
<td>{{p.ListName}}</td>
<td>{{p.VoucherNumber}}</td>
<td>{{p.PaidTo}} {{ p.Lastname}}</td>
<td><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.PaidTo}} {{ p.Lastname}}</td>
<!-- <td> {{p.FeePaymentDetails}}</td>
<td>{{p.CourseName}}</td> -->
<td>{{p.UniversityName}},{{p.CourseName}},{{p.FeePaymentDetails}}</td>

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

@ -180,7 +180,7 @@
<td>{{p.Date}}</td>
<td>{{p.ListName}}</td>
<td>{{p.VoucherNumber}}</td>
<td>{{p.PaidTo}} {{ p.Lastname}}</td>
<td><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.PaidTo}} {{ p.Lastname}}</td>
<td>{{p.UniversityName}},{{p.CourseName}},{{p.FeePaymentDetails}}</td>
<td>