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

1596

Browse Source
This commit is contained in:
sriramv 2019-01-30 15:30:40 +05:30
commit bb01bc8a27
8 changed files with 45 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Apollo/api/application/controllers/SessionMaster_Controller.php
View File

@ -99,6 +99,8 @@ class SessionMaster_Controller extends REST_Controller {
$details['UpdatedBy'] = $this->post('updatedBy');
$details['UpdatedOn'] = $now->format("Y-m-d H:i:s");
$details['BranchCode'] = $this->post('branchCode');
// echo $details['BranchCode'];die();
$updateDetails = $this->sessionM_model->updateSession($details,$universityDetails);// Check if the users data store contains users (in case the database result returns NULL)
if ($updateDetails)

14
Apollo/api/application/models/Fees_status_model.php
View File

@ -2177,18 +2177,18 @@ $REGID='';
public function deleteSetFees($details=null){
$this->db->where('FeesID', $details['FeesID']);
$this->db->delete(FEES_INSTALLMENT);
if ($this->db->affected_rows() >= '1') {
// if ($this->db->affected_rows() >= '1') {
$this->db->where('FeesID', $details['FeesID']);
$this->db->delete(STUDENTS_FEES_STATUS);
$result['deleteStatus']=true;
$result['message']="Successfully Fees Details Deleted";
}
else{
$result['deleteStatus']=false;
$result['message']="Something went wrong.please try again";
}
// print_r($this->db->last_query());die();
// }
// else{
// $result['deleteStatus']=false;
// $result['message']="Something went wrong.please try again";
// }
//print_r($this->db->last_query());die();
return $result;

3
Apollo/api/application/models/Reregister_model.php
View File

@ -94,6 +94,9 @@ class Reregister_model extends CI_Model
$data['studentListOne'] = $res->result();
//print_r($data['studentListOne']);
$data['finalStudentList'] = array();
//print_r($this->db->last_query());die();
foreach($data['studentListOne'] as $student)
{

2
Apollo/api/application/models/SessionMaster_model.php
View File

@ -136,6 +136,7 @@ class SessionMaster_model extends CI_Model {
$existStatusUpdate['IsActive']=true;
$existStatusUpdate['UpdatedBy']=$arrayDetails['UpdatedBy'];
$existStatusUpdate['UpdatedOn']=$arrayDetails['UpdatedOn'];
$existStatusUpdate['BranchID']=$arrayDetails['BranchCode'];
$this->db->where('SessionID',$arrayDetails['SessionID']);
$this->db->where('UniversityID',$urow);
$this->db->update(SESSIONDETAILS, $existStatusUpdate);
@ -146,6 +147,7 @@ class SessionMaster_model extends CI_Model {
$update_array["IsActive"]=true;
$update_array["CreatedBy"]=$arrayDetails['UpdatedBy'];
$update_array["CreatedOn"]=$arrayDetails['UpdatedOn'];
$update_array['BranchID']=$arrayDetails['BranchCode'];
$this->db->insert(SESSIONDETAILS, $update_array);
}

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