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

Studymaterial report changes

Browse Source
This commit is contained in:
gandhimathi 2018-09-25 12:07:18 +05:30
parent fea6aacb13
commit b78f5c88d4
4 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -219,6 +219,7 @@ class Calltracking_model extends CI_Model {
$this->db->join(STAFF.' as ST', 'ST.StaffID = LO.StaffID');
$this->db->join(BRANCH.' as BR', 'BR.BranchCode = STB.BranchCode');
$this->db->where('ST.IsActive',$status);
$this->db->where('STB.IsActive',$status);
$this->db->where('BR.IsActive',$status);
if($userType== ADMIN){
$this->db->where('STB.BranchCode',$branchID);

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

@ -9,7 +9,7 @@ class Reports_model extends CI_Model
{
public function status($bat=null,$br=null,$u=null){
$sql = "select ifnull(sms.sid,'-') as Student_id,ifnull(scd.eid,'-') as Enrollment_id,ifnull(std.name,'-') as Student_name,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(sms.cid,'-') as Course_id,ifnull(sms.branch,'-') as Branch,ifnull(sms.date,'-') as Date,ifnull(cfd.syear,'-') as Sem_year,ifnull(sms.sem,'-') as Sem,ifnull(sfs.batch,'-') as Batch_Code,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(list.Status,'-') as Status,bal.balpayable as Balance_fee,ifnull(sfp.bdate,'-') as Initial_paid_date, ifnull(std.AlternateNumber,'-') as AlternateNumber,ifnull(std.address,'-') as address,cm.uid as univID
$sql = "select ifnull(sms.sid,'-') as Student_id,ifnull(scd.eid,'-') as Enrollment_id,ifnull(std.name,'-') as Student_name,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(sms.cid,'-') as Course_id,ifnull(sms.branch,'-') as Branch,ifnull(sms.date,'-') as Date,ifnull(cfd.syear,'-') as Sem_year,ifnull(sms.sem,'-') as Sem,ifnull(sfs.batch,'-') as Batch_Code,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(list.Status,'-') as Status,ifnull(bal.balpayable,0) as Balance_fee,ifnull(sfp.bdate,'-') as Initial_paid_date, ifnull(std.AlternateNumber,'-') as AlternateNumber,ifnull(std.address,'-') as address,cm.uid as univID,ifnull(apdate.appdate,'-') as appdate
from
(SELECT ID,StudentID as sid,CourseID as cid,ListCode as lcode,BranchCode as branch,SDate as date,Sem as sem FROM T_StudyMaterialStatus where ID in (SELECT max(ID) FROM T_StudyMaterialStatus group by StudentID,CourseID,BranchCode,Sem)
group by sid,sem,cid,branch) as sms
@ -36,6 +36,12 @@ order by CourseID) as cm
(SELECT StudentID as sid,MobileNumber as phone,IsActive as active,concat(FirstName,' ',Lastname) as name,Fathername as father,AlternateNumber,PresentAddress as address FROM T_StudentDetails where IsActive = 1) as std on std.sid=sms.sid
left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,EnrollmentID as eid,BranchID as branch FROM T_Student_CourseDetails) as scd on scd.sid=sms.sid
left join BalFees bal on bal.student=sms.sid and bal.feestype=sms.cid and bal.semyr=sms.sem
left join (SELECT rd.StudentID as sid,rd.CourseID as cid,max(if(list.ListName = 'SENT TO UNIVERSITY', afs.AppFormDate,'-')) as appdate,Sem_Year as sem
FROM T_Registration_Details rd
left join T_ApplicationFormStatus afs on afs.Registration_Details_ID=rd.ID
left join T_PickListDetails list on list.ListCode=afs.ListCode
left join T_Course_Fees_Details cf on cf.ID=rd.FeeType
group by sid,sem) as apdate on apdate.sid=sms.sid and apdate.sem=sms.sem
where sms.branch = '".$br."'
";

4
Apollo/assets/js/controllers/report_study_material_statusCtrl.js
View File

@ -161,7 +161,7 @@ app.controller('report_study_material_statusCtrl', ["$scope", "$filter","$rootSc
$scope.exportData = function () {
alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Initial_paid_date as InitialPaidDate,Enrollment_id as EnrollmentId,Student_name as StudentName,Father_name as FatherName,Course_name as CourseName,Sem as SemYear,University,Status as StudyMaterial_Status,Date,CAST(Balance_fee AS NUMBER) as BalanceFee INTO XLS("Study_material_status.xls",?) FROM ?',[mystyle,$scope.study_mat_data]);
alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Initial_paid_date as InitialPaidDate,Enrollment_id as EnrollmentId,Student_name as StudentName,Father_name as FatherName,Course_name as CourseName,Sem as SemYear,University,CAST(Balance_fee AS NUMBER) as BalanceFee,Date,Status as StudyMaterial_Status INTO XLS("Study_material_status.xls",?) FROM ?',[mystyle,$scope.study_mat_data]);
};
@ -297,7 +297,7 @@ $scope.exportExcel= function () {
submit: function (form, myModel,loading,selectedStudents) {
var comments = [];
for(var stuid=0;stuid<=selectedStudents.length-1;stuid++){
comments [stuid] ="Call Tracking For Study Material Status Report";
comments [stuid] ="Call Tracking For Study Material Status Report - Sem:"+selectedStudents[stuid].Sem + " - Study Material Status:" +selectedStudents[stuid].Status + " - Balance Fee:" +selectedStudents[stuid].Balance_fee;
}
if(isNaN(myModel.date)){
$scope.nextFollowupDate = myModel.date;

12
Apollo/assets/views/report_studymaterialstatus.html
View File

@ -92,9 +92,11 @@
<th>Course</th>
<th>Sem/Year</th>
<th>University</th>
<th>Balance Fee</th>
<th style=" white-space: pre-wrap;text-align:left;width: 100px;">Application Send to Univ Date</th>
<th style=" white-space: pre-wrap;text-align:left;width: 100px;">Study Material Status</th>
<th>Date</th>
<th>Balance Fee</th>
</tr>
@ -108,11 +110,13 @@
<td><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.Student_name}}</a></td>
<td>{{p.Father_name}}</td>
<td>{{p.Course_name}}</td>
<td>{{p.Sem_year}}({{p.Sem}})</td>
<td>{{p.Sem}}</td>
<td>{{p.University}}</td>
<td style="text-align:right;">{{p.Balance_fee || '0'}}</td>
<td>{{p.appdate}}</td>
<td>{{p.Status}}</td>
<td>{{p.Date}}</td>
<td style="text-align:right;">{{p.Balance_fee}}</td>
<td>{{p.Date}}</td>
</tr>