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

aute merge routes.php changes : kdk

Browse Source
This commit is contained in:
dineshkumarkannan 2018-09-08 09:18:36 +05:30
commit 9062f72662
24 changed files with 85 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Apollo/api/application/config/constants.php
View File

@ -161,6 +161,8 @@ defined('STUDENTDOCUMENTTRACKDETAILS') OR define('STUDENTDOCUMENTTRACKDETAILS','
defined('REGISTRATIONDETAILS') OR define('REGISTRATIONDETAILS','T_Registration_Details');
defined('ENROLMENTRECEIVEDFROMUNIV') OR define('ENROLMENTRECEIVEDFROMUNIV','T_Enrolment_Received_From_University');
defined('FORMFEESRECEIVEDFROMUNIV') OR define('FORMFEESRECEIVEDFROMUNIV','T_FormId_FeeDetails_Received_From_University');
defined('UNIVERSITYCREDITDEBIY') OR define('UNIVERSITYCREDITDEBIY','T_University_Credit_Debit');
defined('UNIVERSITYPAYMENT') OR define('UNIVERSITYPAYMENT','T_University_Payment');
// define APPLICATION certificate type constant

4
Apollo/api/application/config/database.php
View File

@ -76,8 +76,8 @@ $query_builder = TRUE;
$db['default'] = array(
'dsn' => '',
'hostname' => 'apollodec.com',
'username' => 'apollod4_DEV',
'password' => 'apollo1234',
'username' => 'apollod4_DEV',
'password' => 'apollo1234',
'database' => 'apollod4_ApolloDECDev',
'dbdriver' => 'mysqli',
'dbprefix' => '',

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

@ -215,7 +215,7 @@ $route['setgrpstatus'] = 'Broadcast_Controller/setgrpstatus';
$route['getAllstudentcoursedetail'] = 'DataCorrection_Controller/getAllstudentcoursedetail';
$route['getAllfeedetail'] = 'DataCorrection_Controller/getAllfeedetail';
$route['updateCourseDetails'] = 'DataCorrection_Controller/updateCourseDetails';
$route['updateCourseDetailss'] = 'DataCorrection_Controller/updateCourseDetailss';
/*
@ -371,6 +371,11 @@ $route['getForFormIdDraftDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/get
$route['addForFormIdDraftDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/addForFormIdDraftDetails';
$route['draftMovetoList'] = 'Receive_Enrolment_Fees_Univ_Controller/draftMovetoList';
$route['editDraftFormIdFeesDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/editDraftFormIdFeesDetails';
<<<<<<< HEAD
$route['getStudentUnivFormIdFeeDatailsList'] = 'Receive_Enrolment_Fees_Univ_Controller/getStudentUnivFormIdFeeDatailsList';
$route['getFormIdDetailsStatusUpdateList'] = 'Receive_Enrolment_Fees_Univ_Controller/getFormIdDetailsStatusUpdateList';
$route['insertStatusUpdateDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/insertStatusUpdateDetails';
=======
$route['paymentVerficationDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/paymentVerficationDetails';
>>>>>>> 06530705d67f7b2031936171f856ae73f35dafbb

6
Apollo/api/application/controllers/Call_Tracking_Controller.php
View File

@ -148,10 +148,14 @@ class Call_Tracking_Controller extends REST_Controller {
$search['requestedDept'] = $this->post('requestedDept');
// $search['branchID'] = $this->post('branchId');
$search['searchDate'] = $this->post('searchDate');
// print_r( $search['searchDate']);
$search['CreatedBranch'] = $this->post('branchId');
$status=$this->post('status');
// $search['searchMobileNumber'] = $this->post('searchMobileNumber');
// $search['searchName']= $this->post('searchName');
$getTrackedDetails = $this->Calltracking_model->getTrackingDetails($search);
$getTrackedDetails = $this->Calltracking_model->getTrackingDetails($search,$status);
if ($getTrackedDetails)
{

2
Apollo/api/application/controllers/DataCorrection_Controller.php
View File

@ -140,7 +140,7 @@ class DataCorrection_Controller extends REST_Controller {
}
public function updateCourseDetails_post()
public function updateCourseDetailss_post()
{
$search['University'] = $this->post('universityid');
$search['courseId'] = $this->post('courseId');

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

@ -212,7 +212,7 @@ class HallTickets_Controller extends REST_Controller {
$this->response([
'message' => 'No records found!',
'status' => REST_Controller::HTTP_NOT_FOUND
'status' => REST_Controller::HTTP_NOT_FOUND
], REST_Controller::HTTP_NOT_FOUND);
}
@ -316,7 +316,7 @@ class HallTickets_Controller extends REST_Controller {
$Cdate = new DateTime('now',new DateTimeZone('Asia/Kolkata'));
$CreatedOn = $Cdate->format('Y-m-d H:i:s');
/////////check semcoursemapping////
$data['subjectDetails'] = $this->Hallticket_model->getSubjectDetails($universityID,$tempCourseArray,$branchId);
// $data['subjectDetails'] = $this->Hallticket_model->getSubjectDetails($universityID,$tempCourseArray,$branchId);
$data['subjectDetails'] = $this->Hallticket_model->getExistDetailsfileupload($university,$courseArray,$branchId);
// print_r( $data['subjectDetails']);
if($data['subjectDetails'] == 1 )

12
Apollo/api/application/models/Calltracking_model.php
View File

@ -352,8 +352,9 @@ class Calltracking_model extends CI_Model {
* created by kms
* */
public function getTrackingDetails($search=null)
public function getTrackingDetails($search=null,$status)
{
$this->db->select('LTF.FollowupOn,LD.LeadID,LD.LeadName,LD.MobileNumber,LD.IsNewEnquiry,LT.TrackingID,LT.ActivityStatus,LT.AssignedTo,LT.StatusCode,LT.University,LT.Course,LT.AlternateMobile,LT.Address,LT.Flag,ST.StaffID,ST.Firstname,PLD1.ListCode as statusListCode,PLD1.ListName as statusListName,AV.ActivityID,AV.ActivityName');
$this->db->from(LEAD_TRACKING_FOLLOWUP.' as LTF');
$this->db->join(LEAD_TRACKING.' as LT','LT.TrackingID=LTF.TrackingID');
@ -437,7 +438,16 @@ class Calltracking_model extends CI_Model {
}
}
if($status!=true)
{
$result_array['pendingTrackingDetails'] = $this->getPrevPendingTrackingDetails($search);
// print_r( $result_array['pendingTrackingDetails']);
}
else
{
$result_array['pendingTrackingDetails']=1;
}
return $result_array;

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

@ -354,6 +354,7 @@ class Student_model extends CI_Model {
$this->db->join('' . STUDENTS_FEES_PAID . ' as t6', 't6.FeesId = t5.FeesID', 'LEFT');
$this->db->where('t1.BranchID', $req['localBranchID']);
$this->db->where('t1.StudentID', $studentId);
$this->db->where('t1.IsActive', '1');
$this->db->group_by('t1.CourseID');
$courseDetails = $this->db->get();
$checkArr = $courseDetails->result();

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

@ -337,7 +337,7 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com
title: 'status',
ncyBreadcrumb: {
label: 'status'
}
}
}).state('app.student.status.studymaterial', {
url: '/studymaterial',
templateUrl: "assets/views/status-update/study_material_status.html",

56
Apollo/assets/js/controllers/callTrackingCtrl.js
View File

@ -60,6 +60,7 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter",
$scope.checkDate = function (value,type) {
// console.log(value.searchDate);
if(value.searchDate==null || value.searchDate==undefined){
$scope.myModel.search='';
@ -68,33 +69,38 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter",
}
else{
if(type=='2'){
$scope.myModel.search = $filter('date')(value.searchDate, 'yyyy-MM-dd');
$scope.toMinDate = $filter('date')(value.searchDate, 'MM-dd-yyyy');
}
}
$scope.searchDateArray(value);
$scope.searchDateArray(value,type);
}
/*
* check to date
* */
$scope.checkToDate = function (value) {
$scope.status='';
$scope.checkToDate = function (value,status) {
$scope.status=status;
if(value.searchDate==null || value.searchDate==undefined){
swal("Failed!", 'Please Select From Date', "error");
$scope.myModel.dateTo='';
$scope.myModel.search='';
$scope.toMinDate = '';
}
else{
$scope.filterSearch=$filter('date')(value.searchDate, 'dd-MM-yyyy');
$scope.search=$scope.filterSearch;
else{
if(value.searchDate!=null && value.dateTo!=null && status=='true')
{
$scope.filterSearch=$filter('date')(value.searchDate,value.dateTo);
$scope.search=$scope.filterSearch;
}
}
$scope.searchDateArray(value);
$scope.searchDateArray(value,status);
}
@ -102,8 +108,8 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter",
/*
* make a search date array
*/
$scope.searchDateArray=function (dateValue) {
$scope.searchDateArray=function (dateValue,status) {
var listDate = [];
if((dateValue.search !=null && dateValue.search !=undefined) && (dateValue.dateTo !=null && dateValue.dateTo !=undefined && dateValue.dateTo !='')){
var startDate =dateValue.search;
@ -117,6 +123,7 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter",
var strDate = startDate;
var arrayDate = $filter('date')(strDate, 'dd-MM-yyyy');
listDate.push(arrayDate);
}
else{
while (strDate < endDate){
@ -404,19 +411,19 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter",
* */
$scope.init = function (myModel) {
// console.log(myModel);
var logcheck = JSON.parse(localStorage.getItem('localObj'));
const LOCALTYPE = logcheck.localType;
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R002' || LOCALTYPE=='R005')) {
console.log("if");
}else {
if(logcheck != null && LOCALTYPE !='R001') {
console.log("else if");
$state.go('app.dashboard');
} else {
console.log("else else");
//ipCookie.remove('cookiechk');
window.localStorage.clear();
$state.go('login.signin');
@ -432,6 +439,9 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter",
$scope.data = [];
if(myModel!='' && myModel!=undefined){
$scope.finalSearchArry=myModel;
}
else{
$scope.finalSearchArry="";
@ -449,7 +459,8 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter",
requestedBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
requestedDept: JSON.parse(localStorage.getItem('localObj')).localType,
branchId: JSON.parse(localStorage.getItem('localObj')).localBranchID,
searchDate: $scope.finalSearchArry
searchDate: $scope.finalSearchArry,
status: $scope.status
}
};
$http(getTrackDetails).then(function (response) {
@ -521,7 +532,11 @@ app.controller('callTrackingCtrl', ["$scope","$rootScope","toaster", "$filter",
});
localStorage.setItem('trackingList', JSON.stringify($scope.data));
}
else if(response.data.trackingStatus == 1)
{
console.log('hai');
}
else {
$scope.loader = false;
@ -651,8 +666,7 @@ app.controller('callTrackingLeadCtrl', ["$scope","$rootScope","toaster", "$filte
//from date change
$scope.checkDate = function (value) {
$scope.myModel.search = $filter('date')(value.leadDate, 'yyyy-MM-dd');
@ -687,14 +701,14 @@ app.controller('callTrackingLeadCtrl', ["$scope","$rootScope","toaster", "$filte
const LOCALTYPE = logcheck.localType;
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' || LOCALTYPE == 'R005' || LOCALTYPE == 'R002')) {
console.log("if");
// console.log("if");
}else {
if(logcheck != null && LOCALTYPE !='R001') {
console.log("else if");
// console.log("else if");
$state.go('app.dashboard');
} else {
console.log("else else");
// console.log("else else");
//ipCookie.remove('cookiechk');
window.localStorage.clear();
$state.go('login.signin');

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

@ -229,7 +229,7 @@ $scope.universitySearchData = '';
var updatecourse = {
method: 'POST',
url: apiPoint.url + 'updateCourseDetails/',
url: apiPoint.url + 'updateCourseDetailss/',
headers: {
'Content-Type': 'application/json'
},
@ -249,6 +249,7 @@ $scope.universitySearchData = '';
$http(updatecourse).then(function (response) {
swal('Change Saved Successfully', response.data.message, "success");
$scope.close();
$scope.getStudentDetails(form,myModel);
});

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

@ -374,7 +374,7 @@ $scope.UploadFileData = function (FileDetails,myModel,courseDetails) {
}
};
};
$http(updateUniversityEnrolment).then(function (response) {
console.log(response);

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

@ -92,7 +92,7 @@
<input type="text" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="myModel.dateTo"
is-open="startOpen" ng-init="startOpen = false" name="addDate" datepicker-options="dateOptions"
min-date="toMinDate"
placeholder="Select To Date" close-text="Close" required="required" ng-change="checkToDate(myModel);" ng-readonly="true"
placeholder="Select To Date" close-text="Close" required="required" ng-change="checkToDate(myModel,'true');" ng-readonly="true"
show-button-bar="true" />
</div>

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

@ -226,6 +226,11 @@
<span class="title" translate="sidebar.nav.student.STUDENTFROMIDFEEDETAILS"> STUDENT FORMID FEE DETAILS </span>
</a>
</li>
<li ui-sref-active="active">
<a ui-sref="app.student.universityformpayment" ng-click="checkSuperAdmin()">
<span class="title" translate="sidebar.nav.student.UNIVERSITYFORMPAYMENT"> University Form Payment </span>
</a>
</li>
</ul>
</li>
<!--<li ng-class="{'active open':$state.includes('app.call')}">

2
Apollo/assets/views/status-update/answer_booklet_status.html
View File

@ -5,7 +5,7 @@
<h1 class="mainTitle" translate="sidebar.nav.student.status.ANSWERBOOKLET">{{ mainTitle }}</h1>
<span class="mainDescription">Update answer booklet status.</span>
</div>
<div ncy-breadcrumb></div>
<!-- <div ncy-breadcrumb></div>-->
</div>
</section>
<!-- end: PAGE TITLE -->

2
Apollo/assets/views/status-update/application_status.html
View File

@ -5,7 +5,7 @@
<h1 class="mainTitle" translate="sidebar.nav.student.status.APPLICATION">{{ mainTitle }}</h1>
<span class="mainDescription">Update application status.</span>
</div>
<div ncy-breadcrumb></div>
<!-- <div ncy-breadcrumb></div>-->
</div>
</section>
<!-- end: PAGE TITLE -->

2
Apollo/assets/views/status-update/certificate_status.html
View File

@ -5,7 +5,7 @@
<h1 class="mainTitle" translate="sidebar.nav.student.status.CERTIFICATE">{{ mainTitle }}</h1>
<span class="mainDescription">Update certificate status.</span>
</div>
<div ncy-breadcrumb></div>
<!-- <div ncy-breadcrumb></div>-->
</div>
</section>
<!-- end: PAGE TITLE -->

2
Apollo/assets/views/status-update/fees_status.html
View File

@ -30,7 +30,7 @@
<span class="mainDescription">Update fees status. </span>
</div>
<div ncy-breadcrumb></div>
<!-- <div ncy-breadcrumb></div>-->
</div>
</section>
<!-- end: PAGE TITLE -->

2
Apollo/assets/views/status-update/markcard_status.html
View File

@ -5,7 +5,7 @@
<h1 class="mainTitle" translate="sidebar.nav.student.status.MARKCARD">{{ mainTitle }}</h1>
<span class="mainDescription">Update markcard status.</span>
</div>
<div ncy-breadcrumb></div>
<!-- <div ncy-breadcrumb></div>-->
</div>
</section>
<!-- end: PAGE TITLE -->

2
Apollo/assets/views/status-update/study_material_status.html
View File

@ -5,7 +5,7 @@
<h1 class="mainTitle" translate="sidebar.nav.student.status.STUDYMATERIAL">{{ mainTitle }}</h1>
<span class="mainDescription">Update study material status.</span>
</div>
<div ncy-breadcrumb></div>
<!-- <div ncy-breadcrumb></div>-->
</div>
</section>
<!-- end: PAGE TITLE -->

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

@ -5,7 +5,7 @@
<h1 class="mainTitle" translate="Enrolment Details">{{ mainTitle }}</h1>
<span class="mainDescription">Student Form Enrolment Details. </span>
</div>
<div ncy-breadcrumb></div>
<!-- <div ncy-breadcrumb></div>-->
</div>
</section>
<!-- end: STUDENT TITLE -->

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

@ -5,7 +5,7 @@
<h1 class="mainTitle" translate="Student FormId Fees Details">{{ mainTitle }}</h1>
<span class="mainDescription">Student University FormId Fees Details. </span>
</div>
<div ncy-breadcrumb></div>
<!-- <div ncy-breadcrumb></div>-->
</div>
</section>
<!-- end: STUDENT TITLE -->

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

@ -5,7 +5,7 @@
<h1 class="mainTitle" translate="Manage Student Details">{{ mainTitle }}</h1>
<span class="mainDescription">Add/Edit student details. </span>
</div>
<div ncy-breadcrumb></div>
<!-- <div ncy-breadcrumb></div>-->
</div>
</section>
<!-- end: STUDENT TITLE -->

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

@ -5,7 +5,7 @@
<h1 class="mainTitle" translate="Manage Student Details">{{ mainTitle }}</h1>
<span class="mainDescription">Add/Edit Student Details. </span>
</div>
<div ncy-breadcrumb></div>
<!-- <div ncy-breadcrumb></div>-->
</div>
</section>
<!-- end: STUDENT TITLE -->