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-03 12:34:43 +05:30
parent b47e1ce6d2
commit 9e97fcac25
12 changed files with 76 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,13 +68,9 @@ class StudentView_Controller extends REST_Controller
$id = $this->post('studentID'); $id = $this->post('studentID');
$comment = $this->post('comments'); $comment = $this->post('comments');
print_r($id); $studentListDetails = $this->studentview_model->updateStudentComment($id,$comment);
print_r($comment);
die();
$studentListDetails = 1;
if ($studentListDetails) { if ($studentListDetails) {
// $studentListDetails['status'] = REST_Controller::HTTP_OK; $studentListDetails['status'] = REST_Controller::HTTP_OK;
// // Set the response and exit // // Set the response and exit
$this->response($studentListDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code $this->response($studentListDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
} else { } else {

9
Apollo/api/application/models/Calltracking_model.php
View File

@ -610,7 +610,7 @@ $msg='Dear '.$name.', Thank you for enquiring with Apollo Distance Education Col
$this->db->select('LTF.FollowupOn,LD.LeadID,LD.LeadName,LD.MobileNumber,LD.IsNewEnquiry,LT.TrackingID,LT.ActivityStatus,LT.AssignedTo,LT.StatusCode,LT.University,LT.Course,LT.AlternateMobile,LT.Address,LT.Flag,ST.StaffID,ST.Firstname,PLD1.ListCode as statusListCode,PLD1.ListName as statusListName,AV.ActivityID,AV.ActivityName,LTF.FollowupComments,LT.ReferredBy as ReferredBy'); $this->db->select('LTF.FollowupOn,LD.LeadID,LD.LeadName,LD.MobileNumber,LD.IsNewEnquiry,LT.TrackingID,LT.ActivityStatus,LT.AssignedTo,LT.StatusCode,LT.University,LT.Course,LT.AlternateMobile,LT.Address,LT.Flag,ST.StaffID,ST.Firstname,PLD1.ListCode as statusListCode,PLD1.ListName as statusListName,AV.ActivityID,AV.ActivityName,LTF.FollowupComments,LT.ReferredBy as ReferredBy,date_format(LT.CreatedOn,"%d-%m-%Y") as trackingDetailsCreatedOn,date_format(LD.CreatedOn,"%d-%m-%Y") as leadDetailsCreatedOn');
$this->db->from(LEAD_TRACKING_FOLLOWUP.' as LTF'); $this->db->from(LEAD_TRACKING_FOLLOWUP.' as LTF');
$this->db->join(LEAD_TRACKING.' as LT','LT.TrackingID=LTF.TrackingID'); $this->db->join(LEAD_TRACKING.' as LT','LT.TrackingID=LTF.TrackingID');
$this->db->join(LEAD_DETAILS.' as LD', 'LT.LeadID = LD.LeadID'); $this->db->join(LEAD_DETAILS.' as LD', 'LT.LeadID = LD.LeadID');
@ -703,6 +703,7 @@ $msg='Dear '.$name.', Thank you for enquiring with Apollo Distance Education Col
$tracking_array["Address"]=$row->Address; $tracking_array["Address"]=$row->Address;
$tracking_array["Comments"]=$row->FollowupComments; $tracking_array["Comments"]=$row->FollowupComments;
$tracking_array["ReferredBy"]=$row->ReferredBy; $tracking_array["ReferredBy"]=$row->ReferredBy;
$tracking_array["trackingDetailsCreatedOn"]=$row->trackingDetailsCreatedOn;
// $tracking_array["followupDetails"]=$this->getTrackingFollowup($row->TrackingID); // $tracking_array["followupDetails"]=$this->getTrackingFollowup($row->TrackingID);
// $followupDetails=$this->getTrackingFollowup($row->TrackingID); // $followupDetails=$this->getTrackingFollowup($row->TrackingID);
@ -821,7 +822,7 @@ $msg='Dear '.$name.', Thank you for enquiring with Apollo Distance Education Col
$this->db->select('LTF.FollowupOn,LD.LeadID,LD.LeadName,LD.MobileNumber,LD.IsNewEnquiry,LT.TrackingID,LT.ActivityStatus,LT.AssignedTo,LT.StatusCode,LT.University,LT.Course,LT.AlternateMobile,LT.Address,LT.Flag,ST.StaffID,ST.Firstname,PLD1.ListCode as statusListCode,PLD1.ListName as statusListName,AV.ActivityID,AV.ActivityName,LTF.FollowupComments'); $this->db->select('LTF.FollowupOn,LD.LeadID,LD.LeadName,LD.MobileNumber,LD.IsNewEnquiry,LT.TrackingID,LT.ActivityStatus,LT.AssignedTo,LT.StatusCode,LT.University,LT.Course,LT.AlternateMobile,LT.Address,LT.Flag,ST.StaffID,ST.Firstname,PLD1.ListCode as statusListCode,PLD1.ListName as statusListName,AV.ActivityID,AV.ActivityName,LTF.FollowupComments,date_format(LT.CreatedOn,"%d-%m-%Y") as trackingDetailsCreatedOn,date_format(LD.CreatedOn,"%d-%m-%Y") as leadDetailsCreatedOn');
$this->db->from(LEAD_TRACKING_FOLLOWUP.' as LTF'); $this->db->from(LEAD_TRACKING_FOLLOWUP.' as LTF');
$this->db->join(LEAD_TRACKING.' as LT','LT.TrackingID=LTF.TrackingID'); $this->db->join(LEAD_TRACKING.' as LT','LT.TrackingID=LTF.TrackingID');
$this->db->join(LEAD_DETAILS.' as LD', 'LT.LeadID = LD.LeadID'); $this->db->join(LEAD_DETAILS.' as LD', 'LT.LeadID = LD.LeadID');
@ -890,6 +891,7 @@ $msg='Dear '.$name.', Thank you for enquiring with Apollo Distance Education Col
$tracking_array["AlternateMobile"]=$row->AlternateMobile; $tracking_array["AlternateMobile"]=$row->AlternateMobile;
$tracking_array["Address"]=$row->Address; $tracking_array["Address"]=$row->Address;
$tracking_array["Comments"]=$row->FollowupComments; $tracking_array["Comments"]=$row->FollowupComments;
$tracking_array["trackingDetailsCreatedOn"]=$row->trackingDetailsCreatedOn;
// $tracking_array["followupDetails"]=$this->getTrackingFollowup($row->TrackingID); // $tracking_array["followupDetails"]=$this->getTrackingFollowup($row->TrackingID);
// $followupDetails=$this->getTrackingFollowup($row->TrackingID); // $followupDetails=$this->getTrackingFollowup($row->TrackingID);
@ -1051,7 +1053,7 @@ $msg='Dear '.$name.', Thank you for enquiring with Apollo Distance Education Col
$this->db->select('LD.LeadID,LD.LeadName,LD.MobileNumber,LD.IsNewEnquiry,LT.TrackingID,LT.ActivityStatus,LT.AssignedTo,LT.CreatedBranch,LT.PendingDocStatus,BR.BranchName,LT.StatusCode,LT.University,LT.Course,LT.AlternateMobile,LT.Address,LT.ReferredBy,ST.StaffID,ST.Firstname,PLD1.ListCode as statusListCode,PLD1.ListName as statusListName,AV.ActivityID,AV.ActivityName'); $this->db->select('LD.LeadID,LD.LeadName,LD.MobileNumber,LD.IsNewEnquiry,LT.TrackingID,LT.ActivityStatus,LT.AssignedTo,LT.CreatedBranch,LT.PendingDocStatus,BR.BranchName,LT.StatusCode,LT.University,LT.Course,LT.AlternateMobile,LT.Address,LT.ReferredBy,ST.StaffID,ST.Firstname,PLD1.ListCode as statusListCode,PLD1.ListName as statusListName,AV.ActivityID,AV.ActivityName,date_format(LT.CreatedOn,"%d-%m-%Y") as trackingDetailsCreatedOn');
$this->db->from(LEAD_DETAILS.' as LD'); $this->db->from(LEAD_DETAILS.' as LD');
$this->db->join(LEAD_TRACKING.' as LT', 'LT.LeadID = LD.LeadID'); $this->db->join(LEAD_TRACKING.' as LT', 'LT.LeadID = LD.LeadID');
$this->db->join(LOGIN.' as LO', 'LO.ID = LT.AssignedTo'); $this->db->join(LOGIN.' as LO', 'LO.ID = LT.AssignedTo');
@ -1128,6 +1130,7 @@ $msg='Dear '.$name.', Thank you for enquiring with Apollo Distance Education Col
$tracking_array["PendingDocStatus"]=$row->PendingDocStatus; $tracking_array["PendingDocStatus"]=$row->PendingDocStatus;
$tracking_array["followupDetails"]=$this->getTrackingFollowup($row->TrackingID); $tracking_array["followupDetails"]=$this->getTrackingFollowup($row->TrackingID);
$tracking_array["collectTrackedID"]=$this->getStudentTrackedID($row->MobileNumber,$trackingID['CreatedBranch'],$trackingID['requestedDept'],$trackingID['UpdatedBy']); $tracking_array["collectTrackedID"]=$this->getStudentTrackedID($row->MobileNumber,$trackingID['CreatedBranch'],$trackingID['requestedDept'],$trackingID['UpdatedBy']);
$tracking_array["trackingDetailsCreatedOn"]=$row->trackingDetailsCreatedOn;
$result[]=$tracking_array; $result[]=$tracking_array;

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

@ -24,7 +24,7 @@ class Fees_status_model extends CI_Model
$this->db->join(COURSE.' as CU', 'CU.CourseID = STC.CourseID'); $this->db->join(COURSE.' as CU', 'CU.CourseID = STC.CourseID');
// $this->db->join(SESSIONMASTER.' as SM', 'SM.SessionID = STC.SessionID'); // $this->db->join(SESSIONMASTER.' as SM', 'SM.SessionID = STC.SessionID');
$this->db->join(UNIVERSITY.' as US', 'US.UniversityID = CU.UniversityID'); $this->db->join(UNIVERSITY.' as US', 'US.UniversityID = CU.UniversityID');
$this->db->join(BATCH.' as BA', 'BA.UniversityID = US.UniversityID'); $this->db->join(BATCH.' as BA', 'BA.UniversityID = US.UniversityID AND BA.BranchCode = STC.BranchID');
$this->db->where('ST.IsActive','1'); $this->db->where('ST.IsActive','1');
$this->db->where('STC.IsActive','1'); $this->db->where('STC.IsActive','1');
if($search['requestedBranch']!='All'){ if($search['requestedBranch']!='All'){
@ -1188,10 +1188,10 @@ class Fees_status_model extends CI_Model
* */ * */
public function setFees($details=null,$jsonData=null){ public function setFees($details=null,$jsonData=null){
echo 'i am Here'; // echo 'i am Here';
print_r($details); // print_r($details);
print_r($jsonData); // print_r($jsonData);
die(); // die();
$RollNo= $details['RollNo']; $RollNo= $details['RollNo'];

6
Apollo/api/application/models/StatusUpdation_model.php
View File

@ -1043,13 +1043,17 @@ $this->db->insert_batch('T_BroadcastStatus', $data);
$studentId = $reqData['studId']; $studentId = $reqData['studId'];
$courseId = $reqData['courseId']; $courseId = $reqData['courseId'];
// $searchTableFor = APPLICATION_FORM; // $searchTableFor = APPLICATION_FORM;
$this->db->select('t1.ID, t1.Student_Fee_Status_Id, t1.BatchCode, t1.FeeType as SemID, CFD.Sem_Year as Sem_Year, t1.RegistrationMode, t1.RegistrationType'); $this->db->select('t1.ID, t1.Student_Fee_Status_Id, t1.BatchCode, t1.FeeType as SemID, CFD.Sem_Year as Sem_Year, t1.RegistrationMode, t1.RegistrationType,BM.BatchName,t1.CreatedOn');
$this->db->from('T_Registration_Details as t1'); $this->db->from('T_Registration_Details as t1');
$this->db->join('T_Course_Fees_Details as CFD', 'CFD.ID = t1.FeeType'); $this->db->join('T_Course_Fees_Details as CFD', 'CFD.ID = t1.FeeType');
$this->db->join('T_BatchMaster as BM', 'BM.BatchCode = t1.BatchCode');
$this->db->where('t1.StudentID', $studentId); $this->db->where('t1.StudentID', $studentId);
$this->db->where('t1.CourseID', $courseId); $this->db->where('t1.CourseID', $courseId);
$this->db->group_by('t1.ID');
$fromTypes = $this->db->get(); $fromTypes = $this->db->get();
$formTypeDetails = $fromTypes->result(); $formTypeDetails = $fromTypes->result();
// print_r($this->db->last_query());
// die();
if($formTypeDetails){ if($formTypeDetails){
// print_r($formTypeDetails);exit(); // print_r($formTypeDetails);exit();
$resultArr['formTypeDetails'] = $formTypeDetails; $resultArr['formTypeDetails'] = $formTypeDetails;

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

@ -349,10 +349,6 @@ class Student_model extends CI_Model {
$stuDetails = $this->db->query($subQuery); $stuDetails = $this->db->query($subQuery);
$checkArr = $stuDetails->result(); $checkArr = $stuDetails->result();
//print_r( $this->db->last_query());
//die();
if (count($checkArr) > 0) { if (count($checkArr) > 0) {
$results['studentList'] = true; $results['studentList'] = true;
$results['student_details'] = $stuDetails->result(); $results['student_details'] = $stuDetails->result();
@ -779,22 +775,6 @@ class Student_model extends CI_Model {
ORDER BY S.CreatedOn"; ORDER BY S.CreatedOn";
} }
else { else {
$subQuery = "SELECT S.*, IF(SFP.ID > 0, '1' , '0') as Fee_paid_exist , SC.id as Student_Course_id , U.UniversityName,U.UniversityID, C.CourseName,C.CourseCode,C.CourseID,SC.IsActive as CourseActive, SC.Status CourseStatus $subQuery = "SELECT S.*, IF(SFP.ID > 0, '1' , '0') as Fee_paid_exist , SC.id as Student_Course_id , U.UniversityName,U.UniversityID, C.CourseName,C.CourseCode,C.CourseID,SC.IsActive as CourseActive, SC.Status CourseStatus
FROM " . STUDENTCOURSE . " as SC FROM " . STUDENTCOURSE . " as SC
@ -822,6 +802,9 @@ class Student_model extends CI_Model {
} else { } else {
$results['studentList'] = false; $results['studentList'] = false;
} }
// print_r( $this->db->last_query());
// die();
return $results; return $results;
} }

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

@ -693,19 +693,27 @@ class Studentview_model extends CI_Model
} }
public function updateStudentComment(){ public function updateStudentComment($id,$value){
return 1;
// $array = (''=>); $Arr = array('Comments'=>$value);
// $this->db->where('ID', $Arr['ID']); $this->db->trans_start();
// $this->db->update(STUDENTS, $array); $this->db->where('StudentID',$id);
// if ($this->db->affected_rows() == '1') { $this->db->update(STUDENTS, $Arr);
// $result['updateUniversityStatus'] = true; $affectedRows=$this->db->affected_rows();
// $result['message'] = "Successfully University details Updated"; $this->db->trans_complete();
// } else { if ($this->db->trans_status() === false) {
// $result['updateUniversityStatus'] = false; $result = array( 'message' => 'Unable to Update details!','studCommentUpdateStatus' => false );
// $result['message'] = "University details not Updated"; } else if ($this->db->trans_status() === true) {
// } if($affectedRows > 0 ) {
// return $result; $result = array( 'message' => 'Successfully Updated!','studCommentUpdateStatus' => true );
} else {
$result = array( 'message' => 'No Changes, Try Again!.','studCommentUpdateStatus' => true );
}
}
else{
$result = array( 'message' => 'Haven`t Updated Anything,Try Again','studCommentUpdateStatus' => false );
}
return $result;
} }
} }

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

@ -3886,32 +3886,27 @@ app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log",
}; };
$scope.updateComments = function (form,details,loading) { $scope.updateComments = function (form,details,loading) {
var stud = details.StudentID;
var cmts = details.Comment;
console.log('stud',stud,'cmts',cmts);
var update = { var update = {
method: 'POST', method: 'POST',
url: apiPoint.url + 'updateStudentCommentDetails/', url: apiPoint.url + 'updateStudentCommentDetails/',
headers: { headers: {
'Content-Type': 'application/json' 'Content-Type': 'application/json'
}, },
data: { data: {studentID: stud,comments: cmts}
studentID: details,
comments: details,
}
}; };
$http(update).then(function (response) { $http(update).then(function (response) {
console.log(response); console.log(response);
// if (response.data.status==200 && response.data.followupStatus) { if (response.data.status==200 && response.data.studCommentUpdateStatus) {
// $rootScope.loadFollowupDetails(response.data.trackingID); // $scope.ldloading2[loading.replace('-', '_')] = false;
// $scope.ldloading2[loading.replace('-', '_')] = false; swal("",response.data.message, "success");
// $rootScope.myModel1.comments=''; } else {
// $scope.ldloading[loading.replace('-', '_')] = false;
// } else { swal("Failed!", response.data.message, "error");
// $scope.ldloading[loading.replace('-', '_')] = false; }
// swal("Failed!", response.data.message, "error");
// }
}); });
}; };
$scope.printStudentDetails = function (details) { $scope.printStudentDetails = function (details) {

2
Apollo/assets/views/callTrackingDetails.html
View File

@ -189,6 +189,7 @@
<th>ReferredBy</th> <th>ReferredBy</th>
<th>Comments</th> <th>Comments</th>
<th>Status</th> <th>Status</th>
<th>CreatedDate</th>
</tr> </tr>
</thead> </thead>
@ -231,6 +232,7 @@
<span class="label label-sm label-success"> {{p.statusName}} </span> <span class="label label-sm label-success"> {{p.statusName}} </span>
</a> </a>
<!--<span class="label label-sm label-success">{{p.statusName}}</span>--></td> <!--<span class="label label-sm label-success">{{p.statusName}}</span>--></td>
<td>{{p.trackingDetailsCreatedOn}}</td>
</tr> </tr>

5
Apollo/assets/views/callTrackingFollowup.html
View File

@ -234,6 +234,11 @@
</td> </td>
</tr> </tr>
<tr>
<td>Created Date</td>
<td>{{followupDetails.trackingDetailsCreatedOn}}</td>
</tr>
</tbody> </tbody>
</table> </table>
</div> </div>

6
Apollo/assets/views/report_mark_certificate_status.html
View File

@ -7,7 +7,7 @@
</div> </div>
</section> </section>
<style> <style>
<!-- td,th { --> /*<!-- td,th { -->
<!-- white-space: nowrap; --> <!-- white-space: nowrap; -->
<!-- } --> <!-- } -->
<!-- th{ --> <!-- th{ -->
@ -21,10 +21,10 @@
th { th {
cursor: pointer; cursor: pointer;
} */ }
<!-- table {border-collapse:collapse; table-layout:fixed; width:310px;} --> <!-- table {border-collapse:collapse; table-layout:fixed; width:310px;} -->
<!-- td {border:solid 1px #fab; width:100px; word-wrap:break-word;} --> <!-- td {border:solid 1px #fab; width:100px; word-wrap:break-word;} -->*/
</style> </style>
<script type="text/javascript" src="bower_components/ng-table-excel-export/ng-table-excel-export.min.js"> <script type="text/javascript" src="bower_components/ng-table-excel-export/ng-table-excel-export.min.js">

6
Apollo/assets/views/status-update/application_status.html
View File

@ -245,7 +245,7 @@
<table class="table table-strip" ng-init="editStatus = false; stufmtype.ID = -1"> <table class="table table-strip" ng-init="editStatus = false; stufmtype.ID = -1">
<thead> <thead>
<tr> <tr>
<th>id</th> <!-- <th>id</th> -->
<th>Batch</th> <th>Batch</th>
<th>Sem/Year</th> <th>Sem/Year</th>
<th>From Type</th> <th>From Type</th>
@ -254,8 +254,8 @@
</thead> </thead>
<tbody ng-repeat="stufmtype in studentFormTypeList"> <tbody ng-repeat="stufmtype in studentFormTypeList">
<tr> <tr>
<td>{{stufmtype.ID}}</td> <!-- <td>{{stufmtype.ID}}</td> -->
<td>{{stufmtype.BatchCode}}</td> <td>{{stufmtype.BatchName}}</td>
<td>{{stufmtype.Sem_Year}}</td> <td>{{stufmtype.Sem_Year}}</td>
<td>{{stufmtype.RegistrationType}}</td> <td>{{stufmtype.RegistrationType}}</td>
<td><i ng-click="statusUpdateView(stufmtype.ID)" tooltip="STATUS UPDATE" class="ti-slice"></i></td> <td><i ng-click="statusUpdateView(stufmtype.ID)" tooltip="STATUS UPDATE" class="ti-slice"></i></td>

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

@ -164,7 +164,7 @@
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<form name="Form" id="form" novalidate method="post">
<table class="table table-condensed"> <table class="table table-condensed">
<thead> <thead>
<tr> <tr>
@ -196,12 +196,19 @@
<tr> <tr>
<td>Comments</td> <td>Comments</td>
<td> <td>
<span style="white-space:pre-wrap; background: red;">{{items.studentDetails.Comments}}</span> <textarea tabindex="12" class="form-control text-dark" placeholder="Enter a comments" rows="2" ng-model="items.studentDetails.Comments" style="color:red !important;"></textarea>
<!-- <span style="white-space:pre-wrap; background: red;">{{items.studentDetails.Comments}}</span> -->
</td> </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
<div class="col-md-12 text-right" style="margin-bottom: 7px;">
<button type="submit" ladda="ldloading2.zoom_in" class="btn btn-sm btn-success" tabindex="13" data-style="zoom-in" ng-click="updateComments(Form,items.studentDetails,'zoom-in');">
Save
</button>
</div>
</form>
</div> </div>
</div> </div>
</div> </div>