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

student view alignment issue and branch code check in call tracking

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2018-11-17 11:33:31 +05:30
parent bf55e17681
commit d8541a9149
2 changed files with 41 additions and 44 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

@ -1681,8 +1681,9 @@ public function GetStaffCountDetails($branchID,$myDate)
$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->where("date_format(LTF.CreatedOn,'%Y-%m-%d')=",$myDate); $this->db->where("date_format(LTF.CreatedOn,'%Y-%m-%d')=",$myDate);
$this->db->where('SD.BranchCode',$branchID); $this->db->where('SBA.BranchCode',$branchID);
$this->db->group_by('AssignedStaff'); $this->db->group_by('AssignedStaff');
$Details = $this->db->get()->result(); $Details = $this->db->get()->result();

8
Apollo/assets/views/student/studentDetailsModal.html
View File

@ -261,12 +261,8 @@
</thead> </thead>
<tbody> <tbody>
<tr ng-repeat="fees in course.feesDetails"> <tr ng-repeat="fees in course.feesDetails">
<td> <td><span>{{fees.FeesName}}</span></td>
<span>{{fees.FeesName}}</span> <td><span>{{fees.BatchName}}</span></td>
</td>
<td>
<span>{{fees.BatchName}}
</td>
<td ng-if="course.feesDetails[0].ProgramType=='P001' || course.feesDetails[0].ProgramType=='P002'">{{fees.SessionName}}/{{fees.ToSessionName}}</td> <td ng-if="course.feesDetails[0].ProgramType=='P001' || course.feesDetails[0].ProgramType=='P002'">{{fees.SessionName}}/{{fees.ToSessionName}}</td>
<td ng-if="course.feesDetails[0].ProgramType=='Y001'">{{fees.SessionName}}</td> <td ng-if="course.feesDetails[0].ProgramType=='Y001'">{{fees.SessionName}}</td>
<td> <span>{{fees.RollNo}}</span></td> <td> <span>{{fees.RollNo}}</span></td>