data correction
This commit is contained in:
parent
506d3354de
commit
4c3ffbcd32
@ -210,6 +210,15 @@ $route['getallnumer'] = 'Broadcast_Controller/getallnumer';
|
||||
$route['setValue'] = 'Broadcast_Controller/setValue';
|
||||
$route['setgrpstatus'] = 'Broadcast_Controller/setgrpstatus';
|
||||
|
||||
/* Data Correction */
|
||||
|
||||
$route['getAllstudentcoursedetail'] = 'DataCorrection_Controller/getAllstudentcoursedetail';
|
||||
$route['getAllfeedetail'] = 'DataCorrection_Controller/getAllfeedetail';
|
||||
$route['updateCourseDetails'] = 'DataCorrection_Controller/updateCourseDetails';
|
||||
|
||||
|
||||
/*
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
171
Apollo/api/application/controllers/DataCorrection_Controller.php
Normal file
171
Apollo/api/application/controllers/DataCorrection_Controller.php
Normal file
@ -0,0 +1,171 @@
|
||||
<?php
|
||||
/**
|
||||
* Date: 04/09/18
|
||||
* Time: 11:24 AM
|
||||
*/
|
||||
|
||||
defined('BASEPATH') OR exit('No direct script access allowed');
|
||||
|
||||
// This can be removed if you use __autoload() in config.php OR use Modular Extensions
|
||||
/** @noinspection PhpIncludeInspection */
|
||||
require_once APPPATH . '/libraries/REST_Controller.php';
|
||||
|
||||
/**
|
||||
* This is an example of a few basic user interaction methods you could use
|
||||
* all done with a hardcoded array
|
||||
*
|
||||
* @package CodeIgniter
|
||||
* @subpackage Rest Server
|
||||
* @category Controller
|
||||
* @author
|
||||
* @license MIT
|
||||
* @link
|
||||
*/
|
||||
class DataCorrection_Controller extends REST_Controller {
|
||||
|
||||
function __construct()
|
||||
{
|
||||
// Construct the parent class
|
||||
parent::__construct();
|
||||
|
||||
// load the model
|
||||
$this->load->model('Data_correction', 'Data_correction');
|
||||
|
||||
}
|
||||
|
||||
public function StudMerge_post()
|
||||
{
|
||||
$toDelete = $this->post('toDelete');
|
||||
$toMerge = $this->post('toMerge');
|
||||
$getStatus = $this->Data_correction->Student_Merge($toDelete,$toMerge);
|
||||
//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 getAllstudentcoursedetail_post()
|
||||
{
|
||||
$search['Firstname'] = $this->post('studentName');
|
||||
$search['MobileNumber'] = $this->post('mobileNumber');
|
||||
$search['receipt'] = $this->post('receipt');
|
||||
$search['requestedtBy'] =$this->post('requestedtBy');
|
||||
$search['branchId']=$this->post('branchId');
|
||||
$search['requestedDept'] = $this->post('requestedDept');
|
||||
$search['University'] = $this->post('University');
|
||||
|
||||
$stucourse = $this->Data_correction->GetAllCourseDetails($search);
|
||||
|
||||
if($stucourse)
|
||||
{
|
||||
$stucourse['status'] = REST_Controller::HTTP_OK;
|
||||
// Set the response and exit
|
||||
$this->response($stucourse, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
|
||||
}
|
||||
else
|
||||
{
|
||||
$this->response([
|
||||
'message' => 'No records found!',
|
||||
'status' => REST_Controller::HTTP_NOT_FOUND
|
||||
], REST_Controller::HTTP_NOT_FOUND);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
public function getAllfeedetail_post()
|
||||
{
|
||||
$search['University'] = $this->post('University');
|
||||
$search['courseId'] = $this->post('courseId');
|
||||
$search['studentId'] =$this->post('studentId');
|
||||
$search['requestedtBy'] =$this->post('requestedtBy');
|
||||
$search['branchId']=$this->post('branchId');
|
||||
$search['requestedDept'] = $this->post('requestedDept');
|
||||
|
||||
$feedetails = $this->Data_correction->GetFeeDetails($search);
|
||||
|
||||
if($feedetails)
|
||||
{
|
||||
$feedetails['status'] = REST_Controller::HTTP_OK;
|
||||
// Set the response and exit
|
||||
$this->response($feedetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
|
||||
}
|
||||
else
|
||||
{
|
||||
$this->response([
|
||||
'message' => 'No records found!',
|
||||
'status' => REST_Controller::HTTP_NOT_FOUND
|
||||
], REST_Controller::HTTP_NOT_FOUND);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
public function updateCourseDetails_post()
|
||||
{
|
||||
$search['University'] = $this->post('universityid');
|
||||
$search['courseId'] = $this->post('courseId');
|
||||
$search['studentId'] =$this->post('studentid');
|
||||
$search['requestedtBy'] =$this->post('requestedtBy');
|
||||
$search['branchId']=$this->post('branchId');
|
||||
$search['requestedDept'] = $this->post('requestedDept');
|
||||
|
||||
$search['Reason'] = $this->post('Reason');
|
||||
$search['IsActive'] = $this->post('IsActive');
|
||||
|
||||
$updatedetails = $this->Data_correction->UpdateCouseandfee($search);
|
||||
|
||||
$allfeeid = $this->Data_correction->GetAllfeeid($search);
|
||||
|
||||
if(!empty($allfeeid))
|
||||
{
|
||||
foreach($allfeeid as $fi)
|
||||
{
|
||||
$feeid = $fi->FeesID;
|
||||
|
||||
$feedeact = $this->Data_correction->feedetailupdate($search,$feeid);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
// if($updatedetails)
|
||||
// {
|
||||
// $updatedetails['status'] = REST_Controller::HTTP_OK;
|
||||
// // Set the response and exit
|
||||
// $this->response($updatedetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// $this->response([
|
||||
// 'message' => 'No records found!',
|
||||
// 'status' => REST_Controller::HTTP_NOT_FOUND
|
||||
// ], REST_Controller::HTTP_NOT_FOUND);
|
||||
// }
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
176
Apollo/api/application/models/Data_correction.php
Normal file
176
Apollo/api/application/models/Data_correction.php
Normal file
@ -0,0 +1,176 @@
|
||||
<?php
|
||||
/**
|
||||
* Date: 04/09/18
|
||||
* Time: 11:24 AM
|
||||
*/
|
||||
defined('BASEPATH') OR exit('No direct script access allowed');
|
||||
|
||||
class Data_Correction extends CI_Model
|
||||
{
|
||||
Public function Student_Merge($toDelete=null,$toMerge=null)
|
||||
{
|
||||
$sql = "";
|
||||
$b=$this->db->query($sql);
|
||||
$batch = $b->result();
|
||||
if (count($batch) > 0) {
|
||||
$results['MergeStatus'] = true;
|
||||
$results['Stud_Merge'] = $batch;
|
||||
} else {
|
||||
$results['MergeStatus'] = false;
|
||||
$results['message'] = 'No record found';
|
||||
}
|
||||
return $results;
|
||||
}
|
||||
|
||||
|
||||
|
||||
Public function GetAllCourseDetails($search)
|
||||
{
|
||||
$this->db->select('sd.MobileNumber,sd.Firstname,sd.Lastname,CourseName,UniversityName,scd.CourseID,scd.ID,sd.StudentID,scd.IsActive as IsActive,scd.DeactiveComments as Reason,scd.UniversityID,sfs.FeesID');
|
||||
$this->db->from('T_StudentDetails sd');
|
||||
$this->db->join('T_Student_CourseDetails scd','scd.StudentID = sd.StudentID');
|
||||
$this->db->join('T_CourseMaster cm','cm.CourseID = scd.CourseID');
|
||||
$this->db->join('T_UniversityMaster um','um.UniversityID = scd.UniversityID');
|
||||
$this->db->join('T_Students_Fees_Status sfs','sfs.StudentID = scd.StudentID and sfs.CourseID=scd.CourseID');
|
||||
if($search['MobileNumber']!='')
|
||||
{
|
||||
$this->db->where('sd.MobileNumber',$search['MobileNumber']);
|
||||
}
|
||||
if($search['Firstname']!='')
|
||||
{
|
||||
// $this->db->like('ST.Firstname','%'.$search['Firstname'].'%');
|
||||
$this->db->like('sd.Firstname',$search['Firstname'],'both');
|
||||
}
|
||||
if($search['University']!='')
|
||||
{
|
||||
// $this->db->like('ST.Firstname','%'.$search['Firstname'].'%');
|
||||
$this->db->where('scd.UniversityID',$search['University']);
|
||||
}
|
||||
$this->db->group_by('scd.ID');
|
||||
|
||||
$searchDetails = $this->db->get();
|
||||
|
||||
if($searchDetails->result())
|
||||
{
|
||||
|
||||
//print_r($searchDetails->result());
|
||||
$result_array['studentStatus'] = true;
|
||||
$result_array['details'] = $searchDetails->result();
|
||||
}
|
||||
else
|
||||
{
|
||||
$result_array['studentStatus'] = false;
|
||||
$result_array['details'] = "No records found!";
|
||||
}
|
||||
// print_r($result_array);
|
||||
// die();
|
||||
|
||||
return $result_array;
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
Public function GetFeeDetails($search)
|
||||
{
|
||||
$this->db->select('BillNO,BillDate,BillAmount,ModeOfPayment ,ReceiptNo,sfd.ID as FID');
|
||||
$this->db->from('T_Students_Fees_PaidDetails sfd');
|
||||
$this->db->join('T_Students_Fees_Status sfs','sfs.StudentID = sfd.StudentID and sfs.FeesID=sfd.FeesId');
|
||||
$this->db->where('sfs.StudentID',$search['studentId']);
|
||||
$this->db->where('sfs.CourseID',$search['courseId']);
|
||||
$feeDetails = $this->db->get();
|
||||
|
||||
if($feeDetails->result())
|
||||
{
|
||||
|
||||
//print_r($searchDetails->result());
|
||||
$result_array['feeStatus'] = true;
|
||||
$result_array['details'] = $feeDetails->result();
|
||||
}
|
||||
else
|
||||
{
|
||||
$result_array['feeStatus'] = false;
|
||||
$result_array['details'] = "No records found!";
|
||||
}
|
||||
|
||||
//print_r($result_array);die();
|
||||
|
||||
return $result_array;
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
Public function UpdateCouseandfee($search)
|
||||
{
|
||||
$time = date('Y-m-d H:i:s');
|
||||
$dateTime = $time;
|
||||
|
||||
|
||||
$coursearr['IsActive'] = $search['IsActive'];
|
||||
$coursearr['DeactiveComments'] =$search['Reason'];
|
||||
$this->db->where('StudentID', $search['studentId']);
|
||||
$this->db->where('UniversityID', $search['University']);
|
||||
$this->db->where('CourseID', $search['courseId']);
|
||||
$this->db->update('T_Student_CourseDetails', $coursearr);
|
||||
|
||||
|
||||
$dayarr['IsActive'] = $search['IsActive'];
|
||||
$dayarr['Reason'] = $search['Reason'];
|
||||
|
||||
if( $search['IsActive'] ==0)
|
||||
{
|
||||
$dayarr['Status'] = 'Cancel';
|
||||
}
|
||||
$this->db->where('StudentID', $search['studentId']);
|
||||
$this->db->where('CourseID', $search['courseId']);
|
||||
$this->db->update('T_DayBookMaster', $dayarr);
|
||||
|
||||
|
||||
// $feearr['IsActive'] = $search['IsActive'];
|
||||
// $feearr['InternalComments'] = $search['Reason'];
|
||||
// $feearr['UpdatedOn'] = $dateTime;
|
||||
// $feearr['UpdatedBy'] = $search['branchId'];
|
||||
|
||||
// $this->db->where('FeesId', $search['ID']);
|
||||
// $this->db->update('T_Students_Fees_PaidDetails', $feearr);
|
||||
|
||||
return TRUE;
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
Public function GetAllfeeid($search)
|
||||
{
|
||||
$this->db->select('FeesID');
|
||||
$this->db->from('T_Students_Fees_Status');
|
||||
$this->db->where('StudentID',$search['studentId']);
|
||||
$this->db->where('CourseID',$search['courseId']);
|
||||
$feeidDetails = $this->db->get();
|
||||
|
||||
//print_r($feeidDetails->result());
|
||||
//die();
|
||||
|
||||
return $feeidDetails->result();
|
||||
}
|
||||
|
||||
|
||||
public function feedetailupdate($search,$feeid)
|
||||
{
|
||||
$time = date('Y-m-d H:i:s');
|
||||
$dateTime = $time;
|
||||
|
||||
$feearr['IsActive'] = $search['IsActive'];
|
||||
$feearr['InternalComments'] = $search['Reason'];
|
||||
$feearr['UpdatedOn'] = $dateTime;
|
||||
$feearr['UpdatedBy'] = $search['branchId'];
|
||||
|
||||
$this->db->where('FeesId', $feeid);
|
||||
$this->db->where('StudentID',$search['studentId']);
|
||||
$this->db->update('T_Students_Fees_PaidDetails', $feearr);
|
||||
return true;
|
||||
}
|
||||
|
||||
}
|
||||
@ -77,7 +77,8 @@
|
||||
"SESSIONSCHEDULE": "Session Schedule",
|
||||
"HALLTICKET": "HALL TICKET",
|
||||
"REREGISTRATION":"RE-REGISTRATION",
|
||||
"ACCOUNTTYPE":"Account Types"
|
||||
"ACCOUNTTYPE":"Account Types",
|
||||
"ENTRY":"ENTRY CORRECTION"
|
||||
},
|
||||
"report": {
|
||||
"TITLE": "REPORTS",
|
||||
@ -106,7 +107,6 @@
|
||||
"STUDENTDETAILS": "Manage",
|
||||
"STUDENTDETAILSADDEDIT": "Manage Details",
|
||||
"STUDENTFEEDETAILCOMPARE": "Student University Fee",
|
||||
"STUDENTFROMIDFEEDETAILS": "Student FormId Fee Details",
|
||||
"status" : {
|
||||
"MAIN": "Update Status",
|
||||
"STUDYMATERIAL": "Study Material",
|
||||
@ -153,6 +153,10 @@
|
||||
"mydetails": {
|
||||
"MAIN": "My Details"
|
||||
},
|
||||
"entry": {
|
||||
"MAIN": "My Details",
|
||||
"coursecorrection": "Course Details"
|
||||
},
|
||||
"announcement": {
|
||||
"MAIN": "ANNOUNCEMENT",
|
||||
"ANNOUNCEMENTLISTING": "List",
|
||||
|
||||
@ -146,6 +146,10 @@ app.constant('JS_REQUIRES', {
|
||||
'FeeCollected_reportCtrl': 'assets/js/controllers/FeeCollected_reportCtrl.js',
|
||||
/*
|
||||
|
||||
**/
|
||||
'entrycorrectionCtrl': 'assets/js/controllers/entrycorrectionCtrl.js',
|
||||
/*
|
||||
|
||||
|
||||
* student status updation
|
||||
* */
|
||||
|
||||
@ -782,7 +782,24 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com
|
||||
ncyBreadcrumb: {
|
||||
label: 'Promote Batch'
|
||||
}
|
||||
});
|
||||
}).state('app.entry', {
|
||||
url: '/entry',
|
||||
template: '<div ui-view class="fade-in-up"> <div style="margin: auto; width: 50%;padding: 10px;"> ENTRY</div> </div>',
|
||||
title: 'entry',
|
||||
ncyBreadcrumb: {
|
||||
label: 'entry'
|
||||
},
|
||||
|
||||
}).state('app.entry.coursecorrection', {
|
||||
url: '/coursecorrection',
|
||||
templateUrl: "assets/views/entry_correction.html",
|
||||
resolve: loadSequence('entrycorrectionCtrl','ngTable', 'ladda', 'angular-ladda'),
|
||||
title: 'coursecorrection',
|
||||
ncyBreadcrumb: {
|
||||
label: 'coursecorrection'
|
||||
},
|
||||
|
||||
});
|
||||
|
||||
// $locationProvider.html5Mode(true);
|
||||
|
||||
|
||||
268
Apollo/assets/js/controllers/entrycorrectionCtrl.js
Normal file
268
Apollo/assets/js/controllers/entrycorrectionCtrl.js
Normal file
@ -0,0 +1,268 @@
|
||||
'use strict';
|
||||
/*** controller***/
|
||||
app.controller('entrycorrectionCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableParams", "API_POINTS", "$localStorage", "$http", "$state","$modal","$log",
|
||||
function ($scope,$rootScope,toaster, $filter, ngTableParams, apiPoint, $localStorage, $http, $state,$modal,$log){
|
||||
|
||||
//function ($scope, apiPoint, $http, SweetAlert, $state,$modal, md5, ipCookie, $window, dateListDescService) {
|
||||
|
||||
// DataTables configurable options
|
||||
|
||||
|
||||
$scope.filters = {
|
||||
|
||||
"Date": "",
|
||||
//"to_date": "",
|
||||
|
||||
};
|
||||
|
||||
|
||||
|
||||
// $scope.initHead = function() {
|
||||
|
||||
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');
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
$scope.universitySearchData = '';
|
||||
|
||||
$scope.init = function()
|
||||
{
|
||||
|
||||
// alert()
|
||||
var getuniv = {
|
||||
method: 'POST',
|
||||
url: apiPoint.url + 'AllgetUniversity/',
|
||||
headers: {
|
||||
'Content-Type': 'application/json'
|
||||
},
|
||||
|
||||
data: {
|
||||
|
||||
branchId: JSON.parse(localStorage.getItem('localObj')).localBranchID,
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
$http(getuniv).then(function (response) {
|
||||
|
||||
if(response.status == 200)
|
||||
{
|
||||
$scope.universitySearchData=response.data.details;
|
||||
|
||||
//console.log($scope.universitySearchData);
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
|
||||
};
|
||||
|
||||
|
||||
|
||||
$scope.studentInfo="";
|
||||
$scope.getStudentDetails = function (form,myModel)
|
||||
{
|
||||
|
||||
if(myModel !=undefined)
|
||||
{
|
||||
var mobileNumber = myModel.mobileNumber;
|
||||
var studentName = myModel.studentName;
|
||||
var receipt = myModel.receipt;
|
||||
$scope.universityId = myModel.myUnivSearch;
|
||||
// console.log($scope.universityId);
|
||||
// return false;
|
||||
|
||||
$scope.isLoaderShow= false
|
||||
|
||||
var getdetail = {
|
||||
method: 'POST',
|
||||
url: apiPoint.url + 'getAllstudentcoursedetail/',
|
||||
headers: {
|
||||
'Content-Type': 'application/json'
|
||||
},
|
||||
data :{
|
||||
studentName: myModel.studentName,
|
||||
mobileNumber: myModel.mobileNumber,
|
||||
receipt: myModel.receipt,
|
||||
University:$scope.universityId,
|
||||
requestedtBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
|
||||
branchId: JSON.parse(localStorage.getItem('localObj')).localBranchID,
|
||||
requestedDept: JSON.parse(localStorage.getItem('localObj')).localType,
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
$http(getdetail).then(function (response) {
|
||||
|
||||
//console.log(response)
|
||||
if (response.data.status==200 && response.data.studentStatus) {
|
||||
$scope.studentInfo=response.data.details;
|
||||
console.log($scope.studentInfo);
|
||||
|
||||
} else {
|
||||
$scope.studentInfo="";
|
||||
|
||||
$scope.isLoaderShow = true;
|
||||
$scope.load = "No Records Found";
|
||||
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
else
|
||||
{
|
||||
swal('Please Enter Any Field to Continue',"",'error');
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
$scope.OpenWindowStatus = false;
|
||||
$scope.editId = -1;
|
||||
$scope.setEditId = function (P)
|
||||
{ //alert(JSON.stringify(P));
|
||||
|
||||
var feedetails = {
|
||||
method: 'POST',
|
||||
url: apiPoint.url + 'getAllfeedetail/',
|
||||
headers: {
|
||||
'Content-Type': 'application/json'
|
||||
},
|
||||
data :{
|
||||
studentId: P.StudentID,
|
||||
courseId:P.CourseID,
|
||||
University:$scope.universityId,
|
||||
requestedtBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
|
||||
branchId: JSON.parse(localStorage.getItem('localObj')).localBranchID,
|
||||
requestedDept: JSON.parse(localStorage.getItem('localObj')).localType,
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
$http(feedetails).then(function (response) {
|
||||
|
||||
//console.log(response)
|
||||
if (response.data.status==200 && response.data.feeStatus) {
|
||||
$scope.feeInfo=response.data.details;
|
||||
console.log($scope.feeInfo);
|
||||
$scope.editId = P.ID;
|
||||
|
||||
} else {
|
||||
$scope.feeInfo="";
|
||||
$scope.loadfee = "No Records Found";
|
||||
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
|
||||
}
|
||||
|
||||
$scope.close = function ()
|
||||
{
|
||||
$scope.editId = -1;
|
||||
}
|
||||
|
||||
|
||||
|
||||
$scope.updatestatus = function(myModel, form, loading)
|
||||
{
|
||||
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("Please Enter Reason!", "", "error");
|
||||
}
|
||||
else
|
||||
{
|
||||
var IsActive = '';
|
||||
|
||||
if(myModel.IsActive == true)
|
||||
{
|
||||
IsActive =1;
|
||||
}
|
||||
|
||||
else if(myModel.IsActive == false)
|
||||
{
|
||||
IsActive =0;
|
||||
}
|
||||
|
||||
var studentid= myModel.StudentID;
|
||||
var universityid = myModel.UniversityID;
|
||||
var courseId = myModel.CourseID;
|
||||
|
||||
var updatecourse = {
|
||||
method: 'POST',
|
||||
url: apiPoint.url + 'updateCourseDetails/',
|
||||
headers: {
|
||||
'Content-Type': 'application/json'
|
||||
},
|
||||
data: {
|
||||
|
||||
studentid:studentid,
|
||||
universityid:universityid,
|
||||
courseId:courseId,
|
||||
Reason:myModel.Reason,
|
||||
IsActive:IsActive,
|
||||
requestedtBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
|
||||
branchId: JSON.parse(localStorage.getItem('localObj')).localBranchID,
|
||||
requestedDept: JSON.parse(localStorage.getItem('localObj')).localType,
|
||||
}
|
||||
};
|
||||
|
||||
$http(updatecourse).then(function (response) {
|
||||
swal('Change Saved Successfully', response.data.message, "success");
|
||||
$scope.close();
|
||||
|
||||
});
|
||||
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}]);
|
||||
|
||||
|
||||
|
||||
|
||||
105
Apollo/assets/views/edit_course.html
Normal file
105
Apollo/assets/views/edit_course.html
Normal file
@ -0,0 +1,105 @@
|
||||
<form name="Form" id="form" novalidate>
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="col-md-12">
|
||||
<fieldset>
|
||||
<legend>
|
||||
Fee Paid Details
|
||||
</legend>
|
||||
<div>
|
||||
<input type="hidden" name="ID" id="ID" ng-model="p.ID">
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<input type="hidden" name="stuid" ng-model="p.StudentID">
|
||||
</div>
|
||||
<div>
|
||||
<input type="hidden" name="uniid" ng-model="p.UniversityID">
|
||||
</div>
|
||||
<div>
|
||||
<input type="hidden" name="courseid" ng-model="p.CourseID">
|
||||
</div>
|
||||
<div>
|
||||
<input type="hidden" name="FeesID" ng-model="p.FeesID">
|
||||
</div>
|
||||
|
||||
<!-- {{feeInfo}} -->
|
||||
<div class="col-md-12">
|
||||
<div class="table-responsive">
|
||||
<table id="datatable" class="table table-hover">
|
||||
<thead>
|
||||
<tr >
|
||||
<th style="font-size: 12px;">BillNO</th>
|
||||
<th style="font-size: 12px;">Receipt No</th>
|
||||
<th style="font-size: 12px">Bill Date</th>
|
||||
<th style="font-size: 12px;">Bill Amount</th>
|
||||
<th style="font-size: 12px;">Mode of Payment</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody ng-repeat="p in feeInfo">
|
||||
<tr>
|
||||
|
||||
<td>{{p.BillNO}}</td>
|
||||
<td>{{p.ReceiptNo}}</td>
|
||||
<td>{{p.BillDate}}</td>
|
||||
<td>{{p.BillAmount}}</td>
|
||||
<td>{{p.ModeOfPayment}}</td>
|
||||
|
||||
|
||||
</tr>
|
||||
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="row">
|
||||
|
||||
<div class="col-md-3 form-group" ng-class="{'has-error':p.Reason.$dirty && p.Reason.$invalid, 'has-success':p.Reason.$valid}">
|
||||
<label>
|
||||
Reason to Deactivate <span class="symbol required"></span>
|
||||
</label>
|
||||
<textarea type="text" placeholder="Enter Reason" tabindex="7" class="form-control" name="Messagebody" ng-model="p.Reason" required></textarea>
|
||||
</div>
|
||||
|
||||
<div class="col-md-3">
|
||||
<label>
|
||||
Active/De-Active
|
||||
</label>
|
||||
<div ng-if="p.IsActive==true">
|
||||
|
||||
<switch ng-model="p.IsActive" ng-init="p.IsActive = true" class="green"></switch>
|
||||
|
||||
</div>
|
||||
<div ng-if="p.IsActive==false">
|
||||
<switch ng-model="p.IsActive" ng-init="p.IsActive = false" class="green"></switch>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="pull-right" ng-if="p.IsActive==true">
|
||||
|
||||
<button type="submit" ladda="ldloading.zoom_in" tabindex="6" class="btn btn-wide btn-success" data-style="zoom-in" ng-click="updatestatus(p,Form,'zoom-in')">
|
||||
Save
|
||||
</button>
|
||||
<input type="button" class="btn btn-warning btn-wide" tabindex="10" value="Cancel" ng-click="close()"></input>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="pull-right" ng-if="p.IsActive==false">
|
||||
<input type="button" class="btn btn-warning btn-wide" tabindex="10" value="Cancel" ng-click="close()"></input>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</fieldset>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
<!-- class="editRowTd" -->
|
||||
181
Apollo/assets/views/entry_correction.html
Normal file
181
Apollo/assets/views/entry_correction.html
Normal file
@ -0,0 +1,181 @@
|
||||
|
||||
|
||||
<style type="text/css">
|
||||
.pad {
|
||||
background-color: #eee;
|
||||
padding: 4px;
|
||||
}
|
||||
.fif {
|
||||
/* background-color: #ddd;*/
|
||||
display: inline-block;
|
||||
margin: 0 175px 0 0;
|
||||
padding: 8px 8px;
|
||||
text-align: left;
|
||||
width: 200px;
|
||||
}
|
||||
|
||||
|
||||
.right {
|
||||
/* background-color: #ddd;*/
|
||||
display: inline-block;
|
||||
/*margin: 0 25px 0 0;*/
|
||||
padding: 1px 1px;
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
|
||||
.rightac {
|
||||
/* background-color: #ddd;*/
|
||||
display: inline-block;
|
||||
margin: 0 175px 0 0;
|
||||
padding: 8px 8px;
|
||||
text-align: left;
|
||||
width: 200px;
|
||||
}
|
||||
|
||||
.a {
|
||||
word-spacing: 9cm;
|
||||
}
|
||||
|
||||
|
||||
|
||||
</style>
|
||||
|
||||
|
||||
|
||||
<section id="page-title">
|
||||
<div class="row">
|
||||
<div class="col-sm-8">
|
||||
<h1 class="mainTitle">COURSE CORRECTION</h1>
|
||||
</div>
|
||||
<!-- <div ncy-breadcrumb></div> -->
|
||||
</div>
|
||||
</section>
|
||||
<style>
|
||||
/* .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="entrycorrectionCtrl" data-ng-init="init()">
|
||||
<form name="Form" id="form" novalidate method="post">
|
||||
|
||||
|
||||
|
||||
<div class="row">
|
||||
<fieldset>
|
||||
<legend>Search</legend>
|
||||
<div class="row">
|
||||
<div class="col-md-3 form-group" ng-class="{'has-error':Form.mobilenumber.$dirty && Form.mobilenumber.$invalid}">
|
||||
<label>
|
||||
Mobile Number
|
||||
</label>
|
||||
|
||||
<input type="text" placeholder="Search Mobile Number" ladda="ldloading1.zoom_in" data-style="zoom-in"
|
||||
autofocus tabindex="1" class="form-control" name="mobilenumber" id="mobilenumber" ng-minlength="10" ng-maxlength="12"
|
||||
ng-model="myModel.mobileNumber" ng-pattern="/^[0-9]*$/"/>
|
||||
<span class="error text-small block"
|
||||
ng-if="Form.mobilenumber.$error.maxlength || Form.mobilenumber.$error.minlength || Form.mobilenumber.$error.pattern">Enter a valid mobile number</span>
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
<div class="col-md-3 form-group">
|
||||
<label>
|
||||
Student First Name
|
||||
</label>
|
||||
|
||||
<input type="text" placeholder="Search Student Name"
|
||||
tabindex="2" class="form-control" name="studentname"
|
||||
ng-model="myModel.studentName" ng-pattern="/^[a-zA-Z.\s]*$/" />
|
||||
<span class="error text-small block"
|
||||
ng-if="Form.studentname.$dirty && Form.studentname.$error.pattern">Invalid student name </span>
|
||||
</div>
|
||||
<!-- <div class="col-md-3 form-group">
|
||||
<label>
|
||||
RECEIPT NUMBER
|
||||
</label>
|
||||
<input type="text" placeholder="Search Receipt Number"
|
||||
tabindex="2" class="form-control" name="receipt"
|
||||
ng-model="myModel.receipt" />
|
||||
|
||||
</div> -->
|
||||
|
||||
<div class="col-md-3 form-group">
|
||||
<label>University</label>
|
||||
<select class="form-control" tabindex="3" class="cs-select cs-skin-elastic" name="university" ng-model="myModel.myUnivSearch"
|
||||
ng-click="getEmployeeList()">
|
||||
|
||||
<option value="" selected>Select University</option>
|
||||
<option ng-repeat="item in universitySearchData" value="{{item.UniversityID}}">{{item.UniversityName}}</option>
|
||||
|
||||
|
||||
</select>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="col-md-2" style="padding-top: 2.3%;">
|
||||
<div class="pull-right">
|
||||
<button type="submit" ng-click="getStudentDetails(Form,myModel);" class="btn btn-success btn-o" tabindex="8">
|
||||
Submit
|
||||
</button>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</fieldset>
|
||||
|
||||
</div>
|
||||
|
||||
<div ng-if="isLoaderShow">
|
||||
<center> <h1>{{load}}</h1> </center>
|
||||
</div>
|
||||
<!-- {{studentInfo}} -->
|
||||
|
||||
<div class="col-md-12">
|
||||
<div class="table-responsive">
|
||||
<table id="datatable" class="table table-hover">
|
||||
<thead>
|
||||
<tr >
|
||||
<th style="font-size: 12px;">Mobile</th>
|
||||
<th style="font-size: 12px;">Name</th>
|
||||
<th style="font-size: 12px">Course</th>
|
||||
<th style="font-size: 12px;">University</th>
|
||||
<th style="font-size: 12px;">Action</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody dir-paginate="p in studentInfo|filter:search:strict|itemsPerPage:10">
|
||||
<tr>
|
||||
|
||||
<td>{{p.MobileNumber}}</td>
|
||||
<td>{{p.Firstname}} {{p.Lastname}}</td>
|
||||
<td>{{p.CourseName}}</td>
|
||||
<td>{{p.UniversityName}}</td>
|
||||
<td><span><a class="text-azure" id="editRowBtn{{p.ID}}" ng-click="setEditId(p);"><b class="glyphicon glyphicon-pencil" tooltip="Edit Details" aria-hidden="true"></b></a> </span></td>
|
||||
<!-- <td></td> -->
|
||||
</tr>
|
||||
<tr ng-show="editId === p.ID" ng-if="editId === p.ID">
|
||||
<td colspan="12" ng-include src="'assets/views/edit_course.html'"></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<dir-pagination-controls direction-links="true" boundary-links="true">
|
||||
</dir-pagination-controls>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
</form>
|
||||
|
||||
|
||||
@ -530,6 +530,29 @@
|
||||
</a>
|
||||
|
||||
</li>-->
|
||||
|
||||
<li ng-class="{'active open':$state.includes('app.entry')}">
|
||||
<a href="javascript:void(0)">
|
||||
<div class="item-content">
|
||||
<div class="item-media">
|
||||
<i class="ti-pencil"></i>
|
||||
</div>
|
||||
<div class="item-inner">
|
||||
<span class="title" translate="sidebar.nav.master.ENTRY"> ENTRY </span><i class="icon-arrow"></i>
|
||||
</div>
|
||||
</div>
|
||||
</a>
|
||||
|
||||
<ul class="sub-menu">
|
||||
|
||||
<li ui-sref-active="active">
|
||||
<a ui-sref="app.entry.coursecorrection" ng-click="checkSuperAdmin()">
|
||||
<span class="title" translate="sidebar.nav.entry.coursecorrection">COURSECORRECTION</span>
|
||||
</a>
|
||||
</li>
|
||||
|
||||
</ul>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
<!-- end: Super Admin -->
|
||||
|
||||
Loading…
Reference in New Issue
Block a user