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:
gandhimathi 2018-10-16 14:49:26 +05:30
commit a7129dfdde
7 changed files with 97 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
Apollo/api/application/models/DayBook_model.php
View File

@ -1035,21 +1035,37 @@ public function GetPLexcelDetails($from,$to,$branch)
$subQuery='select Name,ListName,Date,T_Income_Outcome_Master.ID,T_Income_Outcome_Master.TypeID as OrgType,T_Income_Outcome_Master.TypeName,
SUM(IF(q.Name=? and TypeID =?,Amount,0)) AS OperationalIncome,
SUM(IF(q.Name=? and TypeID = ?,Amount,0)) AS OperationalExpense,
SUM(IF(q.Name=? and TypeID != ?,Amount,0)) AS NonOperationalIncome,
SUM(IF(q.Name=? and TypeID != ?,Amount,0)) AS NonOperationalExpense
from T_NonOperationalMaster as q
Join T_Income_Outcome_Master on T_Income_Outcome_Master.ID= q.Type
Join T_PickListDetails on T_PickListDetails.ListCode=q.Name
where str_to_date(Date,?)>=? and str_to_date(Date,?)<=? and q.BranchCode=? group by Name,Month(str_to_date(Date,?));';
// $subQuery='select Name,ListName,Date,T_Income_Outcome_Master.ID,T_Income_Outcome_Master.TypeID as OrgType,T_Income_Outcome_Master.TypeName,
// SUM(IF(q.Name=? and TypeID =?,Amount,0)) AS OperationalIncome,
// SUM(IF(q.Name=? and TypeID = ?,Amount,0)) AS OperationalExpense,
// SUM(IF(q.Name=? and TypeID != ?,Amount,0)) AS NonOperationalIncome,
// SUM(IF(q.Name=? and TypeID != ?,Amount,0)) AS NonOperationalExpense
// from T_NonOperationalMaster as q
// Join T_Income_Outcome_Master on T_Income_Outcome_Master.ID= q.Type
// Join T_PickListDetails on T_PickListDetails.ListCode=q.Name
// where str_to_date(Date,?)>=? and str_to_date(Date,?)<=? and q.BranchCode=? group by Name,Month(str_to_date(Date,?));';
$query = $this->db->query($subQuery,array('I002','I002','I001','I001','I002','I002','I001','I001','%d-%m-%Y',$fromd,'%d-%m-%Y',$tod,$branch,'%d-%m-%Y'));
// $query = $this->db->query($subQuery,array('I002','I002','I001','I001','I002','I002','I001','I001','%d-%m-%Y',$fromd,'%d-%m-%Y',$tod,$branch,'%d-%m-%Y'));
$subQuery='select Name,ListName,q.Date as dat,month(str_to_date(Date,?)) as month,year(str_to_date(Date,?)) as Year,
T_Income_Outcome_Master.ID,T_Income_Outcome_Master.TypeID as OrgType,T_Income_Outcome_Master.TypeName,
SUM(IF(q.Name=? and TypeID =?,Amount,0)) AS OperationalIncome,
SUM(IF(q.Name=? and TypeID = ?,Amount,0)) AS OperationalExpense,
SUM(IF(q.Name=? and TypeID != ?,Amount,0)) AS NonOperationalIncome,
SUM(IF(q.Name=? and TypeID != ?,Amount,0)) AS NonOperationalExpense,
(SUM(IF(q.Name=? and TypeID =?,Amount,0))+SUM(IF(q.Name=? and TypeID != ?,Amount,0)))-
(SUM(IF(q.Name=? and TypeID = ?,Amount,0))+SUM(IF(q.Name=? and TypeID != ?,Amount,0))) as Net
from T_NonOperationalMaster as q
left Join T_Income_Outcome_Master on T_Income_Outcome_Master.ID= q.Type
left Join T_PickListDetails on T_PickListDetails.ListCode=q.Name
where str_to_date(Date,?)>=? and str_to_date(Date,?)<=?
and q.BranchCode=? group by month';
$query = $this->db->query($subQuery,array('%d-%m-%Y','%d-%m-%Y','I002','I002','I001','I001','I002','I002','I001','I001','I002','I002','I002','I002','I001','I001','I001','I001','%d-%m-%Y',$fromd,'%d-%m-%Y',$tod,$branch));
// $query = $this->db->query($subQuery,array('%d-%m-%Y',$fromd,'%d-%m-%Y',$tod,'1',$branch,'%d-%m-%Y','%d-%m-%Y',$fromd,'%d-%m-%Y',$tod,$branch,'%d-%m-%Y'));
// print_r($this->db->last_query()); die();
$expenseNon = $query->result();

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

