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-09-28 17:20:39 +05:30
commit d9c8ba4cef
10 changed files with 202 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Apollo/api/application/controllers/StatusUpdation_Controller.php
View File

@ -218,6 +218,10 @@ class StatusUpdation_Controller extends REST_Controller {
$reqData = $this->post('data');
$reqDetailsFor = $this->post('statusFor');
$reqDetails = $this->post('getDetailsFor');
//print_r($reqDetails);die();
$getPrevStatusList = $this->statusupdation_model->get_prev_status_list($reqDetailsFor, $reqDetails); // Check if the employee exist
if ($getPrevStatusList) {
$getPrevStatusList['status'] = REST_Controller::HTTP_OK;

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

@ -108,9 +108,28 @@ class StatusUpdation_model extends CI_Model {
//If condition for Check ANSWERBOOKLET_STATUS, If it is null or 'Issued to Student' for do not send sms.
$answerBookletStatus = $this->getAnswerBookletStatus($arr[0]['StudentID'],$arr[0]['CourseID'],$arr[0]['BranchCode'],$arr[0]['Sem']);
//print_r($answerBookletStatus);die();
//print_r($answerBookletStatus);
// echo $answerBookletStatus['ListName'];
// die();
//echo "COURSE ====$arr[0]['CourseID']";
// echo "PARENT -- $answerBookletStatus";
$getlastansbookstatus = $this->GetLastAns_status($arr[0]['StudentID'],$arr[0]['Sem'],$arr[0]['CourseID']);
$latestappstatus='';
if(!empty($getlastansbookstatus))
{
foreach($getlastansbookstatus as $get)
{
$latestappstatus= $get->ListCode;
}
}
// echo $latestappstatus;
// die();
if($answerBookletStatus['isIssueToStudentExist'] == 0 && $answerBookletStatus['statusCount'] != 0)
{
//echo "SEND SMS";
@ -119,8 +138,11 @@ class StatusUpdation_model extends CI_Model {
$studentName = $this->getStudentName($arr[0]['StudentID']);
$CmntToMsg = $arr[0]['Comments'];
$statuToMsg = $this->get_status_name_ListCode($arr[0]['ListCode']);
// $cerNamtToMsg = $this->get_certificate_name($arr[0]['CertificationType']);
if( $statuToMsg == 'received' || $statuToMsg == 'Received' || $statuToMsg == 'RECEIVED'){
if( ($statuToMsg == 'received' || $statuToMsg == 'Received' || $statuToMsg == 'RECEIVED') && $latestappstatus == 'S057'){
$cerNamtToMsg = 'Mark Card';
$getSemYearMsg = $this->get_couser_sem_yr_msg($arr[0]['CourseID']);
$getSemYearANDType = "$getSemYearMsg $cerNamtToMsg";
@ -128,6 +150,10 @@ class StatusUpdation_model extends CI_Model {
$mesg = "$cerNamtToMsg Received - Dear $studentName, Your $getSemYearANDType had been received, Please come and collect it.";
$this->smssend($arr, $mesg);
$this->mailsend($arr, $mesg, $cerNamtToMsg);
// echo $statuToMsg;
// die();
} else if($statuToMsg == 'issued' || $statuToMsg == 'Issued' || $statuToMsg == 'ISSUED') {
$cerNamtToMsg = 'Mark Card';
$getSemYearMsg = $this->get_couser_sem_yr_msg($arr[0]['CourseID']);
@ -214,6 +240,7 @@ class StatusUpdation_model extends CI_Model {
public function get_prev_status_list($reqDetailsFor, $reqDetails) {
if ($reqDetailsFor == 'STUDY_MATERIAL') {
// echo 'in stu';die();
$searchFor = 'M001';
$searchTableFor = STUDY_MATERIAL_STATUS;
$this->db->select('t1.*, t4.Firstname, t5.ListName, t2.Sem_Year, t2.ProgramType');
@ -235,16 +262,21 @@ class StatusUpdation_model extends CI_Model {
$results['message'] = 'No record found';
}
} else if ($reqDetailsFor == 'APPICATION_STATUS') {
//echo 'in app';die();
$searchFor = 'A001';
$searchTableFor = APPLICATION_STATUS;
$this->db->select('t1.*, t4.Firstname, t5.ListName, t1.CertificationType as CertificateName');
$this->db->from('' . $searchTableFor . ' as t1');
$this->db->where('t1.StudentID', $reqDetails['student']);
$this->db->where('t1.CourseID',$reqDetails['CourseID']);
$this->db->join('' . LOGIN . ' as t3', 't3.ID = t1.CreatedBy', 'LEFT');
$this->db->join('' . STAFF . ' as t4', 't4.StaffID = t3.StaffID', 'LEFT');
$this->db->join('' . PICK_LIST_DETAILS . ' as t5', 't5.ListCode = t1.ListCode', 'LEFT');
// $this->db->join('' . CERTIFICATION . ' as t6', 't6.CertificationID = t1.CertificationType', 'LEFT');
$this->db->order_by('t1.CreatedOn', 'DESC');
$statusDetails = $this->db->get();
$prevStatusDetails = $statusDetails->result();
if (count($prevStatusDetails) > 0) {
@ -254,7 +286,13 @@ class StatusUpdation_model extends CI_Model {
$results['preStatusDetails'] = false;
$results['message'] = 'No record found';
}
//print_r($this->db->last_query());
} else if ($reqDetailsFor == 'CERTIFICATION_STATUS') {
// echo 'in cer';die();
$searchFor = 'C001';
$searchTableFor = CERTIFICATION_STATUS;
$this->db->select('t1.*, t4.Firstname, t5.ListName, t2.Sem_Year, t2.ProgramType');
@ -276,6 +314,7 @@ class StatusUpdation_model extends CI_Model {
$results['message'] = 'No record found';
}
} else if ($reqDetailsFor == 'ANSWERBOOKLET_STATUS') {
// echo 'in ans';die();
$searchFor = 'B001';
$searchTableFor = ANSWER_BOOKLET;
$this->db->select('t1.*, t4.Firstname, t5.ListName, t2.Sem_Year, t2.ProgramType');
@ -891,6 +930,9 @@ class StatusUpdation_model extends CI_Model {
//echo "FINAL RES SEND TO PARENT";
// print_r($data);
// die();
// print_r($this->db->last_query());
// die();
return $data;
}
@ -972,4 +1014,26 @@ class StatusUpdation_model extends CI_Model {
}
return $resultArr;
}
}
public function GetLastAns_status($StudentID,$Sem,$CourseID)
{
$subQuery = 'select T_AnswerBookletStatus.ListCode,ListName from T_AnswerBookletStatus
join T_PickListDetails on T_AnswerBookletStatus.ListCode=T_PickListDetails.ListCode
where T_AnswerBookletStatus.StudentID=? and
T_AnswerBookletStatus.CreatedOn=(select max(CreatedOn) from T_AnswerBookletStatus
where StudentID= ?) and Sem=? and CourseID=?';
$query = $this->db->query($subQuery,array($StudentID,$StudentID,$Sem,$CourseID));
$expense = $query->result();
return $expense;
}
}

56
Apollo/api/application/models/Student_model.php
View File

@ -74,9 +74,6 @@ class Student_model extends CI_Model {
LEFT JOIN " . COURSE . " as C ON SC.CourseID = C.CourseID AND SC.BranchID = C.BranchCode
LEFT JOIN ".STUDENTS_FEES_STATUS." as sfs on sfs.CourseID=SC.CourseID AND sfs.StudentID=SC.StudentID
and C.CourseID=sfs.CourseID
WHERE
SC.UniversityID = '$University'
AND SC.BranchID = '$loginUserBranchId'
@ -91,11 +88,6 @@ class Student_model extends CI_Model {
LEFT JOIN " . STUDENTS . " as S ON SC.StudentID = S.StudentID
LEFT JOIN " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode
LEFT JOIN " . COURSE . " as C ON SC.CourseID = C.CourseID AND SC.BranchID = C.BranchCode
LEFT JOIN ".STUDENTS_FEES_STATUS." as sfs on sfs.CourseID=SC.CourseID AND sfs.StudentID=SC.StudentID
and C.CourseID=sfs.CourseID
WHERE
@ -168,11 +160,7 @@ class Student_model extends CI_Model {
LEFT JOIN " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID LEFT JOIN " . COURSE . " as C ON
SC.CourseID = C.CourseID
LEFT JOIN ".STUDENTS_FEES_STATUS." as sfs on sfs.CourseID=SC.CourseID AND sfs.StudentID=SC.StudentID
and C.CourseID=sfs.CourseID
WHERE
SC.UniversityID = '$University'
@ -189,10 +177,7 @@ class Student_model extends CI_Model {
LEFT JOIN " . COURSE . " as C ON SC.CourseID = C.CourseID AND SC.BranchID = C.BranchCode
LEFT JOIN ".STUDENTS_FEES_STATUS." as sfs on sfs.CourseID=SC.CourseID AND sfs.StudentID=SC.StudentID
and C.CourseID=sfs.CourseID
WHERE
SC.CourseID = '$Course' AND SC.UniversityID = '$University'
@ -210,10 +195,7 @@ class Student_model extends CI_Model {
LEFT JOIN " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID LEFT JOIN " . COURSE . " as C ON
SC.CourseID = C.CourseID
LEFT JOIN ".STUDENTS_FEES_STATUS." as sfs on sfs.CourseID=SC.CourseID AND sfs.StudentID=SC.StudentID
and C.CourseID=sfs.CourseID
WHERE
@ -231,9 +213,6 @@ class Student_model extends CI_Model {
LEFT JOIN " . COURSE . " as C ON SC.CourseID = C.CourseID AND SC.BranchID = C.BranchCode
LEFT JOIN ".STUDENTS_FEES_STATUS." as sfs on sfs.CourseID=SC.CourseID AND sfs.StudentID=SC.StudentID
and C.CourseID=sfs.CourseID
WHERE
@ -369,8 +348,6 @@ class Student_model extends CI_Model {
LEFT JOIN " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode
LEFT JOIN " . COURSE . " as C ON SC.CourseID = C.CourseID AND SC.BranchID = C.BranchCode
LEFT JOIN ".STUDENTS_FEES_STATUS." as sfs on sfs.CourseID=SC.CourseID AND sfs.StudentID=SC.StudentID
and C.CourseID=sfs.CourseID
WHERE
SC.UniversityID = '$University'
@ -384,8 +361,6 @@ class Student_model extends CI_Model {
LEFT JOIN " . UNIVERSITY . " as U ON SC.UniversityID = U.UniversityID AND SC.BranchID = U.BranchCode
LEFT JOIN " . COURSE . " as C ON SC.CourseID = C.CourseID AND SC.BranchID = C.BranchCode
LEFT JOIN ".STUDENTS_FEES_STATUS." as sfs on sfs.CourseID=SC.CourseID AND sfs.StudentID=SC.StudentID
and C.CourseID=sfs.CourseID
WHERE
SC.CourseID = '$Course' AND SC.UniversityID = '$University'
@ -449,10 +424,6 @@ class Student_model extends CI_Model {
LEFT JOIN " . COURSE . " as C ON SC.CourseID = C.CourseID AND SC.BranchID = C.BranchCode
LEFT JOIN ".STUDENTS_FEES_STATUS." as sfs on sfs.CourseID=SC.CourseID AND sfs.StudentID=SC.StudentID
and C.CourseID=sfs.CourseID
WHERE
SC.UniversityID = '$University'
AND SC.BranchID = '$loginUserBranchId'
@ -468,11 +439,6 @@ class Student_model extends CI_Model {
LEFT JOIN " . COURSE . " as C ON SC.CourseID = C.CourseID AND SC.BranchID = C.BranchCode
LEFT JOIN ".STUDENTS_FEES_STATUS." as sfs on sfs.CourseID=SC.CourseID AND sfs.StudentID=SC.StudentID
and C.CourseID=sfs.CourseID
WHERE
SC.CourseID = '$Course' AND SC.UniversityID = '$University'
AND SC.BranchID = '$loginUserBranchId'
@ -597,9 +563,6 @@ class Student_model extends CI_Model {
LEFT JOIN " . STUDENTS_FEES_PAID . " as SFP ON SFP.StudentID = S.StudentID
LEFT JOIN ".STUDENTS_FEES_STATUS." as sfs on sfs.CourseID=SC.CourseID AND sfs.StudentID=SC.StudentID
and C.CourseID=sfs.CourseID
WHERE
SC.UniversityID = '$University'
AND SC.BranchID = '$loginUserBranchId'
@ -613,9 +576,7 @@ class Student_model extends CI_Model {
LEFT JOIN " . COURSE . " as C ON SC.CourseID = C.CourseID AND SC.BranchID = C.BranchCode
LEFT JOIN " . STUDENTS_FEES_PAID . " as SFP ON SFP.StudentID = S.StudentID
LEFT JOIN ".STUDENTS_FEES_STATUS." as sfs on sfs.CourseID=SC.CourseID AND sfs.StudentID=SC.StudentID
and C.CourseID=sfs.CourseID
WHERE
SC.CourseID = '$Course' AND SC.UniversityID = '$University'
@ -697,11 +658,6 @@ class Student_model extends CI_Model {
LEFT JOIN " . COURSE . " as C ON SC.CourseID = C.CourseID AND SC.BranchID = C.BranchCode
LEFT JOIN " . STUDENTS_FEES_PAID . " as SFP ON SFP.StudentID = S.StudentID
LEFT JOIN ".STUDENTS_FEES_STATUS." as sfs on sfs.CourseID=SC.CourseID AND sfs.StudentID=SC.StudentID
and C.CourseID=sfs.CourseID
WHERE
@ -718,10 +674,6 @@ class Student_model extends CI_Model {
LEFT JOIN " . COURSE . " as C ON SC.CourseID = C.CourseID AND SC.BranchID = C.BranchCode
LEFT JOIN " . STUDENTS_FEES_PAID . " as SFP ON SFP.StudentID = S.StudentID
LEFT JOIN ".STUDENTS_FEES_STATUS." as sfs on sfs.CourseID=SC.CourseID AND sfs.StudentID=SC.StudentID
and C.CourseID=sfs.CourseID
WHERE
SC.CourseID = '$Course' AND SC.UniversityID = '$University'

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

@ -460,6 +460,11 @@ app.controller('certificateStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
$scope.prevStatusListForStudentCourseLoading = false;
$scope.prevStatusListForStudentCourse = response.data.preStatus_details_list;
$scope.prevNoRecordFound = false;
console.log($scope.prevStatusListForStudentCourse)
} else {
$scope.prevStatusListForStudentCourseLoading = false;
$scope.prevStatusListForStudentCourseNoRecord = true;

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

@ -814,6 +814,9 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n
"date":$filter('date')(new Date(), 'dd-MM-yyyy')
};
//console.log($scope.updateModel);
/* $scope.billCurrentDate=$filter('date')(new Date(), 'dd-MM-yyyy');
alert($scope.billCurrentDate);*/

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

@ -242,7 +242,9 @@ app.controller('markcardStatusCtrl', ["$scope", "toaster", "$filter", "ngTablePa
// Select one row in a table once
$scope.setOneSelect = function (value) {
// alert();
// alert();
// return false;
angular.forEach($scope.searchResultDetails, function (item) {
item.Selected = false;
});
@ -366,6 +368,9 @@ app.controller('markcardStatusCtrl', ["$scope", "toaster", "$filter", "ngTablePa
// Update the status For Certification
$scope.statusUpdate = {
submit: function (form, myStatusModel, localBranchDetails) {
// alert('in');
// return false;
var firstError = null;
if (form.$invalid) {
var field = null, firstError = null;

109
Apollo/assets/views/partials/nav.html
View File

@ -1392,6 +1392,115 @@
</ul>
</li>
<li ng-class="{'active open':$state.includes('app.reports')}">
<a href="javascript:void(0)">
<div class="item-content">
<div class="item-media">
<i class="ti-bar-chart"></i>
</div>
<div class="item-inner">
<span class="title" translate="sidebar.nav.report.TITLE"> REPORTS </span><i class="icon-arrow"></i>
</div>
</div>
</a>
<ul class="sub-menu">
<li ui-sref-active="active">
<a ui-sref="app.reports.studymaterial" ng-click="checkStaff()">
<span class="title" translate="sidebar.nav.report.studmatstatus">Study Material Status</span>
</a>
</li>
<li ui-sref-active="active">
<a ui-sref="app.reports.markcard" ng-click="checkStaff()">
<span class="title" translate="sidebar.nav.report.mstatus">Mark Card Status</span>
</a>
</li>
<li ui-sref-active="active">
<a ui-sref="app.reports.certificate" ng-click="checkStaff()">
<span class="title" translate="sidebar.nav.report.certificate_status">Certificate Status</span>
</a>
</li>
<li ui-sref-active="active">
<a ui-sref="app.reports.mark_certificate" ng-click="checkStaff()">
<span class="title" translate="sidebar.nav.report.certificate_mark_status">Markcard and Certificate Status</span>
</a>
</li>
<!-- <li ui-sref-active="active">
<a ui-sref="app.reports.expense" ng-click="checkStaff()">
<span class="title" translate="sidebar.nav.report.expense">Expense Report</span>
</a>
</li> -->
<li ui-sref-active="active">
<a ui-sref="app.reports.answer_booklets" ng-click="checkStaff()">
<span class="title" translate="sidebar.nav.report.answer_booklets">Answer Booklets Status Report</span>
</a>
</li>
<li ui-sref-active="active">
<a ui-sref="app.reports.app_pending" ng-click="checkStaff()">
<span class="title" translate="sidebar.nav.report.app_pending">New & Re-Reg Form Status Report</span>
</a>
</li>
<li ui-sref-active="active">
<a ui-sref="app.reports.app_pending_old" ng-click="checkStaff()">
<span class="title" translate="sidebar.nav.report.app_pending_old">Application Status List Report(Old Data)</span>
</a>
</li>
<li ui-sref-active="active">
<a ui-sref="app.reports.doc_pending" ng-click="checkStaff()">
<span class="title" translate="sidebar.nav.report.doc_pending">Document Pending Student List Report</span>
</a>
</li>
<!-- <li ui-sref-active="active">
<a ui-sref="app.reports.wav_ref" ng-click="checkStaff()">
<span class="title" translate="sidebar.nav.report.wav_ref">Waiver and Referal Report</span>
</a>
</li>
<li ui-sref-active="active">
<a ui-sref="app.reports.examfee" ng-click="checkStaff()">
<span class="title" translate="sidebar.nav.report.examfee">Exam Writing Fee Report</span>
</a>
</li> -->
<li ui-sref-active="active">
<a ui-sref="app.reports.balfee" ng-click="checkStaff()">
<span class="title" translate="sidebar.nav.report.balfee">Balance Fee Report</span>
</a>
</li>
<!-- <li ui-sref-active="active">
<a ui-sref="app.reports.lead" ng-click="checkStaff()">
<span class="title" translate="sidebar.nav.report.lead">Lead Tracking Report</span>
</a>
</li>
<li ui-sref-active="active">
<a ui-sref="app.reports.newreg" ng-click="checkStaff()">
<span class="title" translate="sidebar.nav.report.newreg">New Registration</span>
</a>
</li>
<li ui-sref-active="active">
<a ui-sref="app.reports.feeCollect" ng-click="checkStaff()">
<span class="title" translate="sidebar.nav.report.feeCollect">Report For Fees Collection</span>
</a>
</li> -->
</ul>
</li>
<li ng-class="{'active open':$state.includes('app.formupload')}">
<a href="javascript:void(0)">
<div class="item-content">

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

@ -189,7 +189,7 @@
<input type="text" placeholder="Enter Total Amount"
autofocus tabindex="15" class="form-control" name="total" id="total" ng-maxlength="9"
ng-model="updateModel.feesType.BalanceAmount" ng-pattern="/^[0-9]*$/" readonly/>
ng-model="updateModel.feesType.PayableFees" ng-pattern="/^[0-9]*$/" readonly/>
<span class="error text-small block"
ng-if="Form.total.$dirty && Form.total.$invalid"
ng-hide="Form.total.$error.maxlength || Form.total.$error.pattern">Total amount is required</span>
@ -283,7 +283,7 @@
<input type="text" placeholder="Enter Fees Amount"
autofocus tabindex="19" class="form-control" name="billAmount" id="billAmount" ng-maxlength="9"
ng-model="updateModel.billAmount" ng-pattern="/^[0-9]*$/" required/>
<b><span style="font-size: 11px;color:red;">Total Payable:</span><span style="font-size: 11px;color: black;">Rs.{{payableAmtInfo}}</span></b>
<b><span style="font-size: 11px;color:red;">Balance Payable Fee:</span><span style="font-size: 11px;color: black;">Rs.{{payableAmtInfo}}</span></b>
<span class="error text-small block"
ng-if="Form.billAmount.$dirty && Form.billAmount.$invalid"
ng-hide="Form.billAmount.$error.maxlength || Form.billAmount.$error.pattern">Bill amount is required</span>

2
Apollo/assets/views/student/student_details.html
View File

@ -279,7 +279,7 @@
</style>
<tab heading="New/Re-Reg Forms" id="addstudent" ng-click="addStudentView()">
<tab heading="Add Student" id="addstudent" ng-click="addStudentView()">
<div ng-hide="inActiveBranchStatus == true">
<div ng-if="existingStudentView == false">
<form name="Form" id="form" novalidate ng-submit="studentFORM.submit(Form, myModel)" method="post">

2
Apollo/assets/views/student/student_details_SuperAdmin.html
View File

@ -312,7 +312,7 @@
</style>
<tab tabindex="6" active="tabactive2" ng-click="tabActive('tabactive1');addStudentView()" heading="New/Re-Reg Forms" id="addstudent">
<tab tabindex="6" active="tabactive2" ng-click="tabActive('tabactive1');addStudentView()" heading="Add Student" id="addstudent">
<!--<button ng-click="tabActive('0')" value="Tab1">Tab1</button>-->
<div ng-if="existingStudentView == false">
<!--<button ng-click="myActivateDiv()">Click Me</button>-->