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

New Reg report

Browse Source
This commit is contained in:
sriramv 2018-12-27 11:58:31 +05:30
parent 547471022d
commit 9f0775f499
4 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Apollo/api/application/config/database.php
View File

@ -76,13 +76,13 @@ $query_builder = TRUE;
$db['default'] = array( $db['default'] = array(
'dsn' => '', 'dsn' => '',
'hostname' => 'apollodec.com', 'hostname' => 'apollodec.com',
'username' => 'apollod4_DEV', 'username' => 'apollod4_DEV',
'password' => 'apollo1234', 'password' => 'apollo1234',
'database' => 'apollod4_ApolloDECDev', 'database' => 'apollod4_ApolloDECDev',
// 'username' => 'apollod4_SIT', // 'username' => 'apollod4_SIT',
// 'password' => 'apollosit1234', // 'password' => 'apollosit1234',
// 'database' => 'apollod4_ApolloDECNEWSIT', // 'database' => 'apollod4_ApolloDECNEWSIT',
'dbdriver' => 'mysqli', 'dbdriver' => 'mysqli',
'dbprefix' => '', 'dbprefix' => '',

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

@ -1113,9 +1113,11 @@ from T_Lead_Tracking_Followup as ltf
// die(); // die();
$subQuery="SELECT T_StudentDetails.StudentID,T_Student_CourseDetails.DOJ,BatchName,CourseName ,T_Student_CourseDetails.UniversityID, T_Student_CourseDetails.CourseID, T_StudentDetails.Firstname,T_StudentDetails.Lastname,T_StudentDetails. MobileNumber, T_StudentDetails.Fathername,CourseName,ReferredBy,ReferersMobileNumber,T_StaffDetails.Firstname as Fname,T_StaffDetails.Lastname as Lname,Sem_Year,UniversityName FROM T_Student_CourseDetails $subQuery="SELECT T_StudentDetails.StudentID,T_Student_CourseDetails.DOJ,T_Students_Fees_PaidDetails.BillDate,BatchName,CourseName ,T_Student_CourseDetails.UniversityID, T_Student_CourseDetails.CourseID, T_StudentDetails.Firstname,T_StudentDetails.Lastname,T_StudentDetails. MobileNumber, T_StudentDetails.Fathername,CourseName,ReferredBy,ReferersMobileNumber,T_StaffDetails.Firstname as Fname,T_StaffDetails.Lastname as Lname,Sem_Year,UniversityName FROM T_Student_CourseDetails
JOIN T_StudentDetails ON T_StudentDetails.StudentID=T_Student_CourseDetails.StudentID JOIN T_StudentDetails ON T_StudentDetails.StudentID=T_Student_CourseDetails.StudentID
JOIN T_UniversityMaster ON T_UniversityMaster.UniversityID=T_Student_CourseDetails.UniversityID JOIN T_CourseMaster ON T_CourseMaster.CourseID=T_Student_CourseDetails.CourseID JOIN T_UniversityMaster ON T_UniversityMaster.UniversityID=T_Student_CourseDetails.UniversityID
JOIN T_CourseMaster ON T_CourseMaster.CourseID=T_Student_CourseDetails.CourseID
join T_Students_Fees_PaidDetails ON T_Students_Fees_PaidDetails.StudentID = T_StudentDetails.StudentID
left JOIN T_Registration_Details ON T_Registration_Details.CourseID = T_Student_CourseDetails.CourseID and T_Registration_Details.StudentID=T_Student_CourseDetails.StudentID left JOIN T_Registration_Details ON T_Registration_Details.CourseID = T_Student_CourseDetails.CourseID and T_Registration_Details.StudentID=T_Student_CourseDetails.StudentID
left JOIN T_BatchMaster ON T_BatchMaster.BatchCode = T_Registration_Details.BatchCode left JOIN T_BatchMaster ON T_BatchMaster.BatchCode = T_Registration_Details.BatchCode
left JOIN T_StaffDetails ON T_StaffDetails.StaffID = T_StudentDetails.AdmittedBy left JOIN T_StaffDetails ON T_StaffDetails.StaffID = T_StudentDetails.AdmittedBy
@ -1127,13 +1129,13 @@ T_Registration_Details.BranchCode= '".$branch."'";
// $fromd= date("Y-m-d",strtotime($from)); // $fromd= date("Y-m-d",strtotime($from));
//and str_to_date(DOJ,?)>=? //and str_to_date(DOJ,?)>=?
$subQuery.=" and str_to_date(T_Student_CourseDetails.DOJ,'%d-%m-%Y')>='".$fromd."'"; $subQuery.=" and str_to_date(T_Students_Fees_PaidDetails.BillDate,'%d-%m-%Y')>='".$fromd."'";
} }
if ($tod != ''){ if ($tod != ''){
// $tod=date("Y-m-d",strtotime($to)); // $tod=date("Y-m-d",strtotime($to));
$subQuery.="and str_to_date(T_Student_CourseDetails.DOJ,'%d-%m-%Y')<='".$tod."'"; $subQuery.="and str_to_date(T_Students_Fees_PaidDetails.BillDate,'%d-%m-%Y')<='".$tod."'";
} }
@ -1145,14 +1147,14 @@ T_Registration_Details.BranchCode= '".$branch."'";
$subQuery.='group by T_Student_CourseDetails.ID'; $subQuery.='group by T_Student_CourseDetails.ID';
$subQuery.=' order by str_to_date(T_Student_CourseDetails.DOJ,?) desc'; $subQuery.=' order by str_to_date(T_Students_Fees_PaidDetails.BillDate,?) desc';
$query = $this->db->query($subQuery,array('%d-%m-%Y')); $query = $this->db->query($subQuery,array('%d-%m-%Y'));
$searchDetails =$query->result(); $searchDetails =$query->result();
//print_r( $this->db->last_query()); // print_r( $this->db->last_query());
//die(); // die();
//print_r($searchDetails);die(); //print_r($searchDetails);die();

