diff --git a/Apollo/api/application/controllers/Call_Tracking_Controller.php b/Apollo/api/application/controllers/Call_Tracking_Controller.php index 8f5eb946..afc265f0 100755 --- a/Apollo/api/application/controllers/Call_Tracking_Controller.php +++ b/Apollo/api/application/controllers/Call_Tracking_Controller.php @@ -230,6 +230,10 @@ class Call_Tracking_Controller extends REST_Controller { $updateDetails = $this->Calltracking_model->updateFollowupDetails($update_followup_details,$followup_details);// Check if the users data store contains users (in case the database result returns NULL) +// echo "com"; +// print_r($followup_details); +// print_r($update_followup_details); +// exit(); if ($updateDetails) { $updateDetails['status'] = REST_Controller::HTTP_OK; diff --git a/Apollo/api/application/controllers/Report.php b/Apollo/api/application/controllers/Report.php index 6b319f2f..4c3769d3 100755 --- a/Apollo/api/application/controllers/Report.php +++ b/Apollo/api/application/controllers/Report.php @@ -77,6 +77,9 @@ class Report extends REST_Controller { $getStatus['markcardstatus'][$cnt+1]["ListCode"] = FEESUPDATE; $getStatus['markcardstatus'][$cnt+1]["ListName"] = "BLANK"; $getStatus['markcardstatus'][$cnt+1]["StudentActivityCode"]= 'C001'; + $getStatus['markcardstatus'][$cnt+2]["ListCode"] = "all"; + $getStatus['markcardstatus'][$cnt+2]["ListName"] = "ALL"; + $getStatus['markcardstatus'][$cnt+2]["StudentActivityCode"]= 'C001'; } else{ $getStatus['markcardstatus'] = array();} $getStatus['status'] = REST_Controller::HTTP_OK; diff --git a/Apollo/api/application/models/Calltracking_model.php b/Apollo/api/application/models/Calltracking_model.php index 159fbac6..c33d82d4 100755 --- a/Apollo/api/application/models/Calltracking_model.php +++ b/Apollo/api/application/models/Calltracking_model.php @@ -670,7 +670,7 @@ $msg='Dear '.$name.', Thank you for enquiring with Apollo Distance Education Col $leadDet=$this->db->get(); - // print_r($this->db->last_query());die(); + // print_r($this->db->last_query());die(); if($this->db->affected_rows()==0){ $result_array['trackingStatus']=false; @@ -693,6 +693,7 @@ $msg='Dear '.$name.', Thank you for enquiring with Apollo Distance Education Col $tracking_array["ActivityStatus"]=$row->ActivityStatus; $tracking_array["AssignedTo"]=$row->AssignedTo; $tracking_array["Firstname"]=$row->Firstname; + $tracking_array["StudentID"]=$row->Firstname; $tracking_array["StatusCode"]=$row->StatusCode; $tracking_array["statusName"]=$row->statusListName; $tracking_array["UniversityName"]=$row->University; @@ -961,6 +962,14 @@ $msg='Dear '.$name.', Thank you for enquiring with Apollo Distance Education Col public function updateFollowupDetails($updateDetails=null,$insertDetails=null) { + // $updateDetails['StatusCode'] = implode(',', $updateDetails['StatusCode']); + // $updateDetails['AssignedTo'] = implode(',', $updateDetails['AssignedTo']); + // $insertDetails['AssignedStaff'] = implode(',', $insertDetails['AssignedStaff']); + // $insertDetails['StatusName'] = $this->getStatusName($insertDetails['StatusName']); + // // print_r($insertDetails); + // // print_r($updateDetails); + // die(); + // exit(); $deactivateStatus['IsActive']=false; $this->db->where('TrackingID',$updateDetails['TrackingID']); $this->db->update(LEAD_TRACKING_FOLLOWUP, $deactivateStatus); @@ -1005,7 +1014,17 @@ $msg='Dear '.$name.', Thank you for enquiring with Apollo Distance Education Col } - + // public function getStatusName($statusArr){ + // $arr = implode(',', $statusArr); + // echo $arr; + // $this->db->select('ListName'); + // $this->db->where_in('ListCode',$arr); + // $statusDetails=$this->db->get(PICK_LIST_DETAILS); + // $status = $statusDetails->result_array(); + // print_r($this->db->last_query());die(); + // $arr2 = implode(',', $status); + // return $arr2; + // } /* * get tracking information when page is loading * created by kms diff --git a/Apollo/api/application/models/Reports_model.php b/Apollo/api/application/models/Reports_model.php index a073401b..f74eea40 100755 --- a/Apollo/api/application/models/Reports_model.php +++ b/Apollo/api/application/models/Reports_model.php @@ -192,6 +192,7 @@ left join BalFees bal on bal.student=sms.sid and bal.feestype=sms.cid and bal.se if(appdate = '','-',ifnull(appdate,'-')) AS appdate, if(ansdate = '','-',ifnull(ansdate,'-')) AS ansdate , scd.coursestatus AS Course_Status, + if(andate.Comments = '','-',ifnull(andate.Comments,'-')) AS AnswerbookSerialNo, if(andate.courierdetails = '','-',ifnull(andate.courierdetails,'-')) AS Courier_Details, if(sfs.batchname = '','-',IFNULL(sfs.batchname, '-')) AS Batch_Name FROM (SELECT FeesID AS fid,T_Students_Fees_Status.BatchCode AS batch,T_BatchMaster.BatchName AS batchname,StudentID AS sid,RollNO AS rollno,CourseID AS cid,FeesType AS ftype,sum(CourseFees) AS cf,Sum(STFOrWR) AS stf,sum(Others) AS others , T_Students_Fees_Status.BranchCode AS branch @@ -241,7 +242,7 @@ left join BalFees bal on bal.student=sms.sid and bal.feestype=sms.cid and bal.se ON scd.sid=sfs.sid AND scd.cid = sfs.cid - LEFT JOIN (SELECT ID,StudentID AS sid,Sem,CourseID, + LEFT JOIN (SELECT ID,StudentID AS sid,Sem,CourseID,Comments, IF(ListName = 'SENT TO UNIVERSITY', AnsDate,'-') AS ansdate,CourierDetails AS courierdetails FROM T_AnswerBookletStatus abs LEFT JOIN T_PickListDetails `list` ON list.ListCode=abs.ListCode @@ -272,6 +273,7 @@ left join BalFees bal on bal.student=sms.sid and bal.feestype=sms.cid and bal.se if ($st != ''){ if ($st == FEESUPDATE){ $sql.=" and (list.lcode IS NULL OR list.lcode = '')";} + else if($st=="all"){ $sql.=""; } else{ $sql.="and list.lcode = '".$st."'";} } if ($from != ''){ diff --git a/Apollo/assets/js/controllers/answerBookletStatusCtrl.js b/Apollo/assets/js/controllers/answerBookletStatusCtrl.js index f9597303..e8065e90 100755 --- a/Apollo/assets/js/controllers/answerBookletStatusCtrl.js +++ b/Apollo/assets/js/controllers/answerBookletStatusCtrl.js @@ -398,7 +398,7 @@ app.controller('answerBookletStatusCtrl', ["$scope", "toaster", "$filter", "ngTa this.ListCode = $scope.myStatusModel.staus; this.SDate = $scope.myStatusModel.dateOn; this.Coursedetail = id; - this.Comments = $scope.myStatusModel.comment; + this.Comments = $scope.myStatusModel.comment.replace('/\n\r?/g', '
'); this.CourierDetails = $scope.myStatusModel.courierDetails.replace('/\n\r?/g', '
'); // alert($scope.myStatusModel.courierDetails); this.Sem = $scope.myStatusModel.sem === '' ? courseID.Sem_Year : $scope.myStatusModel.sem; diff --git a/Apollo/assets/js/controllers/callTrackingCtrl.js b/Apollo/assets/js/controllers/callTrackingCtrl.js index e279d666..1468eccf 100755 --- a/Apollo/assets/js/controllers/callTrackingCtrl.js +++ b/Apollo/assets/js/controllers/callTrackingCtrl.js @@ -717,6 +717,130 @@ $scope.GetstaffwiseDetails($scope.tod); } + $scope.$watch(function () { + $scope.filteredItems = $scope.$eval(" data |filter:search2| filter:search3| filter:search4| filter:search5"); + }); + /** + * Auto Call Tracking Sriram + */ + $scope.selectedLeadID = []; + $scope.isCheckAll = function(e){ + var val = (e.target.checked ? true : false); + // alert(val); + // return true; + if(val) + { + // $scope.disable = false; + var len2 = $scope.data.length; + var len = $scope.filteredItems.length; + console.log("len2",len2); + var i = 0; + for(i=0;i +
+
+
+
+ + Update Call Tracking Details + + + +
+ +
+
+ + + Followup date is required. + +
+ +
+ +
+ +
+
+
+
+
+
Please Wait...
+
+ +
+ +
+ + + Status is required + + +
+ + +
+ +
+
+
+
+
+
Please Wait...
+
+ +
+ +
+ + + + Assigned to is required + + +
+ +
+ + + Assigned to is required +
+ + +
+ +
+
+
+
+
+
Please Wait...
+
+ +
+
+ + + + + +
+
+ + + + +
+
+
+
+
+
+ \ No newline at end of file diff --git a/Apollo/assets/views/callTrackingDetails.html b/Apollo/assets/views/callTrackingDetails.html index 74c38e86..e19e3d48 100755 --- a/Apollo/assets/views/callTrackingDetails.html +++ b/Apollo/assets/views/callTrackingDetails.html @@ -162,11 +162,16 @@
+
+ + +
+ + diff --git a/Apollo/assets/views/report_markcardstatus.html b/Apollo/assets/views/report_markcardstatus.html index c444777b..e5a8c191 100755 --- a/Apollo/assets/views/report_markcardstatus.html +++ b/Apollo/assets/views/report_markcardstatus.html @@ -33,7 +33,7 @@ Please select University. @@ -129,6 +129,7 @@ + @@ -151,6 +152,7 @@ + diff --git a/Apollo/assets/views/status-update/answer_booklet_status.html b/Apollo/assets/views/status-update/answer_booklet_status.html index 9dfb6d03..c78f7a2d 100755 --- a/Apollo/assets/views/status-update/answer_booklet_status.html +++ b/Apollo/assets/views/status-update/answer_booklet_status.html @@ -412,13 +412,9 @@
- - -
ID @@ -195,6 +200,7 @@
Father Name Course BatchAnswer Book Serial No Answer Books Courier Details Sem/Year University{{p.Father_name}} {{p.Course_name}} {{p.Batch_Name}}{{p.AnswerbookSerialNo}} {{p.Courier_Details}} {{p.Sem_year}}({{p.Sem}}) {{p.University}}