Codecommitted 1 : ps

Apollo/api/application/config/routes.php

@@ -93,6 +93,7 @@ $route['getRecentLeadDetails'] = 'Call_Tracking_Controller/getRecentLeadDetails'
 $route['getRecentCloseDetails'] = 'Call_Tracking_Controller/getRecentCloseDetails';
 $route['getRecentPendingDetails'] = 'Call_Tracking_Controller/getRecentPendingDetails';
 $route['callAsImportantFlag'] = 'Call_Tracking_Controller/callAsImportantFlag';
+$route['updateTrackingLeadDetails'] = 'Call_Tracking_Controller/updateTrackingLeadDetails';
 // auto call track
 $route['autoAddlead'] = 'Call_Tracking_Controller/autoAddlead';
 $route['autoTrackingDetails'] = 'Call_Tracking_Controller/autoTrackingDetails';

Apollo/api/application/controllers/Call_Tracking_Controller.php

@@ -584,11 +584,13 @@ public function getstaffCountDetails_post()
          }
 }
 
-
-
 /*
 * End of call tracking 
 */
-
+public function updateTrackingLeadDetails_post(){
+$details = $this->post();
+print_r($details);
+die();
+}
 
 }

Apollo/api/application/models/Employee_model.php

@@ -20,11 +20,13 @@ class Employee_model extends CI_Model
 
     // get login employee profile details
     public function get_emp_prof_detail($empLoginID = null) {
+        // echo "hai i am here don't worry be happy";
+        
         $this->db->select('StaffID');
         $this->db->from(LOGIN);
         $this->db->where('ID', $empLoginID);
         $loginEmpDetail = $this->db->get()->first_row();
-        if ($loginEmpDetail) {
+        if (!empty($loginEmpDetail)) {
             $EmpId = $loginEmpDetail->StaffID;
             $this->db->select('t1.*');
             $this->db->from('' . STAFF . ' as t1');
@@ -32,9 +34,9 @@ class Employee_model extends CI_Model
             // $this->db->join('T_StaffDetails as t2', 't1.StaffID = t2.StaffID', 'LEFT');
             $responseDetails     = $this->db->get()->first_row();
             $result['empStatus'] = true;
-            // print_r($responseDetails->ListCode);exit();
+            print_r($responseDetails);exit();
         
-            if ($responseDetails->ListCode == SUPER_ADMIN) {
+            if (!empty($responseDetails) && $responseDetails->ListCode == SUPER_ADMIN) {
                 //  print_r($result['details']->ListCode);exit();
                 // get branch details for super admin
                 $responseDetails->BranchCode = 'All';
@@ -70,7 +72,7 @@ class Employee_model extends CI_Model
                 // $this->db->join('T_StaffDetails as t2', 't1.StaffID = t2.StaffID', 'LEFT');
                 $branchDetails            = $this->db->get();
                 $result['branchStatus']   = true;
-                $result['work_State'] = $responseDetails->ListCode == ADMIN ? 'Admin' : 'Staff';
+                $result['work_State'] = !empty($responseDetails) && $responseDetails->ListCode == ADMIN ? 'Admin' : 'Staff';
                 $result['branch_details'] = $branchDetails->result();
             }
         } else {

Apollo/assets/js/controllers/callTrackingCtrl.js

@@ -759,17 +759,16 @@ $scope.GetstaffwiseDetails($scope.tod);
         var ide = e.target;
     var val = (ide.checked ? true : false);
     var sid = e.target.id;
+    
+    
     angular.forEach($scope.data,function(value,key){
-        console.log(value);
+        // console.log(value);
         if(sid == value.LeadID)
         {
-            console.log("sid",value);
             sid = value;
         }
     });
-    
     var pos = $scope.selectedLeadID.indexOf(sid);
-    //alert(val);
     if(val)
     {
         if( pos == -1)
@@ -792,52 +791,52 @@ $scope.GetstaffwiseDetails($scope.tod);
     }else{
         $scope.disable = true;
     }
-    console.log($scope.selectedLeadID);
+    console.log("donedon",$scope.selectedLeadID);
     }
     $scope.calltracking = function(){
-      console.log('Function',selectedLeadID);
+      console.log('Function',$scope.selectedLeadID);
       if($scope.selectedLeadID ==''){
           swal('Select Check box','','warning');
       	  return false;
       }else{
-          swal('CallTracking','','info');
       $scope.controller = 'ng-controller="callTrackingCtrl"';
-    //   var lead = {
+      var lead = {
-    //       method: 'POST',
+          method: 'POST',
-    //       url: apiPoint.url + 'updateCallTrackingDetails/',
+          url: apiPoint.url + 'updateCallTrackingDetails/',
-    //       headers: {
+          headers: {
-    //           'Content-Type': 'application/json'
+              'Content-Type': 'application/json'
-    //       },
+          },
-    //       data: {
+          data: {
-    //           requestedBy: JSON.parse(sessionStorage.getItem('localObj')).localUserID,
+              requestedBy: JSON.parse(sessionStorage.getItem('localObj')).localUserID,
-    //           lead:$scope.selectedLeadID,
+              lead:$scope.selectedLeadID,
-    //           branchID:JSON.parse(sessionStorage.getItem('localObj')).localBranchID,
+              branchID:JSON.parse(sessionStorage.getItem('localObj')).localBranchID,
-    //           userType:JSON.parse(sessionStorage.getItem('localObj')).localType,
+              userType:JSON.parse(sessionStorage.getItem('localObj')).localType,
-    //       }
+          }
-    //   };
+      };
-    //   $http(lead).then(function (response) {
+      $http(lead).then(function (response) {
-    //       if (response.data.status==200) {
+          if (response.data.status==200) {          
-              
+            $rootScope.modalInstance = $modal.open({
-    //       $rootScope.modalInstance = $modal.open({
+                templateUrl: 'assets/views/autoCalltracking2.html',
-    //       templateUrl: 'assets/views/autoCalltracking2.html',
+                controller: 'callTrackingCtrl',
-    //       controller: 'callTrackingCtrl',
+                size: size,
-    //       // size: size,
+                resolve: {
-         
+                    pdfitems: function () {
-    //       resolve: {
+                        return  $scope.activity;
-    //           pdfitems: function () {
+                    }
-    //               return  $scope.activity;
+                }
-                  
+            });
-    //           }
-      
-    //        }
-    //       });
 
-    //       $rootScope.modalInstance.result.then(function (selectedItem) {
+            $rootScope.modalInstance.result.then(function (selectedItem) {
-    //           $scope.selected = selectedItem;
+              $scope.selected = selectedItem;
-    //           }, function () { $log.info('Modal dismissed at: ' + new Date());
+            }, function () { 
-    //       });
+                $log.info('Modal dismissed at: ' + new Date());
-    //    }
+            });
-    //   });
+          }
+          else{
+            $log.warn('Problem in Modal : ' + new Date());
+            // ('Modal dismissed at: ' + new Date());
+          }
+      });
     }
   }
 

Apollo/assets/views/autoCalltracking2.html

@@ -55,7 +55,7 @@
                                 Status <span
                                     class="symbol required"></span>
                             </label>
-                            <select class="form-control" name="status" id="Box3" tabindex="7"
+                            <select class="form-contro-l" name="status" id="Box3" tabindex="7"
                                     ng-model="myModel.status" 
                                     required >
                                <option value="">Select Status</option>

Apollo/assets/views/callTrackingDetails.html

@@ -163,7 +163,7 @@
 
                                 <fieldset>
                                     <div class="col-md-1 col-md-offset-10">
-                                        <!-- <button class="btn btn-success btn-o" ng-click="calltracking()">Call Tracking</button> -->
+                                        <button class="btn btn-success btn-o" ng-click="calltracking()">Call Tracking</button>
                                         <!-- ng-click="calltracking()" -->
                                     </div>
 
@@ -200,7 +200,7 @@
                                         </thead>
                                         <tbody dir-paginate="p in data|unique:'TrackingID' |orderBy:sortKey:reverse|filter:search2:strict| filter:search3:strict| filter:search4:strict| filter:search5:strict|itemsPerPage:10">
                                         <tr>
-                                            <td><input type="checkbox" ng-checked="myModel.all" id="{{p.Student_id}}" name="{{p.Student_id}}" class="form-control" ng-click="isClick($event);" /></td>
+                                            <td><input type="checkbox" ng-checked="myModel.all" id="{{p.LeadID}}" name="{{p.LeadID}}" class="form-control" ng-click="isClick($event);" /></td>
                                             <td ng-if="p.Flag==false">
                                                 <a class="glyphicon ng-scope fa margin-right-5  fa-flag text-grey text-extra-large"  tooltip="Potential" ng-click="markAsImportant(p.TrackingID,true);"></a>
                                             </td>

Apollo/assets/views/income_expense_report.html

@@ -315,8 +315,7 @@
           <label style="color: black; font-size: 17px">Net Profit/Loss</label></b> 
         </div>
         <div class="col-md-offset-10" style="color: black; font-size: 17px"><b>
-         <!--  {{expense_data[1].Total - expense_data[0].Total}}
+         <!--  {{expense_data[1].Total - expense_data[0].Total}}-->
- -->
       {{Net_Total}}
         </b></div>