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

1142 admin change

Browse Source
This commit is contained in:
sriramv 2019-01-03 16:07:01 +05:30
parent 99dda23da4
commit 2fe273efa5
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -820,7 +820,7 @@ $sql="select sum(TotalBalance) as total FROM (select (sum(totalpayable) - sum(to
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 lt.CreatedBranch = '".$branchId."' and ltf.StatusName ='S020'";
and list.ListName like 'PENDING' and STR_TO_DATE(ltf.FollowupOn,'%d-%m-%Y') = date(now()) and lt.CreatedBranch = '".$branchId."' ";
$ltd=$this->db->query($sql);
$tlead = $ltd->result();
//to staff
@ -833,7 +833,7 @@ $sql="select sum(TotalBalance) as total FROM (select (sum(totalpayable) - sum(to
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 lt.CreatedBranch = '".$branchId."' and ltf.AssignedStaff = '".$requestedBy."' ";
and list.ListName like 'PENDING' and STR_TO_DATE(ltf.FollowupOn,'%d-%m-%Y') = date(now()) and lt.CreatedBranch = '".$branchId."' and ltf.AssignedStaff = '".$requestedBy."' ";
$sltd=$this->db->query($ssql);
$stlead = $sltd->result();

10
Apollo/assets/views/student/student_details.html
View File

@ -92,7 +92,7 @@
</div>
<div class="col-md-3" ng-if="visiblecheck=='1'">
<div class="col-md-3">
<label for="form-field-select-2" >
Course
</label>
@ -103,9 +103,12 @@
<option value="" selected>Select Course</option>
<option ng-repeat="itemCourse in courseData" value="{{itemCourse.CourseID}}">{{itemCourse.CourseName}}<span ng-show="itemCourse.CourseCode != ''">(<strong>{{itemCourse.CourseCode}}</strong>)</span></option>
</select>
<label for="form-field-select-2" style="color: red;" ng-if="visiblecheck=='0'">
Please select University
</label>
</div>
<div class="col-md-3" ng-if="visiblecheck=='1'">
<div class="col-md-3" >
<label for="form-field-select-2">
Status
</label>
@ -136,6 +139,9 @@
<option value="" selected>Select Batch</option>
<option ng-repeat="item in batchData" value="{{item.BatchCode}}"><!-- {{item.BatchName}} --><span ng-show="item.BatchCode != ''"><strong>{{item.BatchCode}}</strong></span></option>
</select>
<label for="form-field-select-2" style="color: red;" ng-if="visiblecheck=='0'">
Please select University
</label>
</div>
</div>