@ -1041,7 +1041,7 @@ class Fees_status_model extends CI_Model
$myArray = array();
if($endFeesDetails->result()){
foreach ($endFeesDetails->result() as $value ){
$pc_array = array('CourseID'=>$value->CourseID,'Sem_Year'=>'PC', 'ActualFees'=>$value->PC);
$pc_array = array('CourseID'=>$value->CourseID,'Sem_Year'=>'PPC', 'ActualFees'=>$value->PC);
$tc_array = array('CourseID'=>$value->CourseID,'Sem_Year'=>'TC', 'ActualFees'=>$value->TC);
$dc_array = array('CourseID'=>$value->CourseID,'Sem_Year'=>'DC', 'ActualFees'=>$value->DC);
$mc_array = array('CourseID'=>$value->CourseID,'Sem_Year'=>'MC', 'ActualFees'=>$value->MC);
@ -1264,7 +1264,7 @@ class Fees_status_model extends CI_Model
$fromd= date("d-m-Y",strtotime($details['CreatedOn']));
if(($details['FeesType']=='PC') || ($details['FeesType']=='TC')|| ($details['FeesType']=='MC')
if(($details['FeesType']=='PPC') || ($details['FeesType']=='TC')|| ($details['FeesType']=='MC')
|| ($details['FeesType'] == 'DC'))
{

71
Apollo/api/application/models/StatusUpdation_model.php
View File

@ -117,18 +117,19 @@ class StatusUpdation_model extends CI_Model {
$getlastansbookstatus = $this->GetLastAns_status($arr[0]['StudentID'],$arr[0]['Sem'],$arr[0]['CourseID']);
$latestappstatus='';
if(!empty($getlastansbookstatus))
{
// $latestappstatus='';
// if(!empty($getlastansbookstatus))
// {
foreach($getlastansbookstatus as $get)
{
$latestappstatus= $get->ListCode;
}
}
// foreach($getlastansbookstatus as $get)
// {
// $latestappstatus= $get->ListCode;
// }
// }
$upperresult=strtoupper($getlastansbookstatus);
// echo $latestappstatus;
// echo $upperresult;
// die();
if($answerBookletStatus['isIssueToStudentExist'] == 0 && $answerBookletStatus['statusCount'] != 0)
{
@ -138,11 +139,12 @@ $latestappstatus='';
$studentName = $this->getStudentName($arr[0]['StudentID']);
$CmntToMsg = $arr[0]['Comments'];
$statuToMsg = $this->get_status_name_ListCode($arr[0]['ListCode']);
//echo $latestappstatus;die();
// $cerNamtToMsg = $this->get_certificate_name($arr[0]['CertificationType']);
if( ($statuToMsg == 'received' || $statuToMsg == 'Received' || $statuToMsg == 'RECEIVED') && $latestappstatus == 'S057'){
if( ($statuToMsg == 'received' || $statuToMsg == 'Received' || $statuToMsg == 'RECEIVED') && $upperresult == 'RECEIVED'){
// echo 'if';die();
$cerNamtToMsg = 'Mark Card';
$getSemYearMsg = $this->get_couser_sem_yr_msg($arr[0]['CourseID']);
$getSemYearANDType = "$getSemYearMsg $cerNamtToMsg";
@ -155,6 +157,8 @@ $latestappstatus='';
// echo $statuToMsg;
// die();
} else if($statuToMsg == 'issued' || $statuToMsg == 'Issued' || $statuToMsg == 'ISSUED') {
echo 'else if';die();
$cerNamtToMsg = 'Mark Card';
$getSemYearMsg = $this->get_couser_sem_yr_msg($arr[0]['CourseID']);
$getSemYearANDType = "$getSemYearMsg $cerNamtToMsg";
@ -189,7 +193,7 @@ $latestappstatus='';
// $this->db->join('T_Course_Fees_Details as CFD', 'CFD.ID = SFS.FeeType');
// $this->db->join('T_Students_Fees_Status as SFS', 'SFS.StudentID = $sutendDetail');
// $this->db->join( '' . CERTIFICATION . ' as CFR', 'CFR.CertificateName = SFS.FeesType');
$where = '(SFS.FeesType="PC" or SFS.FeesType = "DC" or SFS.FeesType = "TC" or SFS.FeesType = "MC" or SFS.FeesType = "OTHER")';
$where = '(SFS.FeesType="PPC" or SFS.FeesType = "DC" or SFS.FeesType = "TC" or SFS.FeesType = "MC" or SFS.FeesType = "OTHER" or SFS.FeesType="PC")';
$this->db->where($where);
$this->db->where('SFS.StudentID',$sutendDetail);
@ -616,6 +620,8 @@ $latestappstatus='';
// Your new password for logging into Apollo student portal is (Password). Please change the password as soon as you login.
// This is the template to be used.
public function smssend($arr, $msg) {
$number = array();
foreach ($arr as $ar) {
$mobi = $this->get_registered_mobile($ar['StudentID']);
@ -1082,7 +1088,42 @@ $this->db->insert_batch('T_BroadcastStatus', $data);
$expense = $query->result();
return $expense;
//print_r($expense);die();
$latestappstatus='';
if(!empty($expense))
{
foreach($expense as $get)
{
$latestappstatus= $get->ListCode;
}
}
//echo $latestappstatus;die();
$this->db->select('ListCode,ListName');
$this->db->from('T_PickListDetails');
$this->db->where('T_PickListDetails.ListCode',$latestappstatus);
$Type = $this->db->get();
$TypeName = $Type->result();
$LastListname='';
foreach($TypeName as $ty)
{
$LastListname= $ty->ListName;
}
//echo $LastListname;die();
return $LastListname;
}
}

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

@ -105,6 +105,8 @@ app.controller('certificateStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
if (response.data.certificateStatus) {
$scope.certificateDatas = response.data.certificate_details;
// alert(JSON.stringify($scope.certificateData));
console.log($scope.certificateDatas);
} else {
}
});

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

@ -1279,7 +1279,7 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n
$scope.changeInstallemt = function (model,form) {
//alert('in')
if(model.Sem_Year!='TC' && model.Sem_Year!='PC' && model.Sem_Year!='DC' && model.Sem_Year!='MC' && model.Sem_Year!='OTHER'){
if(model.Sem_Year!='TC' && model.Sem_Year!='PPC' && model.Sem_Year!='DC' && model.Sem_Year!='MC' && model.Sem_Year!='OTHER'){
$scope.BatchDetails=[];
$rootScope.updateMoreItems=[];
angular.forEach(model.batchDetails,function (values,key) {

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

@ -379,12 +379,15 @@ app.controller('income_reportCtrl', ["$scope","$rootScope","toaster", "$filter",
{
NonOperationalExpense:"Grand Total",
ListName: $scope.Net_Total
Net: $scope.Net_Total
}
$scope.expense = $scope.PLexceldetails.concat($scope.grandTot);
alasql('SELECT Date,OperationalIncome,NonOperationalIncome,OperationalExpense,NonOperationalExpense,ListName as Type INTO XLS("Income Expense report.xls",?) FROM ?',[mystyle,$scope.expense]);
for (var i = 0; i < $scope.PLexceldetails.length; i++)
$scope.expense[i].SL_NO = i + 1;
alasql('SELECT SL_NO,concat(month,"/",Year)as Date,OperationalIncome,NonOperationalIncome,OperationalExpense,NonOperationalExpense,Net as Profit_or_Loss INTO XLS("Income Expense report.xls",?) FROM ?',[mystyle,$scope.expense]);
};

8
Apollo/assets/views/status-update/setFeesForStudent.html
View File

@ -39,7 +39,7 @@
<!-- {{readonlycheck}} -->
<div class="col-md-3 form-group"
ng-class="{'has-error':Form.batchCode.$dirty && Form.batchCode.$invalid, 'has-success':Form.batchCode.$valid}" ng-if="setModel.feesType.Sem_Year!='TC' && setModel.feesType.Sem_Year!='PC' && setModel.feesType.Sem_Year!='DC' && setModel.feesType.Sem_Year!='MC' && setModel.feesType.Sem_Year!='OTHER'">
ng-class="{'has-error':Form.batchCode.$dirty && Form.batchCode.$invalid, 'has-success':Form.batchCode.$valid}" ng-if="setModel.feesType.Sem_Year!='TC' && setModel.feesType.Sem_Year!='PPC' && setModel.feesType.Sem_Year!='DC' && setModel.feesType.Sem_Year!='MC' && setModel.feesType.Sem_Year!='OTHER'">
<label>
Batch <span class="symbol required"></span>
</label>
@ -52,7 +52,7 @@
<span class="error text-small block"
ng-if="Form.batchCode.$dirty && Form.batchCode.$invalid">Batch is required</span>
</div>
<div class="col-md-3 form-group" ng-if="setModel.feesType.Sem_Year=='TC' || setModel.feesType.Sem_Year=='PC' || setModel.feesType.Sem_Year=='DC' || setModel.feesType.Sem_Year=='MC' || setModel.feesType.Sem_Year=='OTHER'">
<div class="col-md-3 form-group" ng-if="setModel.feesType.Sem_Year=='TC' || setModel.feesType.Sem_Year=='PPC' || setModel.feesType.Sem_Year=='DC' || setModel.feesType.Sem_Year=='MC' || setModel.feesType.Sem_Year=='OTHER'">
<label>
Batch
</label>
@ -71,7 +71,7 @@
<div class="col-md-3 form-group"
ng-class="{'has-error':Form.setsessionname.$dirty && Form.setsessionname.$invalid, 'has-success':Form.setsessionname.$valid}" ng-if="setModel.feesType.Sem_Year!='TC' && setModel.feesType.Sem_Year!='PC' && setModel.feesType.Sem_Year!='DC' && setModel.feesType.Sem_Year!='MC' && setModel.feesType.Sem_Year!='OTHER'">
ng-class="{'has-error':Form.setsessionname.$dirty && Form.setsessionname.$invalid, 'has-success':Form.setsessionname.$valid}" ng-if="setModel.feesType.Sem_Year!='TC' && setModel.feesType.Sem_Year!='PPC' && setModel.feesType.Sem_Year!='DC' && setModel.feesType.Sem_Year!='MC' && setModel.feesType.Sem_Year!='OTHER'">
<!-- <label ng-if="setModel.feesType.ProgramType=='P001' || setModel.feesType.ProgramType=='P002'">
Session From <span class="symbol required"></span>
</label>
@ -112,7 +112,7 @@
ng-if="Form.settosessionname.$dirty && Form.settosessionname.$invalid">Session is required</span>
</div>
<div class="col-md-3 form-group"
ng-if="setModel.feesType.Sem_Year=='TC' || setModel.feesType.Sem_Year=='PC' || setModel.feesType.Sem_Year=='DC' || setModel.feesType.Sem_Year=='MC' || setModel.feesType.Sem_Year=='OTHER'">
ng-if="setModel.feesType.Sem_Year=='TC' || setModel.feesType.Sem_Year=='PPC' || setModel.feesType.Sem_Year=='DC' || setModel.feesType.Sem_Year=='MC' || setModel.feesType.Sem_Year=='OTHER'">
<label>
Session
</label>