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-08-29 13:57:20 +05:30
commit 82badf2fc1
10 changed files with 904 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Apollo/api/application/config/routes.php
View File

@ -330,6 +330,7 @@ $route['report_markcard_certificate'] = 'Report/mark_cert';
$route['report_expense'] = 'Report/expense';
$route['report_answer_booklet'] = 'Report/answer_booklet';
$route['report_app_pending'] = 'Report/app_pending';
$route['report_app_pending_old'] = 'Report/app_pending_old';
$route['report_doc_pending'] = 'Report/doc_pending';
$route['report_wav_ref'] = 'Report/wav_ref';
$route['report_examfee'] = 'Report/examfee';

25
Apollo/api/application/controllers/Report.php
View File

@ -212,6 +212,31 @@ class Report extends REST_Controller {
}
}
public function app_pending_old_post()
{
$bat = $this->post('batch');
$br = $this->post('branch');
$u = $this->post('university');
$getStatus = $this->report_model->app_pending_old($bat,$br,$u);
//print_r($getStatus);
if ($getStatus)
{
$getStatus['status'] = REST_Controller::HTTP_OK;
// Set the response and exit
$this->response($getStatus, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
}
else
{
// Set the response and exit
$this->response([
'message' => 'No records found!',
'status' => REST_Controller::HTTP_NOT_FOUND
], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
}
}
public function doc_pending_post()
{

153
Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php
View File

@ -526,54 +526,115 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model {
public function formIdFeeDetails($formFeeDetails=null,$local=null){
// print_r($formFeeDetails);exit();
foreach ($formFeeDetails as $formIdDetails){
// echo $formIdDetails['FormId'];
$this->db->select('*');
$this->db->from('T_Enrolment_Received_From_University');
$this->db->where('FormID', $formIdDetails['FormId']);
$detailsList = $this->db->get();
if($detailsList->result() == 1){
// $this->db->select('*');
// $this->db->from('T_FormId_FeeDetails_Received_From_University');
// $this->db->where('FormID', $formIdDetails['FormId']);
// $FormIDdetailsList = $this->db->get();
// $dbDetailsArr = array();
// $dbDetailsArr['FormID'] = $formIdDetails['FormId'];
// $dbDetailsArr['FormType'] = $formIdDetails['Form Type'];
// $dbDetailsArr['CentreCode'] = $formIdDetails['CentreCode'];
// $dbDetailsArr['CourseCode'] = $formIdDetails['Course_Code'];
// $dbDetailsArr['ActualCourseFee'] = $formIdDetails['Actual_Course_Fee'];
// $dbDetailsArr['CourseFee'] = $formIdDetails['Course_Fee'];
// $dbDetailsArr['ExamFee'] = $formIdDetails['Exam_Fee'];
// $dbDetailsArr['EnrollmentFee'] = $formIdDetails['Enrollment_Fee'];
// $dbDetailsArr['ProspectusFee'] = $formIdDetails['Prospectus_Fee'];
// $dbDetailsArr['ReRegFee'] = $formIdDetails['Re_Reg_Fee'];
// $dbDetailsArr['CreditTransferFee'] = $formIdDetails['Credit_Transfer_Fee'];
// $dbDetailsArr['LateralEntryFee'] = $formIdDetails['Lateral_Entry_Fee'];
// $dbDetailsArr['DualSpclFee'] = $formIdDetails['Dual_Spcl_Fee'];
// $dbDetailsArr['OtherFee'] = $formIdDetails['Other_Fee'];
// $dbDetailsArr['NRIFEE'] = $formIdDetails['NRI_FEE'];
// $dbDetailsArr['ProvisionalFee'] = $formIdDetails['Provisional_Fee'];
// $dbDetailsArr['MigrationFee'] = $formIdDetails['Migration_Fee'];
// $dbDetailsArr['UrgentResultDMCFee'] = $formIdDetails['Urgent_Result_DMC_Fee'];
// $dbDetailsArr['AdditionalFee'] = $formIdDetails['Additional_Fee'];
// $dbDetailsArr['Amount'] = $formIdDetails['Amount'];
// // $dbDetailsArr['BranchCode'] = $formIdDetails['FormId'];
// if($FormIDdetailsList->result()){
// $ids = $FormIDdetailsList->result();
// $this->db->where('ID', $ids['ID']);
// $this->db->update('T_FormId_FeeDetails_Received_From_University', $dbDetailsArr);
// } else {
// print_r($dbDetailsArr);exit();
// $this->db->insert('T_FormId_FeeDetails_Received_From_University', $dbDetailsArr);
// $this->db->affected_rows();
// }
// $this->db->select('*');
// $this->db->from('T_Enrolment_Received_From_University');
// $this->db->where('FormID', $formIdDetails['FormId']);
// $detailsList = $this->db->get();
// $datassss = $detailsList->result();
foreach ($formFeeDetails as $formIdDetails){
$formIds = $formIdDetails['FormId'];
$formType = $formIdDetails['Form Type'];
$CentreCode = $formIdDetails['CentreCode'];
} else{
$CourseCode = $formIdDetails['Course_Code'];
$ActualCourseFee = $formIdDetails['Actual_Course_Fee'];
$CourseFee = $formIdDetails['Course_Fee'];
$ExamFee = $formIdDetails['Exam_Fee'];
$EnrollmentFee = $formIdDetails['Enrollment_Fee'];
$ProspectusFee = $formIdDetails['Prospectus_Fee'];
$ReRegFee = $formIdDetails['Re_Reg_Fee'];
$CreditTransferFee = $formIdDetails['Credit_Transfer_Fee'];
$LateralEntryFee = $formIdDetails['Lateral_Entry_Fee'];
$DualSpclFee = $formIdDetails['Dual_Spcl_Fee'];
$OtherFee = $formIdDetails['Other_Fee'];
$NRIFEE = $formIdDetails['NRI_FEE'];
$ProvisionalFee = $formIdDetails['Provisional_Fee'];
$MigrationFee = $formIdDetails['Migration_Fee'];
$UrgentResultDMCFee = $formIdDetails['Urgent_Result_DMC_Fee'];
$AdditionalFee = $formIdDetails['Additional_Fee'];
$Amount = $formIdDetails['Amount'];
$query = "INSERT INTO T_FormId_FeeDetails_Received_From_University
(FormID, FormType, CentreCode, CourseCode, ActualCourseFee, CourseFee, ExamFee, EnrollmentFee, ProspectusFee, ReRegFee, CreditTransferFee, LateralEntryFee, DualSpclFee, OtherFee, NRIFEE, ProvisionalFee, MigrationFee, UrgentResultDMCFee, AdditionalFee, Amount)
VALUES
( '$formIds', '$formType', '$CentreCode', '$CourseCode', '$ActualCourseFee', '$CourseFee', '$ExamFee', '$EnrollmentFee', '$ProspectusFee', '$ReRegFee', '$CreditTransferFee', '$LateralEntryFee', '$DualSpclFee', '$OtherFee', '$NRIFEE', '$ProvisionalFee', '$MigrationFee', '$UrgentResultDMCFee', '$AdditionalFee', '$Amount' )
ON DUPLICATE KEY UPDATE
FormType = '$formType',
CentreCode = '$CentreCode',
CourseCode = '$CourseCode',
ActualCourseFee = '$ActualCourseFee',
CourseFee = '$CourseFee',
ExamFee = '$ExamFee',
EnrollmentFee = '$EnrollmentFee',
ProspectusFee = '$ProspectusFee',
ReRegFee = '$ReRegFee',
CreditTransferFee = '$CreditTransferFee',
LateralEntryFee = '$LateralEntryFee',
DualSpclFee = '$DualSpclFee',
OtherFee = '$OtherFee',
NRIFEE = '$NRIFEE',
ProvisionalFee = '$ProvisionalFee',
MigrationFee = '$MigrationFee',
UrgentResultDMCFee = '$UrgentResultDMCFee',
AdditionalFee = '$AdditionalFee',
Amount = '$Amount'";
$queryDetails = $this->db->query($query);
}
// foreach ($formFeeDetails as $formIdDetails){
// // echo $formIdDetails['FormId'];
// $this->db->select('*');
// $this->db->from('T_Enrolment_Received_From_University');
// $this->db->where('FormID', $formIdDetails['FormId']);
// $detailsList = $this->db->get();
// if($detailsList->result() == 1){
// // $this->db->select('*');
// // $this->db->from('T_FormId_FeeDetails_Received_From_University');
// // $this->db->where('FormID', $formIdDetails['FormId']);
// // $FormIDdetailsList = $this->db->get();
// // $dbDetailsArr = array();
// // $dbDetailsArr['FormID'] = $formIdDetails['FormId'];
// // $dbDetailsArr['FormType'] = $formIdDetails['Form Type'];
// // $dbDetailsArr['CentreCode'] = $formIdDetails['CentreCode'];
// // $dbDetailsArr['CourseCode'] = $formIdDetails['Course_Code'];
// // $dbDetailsArr['ActualCourseFee'] = $formIdDetails['Actual_Course_Fee'];
// // $dbDetailsArr['CourseFee'] = $formIdDetails['Course_Fee'];
// // $dbDetailsArr['ExamFee'] = $formIdDetails['Exam_Fee'];
// // $dbDetailsArr['EnrollmentFee'] = $formIdDetails['Enrollment_Fee'];
// // $dbDetailsArr['ProspectusFee'] = $formIdDetails['Prospectus_Fee'];
// // $dbDetailsArr['ReRegFee'] = $formIdDetails['Re_Reg_Fee'];
// // $dbDetailsArr['CreditTransferFee'] = $formIdDetails['Credit_Transfer_Fee'];
// // $dbDetailsArr['LateralEntryFee'] = $formIdDetails['Lateral_Entry_Fee'];
// // $dbDetailsArr['DualSpclFee'] = $formIdDetails['Dual_Spcl_Fee'];
// // $dbDetailsArr['OtherFee'] = $formIdDetails['Other_Fee'];
// // $dbDetailsArr['NRIFEE'] = $formIdDetails['NRI_FEE'];
// // $dbDetailsArr['ProvisionalFee'] = $formIdDetails['Provisional_Fee'];
// // $dbDetailsArr['MigrationFee'] = $formIdDetails['Migration_Fee'];
// // $dbDetailsArr['UrgentResultDMCFee'] = $formIdDetails['Urgent_Result_DMC_Fee'];
// // $dbDetailsArr['AdditionalFee'] = $formIdDetails['Additional_Fee'];
// // $dbDetailsArr['Amount'] = $formIdDetails['Amount'];
// // // $dbDetailsArr['BranchCode'] = $formIdDetails['FormId'];
// // if($FormIDdetailsList->result()){
// // $ids = $FormIDdetailsList->result();
// // $this->db->where('ID', $ids['ID']);
// // $this->db->update('T_FormId_FeeDetails_Received_From_University', $dbDetailsArr);
// // } else {
// // print_r($dbDetailsArr);exit();
// // $this->db->insert('T_FormId_FeeDetails_Received_From_University', $dbDetailsArr);
// // $this->db->affected_rows();
// // }
// } else{
}
}
// }
// }
return 'true';
}

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

@ -515,6 +515,61 @@ GROUP BY x.regid";
return $results;
}
public function app_pending_old($bat=null,$br=null,$u=null){
$sql = "select a.StudentID as Student_id,
a.CourseID as cid,
a.BranchCode as branch,
a.ListCode as lcode,
ifnull(a.AppDate,'-') as adate,
a.CertificationType as ctype,
ifnull(sfs.BatchCode,'-') as batch,
list.ListName as StatusName,
ifnull(sfp.bill,'-') as init_date,
STU.Firstname as Student_name,
STU.Fathername as FatherName,
STU.MobileNumber as Phone_number,
STU.AlternateNumber as AlternateNumber,
STU.PermanentAddress as address,
STU_COUR.EnrollmentID as eid,
COUR.CourseName as Course_name,
UNIV.UniversityName as University
from T_ApplicationStatus a
left join T_Students_Fees_Status sfs on sfs.StudentID = a.StudentID and sfs.CourseID = a.CourseID
left join (SELECT StudentID,FeesId AS FeesID, min(CreatedOn), BillDate AS bill FROM T_Students_Fees_PaidDetails GROUP BY FeesId) as sfp on sfp.StudentID = sfs.StudentID and sfp.FeesID = sfs.FeesID
left join T_PickListDetails list on list.ListCode = a.ListCode
left join T_StudentDetails AS STU ON STU.StudentID = a.StudentID
left join T_CourseMaster AS COUR ON COUR.CourseID = a.CourseID
LEFT JOIN T_UniversityMaster AS UNIV ON UNIV.UniversityID = COUR.UniversityID
LEFT JOIN T_Student_CourseDetails AS STU_COUR ON STU_COUR.StudentID = a.StudentID AND STU_COUR.CourseID = a.CourseID
left join T_CertificationMaster cert on cert.CertificationID=a.CertificationType
where a.ID in (select max(ID) from T_ApplicationStatus group by StudentID,CourseID,CertificationType) and cert.CertificateName like 'APPLICATION%'
";
if ($bat!= ''){
$sql.=" and sfs.BatchCode = '".$bat."'";
}
if ($u!= ''){
$sql.=" and UNIV.UniversityID = '".$u."'";
}
$sql.=" group by Student_id,cid,ctype";
$leadDet=$this->db->query($sql);
$answer = $leadDet->result();
if (count($answer) > 0) {
$results['app_pendingList'] = true;
$results['app_pending_oldData'] = $answer;
} else {
$results['app_pendingList'] = false;
$results['message'] = 'No record found';
}
return $results;
}
public function doc_pending($bat=null,$br=null,$u=null){

1
Apollo/assets/i18n/en.json
View File

@ -88,6 +88,7 @@
"expense": "Expenses",
"answer_booklets": "Answer Booklets",
"app_pending": "New and Re-reg Form Status",
"app_pending_old": "Application Status - Old Data",
"doc_pending": "Student Docs Pending",
"wav_ref": "Waiver and Referral",
"examfee": "Exam Writing Fees",

1
Apollo/assets/js/config.constant.js
View File

@ -226,6 +226,7 @@ app.constant('JS_REQUIRES', {
'report_expenseCtrl':'assets/js/controllers/report_expenseCtrl.js',
'report_ans_bookletCtrl':'assets/js/controllers/report_ans_bookletCtrl.js',
'report_app_pendingCtrl':'assets/js/controllers/report_app_pendingCtrl.js',
'report_app_pending_oldDataCtrl':'assets/js/controllers/report_app_pending_oldDataCtrl.js',
'report_doc_pendingCtrl':'assets/js/controllers/report_doc_pendingCtrl.js',
'report_waiver_referalCtrl':'assets/js/controllers/report_waiver_referalCtrl.js',
'report_examfeeCtrl':'assets/js/controllers/report_examfeeCtrl.js',

6
Apollo/assets/js/config.router.js
View File

@ -675,6 +675,12 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com
resolve: loadSequence('ui.select','report_app_pendingCtrl','ngTable', 'ladda', 'angular-ladda'),
title: 'Application Pending Student List Report',
}).state('app.reports.app_pending_old', {
url: '/report_app_pending_oldDataCtrl',
templateUrl: "assets/views/report_application_pending_oldData.html",
resolve: loadSequence('ui.select','report_app_pending_oldDataCtrl','ngTable', 'ladda', 'angular-ladda'),
title: 'Application Pending Student List Report',
}).state('app.reports.doc_pending', {
url: '/report_doc_pendingCtrl',
templateUrl: "assets/views/report_document_pending.html",

553
Apollo/assets/js/controllers/report_app_pending_oldDataCtrl.js Normal file
View File

@ -0,0 +1,553 @@
'use strict';
/*** controller***/
app.controller('report_app_pending_oldDataCtrl', ["$scope", "$filter","$rootScope","$modal", "API_POINTS", "$http", "SweetAlert", "$state", 'md5', 'ipCookie', '$window',"dateListDescService",
function ($scope, $filter,$rootScope,$modal, apiPoint, $http, SweetAlert, $state, md5, ipCookie, $window, dateListDescService) {
/*
* auto call tracking
*/
$scope.userType=JSON.parse(localStorage.getItem('localObj')).localType;
$scope.myModel = {
"date": new Date(),
"activity": "",
"assignedTo": "",
"status": "",
"referedBy": '',
"comments":'',
"enquiryStatus":'',
"important":false,
"branch":"",
};
//get current date
$scope.hideDateSearch=true;
$scope.modifyMinDate = moment();
//$scope.minDate = $filter('date')($scope.modifyMinDate, 'MM-dd-yyyy');
$scope.currentDate=$filter('date')(new Date(), 'dd-MM-yyyy');
// get 30 plus date for follwup details
$scope.modifyDate = moment();
$scope.modifyDate.add(30, 'days');
$scope.futureDate = $filter('date')($scope.modifyDate, 'dd-MM-yyyy');
$scope.myModel.date=$scope.currentDate;
// console.log($scope.currentDate);
/**
* End of the call tracking
*/
// DataTables configurable options
$scope.univModel = {
"branch": "",
"university": "",
"batch": "",
};
$scope.filters = function () {
var filterlist = {
method: 'POST',
url: apiPoint.url + 'report_filters/',
headers: {
'Content-Type': 'application/json'
},
data: {
branch : JSON.parse(localStorage.getItem('localObj')).localBranchID
}
};
$http(filterlist).then(function (response) {
if (response.data) {
$scope.batch=[];
$scope.batchlist = response.data.batch;
$scope.university = response.data.university;
//Desc order Batchlist
angular.forEach($scope.batchlist,function (values,key) {
var parts = values.BatchDate.split("-");
$scope.batch.push({
"batchcode":values.batchcode,
"batch":values.batch + '('+ values.batchcode + ')',
"BatchDate":values.BatchDate,
"givenDateObject":new Date(parts[2], parts[1] - 1, parts[0])
})
});
// call service for make a list in desc order based on date
$scope.batch=dateListDescService.getOrderByList($scope.batch);
//console.log($scope.branch);
} else {
}
});
}
//For batch dropdown
$scope.$watch('univModel.university', function (newValue,oldValue) {
if(newValue==undefined || newValue==''){
$scope.filterBatchDetails="";
console.log($scope.filterBatchDetails);
}
else{
if(angular.isString(newValue)){
$scope.filterBatchDetails=angular.fromJson(newValue);
}
}
});
//Response data
$scope.show = false;
$scope.onSubmit = function (form) {
$scope.filterUniv = angular.fromJson($scope.univModel.university);
// if($scope.univModel.university !== null){
// $scope.filterUniv = angular.fromJson($scope.univModel.university);
// }else {
// $scope.filterUniv = '';
// }
var firstError = null;
if (form.$invalid) {
var field = null, firstError = null;
$scope.show = true;
for (field in form) {
if (field[0] != '$') {
if (firstError === null && !form[field].$valid) {
firstError = form[field].$batch;
}
if (form[field].$pristine) {
form[field].$dirty = true;
}
}
}
angular.element('.ng-invalid[batch=' + firstError + ']').focus();
}else {
//alert($scope.batch.name);
$scope.app_pending_data = '';
$scope.message = '';
var response_data = {
method: 'POST',
url: apiPoint.url + 'report_app_pending_old/',
headers: {
'Content-Type': 'application/json'
},
data: {
branch: JSON.parse(localStorage.getItem('localObj')).localBranchID,
university: $scope.filterUniv.universityID,
batch: $scope.univModel.batch
}
};
$http(response_data).then(function (response) {
if (response.data.app_pendingList == true) {
$scope.app_pending_data = response.data.app_pending_oldData;
for(var i=0;i<$scope.app_pending_data.length;i++)
$scope.app_pending_data[i].SL_NO = i+1;
} else {
$scope.message = response.data.message;
}
});
}
}
var mystyle = {
sheetid: 'Application Status Report for Old Data',
headers: true,
caption: {
title:'Application Status Report for Old Data',
width: '300px',
style:'font-size:50px;'
},
// style:'background:#00FF00',
column: {
style:'font-size:12px'
},
};
$scope.exportData = function () {
alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,init_date as InititalPaymentDate,eid as EnrollmentID,Student_name as StudentName,FatherName as FatherName,Course_name as CourseName,CAST(Phone_number AS NUMBER) as PhoneNumber,University as University,StatusName as ApplicationPendingStatus,adate as Date INTO XLS("ApplicationStatusReport.xls",?) FROM ?',[mystyle,$scope.app_pending_data]);
};
/**
* Auto Call Tracking Sriram
*/
$scope.selectedStudentsID = [];
$scope.isCheckAll = function(e){
var val = (e.target.checked ? true : false);
if(val)
{
// $scope.disable = false;
var len = $scope.app_pending_data.length;
var i = 0;
for(i=0;i<len;i++)
{
if($scope.selectedStudentsID.indexOf($scope.app_pending_data[i]) === -1)
{
$scope.selectedStudentsID.push($scope.app_pending_data[i]);
}
}
}
else
{
// $scope.disable = true;
$scope.selectedStudentsID = [];
}
if($scope.selectedStudentsID !=''){
$scope.disable = false;
}else{
$scope.disable = true;
}
// console.log($scope.selectedStudentsID);
}
$scope.isClick = function(e){
var ide = e.target;
var val = (ide.checked ? true : false);
var sid = e.target.id;
angular.forEach($scope.app_pending_data,function(value,key){
//console.log(value);
if(sid == value.Student_id)
{
sid = value;
}
});
var pos = $scope.selectedStudentsID.indexOf(sid);
//alert(val);
if(val)
{
if( pos == -1)
{
//console.log("PUSH");
$scope.selectedStudentsID.push(sid);
}
}
else
{
//console.log("POP");
$scope.selectedStudentsID.splice(pos,1);
}
//
if(val){
$scope.disable = false;
}else{
$scope.disable = true;
}
//console.log($scope.selectedStudentsID);
}
$scope.calltracking = function(){
//$rootScope.student = $scope.selectedStudentsID;
if($scope.selectedStudentsID ==''){
swal('Select Check box','','warning');
return false;
}else{
$scope.controller = 'ng-controller="report_app_pending_oldDataCtrl"';
$scope.myModel.comments = 'Call Tracking for Document Report';
var lead = {
method: 'POST',
url: apiPoint.url + 'getTrackingLeadDetails/',
headers: {
'Content-Type': 'application/json'
},
data: {
requestedBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
student:$scope.selectedStudentsID,
branchID:JSON.parse(localStorage.getItem('localObj')).localBranchID,
userType:JSON.parse(localStorage.getItem('localObj')).localType,
}
};
$http(lead).then(function (response) {
if (response.data.status==200) {
$rootScope.activity = response.data.activityDetails;
$rootScope.status = response.data.statusDetails;
$rootScope.staffDetails = response.data.staffDetails;
$rootScope.studentDetails = $scope.selectedStudentsID;
// $scope.modalopen($scope.activity);
$rootScope.modalInstance = $modal.open({
templateUrl: 'assets/views/autoCalltracking.html',
controller: 'report_app_pending_oldDataCtrl',
// size: size,
resolve: {
pdfitems: function () {
return $scope.activity;
}
}
});
$rootScope.modalInstance.result.then(function (selectedItem) {
$scope.selected = selectedItem;
}, function () {
$log.info('Modal dismissed at: ' + new Date());
});
}
});
}
}
$scope.trackForm = {
submit: function (form, myModel,loading,selectedStudents) {
var comments = [];
for(var stuid=0;stuid<=selectedStudents.length-1;stuid++){
comments [stuid] ="Call Tracking For Report Application Details ";
}
//console.log(selectedStudents);
if(isNaN(myModel.date)){
$scope.nextFollowupDate = myModel.date;
}
else{
$scope.getdate=new Date(myModel.date).toDateString();
$scope.nextFollowupDate = $filter('date')(new Date($scope.getdate), 'dd-MM-yyyy');
}
var firstError = null;
if (form.$invalid) {
var field = null, firstError = null;
for (field in form) {
if (field[0] != '$') {
if (firstError === null && !form[field].$valid) {
firstError = form[field].$name;
}
if (form[field].$pristine) {
form[field].$dirty = true;
}
}
}
angular.element('.ng-invalid[name=' + firstError + ']').focus();
// swal("The form cannot be submitted because it contains validation errors!", "Errors are marked with a red, dashed border!", "error");
} else {
$scope.ldloading1 = {};
$scope.ldloading1[loading.replace('-', '_')] = true;
/* hide this fun after branch level changes
if($scope.userType !='R004'){
$scope.updateBranchID = JSON.parse(localStorage.getItem('localObj')).localBranchID;
$scope.updateAssignTo = myModel.assignedTo;
}
else{
$scope.updateBranchID = myModel.branch.BranchCode;
$scope.updateAssignTo = myModel.assignedTo;
}*/
var addLead = {
method: 'POST',
url: apiPoint.url + 'autoAddlead/',
headers: {
'Content-Type': 'application/json'
},
data: {
student:selectedStudents,
date: $scope.nextFollowupDate,
activity: myModel.activity.activityID,
assignedTo: myModel.assignedTo,
status: myModel.status,
referedBy: myModel.referedBy,
comments:comments,
enquiryStatus:myModel.enquiryStatus,
createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
branchId: JSON.parse(localStorage.getItem('localObj')).localBranchID
}
};
$http(addLead).then(function (response) {
console.log(response);
if (response.data.status==200 && response.data.leadDetails.leadStatus == true) {
$rootScope.modalInstance.close();
swal(" ", response.data.leadDetails.message, "success");
$state.go($state.current, {}, { reload: true });
} else {
swal(" ", response.data.leadDetails.message, "error");
}
});
}
},
reset: function (form) {
$scope.myModel = angular.copy($scope.master);
form.$setPristine(true);
$scope.myModel = {
"studentName": "",
"mobileNumber": "",
"universityName": "",
"courseName": "",
"activity": "",
"assignedTo": "",
"status": "",
"referedBy": '',
"comments":''
};
}
};
/**
* Call Tracking End
*/
}]);
/*modal controller
* */
app.controller('studentModalDemoCtrl', ["$scope","$rootScope", "$modal", "$log", "API_POINTS", "$http", function ($scope,$rootScope, $modal, $log, apiPoint, $http) {
//Tooltip for print button
$scope.dynamicTooltip = 'Student View';
// $scope.items = ['item1', 'item2', 'item3'];
$scope.open = function (studentDetails) {
// get student view details
var getcourse = {
method: 'POST',
url: apiPoint.url + 'getStudentBasicInfo/',
headers: {
'Content-Type': 'application/json'
},
data: {
requestedBy: studentDetails.Phone_number,
requestedFrom: 3,
branchCode:JSON.parse(localStorage.getItem('localObj')).localBranchID
}
};
$http(getcourse).then(function (response) {
if (response.data.status == 200 && response.data.studentStatus == true) {
$scope.courseEditLoading = false;
// $scope.studentDetails = response.data.studentDetails;
$scope.studentDetails = response.data;
// $scope.courseDetails = response.data.courseDetails;
var modalInstance = $modal.open({
templateUrl: 'assets/views/student/studentDetailsModal.html',
controller: 'ModalInstanceCtrl',
// size: size,
resolve: {
items: function () {
return $scope.studentDetails;
}
}
});
modalInstance.result.then(function (selectedItem) {
$scope.selected = selectedItem;
}, function () {
$log.info('Modal dismissed at: ' + new Date());
});
} else {
swal("Failed!", "This student is not registerd", "warning");
$scope.courseEditLoading = false;
$scope.studentDetails = "";
$scope.courseDetails = "";
}
});
};
$scope.open1 = function (values,type) {
var modalInstance1 = $modal.open({
templateUrl: 'assets/views/student/studentPaymentModal.html',
controller: 'ModalInstanceCtrl1',
// size: size,
resolve: {
items1: function () {
var myvalues =
{
"values":values,
"type":type
};
return myvalues;
}
}
});
modalInstance1.result.then(function (selectedItem) {
$scope.selected = selectedItem;
}, function () {
$log.info('Modal dismissed at: ' + new Date());
});
};
$scope.printStudentDetails = function (details) {
$rootScope.pdfItems = details;
var printInstance = $modal.open({
templateUrl: 'assets/views/student/studentPdf.html',
controller: 'studentModalDemoCtrl',
});
};
// generate pdf for student view
$scope.export = function(getName) {
kendo.drawing.drawDOM($("#exportthis")).then(function(group) {
kendo.drawing.pdf.saveAs(group, getName+".pdf");
});
}
}]);
// Please note that $modalInstance represents a modal window (instance) dependency.
// It is not the same as the $modal service used above.
app.controller('ModalInstanceCtrl', ["$scope", "$modalInstance", "items", "WordsService", function ($scope, $modalInstance, items, WordsService) {
$scope.items = items;
$scope.selected = {
item: $scope.items[0]
};
$scope.ok = function () {
$modalInstance.close($scope.selected.item);
};
$scope.cancel = function () {
$modalInstance.dismiss('cancel');
};
}]);
app.controller('ModalInstanceCtrl1', ["$scope", "$modalInstance", "items1", "WordsService", function ($scope, $modalInstance, items1, WordsService) {
$scope.items1 = items1.values;
$scope.selectedtype = items1.type;
$scope.ok = function () {
$modalInstance.close($scope.selected.item);
};
$scope.cancel = function () {
$modalInstance.dismiss('cancel');
};
}]);

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

@ -461,9 +461,14 @@
</li>
<li ui-sref-active="active">
<a ui-sref="app.reports.app_pending" ng-click="checkSuperAdmin()">
<span class="title" translate="sidebar.nav.report.app_pending">Application Pending Student List Report</span>
<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="checkSuperAdmin()">
<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="checkSuperAdmin()">
<span class="title" translate="sidebar.nav.report.doc_pending">Document Pending Student List Report</span>
@ -951,7 +956,12 @@
</li>
<li ui-sref-active="active">
<a ui-sref="app.reports.app_pending" ng-click="checkAdmin()">
<span class="title" translate="sidebar.nav.report.app_pending">Application Pending Student List Report</span>
<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="checkAdmin()">
<span class="title" translate="sidebar.nav.report.app_pending_old">Application Status List Report(Old Data)</span>
</a>
</li>
<li ui-sref-active="active">

143
Apollo/assets/views/report_application_pending_oldData.html Normal file
View File

@ -0,0 +1,143 @@
<section id="page-title">
<div class="row">
<div class="col-sm-8">
<!-- <h1 class="mainTitle">Application Pending Student List Report</h1> -->
<h1 class="mainTitle">Application Status Report - Old Data</h1>
</div>
<!-- <div ncy-breadcrumb></div> -->
</div>
</section>
<style>
td,th {
white-space: nowrap;
}
th{
text-align:center;
}
.table>tbody>tr>td { padding: 2px; }
/* .sort-icon {
font-size: 9px;
margin-left: 5px;
}
th {
cursor: pointer;
} */
</style>
<script type="text/javascript" src="bower_components/ng-table-excel-export/ng-table-excel-export.min.js">
</script>
<div class="container-fluid container-fullw bg-white">
<div ng-controller="report_app_pending_oldDataCtrl" ng-init="filters()">
<form name="Form" id="form" novalidate ng-submit="onSubmit(Form)" method="post">
<fieldset>
<div class="row">
<div class="col-md-12">
<div class="row">
<div class="col-md-3">
<label for="form-field-select-2">
University
</label>
<select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" required>
<option value="" selected>Select University</option>
<!--details.universityName for details in university-->
<option ng-repeat="details in university" value="{{details}}">{{details.universityName}}</option>
</select>
<span style="color:red;" ng-if="show" ng-show="Form.university.$dirty && Form.university.$error.required">Please select University.</span>
</div>
<div class="col-md-3">
<label for="form-field-select-2">
Batch
</label>
<select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" required>
<option value="" selected>Select Batch</option>
<option ng-repeat="batchDetails in filterBatchDetails.batchDetails" value="{{batchDetails.BatchCode}}">{{batchDetails.BatchName}}</option>
</select>
<span style="color:red;" ng-if="show" ng-show="Form.batch.$dirty && Form.batch.$error.required">Please select Batch.</span>
</div>
<div class="col-md-2" style="padding-top: 2.3%;">
<div >
<button type="submit" class="btn btn-success btn-o" tabindex="8">
Submit
</button>
</div>
</div>
</div>
</div>
</div>
</fieldset>
</form>
<!-- <pre>{{statusr | json}}</pre> -->
<div class="row" style="text-align: right;">
<div class="col-md-4">
<input class="form-control" type="text" ng-model="search" id="searchIn" autofocus tabindex="2" placeholder="Search" />
</div>
<div class="col-md-6">
<!--<button class="btn btn-success btn-o" ng-click="calltracking()">Call Tracking</button>-->
</div>
<button class="btn btn-success btn-o" ng-click="exportData()">Export to Excel</button>
</div>
<div class="table-responsive">
<table id="datatable" class="table table-hover" style="font-size:0.9em;" ng-controller="studentModalDemoCtrl">
<thead>
<tr>
<!--<th><input type="checkbox" ng-model="myModel.all" id="all" name="all" ng-click="isCheckAll($event);"></th>-->
<th>SL.No</th>
<th>Initital Payment Date</th>
<th>Enrollment ID</th>
<th>Student Name</th>
<th>Father Name</th>
<th>Course</th>
<th>Phone No</th>
<th>University</th>
<th>Application Status</th>
<th>Date</th>
</tr>
</thead>
<tbody dir-paginate="p in app_pending_data|filter:search:strict|itemsPerPage:10">
<tr>
<!-- <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>{{p.SL_NO}}</td>
<td>{{p.init_date}}</td>
<td>{{p.eid}}</td>
<td><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.Student_name}}</a></td>
<td>{{p.FatherName}}</td>
<td>{{p.Course_name}}</td>
<td><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.Phone_number}}</a></td>
<td>{{p.University}}</td>
<td>{{p.StatusName}}</td>
<td>{{p.adate}}</td>
</tr>
</tbody>
</table>
<h3 style="text-align:center;">{{message}}</h3>
</div>
<dir-pagination-controls direction-links="true" boundary-links="true">
</dir-pagination-controls>
</div>
</div>