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

call tracking undefined issue fixed

Browse Source
This commit is contained in:
gandhimathi 2018-09-03 17:55:39 +05:30
parent 4647679a87
commit 5c60bda053
5 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -251,9 +251,9 @@ left join
} }
public function mark_cert_status($bat=null,$br=null,$u=null,$from=null,$to=null){ public function mark_cert_status($bat=null,$br=null,$u=null,$from=null,$to=null){
$sql = "select sms.ID,sms.sid,sms.cid,sms.fid,sms.sem as Sem_year,sms.certname as Certificate_name,sms.ctype, $sql = "select sms.ID,sms.sid,sms.cid,sms.fid,sms.sem as Sem_year,ifnull(sms.certname,'-') as Certificate_name,sms.ctype,
sms.issuedate,sms.istatus, sms.issuedate,sms.istatus,
ifnull(sms.rcvedate,'-') as rdate,sms.rstatus,sms.acmts,sms.balance as Balance_fee,std.name as Student_name,std.father as Father_name,std.phone as Phone_number,cm.course as Course_name,cm.uname as University,mdate,ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber ifnull(sms.rcvedate,'-') as rdate,ifnull(sms.rstatus,'-') as rstatus,sms.acmts,ifnull(sms.balance,0) as Balance_fee,std.name as Student_name,std.father as Father_name,std.phone as Phone_number,cm.course as Course_name,cm.uname as University,mdate,ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber
from from
(select c.ID,c.StudentID as sid,sfs.CourseID as cid,sfs.BranchCode as branch,sfs.FeesID as fid,Sem as sem,c.CertificationType as certname,c.CertificationType as ctype,CDate as mdate,balpayable as balance, (select c.ID,c.StudentID as sid,sfs.CourseID as cid,sfs.BranchCode as branch,sfs.FeesID as fid,Sem as sem,c.CertificationType as certname,c.CertificationType as ctype,CDate as mdate,balpayable as balance,
max(if(ListName = 'ISSUED TO STUDENT', CDate,'-')) as issuedate,max(if(ListName = 'ISSUED TO STUDENT', ListName,'-')) as istatus, max(if(ListName = 'ISSUED TO STUDENT', CDate,'-')) as issuedate,max(if(ListName = 'ISSUED TO STUDENT', ListName,'-')) as istatus,

7
Apollo/assets/js/controllers/feesStatusCtrl.js
View File

@ -2319,7 +2319,8 @@ app.controller('FeesModalInstanceCtrl', ["$scope", "$modalInstance", "$timeout",
$scope.receiptNo=pdfValue.ReceiptNo; $scope.receiptNo=pdfValue.ReceiptNo;
$scope.cur_url = window.location.hostname + window.location.pathname; $scope.cur_url = window.location.hostname + window.location.pathname;
console.log($scope.cur_url);
console.log($scope.BranchLogo);
} }
//testing for print //testing for print
@ -2329,10 +2330,10 @@ app.controller('FeesModalInstanceCtrl', ["$scope", "$modalInstance", "$timeout",
var printHtml = document.getElementById(print).outerHTML; var printHtml = document.getElementById(print).outerHTML;
//var currentPage = document.body.innerHTML; //var currentPage = document.body.innerHTML;
var popupWinindow = window.open('', '_blank', 'width=1200,height=700,scrollbars=no,menubar=no,toolbar=no,location=no,status=no,titlebar=no'); var popupWinindow = window.open('', '_blank', 'width=1200,height=700,scrollbars=no,menubar=no,toolbar=no,location=no,status=no,titlebar=no');
var elementPage = '<html><head><style type="text/css" media="print">@media print {#Header, #Footer { display:none !important; }}</style></head><body>' + printHtml + '<br><br>' + printHtml + '</body>'; var elementPage = '<html><head><style type="text/css" media="print"></style></head><body>' + printHtml + '<br><br><br><br><br><br>' + printHtml + '</body>';
popupWinindow.document.body.innerHTML = elementPage;
popupWinindow.document.body.innerHTML = elementPage; popupWinindow.document.body.innerHTML = elementPage;
popupWinindow.print(); popupWinindow.print();
popupWinindow.document.body.innerHTML = elementPage;
//window.location.reload(); //window.location.reload();
popupWinindow.document.close(); popupWinindow.document.close();
} }

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

@ -300,7 +300,7 @@ app.controller('report_certificateCtrl', ["$scope", "$filter","$rootScope","$mod
//console.log(selectedStudents); //console.log(selectedStudents);
var comments = []; var comments = [];
for(var stuid=0;stuid<=selectedStudents.length-1;stuid++){ for(var stuid=0;stuid<=selectedStudents.length-1;stuid++){
comments [stuid] ="Call Tracking For Report Certificate Status - DocumentName:"+selectedStudents[stuid].Certificate_name + " - Status:" +selectedStudents[stuid].Certificate_status + " - Date:" +selectedStudents[stuid].Certificate_date; comments [stuid] ="Call Tracking For Report Certificate Status - DocumentName:"+selectedStudents[stuid].certname + " - Status:" +selectedStudents[stuid].status + " - Date:" +selectedStudents[stuid].adate;
} }
if(isNaN(myModel.date)){ if(isNaN(myModel.date)){
$scope.nextFollowupDate = myModel.date; $scope.nextFollowupDate = myModel.date;

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

@ -175,7 +175,7 @@ app.controller('report_markcard_certificateCtrl', ["$scope", "$filter","$rootSco
$scope.exportData = function () { $scope.exportData = function () {
alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Student_name as StudentName,Father_name as FatherName,CAST(Phone_number AS NUMBER) as PhoneNumber,University as University,course_name as CourseName,Sem_year as SemYear,Certificate_name as CertificateName,rstatus as ReceivedStatus,rcvedate as ReceivedDate,istatus as IssuedStatus,issuedate as IssuedDate,acmts as CertificateIssuedComments,CAST(Balance_fee AS NUMBER) as BalanceFee INTO XLS("Markcard/Certificate_status.xls",?) FROM ?',[mystyle,$scope.mark_cert_data]); alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Student_name as StudentName,Father_name as FatherName,CAST(Phone_number AS NUMBER) as PhoneNumber,University as University,course_name as CourseName,Sem_year as SemYear,Certificate_name as CertificateName,rstatus as ReceivedStatus,rdate as ReceivedDate,istatus as IssuedStatus,issuedate as IssuedDate,acmts as CertificateIssuedComments,CAST(Balance_fee AS NUMBER) as BalanceFee INTO XLS("Markcard/Certificate_status.xls",?) FROM ?',[mystyle,$scope.mark_cert_data]);
}; };
/** /**
* Auto Call Tracking Sriram * Auto Call Tracking Sriram
@ -310,7 +310,7 @@ app.controller('report_markcard_certificateCtrl', ["$scope", "$filter","$rootSco
//console.log(selectedStudents); //console.log(selectedStudents);
var comments = []; var comments = [];
for(var stuid=0;stuid<=selectedStudents.length-1;stuid++){ for(var stuid=0;stuid<=selectedStudents.length-1;stuid++){
comments [stuid] ="Call Tracking For Report Certificate Status - SemYear:"+selectedStudents[stuid].Sem_year + " - Balance:" +selectedStudents[stuid].Balance_fee + " - CertificateName:" +selectedStudents[stuid].Certificate_name + " - ReceivedStatus:" +selectedStudents[stuid].rstatus + " - ReceivedDate:" +selectedStudents[stuid].rdate; comments [stuid] ="Call Tracking For Report Markcard/Certificate Status - SemYear:"+selectedStudents[stuid].Sem_year + " - Balance:" +selectedStudents[stuid].Balance_fee + " - CertificateName:" +selectedStudents[stuid].Certificate_name + " - ReceivedStatus:" +selectedStudents[stuid].rstatus + " - ReceivedDate:" +selectedStudents[stuid].rdate;
} }
if(isNaN(myModel.date)){ if(isNaN(myModel.date)){
$scope.nextFollowupDate = myModel.date; $scope.nextFollowupDate = myModel.date;

4
Apollo/assets/views/status-update/updateFeesStatus.html
View File

@ -455,14 +455,14 @@
<tr class="title-row" style="height: 15px;"> <tr class="title-row" style="height: 15px;">
<td class="title-branch" ng-if="BranchLogo=='' || BranchLogo==null" style="width: 136px; height: 82px; color: white; font-size: 22px; text-align: center;" rowspan="3"> <td class="title-branch" ng-if="BranchLogo=='' || BranchLogo==null" style="width: 136px; height: 82px; color: white; font-size: 22px; text-align: center;" rowspan="3">
<div class="user-image"> <div class="user-image">
<img class="pull-center" ng-src="http://{{cur_url}}assets/images/logo1.png" alt="APP"> <img class="pull-center" ng-src="http://{{cur_url}}assets/images/logo1.png" alt="APP">
<!-- <img ng-src="{{userInfo.avatar}}" alt="" ng-if="!obj.flow.files.length && !noImage"> <!-- <img ng-src="{{userInfo.avatar}}" alt="" ng-if="!obj.flow.files.length && !noImage">
<img flow-img="obj.flow.files[0]" ng-if="obj.flow.files.length">--> <img flow-img="obj.flow.files[0]" ng-if="obj.flow.files.length">-->
</div> </div>
</td> </td>
<td class="title-branch" ng-if="BranchLogo!='' && BranchLogo!=null" style="width: 136px; height: 82px; color: white; font-size: 22px; text-align: center;" rowspan="3"> <td class="title-branch" ng-if="BranchLogo!='' && BranchLogo!=null" style="width: 136px; height: 82px; color: white; font-size: 22px; text-align: center;" rowspan="3">
<div class="user-image"> <div class="user-image">
<img class="pull-center" ng-src="http://{{cur_url}}images/{{BranchLogo}}" alt="APP"> <img class="pull-center" style="width:150px;height:90px;" ng-src="http://{{cur_url}}images/{{BranchLogo}}" alt="APP">
<!-- <img ng-src="{{userInfo.avatar}}" alt="" ng-if="!obj.flow.files.length && !noImage"> <!-- <img ng-src="{{userInfo.avatar}}" alt="" ng-if="!obj.flow.files.length && !noImage">
<img flow-img="obj.flow.files[0]" ng-if="obj.flow.files.length">--> <img flow-img="obj.flow.files[0]" ng-if="obj.flow.files.length">-->
</div> </div>