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:
gandhimathi 2018-08-31 19:17:34 +05:30
commit 4647679a87
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1386,6 +1386,14 @@ class Calltracking_model extends CI_Model {
$result['message'] = "Something went wrong.please try again"; $result['message'] = "Something went wrong.please try again";
} }
}else{ }else{
if($track_Details['StatusCode'] == 'S020' || $track_Details['StatusCode'] == 'S002'){
$lead_Details['UpdatedOn'] = date('Y-m-d H:i:s');
$lead_Details['UpdatedBy'] = $CreatedBy;
$track_Details['UpdatedOn'] = date('Y-m-d H:i:s');
$track_Details['UpdatedBy'] = $CreatedBy;
}
$lead_Details['CreatedOn'] = date('Y-m-d H:i:s'); $lead_Details['CreatedOn'] = date('Y-m-d H:i:s');
$followup_Details['CreatedOn'] = date('Y-m-d H:i:s'); $followup_Details['CreatedOn'] = date('Y-m-d H:i:s');
$track_Details['CreatedOn'] = date('Y-m-d H:i:s'); $track_Details['CreatedOn'] = date('Y-m-d H:i:s');

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

@ -177,14 +177,14 @@ from
left join T_CertificationMaster cm on cm.CertificationID=app.CertificationType left join T_CertificationMaster cm on cm.CertificationID=app.CertificationType
left join T_PickListDetails p on p.ListCode = app.ListCode left join T_PickListDetails p on p.ListCode = app.ListCode
left join BalFees bal on bal.student=app.StudentID and bal.course=app.CourseID left join BalFees bal on bal.student=app.StudentID and bal.course=app.CourseID
where CertificateName not like 'APPLICATION%' and app.ID IN (SELECT max(ID) FROM T_ApplicationStatus group by StudentID,CourseID,ListCode,BranchCode,CertificationType) where CertificateName not like 'APPLICATION%' and app.ID IN (SELECT max(ID) FROM T_ApplicationStatus group by StudentID,CourseID,BranchCode,CertificationType)
group by app.ID group by app.ID
union union
SELECT app.ID,app.StudentID as sid,app.CourseID as cid,app.BranchCode as branch,app.ListCode as lcode,p.ListName as status,AppDate as adate,app.Comments as acmts,CertificationType as ctype,app.CertificationType as certname,sum(bal.balpayable) as balance SELECT app.ID,app.StudentID as sid,app.CourseID as cid,app.BranchCode as branch,app.ListCode as lcode,p.ListName as status,AppDate as adate,app.Comments as acmts,CertificationType as ctype,app.CertificationType as certname,sum(bal.balpayable) as balance
FROM T_ApplicationStatus as app FROM T_ApplicationStatus as app
left join T_PickListDetails p on p.ListCode = app.ListCode left join T_PickListDetails p on p.ListCode = app.ListCode
left join BalFees bal on bal.student=app.StudentID and bal.course=app.CourseID left join BalFees bal on bal.student=app.StudentID and bal.course=app.CourseID
where app.CertificationType not like 'CERT%' and app.ID IN (SELECT max(ID) FROM T_ApplicationStatus group by StudentID,CourseID,ListCode,BranchCode,CertificationType) where app.CertificationType not like 'CERT%' and app.ID IN (SELECT max(ID) FROM T_ApplicationStatus group by StudentID,CourseID,BranchCode,CertificationType)
group by app.ID) as sms group by app.ID) as sms
left join left join
(SELECT FeesID as fid,BatchCode as batch,StudentID as sid,CourseID as cid,FeesType as ftype,sum(CourseFees) as cf,Sum(STFOrWR) as stf,sum(Others) as others (SELECT FeesID as fid,BatchCode as batch,StudentID as sid,CourseID as cid,FeesType as ftype,sum(CourseFees) as cf,Sum(STFOrWR) as stf,sum(Others) as others

2
Apollo/assets/views/student/studentUnivFeeCompareDetails.html
View File

@ -244,7 +244,7 @@
</div> </div>
</div> </div>
<div class="container"> <div class="container">
<button class="btn btn-success" ng-click="getUnmatchedRecord(getUnmatchedDetailsFor)">Get Record</button> <button class="btn btn-success" ng-disabled="!getUnmatchedDetailsFor" ng-click="getUnmatchedRecord(getUnmatchedDetailsFor)">Get Record</button>
</div> </div>
<div class="container"> <div class="container">
<div ng-if="unMatchedLoadingStatus"> <div ng-if="unMatchedLoadingStatus">