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:
sriramv 2018-08-21 16:47:13 +05:30
commit e1e7e492be
3 changed files with 59 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -879,7 +879,7 @@ JOIN T_StudentDetails ON T_StudentDetails.StudentID=T_Student_CourseDetails.Stud
JOIN T_UniversityMaster ON T_UniversityMaster.UniversityID=T_Student_CourseDetails.UniversityID JOIN T_CourseMaster ON T_CourseMaster.CourseID=T_Student_CourseDetails.CourseID
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
WHERE T_Registration_Details.RegistrationType = ? and str_to_date(DOJ,?)>=? and str_to_date(DOJ,?)<=? and T_Registration_Details.RegistrationMode=? and T_Student_CourseDetails.UniversityID=?';
WHERE T_Registration_Details.RegistrationType = ? and str_to_date(DOJ,?)>=? and str_to_date(DOJ,?)<=? and T_Registration_Details.RegistrationMode=? and T_Student_CourseDetails.UniversityID=? group by T_Registration_Details.StudentID';
$query = $this->db->query($subQuery,array(NEWREGISTRATION_CONST,'%d-%m-%Y',$fromd,'%d-%m-%Y',$tod,'1',$university));

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

@ -85,6 +85,8 @@ $scope.newreglist='';
$scope.isLoaderShow ='';
$scope.load = '';
$scope.isShow= '';
$scope.fromd='';
$scope.tod='';
$scope.getDetails = function (form,myModel)
{
// alert('in')
@ -92,9 +94,44 @@ $scope.isShow= '';
//console.log(form.$dirty);
var from = $scope.filters.from_date;
var to = $scope.filters.to_date;
var university = myModel.myUnivSearch
var university = myModel.myUnivSearch ;
// console.log(from)
var f = new Date(from),
month = '' + (f.getMonth() + 1),
day = '' + f.getDate(),
year = f.getFullYear();
if (month.length < 2) month = '0' + month;
if (day.length < 2) day = '0' + day;
var from_dt = [day, month ,year].join('-');
var t = new Date(to),
month = '' + (t.getMonth() + 1),
day = '' + t.getDate(),
year = t.getFullYear();
if (month.length < 2) month = '0' + month;
if (day.length < 2) day = '0' + day;
var to_dt = [day, month ,year].join('-');
$scope.fromd = from_dt;
$scope.tod = to_dt;
var getstudentdetails = {
method: 'POST',
@ -136,12 +173,23 @@ $scope.isShow= '';
var mystyle = {
sheetid: 'New Registration List',
$scope.exportData = function ()
{
//alert()
$scope.sam = 'New-Registration List from '+$scope.fromd+' to '+$scope.tod;
var mystyle = {
sheetid:$scope.sam,
headers: true,
caption: {
title:'New Registration List',
width: '500px',
title: $scope.sam,
width: '1000px',
style:'font-size:50px;bold:true'
},
// style:'background:#00FF00',
@ -150,12 +198,7 @@ $scope.isShow= '';
},
};
$scope.exportData = function ()
{
//alert()
console.log(mystyle);

8
Apollo/assets/views/dashboard.html
View File

@ -309,13 +309,13 @@
<!-- start university fees details tab-->
<tab heading="University Pending Fees" class="padding-top-5">
<div class="panel-scroll height-200" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true">
<div class="cl-effect-13" style="float: right" ng-if="getLoginType=='R004' && registerdStudentDetails!=false">
<div class="cl-effect-13" style="float: right" ng-if="getLoginType=='R004' && universityFeesDetails!=false">
<a ui-sref="app.reports.balfee">
view more
</a>
</div>
<div class="cl-effect-13" style="float: right" ng-if="registerdStudentDetails=='R003' && registerdStudentDetails!=false">
<div class="cl-effect-13" style="float: right" ng-if="getLoginType=='R003' && universityFeesDetails!=false">
<a ui-sref="app.reports.balfee">
view more
</a>
@ -338,13 +338,13 @@
<!--start batch fees details tab-->
<tab heading="Batch Pending Fees" class="padding-top-5">
<div class="panel-scroll height-200" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true">
<div class="cl-effect-13" style="float: right" ng-if="getLoginType=='R004' && registerdStudentDetails!=false">
<div class="cl-effect-13" style="float: right" ng-if="getLoginType=='R004' && batchFeesDetails!=false">
<a ui-sref="app.reports.balfee">
view more
</a>
</div>
<div class="cl-effect-13" style="float: right" ng-if="registerdStudentDetails=='R003' && registerdStudentDetails!=false">
<div class="cl-effect-13" style="float: right" ng-if="getLoginType=='R003' && batchFeesDetails!=false">
<a ui-sref="app.reports.balfee">
view more
</a>