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

Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2018-10-24 17:26:57 +05:30
commit ecd9be2830
4 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Apollo/api/application/models/Calltracking_model.php
View File

@ -793,7 +793,7 @@ class Calltracking_model extends CI_Model {
if($leadDet){
$result_array = array();
$result_array['followupStatus']=true;
$result='';
$result=[];
$activityID='';
foreach ($leadDet->result() as $row)
{

2
Apollo/api/application/models/StatusUpdation_model.php
View File

@ -603,7 +603,7 @@ $upperresult=strtoupper($getlastansbookstatus);
$this->db->select('t3.BatchName, t3.BatchCode,t3.BatchDate');
$this->db->from('' . BATCH . ' as t3');
$this->db->where('t3.UniversityID', $clip->UniversityID);
$this->db->where('t3.IsActive', 1);
// $this->db->where('t3.IsActive', 1);
$this->db->where('t3.BranchCode', $branch);
$batDetails = $this->db->get();
$batchDetails = $batDetails->result();

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

@ -897,8 +897,6 @@ app.controller('dashboardCtrl', ["$scope", "$rootScope", "toaster", "$filter", "
allowSortingBySummary: true,
allowSorting: true,
allowFiltering: true,
allowExpandAll: true,
wordWrapEnabled: true,
height: 440,
showBorders: true,
fieldChooser: {
@ -920,8 +918,6 @@ app.controller('dashboardCtrl', ["$scope", "$rootScope", "toaster", "$filter", "
}, {
caption: "staff",
dataField: "Staff",
dataType: "string",
width: 200,
area: "column"
}, {
caption: "TotalNoOfAdmissions",
@ -1041,15 +1037,15 @@ app.controller('dashboardCtrl', ["$scope", "$rootScope", "toaster", "$filter", "
}, {
caption: "staff",
dataField: "Staff",
dataType: "string",
width: 200,
// dataType: "string",
// width: 200,
area: "column"
}, {
caption: "TotalNoOfAdmissions",
dataField: "TotalNoOfAdmissions",
dataType: "number",
summaryType: "sum",
width: 100,
// width: 100,
area: "data"
}],
store: $scope.adBatchfilter

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

@ -136,9 +136,10 @@
</center>
</div>
<!-- <div id="dxPivotGrid" dx-pivot-grid="adBatchgrid" ng-if="adb==false"></div> -->
<div id="dxPivotGrid" dx-pivot-grid="adBatchgrid" ng-if="adb==false && fbselect==false"></div>
<div class="table-responsive">
<div dx-pivot-grid="adBatchgrid" ng-if="adb==false && fbselect==false"></div>
<div dx-pivot-grid="adBatchgrid1" ng-if="fbselect==true"></div>
</div>
</div>