diff --git a/Apollo/api/application/config/constants.php b/Apollo/api/application/config/constants.php index af611e46..d5b452e4 100644 --- a/Apollo/api/application/config/constants.php +++ b/Apollo/api/application/config/constants.php @@ -88,6 +88,10 @@ defined('SUPER_ADMIN') OR define('SUPER_ADMIN','R004'); defined('ADMIN') OR define('ADMIN','R003'); defined('EMPLOYEE') OR define('EMPLOYEE','R002'); defined('STUDENT') OR define('STUDENT','R001'); +//status code +defined('OPEN') OR define('OPEN','S001'); +defined('CLOSE') OR define('CLOSE','S002'); +defined('REOPEN') OR define('REOPEN','S003'); //encript database table name defined('LOGIN') OR define('LOGIN','T_Login'); defined('BRANCH') OR define('BRANCH','T_BranchMaster'); diff --git a/Apollo/api/application/controllers/Call_Tracking_Controller.php b/Apollo/api/application/controllers/Call_Tracking_Controller.php index 6837b348..0b595a1b 100644 --- a/Apollo/api/application/controllers/Call_Tracking_Controller.php +++ b/Apollo/api/application/controllers/Call_Tracking_Controller.php @@ -38,7 +38,7 @@ class Call_Tracking_Controller extends REST_Controller { $this->methods['getTrackingDetails_post']['limit'] = 1000; // 50 requests per hour per user/key $this->methods['updateFollowupDetails_post']['limit'] = 1000; // 50 requests per hour per user/key $this->methods['loadFollowupDetails_post']['limit'] = 1000; // 50 requests per hour per user/key - + $this->methods['getDashboardCallTrack_post']['limit'] = 1000; // 50 requests per hour per user/key // load the model $this->load->model('Calltracking_model', 'Calltracking_model'); @@ -225,7 +225,32 @@ class Call_Tracking_Controller extends REST_Controller { } + /* + * get dash board call track details + * created by kms + * */ + public function getDashboardCallTrack_post() + { + $search['requestedBy'] = $this->post('requestedBy'); + $getdashBoardCallDetails = $this->Calltracking_model->getDashboardTrackingDetails($search); + if ($getdashBoardCallDetails) + { + $getdashBoardCallDetails['status'] = REST_Controller::HTTP_OK; + // Set the response and exit + $this->response($getdashBoardCallDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code + } + else + { + // Set the response and exit + $this->response([ + 'message' => 'No records found!', + 'status' => REST_Controller::HTTP_NOT_FOUND + ], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code + } + + + } } \ No newline at end of file diff --git a/Apollo/api/application/models/Calltracking_model.php b/Apollo/api/application/models/Calltracking_model.php index ce29f9b6..9bb82924 100644 --- a/Apollo/api/application/models/Calltracking_model.php +++ b/Apollo/api/application/models/Calltracking_model.php @@ -398,6 +398,47 @@ class Calltracking_model extends CI_Model { $studeTrackID = $this->db->get(); return $studeTrackID->result(); } + /* + * used to get dash board call track details + * created by kms + * */ + public function getDashboardTrackingDetails($serach=null) + { + $now = new DateTime(); + $now->setTimezone(new DateTimezone('Asia/Kolkata')); + $todayFollowupDate=$now->format('d-m-Y'); + $follouwpDetails=$this->todayFollowupDetails($todayFollowupDate,'S001'); + if($follouwpDetails){ + $result_array['todayStatus']=true; + $result_array['todayFolloupDetails']=$follouwpDetails; + } + else{ + $result_array['todayStatus']=false; + $result_array['todayFolloupDetails']=""; + } + /* $follouwpPendingDetails=$this->getPendingFollowupDetails($todayFollowupDate,'S001'); +print_r($follouwpPendingDetails);die();*/ + return $result_array; + + } + /* + * get date wise followup details + * @params date and status and check status + * */ + public function todayFollowupDetails($todayDate=null,$status=null) + { + $this->db->distinct(); + $this->db->select('LD.LeadName,LD.MobileNumber,LT.TrackingID,LT.LeadID,PLD.ListCode,PLD.ListName,LTF.FollowupOn,LT.StatusCode,PLD1.ListName as statusListName'); + $this->db->from(LEAD_DETAILS.' as LD'); + $this->db->join(LEAD_TRACKING.' as LT', 'LT.LeadID = LD.LeadID'); + $this->db->join(LEAD_TRACKING_FOLLOWUP.' as LTF', 'LTF.TrackingID = LT.TrackingID'); + $this->db->join(PICK_LIST_DETAILS.' as PLD', 'PLD.ListCode = LT.ActivityStatus'); + $this->db->join(PICK_LIST_DETAILS.' as PLD1', 'PLD1.ListCode = LT.StatusCode'); + $this->db->where('LTF.FollowupOn',$todayDate); + $this->db->where('LT.StatusCode',$status); + $this->db->order_by('LT.TrackingID','ASC'); + return $this->db->get()->result(); + } } \ No newline at end of file diff --git a/Apollo/assets/js/controllers/dashboardCtrl.js b/Apollo/assets/js/controllers/dashboardCtrl.js index 17e85291..c2c359f9 100644 --- a/Apollo/assets/js/controllers/dashboardCtrl.js +++ b/Apollo/assets/js/controllers/dashboardCtrl.js @@ -1,304 +1,43 @@ 'use strict'; -/** - * controllers used for the dashboard -*/ -app.controller('SparklineCtrl', ["$scope", function ($scope) { - $scope.sales = [600, 923, 482, 1211, 490, 1125, 1487]; - $scope.earnings = [400, 650, 886, 443, 502, 412, 353]; - $scope.referrals = [4879, 6567, 5022, 5890, 9234, 7128, 4811]; -}]); +/** + * controllers for ng-table + * Simple table with sorting and filtering on AngularJS + */ -app.controller('VisitsCtrl', ["$scope", function ($scope) { +app.controller('dashboardCtrl', ["$scope","toaster", "$filter", "ngTableParams", "API_POINTS", "$localStorage", "$http", "$state", function ($scope,toaster, $filter, ngTableParams, apiPoint, $localStorage, $http, $state) { + /* + * used to get dash board call track details + * this method called from view ng-init directive + * created by kms + * */ + $scope.todayFolloupDetails=""; + $scope.initCallTracking = function () { + var getCallTrack = { + method: 'POST', + url: apiPoint.url + 'getDashboardCallTrack/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + requestedBy: JSON.parse(localStorage.getItem('localObj')).localUserID + } + }; + $http(getCallTrack).then(function (response) { + if (response.data.status==200) { + if(response.data.todayStatus){ + $scope.todayFolloupDetails=response.data.todayFolloupDetails; + } + else{ + $scope.todayFolloupDetails='EMPTY'; + } - $scope.data = { - labels: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'], - datasets: [ - { - label: 'My First dataset', - fillColor: 'rgba(220,220,220,0.2)', - strokeColor: 'rgba(220,220,220,1)', - pointColor: 'rgba(220,220,220,1)', - pointStrokeColor: '#fff', - pointHighlightFill: '#fff', - pointHighlightStroke: 'rgba(220,220,220,1)', - data: [65, 59, 80, 81, 56, 55, 40, 84, 64, 120, 132, 87] - }, - { - label: 'My Second dataset', - fillColor: 'rgba(151,187,205,0.2)', - strokeColor: 'rgba(151,187,205,1)', - pointColor: 'rgba(151,187,205,1)', - pointStrokeColor: '#fff', - pointHighlightFill: '#fff', - pointHighlightStroke: 'rgba(151,187,205,1)', - data: [28, 48, 40, 19, 86, 27, 90, 102, 123, 145, 60, 161] - } - ] - }; + } else { - $scope.options = { + $scope.todayFolloupDetails='EMPTY'; - maintainAspectRatio: false, - - // Sets the chart to be responsive - responsive: true, - - ///Boolean - Whether grid lines are shown across the chart - scaleShowGridLines: true, - - //String - Colour of the grid lines - scaleGridLineColor: 'rgba(0,0,0,.05)', - - //Number - Width of the grid lines - scaleGridLineWidth: 1, - - //Boolean - Whether the line is curved between points - bezierCurve: false, - - //Number - Tension of the bezier curve between points - bezierCurveTension: 0.4, - - //Boolean - Whether to show a dot for each point - pointDot: true, - - //Number - Radius of each point dot in pixels - pointDotRadius: 4, - - //Number - Pixel width of point dot stroke - pointDotStrokeWidth: 1, - - //Number - amount extra to add to the radius to cater for hit detection outside the drawn point - pointHitDetectionRadius: 20, - - //Boolean - Whether to show a stroke for datasets - datasetStroke: true, - - //Number - Pixel width of dataset stroke - datasetStrokeWidth: 2, - - //Boolean - Whether to fill the dataset with a colour - datasetFill: true, - - // Function - on animation progress - onAnimationProgress: function () { }, - - // Function - on animation complete - onAnimationComplete: function () { }, - - //String - A legend template - legendTemplate: '' + } + }); }; }]); -app.controller('SalesCtrl', ["$scope", function ($scope) { - // Chart.js Data - $scope.data = { - labels: ['January', 'February', 'March', 'April', 'May', 'June', 'July'], - datasets: [ - { - label: 'My First dataset', - fillColor: 'rgba(220,220,220,0.5)', - strokeColor: 'rgba(220,220,220,0.8)', - highlightFill: 'rgba(220,220,220,0.75)', - highlightStroke: 'rgba(220,220,220,1)', - data: [65, 59, 80, 81, 56, 55, 40] - }, - { - label: 'My Second dataset', - fillColor: 'rgba(151,187,205,0.5)', - strokeColor: 'rgba(151,187,205,0.8)', - highlightFill: 'rgba(151,187,205,0.75)', - highlightStroke: 'rgba(151,187,205,1)', - data: [28, 48, 40, 19, 86, 27, 90] - } - ] - }; - - // Chart.js Options - $scope.options = { - maintainAspectRatio: false, - - // Sets the chart to be responsive - responsive: true, - - //Boolean - Whether the scale should start at zero, or an order of magnitude down from the lowest value - scaleBeginAtZero: true, - - //Boolean - Whether grid lines are shown across the chart - scaleShowGridLines: true, - - //String - Colour of the grid lines - scaleGridLineColor: "rgba(0,0,0,.05)", - - //Number - Width of the grid lines - scaleGridLineWidth: 1, - - //Boolean - If there is a stroke on each bar - barShowStroke: true, - - //Number - Pixel width of the bar stroke - barStrokeWidth: 2, - - //Number - Spacing between each of the X value sets - barValueSpacing: 5, - - //Number - Spacing between data sets within X values - barDatasetSpacing: 1, - - //String - A legend template - legendTemplate: '' - }; - -}]); -app.controller('OnotherCtrl', ["$scope", function ($scope) { - - // Chart.js Data - $scope.data = [ - { - value: 300, - color: '#F7464A', - highlight: '#FF5A5E', - label: 'Red' - }, - { - value: 50, - color: '#46BFBD', - highlight: '#5AD3D1', - label: 'Green' - }, - { - value: 100, - color: '#FDB45C', - highlight: '#FFC870', - label: 'Yellow' - } - ]; - $scope.total = 450; - // Chart.js Options - $scope.options = { - - // Sets the chart to be responsive - responsive: false, - - //Boolean - Whether we should show a stroke on each segment - segmentShowStroke: true, - - //String - The colour of each segment stroke - segmentStrokeColor: '#fff', - - //Number - The width of each segment stroke - segmentStrokeWidth: 2, - - //Number - The percentage of the chart that we cut out of the middle - percentageInnerCutout: 50, // This is 0 for Pie charts - - //Number - Amount of animation steps - animationSteps: 100, - - //String - Animation easing effect - animationEasing: 'easeOutBounce', - - //Boolean - Whether we animate the rotation of the Doughnut - animateRotate: true, - - //Boolean - Whether we animate scaling the Doughnut from the centre - animateScale: false, - - //String - A legend template - legendTemplate: '' - - }; - -}]); -app.controller('LastCtrl', ["$scope", function ($scope) { - - // Chart.js Data - $scope.data = { - labels: ['Eating', 'Drinking', 'Sleeping', 'Designing', 'Coding', 'Cycling', 'Running'], - datasets: [ - { - label: 'My First dataset', - fillColor: 'rgba(220,220,220,0.2)', - strokeColor: 'rgba(220,220,220,1)', - pointColor: 'rgba(220,220,220,1)', - pointStrokeColor: '#fff', - pointHighlightFill: '#fff', - pointHighlightStroke: 'rgba(220,220,220,1)', - data: [65, 59, 90, 81, 56, 55, 40] - }, - { - label: 'My Second dataset', - fillColor: 'rgba(151,187,205,0.2)', - strokeColor: 'rgba(151,187,205,1)', - pointColor: 'rgba(151,187,205,1)', - pointStrokeColor: '#fff', - pointHighlightFill: '#fff', - pointHighlightStroke: 'rgba(151,187,205,1)', - data: [28, 48, 40, 19, 96, 27, 100] - } - ] - }; - - // Chart.js Options - $scope.options = { - - // Sets the chart to be responsive - responsive: true, - - //Boolean - Whether to show lines for each scale point - scaleShowLine: true, - - //Boolean - Whether we show the angle lines out of the radar - angleShowLineOut: true, - - //Boolean - Whether to show labels on the scale - scaleShowLabels: false, - - // Boolean - Whether the scale should begin at zero - scaleBeginAtZero: true, - - //String - Colour of the angle line - angleLineColor: 'rgba(0,0,0,.1)', - - //Number - Pixel width of the angle line - angleLineWidth: 1, - - //String - Point label font declaration - pointLabelFontFamily: '"Arial"', - - //String - Point label font weight - pointLabelFontStyle: 'normal', - - //Number - Point label font size in pixels - pointLabelFontSize: 10, - - //String - Point label font colour - pointLabelFontColor: '#666', - - //Boolean - Whether to show a dot for each point - pointDot: true, - - //Number - Radius of each point dot in pixels - pointDotRadius: 3, - - //Number - Pixel width of point dot stroke - pointDotStrokeWidth: 1, - - //Number - amount extra to add to the radius to cater for hit detection outside the drawn point - pointHitDetectionRadius: 20, - - //Boolean - Whether to show a stroke for datasets - datasetStroke: true, - - //Number - Pixel width of dataset stroke - datasetStrokeWidth: 2, - - //Boolean - Whether to fill the dataset with a colour - datasetFill: true, - - //String - A legend template - legendTemplate: '' - }; - -}]); diff --git a/Apollo/assets/views/dashboard.html b/Apollo/assets/views/dashboard.html index 265aaa7c..0d256d51 100644 --- a/Apollo/assets/views/dashboard.html +++ b/Apollo/assets/views/dashboard.html @@ -1,37 +1,101 @@ - - - +

{{ mainTitle }}

-
+
-
-
-
+
+
+
+
+
+

Today Follow Up Details

+ +
- -

Something awesome is coming soon

-

We are building something very cool stay tuned and be patient. your patience will be well paid

-
+
+
No Followup!
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
Tracking IDLead NameMobile NoActivityStatus
{{today.TrackingID}}{{today.LeadName}}{{today.MobileNumber}}{{today.ListName}}
+
-
- - - - - \ No newline at end of file +
+
+
+

Pending Follow Up Details

+ +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
Tracking IDLead NameMobile NoActivityStatus
{{today.TrackingID}}{{today.LeadName}}{{today.MobileNumber}}{{today.ListName}}
+
+
+
+
+
+