university formid details changes : kdk
This commit is contained in:
parent
9c49567609
commit
4aa5332c38
@ -273,6 +273,8 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller {
|
||||
}
|
||||
}
|
||||
|
||||
// get formid draft mode list details
|
||||
// kdk
|
||||
public function getForFormIdDraftDetails_post(){
|
||||
$reqBranch = $this->post('localDetails');
|
||||
$getForFormIdDraftDetails = $this->receive_model->getForFormIdDraftDetails(); // Check if the employee exist
|
||||
@ -288,6 +290,8 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller {
|
||||
}
|
||||
}
|
||||
|
||||
// add formid manual details form the university and draftmode
|
||||
// kdk
|
||||
public function addForFormIdDraftDetails_post(){
|
||||
$reqBranch = $this->post('localDetails');
|
||||
$details = $this->post('details');
|
||||
@ -306,6 +310,8 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller {
|
||||
}
|
||||
}
|
||||
|
||||
// manual formid entry draft details move to the list details
|
||||
// kdk
|
||||
public function draftMovetoList_post(){
|
||||
$reqBranch = $this->post('localDetails');
|
||||
$details = $this->post('details');
|
||||
@ -322,6 +328,8 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller {
|
||||
}
|
||||
}
|
||||
|
||||
// edit draft mode formid manul entry details
|
||||
// kdk
|
||||
public function editDraftFormIdFeesDetails_post(){
|
||||
$reqBranch = $this->post('localDetails');
|
||||
$details = $this->post('details');
|
||||
@ -341,7 +349,8 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller {
|
||||
}
|
||||
}
|
||||
|
||||
// get formid fee details list with status
|
||||
// get formid , fee details form the file upload for the university , course, student
|
||||
// kdk
|
||||
public function getStudentUnivFormIdFeeDatailsList_post(){
|
||||
$reqBranchData = $this->post('data');
|
||||
$searchDetails = $this->post('search');
|
||||
@ -359,6 +368,8 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller {
|
||||
}
|
||||
}
|
||||
|
||||
// get formid status list for that particular record
|
||||
// kdk
|
||||
public function getFormIdDetailsStatusUpdateList_post(){
|
||||
$reqBranchData = $this->post('localDetails');
|
||||
$statusDetailsId = $this->post('detailsID');
|
||||
@ -376,6 +387,8 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller {
|
||||
}
|
||||
}
|
||||
|
||||
// add formid list file status list for that record
|
||||
// kdk
|
||||
public function insertStatusUpdateDetails_post(){
|
||||
$reqBranchData = $this->post('localDetails');
|
||||
$statusDetails = $this->post('details');
|
||||
@ -413,6 +426,8 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller {
|
||||
}
|
||||
}
|
||||
|
||||
// get unmatched records of the formid file details , compare with file 1
|
||||
// kdk
|
||||
public function getUnmatchedFormIdFeesDetails_post(){
|
||||
$localDetails = $this->post('localDetails');
|
||||
$getDetailsFor = $this->post('getDetailsFor');
|
||||
@ -430,6 +445,8 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller {
|
||||
}
|
||||
}
|
||||
|
||||
// add fromid university amount details to account state
|
||||
// kdk
|
||||
public function addToAccountStateList_post(){
|
||||
$localDetails = $this->post('localDetails');
|
||||
$getDetailsFor = $this->post('details');
|
||||
|
||||
@ -367,7 +367,8 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model {
|
||||
return $finalArray;
|
||||
}
|
||||
|
||||
|
||||
// add student formid feedetails from the university by file upload , with check the unique entry
|
||||
// kdk
|
||||
public function formIdFeeDetails($formFeeDetails=null,$local=null, $univ =null){
|
||||
$localBranchID = $local['localBranchID'];
|
||||
$localUserID = $local['localUserID'];
|
||||
@ -890,6 +891,8 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model {
|
||||
return $resultArray;
|
||||
}
|
||||
|
||||
// get formid draft mode list details
|
||||
// kdk
|
||||
public function getForFormIdDraftDetails(){
|
||||
$selectQuery = "SELECT * FROM T_FormId_FeeDetails_Received_From_University WHERE DraftStatus = 1";
|
||||
$details = $this->db->query($selectQuery);
|
||||
@ -906,6 +909,8 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model {
|
||||
return $result;
|
||||
}
|
||||
|
||||
// add formid manual details form the university and draftmode
|
||||
// kdk
|
||||
public function addForFormIdDraftDetails($details, $local, $univ =null){
|
||||
|
||||
$localBranchID = $local['localBranchID'];
|
||||
@ -988,6 +993,8 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model {
|
||||
return $result;
|
||||
}
|
||||
|
||||
// manual formid entry draft details move to the list details
|
||||
// kdk
|
||||
public function draftMovetoList($detail, $local){
|
||||
// print_r($details);exit();
|
||||
|
||||
@ -1016,6 +1023,8 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model {
|
||||
return $result;
|
||||
}
|
||||
|
||||
// edit draft mode formid manul entry details
|
||||
// kdk
|
||||
public function editDraftFormIdFeesDetails($reqBranch, $details, $detailsID){
|
||||
$ids = $detailsID;
|
||||
$formIds = $details['FormID'];
|
||||
@ -1085,6 +1094,8 @@ $result['updatedraftStatus'] = false;
|
||||
return $result;
|
||||
}
|
||||
|
||||
// get formid , fee details form the file upload for the university , course, student
|
||||
// kdk
|
||||
public function getStudentUnivFormIdFeeDatailsList($reqBranchData, $searchDetails){
|
||||
|
||||
$this->db->select('FUD.*, concat(ST.FirstName," ", ST.Lastname) as app_StudentName, IF(concat(ST.FirstName," " , ST.Lastname) = FUD.Student_Name, "YES", "NO") as StudentNameStatus ,
|
||||
@ -1154,6 +1165,8 @@ $result['updatedraftStatus'] = false;
|
||||
|
||||
}
|
||||
|
||||
// get formid status list for that particular record
|
||||
// kdk
|
||||
public function getFormIdDetailsStatusUpdateList($reqBranchData, $searchDetails){
|
||||
$selectQuery = "SELECT * , concat(t3.Firstname, '', t3.Lastname) as CreatedByName
|
||||
FROM T_FormId_FeeDetails_Received_From_University_StatusUpdate as t1
|
||||
@ -1174,6 +1187,8 @@ $result['updatedraftStatus'] = false;
|
||||
return $result;
|
||||
}
|
||||
|
||||
// add formid list file status list for that record
|
||||
// kdk
|
||||
public function insertStatusUpdateDetails($reqBranchData, $statusDetails, $id, $formId ){
|
||||
|
||||
$newLeadDetails['FormIdDetailsID'] = $id;
|
||||
@ -1194,7 +1209,8 @@ $result['updatedraftStatus'] = false;
|
||||
return $result;
|
||||
}
|
||||
|
||||
// get university list
|
||||
// get university list for search
|
||||
// kdk
|
||||
public function get_university_list($branch) {
|
||||
$this->db->select('UniversityID, UniversityName');
|
||||
$this->db->order_by('CreatedOn', 'DESC');
|
||||
@ -1213,6 +1229,8 @@ $result['updatedraftStatus'] = false;
|
||||
return $results;
|
||||
}
|
||||
|
||||
// get unmatched records of the formid file details , compare with file 1
|
||||
// kdk
|
||||
public function getUnmatchedFormIdFeesDetails($localDetails, $getDetailsFor) {
|
||||
|
||||
$searchUniv = $getDetailsFor['univCode'];
|
||||
@ -1237,6 +1255,8 @@ $result['updatedraftStatus'] = false;
|
||||
return $resultArr;
|
||||
}
|
||||
|
||||
// Add formid , university amount payment details to the account state
|
||||
// kdk
|
||||
public function addFormIdListToAccountState($localDetails, $getDetailsFor){
|
||||
$localCreatedBy = $localDetails['localUserID'];
|
||||
$time = date('Y-m-d H:i:s');
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
'use strict';
|
||||
/**
|
||||
* controllers for ng-table
|
||||
* Simple table with sorting and filtering on AngularJS
|
||||
* Student University Formid, Fee details compare
|
||||
* kdk
|
||||
*/
|
||||
|
||||
@ -403,7 +402,7 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter
|
||||
// manual entry details add
|
||||
|
||||
$scope.addManualData = function () {
|
||||
alert(JSON.stringify($scope.draftManualEntryDetails));
|
||||
// alert(JSON.stringify($scope.draftManualEntryDetails));
|
||||
|
||||
var addDraftDetailsList = {
|
||||
method: 'POST',
|
||||
@ -461,6 +460,7 @@ $scope.draftManualEntryDetails = {
|
||||
return 0;
|
||||
}
|
||||
|
||||
// add draft details to list
|
||||
$scope.addToList = function (id) {
|
||||
swal({
|
||||
title: "Are you sure?",
|
||||
@ -501,7 +501,8 @@ $scope.draftManualEntryDetails = {
|
||||
} else {
|
||||
swal("", response.data.draftDetailsMessagae, "warning");
|
||||
|
||||
}});
|
||||
}
|
||||
});
|
||||
} else {
|
||||
swal("Cancelled", "Your record not added to list :)", "error");
|
||||
}
|
||||
@ -516,6 +517,7 @@ $scope.draftManualEntryDetails = {
|
||||
$scope.editId = details;
|
||||
}
|
||||
|
||||
// update feeid details in draft mode
|
||||
$scope.updateFeeIDDetails = function (id, p) {
|
||||
var editDraftMoveToList = {
|
||||
method: 'POST',
|
||||
@ -539,7 +541,8 @@ $scope.draftManualEntryDetails = {
|
||||
} else {
|
||||
swal("", response.data.updatedraftDetailsMessagae, "warning");
|
||||
|
||||
}});
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
$scope.statusUpdateEditId = -1;
|
||||
@ -554,6 +557,7 @@ $scope.draftManualEntryDetails = {
|
||||
|
||||
$scope.StatusListDetails = '';
|
||||
$scope.getFormIdDetailsStatusListLoading = false;
|
||||
// formid records status details
|
||||
$scope.getFormIdDetailsStatusList = function (id) {
|
||||
|
||||
$scope.getFormIdDetailsStatusListLoading = true;
|
||||
@ -576,7 +580,8 @@ $scope.draftManualEntryDetails = {
|
||||
$scope.getFormIdDetailsStatusListLoading = false;
|
||||
$scope.StatusListDetails = response.data.formIdstatusListDetails;
|
||||
$scope.StatusListDetailsApiMessage = response.data.formIdstatusListMessagae;
|
||||
}});
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
$scope.statusUpdateFormIdDetails = {
|
||||
@ -591,6 +596,8 @@ $scope.draftManualEntryDetails = {
|
||||
}
|
||||
}
|
||||
|
||||
// add status for the formid record details
|
||||
// kdk
|
||||
$scope.addStatusUpdateDetails = function (id, formId) {
|
||||
var addStatusUpdateDetailsStatusList = {
|
||||
method: 'POST',
|
||||
@ -618,9 +625,12 @@ $scope.draftManualEntryDetails = {
|
||||
// $scope.getFormIdDetailsStatusListLoading = false;
|
||||
// $scope.StatusListDetails = response.data.formIdstatusListDetails;
|
||||
// $scope.StatusListDetailsApiMessage = response.data.formIdstatusListMessagae;
|
||||
}});
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
// add formid list details to account state
|
||||
// kdk
|
||||
$scope.addToAccountState = function (id) {
|
||||
|
||||
swal({
|
||||
@ -660,7 +670,8 @@ $scope.draftManualEntryDetails = {
|
||||
} else {
|
||||
swal("", response.data.accountStateMoveMessagae, "warning");
|
||||
|
||||
}});
|
||||
}
|
||||
});
|
||||
} else {
|
||||
swal("Cancelled", "Your record not added to list :)", "error");
|
||||
}
|
||||
|
||||
@ -218,7 +218,8 @@
|
||||
<div class="container" style="border: 1px solid gray; padding: 12px; margin: 4px;" ng-init="getFormIdDetailsStatusList(p.ID)">
|
||||
<div ng-if="getFormIdDetailsStatusListLoading">
|
||||
<div style="align: center; color: blue" align="center">
|
||||
<h3>Loading...</h3></div>
|
||||
<h3>Loading...</h3>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="container" ng-if="!getFormIdDetailsStatusListLoading">
|
||||
@ -253,7 +254,8 @@
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="pull-right">
|
||||
<button type="button" ladda="ldloading1.zoom_in" tabindex="2028" ng-disabled="statusUpdateFormIdDetails.Status == ''" class="btn btn-wide btn-success" data-style="zoom-in" ng-click="addStatusUpdateDetails(p.ID, p.FormID)">
|
||||
<button type="button" ladda="ldloading1.zoom_in" tabindex="2028" ng-disabled="statusUpdateFormIdDetails.Status == ''" class="btn btn-wide btn-success"
|
||||
data-style="zoom-in" ng-click="addStatusUpdateDetails(p.ID, p.FormID)">
|
||||
<i class='fa fa-spinner fa-spin' ng-if="editSaveButtonDisable" > </i> Save
|
||||
</button>
|
||||
<button type="reset" class="btn btn-warning btn-wide" tabindex="2029" ng-click="resetStatusUpdateForm()" ng-disabled="statusUpdateFormIdDetails.Status == ''">
|
||||
@ -280,7 +282,9 @@
|
||||
</table>
|
||||
</div>
|
||||
<div ng-if="StatusListDetails == ''">
|
||||
<div style="color: blue;" align="center"><h3>{{StatusListDetailsApiMessage}}</h3></div>
|
||||
<div style="color: blue;" align="center">
|
||||
<h3>{{StatusListDetailsApiMessage}}</h3>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
|
||||
Loading…
Reference in New Issue
Block a user