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

daybook details changes : kdk

Browse Source
This commit is contained in:
dineshkumarkannan 2018-04-27 14:54:40 +05:30
parent ab7ff6e6ea
commit 8aa185950d
6 changed files with 83 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,8 +34,9 @@ class DayBook_Controller extends REST_Controller {
//get income expese type, name details //get income expese type, name details
public function getIncomeExpenseTypeState_post() { public function getIncomeExpenseTypeState_post() {
$reqData = $this->post('data'); $reqData = $this->post('localReqDetails');
$getIncomeExpenseTypeState = $this->daybook_model->get_Income_Expense_typeState();// Check if the employee exist
$getIncomeExpenseTypeState = $this->daybook_model->get_Income_Expense_typeState($reqData['localBranchID']);// Check if the employee exist
if ($getIncomeExpenseTypeState) if ($getIncomeExpenseTypeState)
{ {
$getIncomeExpenseTypeState['status'] = REST_Controller::HTTP_OK; $getIncomeExpenseTypeState['status'] = REST_Controller::HTTP_OK;

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

@ -15,7 +15,7 @@ class DayBook_model extends CI_Model
* */ * */
// get income expense type lists // get income expense type lists
public function get_Income_Expense_typeState(){ public function get_Income_Expense_typeState($branchId){
$this->db->select('t1.ListCode, t1.ListName'); $this->db->select('t1.ListCode, t1.ListName');
$this->db->from(''.PICK_LIST_DETAILS. ' as t1'); $this->db->from(''.PICK_LIST_DETAILS. ' as t1');
$this->db->where('t1.ListGroup', 10); $this->db->where('t1.ListGroup', 10);
@ -26,6 +26,7 @@ class DayBook_model extends CI_Model
$this->db->select('t2.TypeName, t2.TypeID, t2.ID'); $this->db->select('t2.TypeName, t2.TypeID, t2.ID');
$this->db->from(''.INCOMEOUTCOMEMASTER. ' as t2'); $this->db->from(''.INCOMEOUTCOMEMASTER. ' as t2');
$this->db->where('t2.IsActive', 1); $this->db->where('t2.IsActive', 1);
$this->db->where('t2.BranchCode', $branchId);
$typeNaDetails = $this->db->get(); $typeNaDetails = $this->db->get();
$typeNameDetails = $typeNaDetails->result(); $typeNameDetails = $typeNaDetails->result();
@ -68,11 +69,11 @@ class DayBook_model extends CI_Model
t7.UniversityName as UniversityName, t6.CourseName as CourseName t7.UniversityName as UniversityName, t6.CourseName as CourseName
FROM ".DAYBOOKMASTER." as t1 FROM ".DAYBOOKMASTER." as t1
LEFT JOIN ".PICK_LIST_DETAILS." as t2 ON t2.ListCode = t1.Name LEFT JOIN ".PICK_LIST_DETAILS." as t2 ON t2.ListCode = t1.Name
LEFT JOIN ".INCOMEOUTCOMEMASTER." as t3 ON t3.ID = t1.Type LEFT JOIN ".INCOMEOUTCOMEMASTER." as t3 ON t3.ID = t1.Type AND t3.BranchCode = t1.BranchCode
LEFT JOIN ".LOGIN." as t4 ON t4.ID = t1.Approval_By LEFT JOIN ".LOGIN." as t4 ON t4.ID = t1.Approval_By
LEFT JOIN ".STAFF." as t5 ON t5.StaffID = t4.StaffID LEFT JOIN ".STAFF." as t5 ON t5.StaffID = t4.StaffID
LEFT JOIN ".COURSE." as t6 ON t6.CourseID = t1.CourseID LEFT JOIN ".COURSE." as t6 ON t6.CourseID = t1.CourseID AND t6.BranchCode = t1.BranchCode
LEFT JOIN ".UNIVERSITY." as t7 ON t7.UniversityID = t6.UniversityID LEFT JOIN ".UNIVERSITY." as t7 ON t7.UniversityID = t6.UniversityID AND t7.BranchCode = t1.BranchCode
WHERE STR_TO_DATE(t1.Date, '%d-%m-%Y') BETWEEN '$fromDate' WHERE STR_TO_DATE(t1.Date, '%d-%m-%Y') BETWEEN '$fromDate'
AND '$toDate' AND t1.BranchCode = '$reqpayType' ORDER BY ORDER_ID DESC"; AND '$toDate' AND t1.BranchCode = '$reqpayType' ORDER BY ORDER_ID DESC";
// echo $querys;exit(); // echo $querys;exit();
@ -95,11 +96,11 @@ class DayBook_model extends CI_Model
t7.UniversityName as UniversityName, t6.CourseName as CourseName t7.UniversityName as UniversityName, t6.CourseName as CourseName
FROM ".DAYBOOKMASTER." as t1 FROM ".DAYBOOKMASTER." as t1
LEFT JOIN ".PICK_LIST_DETAILS." as t2 ON t2.ListCode = t1.Name LEFT JOIN ".PICK_LIST_DETAILS." as t2 ON t2.ListCode = t1.Name
LEFT JOIN ".INCOMEOUTCOMEMASTER." as t3 ON t3.ID = t1.Type LEFT JOIN ".INCOMEOUTCOMEMASTER." as t3 ON t3.ID = t1.Type AND t3.BranchCode = t1.BranchCode
LEFT JOIN ".LOGIN." as t4 ON t4.ID = t1.Approval_By LEFT JOIN ".LOGIN." as t4 ON t4.ID = t1.Approval_By
LEFT JOIN ".STAFF." as t5 ON t5.StaffID = t4.StaffID LEFT JOIN ".STAFF." as t5 ON t5.StaffID = t4.StaffID
LEFT JOIN ".COURSE." as t6 ON t6.CourseID = t1.CourseID LEFT JOIN ".COURSE." as t6 ON t6.CourseID = t1.CourseID AND t6.BranchCode = t1.BranchCode
LEFT JOIN ".UNIVERSITY." as t7 ON t7.UniversityID = t6.UniversityID LEFT JOIN ".UNIVERSITY." as t7 ON t7.UniversityID = t6.UniversityID AND t7.BranchCode = t1.BranchCode
WHERE t1.BranchCode = '$reqpayType' ORDER BY ORDER_ID DESC"; WHERE t1.BranchCode = '$reqpayType' ORDER BY ORDER_ID DESC";
} }
@ -120,18 +121,27 @@ class DayBook_model extends CI_Model
$toDate = $dTo->format('Y-m-d'); $toDate = $dTo->format('Y-m-d');
$reqpayType = $reqDataBy['localBranchID']; $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 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 $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
LEFT JOIN ".LOGIN." as t4 ON t4.ID = t1.Approval_By LEFT JOIN ".STAFF." as t5 ON t5.StaffID = t4.StaffID LEFT JOIN ".COURSE." as t6 ON t6.CourseID = t1.CourseID FROM ".DAYBOOKMASTER." as t1
LEFT JOIN ".UNIVERSITY." as t7 ON t7.UniversityID = t6.UniversityID 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
LEFT JOIN ".LOGIN." as t4 ON t4.ID = t1.Approval_By
LEFT JOIN ".STAFF." as t5 ON t5.StaffID = t4.StaffID
LEFT JOIN ".COURSE." as t6 ON t6.CourseID = t1.CourseID AND t6.BranchCode = t1.BranchCode
LEFT JOIN ".UNIVERSITY." as t7 ON t7.UniversityID = t6.UniversityID AND t7.BranchCode = t1.BranchCode
WHERE STR_TO_DATE(t1.Date, '%d-%m-%Y') BETWEEN '$fromDate' WHERE STR_TO_DATE(t1.Date, '%d-%m-%Y') BETWEEN '$fromDate'
AND '$toDate' AND t1.BranchCode = '$reqpayType' AND t1.Status NOT IN ('Approved', 'Cancel') ORDER BY ORDER_ID DESC"; AND '$toDate' AND t1.BranchCode = '$reqpayType' AND t1.Status NOT IN ('Approved', 'Cancel') ORDER BY ORDER_ID DESC";
} }
else { $reqpayType = $reqDataBy['localBranchID']; else { $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 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 $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
LEFT JOIN ".LOGIN." as t4 ON t4.ID = t1.Approval_By LEFT JOIN ".STAFF." as t5 ON t5.StaffID = t4.StaffID LEFT JOIN ".COURSE." as t6 ON t6.CourseID = t1.CourseID FROM ".DAYBOOKMASTER." as t1
LEFT JOIN ".UNIVERSITY." as t7 ON t7.UniversityID = t6.UniversityID 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
LEFT JOIN ".LOGIN." as t4 ON t4.ID = t1.Approval_By
LEFT JOIN ".STAFF." as t5 ON t5.StaffID = t4.StaffID
LEFT JOIN ".COURSE." as t6 ON t6.CourseID = t1.CourseID AND t6.BranchCode = t1.BranchCode
LEFT JOIN ".UNIVERSITY." as t7 ON t7.UniversityID = t6.UniversityID AND t7.BranchCode = t1.BranchCode
WHERE t1.BranchCode = '$reqpayType' AND t1.Status NOT IN ('Approved', 'Cancel') ORDER BY ORDER_ID DESC"; WHERE t1.BranchCode = '$reqpayType' AND t1.Status NOT IN ('Approved', 'Cancel') ORDER BY ORDER_ID DESC";
} }
$dayBookDetails = $this->db->query($querys); $dayBookDetails = $this->db->query($querys);
$dayBookDetailsList = $dayBookDetails->result(); $dayBookDetailsList = $dayBookDetails->result();

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

@ -21,7 +21,8 @@ app.controller('daybooksuperadminCtrl', ["$scope", "$rootScope", "toaster", "$fi
$scope.init = function () { $scope.init = function () {
if (localDetail != null) { if (localDetail != null) {
if (localDetails.localType === 'R004') { if (localDetails.localType === 'R004') {
$scope.getBranchList(); // $scope.getBranchList();
getDetails();
} else { } else {
ipCookie.remove('cookiechk'); ipCookie.remove('cookiechk');
$window.localStorage.clear(); $window.localStorage.clear();
@ -32,33 +33,33 @@ app.controller('daybooksuperadminCtrl', ["$scope", "$rootScope", "toaster", "$fi
} }
$scope.getBranchList = function () { // $scope.getBranchList = function () {
$scope.loader = true; // $scope.loader = true;
var empListreq = { // var empListreq = {
method: 'POST', // method: 'POST',
url: apiPoint.url + 'getBranchListDetails/', // url: apiPoint.url + 'getBranchListDetails/',
headers: { // headers: {
'Content-Type': 'application/json' // 'Content-Type': 'application/json'
}, // },
data: { // data: {
data: localDetails // data: localDetails
} // }
}; // };
$http(empListreq).then(function (response) { // $http(empListreq).then(function (response) {
if (response.data.branDetailstatus) { // if (response.data.branDetailstatus) {
$scope.loader = false; // $scope.loader = false;
$scope.branchList_data = response.data.branch_details; // $scope.branchList_data = response.data.branch_details;
} else { // } else {
} // }
}); // });
} // }
$scope.changeBranch = function () { // $scope.changeBranch = function () {
$scope.viewStudentDetailsPage = false; // $scope.viewStudentDetailsPage = false;
localDetails.localBranchID = $scope.localBranchDetails; // localDetails.localBranchID = $scope.localBranchDetails;
localDetail.localBranchID = $scope.localBranchDetails; // localDetail.localBranchID = $scope.localBranchDetails;
getDetails() // getDetails()
} // }
function getDetails() { function getDetails() {
$scope.todayDate = new Date(); $scope.todayDate = new Date();
@ -421,9 +422,9 @@ $scope.dayBookApprovalAccess = '';
$http(addDayBookDetails).then(function (response) { $http(addDayBookDetails).then(function (response) {
if (response.data.addDayBookStatus) { if (response.data.addDayBookStatus) {
swal(" ", "Income/Expense added successfully.", "success"); swal(" ", "Income/Expense added successfully.", "success");
// $state.go($state.current, {}, { reload: true }); $state.go($state.current, {}, { reload: true });
$scope.viewStudentDetailsPage = false; $scope.viewStudentDetailsPage = false;
$scope.myActivateDiv(); // $scope.myActivateDiv();
$scope.disableAddButton = false; $scope.disableAddButton = false;
} else { } else {
swal(" ", response.data.message, "error"); swal(" ", response.data.message, "error");
@ -450,25 +451,25 @@ $scope.dayBookApprovalAccess = '';
} }
$scope.myActivateDiv = function () { // $scope.myActivateDiv = function () {
$scope.viewStudentDetailsPage = false; // $scope.viewStudentDetailsPage = false;
$scope.myModelAdd = { // $scope.myModelAdd = {
"id": "", // "id": "",
"date": "", // "date": "",
"name": "", // "name": "",
"type": "", // "type": "",
"amount": "", // "amount": "",
"status": "", // "status": "",
"description": "", // "description": "",
"paidTo": "", // "paidTo": "",
"description_paid": "", // "description_paid": "",
"voucherNumber": "" // "voucherNumber": ""
} // }
$timeout(function () { // $timeout(function () {
getDetails(); // getDetails();
}, 1000); // }, 1000);
} // }
// update a daybook entry details // update a daybook entry details

3
Apollo/assets/js/controllers/daybooksuperadminapprovalCtrl.js
View File

@ -21,7 +21,8 @@ app.controller('daybooksuperadminapprovalCtrl', ["$scope", "$rootScope", "toaste
$scope.init = function () { $scope.init = function () {
if (localDetail != null) { if (localDetail != null) {
if (localDetails.localType === 'R004') { if (localDetails.localType === 'R004') {
$scope.getBranchList(); // $scope.getBranchList();
getDetails()
} else { } else {
ipCookie.remove('cookiechk'); ipCookie.remove('cookiechk');
$window.localStorage.clear(); $window.localStorage.clear();

26
Apollo/assets/views/daybook/daybooksuperAdminApproval.html
View File

@ -10,31 +10,9 @@
<!-- end: PAGE TITLE --> <!-- end: PAGE TITLE -->
<!-- start: DAY BOOK --> <!-- start: DAY BOOK -->
<div class="container-fluid container-fullw bg-white"> <div class="container-fluid container-fullw bg-white">
<div ng-controller="daybooksuperadminapprovalCtrl" > <div ng-controller="daybooksuperadminapprovalCtrl" ng-init="init()">
<div class="container" ng-init="init()">
<div class="row">
<div class="col-lg-4"></div>
<div class="col-lg-4">
<div> <div>
<label for="form-field-select-2">
Select Branch
</label>
<select class="form-control" tabindex="0" class="cs-select cs-skin-elastic" name="branch" ng-model="localBranchDetails" ng-change="changeBranch()"
id="selectBranch" required>
<option value="" disabled selected>Select Branch</option>
<option ng-repeat="bdata in branchList_data" value="{{bdata.BranchCode}}">{{bdata.BranchName}}</option>
</select>
</div>
<!-- ng-if="loader == true"-->
<span ng-if="loader == true" style="color: #007AFF;
font-size: 16px;">Loading...</span>
</div>
<div class="col-lg-4"></div>
</div>
</div>
<div ng-if="viewStudentDetailsPage">
<tabset class="tabbable"> <tabset class="tabbable">
<tab heading="View" id="viewDayBook"> <tab heading="View" id="viewDayBook">
<div class="container-fluid container-fullw"> <div class="container-fluid container-fullw">

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

@ -10,63 +10,15 @@
<!-- end: PAGE TITLE --> <!-- end: PAGE TITLE -->
<!-- start: DAY BOOK --> <!-- start: DAY BOOK -->
<div class="container-fluid container-fullw bg-white"> <div class="container-fluid container-fullw bg-white">
<div ng-controller="daybooksuperadminCtrl" > <div ng-controller="daybooksuperadminCtrl" ng-init="init()" >
<div class="container" ng-init="init()">
<div class="row">
<div class="col-lg-4"></div>
<div class="col-lg-4">
<div> <div>
<label for="form-field-select-2"> <tabset class="tabbable">
Select Branch
</label>
<select class="form-control" tabindex="0" class="cs-select cs-skin-elastic" name="branch" ng-model="localBranchDetails" ng-change="changeBranch()"
id="selectBranch" required>
<option value="" disabled selected>Select Branch</option>
<option ng-repeat="bdata in branchList_data" value="{{bdata.BranchCode}}">{{bdata.BranchName}}</option>
</select>
</div>
<!-- ng-if="loader == true"-->
<span ng-if="loader == true" style="color: #007AFF;
font-size: 16px;">Loading...</span>
</div>
<div class="col-lg-4"></div>
</div>
</div>
<div ng-if="viewStudentDetailsPage">
<tabset class="tabbable" ng-init="init()">
<tab heading="View" id="viewDayBook"> <tab heading="View" id="viewDayBook">
<div class="container-fluid container-fullw"> <div class="container-fluid container-fullw">
<div class="row"> <div class="row">
<!--<div class="col-md-12" align="center">
<spinner name="html5spinner">
<div class="overlay"></div>
<div class="spinner">
<div class="double-bounce1"></div>
<div class="double-bounce2"></div>
</div>
<div class="please-wait">Please Wait...</div>
</spinner>
</div>
<div class="col-md-12" ng-if="studentData == false" style="min-height: 281px;">
<p style="color: red;" align="center"><strong><h3 class="text-center">No
records found... </h3></strong></p>
</div>-->
<div class="col-md-12"> <div class="col-md-12">
<div class="row"> <div class="row">
<!--<div class="col-md-3">
<script>
$(function () {
$("#search").focus();
});
</script>
<input class="form-control" type="text" ng-model="search" id="search" autofocus tabindex="1" placeholder="Search" /><br><br>
</div>-->
<div class="col-md-4"> <div class="col-md-4">
<!--<pre>{{searchData.date}}</pre>-->
<div data-ng-controller="DatepickerDemoCtrl"> <div data-ng-controller="DatepickerDemoCtrl">
<label> <label>
From Date From Date