From c88bb2b2ab296ade2c7ed4a17f8850373b16350b Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Thu, 23 Nov 2017 11:05:02 +0530
Subject: [PATCH] changes in followup screen

---
 Apollo/assets/views/callTrackingFollowup.html | 88 ++++++++++++++++++-
 1 file changed, 85 insertions(+), 3 deletions(-)

diff --git a/Apollo/assets/views/callTrackingFollowup.html b/Apollo/assets/views/callTrackingFollowup.html
index 48080afd..1d1caf0c 100644
--- a/Apollo/assets/views/callTrackingFollowup.html
+++ b/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>