fee id capture details changes : kdk
This commit is contained in:
dineshkumarkannan
parent
525232c197
commit
22afde7cb2
@ -277,7 +277,9 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller {
|
||||
// kdk
|
||||
public function getForFormIdDraftDetails_post(){
|
||||
$reqBranch = $this->post('localDetails');
|
||||
$getForFormIdDraftDetails = $this->receive_model->getForFormIdDraftDetails(); // Check if the employee exist
|
||||
$getDetailsFor = $this->post('getDetailsFor');
|
||||
|
||||
$getForFormIdDraftDetails = $this->receive_model->getForFormIdDraftDetails($getDetailsFor); // Check if the employee exist
|
||||
if ($getForFormIdDraftDetails) {
|
||||
$getForFormIdDraftDetails['status'] = REST_Controller::HTTP_OK;
|
||||
// Set the response and exit
|
||||
|
||||
@ -893,8 +893,10 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model {
|
||||
|
||||
// get formid draft mode list details
|
||||
// kdk
|
||||
public function getForFormIdDraftDetails(){
|
||||
$selectQuery = "SELECT * FROM T_FormId_FeeDetails_Received_From_University WHERE DraftStatus = 1";
|
||||
public function getForFormIdDraftDetails($getUnivDetails){
|
||||
$selectUniv = $getUnivDetails['univCode'];
|
||||
|
||||
$selectQuery = "SELECT * FROM T_FormId_FeeDetails_Received_From_University WHERE UniversityID = '$selectUniv' AND DraftStatus = 1";
|
||||
$details = $this->db->query($selectQuery);
|
||||
$detailsList = $details->result();
|
||||
if($detailsList) {
|
||||
@ -1100,7 +1102,8 @@ $result['updatedraftStatus'] = false;
|
||||
|
||||
$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 ,
|
||||
ST.Fathername as app_FatherName, IF(ST.Fathername = FUD.Father_Name, "YES", "NO") as FathernameStatus,
|
||||
CM.CourseCode as app_CourseCode, IF(CM.CourseCode = FUD.CourseCode, "YES", "NO" ) as CourseCodeStatus');
|
||||
CM.CourseCode as app_CourseCode, IF(CM.CourseCode = FUD.CourseCode, "YES", "NO" ) as CourseCodeStatus,
|
||||
IF(ENU.SemesterYear = FUD.Semester, "YES", "NO" ) as SemesterStatus');
|
||||
$this->db->from('T_FormId_FeeDetails_Received_From_University as FUD');
|
||||
$this->db->join(ENROLMENTRECEIVEDFROMUNIV.' as ENU', 'FUD.FormID = ENU.FormID' );
|
||||
$this->db->join(STUDENTCOURSE.' as STC', 'STC.EnrollmentID = ENU.EnrolmentNo');
|
||||
|
||||
@ -129,9 +129,10 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter
|
||||
|
||||
$scope.Searchloader = false;
|
||||
$scope.studentData = false;
|
||||
|
||||
$scope.formIdListNoRecordFound = false;
|
||||
$scope.onSubmit = function () {
|
||||
$scope.Searchloader = true;
|
||||
$scope.formIdListNoRecordFound = false;
|
||||
if ($scope.searchData.University !== '' && $scope.searchData.Course !== '') {
|
||||
$scope.Searchloader = true;
|
||||
var empListreq = {
|
||||
@ -151,11 +152,13 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter
|
||||
$scope.studentData = true;
|
||||
$scope.data = response.data.studentFeeCompareDetails;
|
||||
$scope.studentListLength = $scope.data.length;
|
||||
$scope.formIdListNoRecordFound = false;
|
||||
// $scope.statusMessage = $scope.data.message;
|
||||
} else {
|
||||
$scope.formIdListNoRecordFound = true;
|
||||
$scope.Searchloader = false;
|
||||
$scope.studentData = false;
|
||||
$scope.statusMessage = $scope.data.message;
|
||||
$scope.statusMessage = response.data.message;
|
||||
}
|
||||
});
|
||||
} else {
|
||||
@ -169,9 +172,8 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter
|
||||
}
|
||||
|
||||
$scope.myObjErr = {
|
||||
"text-decoration": "underline",
|
||||
"text-decoration-color": "red",
|
||||
"font-size": "inherit"
|
||||
"color": "red",
|
||||
"font-size": "inherit",
|
||||
}
|
||||
|
||||
$scope.editId = -1;
|
||||
@ -334,6 +336,7 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter
|
||||
// get subtab details for the formid fee details get form the university
|
||||
|
||||
$scope.subTabActive = function (tab) {
|
||||
$scope.subTabactive = tab;
|
||||
if (tab == 'subTabactive2') {
|
||||
getDraftFormIdDetails();
|
||||
}
|
||||
@ -369,6 +372,7 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter
|
||||
}
|
||||
|
||||
|
||||
|
||||
$scope.draftListDetails = '';
|
||||
$scope.draftListDetailsNoRecordFound = false;
|
||||
$scope.draftListDetailsLoading = false;
|
||||
@ -384,7 +388,8 @@ app.controller('studentUnivFormIdFeeDetailsCtrl', ["$scope", "toaster", "$filter
|
||||
'Content-Type': 'application/json'
|
||||
},
|
||||
data: {
|
||||
localDetails: localDetail
|
||||
localDetails: localDetail,
|
||||
getDetailsFor: $scope.formUploadUnivSelectID
|
||||
}
|
||||
};
|
||||
$http(getFormIdDraftDetailsList).then(function (response) {
|
||||
|
||||
@ -101,6 +101,9 @@
|
||||
</div>
|
||||
<h2> {{statusMessage}} </h2>
|
||||
</div>
|
||||
<div ng-if="formIdListNoRecordFound" align="center">
|
||||
<div style="color: red; align: center;" align="center"> No Record Found ...</div>
|
||||
</div>
|
||||
<div class="table-responsive" ng-if="studentData">
|
||||
<table class="table table-hover">
|
||||
<thead>
|
||||
@ -181,16 +184,16 @@
|
||||
{{p.Year}}
|
||||
</td>
|
||||
<td>
|
||||
{{p.Semester}}
|
||||
<div ng-style="p.SemesterStatus == 'YES' ? myObj: myObjErr"> {{p.Semester}} </div>
|
||||
</td>
|
||||
<td ng-style="p.StudentNameStatus == 'YES' ? myObj: myObjErr">
|
||||
{{p.Student_Name}}
|
||||
<td>
|
||||
<div ng-style="p.StudentNameStatus == 'YES' ? myObj: myObjErr">{{p.Student_Name}}<div>
|
||||
</td>
|
||||
<td ng-style="p.FathernameStatus == 'YES' ? myObj: myObjErr">
|
||||
{{p.Father_Name}}
|
||||
<td>
|
||||
<div ng-style="p.FathernameStatus == 'YES' ? myObj: myObjErr"> {{p.Father_Name}}</div>
|
||||
</td>
|
||||
<td ng-style="p.CourseCodeStatus == 'YES' ? myObj: myObjErr">
|
||||
{{p.CourseCode}}
|
||||
<td>
|
||||
<div ng-style="p.CourseCodeStatus == 'YES' ? myObj: myObjErr"> {{p.CourseCode}} </div>
|
||||
</td>
|
||||
<td>{{p.ActualCourseFee}}</td>
|
||||
<td>{{p.CourseFee}}</td>
|
||||
@ -312,7 +315,7 @@
|
||||
<label>
|
||||
University <span class="symbol required"></span>
|
||||
</label>
|
||||
<select class="form-control" tabindex="1" name="formUniversity" ng-model="formUploadUnivSelectID.univCode" required>
|
||||
<select class="form-control" tabindex="1" name="formUniversity" ng-model="formUploadUnivSelectID.univCode" ng-change="subTabActive('subTabactive1');" required>
|
||||
<option value="" selected>Select University</option>
|
||||
<option ng-repeat="univ in universityData" value="{{univ.UniversityID}}">{{univ.UniversityName}}</option>
|
||||
</select>
|
||||
@ -321,7 +324,7 @@
|
||||
</div>
|
||||
|
||||
<tabset ng-if="formUploadUnivSelectID.univCode" id="uploadDetails" class="tabbable">
|
||||
<tab tabindex="1" active="subTabactive1" ng-click="subTabActive('subTabactive1')" heading="Upload File" id="uploadFiles">
|
||||
<tab tabindex="1" active="subTabactive == 'subTabactive1'" ng-click="subTabActive('subTabactive1')" heading="Upload File" id="uploadFiles">
|
||||
<div class="container-fluid">
|
||||
<div class="row">
|
||||
|
||||
@ -336,7 +339,7 @@
|
||||
</div>
|
||||
</div>
|
||||
</tab>
|
||||
<tab tabindex="2" active="subTabactive2" ng-click="subTabActive('subTabactive2')" heading="Upload Data Manualy" id="uploadDataManualy">
|
||||
<tab tabindex="2" active="subTabactive == 'subTabactive2'" ng-click="subTabActive('subTabactive2')" heading="Upload Data Manualy" id="uploadDataManualy">
|
||||
<div class="container-fluid">
|
||||
<div class="container">
|
||||
<div class="table-responsive">
|
||||
@ -417,6 +420,9 @@
|
||||
Loading...
|
||||
</div>
|
||||
</div>
|
||||
<div class="container">
|
||||
<div ng-if="draftListDetailsNoRecordFound" style="color: red; align: center;" align="center"> No Record Found ...</div>
|
||||
</div>
|
||||
<div class="container">
|
||||
<div ng-if="draftListDetails && !draftListDetailsLoading" class="table-responsive">
|
||||
<table class="table table-border table-hover">
|
||||
|
||||
Loading…
Reference in New Issue
Block a user