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

Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec

Browse Source
This commit is contained in:
dineshkumarkannan 2018-05-31 09:32:57 +05:30
commit 9a0599ac6b
9 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Apollo/api/application/controllers/Call_Tracking_Controller.php
View File

@ -114,6 +114,9 @@ class Call_Tracking_Controller extends REST_Controller {
$tracking_followup_details['FollowupComments'] = $this->post('comments');
$tracking_followup_details['CreatedBy'] = $this->post('createdBy');
$tracking_followup_details['CreatedOn'] = $now->format('Y-m-d H:i:s');
$tracking_followup_details['StatusName'] = $this->post('status');
$tracking_followup_details['AssignedStaff'] = $this->post('assignedTo');
@ -195,6 +198,9 @@ class Call_Tracking_Controller extends REST_Controller {
$followup_details['CreatedBy'] = $this->post('updatedBy');
$followup_details['FollowupComments'] = $this->post('comments');
$followup_details['CreatedOn'] = $now->format('Y-m-d H:i:s');
$followup_details['StatusName'] = $this->post('status');
$followup_details['AssignedStaff'] = $this->post('assignedTo');

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

@ -541,11 +541,13 @@ class Calltracking_model extends CI_Model {
public function getTrackingFollowup($trackingId=null)
{
$this->db->select('LTF.InteractionId,LTF.TrackingID,LTF.FollowupOn,LTF.FollowupComments,DATE_FORMAT(LTF.CreatedOn, "%d-%m-%Y %h:%i %p") AS CreatedOn,ST.FirstName');
$this->db->select('LTF.InteractionId,LTF.TrackingID,LTF.FollowupOn,LTF.FollowupComments,DATE_FORMAT(LTF.CreatedOn, "%d-%m-%Y %h:%i %p") AS CreatedOn,ST.FirstName,ST1.FirstName as AssignedName,PLD.ListName as AssignedStatus');
$this->db->from(LEAD_TRACKING_FOLLOWUP.' as LTF');
$this->db->join(LOGIN.' as LO', 'LO.ID = LTF.CreatedBy');
$this->db->join(STAFF.' as ST', 'ST.StaffID = LO.StaffID');
$this->db->join(LOGIN.' as LO1', 'LO1.ID = LTF.AssignedStaff','left');
$this->db->join(STAFF.' as ST1', 'ST1.StaffID = LO1.StaffID','left');
$this->db->join(PICK_LIST_DETAILS.' as PLD', 'PLD.ListCode = LTF.StatusName','left');
$this->db->where('TrackingID',$trackingId);
$this->db->order_by('InteractionId','DESC');
$trackingDetails = $this->db->get();

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

@ -1525,6 +1525,10 @@ class Fees_status_model extends CI_Model
$insertfollowup_Details['FollowupComments']=$arrayDetails['FollowupComments'];
$insertfollowup_Details['CreatedBy'] = $arrayDetails['CreatedBy'];
$insertfollowup_Details['CreatedOn'] = $arrayDetails['CreatedOn'];
$insertfollowup_Details['StatusName'] = $arrayDetails['StatusCode'];
$insertfollowup_Details['AssignedStaff'] = $arrayDetails['CreatedBy'];
$this->db->insert(LEAD_TRACKING_FOLLOWUP, $insertfollowup_Details);
}

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

@ -638,6 +638,8 @@ class StatusUpdation_model extends CI_Model {
$insertfollowup_Details['FollowupComments'] = $arrayDetails['FollowupComments'];
$insertfollowup_Details['CreatedBy'] = $arrayDetails['CreatedBy'];
$insertfollowup_Details['CreatedOn'] = $arrayDetails['CreatedOn'];
$insertfollowup_Details['StatusName'] = $arrayDetails['StatusCode'];
$insertfollowup_Details['AssignedStaff'] = $arrayDetails['CreatedBy'];
$this->db->insert(LEAD_TRACKING_FOLLOWUP, $insertfollowup_Details);
// this if for insert follow up details
@ -734,6 +736,8 @@ class StatusUpdation_model extends CI_Model {
$insertfollowup_Details['FollowupComments'] = $arrayDetails['FollowupComments'];
$insertfollowup_Details['CreatedBy'] = $arrayDetails['CreatedBy'];
$insertfollowup_Details['CreatedOn'] = $arrayDetails['CreatedOn'];
$insertfollowup_Details['StatusName'] = $arrayDetails['StatusCode'];
$insertfollowup_Details['AssignedStaff'] = $arrayDetails['CreatedBy'];
$this->db->insert(LEAD_TRACKING_FOLLOWUP, $insertfollowup_Details);
// this if for insert follow up details

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

@ -339,6 +339,13 @@
<div class="text-muted text-small">
{{message.FirstName}} &nbsp;&nbsp; On &nbsp;&nbsp;{{message.CreatedOn}}
</div>
<div class="text-muted text-small">
<span ng-if="message.AssignedStatus!='' && message.AssignedStatus!=null">Status - {{message.AssignedStatus}}</span>
</div>
<div class="text-muted text-small">
</span><span ng-if="message.AssignedName!='' && message.AssignedName!=null">Assigned To - {{message.AssignedName}}</span>
</div>
<span style="white-space:pre-wrap;margin-left: -4px;"> {{message.FollowupComments}}</span>
</div>

2
Apollo/assets/views/status-update/answer_booklet_status.html
View File

@ -191,7 +191,7 @@
<span ng-if="s.ProgramType !== 'Y001'">(<b>{{s.Sem}}</b>)</span>
</th>
<td>{{s.ListName}}</td>
<td>{{s.Comments}}</td>
<td><span style="white-space:pre-wrap;">{{s.Comments}}</span></td>
<td>{{s.AnsDate}}</td>
<td>{{s.Firstname}}</td>
</tbody>

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

@ -189,7 +189,7 @@
<tbody ng-repeat="s in prevStatusListForStudentCourse">
<td>{{s.ListName}}</td>
<td>{{s.Comments}}</td>
<td><span style="white-space:pre-wrap;">{{s.Comments}}</span></td>
<td>{{s.CertificateName}}</td>
<td>{{s.AppDate}}</td>
<td>{{s.Firstname}}</td>

2
Apollo/assets/views/status-update/certification_status.html
View File

@ -190,7 +190,7 @@
<span ng-if="s.ProgramType !== 'Y001'">(<b>{{s.Sem}}</b>)</span>
</th>
<td>{{s.ListName}}</td>
<td>{{s.Comments}}</td>
<td><span style="white-space:pre-wrap;">{{s.Comments}}</span></td>
<td>{{s.CertificationType}}</td>
<td>{{s.CertificationNo}}</td>
<td>{{s.CDate}}</td>

2
Apollo/assets/views/status-update/study_material_status.html
View File

@ -192,7 +192,7 @@
<span ng-if="s.ProgramType !== 'Y001'">(<b>{{s.Sem}}</b>)</span>
</th>
<td>{{s.ListName}}</td>
<td>{{s.Comments}}</td>
<td><span style="white-space:pre-wrap;">{{s.Comments}}</span></td>
<td>{{s.SDate}}</td>
<td>{{s.Firstname}}</td>
</tbody>