2
Apollo/assets/js/controllers/newreg_reportCtrl.js
View File

@ -231,7 +231,7 @@ $scope.tod = to_dt;
}; };
// console.log(mystyle); // console.log(mystyle);
alasql('SELECT SL_NO,DOJ as InitialPaymentPaidDate,CONCAT(Firstname,Lastname) as StudentName,Fathername,Course,Sem_Year as SEM_or_YEAR,MobileNumber as Phone_No,University,ReferedBy,ReferersMobileNumber,CONCAT(Fname,Lname) as AdmittedBY INTO XLS("New Registration report.xls",?) FROM ?',[mystyle,$scope.newreglist]); alasql('SELECT SL_NO,BillDate as InitialPaymentPaidDate,CONCAT(Firstname,Lastname) as StudentName,Fathername,CourseName,Sem_Year as SEM_or_YEAR,MobileNumber as Phone_No,UniversityName,ReferedBy,ReferersMobileNumber,CONCAT(Fname,Lname) as AdmittedBY INTO XLS("New Registration report.xls",?) FROM ?',[mystyle,$scope.newreglist]);
//console.log($scope.fullincomedetail); //console.log($scope.fullincomedetail);
// alasql('SELECT DOJ as RegistrationDate,Firstname as Name,Fathername,UniversityName,BatchName,CourseName,MobileNumber INTO XLS("New Registration report.xls",?) FROM ?',[mystyle,$scope.newreglist]); // alasql('SELECT DOJ as RegistrationDate,Firstname as Name,Fathername,UniversityName,BatchName,CourseName,MobileNumber INTO XLS("New Registration report.xls",?) FROM ?',[mystyle,$scope.newreglist]);

2
Apollo/assets/views/newreg_report.html
View File

@ -202,7 +202,7 @@
<tbody> <tbody>
<tr dir-paginate="p in newreglist|filter:search:strict|itemsPerPage:10"> <tr dir-paginate="p in newreglist|filter:search:strict|itemsPerPage:10">
<td>{{p.SL_NO}}</td> <td>{{p.SL_NO}}</td>
<td>{{p.DOJ}}</td> <td>{{p.BillDate}}</td>
<td><a tooltip="View Student" ng-click="open(p);" class="text-dark">{{p.Firstname}} {{p.Lastname}}</a></td> <td><a tooltip="View Student" ng-click="open(p);" class="text-dark">{{p.Firstname}} {{p.Lastname}}</a></td>
<td>{{p.Fathername}}</td> <td>{{p.Fathername}}</td>
<td>{{p.CourseName}}</td> <td>{{p.CourseName}}</td>