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

Apollo/api/application/controllers/Call_Tracking_Controller.php

@@ -126,9 +126,9 @@ class Call_Tracking_Controller extends REST_Controller {
     {
         $search['requestedBy'] = $this->post('requestedBy');
         $search['requestedDept'] = $this->post('requestedDept');
-        $search['searchDate'] = $this->post('searchDate');
+       // $search['searchDate'] = $this->post('searchDate');
-        $search['searchMobileNumber'] = $this->post('searchMobileNumber');
+       // $search['searchMobileNumber'] = $this->post('searchMobileNumber');
-        $search['searchName']= $this->post('searchName');
+       // $search['searchName']= $this->post('searchName');
         $getTrackedDetails = $this->Calltracking_model->getTrackingDetails($search);
 
         if ($getTrackedDetails)
@@ -154,18 +154,21 @@ class Call_Tracking_Controller extends REST_Controller {
      * */
     public function updateFollowupDetails_post()
     {
+        $now = new DateTime();
+        $now->setTimezone(new DateTimezone('Asia/Kolkata'));
 
         //store followup details for update
         $update_followup_details['TrackingID'] = $this->post('trackingID');
         $update_followup_details['UpdatedBy'] = $this->post('updatedBy');
          $update_followup_details['StatusCode'] = $this->post('status');
-        $update_followup_details['UpdatedOn'] = date('Y-m-d H:i:s');
+        $update_followup_details['UpdatedOn'] = $now->format('Y-m-d H:i:s');
 
          // store followup details for insert
         $followup_details['TrackingID'] = $this->post('trackingID');
         $followup_details['FollowupOn'] = $this->post('date');
         $followup_details['CreatedBy'] = $this->post('updatedBy');
         $followup_details['FollowupComments'] = $this->post('comments');
+        $followup_details['CreatedOn'] = $now->format('Y-m-d H:i:s');
 
 
 

Apollo/api/application/models/Calltracking_model.php

@@ -276,10 +276,14 @@ class Calltracking_model extends CI_Model {
 
     public function getTrackingFollowup($trackingId=null)
     {
-        $this->db->select('InteractionId,TrackingID,FollowupOn,FollowupComments,CreatedOn');
+        $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->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->where('TrackingID',$trackingId);
         $this->db->order_by('InteractionId','DESC');
-        $trackingDetails = $this->db->get(LEAD_TRACKING_FOLLOWUP);
+        $trackingDetails = $this->db->get();
         return $trackingDetails->result();
     }
 
@@ -356,6 +360,8 @@ class Calltracking_model extends CI_Model {
                 $tracking_array["ListCode"]=$row->ListCode;
                 $tracking_array["ListName"]=$row->ListName;
                 $tracking_array["followupDetails"]=$this->getTrackingFollowup($row->TrackingID);
+                $tracking_array["collectTrackedID"]=$this->getStudentTrackedID($row->MobileNumber);
+
                 $result[]=$tracking_array;
 
 
@@ -375,5 +381,23 @@ class Calltracking_model extends CI_Model {
 
     }
 
+    /*
+     * get student tracked id
+     * @params mobile number
+     * created by kms
+     * */
+    public function getStudentTrackedID($stuMobile=null)
+    {
+        $this->db->distinct();
+        $this->db->select('LT.TrackingID,LT.LeadID,PLD.ListCode,PLD.ListName');
+        $this->db->from(LEAD_DETAILS.' as LD');
+        $this->db->join(LEAD_TRACKING.' as LT', 'LT.LeadID = LD.LeadID');
+        $this->db->join(PICK_LIST_DETAILS.' as PLD', 'PLD.ListCode = LT.ActivityStatus');
+        $this->db->where('LD.MobileNumber',$stuMobile);
+        $this->db->order_by('LT.TrackingID','ASC');
+        $studeTrackID = $this->db->get();
+        return $studeTrackID->result();
+    }
+
 
 }

Apollo/assets/js/controllers/callTrackingCtrl.js

@@ -350,7 +350,6 @@ app.controller('callTrackingCtrl2', ["$scope","$rootScope","toaster", "$filter",
     };
     $rootScope.loadFollowupDetails = function (trackID) {
 
-
         var load = {
             method: 'POST',
             url: apiPoint.url + 'loadFollowupDetails/',
@@ -394,3 +393,5 @@ app.controller('callTrackingCtrl2', ["$scope","$rootScope","toaster", "$filter",
 }]);
 
 
+
+

Apollo/assets/views/callTrackingFollowup.html

@@ -1,3 +1,14 @@
+<style>
+    b.fa {
+        display: inline-block;
+        border-radius: 60px;
+        box-shadow: 0px 0px 2px #FF6600;
+        padding: 0.5em 0.6em;
+
+
+    }
+
+</style>
 <!--<section id="page-title">
     <div class="row">
         <div class="col-sm-8">
@@ -19,12 +30,16 @@
         </div>
         <div collapse="activities1" ng-init="activities1=false" class="panel-wrapper" style="min-height: 100%;">
             <div class="panel-body">
+
                 <div class="row">
+
+
                     <div class="col-md-12">
 
                         <div class="row">
                             <div class="col-md-4">
                                 <div class="user-left">
+
                                     <!--{{followupDetails | json}}-->
                                     <table class="table table-condensed">
                                         <thead>
@@ -74,7 +89,7 @@
                                             <td><span class="label label-sm label-info">{{followupDetails.ListName}}</span></td>
                                         </tr>
                                         <tr>
-                                            <td>Followup Date</td>
+                                            <td>Followup On</td>
                                             <td>
 
 
@@ -125,6 +140,71 @@
 
                                         </tbody>
                                     </table>
+                                    <div class="panel panel-white" id="lead">
+                                        <div class="panel-heading border-light">
+                                            <h4 class="panel-title text-pink">Other Lead/Activities</h4>
+                                            <paneltool class="panel-tools" tool-collapse="tool-collapse" tool-refresh="load1" tool-dismiss="tool-dismiss"></paneltool>
+                                        </div>
+                                        <div collapse="lead" ng-init="lead=false" class="panel-wrapper">
+                                            <div class="panel-body" style="min-height:50px;max-height:100px;overflow-y: scroll;">
+
+
+
+
+                                                <ul class="timeline-xs">
+                                                    <li ng-class-odd="'timeline-item success'" ng-class-even="'timeline-item info'" ng-repeat="trackValues in followupDetails.collectTrackedID">
+                                                        <div class="margin-left-15">
+                                                            <div class="text-muted text-small">
+                                                                {{trackValues.ListName}}
+                                                            </div>
+                                                            <p>
+                                                                <a href="#"  class="text-blue" ng-click="loadFollowupDetails(trackValues.TrackingID);">
+                                                                    Tracking ID {{trackValues.TrackingID}}
+                                                                </a>
+
+                                                            </p>
+
+
+
+
+                                                        </div>
+                                                    </li>
+                                                </ul>
+                                            </div>
+                                        </div>
+                                    </div>
+
+
+
+
+                                    <!--<div class="panel panel-white" id="lead">
+                                        <div class="panel-heading border-light">
+                                            <h4 class="panel-title text-orange">Other Lead/Activities</h4>
+                                            <paneltool class="panel-tools" tool-collapse="tool-collapse" tool-refresh="load1" tool-dismiss="tool-dismiss"></paneltool>
+                                        </div>
+                                        <div collapse="activities" ng-init="lead=false" class="panel-wrapper">
+                                            <div class="panel-body" style="max-height: 5%;overflow-y: scroll;">
+                                                <ul class="timeline-xs">
+                                                    <li ng-class-odd="'timeline-item info'" ng-class-even="'timeline-item warning'" ng-repeat="trackValues in followupDetails.collectTrackedID">
+                                                        <div class="margin-left-15">
+                                                            <div class="text-muted text-small">
+                                                                {{trackValues.ListName}}, TrackID {{trackValues.TrackingID}}
+                                                            </div>
+                                                            <p>
+                                                                <a href="#"  class="text-orange" ng-click="setEditId(p);"><b class="fa fa-hover fa-phone " aria-hidden="true"></b>
+                                                                </a>
+                                                            </p>
+                                                        </div>
+                                                    </li>
+                                                </ul>
+                                            </div>
+                                        </div>
+                                    </div>
+-->
+
+
+
+
 
 
 
@@ -164,13 +244,14 @@
                                         <paneltool class="panel-tools" tool-collapse="tool-collapse" tool-refresh="load1" tool-dismiss="tool-dismiss"></paneltool>
                                     </div>
                                     <div collapse="activities" ng-init="activities=false" class="panel-wrapper">
-                                        <div class="panel-body">
+                                        <div class="panel-body" style="min-height:150px;max-height:300px;overflow-y: scroll;">
                                             <ul class="timeline-xs">
                                                 <li ng-class-odd="'timeline-item info'" ng-class-even="'timeline-item warning'" ng-repeat="message in followupDetails.followupDetails">
                                                     <div class="margin-left-15">
                                                         <div class="text-muted text-small">
-                                                            {{message.FollowupOn}}
+                                                            {{message.FirstName}} &nbsp;&nbsp; On &nbsp;&nbsp;{{message.CreatedOn}}
                                                         </div>
+
                                                         <p>
                                                             {{message.FollowupComments}}
                                                         </p>
@@ -185,6 +266,7 @@
                         </div>
 
                     </div>
+
                 </div>
             </div>
         </div>