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

reregistration form and course de activate issue no : 1619 , 1623

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2019-01-29 14:46:45 +05:30
parent e8b015f773
commit 33d8667c34
4 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Apollo/api/application/models/Student_model.php
View File

@ -1565,7 +1565,28 @@ if(count($qry)>0)
//echo $Enrollment ;
//print_r($reqArr);die();
// print_r($reqArr);die();
if($reqArr['IsActive'] == 0)
{
$this->db->select('*');
$this->db->from('T_Students_Fees_Status');
$this->db->where('StudentID',$reqArr['StudentID']);
$this->db->where('CourseID',$reqArr['CourseID']);
$qry=$this->db->get();
$qry=$qry->result();
if(count($qry)>0)
{
$result['StudentStatus'] = false;
$result['message'] = "Fees Satus are active";
return $result;
}
}
if($Enrollment !='')
@ -1618,6 +1639,8 @@ if(count($qry)>0)
}
}
return $result;
}
//get login branch employee list

4
Apollo/assets/js/controllers/studentCtrl.js
View File

@ -2501,6 +2501,8 @@ $scope.getPhoneNoHistoy = function(studentId)
$scope.courseEditLoading = false;
$scope.studentCourseList = response.data.course_details;
// $scope.stucour = $scope.studentCourse[0];
console.log($scope.studentCourseList);
} else {
$scope.courselist = false;
$scope.courseEditLoading='';
@ -2634,6 +2636,8 @@ $scope.getPhoneNoHistoy = function(studentId)
// update sutdent course details
$scope.updateStudentCourseDetails = function (form, datas, hidedoj) {
//alert('in');return false;
if (form.$invalid) {
var field = null, firstError = null;
for (field in form) {

4
Apollo/assets/views/reregistration/reregistrationformpdf.html
View File

@ -61,11 +61,11 @@
<table style="height: 105px; width: 100%;border-collapse: collapse;" >
<tbody>
<tr>
<td style="width: 28.0547%;">Name of the Cadidate:</td>
<td style="width: 28.0547%;">Name of the Candidate:</td>
<td style="width: 68.9453%; border-bottom: 1px dotted;">{{Course.Firstname}} {{Course.Lastname}}</td>
</tr>
<tr>
<td style="width: 28.0547%;">Father's Nmae:</td>
<td style="width: 28.0547%;">Father's Name:</td>
<td style="width: 68.9453%; border-bottom: 1px dotted;">{{Course.Fathername}}</td>
</tr>
<tr>

2
Apollo/assets/views/student/editStudentCourseDetails.html
View File

@ -169,7 +169,7 @@
<span class="error text-small block" ng-if="Form.dateofjoining.$dirty && Form.dateofjoining.$error.required">Date of Joining is required</span>
</div>
<div ng-hide="stucour.Fee_paid_exist == 1 && localUserType == 'R002'">
<div ng-hide="stucour.Fee_paid_exist == 1 && localUserType == 'R002'" ng-if="localUserType == 'R003' || localUserType == 'R004'">
<div class="col-md-4" >
<label>
Active/De-Active