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

fixes : ps

Browse Source
This commit is contained in:
Sanjeev 2021-02-13 20:58:21 +05:30
parent b961f5154e
commit 13c08e09a1
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1987,6 +1987,7 @@ public function GetStaffCallDetails($branchID,$myDate,$staff)
$this->db->join('T_Login L','L.ID=LT.AssignedTo'); $this->db->join('T_Login L','L.ID=LT.AssignedTo');
$this->db->join('T_StaffDetails SD','SD.StaffID=L.StaffID'); $this->db->join('T_StaffDetails SD','SD.StaffID=L.StaffID');
$this->db->join('T_PickListDetails PLD','PLD.ListCode = LTF.StatusName'); $this->db->join('T_PickListDetails PLD','PLD.ListCode = LTF.StatusName');
$this->db->where('LTF.IsActive',1);
$this->db->where("date_format(LTF.CreatedOn,'%Y-%m-%d')=",$myDate); $this->db->where("date_format(LTF.CreatedOn,'%Y-%m-%d')=",$myDate);
$this->db->where('LT.CreatedBranch',$branchID); $this->db->where('LT.CreatedBranch',$branchID);
$this->db->where('LTF.AssignedStaff',$staff); $this->db->where('LTF.AssignedStaff',$staff);
@ -2017,12 +2018,12 @@ public function GetStaffCallDetails($branchID,$myDate,$staff)
public function GetStaffCountDetails($branchID,$myDate) public function GetStaffCountDetails($branchID,$myDate)
{ {
$this->db->select('AssignedStaff,Firstname,Lastname,SD.StaffID,count(InteractionId) as count'); $this->db->select('AssignedStaff,Firstname,Lastname,SD.StaffID,count(InteractionId) as count');
$this->db->from('T_Lead_Tracking_Followup LTF'); $this->db->from('T_Lead_Tracking_Followup LTF');
$this->db->join('T_Login L','L.ID=LTF.AssignedStaff'); $this->db->join('T_Login L','L.ID=LTF.AssignedStaff');
$this->db->join('T_StaffDetails SD','SD.StaffID=L.StaffID'); $this->db->join('T_StaffDetails SD','SD.StaffID=L.StaffID');
$this->db->join('T_Staff_BranchAccess SBA','SBA.StaffID = SD.StaffID'); $this->db->join('T_Staff_BranchAccess SBA','SBA.StaffID = SD.StaffID');
$this->db->where('LTF.IsActive',1);
$this->db->where("date_format(LTF.CreatedOn,'%Y-%m-%d')=",$myDate); $this->db->where("date_format(LTF.CreatedOn,'%Y-%m-%d')=",$myDate);
$this->db->where('SBA.BranchCode',$branchID); $this->db->where('SBA.BranchCode',$branchID);
$this->db->group_by('AssignedStaff'); $this->db->group_by('AssignedStaff');

2
Apollo/assets/views/status-update/answer_booklet_status.html
View File

@ -303,7 +303,7 @@
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-6 form-group" ng-class="{'has-error':Form.description.$dirty && Form.description.$invalid}"> <div class="col-md-6 form-group" ng-class="{'has-error':Form.description.$dirty && Form.description.$invalid}">
<label> Answer Booklet Serial Number </label> <label> Answer Booklet Serial Number </label>
<textarea type="text" placeholder="Enter Serial Number" tabindex="7" class="form-control" name="description" ng-model="myStatusModel.comment"/> <textarea type="text" placeholder="Enter Serial Number" tabindex="7" class="form-control" name="description" ng-model="myStatusModel.comment"/>
<span class="error text-small block" ng-if="Form.description.$dirty && Form.description.$error.pattern">Enter a Serial Number</span> <span class="error text-small block" ng-if="Form.description.$dirty && Form.description.$error.pattern">Enter a Serial Number</span>
</div> </div>