Merge remote-tracking branch 'origin/master'
This commit is contained in:
gandhimathi
commit
6956a79758
@ -31,12 +31,15 @@ class Batch_Controller extends REST_Controller {
|
|||||||
|
|
||||||
public function addBatchDetails_post()
|
public function addBatchDetails_post()
|
||||||
{
|
{
|
||||||
|
$now = new DateTime();
|
||||||
|
$now->setTimezone(new DateTimezone('Asia/Kolkata'));
|
||||||
$details['BatchCode'] = $this->post('batchcode');
|
$details['BatchCode'] = $this->post('batchcode');
|
||||||
$details['BatchName'] = $this->post('batcheName');
|
$details['BatchName'] = $this->post('batcheName');
|
||||||
$details['UniversityID'] = $this->post('universityName');
|
$details['UniversityID'] = $this->post('universityName');
|
||||||
$details['CreatedBy'] = $this->post('createdBy');
|
$details['CreatedBy'] = $this->post('createdBy');
|
||||||
$details['IsActive'] = $this->post('status');
|
$details['IsActive'] = $this->post('status');
|
||||||
|
$details['CreatedOn'] = $now->format('Y-m-d H:i:s');
|
||||||
|
|
||||||
$batchDetails = $this->batch_model->addBatch($details);// Check if the users data store contains users (in case the database result returns NULL)
|
$batchDetails = $this->batch_model->addBatch($details);// Check if the users data store contains users (in case the database result returns NULL)
|
||||||
if ($batchDetails)
|
if ($batchDetails)
|
||||||
{
|
{
|
||||||
@ -86,11 +89,16 @@ class Batch_Controller extends REST_Controller {
|
|||||||
* */
|
* */
|
||||||
public function updateBatchDetails_post()
|
public function updateBatchDetails_post()
|
||||||
{
|
{
|
||||||
|
$now = new DateTime();
|
||||||
|
$now->setTimezone(new DateTimezone('Asia/Kolkata'));
|
||||||
$details['BatchCode'] = $this->post('batchCode');
|
$details['BatchCode'] = $this->post('batchCode');
|
||||||
$details['BatchName'] = $this->post('batchName');
|
$details['BatchName'] = $this->post('batchName');
|
||||||
$details['IsActive'] = $this->post('status');
|
$details['IsActive'] = $this->post('status');
|
||||||
$details['UpdatedBy'] = $this->post('updatedBy');
|
$details['UpdatedBy'] = $this->post('updatedBy');
|
||||||
$details['UpdatedOn'] = date("Y-m-d", time());
|
$details['UpdatedOn'] = $now->format("Y-m-d H:i:s");
|
||||||
|
|
||||||
|
// print_r( $details['UpdatedOn'])
|
||||||
|
//exit();
|
||||||
$updateDetails = $this->batch_model->updateBatch($details);// Check if the users data store contains users (in case the database result returns NULL)
|
$updateDetails = $this->batch_model->updateBatch($details);// Check if the users data store contains users (in case the database result returns NULL)
|
||||||
|
|
||||||
if ($updateDetails)
|
if ($updateDetails)
|
||||||
|
|||||||
@ -75,8 +75,6 @@ class Announcement_model extends CI_Model {
|
|||||||
$result['message'] = "Something went wrong.please try again";
|
$result['message'] = "Something went wrong.please try again";
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
return $result;
|
return $result;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -63,4 +63,3 @@ app.controller('dashboardCtrl', ["$scope","toaster", "$filter", "ngTableParams",
|
|||||||
};
|
};
|
||||||
|
|
||||||
}]);
|
}]);
|
||||||
|
|
||||||
|
|||||||
@ -29,7 +29,7 @@ function ($rootScope, $state, $stateParams) {
|
|||||||
isNavbarFixed: true, //true if you want to initialize the template with fixed header
|
isNavbarFixed: true, //true if you want to initialize the template with fixed header
|
||||||
isSidebarFixed: true, // true if you want to initialize the template with fixed sidebar
|
isSidebarFixed: true, // true if you want to initialize the template with fixed sidebar
|
||||||
isSidebarClosed: true, // true if you want to initialize the template with closed sidebar
|
isSidebarClosed: true, // true if you want to initialize the template with closed sidebar
|
||||||
isFooterFixed: true, // true if you want to initialize the template with fixed footer
|
isFooterFixed: false, // true if you want to initialize the template with fixed footer
|
||||||
theme: 'theme-5', // indicate the theme chosen for your project
|
theme: 'theme-5', // indicate the theme chosen for your project
|
||||||
logo: 'assets/images/logo.png', // relative path of the project logo
|
logo: 'assets/images/logo.png', // relative path of the project logo
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
<style>
|
<style>
|
||||||
a {
|
a {
|
||||||
color:#5b5b60;
|
color: #5b5b60;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
<!-- start: DASHBOARD TITLE -->
|
<!-- start: DASHBOARD TITLE -->
|
||||||
@ -17,131 +17,141 @@
|
|||||||
<div class="container-fluid container-fullw bg-white" ng-controller="dashboardCtrl">
|
<div class="container-fluid container-fullw bg-white" ng-controller="dashboardCtrl">
|
||||||
<div class="row" data-ng-init="initCallTracking()">
|
<div class="row" data-ng-init="initCallTracking()">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-sm-6">
|
<div class="col-sm-6">
|
||||||
<div class="panel panel-white" id="panel1">
|
<div class="panel panel-white" id="panel1">
|
||||||
<div class="panel-heading panel-white">
|
<div class="panel-heading panel-white">
|
||||||
<h4 class="panel-title text-green">Today Follow Up Details</h4>
|
<h4 class="panel-title text-green">Today Follow Up Details</h4>
|
||||||
<ct-paneltool class="panel-tools" tool-refresh="load1" ng-click="initCallTracking()"></ct-paneltool>
|
<ct-paneltool class="panel-tools" tool-refresh="load1" ng-click="initCallTracking()"></ct-paneltool>
|
||||||
</div>
|
|
||||||
<div class="panel-body">
|
|
||||||
<div ng-if="emptyDataToday==true">
|
|
||||||
<center><h5 class="text-dark">No Followup!</h5></center>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="panel-scroll height-180" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true" ng-if="emptyDataToday==false">
|
<div class="panel-body">
|
||||||
<table class="table table-hover">
|
<div ng-if="emptyDataToday==true">
|
||||||
<thead>
|
<center>
|
||||||
<tr>
|
<h5 class="text-dark">No Followup!</h5>
|
||||||
<th>Tracking ID</th>
|
</center>
|
||||||
<th>Lead Name</th>
|
</div>
|
||||||
<th>Mobile No</th>
|
<div class="panel-scroll height-180" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true" ng-if="emptyDataToday==false">
|
||||||
<th>Activity</th>
|
<table class="table table-hover">
|
||||||
<th>Status</th>
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th>Tracking ID</th>
|
||||||
|
<th>Lead Name</th>
|
||||||
|
<th>Mobile No</th>
|
||||||
|
<th>Activity</th>
|
||||||
|
<th>Status</th>
|
||||||
|
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody ng-repeat="today in todayFolloupDetails">
|
<tbody ng-repeat="today in todayFolloupDetails">
|
||||||
|
|
||||||
<tr>
|
<tr>
|
||||||
<td>{{today.TrackingID}}</td>
|
<td>{{today.TrackingID}}</td>
|
||||||
<td>{{today.LeadName}}</td>
|
<td>{{today.LeadName}}</td>
|
||||||
<td>{{today.MobileNumber}}</td>
|
<td>{{today.MobileNumber}}</td>
|
||||||
<td>{{today.ListName}}</td>
|
<td>{{today.ListName}}</td>
|
||||||
<td class="hidden-xs" ng-if="today.StatusCode!='S001'"><span class="label label-sm label-success">{{today.statusListName}}</span></td>
|
<td class="hidden-xs" ng-if="today.StatusCode!='S001'"><span class="label label-sm label-success">{{today.statusListName}}</span></td>
|
||||||
<td class="hidden-xs" ng-if="today.StatusCode=='S001'"><span class="label label-sm label-warning">{{today.statusListName}}</span></td>
|
<td class="hidden-xs" ng-if="today.StatusCode=='S001'"><span class="label label-sm label-warning">{{today.statusListName}}</span></td>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</tr>
|
</tr>
|
||||||
</tbody>
|
</tbody>
|
||||||
|
|
||||||
</table>
|
</table>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
<div class="col-sm-6">
|
||||||
<div class="col-sm-6">
|
<div class="panel panel-white" id="panel2">
|
||||||
<div class="panel panel-white" id="panel2">
|
<div class="panel-heading panel-white">
|
||||||
<div class="panel-heading panel-white">
|
<h4 class="panel-title text-red">Pending Follow Up Details</h4>
|
||||||
<h4 class="panel-title text-red">Pending Follow Up Details</h4>
|
<ct-paneltool class="panel-tools" tool-refresh="load1" ng-click="initCallTracking()"></ct-paneltool>
|
||||||
<ct-paneltool class="panel-tools" tool-refresh="load1" ng-click="initCallTracking()"></ct-paneltool>
|
|
||||||
</div>
|
|
||||||
<div class="panel-body">
|
|
||||||
<div ng-if="emptyDataPending==true">
|
|
||||||
<center><h5 class="text-dark">No Pending Followup!</h5></center>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="panel-scroll height-180" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true" ng-if="emptyDataPending==false">
|
<div class="panel-body">
|
||||||
<table class="table table-hover">
|
<div ng-if="emptyDataPending==true">
|
||||||
<thead>
|
<center>
|
||||||
<tr>
|
<h5 class="text-dark">No Pending Followup!</h5>
|
||||||
<th>Tracking ID</th>
|
</center>
|
||||||
<th>Lead Name</th>
|
</div>
|
||||||
<th>Mobile No</th>
|
<div class="panel-scroll height-180" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true" ng-if="emptyDataPending==false">
|
||||||
<th>Activity</th>
|
<table class="table table-hover">
|
||||||
<th>Followup On</th>
|
<thead>
|
||||||
<th>Status</th>
|
<tr>
|
||||||
|
<th>Tracking ID</th>
|
||||||
|
<th>Lead Name</th>
|
||||||
|
<th>Mobile No</th>
|
||||||
|
<th>Activity</th>
|
||||||
|
<th>Followup On</th>
|
||||||
|
<th>Status</th>
|
||||||
|
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody ng-repeat="pending in pendingFolloupDetails">
|
<tbody ng-repeat="pending in pendingFolloupDetails">
|
||||||
|
|
||||||
<tr>
|
<tr>
|
||||||
<td>{{pending.TrackingID}}</td>
|
<td>{{pending.TrackingID}}</td>
|
||||||
<td>{{pending.LeadName}}</td>
|
<td>{{pending.LeadName}}</td>
|
||||||
<td>{{pending.MobileNumber}}</td>
|
<td>{{pending.MobileNumber}}</td>
|
||||||
<td>{{pending.ListName}}</td>
|
<td>{{pending.ListName}}</td>
|
||||||
<td>{{pending.FollowupOn}}</td>
|
<td>{{pending.FollowupOn}}</td>
|
||||||
<td class="hidden-xs"><span class="label label-sm label-danger">{{pending.statusListName}}</span></td>
|
<td class="hidden-xs"><span class="label label-sm label-danger">{{pending.statusListName}}</span></td>
|
||||||
</tr>
|
</tr>
|
||||||
</tbody>
|
</tbody>
|
||||||
|
|
||||||
</table>
|
</table>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-sm-6">
|
<div class="col-sm-6">
|
||||||
<div class="panel panel-white" id="panel3">
|
<div class="panel panel-white" id="panel3">
|
||||||
<div class="panel-heading panel-white">
|
<div class="panel-heading panel-white">
|
||||||
<h4 class="panel-title text-purple">Today Created Lead Details</h4>
|
<h4 class="panel-title text-purple">Today Created Lead Details</h4>
|
||||||
<ct-paneltool class="panel-tools" tool-refresh="load1" ng-click="initCallTracking()"></ct-paneltool>
|
<ct-paneltool class="panel-tools" tool-refresh="load1" ng-click="initCallTracking()"></ct-paneltool>
|
||||||
</div>
|
|
||||||
<div class="panel-body">
|
|
||||||
<div ng-if="emptyDataLead==true">
|
|
||||||
<center><h5 class="text-dark">No Lead Created By Today!</h5></center>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="panel-scroll height-180" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true" ng-if="emptyDataLead==false">
|
<div class="panel-body">
|
||||||
<table class="table table-hover">
|
<div ng-if="emptyDataLead==true">
|
||||||
<thead>
|
<center>
|
||||||
<tr>
|
<h5 class="text-dark">No Lead Created By Today!</h5>
|
||||||
<th>Tracking ID</th>
|
</center>
|
||||||
<th>Lead Name</th>
|
</div>
|
||||||
<th>Mobile No</th>
|
<div class="panel-scroll height-180" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true" ng-if="emptyDataLead==false">
|
||||||
<th>Activity</th>
|
<table class="table table-hover">
|
||||||
<th>Followup On</th>
|
<thead>
|
||||||
<th>Status</th>
|
<tr>
|
||||||
|
<th>Tracking ID</th>
|
||||||
|
<th>Lead Name</th>
|
||||||
|
<th>Mobile No</th>
|
||||||
|
<th>Activity</th>
|
||||||
|
<th>Followup On</th>
|
||||||
|
<th>Status</th>
|
||||||
|
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody ng-repeat="lead in leadDetails">
|
<tbody ng-repeat="lead in leadDetails">
|
||||||
|
|
||||||
<tr>
|
<tr>
|
||||||
<td>{{lead.TrackingID}}</td>
|
<td>{{lead.TrackingID}}</td>
|
||||||
<td>{{lead.LeadName}}</td>
|
<td>{{lead.LeadName}}</td>
|
||||||
<td>{{lead.MobileNumber}}</td>
|
<td>{{lead.MobileNumber}}</td>
|
||||||
<td>{{lead.ListName}}</td>
|
<td>{{lead.ListName}}</td>
|
||||||
<td>{{lead.FollowupOn}}</td>
|
<td>{{lead.FollowupOn}}</td>
|
||||||
<td class="hidden-xs" ng-if="lead.StatusCode!='S001'"><span class="label label-sm label-info">{{lead.statusListName}}</span></td>
|
<td class="hidden-xs" ng-if="lead.StatusCode!='S001'"><span class="label label-sm label-info">{{lead.statusListName}}</span></td>
|
||||||
<td class="hidden-xs" ng-if="lead.StatusCode=='S001'"><span class="label label-sm label-info">{{lead.statusListName}}</span></td> </tr>
|
<td class="hidden-xs" ng-if="lead.StatusCode=='S001'"><span class="label label-sm label-info">{{lead.statusListName}}</span></td>
|
||||||
</tbody>
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
|
||||||
</table>
|
</table>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
Loading…
Reference in New Issue
Block a user