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

screen changes : ps

Browse Source
This commit is contained in:
Sanjeev 2020-12-01 15:03:10 +05:30
parent d8dadce072
commit 56a4b89abd
11 changed files with 109 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Apollo/api/application/config/routes.php
View File

@ -297,8 +297,7 @@ $route['getPrevStatusDetailsForStu'] = 'StatusUpdation_Controller/getPrevStatusD
/*get student view details*/
$route['getStudentBasicInfo'] = 'StudentView_Controller/getStudentInfo';
$route['updateStudentCommentDetails']= 'StudentView_Controller/updateStudentCommentDetails';
/*get certificate Details*/

1
Apollo/api/application/controllers/Fees_Status_Controller.php
View File

@ -62,6 +62,7 @@ class Fees_Status_Controller extends REST_Controller {
$search['CourseID'] = $this->post('course');
$search['requestedDept'] = $this->post('requestedDept');
$search['requestedBranch'] = $this->post('branchId');
$search['BatchCode'] = $this->post('batch');
$getStudentDetails = $this->Fees_model->getStudentList($search);
if ($getStudentDetails)
{

25
Apollo/api/application/controllers/StudentView_Controller.php
View File

@ -32,6 +32,7 @@ class StudentView_Controller extends REST_Controller
// Ensure you have created the 'limits' table and enabled 'limits' within application/config/rest.php
$this->methods['getStudentInfo_post']['limit'] = 500;
$this->methods['updateStudentCommentDetails_post']['limit'] = 500;
// load the employee model
$this->load->model('Studentview_model', 'studentview_model');
@ -61,5 +62,29 @@ class StudentView_Controller extends REST_Controller
], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
}
}
public function updateStudentCommentDetails_post(){
$id = $this->post('studentID');
$comment = $this->post('comments');
print_r($id);
print_r($comment);
die();
$studentListDetails = 1;
if ($studentListDetails) {
// $studentListDetails['status'] = REST_Controller::HTTP_OK;
// // Set the response and exit
$this->response($studentListDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
} else {
// Set the response and exit
$this->response([
'message' => 'No users were found',
'status' => REST_Controller::HTTP_NOT_FOUND
], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
}
}
}

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

@ -18,7 +18,7 @@ class Fees_status_model extends CI_Model
{
if($search['MobileNumber']!='' OR $search['Firstname']!='' OR $search['UniversityID']!='' OR $search['CourseID']!='' OR $search['BatchCode']!=''){
$this->db->select('ST.StudentID,ST.MobileNumber,ST.Firstname,ST.Lastname,ST.Fathername,ST.EmailID,STC.ID,US.UniversityID,US.UniversityName,CU.CourseID,CU.CourseName,ST.PermanentAddress,if(STC.EnrollmentID = "","",STC.EnrollmentID) as EnrollmentID,US.ProfilePicPath,US.MobileNumber as UnivMobileNumber,US.Address,US.EmailID,ST.MotherName,CU.Specilization1 as Specilization,BA.BatchCode,BA.BatchName');
$this->db->select('ST.StudentID,ST.MobileNumber,ST.Firstname,ST.Lastname,ST.Fathername,ST.EmailID,STC.ID,US.UniversityID,US.UniversityName,CU.CourseID,CU.CourseName,ST.PermanentAddress,if(STC.EnrollmentID = "","",STC.EnrollmentID) as EnrollmentID,US.ProfilePicPath,US.MobileNumber as UnivMobileNumber,US.Address,US.EmailID,ST.MotherName,CU.Specilization1 as Specilization,BA.BatchCode,BA.BatchName,STC.IsActive as CourseActive, STC.Status as CourseStatus,ST.DeactiveComments,ST.IsActive');
$this->db->from(STUDENTS.' as ST');
$this->db->join(STUDENTCOURSE.' as STC', 'STC.StudentID = ST.StudentID');
$this->db->join(COURSE.' as CU', 'CU.CourseID = STC.CourseID');
@ -59,7 +59,7 @@ class Fees_status_model extends CI_Model
$this->db->where('ST.Firstname',$search['Firstname']);
}*/
$searchDetails = $this->db->get();
// print_r($this->db->last_query());die();
if($searchDetails->result()) {
$result_array['studentStatus'] = true;
$result_array['details'] = $searchDetails->result();
@ -1188,10 +1188,10 @@ class Fees_status_model extends CI_Model
* */
public function setFees($details=null,$jsonData=null){
//echo 'in';
// print_r($details);
//print_r($jsonData);
//die();
echo 'i am Here';
print_r($details);
print_r($jsonData);
die();
$RollNo= $details['RollNo'];
@ -1340,10 +1340,11 @@ if(($details['FeesType']=='PPC') || ($details['FeesType']=='TC')|| ($details['Fe
$listcode='';
foreach($getId as $ge)
{
$listcode=$ge->ListCode;
}
// Expected Remove because mentioned ON Apollo XL sheet(30.11.2020)
// foreach($getId as $ge)
// {
// $listcode=$ge->ListCode;
// }
$appstatus['StudentID'] = $details['StudentID'];
$appstatus['CourseID'] = $details['CourseID'];

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

@ -73,6 +73,8 @@ class Student_model extends CI_Model {
// }
$sql.=" group by LTF.TrackingID";
// print_r($sql);
// die();
$b=$this->db->query($sql);
$trackingDetails = $b->result();
$result =$trackingDetails;

16
Apollo/api/application/models/Studentview_model.php
View File

@ -75,6 +75,7 @@ class Studentview_model extends CI_Model
$this->db->where('ST.MobileNumber', $requestedBy);
$this->db->where('STC.BranchID', $requestedBranch);
$studentDetails = $this->db->get()->first_row();
// print_r($this->db->last_query());die();
if($studentDetails){
$result['studentStatus'] = true;
$result['studentDetails'] = $studentDetails;
@ -692,4 +693,19 @@ class Studentview_model extends CI_Model
}
public function updateStudentComment(){
return 1;
// $array = (''=>);
// $this->db->where('ID', $Arr['ID']);
// $this->db->update(STUDENTS, $array);
// if ($this->db->affected_rows() == '1') {
// $result['updateUniversityStatus'] = true;
// $result['message'] = "Successfully University details Updated";
// } else {
// $result['updateUniversityStatus'] = false;
// $result['message'] = "University details not Updated";
// }
// return $result;
}
}

2
Apollo/api/system/libraries/Upload.php
View File

@ -1104,7 +1104,7 @@ class CI_Upload {
}
$memory_limit = (int) ceil(filesize($file) + $memory_limit[0]);
ini_set('memory_limit', $memory_limit); // When an integer is used, the value is measured in bytes. - PHP.net
ini_set('memory_limit', '512M'); // ini_set('memory_limit', $memory_limit); // When an integer is used, the value is measured in bytes. - PHP.net
}
// If the file being uploaded is an image, then we should have no problem with XSS attacks (in theory), but

3
Apollo/assets/js/api/application/controllers/Fees_Status_Controller.php
View File

@ -55,7 +55,6 @@ class Fees_Status_Controller extends REST_Controller {
* */
public function getStudentList_post()
{
echo "i am here";die();
$search['requestedBy'] = $this->post('requestedtBy');
$search['Firstname'] = $this->post('studentName');
$search['MobileNumber'] = $this->post('mobileNumber');
@ -79,8 +78,6 @@ class Fees_Status_Controller extends REST_Controller {
'status' => REST_Controller::HTTP_NOT_FOUND
], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
}
}
/*

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

@ -3885,6 +3885,35 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
});
};
$scope.updateComments = function (form,details,loading) {
var update = {
method: 'POST',
url: apiPoint.url + 'updateStudentCommentDetails/',
headers: {
'Content-Type': 'application/json'
},
data: {
studentID: details,
comments: details,
}
};
$http(update).then(function (response) {
console.log(response);
// if (response.data.status==200 && response.data.followupStatus) {
// $rootScope.loadFollowupDetails(response.data.trackingID);
// $scope.ldloading2[loading.replace('-', '_')] = false;
// $rootScope.myModel1.comments='';
// } else {
// $scope.ldloading[loading.replace('-', '_')] = false;
// swal("Failed!", response.data.message, "error");
// }
});
};
$scope.printStudentDetails = function (details) {
$rootScope.pdfItems = details;
@ -3901,7 +3930,6 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
});
}
}]);
// Please note that $modalInstance represents a modal window (instance) dependency.

13
Apollo/assets/views/status-update/fees_status.html
View File

@ -116,6 +116,9 @@
<th ng-click="sort('CourseName')">Course
<span class="glyphicon sort-icon" ng-show="sortKey=='CourseName'" ng-class="{'glyphicon-chevron-up':reverse,'glyphicon-chevron-down':!reverse}"></span>
</th>
<th>Student Status</th>
<th>Course Status</th>
<th>Comment</th>
<!-- <th>Session</th>-->
<th>Action</th>
<th></th>
@ -129,6 +132,16 @@
<td><a tooltip="View Student" class="text-dark" ng-click="open(user);">{{user.MobileNumber}}</a></td>
<td>{{user.UniversityName}}</td>
<td>{{user.CourseName}}</td>
<td><span ng-if="user.IsActive == true" style="text-transform: uppercase; text-shadow: 1px 1px #166307; color: #2be209 ">ACTIVE</span>
<span tooltip="{{user.DeactiveComments}}" ng-if="user.IsActive == false" style="text-transform: uppercase; text-shadow: 1px 1px rgb(167, 88, 15); color: rgba(236, 24, 24, 0.98823529);">DEACTIVE</span>
</td>
<td><span ng-if="user.CourseActive == true" style="text-transform: uppercase; text-shadow: 1px 1px #166307; color: #2be209 ">ACTIVE</span>
<span tooltip="{{user.DeactiveComments}}" ng-if="user.CourseActive == false" style="text-transform: uppercase; text-shadow: 1px 1px rgb(167, 88, 15); color: rgba(236, 24, 24, 0.98823529);">DEACTIVE</span>
</td>
<td>
<div>{{user.Comments && user.CourseStatus ? user.Comments +' / '+ user.CourseStatus : (user.Comments ? user.Comments : (user.CourseStatus ? user.CourseStatus : ''))}}</div>
</td>
<!-- <td>{{user.SessionName}}</td>-->
<td>
<input type="button" class="btn btn-info btn-xs btn-transparent tooltips" tooltip-placement="bottom" tooltip="Click To Set Fees" id="setRow{{user.ID}}" value="Set Fees" ng-click="setFees(user)">

11
Apollo/assets/views/student/studentDetailsModal.html
View File

@ -155,7 +155,10 @@
<td>Designation</td>
<td>{{items.studentDetails.Designation}}</td>
</tr>
<tr>
<td>Company Name</td>
<td>{{items.studentDetails.Companyname}}</td>
</tr>
</tbody>
</table>
@ -190,6 +193,12 @@
<td>Refered Person No</td>
<td>{{items.studentDetails.ReferersMobileNumber}}</td>
</tr>
<tr>
<td>Comments</td>
<td>
<span style="white-space:pre-wrap; background: red;">{{items.studentDetails.Comments}}</span>
</td>
</tr>
</tbody>
</table>