diff --git a/Apollo/api/application/config/routes.php b/Apollo/api/application/config/routes.php index a986a01f..5b101c65 100755 --- a/Apollo/api/application/config/routes.php +++ b/Apollo/api/application/config/routes.php @@ -187,6 +187,11 @@ $route['IncomeExpenseDetails'] = 'DayBook_Controller/getIncomeExpenseDetails'; $route['ViewFullIncomeDetails'] = 'DayBook_Controller/ViewFullIncomeDetails'; $route['GetSubTypes'] = 'DayBook_Controller/GetSubTypes'; + +$route['getAllDayBookDetails'] = 'DayBook_Controller/getAllDayBookDetails'; + +$route['update_DayBookDetails'] = 'DayBook_Controller/update_DayBookDetailsData'; + /* Add New Contact Group */ $route['addNewGroup'] = 'Broadcast_Controller/addNewGroup'; $route['getGroups'] = 'Broadcast_Controller/getGroups'; diff --git a/Apollo/api/application/controllers/DayBook_Controller.php b/Apollo/api/application/controllers/DayBook_Controller.php index 818009c5..967a2e4e 100755 --- a/Apollo/api/application/controllers/DayBook_Controller.php +++ b/Apollo/api/application/controllers/DayBook_Controller.php @@ -449,5 +449,53 @@ class DayBook_Controller extends REST_Controller { ], REST_Controller::HTTP_NOT_FOUND); } } + + + + + public function getAllDayBookDetails_post() + { + + $search['Firstname'] = $this->post('studentName'); + $search['MobileNumber'] = $this->post('mobileNumber'); + $search['receipt'] = $this->post('receipt'); + + $allfinace = $this->daybook_model->GetAllDaybook($search); + + //print_r($allfinace); + + if($allfinace) + { + $allfinace['status'] = REST_Controller::HTTP_OK; + // Set the response and exit + $this->response($allfinace, 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); + } + + + } + + + public function update_DayBookDetailsData_post() + { + $now = new DateTime(); + $now->setTimezone(new DateTimezone('Asia/Kolkata')); + $up_details['ID']= $this->post('ID'); + //$up_details['Date'] =$this->post('Date'); + $up_details['Amount'] = $this->post('Amount'); + $up_details['Reason'] = $this->post('Reason'); + $up_details['IsActive'] = $this->post('IsActive'); + $up_details['FeesPaymentID'] = $this->post('FID'); + $up_details['requestedtBy'] = $this->post('requestedtBy'); + $up_details['branchId'] = $this->post('branchId'); + + $updatevalue = $this->daybook_model->UpdateDayFee($up_details); + } } diff --git a/Apollo/api/application/controllers/Reregister_Controller.php b/Apollo/api/application/controllers/Reregister_Controller.php index 458e9ce1..053a4796 100644 --- a/Apollo/api/application/controllers/Reregister_Controller.php +++ b/Apollo/api/application/controllers/Reregister_Controller.php @@ -158,7 +158,8 @@ class Reregister_Controller extends REST_Controller { } public function getSubject_post(){ - $SemesterID = $this->post('SemNum'); + $Sem = $this->post('SemNum'); + $SemesterID = ucfirst($Sem); $branchId = $this->post('branchId'); $course = $this->post('Course'); $sem = ''; diff --git a/Apollo/api/application/models/DayBook_model.php b/Apollo/api/application/models/DayBook_model.php index a3cc182b..60f646e6 100755 --- a/Apollo/api/application/models/DayBook_model.php +++ b/Apollo/api/application/models/DayBook_model.php @@ -753,4 +753,103 @@ $query = $this->db->query($subQuery,array('%d-%m-%Y',$fromd,'%d-%m-%Y',$tod,'Can return $result; } + + + + public function GetAllDaybook($search=null) + { + //if($search['MobileNumber']!='' && $search['Firstname']!='' && $search['receipt']!='') + //{ + $this->db->select('T_DayBookMaster.ID,Name,Type,Amount,Date,T_DayBookMaster.Description,VoucherNumber,PaidTo,T_DayBookMaster.ModeOfPayment,FeePaymentDetails,Firstname,ListName,T_DayBookMaster.ReceiptNo,T_Students_Fees_PaidDetails.IsActive as IsActive,T_Students_Fees_PaidDetails.ID as FID,T_DayBookMaster.Reason as Reason'); + $this->db->from('T_DayBookMaster'); + $this->db->join('T_StudentDetails','T_StudentDetails.StudentID=T_DayBookMaster.StudentID','left'); + $this->db->join('T_PickListDetails','T_PickListDetails.ListCode=T_DayBookMaster.Name','left'); + $this->db->join('T_Students_Fees_PaidDetails','T_Students_Fees_PaidDetails.ID = T_DayBookMaster.FeesPaymentID'); + + if($search['MobileNumber']!='') + { + $this->db->where('T_StudentDetails.MobileNumber',$search['MobileNumber']); + } + if($search['Firstname']!='') + { + // $this->db->like('ST.Firstname','%'.$search['Firstname'].'%'); + $this->db->like('T_StudentDetails.Firstname',$search['Firstname'],'both'); + } + if($search['receipt']!='') + { + $this->db->where('T_DayBookMaster.VoucherNumber',$search['receipt']); + $this->db->or_where('T_DayBookMaster.ReceiptNo',$search['receipt']); + } + + $searchDetails = $this->db->get(); + + if($searchDetails->result()) + { + + //print_r($searchDetails->result()); + $result_array['studentStatus'] = true; + $result_array['details'] = $searchDetails->result(); + } + else + { + $result_array['studentStatus'] = false; + $result_array['details'] = "No records found!"; + } + + + return $result_array; + + //} + + // else{ + // $result_array['studentStatus'] = false; + // $result_array['details'] = "No records found!"; + // } + } + + + public function UpdateDayFee($up_details) + { + //echo $up_details['ID']; + //UpdatedOn + + $time = date('Y-m-d H:i:s'); + $dateTime = $time; + + // echo $dateTime; + // die(); + + $daybookarr['ID'] = $up_details['ID']; + // $daybookarr['IsActive'] = $up_details['IsActive']; + $daybookarr['Reason'] = $up_details['Reason']; + $daybookarr['UpdatedOn'] = $dateTime; + $daybookarr['UpdatedBy'] =$up_details['requestedtBy']; + + + if($up_details['IsActive'] == 0) + { + $daybookarr['Status'] = 'Cancel'; + } + + else + { + $daybookarr['Status'] = 'Approved'; + } + + + + $this->db->where('ID', $daybookarr['ID']); + $this->db->update('T_DayBookMaster', $daybookarr); + + + $feearr['ID'] = $up_details['FeesPaymentID']; + $feearr['IsActive'] = $up_details['IsActive']; + $feearr['UpdatedOn'] = $dateTime; + $feearr['UpdatedBy'] = $up_details['branchId']; + + $this->db->where('ID', $feearr['ID']); + $this->db->update('T_Students_Fees_PaidDetails', $feearr); + + return TRUE; + } } \ No newline at end of file diff --git a/Apollo/assets/i18n/en.json b/Apollo/assets/i18n/en.json index 2c8f0340..454c8886 100755 --- a/Apollo/assets/i18n/en.json +++ b/Apollo/assets/i18n/en.json @@ -139,7 +139,8 @@ "APPROVAL": "APPROVE EXPENSE", "DAYBOOKDETAILS": "DAYBOOK DETAILS", "DAYBOOKAPPROVAL": "DAYBOOK APPROVAL", - "INCOMEEXPENSEREPORT" : "PROFIT-LOSS STATEMENT" + "INCOMEEXPENSEREPORT" : "PROFIT-LOSS STATEMENT", + "DATACORRECTION" : "DATA CORRECTION" }, "mydetails": { "MAIN": "MY DETAILS" diff --git a/Apollo/assets/js/config.constant.js b/Apollo/assets/js/config.constant.js index 040f2eab..3eabac83 100755 --- a/Apollo/assets/js/config.constant.js +++ b/Apollo/assets/js/config.constant.js @@ -133,7 +133,10 @@ app.constant('JS_REQUIRES', { 'income_reportCtrl': 'assets/js/controllers/income_reportCtrl.js', /* - + + * */ + 'datacorrectionCtrl': 'assets/js/controllers/datacorrectionCtrl.js', + /* @@ -153,11 +156,11 @@ app.constant('JS_REQUIRES', { /* * student Certification status updation * */ - 'markcardStatusCtrl': 'assets/js/controllers/markcardStatusCtrl.js', + 'certificationStatusCtrl': 'assets/js/controllers/certificationStatusCtrl.js', /* * student Certification status updation * */ - 'certificateStatusCtrl': 'assets/js/controllers/certificateStatusCtrl.js', + 'applicationStatusCtrl': 'assets/js/controllers/applicationStatusCtrl.js', /* * Certificate Type * */ diff --git a/Apollo/assets/js/config.router.js b/Apollo/assets/js/config.router.js index 7ac6422a..bf4bb81e 100755 --- a/Apollo/assets/js/config.router.js +++ b/Apollo/assets/js/config.router.js @@ -178,6 +178,14 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com ncyBreadcrumb: { label: 'income_expense' }, + }).state('app.daybooksuperadmin.datacorrection', { + url: '/datacorrection', + templateUrl: "assets/views/data_correction.html", + resolve: loadSequence('datacorrectionCtrl','ngTable', 'ladda', 'angular-ladda'), + title: 'datacorrection', + ncyBreadcrumb: { + label: 'datacorrection' + }, }).state('app.master.studentStatusUpdate', { url: '/default activity', templateUrl: "assets/views/studentStatusUpdate.html", @@ -307,22 +315,22 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com label: 'Answer Booklet' }, // resolve: loadSequence('wizardCtrl') - }).state('app.student.status.markcardstatus', { - url: '/markcardstatus', - templateUrl: "assets/views/status-update/markcard_status.html", + }).state('app.student.status.certificationstatus', { + url: '/certificationstatus', + templateUrl: "assets/views/status-update/certification_status.html", title: 'Mark Card', - resolve: loadSequence('ui.select','spin', 'ui.mask', 'spin', 'ladda', 'angular-ladda', 'ngTable', 'markcardStatusCtrl'), + resolve: loadSequence('ui.select','spin', 'ui.mask', 'spin', 'ladda', 'angular-ladda', 'ngTable', 'certificationStatusCtrl'), ncyBreadcrumb: { label: 'Mark Card' }, // resolve: loadSequence('wizardCtrl') - }).state('app.student.status.certificatestatus', { - url: '/certificatestatus', - templateUrl: "assets/views/status-update/certificate_status.html", - title: 'Certificate Status', - resolve: loadSequence('ui.select','spin', 'ui.mask', 'spin', 'ladda', 'angular-ladda', 'ngTable', 'certificateStatusCtrl'), + }).state('app.student.status.applicationstatus', { + url: '/applicationstatus', + templateUrl: "assets/views/status-update/application_status.html", + title: 'Documents Status', + resolve: loadSequence('ui.select','spin', 'ui.mask', 'spin', 'ladda', 'angular-ladda', 'ngTable', 'applicationStatusCtrl'), ncyBreadcrumb: { - label: 'Certificate Status' + label: 'Documents Status' }, // resolve: loadSequence('wizardCtrl') }).state('app.status.application', { diff --git a/Apollo/assets/js/controllers/datacorrectionCtrl.js b/Apollo/assets/js/controllers/datacorrectionCtrl.js new file mode 100644 index 00000000..1f67b36c --- /dev/null +++ b/Apollo/assets/js/controllers/datacorrectionCtrl.js @@ -0,0 +1,233 @@ +'use strict'; +/*** controller***/ +app.controller('datacorrectionCtrl', ["$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 = { + + "Date": "", + //"to_date": "", + + }; + + + + // $scope.initHead = function() { + + var logcheck = JSON.parse(localStorage.getItem('localObj')); + + const LOCALTYPE = logcheck.localType; + if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { + console.log("if"); + }else { + if(logcheck != null && LOCALTYPE !='R001') { + console.log("else if"); + $state.go('app.dashboard'); + } else { + + console.log("else else"); + //ipCookie.remove('cookiechk'); + window.localStorage.clear(); + $state.go('login.signin'); + } + } + + + + + $scope.init = function(){ + + console.log('gf'); + } + + + + // $scope.click = function (form,myModel) + // { + + + // alert() + // }; + + + + + $scope.studentInfo=""; + $scope.getStudentDetails = function (form,myModel) { + + // console.log(form.$invalid) + // alert() + + var mobileNumber = myModel.mobileNumber; + //console.log(mobileNumber); + var studentName = myModel.studentName; + //console.log(studentName); + var receipt = myModel.receipt; + //console.log(receipt); + + 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.isLoaderShow= false + var getStudent = { + method: 'POST', + url: apiPoint.url + 'getAllDayBookDetails/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + studentName: myModel.studentName, + mobileNumber: myModel.mobileNumber, + receipt: myModel.receipt, + // course:myModel.courseName, + requestedtBy: JSON.parse(localStorage.getItem('localObj')).localUserID, + branchId: JSON.parse(localStorage.getItem('localObj')).localBranchID, + requestedDept: JSON.parse(localStorage.getItem('localObj')).localType, + } + }; + $http(getStudent).then(function (response) { + if (response.data.status==200 && response.data.studentStatus) { + $scope.studentInfo=response.data.details; + console.log($scope.studentInfo); + + } else { + $scope.studentInfo=""; + + $scope.isLoaderShow = true; + $scope.load = "No Records Found"; + + } + }); + + } + } + + +// $scope.setDate = function(p) +// { +// alert() +// } + + + + + $scope.updatestatus = function (myModel, form, loading) + { +//alert(myModel.ID) + +//alert(myModel.Reason); + +var d = new Date(myModel.Date); +// console.log(d.getUTCDate()); // Hours +// console.log(d.getUTCMonth()); +// console.log(d.getUTCFullYear()); + +var mdate = d.getUTCDate() + 1; +var mmonth = d.getUTCMonth() + 1; +var myear = d.getUTCFullYear(); + +var CDate = mdate+"-"+mmonth+"-"+myear; +//console.log(CDate) + + +var IsActive = ''; + +if(myModel.IsActive == true) +{ + IsActive =1; +} + +else if(myModel.IsActive == false) +{ + IsActive =0; +} + + var updatedaybook = { + method: 'POST', + url: apiPoint.url + 'update_DayBookDetails/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + studentName: myModel.studentName, + mobileNumber: myModel.mobileNumber, + receipt: myModel.receipt, + ID : myModel.ID, + FID : myModel.FID, + Date :myModel.Date, + Amount :myModel.Amount, + Reason : myModel.Reason, + IsActive : IsActive, + // course:myModel.courseName, + requestedtBy: JSON.parse(localStorage.getItem('localObj')).localUserID, + branchId: JSON.parse(localStorage.getItem('localObj')).localBranchID, + requestedDept: JSON.parse(localStorage.getItem('localObj')).localType, + } + }; + + $http(updatedaybook).then(function (response) { + swal('Change Saved Successfully', response.data.message, "success"); + $scope.close(); + + }); + + }; + + + + + + + + + + + + + + + $scope.OpenWindowStatus = false; + $scope.editId = -1; + $scope.setEditId = function (P) + { //alert(P); + $scope.editId = P; + } + + $scope.close = function () + { + $scope.editId = -1; + } + + + + + + + + + + + }]); + + + + diff --git a/Apollo/assets/views/data_correction.html b/Apollo/assets/views/data_correction.html new file mode 100644 index 00000000..5e6673b6 --- /dev/null +++ b/Apollo/assets/views/data_correction.html @@ -0,0 +1,171 @@ + + + + + + +
+
+
+

DATA CORRECTION

+
+ +
+
+ + +
+
+
+ + + +
+
+ Search +
+
+ + + + Enter a valid mobile number + + +
+ +
+ + + + Invalid student name +
+
+ + + +
+ + + +
+
+ + +
+
+ +
+
+ +
+ +
+

{{load}}

+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
TypeReceipt NoPaid To / Received FromDateSemVoucher Number / Bill NumberAmountAction
{{p.ListName}}{{p.ReceiptNo}}{{p.PaidTo}}{{p.Date}}{{p.FeePaymentDetails}}{{p.VoucherNumber}}{{p.Amount}}
+
+
+ +
+ + diff --git a/Apollo/assets/views/edit_daybookentries.html b/Apollo/assets/views/edit_daybookentries.html new file mode 100644 index 00000000..f6a89d89 --- /dev/null +++ b/Apollo/assets/views/edit_daybookentries.html @@ -0,0 +1,122 @@ +
+
+
+
+
+ + Update Day Book Details + +
+ +
+ +
+ +
+
+
+ + +
+ + +
+ + + + + +
+ +
+ + + + + +
+ +
+ + + + + + + +
+ + +
+ + + +
+ + + + +
+ + + + +
+ + + +
+ +
+ + + +
+
+ + +
+ +
+ +
+ +
+
+
+
+ + + + +
+
+
+ +
+
+
+ \ No newline at end of file diff --git a/Apollo/assets/views/partials/nav.html b/Apollo/assets/views/partials/nav.html index 3fbf0151..ec04b8a2 100755 --- a/Apollo/assets/views/partials/nav.html +++ b/Apollo/assets/views/partials/nav.html @@ -199,13 +199,13 @@
  • - + Certification
  • - - Certificate + + Application
    • @@ -307,6 +307,13 @@ +
  • + + DATA CORRECTION + +
    • + + @@ -411,11 +418,6 @@
    @@ -775,6 +777,14 @@ +
  • + + DATA CORRECTION + +
    • + + + @@ -880,11 +890,6 @@
    @@ -1276,12 +1292,12 @@
  • - - Markcard + + Certification
  • - + Application