From 2ab7b8abe87509fc8e2fe1ae5ec9cee0e40f0f96 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Wed, 25 Jul 2018 08:01:24 +0000 Subject: [PATCH 01/16] Fees_status_model.php edited online with Bitbucket --- Apollo/api/application/models/Fees_status_model.php | 1 + 1 file changed, 1 insertion(+) diff --git a/Apollo/api/application/models/Fees_status_model.php b/Apollo/api/application/models/Fees_status_model.php index 38c1f703..ddb47150 100755 --- a/Apollo/api/application/models/Fees_status_model.php +++ b/Apollo/api/application/models/Fees_status_model.php @@ -482,6 +482,7 @@ class Fees_status_model extends CI_Model } $this->db->select('BillNO'); $this->db->where('UpdatedBy', $feesPaidDetails['UpdatedBy']); + $this->db->order_by('BillNO', 'asc'); $getLastBillNo=$this->db->get(STUDENTS_FEES_PAID)->last_row(); if($getLastBillNo){ $strExplode= explode("-", $getLastBillNo->BillNO); From 11350812b0d6bb033a59b010135597647d032bf4 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Sat, 28 Jul 2018 10:23:15 +0000 Subject: [PATCH 02/16] nav.html edited online with Bitbucket For Re Registration access changing --- Apollo/assets/views/partials/nav.html | 78 +++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/Apollo/assets/views/partials/nav.html b/Apollo/assets/views/partials/nav.html index 7b812ad9..a01019b1 100755 --- a/Apollo/assets/views/partials/nav.html +++ b/Apollo/assets/views/partials/nav.html @@ -765,6 +765,32 @@ +
  • + +
    +
    + +
    +
    + REREGISTRATION +
    +
    +     + + +
  • @@ -1070,6 +1096,32 @@
    • +
  • + +
    +
    + +
    +
    + REREGISTRATION +
    +
    +     + + +
  • @@ -1298,6 +1350,32 @@
    • +
  • + +
    +
    + +
    +
    + REREGISTRATION +
    +
    +     + + +
  • From abd5049db08a3136b5e5e85a63d45cb8255aa0e5 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Thu, 2 Aug 2018 11:59:08 +0530 Subject: [PATCH 03/16] income expense report --- Apollo/api/application/config/routes.php | 12 + .../controllers/DayBook_Controller.php | 156 +++++++ .../api/application/models/DayBook_model.php | 113 +++++ Apollo/assets/i18n/en.json | 6 +- Apollo/assets/js/config.constant.js | 16 + Apollo/assets/js/config.router.js | 16 + Apollo/assets/js/controllers/incomeCtrl.js | 269 +++++++++++ .../js/controllers/income_reportCtrl.js | 432 ++++++++++++++++++ Apollo/assets/views/add_income_expense.html | 96 ++++ .../views/daybook/daybooksuperadmin.html | 19 +- .../assets/views/income_expense_report.html | 232 ++++++++++ .../views/income_expense_report_pdf.html | 159 +++++++ Apollo/assets/views/partials/nav.html | 40 ++ 13 files changed, 1561 insertions(+), 5 deletions(-) create mode 100644 Apollo/assets/js/controllers/incomeCtrl.js create mode 100644 Apollo/assets/js/controllers/income_reportCtrl.js create mode 100644 Apollo/assets/views/add_income_expense.html create mode 100644 Apollo/assets/views/income_expense_report.html create mode 100644 Apollo/assets/views/income_expense_report_pdf.html diff --git a/Apollo/api/application/config/routes.php b/Apollo/api/application/config/routes.php index 2b30e564..e0821fab 100755 --- a/Apollo/api/application/config/routes.php +++ b/Apollo/api/application/config/routes.php @@ -176,6 +176,18 @@ $route['deleteSetFeesDetails'] = 'Fees_Status_Controller/deleteSetFeesDetails'; /*update fees details for student*/ $route['updateFeesDetails'] = 'Fees_Status_Controller/updateFeesDetails'; $route['getUniversityCourseForFees'] = 'Fees_Status_Controller/getUniversityCourseForFees'; + + +/*account type*/ +$route['getAccounttypes'] = 'DayBook_Controller/getAccounttypes'; +$route['addAccountnameDetails'] = 'DayBook_Controller/addAccountnameDetails'; +$route['IncomeExpenseDetails'] = 'DayBook_Controller/getIncomeExpenseDetails'; +$route['ViewFullIncomeDetails'] = 'DayBook_Controller/ViewFullIncomeDetails'; +$route['GetSubTypes'] = 'DayBook_Controller/GetSubTypes'; + + + + /* * get default activity details * */ diff --git a/Apollo/api/application/controllers/DayBook_Controller.php b/Apollo/api/application/controllers/DayBook_Controller.php index b7f3fc13..818009c5 100755 --- a/Apollo/api/application/controllers/DayBook_Controller.php +++ b/Apollo/api/application/controllers/DayBook_Controller.php @@ -30,8 +30,61 @@ class DayBook_Controller extends REST_Controller { parent::__construct(); // load the university model $this->load->model('DayBook_model', 'daybook_model'); + + + $this->methods['addAccountnameDetails_get']['limit'] = 500; // 500 requests per hour per user/key + $this->methods['addAccountnameDetails_post']['limit'] = 100; // 100 requests per hour per user/key + $this->methods['addAccountnameDetails_delete']['limit'] = 50; // 50 requests per hour per user/key + $this->load->model('Status_model', 'status_model'); + + $this->methods['GetSubTypes']['limit'] = 500; } + + + + public function addAccountnameDetails_post() + { + + + $now = new DateTime(); + $now->setTimezone(new DateTimezone('Asia/Kolkata')); + $details['ListName'] = $this->post('statusName'); + $details['ListGroup'] = "10"; + $details['CreatedBy'] = $this->post('createdBy'); + $details['IsActive'] = $this->post('status'); + $details['BranchCode'] = $this->post('branch'); + $details['CreatedOn'] = $now->format('Y-m-d H:i:s'); + $statusDetails = $this->status_model->addstatus($details);// Check if the users data store contains users (in case the database result returns NULL) + if ($statusDetails) + { + $statusDetails['status'] = REST_Controller::HTTP_OK; + // Set the response and exit + $this->response($statusDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code + } + else + { + // Set the response and exit + $this->response([ + 'message' => 'Something went wrong.please try again!', + 'status' => REST_Controller::HTTP_NOT_FOUND + ], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code + } + + + } + + + + + + + + + + + + //get income expese type, name details public function getIncomeExpenseTypeState_post() { $reqData = $this->post('localReqDetails'); @@ -293,5 +346,108 @@ class DayBook_Controller extends REST_Controller { ], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code } } + + + + + public function getAccounttypes_post() + { + $requestedBy = $this->post('requestedBy'); + $requestedBranch = $this->post('requestBranch'); + //echo $requestedBy; + $getStatus = $this->daybook_model->getAccounttype($requestedBy,$requestedBranch); +// print_r($getStatus); +// die(); + if ($getStatus) + { + $getStatus['status'] = REST_Controller::HTTP_OK; + // Set the response and exit + $this->response($getStatus, 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 + } + + + } + + public function ViewFullIncomeDetails_post() + { + $from = $this->post('from'); + $to = $this->post('to'); + $incid = 'I002'; + + $getincomedetails = $this->daybook_model->getIncome_Details($from,$to,$incid); + + // print_r($getincomedetails); + // die(); + if ($getincomedetails) + { + $getincomedetails['status'] = REST_Controller::HTTP_OK; + // Set the response and exit + $this->response($getincomedetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code + } + + + } + + + + public function getIncomeExpenseDetails_post() + { + $from = $this->post('from'); + $to = $this->post('to'); + $br = $this->post('branch'); + // echo $from.'from'; + // echo $to.'to'; + $getStatus = $this->daybook_model->Income_expense($from,$to,$br); + //print_r($getStatus); + if ($getStatus) + { + $getStatus['status'] = REST_Controller::HTTP_OK; + // Set the response and exit + $this->response($getStatus, 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 + } + + } + + + public function GetSubTypes_post() + { +//echo 'in'; + + $getsubtypes = $this->daybook_model->Income_expenseSubtype(); + + // print_r($getsubtypes); + // die(); + + if($getsubtypes) + { + + $getsubtypes['status'] = REST_Controller::HTTP_OK; + // Set the response and exit + $this->response($getsubtypes, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code + } + else + { + $this->response([ + 'message' => 'No records found!', + 'status' => REST_Controller::HTTP_NOT_FOUND + ], REST_Controller::HTTP_NOT_FOUND); + } + } } diff --git a/Apollo/api/application/models/DayBook_model.php b/Apollo/api/application/models/DayBook_model.php index 26a2b1ec..f1c08f6b 100755 --- a/Apollo/api/application/models/DayBook_model.php +++ b/Apollo/api/application/models/DayBook_model.php @@ -626,4 +626,117 @@ class DayBook_model extends CI_Model $results['dayBookListDetails'] = $dayBookDetailsList; return $results; } + + + public function getAccounttype($requestedBy,$requestedBranch) + { + $this->db->select('ListCode,ListName,IsActive'); + $this->db->where('ListGroup','10'); + //$this->db->where('BranchCode', $reqBranch); + $this->db->order_by('ListCode','DESC'); + $statusDetails = $this->db->get(PICK_LIST_DETAILS); + if($statusDetails->result()){ + + $result['Status'] = true; + $result['details'] = $statusDetails->result(); + } + else { + $result['Status'] = false; + $result['message'] = "No records found!"; + } + + return $result; + } + + + public function Income_expense($from,$to,$br) + { + $incomecode='I002'; + $expensecode='I001'; + + $fromd= date("d-m-Y",strtotime($from)); + $tod=date("d-m-Y",strtotime($to)); + + $subQuery= 'SELECT + DISTINCT(p.Name) AS TID,ListName, + SUM(IF(p.Name=?,Amount,0)) AS Income, + SUM(IF(p.Name=?,Amount,0)) AS Expense, + SUM( CASE Name + WHEN ? THEN Amount + WHEN ? THEN Amount + END) AS Total + FROM + T_DayBookMaster AS p + join T_PickListDetails on T_PickListDetails.ListCode = p.name + where Date>=? and Date<=? and p.IsActive=? and (p.Name=? or p.Name=?) + GROUP BY p.`Name`'; + $query = $this->db->query($subQuery,array($incomecode,$expensecode,$incomecode,$expensecode,$fromd,$tod,'1','I001','I002')); + $expense = $query->result(); + + if(count($query)>0) + { + $results['expense_data'] = $expense; + } + + return $results; + + } + + + public function getIncome_Details($from,$to,$incid) + { + $fromd= date("d-m-Y",strtotime($from)); + $tod=date("d-m-Y",strtotime($to)); + $expid = 'I001'; + + // $subQuery = 'select T_DayBookMaster.ID,TypeName,Amount,T_DayBookMaster.Date,Reason,Description from T_DayBookMaster + // join T_Income_Outcome_Master on T_Income_Outcome_Master.TypeID=T_DayBookMaster.Name and + // T_Income_Outcome_Master.ID = T_DayBookMaster.Type where Name=? and date>=? and date<=?'; + + $subQuery = 'select Name,T_DayBookMaster.ID,T_Income_Outcome_Master.TypeID as OrgType,T_Income_Outcome_Master.TypeName,Amount,T_DayBookMaster.Date,Reason,T_DayBookMaster.Description,ListName from T_DayBookMaster left join T_Income_Outcome_Master on + T_Income_Outcome_Master.ID = T_DayBookMaster.Type + join T_PickListDetails on T_PickListDetails.ListCode = T_Income_Outcome_Master.TypeID + where Name in (?,?) and date>=? and date<=?'; + + $query = $this->db->query($subQuery,array($incid,$expid,$fromd,$tod)); + + + // print_r( $this->db->last_query()); + // die(); + + $expense = $query->result(); + + if(count($query)>0) + { + $results['fullexpense_detail'] = $expense; + } + + return $results; + + //return $query->result_array(); + + + } + + + public function Income_expenseSubtype() + { + $this->db->select('ListCode,ListName,IsActive'); + $this->db->where('ListGroup','10'); + + $this->db->order_by('ListCode','DESC'); + $statusDetails = $this->db->get(PICK_LIST_DETAILS); + if($statusDetails->result()){ + + $result['Status'] = true; + $result['details'] = $statusDetails->result(); + } + else { + $result['Status'] = false; + $result['message'] = "No records found!"; + } + + return $result; + + } } \ No newline at end of file diff --git a/Apollo/assets/i18n/en.json b/Apollo/assets/i18n/en.json index 35f88782..548b628a 100755 --- a/Apollo/assets/i18n/en.json +++ b/Apollo/assets/i18n/en.json @@ -75,7 +75,8 @@ "SESSIONMASTER":"SESSION DETAILS", "SESSIONSCHEDULE": "SESSION SCHEDULE", "HALLTICKET": "GENERATE HALLTICKET", - "REREGISTRATION":"RE REGISTRATION" + "REREGISTRATION":"RE REGISTRATION", + "ACCOUNTTYPE":"ACCOUNT TYPE" }, "report": { "TITLE": "REPORTS", @@ -136,7 +137,8 @@ "DAYBOOK": "DAY BOOK ", "APPROVAL": "APPROVE EXPENSE", "DAYBOOKDETAILS": "DAYBOOK DETAILS", - "DAYBOOKAPPROVAL": "DAYBOOK APPROVAL" + "DAYBOOKAPPROVAL": "DAYBOOK APPROVAL", + "INCOMEEXPENSEREPORT" : "INCOME EXPENSE REPORT" }, "mydetails": { "MAIN": "MY DETAILS" diff --git a/Apollo/assets/js/config.constant.js b/Apollo/assets/js/config.constant.js index 13c8a568..16a9188a 100755 --- a/Apollo/assets/js/config.constant.js +++ b/Apollo/assets/js/config.constant.js @@ -122,6 +122,22 @@ app.constant('JS_REQUIRES', { * */ 'statusCtrl': 'assets/js/controllers/statusCtrl.js', /* + + + * status + * */ + 'incomeCtrl': 'assets/js/controllers/incomeCtrl.js', + /* + + * */ + 'income_reportCtrl': 'assets/js/controllers/income_reportCtrl.js', + /* + + + + + + * student status updation * */ 'studyMaterialStatusCtrl': 'assets/js/controllers/studyMaterialStatusCtrl.js', diff --git a/Apollo/assets/js/config.router.js b/Apollo/assets/js/config.router.js index bbcf3cb5..02c96bfa 100755 --- a/Apollo/assets/js/config.router.js +++ b/Apollo/assets/js/config.router.js @@ -154,6 +154,14 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com label: 'Course' }, // resolve: loadSequence('iconsCtrl') + }).state('app.master.accounttype', { + url: '/accounttype', + templateUrl: "assets/views/add_income_expense.html", + resolve: loadSequence('incomeCtrl','ngTable', 'ladda', 'angular-ladda'), + title: 'income_expense', + ncyBreadcrumb: { + label: 'income_expense' + }, }).state('app.master.status', { url: '/status', templateUrl: "assets/views/status.html", @@ -162,6 +170,14 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com ncyBreadcrumb: { label: 'Status' }, + }).state('app.master.incomeexpensereport', { + url: '/incomeexpensereport', + templateUrl: "assets/views/income_expense_report.html", + resolve: loadSequence('income_reportCtrl','ngTable', 'ladda', 'angular-ladda'), + title: 'IncomeExpense', + ncyBreadcrumb: { + label: 'income_expense' + }, }).state('app.master.studentStatusUpdate', { url: '/default activity', templateUrl: "assets/views/studentStatusUpdate.html", diff --git a/Apollo/assets/js/controllers/incomeCtrl.js b/Apollo/assets/js/controllers/incomeCtrl.js new file mode 100644 index 00000000..b6dd89c8 --- /dev/null +++ b/Apollo/assets/js/controllers/incomeCtrl.js @@ -0,0 +1,269 @@ +'use strict'; +/** + * controllers for ng-table + * Simple table with sorting and filtering on AngularJS + */ +// var helloApp = angular.module("helloApp", []); +app.controller("incomeCtrl", ["$scope", "toaster", "$filter", "API_POINTS", "$localStorage", "$http", "$state", 'ipCookie', function ($scope, toaster, $filter, apiPoint, $localStorage, $http, $state, ipCookie) { + + $scope.myModel = { + "StatusName": "", + "switchsetting": true + }; + + // get local client details + var localDetail = JSON.parse(localStorage.getItem('localObj')); + var localDetails = ipCookie('cookiechk'); + + $scope.initHead = function() { + // alert(); + const LOCALTYPE = localDetail.localType; + if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { + }else { + if(localDetail != null) { + $state.go('app.dashboard'); + } else { + ipCookie.remove('cookiechk'); + $window.localStorage.clear(); + $state.go('login.signin'); + } + } + } + + /* + * edit status details + * created by Surendiran + * */ + $scope.editId = -1; + $scope.setEditId = function (pid) { + $scope.editId = pid; + $scope.viewId = -1; + }; + + /* + * cancel edit div + * created by Surendiran + * */ + $scope.cancel = function () { + $scope.init(); + $scope.editId = -1; + + }; + + // sorting function for table params + $scope.sort = function (keyname) { + $scope.sortKey = keyname; //set the sortKey to the param passed + $scope.reverse = !$scope.reverse; //if true make it false and vice versa + } + + + $scope.statusForm = { + submit: function (form, myModel, loading) { + 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.ldloading1 = {}; + + $scope.ldloading1[loading.replace('-', '_')] = true; + + + var addstatus = { + method: 'POST', + url: apiPoint.url + 'addAccountnameDetails/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + statusName: myModel.StatusName, + status: myModel.switchsetting, + createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID, + branch : localDetail.localBranchID + } + }; + + $http(addstatus).then(function (response) { + if (response.data.status == 200 && response.data.Status) { + $scope.ldloading1[loading.replace('-', '_')] = false; + $scope.init(); + swal(" ", "Status added successfully.", "success"); + $state.go($state.current, {}, { reload: true }); + } else { + $scope.ldloading1[loading.replace('-', '_')] = false; + swal("", response.data.message, "error"); + } + }); + + + } + }, + + reset: function (form) { + + $scope.myModel = angular.copy($scope.master); + form.$setPristine(true); + $scope.myModel = { + "StatusName": "", + "switchsetting": true + }; + + } + }; + /* + *get status details when page loading called from view file + * + * + * created by Surendiran + * */ + $scope.loader = ''; + $scope.emptyData = ''; + $scope.init = function () { + + var getStatus = { + method: 'POST', + url: apiPoint.url + 'getAccounttypes/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + requestBranch: localDetail.localBranchID, + requestedBy: JSON.parse(localStorage.getItem('localObj')).localUserID + } + }; + + $http(getStatus).then(function (response) { + if (response.data.status == 200 && response.data.Status) { + + // console.log(response.data.details); + $scope.emptyData = true; + $scope.loader = true; + + $scope.statusInfo = response.data.details; + //console.log($scope.statusInfo); + + } else { + $scope.emptyData = false; + $scope.loader = true; + + $scope.statusInfo = ''; + + } + }); + + // var getBranchList = { + // method: 'POST', + // url: apiPoint.url + 'getBranchListStatusUpdate/', + // headers: { + // 'Content-Type': 'application/json' + // }, + // data: { + // requestedBy: JSON.parse(localStorage.getItem('localObj')).localUserID + // } + // }; + + // $http(getBranchList).then(function (response) { + // if (response.data.branchListStatus == true) { + // $scope.branchList = response.data.branch_list_details; + // } else { + // $scope.branchListMessage = response.data.message; + // } + // }); + + }; + + /* + * update the status details + * created by Surendiran + * */ + $scope.updatestatus = function (myModel, form, loading) { + + 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].$stop_name; + } + + if (form[field].$pristine) { + form[field].$dirty = true; + } + } + } + angular.element('.ng-invalid[name=' + firstError + ']').focus(); + } else { + $scope.ldloading = {}; + + $scope.ldloading[loading.replace('-', '_')] = true; + + + var update = { + method: 'POST', + url: apiPoint.url + 'updateStatusDetails/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + ListCode: myModel.ListCode, + ListName: myModel.ListName, + status: myModel.IsActive, + requestBranch: localDetail.localBranchID, + updatedBy: JSON.parse(localStorage.getItem('localObj')).localUserID + } + }; + $http(update).then(function (response) { + if (response.data.Status) { + $scope.ldloading[loading.replace('-', '_')] = false; + swal("", "Updated Successfully", "success"); + $scope.editId = -1; + $scope.init(); + } else { + $scope.ldloading[loading.replace('-', '_')] = false; + $scope.init(); + swal("", response.data.message, "error"); + } + }); + } + }; + + $scope.localBranchDetails = ''; + + $scope.selectBranch = function(branchCode) { + // alert(branchCode); + + var getBranchStatusList = { + method: 'POST', + url: apiPoint.url + 'getBranchStatusList/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + requestedBy: localDetail, + branchCode: branchCode + } + }; + + $http(getBranchStatusList).then(function (response) { + if (response.data.branchListStatus == true) { + $scope.branchList = response.data.branch_list_details; + } else { + $scope.branchListMessage = response.data.message; + } + }); + + } +}]); \ No newline at end of file diff --git a/Apollo/assets/js/controllers/income_reportCtrl.js b/Apollo/assets/js/controllers/income_reportCtrl.js new file mode 100644 index 00000000..bd7831c9 --- /dev/null +++ b/Apollo/assets/js/controllers/income_reportCtrl.js @@ -0,0 +1,432 @@ +'use strict'; +/*** controller***/ +app.controller('income_reportCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableParams", "API_POINTS", "$localStorage", "$http", "$state","$modal","$log", + function ($scope,$rootScope,toaster, $filter, ngTableParams, apiPoint, $localStorage, $http, $state,$modal,$log){ + + //function ($scope, apiPoint, $http, SweetAlert, $state,$modal, md5, ipCookie, $window, dateListDescService) { + + // DataTables configurable options + + + $scope.filters = { + + "from_date": "", + "to_date": "", + + }; + + // $scope.filters = function () { + // var filterlist = { + // method: 'POST', + // url: apiPoint.url + 'report_filters/', + // headers: { + // 'Content-Type': 'application/json' + // }, + // data: { + // branch : JSON.parse(localStorage.getItem('localObj')).localBranchID + + // } + + // }; + // $http(filterlist).then(function (response) { + // if (response.data) { + // $scope.batch=[]; + // $scope.batchlist = response.data.batch; + // $scope.university = response.data.university; + // //Desc order Batchlist + // angular.forEach($scope.batchlist,function (values,key) { + // var parts = values.BatchDate.split("-"); + // $scope.batch.push({ + // // "batchcode":values.batchcode, + // // "batch":values.batch + '('+ values.batchcode + ')', + // "BatchDate":values.BatchDate, + // "givenDateObject":new Date(parts[2], parts[1] - 1, parts[0]) + // }) + // }); + // // call service for make a list in desc order based on date + // $scope.batch=dateListDescService.getOrderByList($scope.batch); + // //console.log($scope.branch); + // } else { + // } + // }); + // } + + $scope.onSubmit = function () { + + + //alert($scope.batch.name); + $scope.expense_data = ''; + $scope.message = ''; + $scope.incomedetail = ''; + $scope.Subtypes = ''; + + var response_data = { + method: 'POST', + url: apiPoint.url + 'IncomeExpenseDetails/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + branch: JSON.parse(localStorage.getItem('localObj')).localBranchID, + from : $scope.filters.from_date, + to : $scope.filters.to_date + } + + }; + + $http(response_data).then(function (response) { + //console.log(response.data); + if (response.data.status == '200') { + + $scope.expense_data = response.data.expense_data; + //console.log($scope.expense_data) + + + } else { + $scope.message = response.data.message; + } + + }); + + + + var income_data = { + method: 'POST', + url: apiPoint.url + 'ViewFullIncomeDetails/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + branch: JSON.parse(localStorage.getItem('localObj')).localBranchID, + from : $scope.filters.from_date, + to : $scope.filters.to_date + } + + }; + + + $http(income_data).then(function (response) { + //console.log(response.data); + if (response.data.status == '200') + { + $scope.incomedetail = response.data; + $scope.fullincomedetail = response.data.fullexpense_detail; + //console.log($scope.fullincomedetail); + + + } + else + { + $scope.message = response.data.message; + } + + }); + + + + + var getsubdivision = { + method: 'POST', + url: apiPoint.url + 'GetSubTypes/', + headers: { + 'Content-Type': 'application/json' + + }, + data: { + branch: JSON.parse(localStorage.getItem('localObj')).localBranchID, + from : $scope.filters.from_date, + to : $scope.filters.to_date + } + + + }; + + + $http(getsubdivision).then(function (response) { + // console.log(response.data); + if (response.data.status == '200') + { + $scope.Subtypes = response.data.details; + + // console.log($scope.Subtypes); + + } + else + { + $scope.message = response.data.message; + } + + }); + + + } + + + + + var mystyle = { + sheetid: 'EXPENSE REPORT', + headers: true, + caption: { + title:'EXPENSE REPORT', + width: '300px', + style:'font-size:50px;' + }, + // style:'background:#00FF00', + column: { + style:'font-size:10px' + }, + + }; + + + + $scope.exportData = function () + { + //alert() + + angular.forEach(($scope.fullincomedetail),function(fullincomedetail,key) + { + //console.log($scope.fullincomedetail[key].TypeName); + if($scope.fullincomedetail[key].Name == 'I001') + { + $scope.fullincomedetail[key]['Type'] = 'Expense'; + + } + + else if($scope.fullincomedetail[key].Name == 'I002') + { + $scope.fullincomedetail[key]['Type'] = 'Income'; + } + + + //console.log($scope.fullincomedetail); + + // alasql('SELECT Type,ListName,TypeName,Date,Amount INTO XLS("Income_Expense_report.xls",?) FROM ?',[mystyle,$scope.fullincomedetail]); + + + }); + +//console.log($scope.fullincomedetail); + alasql('SELECT Type,ListName,TypeName,Date,Amount INTO XLS("Income Expense report.xls",?) FROM ?',[mystyle,$scope.fullincomedetail]); + + }; + + + $scope.OpenWindowStatus = false; + $scope.editId = -1; + $scope.setEditId = function (P) + { + //alert(P); + $scope.editId = P; + + } + + $scope.close = function () + { + + $scope.editId = -1; + + } + +$scope.fdate =''; +$scope.tdate =''; +//$scope.Subtypes = ''; + + + $scope.changeSem = function() + { + + $scope.open($scope.fullincomedetail,$scope.expense_data,$scope.Subtypes); + } + + +var fm_date= ''; +var Total_inc = 0; +var Total_exp = 0; + $scope.open = function(incomeexpensedetails,incomeexpenselist,Subtypes) + { + + //Total_inc === incomeexpenselist[1].Total + if(incomeexpenselist[1] == 'undefined' || incomeexpenselist[1] == null) + { + Total_exp=0; + } + else + { + Total_exp = incomeexpenselist[1].Total; + } + + if(incomeexpenselist[0] == 'undefined' || incomeexpenselist[0] == null) + { + Total_inc=0; + } + else + { + Total_inc = incomeexpenselist[0].Total; + } + //console.log(incomeexpenselist[1]); + +// + var formate = "dd-MM-yyyy"; + + $scope.fdate = $filter('date')(new Date($scope.filters.from_date), formate); + $scope.tdate = $filter('date')(new Date($scope.filters.to_date), formate); + + // fm_date = $scope.fdate; + // console.log(fm_date); + + incomeexpensedetails['fdate'] = $scope.fdate; + incomeexpensedetails['tdate'] = $scope.tdate; + // console.log(incomeexpensedetails); + // console.log(Subtypes); + + $rootScope.income_expendelist = incomeexpenselist; + $rootScope.income_expensedetails = incomeexpensedetails; + $rootScope.listdetails = Subtypes; + $rootScope.fdate = $scope.fdate; + $rootScope.tdate = $scope.tdate + //$rootScope.sum = incomeexpenselist[1].Total - incomeexpenselist[0].Total; + + $rootScope.sum = Total_inc -Total_exp; + //console.log($rootScope.sum); + //console.log($rootScope.listdetails); + + var modalInstance = $modal.open({ + templateUrl: 'assets/views/income_expense_report_pdf.html', + controller: 'income_reportCtrl', + // size: size, + resolve: { + pdfitems: function () { + //return $scope.FeesName; + return incomeexpensedetails; + } + } + }); + + + + modalInstance.result.then(function (selectedItem) { + $scope.selected = selectedItem; + }, function () { + $log.info('Modal dismissed at: ' + new Date()); + }); + + + + }; + + + + + + + $scope.generatePDF = function() + { + + + kendo.drawing.drawDOM($("#income_expensepdf")).then(function(group) { + kendo.drawing.pdf.saveAs(group, "income_expensepdf"+".pdf"); + }); + + + } + + // alert('in'); + // //console.log($scope.income_expensedetails.fdate); + // // return false; + + // var doc = new jsPDF('A4'); + // var canvas = document.createElement("canvas"); + // canvas.width = 100; + // canvas.height = 100; + // var ctx = canvas.getContext("2d"); + // doc.line(10,240,200,240); + // doc.setFontSize(20); + // doc.text(70,32,"Apollo Distance Education"); + // doc.setFontSize(15); + // doc.text(85,40,"Profit and Loss Report"); + // doc.setFontSize(12); + // doc.text(83,48,"From "+$scope.income_expensedetails.fdate+" to "+$scope.income_expensedetails.tdate ); + // doc.setFontSize(10); + // // doc.text(11,55,"Income"); + + // var TypeName= ''; + // var row=15; + // var column=60; + // var columnam=''; + // var rowam=60; + + // doc.rect(10, 10, 190, 280); + // var col = 45; + + // // var elem = document.getElementById('myCanvas'); + // // var two = new Two({ + // // type: Two.Types.canvas, + // // fullscreen: true + // // }).appendTo(elem); + // // two.update(); + + // var line = two.makeLine(450, 140, 900, 140); + // line.linewidth = 5; + // line.stroke = "blue"; + // // doc.rect(col,57,5,5); + // //console.log(JSON.parse($scope.income_expensedetails).length);return false; + // angular.forEach(($scope.income_expensedetails),function(income_expensedetails,key) + // { + // //console.log(income_expensedetails.TypeName); + // TypeName = income_expensedetails.TypeName; + // //console.log(income_expensedetails.Amount); + // row= row+10; + // // column= column+10; + // rowam=rowam+10; + // columnam = columnam+10; + // if(income_expensedetails.Name == 'I002') + // { + + // doc.setFontSize(11); + // doc.text(11,55,"Income"); + // doc.setFontSize(8); + // column= column+15; + // console.log(income_expensedetails.TypeName) + + // doc.text(row,column,income_expensedetails.TypeName); + // doc.text(rowam,column,income_expensedetails.Amount); + // } + + // }); + + + + // angular.forEach(($scope.income_expensedetails),function(income_expensedetails,key) + // { + // //console.log(income_expensedetails.TypeName); + // TypeName = income_expensedetails.TypeName; + // //console.log(income_expensedetails.Amount); + // row= row+10; + // // column= column+10; + // rowam=rowam+10; + // columnam = columnam+10; + // if(income_expensedetails.Name == 'I001') + // { + // doc.setFontSize(10); + // doc.text(11,105,"Expense"); + // doc.setFontSize(8); + // column= column+15; + // console.log(income_expensedetails.TypeName) + + // doc.text(row,column,income_expensedetails.TypeName); + // doc.text(rowam,column,income_expensedetails.Amount); + // } + + // }); + + + // doc.save('sample.pdf'); + + + }]); + + + + diff --git a/Apollo/assets/views/add_income_expense.html b/Apollo/assets/views/add_income_expense.html new file mode 100644 index 00000000..464e8e3e --- /dev/null +++ b/Apollo/assets/views/add_income_expense.html @@ -0,0 +1,96 @@ + +
    +
    +
    +

    + + Add New Income Expense Types. + +
    +
    +
    +
    +
    +
    + + +
    +
    + Add New +
    +
    +
    +
    + + + Account Name is required + Invalid Account Name +
    +
    +
    + +
    +
    +
    +
    +
    +
    +
    +
    +
    + +

    +
    +
    + + + + + + + + + + + + + + + + + + + + + +
    Status ID + + Status Name + + Status
    {{p.ListCode}}{{p.ListName}} Active In-Active + + +
    + + +     + +     +
    +
    \ No newline at end of file diff --git a/Apollo/assets/views/daybook/daybooksuperadmin.html b/Apollo/assets/views/daybook/daybooksuperadmin.html index 72fdbaa9..c7cd7109 100755 --- a/Apollo/assets/views/daybook/daybooksuperadmin.html +++ b/Apollo/assets/views/daybook/daybooksuperadmin.html @@ -313,6 +313,7 @@ Enter a Valid Date +
    +
    @@ -359,17 +364,25 @@
    +
    Type is Required
    +
    • + + +
  • + + Account Type + +
    • + +
  • DAY BOOK DETAILS @@ -283,6 +292,15 @@ DAY BOOK
    • + +
  • + + DAY BOOK INCOME EXPENSE REPORT + +
    • + + +
  • @@ -726,6 +744,16 @@ DAY BOOK
    • + +
  • + + DAY BOOK INCOME EXPENSE REPORT + +
    • + + + + @@ -1061,6 +1089,12 @@ DAY BOOK + +
  • + + DAY BOOK INCOME EXPENSE REPORT + +
    • @@ -1311,6 +1345,12 @@ DAY BOOK + +
  • + + DAY BOOK INCOME EXPENSE REPORT + +
    • From 6b1a0765d776619f7493981f37dcc11a6ec42028 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Thu, 2 Aug 2018 12:05:21 +0530 Subject: [PATCH 04/16] total amount --- Apollo/assets/js/controllers/income_reportCtrl.js | 10 +++++----- Apollo/assets/views/income_expense_report.html | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Apollo/assets/js/controllers/income_reportCtrl.js b/Apollo/assets/js/controllers/income_reportCtrl.js index bd7831c9..6391ca73 100644 --- a/Apollo/assets/js/controllers/income_reportCtrl.js +++ b/Apollo/assets/js/controllers/income_reportCtrl.js @@ -79,7 +79,7 @@ app.controller('income_reportCtrl', ["$scope","$rootScope","toaster", "$filter", if (response.data.status == '200') { $scope.expense_data = response.data.expense_data; - //console.log($scope.expense_data) + console.log($scope.expense_data) } else { @@ -248,22 +248,22 @@ var Total_exp = 0; { //Total_inc === incomeexpenselist[1].Total - if(incomeexpenselist[1] == 'undefined' || incomeexpenselist[1] == null) + if(incomeexpenselist[0] == 'undefined' || incomeexpenselist[0] == null) { Total_exp=0; } else { - Total_exp = incomeexpenselist[1].Total; + Total_exp = incomeexpenselist[0].Total; } - if(incomeexpenselist[0] == 'undefined' || incomeexpenselist[0] == null) + if(incomeexpenselist[1] == 'undefined' || incomeexpenselist[1] == null) { Total_inc=0; } else { - Total_inc = incomeexpenselist[0].Total; + Total_inc = incomeexpenselist[1].Total; } //console.log(incomeexpenselist[1]); diff --git a/Apollo/assets/views/income_expense_report.html b/Apollo/assets/views/income_expense_report.html index 92c59f15..f46ede82 100644 --- a/Apollo/assets/views/income_expense_report.html +++ b/Apollo/assets/views/income_expense_report.html @@ -214,7 +214,7 @@
    - {{expense_data[0].Total - expense_data[1].Total}} + {{expense_data[1].Total - expense_data[0].Total}}
    From f7193c3d32c6a54b948ee120b95a9cbff6adbbeb Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Fri, 3 Aug 2018 12:17:44 +0530 Subject: [PATCH 05/16] income expense --- .../api/application/models/DayBook_model.php | 27 ++++++++++++------- .../js/controllers/income_reportCtrl.js | 10 +++++-- .../views/income_expense_report_pdf.html | 26 +++++++++--------- 3 files changed, 38 insertions(+), 25 deletions(-) diff --git a/Apollo/api/application/models/DayBook_model.php b/Apollo/api/application/models/DayBook_model.php index f1c08f6b..07ef0e6e 100755 --- a/Apollo/api/application/models/DayBook_model.php +++ b/Apollo/api/application/models/DayBook_model.php @@ -651,12 +651,17 @@ class DayBook_model extends CI_Model public function Income_expense($from,$to,$br) { + + // echo $from.'ff'; + // echo $to.'to'; $incomecode='I002'; $expensecode='I001'; - $fromd= date("d-m-Y",strtotime($from)); - $tod=date("d-m-Y",strtotime($to)); - + $fromd= date("Y-m-d",strtotime($from)); + $tod=date("Y-m-d",strtotime($to)); +// echo $fromd; +// echo $tod; +// die(); $subQuery= 'SELECT DISTINCT(p.Name) AS TID,ListName, SUM(IF(p.Name=?,Amount,0)) AS Income, @@ -668,15 +673,17 @@ class DayBook_model extends CI_Model FROM T_DayBookMaster AS p join T_PickListDetails on T_PickListDetails.ListCode = p.name - where Date>=? and Date<=? and p.IsActive=? and (p.Name=? or p.Name=?) + where str_to_date(Date,?)>=? and str_to_date(Date,?)<=? and p.IsActive=? and (p.Name=? or p.Name=?) GROUP BY p.`Name`'; - $query = $this->db->query($subQuery,array($incomecode,$expensecode,$incomecode,$expensecode,$fromd,$tod,'1','I001','I002')); + $query = $this->db->query($subQuery,array($incomecode,$expensecode,$incomecode,$expensecode,'%d-%m-%Y',$fromd,'%d-%m-%Y',$tod,'1','I001','I002')); $expense = $query->result(); if(count($query)>0) { $results['expense_data'] = $expense; - } + } + + //print_r( $this->db->last_query()); return $results; @@ -685,8 +692,8 @@ class DayBook_model extends CI_Model public function getIncome_Details($from,$to,$incid) { - $fromd= date("d-m-Y",strtotime($from)); - $tod=date("d-m-Y",strtotime($to)); + $fromd= date("Y-m-d",strtotime($from)); + $tod=date("Y-m-d",strtotime($to)); $expid = 'I001'; // $subQuery = 'select T_DayBookMaster.ID,TypeName,Amount,T_DayBookMaster.Date,Reason,Description from T_DayBookMaster @@ -696,9 +703,9 @@ class DayBook_model extends CI_Model $subQuery = 'select Name,T_DayBookMaster.ID,T_Income_Outcome_Master.TypeID as OrgType,T_Income_Outcome_Master.TypeName,Amount,T_DayBookMaster.Date,Reason,T_DayBookMaster.Description,ListName from T_DayBookMaster left join T_Income_Outcome_Master on T_Income_Outcome_Master.ID = T_DayBookMaster.Type join T_PickListDetails on T_PickListDetails.ListCode = T_Income_Outcome_Master.TypeID - where Name in (?,?) and date>=? and date<=?'; + where Name in (?,?) and str_to_date(date,?)>=? and str_to_date(date,?)<=?'; - $query = $this->db->query($subQuery,array($incid,$expid,$fromd,$tod)); + $query = $this->db->query($subQuery,array($incid,$expid,'%d-%m-%Y',$fromd,'%d-%m-%Y',$tod)); // print_r( $this->db->last_query()); diff --git a/Apollo/assets/js/controllers/income_reportCtrl.js b/Apollo/assets/js/controllers/income_reportCtrl.js index 6391ca73..6a89b2e3 100644 --- a/Apollo/assets/js/controllers/income_reportCtrl.js +++ b/Apollo/assets/js/controllers/income_reportCtrl.js @@ -325,8 +325,14 @@ var Total_exp = 0; { - kendo.drawing.drawDOM($("#income_expensepdf")).then(function(group) { - kendo.drawing.pdf.saveAs(group, "income_expensepdf"+".pdf"); + // kendo.drawing.drawDOM($("#income_expensepdf")).then(function(group) { + // kendo.drawing.pdf.saveAs(group, "income_expensepdf"+".pdf"); + + + kendo.drawing.drawDOM($("#income_expensepdf"), + { paperSize: "A4", + margin:"1cm"} ).then(function(group) { + kendo.drawing.pdf.saveAs(group, "income_expensepdf"+".pdf"); }); diff --git a/Apollo/assets/views/income_expense_report_pdf.html b/Apollo/assets/views/income_expense_report_pdf.html index 2c042f50..06c84d16 100644 --- a/Apollo/assets/views/income_expense_report_pdf.html +++ b/Apollo/assets/views/income_expense_report_pdf.html @@ -47,7 +47,7 @@
    -

    Apollo Distance Education

    +
    Apollo Distance Education

    Profit and Loss Report

    From: {{income_expensedetails.fdate}} to {{income_expensedetails.tdate}}


    @@ -58,7 +58,7 @@
    - +
    @@ -67,8 +67,8 @@
    {{li.ListName }}
    -
    {{li.TypeName}}
    -
    {{li.Amount}}
    +
    {{li.TypeName}}
    +
    {{li.Amount}}
    @@ -78,9 +78,9 @@
    - +
    -
    +
    {{de.Total}}
    @@ -93,7 +93,7 @@
    - +
    @@ -101,8 +101,8 @@ {{li.ListName}}
    -
    {{li.TypeName}}
    -
    {{li.Amount}}
    +
    {{li.TypeName}}
    +
    {{li.Amount}}
    @@ -111,9 +111,9 @@
    - +
    -
    +
    {{de.Total}}
    @@ -131,9 +131,9 @@

    - +
    -
    +
    {{sum}}
    From 6f303c639a8aae6bba86bbe6740c56f68d9b2368 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Fri, 3 Aug 2018 16:49:36 +0530 Subject: [PATCH 06/16] income total --- .../js/controllers/income_reportCtrl.js | 57 +++++++++++++++++-- .../assets/views/income_expense_report.html | 9 ++- .../views/income_expense_report_pdf.html | 3 +- 3 files changed, 62 insertions(+), 7 deletions(-) diff --git a/Apollo/assets/js/controllers/income_reportCtrl.js b/Apollo/assets/js/controllers/income_reportCtrl.js index 6a89b2e3..4913c900 100644 --- a/Apollo/assets/js/controllers/income_reportCtrl.js +++ b/Apollo/assets/js/controllers/income_reportCtrl.js @@ -59,6 +59,9 @@ app.controller('income_reportCtrl', ["$scope","$rootScope","toaster", "$filter", $scope.message = ''; $scope.incomedetail = ''; $scope.Subtypes = ''; + $scope.Total_expense = ''; + $scope.Total_income = ''; + var response_data = { method: 'POST', @@ -76,14 +79,59 @@ app.controller('income_reportCtrl', ["$scope","$rootScope","toaster", "$filter", $http(response_data).then(function (response) { //console.log(response.data); - if (response.data.status == '200') { + if (response.data.status == '200') + { $scope.expense_data = response.data.expense_data; - console.log($scope.expense_data) + + console.log($scope.expense_data); + if(($scope.expense_data.length)==2) + { + + if($scope.expense_data[0].Total == 'undefined' || $scope.expense_data[0].Total == null) + { + $scope.Total_expense=0; + } + else + { + $scope.Total_expense = $scope.expense_data[0].Total; + } + + if($scope.expense_data[1].Total == 'undefined' || $scope.expense_data[1].Total == null) + { + $scope.Total_income=0; + } + else + { + $scope.Total_income = $scope.expense_data[1].Total; + } + + } - } else { - $scope.message = response.data.message; + else + { + if($scope.expense_data[0].TID == 'I002') + { + $scope.Total_income = $scope.expense_data[0].Total; + $scope.Total_expense = 0; + + } + + else + { + $scope.Total_expense = $scope.expense_data[0].Total; + $scope.Total_income = 0; + } + + } + + $scope.Net_Total = $scope.Total_income -$scope.Total_expense; + + + } + else { + $scope.message = response.data.message; } }); @@ -286,6 +334,7 @@ var Total_exp = 0; $rootScope.listdetails = Subtypes; $rootScope.fdate = $scope.fdate; $rootScope.tdate = $scope.tdate + $rootScope.net_totalamount = $scope.Net_Total; //$rootScope.sum = incomeexpenselist[1].Total - incomeexpenselist[0].Total; $rootScope.sum = Total_inc -Total_exp; diff --git a/Apollo/assets/views/income_expense_report.html b/Apollo/assets/views/income_expense_report.html index f46ede82..ab9c2bb7 100644 --- a/Apollo/assets/views/income_expense_report.html +++ b/Apollo/assets/views/income_expense_report.html @@ -214,8 +214,9 @@
    - {{expense_data[1].Total - expense_data[0].Total}} - + + {{Net_Total}}
    @@ -224,6 +225,10 @@
    + +
    +

    No Records Found

     +
    diff --git a/Apollo/assets/views/income_expense_report_pdf.html b/Apollo/assets/views/income_expense_report_pdf.html index 06c84d16..4e857229 100644 --- a/Apollo/assets/views/income_expense_report_pdf.html +++ b/Apollo/assets/views/income_expense_report_pdf.html @@ -134,7 +134,8 @@
    - {{sum}} + + {{net_totalamount}}
    From 3e3f7f97b8063e01ceaf54cbb75eb38a53126ac4 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Fri, 3 Aug 2018 17:07:41 +0530 Subject: [PATCH 07/16] income expense --- Apollo/assets/js/controllers/income_reportCtrl.js | 14 ++++++++++++++ Apollo/assets/views/income_expense_report.html | 11 ++++++++--- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/Apollo/assets/js/controllers/income_reportCtrl.js b/Apollo/assets/js/controllers/income_reportCtrl.js index 4913c900..4aa97460 100644 --- a/Apollo/assets/js/controllers/income_reportCtrl.js +++ b/Apollo/assets/js/controllers/income_reportCtrl.js @@ -61,6 +61,8 @@ app.controller('income_reportCtrl', ["$scope","$rootScope","toaster", "$filter", $scope.Subtypes = ''; $scope.Total_expense = ''; $scope.Total_income = ''; + $scope.load = ''; + $scope.isLoaderShow = ''; var response_data = { @@ -84,6 +86,17 @@ app.controller('income_reportCtrl', ["$scope","$rootScope","toaster", "$filter", $scope.expense_data = response.data.expense_data; + if($scope.expense_data.length>0) + { + $scope.isLoaderShow =false; + $scope.load = 'Loading....'; + } + else + { + $scope.isLoaderShow = true; + $scope.load = "No Records Found"; + } + console.log($scope.expense_data); if(($scope.expense_data.length)==2) { @@ -132,6 +145,7 @@ app.controller('income_reportCtrl', ["$scope","$rootScope","toaster", "$filter", } else { $scope.message = response.data.message; + } }); diff --git a/Apollo/assets/views/income_expense_report.html b/Apollo/assets/views/income_expense_report.html index ab9c2bb7..9c2db54a 100644 --- a/Apollo/assets/views/income_expense_report.html +++ b/Apollo/assets/views/income_expense_report.html @@ -134,8 +134,13 @@
    +
    +

    {{load}}

    +
    + +
    - +
    @@ -226,9 +231,9 @@
    -
    +
    From 451a3656def32bb0f6bf53ff43445308d01a34b7 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Fri, 3 Aug 2018 17:37:03 +0530 Subject: [PATCH 08/16] print option for fees details --- .../assets/js/controllers/feesStatusCtrl.js | 75 ++++++++++++------- .../views/status-update/updateFeesStatus.html | 20 +++-- 2 files changed, 62 insertions(+), 33 deletions(-) diff --git a/Apollo/assets/js/controllers/feesStatusCtrl.js b/Apollo/assets/js/controllers/feesStatusCtrl.js index 2d8b234c..7e14abc3 100755 --- a/Apollo/assets/js/controllers/feesStatusCtrl.js +++ b/Apollo/assets/js/controllers/feesStatusCtrl.js @@ -315,7 +315,7 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n angular.forEach($scope.masterSessionDetails,function (svalues,skey) { - if((svalues.IsActive=='1' || $scope.feesStructureInfo[0].SessionName==svalues.SessionID) && $scope.ExistSessionDate <= new Date(svalues.SessionDate.substring(6,10)+'-'+svalues.SessionDate.substring(3,5)+'-'+svalues.SessionDate.substring(0,2))){ + if((svalues.IsActive=='1' || $scope.feesStructureInfo[0].SessionName==svalues.SessionID) && $scope.ExistSessionDate < new Date(svalues.SessionDate.substring(6,10)+'-'+svalues.SessionDate.substring(3,5)+'-'+svalues.SessionDate.substring(0,2))){ $scope.sessionDetails.push({ "SessionName":svalues.SessionName, "SessionID":svalues.SessionID, @@ -360,7 +360,7 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n "SessionID":svalues.SessionID, }); - if($scope.ExistSessionDate <= new Date(svalues.SessionDate.substring(6,10)+'-'+svalues.SessionDate.substring(3,5)+'-'+svalues.SessionDate.substring(0,2))){ + if($scope.ExistSessionDate < new Date(svalues.SessionDate.substring(6,10)+'-'+svalues.SessionDate.substring(3,5)+'-'+svalues.SessionDate.substring(0,2))){ $scope.sessionDetailsTo.push({ @@ -394,7 +394,7 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n angular.forEach($scope.masterSessionDetails,function (svalues,skey) { - if((svalues.IsActive=='1' || $scope.feesStructureInfo[0].SessionName==svalues.SessionID) && $scope.ExistSessionDate <= new Date(svalues.SessionDate.substring(6,10)+'-'+svalues.SessionDate.substring(3,5)+'-'+svalues.SessionDate.substring(0,2))){ + if((svalues.IsActive=='1' || $scope.feesStructureInfo[0].SessionName==svalues.SessionID) && $scope.ExistSessionDate < new Date(svalues.SessionDate.substring(6,10)+'-'+svalues.SessionDate.substring(3,5)+'-'+svalues.SessionDate.substring(0,2))){ $scope.sessionDetails.push({ "SessionName":svalues.SessionName , "SessionID":svalues.SessionID, @@ -457,7 +457,7 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n "SessionID":svalues.SessionID, }); - if($scope.ExistSessionDate <= new Date(svalues.SessionDate.substring(6,10)+'-'+svalues.SessionDate.substring(3,5)+'-'+svalues.SessionDate.substring(0,2))){ + if($scope.ExistSessionDate < new Date(svalues.SessionDate.substring(6,10)+'-'+svalues.SessionDate.substring(3,5)+'-'+svalues.SessionDate.substring(0,2))){ $scope.sessionDetailsTo.push({ @@ -2222,7 +2222,7 @@ app.controller('ModalDemoCtrl', ["$scope", "$modal", "$log", function ($scope, $ // Please note that $modalInstance represents a modal window (instance) dependency. // It is not the same as the $modal service used above. -app.controller('FeesModalInstanceCtrl', ["$scope", "$modalInstance", "items","WordsService", function ($scope, $modalInstance, items,WordsService) { +app.controller('FeesModalInstanceCtrl', ["$scope", "$modalInstance", "$timeout", "items","WordsService", function ($scope, $modalInstance, $timeout, items,WordsService) { $scope.items = items; $scope.selected = { @@ -2237,6 +2237,7 @@ app.controller('FeesModalInstanceCtrl', ["$scope", "$modalInstance", "items","Wo $scope.cancel = function () { $modalInstance.dismiss('cancel'); }; + //show hide function for pdf design $scope.billNo=""; $scope.receiptNo=""; @@ -2250,7 +2251,13 @@ app.controller('FeesModalInstanceCtrl', ["$scope", "$modalInstance", "items","Wo $scope.BranchAddr = ""; $scope.BranchLogo = ""; $scope.FeesReceiptTitle = ""; - $scope.ShowHide = function (pdfValue) { + $scope.myPdfView = ''; + $scope.ShowHide = function (pdfValue,print) { + $timeout(()=> { + //alert(this.print); + $scope.printPdf(print); + }, 0); + $scope.myPdfView = pdfValue; $scope.showButton = true; $scope.billNo = pdfValue.BillNO; $scope.paymentType=pdfValue.ModeOfPayment; @@ -2264,32 +2271,46 @@ app.controller('FeesModalInstanceCtrl', ["$scope", "$modalInstance", "items","Wo $scope.FeesReceiptTitle = pdfValue.FeesReceiptTitle; $scope.receiptNo=pdfValue.ReceiptNo; - + + } - $scope.pdfPrint = function (pdf) { - //PDF print - var innerContents = document.getElementById(pdf).innerHTML; - var popupWinindow = window.open('', '_blank', 'width=600,height=700,scrollbars=no,menubar=no,toolbar=no,location=no,status=no,titlebar=no'); + //testing for print + + $scope.printPdf = function (print) { + + var innerContents = document.getElementById(print).innerHTML; + + var popupWinindow = window.open('', '_blank', 'width=1200,height=700,scrollbars=no,menubar=no,toolbar=no,location=no,status=no,titlebar=no'); popupWinindow.document.open(); - popupWinindow.document.write('' + innerContents + ''); + popupWinindow.document.write(''); + popupWinindow.document.write(''); + popupWinindow.document.write(innerContents); + popupWinindow.document.write(''); popupWinindow.document.close(); + popupWinindow.focus(); + popupWinindow.print(); + popupWinindow.close(); + + } - $scope.mouseLeave = function(){ - $scope.showButton = false; - $scope.billNo=""; - $scope.sessionName=""; - $scope.paymentType=""; - $scope.billDate=""; - $scope.amountInWords = ""; - $scope.billAmount = ""; - $scope.branchName = ""; - $scope.ReceivedBy=""; - $scope.BranchAddr = ""; - $scope.BranchLogo = ""; - $scope.FeesReceiptTitle=""; - $scope.receiptNo=""; - } + // $scope.mouseLeave = function(){ + // $scope.showButton = false; + // $scope.billNo=""; + // $scope.sessionName=""; + // $scope.paymentType=""; + // $scope.billDate=""; + // $scope.amountInWords = ""; + // $scope.billAmount = ""; + // $scope.branchName = ""; + // $scope.ReceivedBy=""; + // $scope.BranchAddr = ""; + // $scope.BranchLogo = ""; + // $scope.FeesReceiptTitle=""; + // $scope.receiptNo=""; + // } }]); app.directive('visible', function() { diff --git a/Apollo/assets/views/status-update/updateFeesStatus.html b/Apollo/assets/views/status-update/updateFeesStatus.html index 3fde4588..70226422 100755 --- a/Apollo/assets/views/status-update/updateFeesStatus.html +++ b/Apollo/assets/views/status-update/updateFeesStatus.html @@ -423,7 +423,7 @@ Mode of Payment Comments For Student Comments For Internal - Print + Print @@ -438,17 +438,18 @@ - + + + - -
    - - +
    +
    +
    @@ -459,7 +460,9 @@ --> +
    +
    APOLLO {{FeesReceiptTitle}} +
    @@ -516,8 +519,11 @@     		Note: Terms & Conditions will be applicable as per University norms Fees once paid will not be refunded at any reasons
    +
    +
    @@ -533,6 +539,7 @@ + @@ -547,4 +554,5 @@ + \ No newline at end of file From 8188e464f6954d4d77992384ead1c03ff8383baf Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Sat, 4 Aug 2018 07:00:00 +0530 Subject: [PATCH 09/16] income expense --- .../api/application/models/DayBook_model.php | 9 +- .../js/controllers/income_reportCtrl.js | 2 +- .../assets/views/income_expense_report.html | 158 +++++++++++------ .../views/income_expense_report_pdf.html | 164 ++++++++++++------ 4 files changed, 224 insertions(+), 109 deletions(-) diff --git a/Apollo/api/application/models/DayBook_model.php b/Apollo/api/application/models/DayBook_model.php index 07ef0e6e..e2bcb06e 100755 --- a/Apollo/api/application/models/DayBook_model.php +++ b/Apollo/api/application/models/DayBook_model.php @@ -700,19 +700,20 @@ class DayBook_model extends CI_Model // join T_Income_Outcome_Master on T_Income_Outcome_Master.TypeID=T_DayBookMaster.Name and // T_Income_Outcome_Master.ID = T_DayBookMaster.Type where Name=? and date>=? and date<=?'; - $subQuery = 'select Name,T_DayBookMaster.ID,T_Income_Outcome_Master.TypeID as OrgType,T_Income_Outcome_Master.TypeName,Amount,T_DayBookMaster.Date,Reason,T_DayBookMaster.Description,ListName from T_DayBookMaster left join T_Income_Outcome_Master on + $subQuery = 'select Name,T_DayBookMaster.ID,T_Income_Outcome_Master.TypeID as OrgType,T_Income_Outcome_Master.TypeName,SUM(Amount) as Tot_Amount,T_Income_Outcome_Master.ID as SID,T_Income_Outcome_Master.TypeName as Type,T_DayBookMaster.Date,Reason,T_DayBookMaster.Description,ListName from T_DayBookMaster left join T_Income_Outcome_Master on T_Income_Outcome_Master.ID = T_DayBookMaster.Type join T_PickListDetails on T_PickListDetails.ListCode = T_Income_Outcome_Master.TypeID - where Name in (?,?) and str_to_date(date,?)>=? and str_to_date(date,?)<=?'; + where Name in (?,?) and str_to_date(date,?)>=? and str_to_date(date,?)<=? group by ListName'; $query = $this->db->query($subQuery,array($incid,$expid,'%d-%m-%Y',$fromd,'%d-%m-%Y',$tod)); - // print_r( $this->db->last_query()); + // print_r( $this->db->last_query()); // die(); - $expense = $query->result(); + $expense = $query->result(); + // print_r($expense); if(count($query)>0) { $results['fullexpense_detail'] = $expense; diff --git a/Apollo/assets/js/controllers/income_reportCtrl.js b/Apollo/assets/js/controllers/income_reportCtrl.js index 4aa97460..1f2bc912 100644 --- a/Apollo/assets/js/controllers/income_reportCtrl.js +++ b/Apollo/assets/js/controllers/income_reportCtrl.js @@ -173,7 +173,7 @@ app.controller('income_reportCtrl', ["$scope","$rootScope","toaster", "$filter", { $scope.incomedetail = response.data; $scope.fullincomedetail = response.data.fullexpense_detail; - //console.log($scope.fullincomedetail); + console.log($scope.fullincomedetail); } diff --git a/Apollo/assets/views/income_expense_report.html b/Apollo/assets/views/income_expense_report.html index 9c2db54a..6af776f9 100644 --- a/Apollo/assets/views/income_expense_report.html +++ b/Apollo/assets/views/income_expense_report.html @@ -123,9 +123,9 @@
    - +
    - + @@ -140,79 +140,133 @@
    - - -
    -
    - -
    - -
    - -
    - {{li.ListName }} + + + + + +
    + +
    + +
    + +
    +
    +{{li.ListName }}
    {{li.TypeName}}
    -
    {{li.Amount}}
    +
    {{li.Tot_Amount}}
    +
    -
    - -
    +
    + +
    - -
    -
    + + + + +
    + +
    + +
    + + +
    +{{li.ListName }} +
    +
    {{li.TypeName}}
    +
    {{li.Tot_Amount}}
    +
    +
    + + + +
    + + + + +
    +
    -
    -
    +
    +
    {{de.Total}} -
    -
    - -
    +
    +
    + - -
    -
    - -
    - +
    -
    - -
    - {{li.ListName }} +
    + +
    + +
    +
    + {{li.ListName }}
    {{li.TypeName}}
    -
    {{li.Amount}}
    +
    {{li.Tot_Amount}}
    +
    -
    - -
    - - -
    -
    - -
    -
    - {{de.Total}} -
    -
    - -
    +
    + +
    + + + +
    + +
    + +
    + + +
    + {{li.ListName }} +
    +
    {{li.TypeName}}
    +
    {{li.Tot_Amount}}
    +
    +
    + + + +
    + + + + +
    +
    + +
    +
    + {{de.Total}} +
    +
    + + +
    diff --git a/Apollo/assets/views/income_expense_report_pdf.html b/Apollo/assets/views/income_expense_report_pdf.html index 4e857229..c62b8e3b 100644 --- a/Apollo/assets/views/income_expense_report_pdf.html +++ b/Apollo/assets/views/income_expense_report_pdf.html @@ -36,6 +36,10 @@ word-spacing: 9cm; } +.b { + line-height: 1.6; +} + @@ -47,7 +51,7 @@
    -
    Apollo Distance Education
    +

    Apollo Distance Education

    Profit and Loss Report

    From: {{income_expensedetails.fdate}} to {{income_expensedetails.tdate}}


    @@ -55,70 +59,126 @@
    - -
    -
    - -
    - -
    - -
    - {{li.ListName }} + + + + +
    + +
    + +
    + +
    +
    +{{li.ListName }}
    -
    {{li.TypeName}}
    -
    {{li.Amount}}
    +
    {{li.TypeName}}
    +
    {{li.Tot_Amount}}
    +
    - -
    + +
    - -
    -
    - -
    -
    - {{de.Total}} -
    -
    + -
    - +
    - +
    + +
    -
    -
    - -
    - -
    -
    + +
    +{{li.ListName }} +
    +
    {{li.TypeName}}
    +
    {{li.Tot_Amount}}
    +
    +
    - {{li.ListName}} -
    -
    {{li.TypeName}}
    -
    {{li.Amount}}
    - -
    -
    -
    + + +
    - -
    -
    - -
    -
    - {{de.Total}} -
    -
    -
    + + + +
    +
    + +
    +
    + {{de.Total}} +
    +
    + + + + + + +
    + +
    + +
    + +
    +
    + {{li.ListName }} +
    +
    {{li.TypeName}}
    +
    {{li.Tot_Amount}}
    +
    +
    + +
    + +
    + + + + + + + +
    + +
    + +
    + + +
    + {{li.ListName }} +
    +
    {{li.TypeName}}
    +
    {{li.Tot_Amount}}
    +
    +
    + + + +
    + + + + +
    +
    + +
    +
    + {{de.Total}} +
    +
    +

    From 45f73f2ebad73e073e47f59385babb9cb403795b Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Sat, 4 Aug 2018 16:26:54 +0530 Subject: [PATCH 10/16] income --- .../api/application/models/DayBook_model.php | 24 ++++++---- .../js/controllers/income_reportCtrl.js | 5 ++ .../assets/views/income_expense_report.html | 46 ++++++++++++------- .../views/income_expense_report_pdf.html | 16 +++---- 4 files changed, 57 insertions(+), 34 deletions(-) diff --git a/Apollo/api/application/models/DayBook_model.php b/Apollo/api/application/models/DayBook_model.php index e2bcb06e..9a1f08ee 100755 --- a/Apollo/api/application/models/DayBook_model.php +++ b/Apollo/api/application/models/DayBook_model.php @@ -696,19 +696,25 @@ class DayBook_model extends CI_Model $tod=date("Y-m-d",strtotime($to)); $expid = 'I001'; - // $subQuery = 'select T_DayBookMaster.ID,TypeName,Amount,T_DayBookMaster.Date,Reason,Description from T_DayBookMaster - // join T_Income_Outcome_Master on T_Income_Outcome_Master.TypeID=T_DayBookMaster.Name and - // T_Income_Outcome_Master.ID = T_DayBookMaster.Type where Name=? and date>=? and date<=?'; - $subQuery = 'select Name,T_DayBookMaster.ID,T_Income_Outcome_Master.TypeID as OrgType,T_Income_Outcome_Master.TypeName,SUM(Amount) as Tot_Amount,T_Income_Outcome_Master.ID as SID,T_Income_Outcome_Master.TypeName as Type,T_DayBookMaster.Date,Reason,T_DayBookMaster.Description,ListName from T_DayBookMaster left join T_Income_Outcome_Master on - T_Income_Outcome_Master.ID = T_DayBookMaster.Type - join T_PickListDetails on T_PickListDetails.ListCode = T_Income_Outcome_Master.TypeID - where Name in (?,?) and str_to_date(date,?)>=? and str_to_date(date,?)<=? group by ListName'; + // $subQuery = 'select Name,T_DayBookMaster.ID,T_Income_Outcome_Master.TypeID as OrgType,T_Income_Outcome_Master.TypeName,SUM(Amount) as Tot_Amount,T_Income_Outcome_Master.ID as SID,T_Income_Outcome_Master.TypeName as Type,T_DayBookMaster.Date,Reason,T_DayBookMaster.Description,ListName from T_DayBookMaster left join T_Income_Outcome_Master on + // T_Income_Outcome_Master.ID = T_DayBookMaster.Type + // join T_PickListDetails on T_PickListDetails.ListCode = T_Income_Outcome_Master.TypeID + // where Name in (?,?) and str_to_date(date,?)>=? and str_to_date(date,?)<=? group by ListName'; - $query = $this->db->query($subQuery,array($incid,$expid,'%d-%m-%Y',$fromd,'%d-%m-%Y',$tod)); + // $query = $this->db->query($subQuery,array($incid,$expid,'%d-%m-%Y',$fromd,'%d-%m-%Y',$tod)); + + + + $subQuery='select Name,sum(Amount) as Total,T_DayBookMaster.ID,T_Income_Outcome_Master.ID as SubID,T_Income_Outcome_Master.TypeID as OrgType,T_Income_Outcome_Master.TypeName,T_DayBookMaster.Date,Reason,T_DayBookMaster.Description,ListName from T_DayBookMaster +left join T_Income_Outcome_Master on T_Income_Outcome_Master.ID = T_DayBookMaster.Type +join T_PickListDetails on T_PickListDetails.ListCode = T_Income_Outcome_Master.TypeID +where str_to_date(date,?)>=? and str_to_date(date,?)<=? group by Type'; + +$query = $this->db->query($subQuery,array('%d-%m-%Y',$fromd,'%d-%m-%Y',$tod)); - // print_r( $this->db->last_query()); + //print_r( $this->db->last_query()); // die(); $expense = $query->result(); diff --git a/Apollo/assets/js/controllers/income_reportCtrl.js b/Apollo/assets/js/controllers/income_reportCtrl.js index 1f2bc912..b2188c5c 100644 --- a/Apollo/assets/js/controllers/income_reportCtrl.js +++ b/Apollo/assets/js/controllers/income_reportCtrl.js @@ -63,6 +63,8 @@ app.controller('income_reportCtrl', ["$scope","$rootScope","toaster", "$filter", $scope.Total_income = ''; $scope.load = ''; $scope.isLoaderShow = ''; + $scope.fromda = ''; + $scope.toda =''; var response_data = { @@ -75,8 +77,11 @@ app.controller('income_reportCtrl', ["$scope","$rootScope","toaster", "$filter", branch: JSON.parse(localStorage.getItem('localObj')).localBranchID, from : $scope.filters.from_date, to : $scope.filters.to_date + } + + }; $http(response_data).then(function (response) { diff --git a/Apollo/assets/views/income_expense_report.html b/Apollo/assets/views/income_expense_report.html index 6af776f9..13ea187f 100644 --- a/Apollo/assets/views/income_expense_report.html +++ b/Apollo/assets/views/income_expense_report.html @@ -133,38 +133,50 @@
    -
    -
    -

    {{load}}

    -
    +
    +
    +

    {{load}}

    +
    -
    +
    + +
    +

    Apollo Distance Education

    +

    Profit and Loss Report

    +
    +
    +
    +
    + + +
    -
    +
    {{li.ListName }}
    {{li.TypeName}}
    -
    {{li.Tot_Amount}}
    +
    {{li.Total}}
    -
    +
    @@ -183,7 +195,7 @@ {{li.ListName }}
    {{li.TypeName}}
    -
    {{li.Tot_Amount}}
    +
    {{li.Total}}
    @@ -215,16 +227,16 @@
    -
    +
    {{li.ListName }}
    {{li.TypeName}}
    -
    {{li.Tot_Amount}}
    +
    {{li.Total}}
    -
    +
    @@ -245,7 +257,7 @@ {{li.ListName }}
    {{li.TypeName}}
    -
    {{li.Tot_Amount}}
    +
    {{li.Total}}
    @@ -282,14 +294,14 @@ -
    -
    +
    +
    - - + diff --git a/Apollo/assets/views/income_expense_report_pdf.html b/Apollo/assets/views/income_expense_report_pdf.html index c62b8e3b..f6910464 100644 --- a/Apollo/assets/views/income_expense_report_pdf.html +++ b/Apollo/assets/views/income_expense_report_pdf.html @@ -70,16 +70,16 @@ -
    +
    {{li.ListName }}
    {{li.TypeName}}
    -
    {{li.Tot_Amount}}
    +
    {{li.Total}}
    -
    + @@ -97,7 +97,7 @@ {{li.ListName }}
    {{li.TypeName}}
    -
    {{li.Tot_Amount}}
    +
    {{li.Total}}
    @@ -129,16 +129,16 @@ -
    +
    {{li.ListName }}
    {{li.TypeName}}
    -
    {{li.Tot_Amount}}
    +
    {{li.Total}}
    -
    + @@ -159,7 +159,7 @@ {{li.ListName }}
    {{li.TypeName}}
    -
    {{li.Tot_Amount}}
    +
    {{li.Total}}
    From c8c367775294e2a35f492148ef8a8aa2bdd6a685 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Mon, 6 Aug 2018 12:41:46 +0530 Subject: [PATCH 11/16] profit loss statement --- Apollo/assets/i18n/en.json | 2 +- Apollo/assets/views/income_expense_report.html | 14 +++++++------- Apollo/assets/views/income_expense_report_pdf.html | 14 +++++++------- Apollo/assets/views/partials/nav.html | 8 ++++---- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Apollo/assets/i18n/en.json b/Apollo/assets/i18n/en.json index 548b628a..2936f67c 100755 --- a/Apollo/assets/i18n/en.json +++ b/Apollo/assets/i18n/en.json @@ -138,7 +138,7 @@ "APPROVAL": "APPROVE EXPENSE", "DAYBOOKDETAILS": "DAYBOOK DETAILS", "DAYBOOKAPPROVAL": "DAYBOOK APPROVAL", - "INCOMEEXPENSEREPORT" : "INCOME EXPENSE REPORT" + "INCOMEEXPENSEREPORT" : "PROFIT-LOSS STATEMENT" }, "mydetails": { "MAIN": "MY DETAILS" diff --git a/Apollo/assets/views/income_expense_report.html b/Apollo/assets/views/income_expense_report.html index 13ea187f..89cb4f9b 100644 --- a/Apollo/assets/views/income_expense_report.html +++ b/Apollo/assets/views/income_expense_report.html @@ -46,7 +46,7 @@
    -

    Income-Expense Report

    +

    PROFIT LOSS STATEMENT

    @@ -155,7 +155,7 @@

    Apollo Distance Education

    -

    Profit and Loss Report

    +

    Profit and Loss Statement


    @@ -169,7 +169,7 @@
    -{{li.ListName }} +
    {{li.TypeName}}
    {{li.Total}}
    @@ -191,8 +191,8 @@
    -
    -{{li.ListName }} +
    +
    {{li.TypeName}}
    {{li.Total}}
    @@ -229,7 +229,7 @@
    - {{li.ListName }} +
    {{li.TypeName}}
    {{li.Total}}
    @@ -254,7 +254,7 @@
    - {{li.ListName }} +
    {{li.TypeName}}
    {{li.Total}}
    diff --git a/Apollo/assets/views/income_expense_report_pdf.html b/Apollo/assets/views/income_expense_report_pdf.html index f6910464..4566146d 100644 --- a/Apollo/assets/views/income_expense_report_pdf.html +++ b/Apollo/assets/views/income_expense_report_pdf.html @@ -52,8 +52,8 @@

    Apollo Distance Education

    -

    Profit and Loss Report

    -

    From: {{income_expensedetails.fdate}} to {{income_expensedetails.tdate}}

    +

    Profit and Loss Statement

    +

    From {{income_expensedetails.fdate}} to {{income_expensedetails.tdate}}


    @@ -72,7 +72,7 @@
    -{{li.ListName }} +
    {{li.TypeName}}
    {{li.Total}}
    @@ -93,8 +93,8 @@
    -
    -{{li.ListName }} +
    +
    {{li.TypeName}}
    {{li.Total}}
    @@ -131,7 +131,7 @@
    - {{li.ListName }} +
    {{li.TypeName}}
    {{li.Total}}
    @@ -156,7 +156,7 @@
    - {{li.ListName }} +
    {{li.TypeName}}
    {{li.Total}}
    diff --git a/Apollo/assets/views/partials/nav.html b/Apollo/assets/views/partials/nav.html index aa1563be..1c5aa6d7 100755 --- a/Apollo/assets/views/partials/nav.html +++ b/Apollo/assets/views/partials/nav.html @@ -295,7 +295,7 @@
  • - DAY BOOK INCOME EXPENSE REPORT + DAY BOOK PROFIT-LOSS STATEMENT
    • @@ -747,7 +747,7 @@
  • - DAY BOOK INCOME EXPENSE REPORT + DAY BOOK PROFIT-LOSS STATEMENT
    • @@ -1092,7 +1092,7 @@
  • - DAY BOOK INCOME EXPENSE REPORT + DAY BOOK PROFIT-LOSS STATEMENT
    • @@ -1348,7 +1348,7 @@
  • - DAY BOOK INCOME EXPENSE REPORT + DAY BOOK PROFIT-LOSS STATEMENT
    • From 6ef11f3ad1fdd1cae3f4d679e6915299524d678b Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Mon, 6 Aug 2018 14:29:05 +0530 Subject: [PATCH 12/16] sum --- .../api/application/models/DayBook_model.php | 4 ++-- .../daybook/daybooksuperAdminApproval.html | 3 ++- .../views/daybook/daybooksuperadmin.html | 21 ++++++++++++++++--- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/Apollo/api/application/models/DayBook_model.php b/Apollo/api/application/models/DayBook_model.php index 9a1f08ee..627c9e52 100755 --- a/Apollo/api/application/models/DayBook_model.php +++ b/Apollo/api/application/models/DayBook_model.php @@ -709,12 +709,12 @@ class DayBook_model extends CI_Model $subQuery='select Name,sum(Amount) as Total,T_DayBookMaster.ID,T_Income_Outcome_Master.ID as SubID,T_Income_Outcome_Master.TypeID as OrgType,T_Income_Outcome_Master.TypeName,T_DayBookMaster.Date,Reason,T_DayBookMaster.Description,ListName from T_DayBookMaster left join T_Income_Outcome_Master on T_Income_Outcome_Master.ID = T_DayBookMaster.Type join T_PickListDetails on T_PickListDetails.ListCode = T_Income_Outcome_Master.TypeID -where str_to_date(date,?)>=? and str_to_date(date,?)<=? group by Type'; +where str_to_date(date,?)>=? and str_to_date(date,?)<=? group by Type,Name'; $query = $this->db->query($subQuery,array('%d-%m-%Y',$fromd,'%d-%m-%Y',$tod)); - //print_r( $this->db->last_query()); + //print_r( $this->db->last_query()); // die(); $expense = $query->result(); diff --git a/Apollo/assets/views/daybook/daybooksuperAdminApproval.html b/Apollo/assets/views/daybook/daybooksuperAdminApproval.html index 6ccf9ca8..96ec626a 100755 --- a/Apollo/assets/views/daybook/daybooksuperAdminApproval.html +++ b/Apollo/assets/views/daybook/daybooksuperAdminApproval.html @@ -54,10 +54,11 @@
    + Type is Required diff --git a/Apollo/assets/views/daybook/daybooksuperadmin.html b/Apollo/assets/views/daybook/daybooksuperadmin.html index c7cd7109..dae4cdc2 100755 --- a/Apollo/assets/views/daybook/daybooksuperadmin.html +++ b/Apollo/assets/views/daybook/daybooksuperadmin.html @@ -232,13 +232,28 @@ + {{typeItem}} + + + + + - Type is Required + + Type is Required
    From a7f7110ee8434de4a03d860586b28fdd0a4b8efe Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Mon, 6 Aug 2018 09:02:52 +0000 Subject: [PATCH 13/16] feesStatusCtrl.js edited online with Bitbucket -for pdf border --- Apollo/assets/js/controllers/feesStatusCtrl.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Apollo/assets/js/controllers/feesStatusCtrl.js b/Apollo/assets/js/controllers/feesStatusCtrl.js index 7e14abc3..f0578c60 100755 --- a/Apollo/assets/js/controllers/feesStatusCtrl.js +++ b/Apollo/assets/js/controllers/feesStatusCtrl.js @@ -2284,7 +2284,7 @@ app.controller('FeesModalInstanceCtrl', ["$scope", "$modalInstance", "$timeout", popupWinindow.document.open(); popupWinindow.document.write(''); popupWinindow.document.write(''); popupWinindow.document.write(innerContents); popupWinindow.document.write(''); From d18d8bdfd23f2ea3b1a79d06fc5b31fd8c297ba5 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Mon, 6 Aug 2018 09:05:26 +0000 Subject: [PATCH 14/16] updateFeesStatus.html edited online with Bitbucket-for pdf changes --- .../views/status-update/updateFeesStatus.html | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/Apollo/assets/views/status-update/updateFeesStatus.html b/Apollo/assets/views/status-update/updateFeesStatus.html index 70226422..ad38f311 100755 --- a/Apollo/assets/views/status-update/updateFeesStatus.html +++ b/Apollo/assets/views/status-update/updateFeesStatus.html @@ -450,18 +450,18 @@
    - + - - + -
    -
    - - + From d87a5f78305a6782bcb6cdb9656d55aab6be3d0f Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Mon, 6 Aug 2018 15:00:20 +0530 Subject: [PATCH 15/16] active --- Apollo/assets/js/config.router.js | 2 +- Apollo/assets/js/controllers/income_reportCtrl.js | 2 +- Apollo/assets/views/partials/nav.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Apollo/assets/js/config.router.js b/Apollo/assets/js/config.router.js index 02c96bfa..e2b93790 100755 --- a/Apollo/assets/js/config.router.js +++ b/Apollo/assets/js/config.router.js @@ -170,7 +170,7 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com ncyBreadcrumb: { label: 'Status' }, - }).state('app.master.incomeexpensereport', { + }).state('app.daybooksuperadmin.incomeexpensereport', { url: '/incomeexpensereport', templateUrl: "assets/views/income_expense_report.html", resolve: loadSequence('income_reportCtrl','ngTable', 'ladda', 'angular-ladda'), diff --git a/Apollo/assets/js/controllers/income_reportCtrl.js b/Apollo/assets/js/controllers/income_reportCtrl.js index b2188c5c..1511a7e0 100644 --- a/Apollo/assets/js/controllers/income_reportCtrl.js +++ b/Apollo/assets/js/controllers/income_reportCtrl.js @@ -400,7 +400,7 @@ var Total_exp = 0; kendo.drawing.drawDOM($("#income_expensepdf"), { paperSize: "A4", margin:"1cm"} ).then(function(group) { - kendo.drawing.pdf.saveAs(group, "income_expensepdf"+".pdf"); + kendo.drawing.pdf.saveAs(group, "profit-loss statement"+".pdf"); }); diff --git a/Apollo/assets/views/partials/nav.html b/Apollo/assets/views/partials/nav.html index 1c5aa6d7..9dda9651 100755 --- a/Apollo/assets/views/partials/nav.html +++ b/Apollo/assets/views/partials/nav.html @@ -294,7 +294,7 @@
  • - + DAY BOOK PROFIT-LOSS STATEMENT
    • From 94df771262d70cf75a2b14375669005f2e211e37 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Tue, 7 Aug 2018 07:05:24 +0000 Subject: [PATCH 16/16] Broadcast_model.php edited online with Bitbucket - for Change of sender ID --- Apollo/api/application/models/Broadcast_model.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Apollo/api/application/models/Broadcast_model.php b/Apollo/api/application/models/Broadcast_model.php index 40012b0d..894a486f 100755 --- a/Apollo/api/application/models/Broadcast_model.php +++ b/Apollo/api/application/models/Broadcast_model.php @@ -309,7 +309,7 @@ class Broadcast_model extends CI_Model { // $mobile = "91$mobile"; $message = urlencode($msg); $ch = curl_init(); - curl_setopt($ch, CURLOPT_URL, "https://smsapi.24x7sms.com/api_2.0/SendSMS.aspx?APIKEY=xegCdYUIMf3&MobileNo=" . $mobile . "&SenderID=APOLLO&Message=" . $message . "&ServiceName=PROMOTIONAL_HIGH"); + curl_setopt($ch, CURLOPT_URL, "https://smsapi.24x7sms.com/api_2.0/SendSMS.aspx?APIKEY=xegCdYUIMf3&MobileNo=" . $mobile . "&SenderID=APODEC&Message=" . $message . "&ServiceName=PROMOTIONAL_HIGH"); curl_setopt($ch, CURLOPT_RETURNTRANSFER, TRUE); $output = curl_exec($ch); curl_close($ch); @@ -333,7 +333,7 @@ class Broadcast_model extends CI_Model { // $mobile = "91$mobile"; $message = urlencode($msg); $ch = curl_init(); - curl_setopt($ch, CURLOPT_URL, "https://smsapi.24x7sms.com/api_2.0/SendSMS.aspx?APIKEY=xegCdYUIMf3&MobileNo=" . $mobile . "&SenderID=APOLLO&Message=" . $message . "&ServiceName=PROMOTIONAL_HIGH"); + curl_setopt($ch, CURLOPT_URL, "https://smsapi.24x7sms.com/api_2.0/SendSMS.aspx?APIKEY=xegCdYUIMf3&MobileNo=" . $mobile . "&SenderID=APODEC&Message=" . $message . "&ServiceName=PROMOTIONAL_HIGH"); curl_setopt($ch, CURLOPT_RETURNTRANSFER, TRUE); $output = curl_exec($ch); curl_close($ch);
    APOLLO + APOLLO
    - + APP
    		{{FeesReceiptTitle}} +
    +
    		{{FeesReceiptTitle}}
    +
    FEES ESTIMATE  {{billNo}} / {{receiptNo}}