Apollo-DEC/apollodec
Apollo-DEC/apollodec
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dashboard issues

Browse Source
This commit is contained in:
gandhimathi 2018-10-30 18:59:01 +05:30
parent 26f803ded4
commit fe66d6973a
8 changed files with 356 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
Apollo/api/application/controllers/Dashboard_Controller.php
View File

@ -116,7 +116,8 @@ class Dashboard_Controller extends REST_Controller {
* */ * */
public function getleadCountToday_post(){ public function getleadCountToday_post(){
$branchId = $this->post('branchId'); $branchId = $this->post('branchId');
$getleadCountToday = $this->dashboard_model->leadCountDay($branchId); $requestedBy = $this->post('requestedBy');
$getleadCountToday = $this->dashboard_model->leadCountDay($branchId,$requestedBy);
if ($getleadCountToday) { if ($getleadCountToday) {
$getleadCountToday['status'] = REST_Controller::HTTP_OK; $getleadCountToday['status'] = REST_Controller::HTTP_OK;
// Set the response and exit // Set the response and exit
@ -133,7 +134,8 @@ class Dashboard_Controller extends REST_Controller {
} }
public function getleadCountMonth_post(){ public function getleadCountMonth_post(){
$branchId = $this->post('branchId'); $branchId = $this->post('branchId');
$getleadCountMonth = $this->dashboard_model->leadCountMonth( $branchId); $requestedBy = $this->post('requestedBy');
$getleadCountMonth = $this->dashboard_model->leadCountMonth( $branchId,$requestedBy);
if ($getleadCountMonth) { if ($getleadCountMonth) {
$getleadCountMonth['status'] = REST_Controller::HTTP_OK; $getleadCountMonth['status'] = REST_Controller::HTTP_OK;
// Set the response and exit // Set the response and exit
@ -150,7 +152,8 @@ class Dashboard_Controller extends REST_Controller {
} }
public function getleadCountDayClosed_post(){ public function getleadCountDayClosed_post(){
$branchId = $this->post('branchId'); $branchId = $this->post('branchId');
$getleadCountDayClosed = $this->dashboard_model->leadCountDayClosed($branchId); $requestedBy = $this->post('requestedBy');
$getleadCountDayClosed = $this->dashboard_model->leadCountDayClosed($branchId, $requestedBy);
if ($getleadCountDayClosed) { if ($getleadCountDayClosed) {
$getleadCountDayClosed['status'] = REST_Controller::HTTP_OK; $getleadCountDayClosed['status'] = REST_Controller::HTTP_OK;
// Set the response and exit // Set the response and exit
@ -167,7 +170,8 @@ class Dashboard_Controller extends REST_Controller {
} }
public function getleadCountMonthClosed_post(){ public function getleadCountMonthClosed_post(){
$branchId = $this->post('branchId'); $branchId = $this->post('branchId');
$getleadCountMonthClosed = $this->dashboard_model->leadCountMonthClosed( $branchId); $requestedBy = $this->post('requestedBy');
$getleadCountMonthClosed = $this->dashboard_model->leadCountMonthClosed( $branchId, $requestedBy);
if ($getleadCountMonthClosed) { if ($getleadCountMonthClosed) {
$getleadCountMonthClosed['status'] = REST_Controller::HTTP_OK; $getleadCountMonthClosed['status'] = REST_Controller::HTTP_OK;
// Set the response and exit // Set the response and exit
@ -201,7 +205,7 @@ class Dashboard_Controller extends REST_Controller {
} }
public function getadmimssionYear_post(){ public function getadmimssionYear_post(){
$branchId = $this->post('branchId'); $branchId = $this->post('branchId');
$data = $this->post('data'); $requestedBy = $this->post('requestedBy');
$getadmimssionYear = $this->dashboard_model->admissionCountYear($branchId); $getadmimssionYear = $this->dashboard_model->admissionCountYear($branchId);
if ($getadmimssionYear) { if ($getadmimssionYear) {
$getadmimssionYear['status'] = REST_Controller::HTTP_OK; $getadmimssionYear['status'] = REST_Controller::HTTP_OK;
@ -219,7 +223,8 @@ class Dashboard_Controller extends REST_Controller {
} }
public function getfupToday_post(){ public function getfupToday_post(){
$branchId = $this->post('branchId'); $branchId = $this->post('branchId');
$getfupToday = $this->dashboard_model->followupsCountToday($branchId); $requestedBy = $this->post('requestedBy');
$getfupToday = $this->dashboard_model->followupsCountToday($branchId,$requestedBy);
if ($getfupToday) { if ($getfupToday) {
$getfupToday['status'] = REST_Controller::HTTP_OK; $getfupToday['status'] = REST_Controller::HTTP_OK;
// Set the response and exit // Set the response and exit
@ -236,7 +241,8 @@ class Dashboard_Controller extends REST_Controller {
} }
public function getfupMonth_post(){ public function getfupMonth_post(){
$branchId = $this->post('branchId'); $branchId = $this->post('branchId');
$getfupMonth = $this->dashboard_model->followupsCountMonth($branchId); $requestedBy = $this->post('requestedBy');
$getfupMonth = $this->dashboard_model->followupsCountMonth($branchId,$requestedBy);
if ($getfupMonth) { if ($getfupMonth) {
$getfupMonth['status'] = REST_Controller::HTTP_OK; $getfupMonth['status'] = REST_Controller::HTTP_OK;
// Set the response and exit // Set the response and exit
@ -252,9 +258,10 @@ class Dashboard_Controller extends REST_Controller {
} }
} }
public function leadToday_post(){ public function leadToday_post(){
$logintype = $this->post('requestedDept');
$branchId = $this->post('branchId'); $branchId = $this->post('branchId');
$requestedBy = $this->post('requestedBy'); $requestedBy = $this->post('requestedBy');
$leadToday = $this->dashboard_model->leadToday($branchId,$requestedBy); $leadToday = $this->dashboard_model->leadToday($branchId,$requestedBy,$logintype);
if ($leadToday) { if ($leadToday) {
$leadToday['status'] = REST_Controller::HTTP_OK; $leadToday['status'] = REST_Controller::HTTP_OK;
// Set the response and exit // Set the response and exit
@ -272,7 +279,8 @@ class Dashboard_Controller extends REST_Controller {
public function leadMonth_post(){ public function leadMonth_post(){
$branchId = $this->post('branchId'); $branchId = $this->post('branchId');
$requestedBy = $this->post('requestedBy'); $requestedBy = $this->post('requestedBy');
$leadMonth = $this->dashboard_model->leadMonth($branchId,$requestedBy); $logintype = $this->post('requestedDept');
$leadMonth = $this->dashboard_model->leadMonth($branchId,$requestedBy,$logintype);
if ($leadMonth) { if ($leadMonth) {
$leadMonth['status'] = REST_Controller::HTTP_OK; $leadMonth['status'] = REST_Controller::HTTP_OK;
// Set the response and exit // Set the response and exit
@ -290,7 +298,8 @@ class Dashboard_Controller extends REST_Controller {
public function leadTodayClosed_post(){ public function leadTodayClosed_post(){
$branchId = $this->post('branchId'); $branchId = $this->post('branchId');
$requestedBy = $this->post('requestedBy'); $requestedBy = $this->post('requestedBy');
$leadTodayClosed = $this->dashboard_model->leadTodayClosed($branchId,$requestedBy); $logintype = $this->post('requestedDept');
$leadTodayClosed = $this->dashboard_model->leadTodayClosed($branchId,$requestedBy,$logintype);
if ($leadTodayClosed) { if ($leadTodayClosed) {
$leadTodayClosed['status'] = REST_Controller::HTTP_OK; $leadTodayClosed['status'] = REST_Controller::HTTP_OK;
// Set the response and exit // Set the response and exit
@ -308,7 +317,8 @@ class Dashboard_Controller extends REST_Controller {
public function leadMonthClosed_post(){ public function leadMonthClosed_post(){
$branchId = $this->post('branchId'); $branchId = $this->post('branchId');
$requestedBy = $this->post('requestedBy'); $requestedBy = $this->post('requestedBy');
$leadMonthClosed = $this->dashboard_model->leadMonthClosed($branchId,$requestedBy); $logintype = $this->post('requestedDept');
$leadMonthClosed = $this->dashboard_model->leadMonthClosed($branchId,$requestedBy,$logintype);
if ($leadMonthClosed) { if ($leadMonthClosed) {
$leadMonthClosed['status'] = REST_Controller::HTTP_OK; $leadMonthClosed['status'] = REST_Controller::HTTP_OK;
// Set the response and exit // Set the response and exit
@ -326,7 +336,8 @@ class Dashboard_Controller extends REST_Controller {
public function admissionMonth_post(){ public function admissionMonth_post(){
$year = $this->post('year'); $year = $this->post('year');
$month = $this->post('month'); $month = $this->post('month');
$admissionMonth = $this->dashboard_model->admissionMonth($year,$month); $branchId = $this->post('branchId');
$admissionMonth = $this->dashboard_model->admissionMonth($year,$month,$branchId);
if ($admissionMonth) { if ($admissionMonth) {
$admissionMonth['status'] = REST_Controller::HTTP_OK; $admissionMonth['status'] = REST_Controller::HTTP_OK;
// Set the response and exit // Set the response and exit
@ -381,7 +392,8 @@ class Dashboard_Controller extends REST_Controller {
public function followupsToday_post(){ public function followupsToday_post(){
$branchId = $this->post('branchId'); $branchId = $this->post('branchId');
$requestedBy = $this->post('requestedBy'); $requestedBy = $this->post('requestedBy');
$followupsToday = $this->dashboard_model->followupsToday( $branchId, $requestedBy); $logintype = $this->post('requestedDept');
$followupsToday = $this->dashboard_model->followupsToday( $branchId, $requestedBy,$logintype);
if ($followupsToday) { if ($followupsToday) {
$followupsToday['status'] = REST_Controller::HTTP_OK; $followupsToday['status'] = REST_Controller::HTTP_OK;
// Set the response and exit // Set the response and exit
@ -399,7 +411,8 @@ class Dashboard_Controller extends REST_Controller {
public function followupsPending_post(){ public function followupsPending_post(){
$branchId = $this->post('branchId'); $branchId = $this->post('branchId');
$requestedBy = $this->post('requestedBy'); $requestedBy = $this->post('requestedBy');
$followupsPending = $this->dashboard_model->followupsPending( $branchId, $requestedBy); $logintype = $this->post('requestedDept');
$followupsPending = $this->dashboard_model->followupsPending( $branchId, $requestedBy,$logintype);
if ($followupsPending) { if ($followupsPending) {
$followupsPending['status'] = REST_Controller::HTTP_OK; $followupsPending['status'] = REST_Controller::HTTP_OK;
// Set the response and exit // Set the response and exit

142
Apollo/api/application/models/Dashboard_model.php
View File

@ -212,7 +212,7 @@ class Dashboard_model extends CI_Model
} }
public function leadCountDay($branchId){ public function leadCountDay($branchId = null, $requestedBy = null){
$ltsql = "select count(InteractionID) as count $ltsql = "select count(InteractionID) as count
from T_Lead_Tracking_Followup as ltf from T_Lead_Tracking_Followup as ltf
left join T_Lead_Tracking lt on lt.TrackingID=ltf.TrackingID left join T_Lead_Tracking lt on lt.TrackingID=ltf.TrackingID
@ -225,11 +225,23 @@ from T_Lead_Tracking_Followup as ltf
and date(ltf.CreatedOn) = date(now()) and ltf.IsActive = 1 and lt.CreatedBranch = '".$branchId."' "; and date(ltf.CreatedOn) = date(now()) and ltf.IsActive = 1 and lt.CreatedBranch = '".$branchId."' ";
$ltCount=$this->db->query($ltsql); $ltCount=$this->db->query($ltsql);
$lcount = $ltCount->result(); $lcount = $ltCount->result();
$sltsql = "select count(InteractionID) as count
from T_Lead_Tracking_Followup as ltf
left join T_Lead_Tracking lt on lt.TrackingID=ltf.TrackingID
join T_Login l on l.ID=lt.AssignedTo
join T_StaffDetails sd on sd.StaffID=l.StaffID
left join T_Lead_Details ld on ld.LeadID=lt.LeadID
left join T_ActivityMaster am on am.ActivityID=lt.ActivityStatus
join T_PickListDetails list on list.ListCode=ltf.StatusName
where InteractionID in (select max(InteractionID) from T_Lead_Tracking_Followup group by TrackingID)
and date(ltf.CreatedOn) = date(now()) and ltf.IsActive = 1 and lt.CreatedBranch = '".$branchId."' and ltf.AssignedStaff = '".$requestedBy."' ";
$sltCount=$this->db->query($sltsql);
$slcount = $sltCount->result();
//print_r($lcount); //print_r($lcount);
if (count($lcount) > 0) { if (count($lcount) > 0) {
$results['leadList'] = true; $results['leadList'] = true;
$results['lead_data'] = $lcount; $results['lead_data'] = $lcount;
$results['slead_data'] = $slcount;
} else { } else {
$results['leadList'] = false; $results['leadList'] = false;
$results['message'] = 'No record found'; $results['message'] = 'No record found';
@ -237,7 +249,7 @@ if (count($lcount) > 0) {
return $results; return $results;
} }
public function leadCountMonth($branchId){ public function leadCountMonth($branchId = null, $requestedBy = null){
$ltsql = "select count(InteractionID) as count $ltsql = "select count(InteractionID) as count
from T_Lead_Tracking_Followup as ltf from T_Lead_Tracking_Followup as ltf
left join T_Lead_Tracking lt on lt.TrackingID=ltf.TrackingID left join T_Lead_Tracking lt on lt.TrackingID=ltf.TrackingID
@ -250,10 +262,22 @@ public function leadCountMonth($branchId){
and month(ltf.CreatedOn) = month(now()) and ltf.IsActive = 1 and lt.CreatedBranch = '".$branchId."' "; and month(ltf.CreatedOn) = month(now()) and ltf.IsActive = 1 and lt.CreatedBranch = '".$branchId."' ";
$ltCount=$this->db->query($ltsql); $ltCount=$this->db->query($ltsql);
$lcount = $ltCount->result(); $lcount = $ltCount->result();
$sltsql = "select count(InteractionID) as count
from T_Lead_Tracking_Followup as ltf
left join T_Lead_Tracking lt on lt.TrackingID=ltf.TrackingID
join T_Login l on l.ID=lt.AssignedTo
join T_StaffDetails sd on sd.StaffID=l.StaffID
left join T_Lead_Details ld on ld.LeadID=lt.LeadID
left join T_ActivityMaster am on am.ActivityID=lt.ActivityStatus
join T_PickListDetails list on list.ListCode=ltf.StatusName
where InteractionID in (select max(InteractionID) from T_Lead_Tracking_Followup group by TrackingID)
and month(ltf.CreatedOn) = month(now()) and ltf.IsActive = 1 and lt.CreatedBranch = '".$branchId."' and ltf.AssignedStaff = '".$requestedBy."' ";
$sltCount=$this->db->query($sltsql);
$slcount = $sltCount->result();
if (count($lcount) > 0) { if (count($lcount) > 0) {
$results['leadList'] = true; $results['leadList'] = true;
$results['lead_data'] = $lcount; $results['lead_data'] = $lcount;
$results['slead_data'] = $slcount;
} else { } else {
$results['leadList'] = false; $results['leadList'] = false;
$results['message'] = 'No record found'; $results['message'] = 'No record found';
@ -261,7 +285,7 @@ public function leadCountMonth($branchId){
return $results; return $results;
} }
public function leadCountDayClosed($branchId){ public function leadCountDayClosed($branchId = null, $requestedBy = null){
$ltsql = "select count(InteractionID) as count $ltsql = "select count(InteractionID) as count
from T_Lead_Tracking_Followup as ltf from T_Lead_Tracking_Followup as ltf
left join T_Lead_Tracking lt on lt.TrackingID=ltf.TrackingID left join T_Lead_Tracking lt on lt.TrackingID=ltf.TrackingID
@ -274,11 +298,23 @@ public function leadCountMonth($branchId){
and date(ltf.CreatedOn) = date(now()) and list.ListName like 'CLOSE' and ltf.IsActive = 1 and lt.CreatedBranch = '".$branchId."' "; and date(ltf.CreatedOn) = date(now()) and list.ListName like 'CLOSE' and ltf.IsActive = 1 and lt.CreatedBranch = '".$branchId."' ";
$ltCount=$this->db->query($ltsql); $ltCount=$this->db->query($ltsql);
$lcount = $ltCount->result(); $lcount = $ltCount->result();
$sltsql = "select count(InteractionID) as count
from T_Lead_Tracking_Followup as ltf
left join T_Lead_Tracking lt on lt.TrackingID=ltf.TrackingID
join T_Login l on l.ID=lt.AssignedTo
join T_StaffDetails sd on sd.StaffID=l.StaffID
left join T_Lead_Details ld on ld.LeadID=lt.LeadID
left join T_ActivityMaster am on am.ActivityID=lt.ActivityStatus
join T_PickListDetails list on list.ListCode=ltf.StatusName
where InteractionID in (select max(InteractionID) from T_Lead_Tracking_Followup group by TrackingID)
and date(ltf.CreatedOn) = date(now()) and list.ListName like 'CLOSE' and ltf.IsActive = 1 and lt.CreatedBranch = '".$branchId."' and ltf.AssignedStaff = '".$requestedBy."' ";
$sltCount=$this->db->query($sltsql);
$slcount = $sltCount->result();
if (count($lcount) > 0) { if (count($lcount) > 0) {
$results['leadList'] = true; $results['leadList'] = true;
$results['lead_data'] = $lcount; $results['lead_data'] = $lcount;
$results['slead_data'] = $slcount;
} else { } else {
$results['leadList'] = false; $results['leadList'] = false;
$results['message'] = 'No record found'; $results['message'] = 'No record found';
@ -286,7 +322,7 @@ public function leadCountMonth($branchId){
return $results; return $results;
} }
public function leadCountMonthClosed($branchId){ public function leadCountMonthClosed($branchId = null, $requestedBy = null){
$ltsql = "select count(InteractionID) as count $ltsql = "select count(InteractionID) as count
from T_Lead_Tracking_Followup as ltf from T_Lead_Tracking_Followup as ltf
left join T_Lead_Tracking lt on lt.TrackingID=ltf.TrackingID left join T_Lead_Tracking lt on lt.TrackingID=ltf.TrackingID
@ -299,10 +335,22 @@ public function leadCountMonth($branchId){
and month(ltf.CreatedOn) = month(now()) and list.ListName like 'CLOSE' and ltf.IsActive = 1 and lt.CreatedBranch = '".$branchId."' "; and month(ltf.CreatedOn) = month(now()) and list.ListName like 'CLOSE' and ltf.IsActive = 1 and lt.CreatedBranch = '".$branchId."' ";
$ltCount=$this->db->query($ltsql); $ltCount=$this->db->query($ltsql);
$lcount = $ltCount->result(); $lcount = $ltCount->result();
$sltsql = "select count(InteractionID) as count
from T_Lead_Tracking_Followup as ltf
left join T_Lead_Tracking lt on lt.TrackingID=ltf.TrackingID
join T_Login l on l.ID=lt.AssignedTo
join T_StaffDetails sd on sd.StaffID=l.StaffID
left join T_Lead_Details ld on ld.LeadID=lt.LeadID
left join T_ActivityMaster am on am.ActivityID=lt.ActivityStatus
join T_PickListDetails list on list.ListCode=ltf.StatusName
where InteractionID in (select max(InteractionID) from T_Lead_Tracking_Followup group by TrackingID)
and month(ltf.CreatedOn) = month(now()) and list.ListName like 'CLOSE' and ltf.IsActive = 1 and lt.CreatedBranch = '".$branchId."' and ltf.AssignedStaff = '".$requestedBy."' ";
$sltCount=$this->db->query($sltsql);
$slcount = $sltCount->result();
if (count($lcount) > 0) { if (count($lcount) > 0) {
$results['leadList'] = true; $results['leadList'] = true;
$results['lead_data'] = $lcount; $results['lead_data'] = $lcount;
$results['slead_data'] = $slcount;
} else { } else {
$results['leadList'] = false; $results['leadList'] = false;
$results['message'] = 'No record found'; $results['message'] = 'No record found';
@ -338,7 +386,7 @@ public function leadCountMonth($branchId){
return $results; return $results;
} }
public function followupsCountToday($branchId = null){ public function followupsCountToday($branchId = null, $requestedBy = null){
$sql = "select count(ltf.TrackingID) as count $sql = "select count(ltf.TrackingID) as count
from T_Lead_Tracking_Followup as ltf from T_Lead_Tracking_Followup as ltf
left join T_Lead_Tracking lt on lt.TrackingID=ltf.TrackingID left join T_Lead_Tracking lt on lt.TrackingID=ltf.TrackingID
@ -351,9 +399,22 @@ public function leadCountMonth($branchId){
and STR_TO_DATE(ltf.FollowupOn,'%d-%m-%Y') = date(now()) and ltf.IsActive = 1 and lt.CreatedBranch = '".$branchId."' "; and STR_TO_DATE(ltf.FollowupOn,'%d-%m-%Y') = date(now()) and ltf.IsActive = 1 and lt.CreatedBranch = '".$branchId."' ";
$followupsCount=$this->db->query($sql); $followupsCount=$this->db->query($sql);
$fcount = $followupsCount->result(); $fcount = $followupsCount->result();
$ssql = "select count(ltf.TrackingID) as count
from T_Lead_Tracking_Followup as ltf
left join T_Lead_Tracking lt on lt.TrackingID=ltf.TrackingID
join T_Login l on l.ID=lt.AssignedTo
join T_StaffDetails sd on sd.StaffID=l.StaffID
left join T_Lead_Details ld on ld.LeadID=lt.LeadID
left join T_ActivityMaster am on am.ActivityID=lt.ActivityStatus
join T_PickListDetails list on list.ListCode=ltf.StatusName
where InteractionID in (select max(InteractionID) from T_Lead_Tracking_Followup group by TrackingID)
and STR_TO_DATE(ltf.FollowupOn,'%d-%m-%Y') = date(now()) and ltf.IsActive = 1 and lt.CreatedBranch = '".$branchId."' and ltf.AssignedStaff = '".$requestedBy."' ";
$sfollowupsCount=$this->db->query($ssql);
$sfcount = $sfollowupsCount->result();
if (count($fcount) > 0) { if (count($fcount) > 0) {
$results['fUpList'] = true; $results['fUpList'] = true;
$results['fUp_data'] = $fcount; $results['fUp_data'] = $fcount;
$results['sfUp_data'] = $sfcount;
} else { } else {
$results['fUpList'] = false; $results['fUpList'] = false;
$results['message'] = 'No record found'; $results['message'] = 'No record found';
@ -361,7 +422,7 @@ public function leadCountMonth($branchId){
return $results; return $results;
} }
public function followupsCountMonth($branchId = null){ public function followupsCountMonth($branchId = null, $requestedBy = null){
$sql = "select count(ltf.TrackingID) as count $sql = "select count(ltf.TrackingID) as count
from T_Lead_Tracking_Followup as ltf from T_Lead_Tracking_Followup as ltf
left join T_Lead_Tracking lt on lt.TrackingID=ltf.TrackingID left join T_Lead_Tracking lt on lt.TrackingID=ltf.TrackingID
@ -374,9 +435,23 @@ public function leadCountMonth($branchId){
and month(STR_TO_DATE(ltf.FollowupOn,'%d-%m-%Y')) = month(now()) and ltf.IsActive = 1 and lt.CreatedBranch = '".$branchId."' "; and month(STR_TO_DATE(ltf.FollowupOn,'%d-%m-%Y')) = month(now()) and ltf.IsActive = 1 and lt.CreatedBranch = '".$branchId."' ";
$followupsCount=$this->db->query($sql); $followupsCount=$this->db->query($sql);
$fcount = $followupsCount->result(); $fcount = $followupsCount->result();
//to staff
$ssql = "select count(ltf.TrackingID) as count
from T_Lead_Tracking_Followup as ltf
left join T_Lead_Tracking lt on lt.TrackingID=ltf.TrackingID
join T_Login l on l.ID=lt.AssignedTo
join T_StaffDetails sd on sd.StaffID=l.StaffID
left join T_Lead_Details ld on ld.LeadID=lt.LeadID
left join T_ActivityMaster am on am.ActivityID=lt.ActivityStatus
join T_PickListDetails list on list.ListCode=ltf.StatusName
where InteractionID in (select max(InteractionID) from T_Lead_Tracking_Followup group by TrackingID)
and month(STR_TO_DATE(ltf.FollowupOn,'%d-%m-%Y')) = month(now()) and ltf.IsActive = 1 and lt.CreatedBranch = '".$branchId."' and ltf.AssignedStaff = '".$requestedBy."' ";
$sfollowupsCount=$this->db->query($ssql);
$sfcount = $sfollowupsCount->result();
if (count($fcount) > 0) { if (count($fcount) > 0) {
$results['fUpList'] = true; $results['fUpList'] = true;
$results['fUp_data'] = $fcount; $results['fUp_data'] = $fcount;
$results['sfUp_data'] = $sfcount;
} else { } else {
$results['fUpList'] = false; $results['fUpList'] = false;
$results['message'] = 'No record found'; $results['message'] = 'No record found';
@ -385,7 +460,7 @@ public function leadCountMonth($branchId){
return $results; return $results;
} }
public function leadToday($branchId = null,$requestedBy = null){ public function leadToday($branchId = null,$requestedBy = null, $logintype = null){
$sql = "select InteractionID,ifnull(date_format(ltf.CreatedOn,'%d-%m-%Y'),'-') as date,ltf.TrackingID as TrackingId,ifnull(ltf.FollowupOn,'-') as followUpDate,ld.LeadName as name,ifnull(ld.MobileNumber,'-') as mobileNo,lt.University as university,lt.Course as course,list.ListName as status,ltf.FollowupComments as cmnts,ifnull(am.ActivityName,'-') as activity,sd.FirstName as AssignTo $sql = "select InteractionID,ifnull(date_format(ltf.CreatedOn,'%d-%m-%Y'),'-') as date,ltf.TrackingID as TrackingId,ifnull(ltf.FollowupOn,'-') as followUpDate,ld.LeadName as name,ifnull(ld.MobileNumber,'-') as mobileNo,lt.University as university,lt.Course as course,list.ListName as status,ltf.FollowupComments as cmnts,ifnull(am.ActivityName,'-') as activity,sd.FirstName as AssignTo
from T_Lead_Tracking_Followup as ltf from T_Lead_Tracking_Followup as ltf
left join T_Lead_Tracking lt on lt.TrackingID=ltf.TrackingID left join T_Lead_Tracking lt on lt.TrackingID=ltf.TrackingID
@ -409,7 +484,7 @@ public function leadCountMonth($branchId){
left join T_ActivityMaster am on am.ActivityID=lt.ActivityStatus left join T_ActivityMaster am on am.ActivityID=lt.ActivityStatus
join T_PickListDetails list on list.ListCode=ltf.StatusName join T_PickListDetails list on list.ListCode=ltf.StatusName
where InteractionID in (select max(InteractionID) from T_Lead_Tracking_Followup group by TrackingID) where InteractionID in (select max(InteractionID) from T_Lead_Tracking_Followup group by TrackingID)
and date(ltf.CreatedOn) = date(now()) and ltf.IsActive = 1 and lt.CreatedBranch = '".$branchId."' and sd.StaffID = '".$requestedBy."' "; and date(ltf.CreatedOn) = date(now()) and ltf.IsActive = 1 and lt.CreatedBranch = '".$branchId."' and ltf.AssignedStaff = '".$requestedBy."' ";
$sltd=$this->db->query($ssql); $sltd=$this->db->query($ssql);
$stlead = $sltd->result(); $stlead = $sltd->result();
// print_r($ssql); // print_r($ssql);
@ -424,7 +499,7 @@ public function leadCountMonth($branchId){
return $results; return $results;
} }
public function leadMonth($branchId = null,$requestedBy = null){ public function leadMonth($branchId = null,$requestedBy = null, $logintype = null){
$sql = "select InteractionID,ifnull(date_format(ltf.CreatedOn,'%d-%m-%Y'),'-') as date,ltf.TrackingID as TrackingId,ifnull(ltf.FollowupOn,'-') as followUpDate,ld.LeadName as name,ifnull(ld.MobileNumber,'-') as mobileNo,lt.University as university,lt.Course as course,list.ListName as status,ltf.FollowupComments as cmnts,ifnull(am.ActivityName,'-') as activity,sd.FirstName as AssignTo $sql = "select InteractionID,ifnull(date_format(ltf.CreatedOn,'%d-%m-%Y'),'-') as date,ltf.TrackingID as TrackingId,ifnull(ltf.FollowupOn,'-') as followUpDate,ld.LeadName as name,ifnull(ld.MobileNumber,'-') as mobileNo,lt.University as university,lt.Course as course,list.ListName as status,ltf.FollowupComments as cmnts,ifnull(am.ActivityName,'-') as activity,sd.FirstName as AssignTo
from T_Lead_Tracking_Followup as ltf from T_Lead_Tracking_Followup as ltf
left join T_Lead_Tracking lt on lt.TrackingID=ltf.TrackingID left join T_Lead_Tracking lt on lt.TrackingID=ltf.TrackingID
@ -447,7 +522,7 @@ public function leadCountMonth($branchId){
left join T_ActivityMaster am on am.ActivityID=lt.ActivityStatus left join T_ActivityMaster am on am.ActivityID=lt.ActivityStatus
join T_PickListDetails list on list.ListCode=ltf.StatusName join T_PickListDetails list on list.ListCode=ltf.StatusName
where InteractionID in (select max(InteractionID) from T_Lead_Tracking_Followup group by TrackingID) where InteractionID in (select max(InteractionID) from T_Lead_Tracking_Followup group by TrackingID)
and month(ltf.CreatedOn) = month(now()) and ltf.IsActive = 1 and lt.CreatedBranch = '".$branchId."' and sd.StaffID = '".$requestedBy."' "; and month(ltf.CreatedOn) = month(now()) and ltf.IsActive = 1 and lt.CreatedBranch = '".$branchId."' and ltf.AssignedStaff = '".$requestedBy."' ";
$sltd=$this->db->query($ssql); $sltd=$this->db->query($ssql);
$stlead = $sltd->result(); $stlead = $sltd->result();
if (count($tlead) > 0) { if (count($tlead) > 0) {
@ -461,7 +536,7 @@ public function leadCountMonth($branchId){
return $results; return $results;
} }
public function leadTodayClosed($branchId = null,$requestedBy = null){ public function leadTodayClosed($branchId = null,$requestedBy = null, $logintype = null){
$sql = "select InteractionID,ifnull(date_format(ltf.CreatedOn,'%d-%m-%Y'),'-') as date,ltf.TrackingID as TrackingId,ifnull(ltf.FollowupOn,'-') as followUpDate,ld.LeadName as name,ifnull(ld.MobileNumber,'-') as mobileNo,lt.University as university,lt.Course as course,list.ListName as status,ltf.FollowupComments as cmnts,ifnull(am.ActivityName,'-') as activity,sd.FirstName as AssignTo $sql = "select InteractionID,ifnull(date_format(ltf.CreatedOn,'%d-%m-%Y'),'-') as date,ltf.TrackingID as TrackingId,ifnull(ltf.FollowupOn,'-') as followUpDate,ld.LeadName as name,ifnull(ld.MobileNumber,'-') as mobileNo,lt.University as university,lt.Course as course,list.ListName as status,ltf.FollowupComments as cmnts,ifnull(am.ActivityName,'-') as activity,sd.FirstName as AssignTo
from T_Lead_Tracking_Followup as ltf from T_Lead_Tracking_Followup as ltf
left join T_Lead_Tracking lt on lt.TrackingID=ltf.TrackingID left join T_Lead_Tracking lt on lt.TrackingID=ltf.TrackingID
@ -484,7 +559,7 @@ public function leadCountMonth($branchId){
left join T_ActivityMaster am on am.ActivityID=lt.ActivityStatus left join T_ActivityMaster am on am.ActivityID=lt.ActivityStatus
join T_PickListDetails list on list.ListCode=ltf.StatusName join T_PickListDetails list on list.ListCode=ltf.StatusName
where InteractionID in (select max(InteractionID) from T_Lead_Tracking_Followup group by TrackingID) where InteractionID in (select max(InteractionID) from T_Lead_Tracking_Followup group by TrackingID)
and date(ltf.CreatedOn) = date(now()) and ltf.IsActive = 1 and list.ListName like 'CLOSE' and lt.CreatedBranch = '".$branchId."' and sd.StaffID = '".$requestedBy."' "; and date(ltf.CreatedOn) = date(now()) and ltf.IsActive = 1 and list.ListName like 'CLOSE' and lt.CreatedBranch = '".$branchId."' and ltf.AssignedStaff = '".$requestedBy."' ";
$sltd=$this->db->query($ssql); $sltd=$this->db->query($ssql);
$stlead = $sltd->result(); $stlead = $sltd->result();
if (count($tlead) > 0) { if (count($tlead) > 0) {
@ -498,7 +573,7 @@ public function leadCountMonth($branchId){
return $results; return $results;
} }
public function leadMonthClosed($branchId = null,$requestedBy = null){ public function leadMonthClosed($branchId = null,$requestedBy = null, $logintype = null){
$sql = "select InteractionID,ifnull(date_format(ltf.CreatedOn,'%d-%m-%Y'),'-') as date,ltf.TrackingID as TrackingId,ifnull(ltf.FollowupOn,'-') as followUpDate,ld.LeadName as name,ifnull(ld.MobileNumber,'-') as mobileNo,lt.University as university,lt.Course as course,list.ListName as status,ltf.FollowupComments as cmnts,ifnull(am.ActivityName,'-') as activity,sd.FirstName as AssignTo $sql = "select InteractionID,ifnull(date_format(ltf.CreatedOn,'%d-%m-%Y'),'-') as date,ltf.TrackingID as TrackingId,ifnull(ltf.FollowupOn,'-') as followUpDate,ld.LeadName as name,ifnull(ld.MobileNumber,'-') as mobileNo,lt.University as university,lt.Course as course,list.ListName as status,ltf.FollowupComments as cmnts,ifnull(am.ActivityName,'-') as activity,sd.FirstName as AssignTo
from T_Lead_Tracking_Followup as ltf from T_Lead_Tracking_Followup as ltf
left join T_Lead_Tracking lt on lt.TrackingID=ltf.TrackingID left join T_Lead_Tracking lt on lt.TrackingID=ltf.TrackingID
@ -511,6 +586,7 @@ public function leadCountMonth($branchId){
and month(ltf.CreatedOn) = month(now()) and ltf.IsActive = 1 and list.ListName like 'CLOSE' and lt.CreatedBranch = '".$branchId."' "; and month(ltf.CreatedOn) = month(now()) and ltf.IsActive = 1 and list.ListName like 'CLOSE' and lt.CreatedBranch = '".$branchId."' ";
$ltd=$this->db->query($sql); $ltd=$this->db->query($sql);
$tlead = $ltd->result(); $tlead = $ltd->result();
// echo $sql;
//to staff //to staff
$ssql = "select InteractionID,ifnull(date_format(ltf.CreatedOn,'%d-%m-%Y'),'-') as date,ltf.TrackingID as TrackingId,ifnull(ltf.FollowupOn,'-') as followUpDate,ld.LeadName as name,ifnull(ld.MobileNumber,'-') as mobileNo,lt.University as university,lt.Course as course,list.ListName as status,ltf.FollowupComments as cmnts,ifnull(am.ActivityName,'-') as activity,sd.FirstName as AssignTo $ssql = "select InteractionID,ifnull(date_format(ltf.CreatedOn,'%d-%m-%Y'),'-') as date,ltf.TrackingID as TrackingId,ifnull(ltf.FollowupOn,'-') as followUpDate,ld.LeadName as name,ifnull(ld.MobileNumber,'-') as mobileNo,lt.University as university,lt.Course as course,list.ListName as status,ltf.FollowupComments as cmnts,ifnull(am.ActivityName,'-') as activity,sd.FirstName as AssignTo
from T_Lead_Tracking_Followup as ltf from T_Lead_Tracking_Followup as ltf
@ -521,7 +597,7 @@ public function leadCountMonth($branchId){
left join T_ActivityMaster am on am.ActivityID=lt.ActivityStatus left join T_ActivityMaster am on am.ActivityID=lt.ActivityStatus
join T_PickListDetails list on list.ListCode=ltf.StatusName join T_PickListDetails list on list.ListCode=ltf.StatusName
where InteractionID in (select max(InteractionID) from T_Lead_Tracking_Followup group by TrackingID) where InteractionID in (select max(InteractionID) from T_Lead_Tracking_Followup group by TrackingID)
and month(ltf.CreatedOn) = month(now()) and ltf.IsActive = 1 and list.ListName like 'CLOSE' and lt.CreatedBranch = '".$branchId."' and sd.StaffID = '".$requestedBy."' "; and month(ltf.CreatedOn) = month(now()) and ltf.IsActive = 1 and list.ListName like 'CLOSE' and lt.CreatedBranch = '".$branchId."' and ltf.AssignedStaff = '".$requestedBy."' ";
$sltd=$this->db->query($ssql); $sltd=$this->db->query($ssql);
$stlead = $sltd->result(); $stlead = $sltd->result();
@ -536,7 +612,7 @@ public function leadCountMonth($branchId){
return $results; return $results;
} }
public function admissionMonth($year = null,$month = null){ public function admissionMonth($year = null,$month = null, $branchId = null){
$sql = "select UniversityID as uid,university, $sql = "select UniversityID as uid,university,
SUM(IF((wc.week_of_month = 1), wc.tot_cnt,0)) AS week1, SUM(IF((wc.week_of_month = 1), wc.tot_cnt,0)) AS week1,
SUM(IF((wc.week_of_month = 2), wc.tot_cnt,0)) AS week2, SUM(IF((wc.week_of_month = 2), wc.tot_cnt,0)) AS week2,
@ -544,18 +620,20 @@ public function leadCountMonth($branchId){
SUM(IF((wc.week_of_month = 4), wc.tot_cnt,0)) AS week4, SUM(IF((wc.week_of_month = 4), wc.tot_cnt,0)) AS week4,
SUM(IF((wc.week_of_month = 5), wc.tot_cnt,0)) AS week5, SUM(IF((wc.week_of_month = 5), wc.tot_cnt,0)) AS week5,
sum(tot_cnt) as total, sum(tot_cnt) as total,
group_concat(AdmittedBy,'-',tot_cnt separator ',') as AdmissionTakenBy group_concat(name,'-',tot_cnt separator ',') as AdmissionTakenBy
from (SELECT from (SELECT
scd.UniversityID AS UniversityID, scd.UniversityID AS UniversityID,
um.UniversityName as university, um.UniversityName as university,
std.CreatedOn AS cdate, std.CreatedOn AS cdate,
std.AdmittedBy AS AdmittedBy, std.AdmittedBy AS AdmittedBy,
concat(sd.Firstname,'',sd.Lastname) as name,
(FLOOR(((DAYOFMONTH(std.CreatedOn) - 1) / 7)) + 1) AS week_of_month, (FLOOR(((DAYOFMONTH(std.CreatedOn) - 1) / 7)) + 1) AS week_of_month,
COUNT(scd.StudentID) AS tot_cnt COUNT(scd.StudentID) AS tot_cnt
FROM FROM
T_StudentDetails std T_StudentDetails std
JOIN getUniv scd ON scd.StudentID = std.StudentID JOIN getUniv scd ON scd.StudentID = std.StudentID
left join T_UniversityMaster um on um.UniversityID = scd.UniversityID left join T_UniversityMaster um on um.UniversityID = scd.UniversityID
left join T_StaffDetails sd on sd.StaffID = std.AdmittedBy
WHERE WHERE
std.AdmittedBy IS NOT NULL std.AdmittedBy IS NOT NULL
AND YEAR(std.CreatedOn) = YEAR(NOW()) AND YEAR(std.CreatedOn) = YEAR(NOW())
@ -571,18 +649,20 @@ public function leadCountMonth($branchId){
SUM(IF((wc.week_of_month = 4), wc.tot_cnt,0)) AS week4, SUM(IF((wc.week_of_month = 4), wc.tot_cnt,0)) AS week4,
SUM(IF((wc.week_of_month = 5), wc.tot_cnt,0)) AS week5, SUM(IF((wc.week_of_month = 5), wc.tot_cnt,0)) AS week5,
sum(tot_cnt) as total, sum(tot_cnt) as total,
group_concat(AdmittedBy,'-',tot_cnt separator ',') as AdmissionTakenBy group_concat(name,'-',tot_cnt separator ',') as AdmissionTakenBy
from (SELECT from (SELECT
scd.UniversityID AS UniversityID, scd.UniversityID AS UniversityID,
um.UniversityName as university, um.UniversityName as university,
std.CreatedOn AS cdate, std.CreatedOn AS cdate,
std.AdmittedBy AS AdmittedBy, std.AdmittedBy AS AdmittedBy,
concat(sd.Firstname,'',sd.Lastname) as name,
(FLOOR(((DAYOFMONTH(std.CreatedOn) - 1) / 7)) + 1) AS week_of_month, (FLOOR(((DAYOFMONTH(std.CreatedOn) - 1) / 7)) + 1) AS week_of_month,
COUNT(scd.StudentID) AS tot_cnt COUNT(scd.StudentID) AS tot_cnt
FROM FROM
T_StudentDetails std T_StudentDetails std
JOIN getUniv scd ON scd.StudentID = std.StudentID JOIN getUniv scd ON scd.StudentID = std.StudentID
left join T_UniversityMaster um on um.UniversityID = scd.UniversityID left join T_UniversityMaster um on um.UniversityID = scd.UniversityID
left join T_StaffDetails sd on sd.StaffID = std.AdmittedBy
WHERE WHERE
std.AdmittedBy IS NOT NULL std.AdmittedBy IS NOT NULL
AND YEAR(std.CreatedOn) = '".$year."' AND YEAR(std.CreatedOn) = '".$year."'
@ -631,7 +711,7 @@ public function leadCountMonth($branchId){
GROUP_CONCAT(DISTINCT sc.sname, '-', sc.cnt SEPARATOR ';') AS AdmissionTakenBy GROUP_CONCAT(DISTINCT sc.sname, '-', sc.cnt SEPARATOR ';') AS AdmissionTakenBy
FROM FROM
T_StudentDetails std T_StudentDetails std
JOIN getUniYear scd ON scd.StudentID = std.StudentID JOIN T_Student_CourseDetails scd ON scd.StudentID = std.StudentID
JOIN (select UniversityID,AdmittedBy,cnt,sname,group_concat(sname,'-',cnt) as staf from (SELECT scd.UniversityID AS UniversityID, JOIN (select UniversityID,AdmittedBy,cnt,sname,group_concat(sname,'-',cnt) as staf from (SELECT scd.UniversityID AS UniversityID,
std.BranchCode, std.BranchCode,
std.CreatedOn, std.CreatedOn,
@ -676,7 +756,7 @@ public function leadCountMonth($branchId){
GROUP_CONCAT(DISTINCT sc.sname, '-', sc.cnt SEPARATOR ';') AS AdmissionTakenBy GROUP_CONCAT(DISTINCT sc.sname, '-', sc.cnt SEPARATOR ';') AS AdmissionTakenBy
FROM FROM
T_StudentDetails std T_StudentDetails std
JOIN getUniYear scd ON scd.StudentID = std.StudentID JOIN T_Student_CourseDetails scd ON scd.StudentID = std.StudentID
JOIN (select UniversityID,AdmittedBy,cnt,sname,group_concat(sname,'-',cnt) as staf from (SELECT scd.UniversityID AS UniversityID, JOIN (select UniversityID,AdmittedBy,cnt,sname,group_concat(sname,'-',cnt) as staf from (SELECT scd.UniversityID AS UniversityID,
std.BranchCode, std.BranchCode,
std.CreatedOn, std.CreatedOn,
@ -719,8 +799,8 @@ public function leadCountMonth($branchId){
public function feeOutstanding($branchId = null, $univ = null){ public function feeOutstanding($branchId = null, $univ = null){
$sql = "select bcode,Batches,uid,staff,admittedby,sum(totalpayable) as TotalPayableFee,sum(totalpaid) as TotalPaidFee,(sum(totalpayable) - sum(totalpaid)) as TotalBalance, $sql = "select bcode,Batches,uid,staff,admittedby,sum(totalpayable) as TotalPayableFee,sum(totalpaid) as TotalPaidFee,(sum(totalpayable) - sum(totalpaid)) as TotalBalance,
round((((sum(totalpayable) - sum(totalpaid)) / sum(totalpayable)) * 100),0) as BalancePercentage, concat(round((((sum(totalpayable) - sum(totalpaid)) / sum(totalpayable)) * 100),0),'%') as BalancePercentage,
group_concat(staff,'-',bal_percentage separator ',') as BalancePercentageByStaff GROUP_CONCAT(staff,'-',CONCAT_WS('',bal_percentage, '%') separator ',') as BalancePercentageByStaff
from from
(SELECT (SELECT
a.BatchCode AS bcode, a.BatchCode AS bcode,
@ -765,7 +845,7 @@ public function leadCountMonth($branchId){
return $results; return $results;
} }
public function followupsToday($branchId = null, $requestedBy = null){ public function followupsToday($branchId = null, $requestedBy = null, $logintype = null){
$sql = "select InteractionID,ifnull(date_format(ltf.CreatedOn,'%d-%m-%Y'),'-') as date,ltf.TrackingID as TrackingId,ifnull(ltf.FollowupOn,'-') as FollowUpDate,ld.LeadName as name,ifnull(ld.MobileNumber,'-') as mobileNo,lt.University as university,lt.Course as course,list.ListName as status,ltf.FollowupComments as cmnts,ifnull(am.ActivityName,'-') as activity,sd.FirstName as AssignTo $sql = "select InteractionID,ifnull(date_format(ltf.CreatedOn,'%d-%m-%Y'),'-') as date,ltf.TrackingID as TrackingId,ifnull(ltf.FollowupOn,'-') as FollowUpDate,ld.LeadName as name,ifnull(ld.MobileNumber,'-') as mobileNo,lt.University as university,lt.Course as course,list.ListName as status,ltf.FollowupComments as cmnts,ifnull(am.ActivityName,'-') as activity,sd.FirstName as AssignTo
from T_Lead_Tracking_Followup as ltf from T_Lead_Tracking_Followup as ltf
left join T_Lead_Tracking lt on lt.TrackingID=ltf.TrackingID left join T_Lead_Tracking lt on lt.TrackingID=ltf.TrackingID
@ -788,7 +868,7 @@ public function leadCountMonth($branchId){
left join T_ActivityMaster am on am.ActivityID=lt.ActivityStatus left join T_ActivityMaster am on am.ActivityID=lt.ActivityStatus
join T_PickListDetails list on list.ListCode=ltf.StatusName join T_PickListDetails list on list.ListCode=ltf.StatusName
where InteractionID in (select max(InteractionID) from T_Lead_Tracking_Followup group by TrackingID) where InteractionID in (select max(InteractionID) from T_Lead_Tracking_Followup group by TrackingID)
and STR_TO_DATE(ltf.FollowupOn,'%d-%m-%Y') = date(now()) and lt.CreatedBranch = '".$branchId."' and sd.StaffID = '".$requestedBy."' "; and STR_TO_DATE(ltf.FollowupOn,'%d-%m-%Y') = date(now()) and lt.CreatedBranch = '".$branchId."' and ltf.AssignedStaff = '".$requestedBy."' ";
$sltd=$this->db->query($ssql); $sltd=$this->db->query($ssql);
$stlead = $sltd->result(); $stlead = $sltd->result();
@ -803,7 +883,7 @@ public function leadCountMonth($branchId){
return $results; return $results;
} }
public function followupsPending($branchId = null, $requestedBy = null){ public function followupsPending($branchId = null, $requestedBy = null, $logintype = null){
$sql = "select InteractionID,ifnull(date_format(ltf.CreatedOn,'%d-%m-%Y'),'-') as date,ltf.TrackingID as TrackingId,ifnull(ltf.FollowupOn,'-') as FollowUpDate,ld.LeadName as name,ifnull(ld.MobileNumber,'-') as mobileNo,lt.University as university,lt.Course as course,list.ListName as status,ltf.FollowupComments as cmnts,ifnull(am.ActivityName,'-') as activity,sd.FirstName as AssignTo $sql = "select InteractionID,ifnull(date_format(ltf.CreatedOn,'%d-%m-%Y'),'-') as date,ltf.TrackingID as TrackingId,ifnull(ltf.FollowupOn,'-') as FollowUpDate,ld.LeadName as name,ifnull(ld.MobileNumber,'-') as mobileNo,lt.University as university,lt.Course as course,list.ListName as status,ltf.FollowupComments as cmnts,ifnull(am.ActivityName,'-') as activity,sd.FirstName as AssignTo
from T_Lead_Tracking_Followup as ltf from T_Lead_Tracking_Followup as ltf
left join T_Lead_Tracking lt on lt.TrackingID=ltf.TrackingID left join T_Lead_Tracking lt on lt.TrackingID=ltf.TrackingID
@ -813,7 +893,7 @@ public function leadCountMonth($branchId){
left join T_ActivityMaster am on am.ActivityID=lt.ActivityStatus left join T_ActivityMaster am on am.ActivityID=lt.ActivityStatus
join T_PickListDetails list on list.ListCode=ltf.StatusName join T_PickListDetails list on list.ListCode=ltf.StatusName
where InteractionID in (select max(InteractionID) from T_Lead_Tracking_Followup group by TrackingID) where InteractionID in (select max(InteractionID) from T_Lead_Tracking_Followup group by TrackingID)
and list.ListName not like 'CLOSE' and list.ListName like 'PENDING' and lt.CreatedBranch = '".$branchId."' "; and list.ListName not like 'CLOSE' and list.ListName like 'PENDING' and month(STR_TO_DATE(ltf.FollowupOn,'%d-%m-%Y')) = month(now()) and lt.CreatedBranch = '".$branchId."' ";
$ltd=$this->db->query($sql); $ltd=$this->db->query($sql);
$tlead = $ltd->result(); $tlead = $ltd->result();
//To staff //To staff
@ -826,10 +906,10 @@ public function leadCountMonth($branchId){
left join T_ActivityMaster am on am.ActivityID=lt.ActivityStatus left join T_ActivityMaster am on am.ActivityID=lt.ActivityStatus
join T_PickListDetails list on list.ListCode=ltf.StatusName join T_PickListDetails list on list.ListCode=ltf.StatusName
where InteractionID in (select max(InteractionID) from T_Lead_Tracking_Followup group by TrackingID) where InteractionID in (select max(InteractionID) from T_Lead_Tracking_Followup group by TrackingID)
and list.ListName not like 'CLOSE' and list.ListName like 'PENDING' and lt.CreatedBranch = '".$branchId."' and sd.StaffID = '".$requestedBy."' "; and list.ListName not like 'CLOSE' and list.ListName like 'PENDING' and month(STR_TO_DATE(ltf.FollowupOn,'%d-%m-%Y')) = month(now()) and lt.CreatedBranch = '".$branchId."' and ltf.AssignedStaff = '".$requestedBy."' ";
$sltd=$this->db->query($ssql); $sltd=$this->db->query($ssql);
$stlead = $sltd->result(); $stlead = $sltd->result();
//echo $requestedBy;
if ((count($tlead) > 0) or (count($stlead) > 0)) { if ((count($tlead) > 0) or (count($stlead) > 0)) {
$results['lList'] = true; $results['lList'] = true;
$results['l_data'] = $tlead; $results['l_data'] = $tlead;

124
Apollo/assets/js/controllers/dashboardCtrl.js
View File

@ -200,7 +200,7 @@ app.controller('dashboardCtrl', ["$scope", "$rootScope", "toaster", "$filter", "
$scope.sl_dataToday[i].Sl_No = i + 1; $scope.sl_dataToday[i].Sl_No = i + 1;
$scope.ltl = false; $scope.ltl = false;
if ($scope.l_dataToday == '') { if ($scope.getLoginType == 'R002' || $scope.getLoginType == 'R005') {
$scope.Dt_leadtoday = $scope.sl_dataToday; $scope.Dt_leadtoday = $scope.sl_dataToday;
// console.log($scope.Dt_leadtoday); // console.log($scope.Dt_leadtoday);
// console.log('if'); // console.log('if');
@ -271,7 +271,7 @@ app.controller('dashboardCtrl', ["$scope", "$rootScope", "toaster", "$filter", "
for (var i = 0; i < $scope.sl_dataMonth.length; i++) for (var i = 0; i < $scope.sl_dataMonth.length; i++)
$scope.sl_dataMonth[i].Sl_No = i + 1; $scope.sl_dataMonth[i].Sl_No = i + 1;
$scope.lml = false; $scope.lml = false;
if ($scope.l_dataMonth == '') { if ($scope.getLoginType == 'R002' || $scope.getLoginType == 'R005') {
$scope.Dt_leadmonth = $scope.sl_dataMonth; $scope.Dt_leadmonth = $scope.sl_dataMonth;
// console.log($scope.Dt_leadmonth); // console.log($scope.Dt_leadmonth);
// console.log('if'); // console.log('if');
@ -340,7 +340,7 @@ app.controller('dashboardCtrl', ["$scope", "$rootScope", "toaster", "$filter", "
for (var i = 0; i < $scope.sl_dataDayClosed.length; i++) for (var i = 0; i < $scope.sl_dataDayClosed.length; i++)
$scope.sl_dataDayClosed[i].Sl_No = i + 1; $scope.sl_dataDayClosed[i].Sl_No = i + 1;
$scope.cdl = false; $scope.cdl = false;
if ($scope.l_dataDayClosed == '') { if ($scope.getLoginType == 'R002' || $scope.getLoginType == 'R005') {
$scope.Dt_dataDayClosed = $scope.sl_dataDayClosed; $scope.Dt_dataDayClosed = $scope.sl_dataDayClosed;
// console.log($scope.Dt_dataDayClosed); // console.log($scope.Dt_dataDayClosed);
// console.log('if'); // console.log('if');
@ -410,7 +410,7 @@ app.controller('dashboardCtrl', ["$scope", "$rootScope", "toaster", "$filter", "
for (var i = 0; i < $scope.sl_dataMonthClosed.length; i++) for (var i = 0; i < $scope.sl_dataMonthClosed.length; i++)
$scope.sl_dataMonthClosed[i].Sl_No = i + 1; $scope.sl_dataMonthClosed[i].Sl_No = i + 1;
$scope.cml = false; $scope.cml = false;
if ($scope.l_dataMonthClosed == '') { if ($scope.getLoginType == 'R002' || $scope.getLoginType == 'R005' ) {
$scope.Dt_dataMonthClosed = $scope.sl_dataMonthClosed; $scope.Dt_dataMonthClosed = $scope.sl_dataMonthClosed;
// console.log($scope.Dt_dataMonthClosed); // console.log($scope.Dt_dataMonthClosed);
// console.log('if'); // console.log('if');
@ -451,7 +451,7 @@ app.controller('dashboardCtrl', ["$scope", "$rootScope", "toaster", "$filter", "
showColumnLines: "showColumnLines", showColumnLines: "showColumnLines",
showRowLines: "showRowLines", showRowLines: "showRowLines",
rowAlternationEnabled: "rowAlternationEnabled", rowAlternationEnabled: "rowAlternationEnabled",
dataSource: 'l_dataMonthClosed' dataSource: 'Dt_dataMonthClosed'
}, },
columns: ['TrackingId', 'name', 'mobileNo', 'course', 'university', 'activity', 'AssignTo', 'followUpDate', 'status'] columns: ['TrackingId', 'name', 'mobileNo', 'course', 'university', 'activity', 'AssignTo', 'followUpDate', 'status']
}; };
@ -701,7 +701,7 @@ app.controller('dashboardCtrl', ["$scope", "$rootScope", "toaster", "$filter", "
columns: [{ columns: [{
dataField: "Sl_No", dataField: "Sl_No",
dataType: "number", dataType: "number",
//width:50 width:50
}, { }, {
dataField: "Batches", dataField: "Batches",
dataType: "number", dataType: "number",
@ -720,7 +720,8 @@ app.controller('dashboardCtrl', ["$scope", "$rootScope", "toaster", "$filter", "
// width:80 // width:80
}, { }, {
dataField: "BalancePercentage", dataField: "BalancePercentage",
dataType: "number", cssClass: "cls",
// dataType: "number",
// width:80 // width:80
}, { }, {
dataField: "BalancePercentageByStaff", dataField: "BalancePercentageByStaff",
@ -754,7 +755,7 @@ app.controller('dashboardCtrl', ["$scope", "$rootScope", "toaster", "$filter", "
$scope.sftoday[i].Sl_No = i + 1; $scope.sftoday[i].Sl_No = i + 1;
$scope.futl = false; $scope.futl = false;
// console.log($scope.ftoday); // console.log($scope.ftoday);
if ($scope.ftoday == '') { if ($scope.getLoginType == 'R002' || $scope.getLoginType == 'R005' ) {
$scope.Dt_ftoday = $scope.sftoday; $scope.Dt_ftoday = $scope.sftoday;
// console.log($scope.Dt_dataMonthClosed); // console.log($scope.Dt_dataMonthClosed);
// console.log('if'); // console.log('if');
@ -812,6 +813,8 @@ app.controller('dashboardCtrl', ["$scope", "$rootScope", "toaster", "$filter", "
} }
}; };
console.log(JSON.parse(localStorage.getItem('localObj')).localType);
$http(fpending).then(function (response) { $http(fpending).then(function (response) {
if (response.data.lList == true) { if (response.data.lList == true) {
$scope.fpending = response.data.l_data; $scope.fpending = response.data.l_data;
@ -824,14 +827,16 @@ app.controller('dashboardCtrl', ["$scope", "$rootScope", "toaster", "$filter", "
for (var i = 0; i < $scope.sfpending.length; i++) for (var i = 0; i < $scope.sfpending.length; i++)
$scope.sfpending[i].Sl_No = i + 1; $scope.sfpending[i].Sl_No = i + 1;
// console.log($scope.fpending); // console.log($scope.fpending);
if ($scope.fpending == '') { // console.log($scope.sfpending);
if ($scope.getLoginType == 'R002' || $scope.getLoginType == 'R005' ) {
$scope.Dt_fpending = $scope.sfpending; $scope.Dt_fpending = $scope.sfpending;
// console.log($scope.Dt_dataMonthClosed); // console.log($scope.Dt_dataMonthClosed);
// console.log('if'); // console.log('if');
} }
else { else {
$scope.Dt_fpending = $scope.fpending; $scope.Dt_fpending = $scope.fpending;
// console.log($scope.Dt_dataMonthClosed); console.log($scope.Dt_fpending);
// console.log('else'); // console.log('else');
} }
} else { } else {
@ -908,6 +913,7 @@ app.controller('dashboardCtrl', ["$scope", "$rootScope", "toaster", "$filter", "
"export": { "export": {
enabled: true, enabled: true,
fileName: "AdmissionsBatch" fileName: "AdmissionsBatch"
}, },
dataSource: { dataSource: {
fields: [{ fields: [{
@ -1338,14 +1344,28 @@ app.controller('dashboardCtrl', ["$scope", "$rootScope", "toaster", "$filter", "
} }
/*end dashboard tab*/ /*end dashboard tab*/
/*For dashboard tiles*/ /*For dashboard tiles*/
$scope.lead_dataToday = 0; $scope.lead_dataToday = '';
$scope.lead_dataMonth = 0; $scope.lead_dataMonth = '';
$scope.leadCountDayClosed = 0; $scope.leadCountDayClosed = '';
$scope.leadCountMonthClosed = 0; $scope.leadCountMonthClosed = '';
$scope.ad_data = 0; $scope.ad_data = '';
$scope.ad_dataYear = 0; $scope.ad_dataYear = '';
$scope.fup_today = 0; $scope.fup_today = '';
$scope.fup_month = 0; $scope.fup_month = '';
//to staff
$scope.slead_dataToday = '';
$scope.slead_dataMonth = '';
$scope.sleadCountDayClosed = '';
$scope.sleadCountMonthClosed = '';
$scope.sfup_today = '';
$scope.sfup_month = '';
//common variable
$scope.cslead_dataToday = '';
$scope.cslead_dataMonth = '';
$scope.csleadCountDayClosed = '';
$scope.csleadCountMonthClosed = '';
$scope.csfup_today = '';
$scope.csfup_month = '';
//1st tile for lead created today //1st tile for lead created today
var todayCount = { var todayCount = {
method: 'POST', method: 'POST',
@ -1363,6 +1383,18 @@ app.controller('dashboardCtrl', ["$scope", "$rootScope", "toaster", "$filter", "
$http(todayCount).then(function (response) { $http(todayCount).then(function (response) {
if (response.data.leadList == true) { if (response.data.leadList == true) {
$scope.lead_dataToday = response.data.lead_data[0].count; $scope.lead_dataToday = response.data.lead_data[0].count;
$scope.slead_dataToday = response.data.slead_data[0].count;
if ($scope.getLoginType == 'R002' || $scope.getLoginType == 'R005' ) {
$scope.cslead_dataToday = $scope.slead_dataToday;
// console.log($scope.Dt_dataMonthClosed);
// console.log('if');
}
else {
$scope.cslead_dataToday = $scope.lead_dataToday;
//console.log($scope.Dt_fpending);
// console.log('else');
}
// console.log($scope.lead_dataToday); // console.log($scope.lead_dataToday);
} else { } else {
@ -1386,7 +1418,17 @@ app.controller('dashboardCtrl', ["$scope", "$rootScope", "toaster", "$filter", "
$http(monthCount).then(function (response) { $http(monthCount).then(function (response) {
if (response.data.leadList == true) { if (response.data.leadList == true) {
$scope.lead_dataMonth = response.data.lead_data[0].count; $scope.lead_dataMonth = response.data.lead_data[0].count;
$scope.slead_dataMonth = response.data.slead_data[0].count;
if ($scope.getLoginType == 'R002' || $scope.getLoginType == 'R005' ) {
$scope.cslead_dataMonth = $scope.slead_dataMonth;
// console.log($scope.Dt_dataMonthClosed);
// console.log('if');
}
else {
$scope.cslead_dataMonth = $scope.lead_dataMonth;
//console.log($scope.Dt_fpending);
// console.log('else');
}
//console.log($scope.lead_dataMonth); //console.log($scope.lead_dataMonth);
} else { } else {
$scope.message = response.data.message; $scope.message = response.data.message;
@ -1409,6 +1451,17 @@ app.controller('dashboardCtrl', ["$scope", "$rootScope", "toaster", "$filter", "
$http(dayCountClosed).then(function (response) { $http(dayCountClosed).then(function (response) {
if (response.data.leadList == true) { if (response.data.leadList == true) {
$scope.leadCountDayClosed = response.data.lead_data[0].count; $scope.leadCountDayClosed = response.data.lead_data[0].count;
$scope.sleadCountDayClosed = response.data.slead_data[0].count;
if ($scope.getLoginType == 'R002' || $scope.getLoginType == 'R005' ) {
$scope.csleadCountDayClosed = $scope.sleadCountDayClosed;
// console.log($scope.Dt_dataMonthClosed);
// console.log('if');
}
else {
$scope.csleadCountDayClosed = $scope.leadCountDayClosed;
//console.log($scope.Dt_fpending);
// console.log('else');
}
// console.log($scope.leadCountDayClosed); // console.log($scope.leadCountDayClosed);
} else { } else {
@ -1432,6 +1485,17 @@ app.controller('dashboardCtrl', ["$scope", "$rootScope", "toaster", "$filter", "
$http(monthCountClosed).then(function (response) { $http(monthCountClosed).then(function (response) {
if (response.data.leadList == true) { if (response.data.leadList == true) {
$scope.leadCountMonthClosed = response.data.lead_data[0].count; $scope.leadCountMonthClosed = response.data.lead_data[0].count;
$scope.sleadCountMonthClosed = response.data.slead_data[0].count;
if ($scope.getLoginType == 'R002' || $scope.getLoginType == 'R005' ) {
$scope.csleadCountMonthClosed = $scope.sleadCountMonthClosed;
// console.log($scope.Dt_dataMonthClosed);
// console.log('if');
}
else {
$scope.csleadCountMonthClosed = $scope.leadCountMonthClosed;
//console.log($scope.Dt_fpending);
// console.log('else');
}
//console.log($scope.leadCountMonthClosed); //console.log($scope.leadCountMonthClosed);
} else { } else {
@ -1499,6 +1563,17 @@ app.controller('dashboardCtrl', ["$scope", "$rootScope", "toaster", "$filter", "
$http(fupToday).then(function (response) { $http(fupToday).then(function (response) {
if (response.data.fUpList == true) { if (response.data.fUpList == true) {
$scope.fup_today = response.data.fUp_data[0].count; $scope.fup_today = response.data.fUp_data[0].count;
$scope.sfup_today = response.data.sfUp_data[0].count;
if ($scope.getLoginType == 'R002' || $scope.getLoginType == 'R005' ) {
$scope.csfup_today = $scope.sfup_today;
// console.log($scope.Dt_dataMonthClosed);
// console.log('if');
}
else {
$scope.csfup_today = $scope.fup_today;
//console.log($scope.Dt_fpending);
// console.log('else');
}
// console.log($scope.fup_today); // console.log($scope.fup_today);
} else { } else {
@ -1522,6 +1597,17 @@ app.controller('dashboardCtrl', ["$scope", "$rootScope", "toaster", "$filter", "
$http(fupMonth).then(function (response) { $http(fupMonth).then(function (response) {
if (response.data.fUpList == true) { if (response.data.fUpList == true) {
$scope.fup_month = response.data.fUp_data[0].count; $scope.fup_month = response.data.fUp_data[0].count;
$scope.sfup_month = response.data.sfUp_data[0].count;
if ($scope.getLoginType == 'R002' || $scope.getLoginType == 'R005' ) {
$scope.csfup_month = $scope.sfup_month;
// console.log($scope.Dt_dataMonthClosed);
// console.log('if');
}
else {
$scope.csfup_month = $scope.fup_month;
//console.log($scope.Dt_fpending);
// console.log('else');
}
// console.log($scope.fup_month); // console.log($scope.fup_month);
} else { } else {

95
Apollo/assets/views/dashboard.html
View File

@ -20,7 +20,7 @@
<div class="col-sm-12" ng-controller="studentModalDemoCtrl"> <div class="col-sm-12" ng-controller="studentModalDemoCtrl">
<div class="panel panel-white no-radius"> <div class="panel panel-white no-radius">
<div class="panel-body"> <div ng-if="getLoginType=='R004' || getLoginType=='R003'" class="panel-body">
<div class="row"> <div class="row">
<div class="col-md-3"> <div class="col-md-3">
<div class="panel panel-white no-radius text-center"> <div class="panel panel-white no-radius text-center">
@ -139,6 +139,99 @@
</div>
<div ng-if="getLoginType=='R002' || getLoginType=='R005'" class="panel-body">
<div class="row">
<div class="col-md-4">
<div class="panel panel-white no-radius text-center">
<div class="panel-body">
<!-- <span class="fa-stack fa-2x">
<i class="fa fa-square fa-stack-2x text-primary"></i>
<i class="fa fa-smile-o fa-stack-1x fa-inverse">T</i>
</span> -->
<h3 class="StepTitle">Leads Created</h3>
<div class="row">
<div class="col-md-6">
<p class="text-large">
Today
</p>{{cslead_dataToday || 0}}
</div>
<div class="col-md-6">
<p class="text-large">
This month
</p>{{cslead_dataMonth || 0}}
</div>
</div>
<p class="links cl-effect-1">
<a href="#/app/dashboard_tile1">
view more
</a>
</p>
</div>
</div>
</div>
<div class="col-md-4">
<div class="panel panel-white no-radius text-center">
<div class="panel-body">
<!-- <span class="fa-stack fa-2x">
<i class="fa fa-square fa-stack-2x text-primary"></i>
<i class="fa fa-smile-o fa-stack-1x fa-inverse">T</i>
</span> -->
<h3 class="StepTitle">Leads Closed</h3>
<div class="row">
<div class="col-md-6">
<p class="text-large">
Today
</p>{{csleadCountDayClosed || 0}}
</div>
<div class="col-md-6">
<p class="text-large">
This month
</p>{{csleadCountMonthClosed || 0}}
</div>
</div>
<p class="links cl-effect-1">
<a href="#/app/dashboard_tile2">
view more
</a>
</p>
</div>
</div>
</div>
<div class="col-md-4">
<div class="panel panel-white no-radius text-center">
<div class="panel-body">
<!-- <span class="fa-stack fa-2x">
<i class="fa fa-square fa-stack-2x text-primary"></i>
<i class="fa fa-smile-o fa-stack-1x fa-inverse">T</i>
</span> -->
<h3 class="StepTitle">Follow Ups</h3>
<div class="row">
<div class="col-md-6">
<p class="text-large">
Today
</p>{{csfup_today || 0}}
</div>
<div class="col-md-6">
<p class="text-large">
This month
</p>{{csfup_month || 0}}
</div>
</div>
<p class="links cl-effect-1">
<a href="#/app/dashboard_tile4">
view more
</a>
</p>
</div>
</div>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>

10
Apollo/assets/views/dashboard_tile1.html
View File

@ -26,8 +26,8 @@
<div class="row"> <div class="row">
<tabset class="tabbable no-padding no-margin"> <tabset class="tabbable no-padding no-margin">
<!-- start today followup details tab--> <!-- start today followup details tab-->
<tab heading="Leads Created Today : {{l_dataToday.length || sl_dataToday.length}}" class="padding-top-5 padding-left-5"> <tab heading="Leads Created Today" class="padding-top-5 padding-left-5">
<div ng-if="getLoginType=='R004' || getLoginType=='R003'" class="panel-scroll height-600" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true"> <div ng-if="getLoginType=='R004' || getLoginType=='R003'" class="panel-scroll height-500" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true">
<div ng-if="lt==true"> <div ng-if="lt==true">
<center> <center>
@ -75,7 +75,7 @@
</table> --> </table> -->
</div> </div>
<div ng-if="getLoginType=='R002' || getLoginType=='R005'" class="panel-scroll height-350" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true"> <div ng-if="getLoginType=='R002' || getLoginType=='R005'" class="panel-scroll height-500" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true">
<div ng-if="ltl==true"> <div ng-if="ltl==true">
<center> <center>
<h5 class="text-dark">No Leads!</h5> <h5 class="text-dark">No Leads!</h5>
@ -91,7 +91,7 @@
</tab> </tab>
<!-- end today followup details tab--> <!-- end today followup details tab-->
<!-- end pending track details tab--> <!-- end pending track details tab-->
<tab heading="Leads Created This Month : {{l_dataMonth.length || sl_dataMonth.length}}" class="padding-top-5 padding-left-5"> <tab heading="Leads Created This Month" class="padding-top-5 padding-left-5">
<div ng-if="getLoginType=='R004' || getLoginType=='R003'" class="panel-scroll height-500" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true"> <div ng-if="getLoginType=='R004' || getLoginType=='R003'" class="panel-scroll height-500" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true">
<div ng-if="lm==true"> <div ng-if="lm==true">
<center> <center>
@ -141,7 +141,7 @@
</tbody> </tbody>
</table> --> </table> -->
</div> </div>
<div ng-if="getLoginType=='R002' || getLoginType=='R005'" class="panel-scroll height-350" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true"> <div ng-if="getLoginType=='R002' || getLoginType=='R005'" class="panel-scroll height-500" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true">
<div ng-if="lml==true"> <div ng-if="lml==true">
<center> <center>
<h5 class="text-dark">No Leads!</h5> <h5 class="text-dark">No Leads!</h5>

10
Apollo/assets/views/dashboard_tile2.html
View File

@ -26,7 +26,7 @@
<div class="row"> <div class="row">
<tabset class="tabbable no-padding no-margin"> <tabset class="tabbable no-padding no-margin">
<!-- start today followup details tab--> <!-- start today followup details tab-->
<tab heading="Leads Closed Today : {{l_dataDayClosed.length || sl_dataDayClosed.length}}" class="padding-top-5 padding-left-5"> <tab heading="Leads Closed Today" class="padding-top-5 padding-left-5">
<div ng-if="getLoginType=='R004' || getLoginType=='R003'" class="panel-scroll height-500" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true"> <div ng-if="getLoginType=='R004' || getLoginType=='R003'" class="panel-scroll height-500" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true">
<div ng-if="cd==true"> <div ng-if="cd==true">
<center> <center>
@ -37,8 +37,8 @@
<div dx-data-grid="todayLeadClosed" ng-if="cd==false"></div> <div dx-data-grid="todayLeadClosed" ng-if="cd==false"></div>
</div> </div>
<div ng-if="getLoginType=='R002' || getLoginType=='R005'" class="panel-scroll height-350" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true"> <div ng-if="getLoginType=='R002' || getLoginType=='R005'" class="panel-scroll height-500" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true">
<div ng-if="cdl!=true"> <div ng-if="cdl==true">
<center> <center>
<h5 class="text-dark">No Followup!</h5> <h5 class="text-dark">No Followup!</h5>
</center> </center>
@ -49,7 +49,7 @@
</tab> </tab>
<!-- end today followup details tab--> <!-- end today followup details tab-->
<!-- end pending track details tab--> <!-- end pending track details tab-->
<tab heading="Leads Closed This Month : {{l_dataMonthClosed.length || sl_dataMonthClosed.length}}" class="padding-top-5"> <tab heading="Leads Closed This Month" class="padding-top-5">
<div ng-if="getLoginType=='R004' || getLoginType=='R003'" class="panel-scroll height-500" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true"> <div ng-if="getLoginType=='R004' || getLoginType=='R003'" class="panel-scroll height-500" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true">
<div ng-if="cm==true"> <div ng-if="cm==true">
@ -65,7 +65,7 @@
<div dx-data-grid="monthLeadClosed" ng-if="cm==false"></div> <div dx-data-grid="monthLeadClosed" ng-if="cm==false"></div>
</div> </div>
<div ng-if="getLoginType=='R002' || getLoginType=='R005'" class="panel-scroll height-350" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true"> <div ng-if="getLoginType=='R002' || getLoginType=='R005'" class="panel-scroll height-500" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true">
<div ng-if="cml==true"> <div ng-if="cml==true">
<center> <center>

5
Apollo/assets/views/dashboard_tile3.html
View File

@ -7,6 +7,9 @@
white-space: normal; white-space: normal;
word-wrap: break-word; word-wrap: break-word;
} }
.dx-data-row td.cls {
text-align: right!important;
}
</style> </style>
<!-- start: DASHBOARD TITLE --> <!-- start: DASHBOARD TITLE -->
<!--<section id="page-title" class="padding-top-15 padding-bottom-15"> <!--<section id="page-title" class="padding-top-15 padding-bottom-15">
@ -102,7 +105,7 @@
<!-- end Admissions-Batch tab--> <!-- end Admissions-Batch tab-->
<tab heading="Admissions-Batch : {{adBatch.length || adBatchfilter.length}}" class="padding-top-5"> <tab heading="Admissions-Batch : {{adBatch.length || adBatchfilter.length}}" class="padding-top-5">
<div ng-if="getLoginType=='R004' || getLoginType=='R003'" class="panel-scroll height-500" perfect-scrollbar wheel-propagation="false" <div ng-if="getLoginType=='R004' || getLoginType=='R003'" class="panel-scroll height-400" perfect-scrollbar wheel-propagation="false"
suppress-scroll-x="true"> suppress-scroll-x="true">
<div class="row"> <div class="row">
<div class="col-md-4"> <div class="col-md-4">

6
Apollo/assets/views/dashboard_tile4.html
View File

@ -27,7 +27,7 @@
<tabset class="tabbable no-padding no-margin"> <tabset class="tabbable no-padding no-margin">
<!-- start FollowUps-Today tab--> <!-- start FollowUps-Today tab-->
<tab heading="FollowUps-Today : {{ftoday.length}}" class="padding-top-5"> <tab heading="FollowUps-Today" class="padding-top-5">
<div ng-if="getLoginType=='R004' || getLoginType=='R003'" class="panel-scroll height-500" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true"> <div ng-if="getLoginType=='R004' || getLoginType=='R003'" class="panel-scroll height-500" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true">
<div ng-if="fut==true"> <div ng-if="fut==true">
@ -52,7 +52,7 @@
</tab> </tab>
<!-- end FollowUps-Today tab--> <!-- end FollowUps-Today tab-->
<!-- start FollowUps-Pending Calls tab--> <!-- start FollowUps-Pending Calls tab-->
<tab heading="FollowUps-Pending Calls : {{fpending.length}}" class="padding-top-5"> <tab heading="FollowUps-Pending Calls" class="padding-top-5">
<div ng-if="getLoginType=='R004' || getLoginType=='R003'" class="panel-scroll height-500" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true"> <div ng-if="getLoginType=='R004' || getLoginType=='R003'" class="panel-scroll height-500" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true">
<div ng-if="fp==true"> <div ng-if="fp==true">
<center> <center>
@ -63,7 +63,7 @@
<div dx-data-grid="FollowPending" ng-if="fp==false"></div> <div dx-data-grid="FollowPending" ng-if="fp==false"></div>
</div> </div>
<div ng-if="getLoginType=='R002' || getLoginType=='R005'" class="panel-scroll height-350" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true"> <div ng-if="getLoginType=='R002' || getLoginType=='R005'" class="panel-scroll height-500" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true">
<div ng-if="fpl==true"> <div ng-if="fpl==true">
<center> <center>
<h5 class="text-dark">No Records!</h5> <h5 class="text-dark">No Records!</h5>