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

New&reg and balance fee report fixes

Browse Source
This commit is contained in:
gandhimathi 2018-10-03 13:36:31 +05:30
parent 0c23ca64a5
commit 1172a232c3
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -168,7 +168,7 @@ app.controller('report_app_pendingCtrl', ["$scope", "$filter","$rootScope","$mod
$scope.exportData = function () { $scope.exportData = function () {
alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,InitialPayDate as InititalPaymentDate,EnrollmentNumber as EnrollmentID,Student_name as StudentName,FatherName as FatherName,Course_name as CourseName,Sem_Year as SemYear,University as University,StatusName as ApplicationPendingStatus,FormType as FormType,StatusUpdationOn as Date INTO XLS("New_RegFormStatusReport.xls",?) FROM ?',[mystyle,$scope.app_pending_data]); alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,InitialPayDate as InititalPaymentDate,EnrollmentNumber as EnrollmentID,Student_name as StudentName,FatherName as FatherName,Course_name as CourseName,Sem_Year as SemYear,University as University,FormType as FormType,StatusName as ApplicationPendingStatus,StatusUpdationOn as Date INTO XLS("New_RegFormStatusReport.xls",?) FROM ?',[mystyle,$scope.app_pending_data]);
}; };

6
Apollo/assets/js/controllers/report_balfeeCtrl.js
View File

@ -252,7 +252,7 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal",
} }
console.log($scope.selectedStudentsID); console.log($scope.selectedStudentsID);
} }
$scope.isClick = function(e){ $scope.isClick = function(e,s){
var ide = e.target; var ide = e.target;
var val = (ide.checked ? true : false); var val = (ide.checked ? true : false);
var sid = e.target.id; var sid = e.target.id;
@ -260,7 +260,7 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal",
// console.log($scope.balfee_data); // console.log($scope.balfee_data);
angular.forEach($scope.balfee_data,function(value,key){ angular.forEach($scope.balfee_data,function(value,key){
if(sid == value.Student_id) if(sid == value.Student_id && s == value.Sem_year)
{ {
sid = value; sid = value;
} }
@ -353,7 +353,7 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal",
for(var stuid=0;stuid<=selectedStudents.length-1;stuid++){ for(var stuid=0;stuid<=selectedStudents.length-1;stuid++){
comments [stuid] ="Call Tracking For Report Balance Fee - Sem:"+selectedStudents[stuid].Sem_year + " - Balance Fee:" +selectedStudents[stuid].bal; comments [stuid] ="Call Tracking For Report Balance Fee - Sem:"+selectedStudents[stuid].Sem_year + " - Balance Fee:" +selectedStudents[stuid].bal;
} }
//console.log(selectedStudents); //console.log(selectedStudents);return false;
if(isNaN(myModel.date)){ if(isNaN(myModel.date)){
$scope.nextFollowupDate = myModel.date; $scope.nextFollowupDate = myModel.date;

5
Apollo/assets/views/report_application_pending.html
View File

@ -107,8 +107,8 @@
<th>Sem/Year</th> <th>Sem/Year</th>
<!--<th>Phone No</th>--> <!--<th>Phone No</th>-->
<th>University</th> <th>University</th>
<th style=" white-space: pre-wrap;text-align:left;width: 100px;"!important>Application Pending Status</th>
<th>Form Type</th> <th>Form Type</th>
<th style=" white-space: pre-wrap;text-align:left;width: 100px;"!important>Application Pending Status</th>
<th>Date</th> <th>Date</th>
@ -127,8 +127,9 @@
<td>{{p.Sem_Year}}</td> <td>{{p.Sem_Year}}</td>
<!--<td><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.Phone_number}}</a></td>--> <!--<td><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.Phone_number}}</a></td>-->
<td>{{p.University}}</td> <td>{{p.University}}</td>
<td>{{p.StatusName}}</td>
<td>{{p.FormType}}</td> <td>{{p.FormType}}</td>
<td>{{p.StatusName}}</td>
<td>{{p.StatusUpdationOn}}</td> <td>{{p.StatusUpdationOn}}</td>

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

@ -162,7 +162,7 @@
</thead> </thead>
<tbody current-page="currentPage"> <tbody current-page="currentPage">
<tr dir-paginate="p in returnResultData|filter:search:strict|itemsPerPage:itemsPerPage"> <tr dir-paginate="p in returnResultData|filter:search:strict|itemsPerPage:itemsPerPage">
<td><input type="checkbox" ng-checked="myModel.all" id="{{p.Student_id}}" name="{{p.Student_id}}" class="form-control" ng-click="isClick($event);" /></td> <td><input type="checkbox" ng-checked="myModel.all" id="{{p.Student_id}}" name="{{p.Student_id}}" class="form-control" ng-click="isClick($event,p.Sem_year);" /></td>
<td nowrap>{{p.SL_NO}}</td> <td nowrap>{{p.SL_NO}}</td>
<td nowrap>{{p.eid}}</td> <td nowrap>{{p.eid}}</td>
<td nowrap><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.Student_name}}</a></td> <td nowrap><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.Student_name}}</a></td>