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-11 13:05:26 +05:30
commit de7cee569a
12 changed files with 129 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,7 +16,7 @@ class HallTickets_Controller extends REST_Controller {
function __construct()
{
// Construct the parent class
// Construct the parent class
parent::__construct();
// Configure limits on our controller methods
@ -320,13 +320,27 @@ class HallTickets_Controller extends REST_Controller {
$branchId = $this->post('branchId');
$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->getExistDetailsfileupload($university,$courseArray,$branchId);
// print_r( $data['subjectDetails']);
if($data['subjectDetails'] == 1 )
$fileArray = array();
foreach($filedetails as $filedetailsarray)
{
$fileArray[]=$filedetailsarray['SubjectID'];
}
$data['subjectDetails'] = $this->Hallticket_model->getExistDetailsfileupload($university,$courseArray,$branchId);
// print_r( $data['subjectDetails']);
if($data['subjectDetails'] == 1 )
{
foreach($courseArray as $CourseDatialArray)
$data['SubjectMappingDetails'] = $this->Hallticket_model->getSubjectMappingDetails($university,$courseArray,$branchId);
$maparray=array();
foreach ( $data['SubjectMappingDetails'] as $object)
{
$maparray[]=$object->SubjectCode;
}
if ($fileArray == $maparray)
{
foreach($courseArray as $CourseDatialArray)
{
$course=$CourseDatialArray;
$schedulemaster = array('UniversityID'=>$university,'CourseID'=>$course,'BranchCode'=>$branchId,'CreatedBy'=>$requestedBy,'CreatedOn'=>$CreatedOn);
@ -355,28 +369,35 @@ class HallTickets_Controller extends REST_Controller {
'status' => REST_Controller::HTTP_NOT_FOUND
], REST_Controller::HTTP_NOT_FOUND);
}
}
}
else
{
$this->response([
'message' => 'Records Do Not Match With Mapped Subjects!',
'status' => REST_Controller::HTTP_NOT_FOUND
], REST_Controller::HTTP_NOT_FOUND);
}
}
// else if($data['subjectDetails'] == 0)
else
{
$this->response([
'message' => 'Please Mapping the course supject!',
'message' => ' Course Mapping for the Subject Not Found !',
'status' => REST_Controller::HTTP_NOT_FOUND
], REST_Controller::HTTP_NOT_FOUND);
}
// else{
// $this->response([
// 'message' => 'No records found!',
// 'status' => REST_Controller::HTTP_NOT_FOUND
// ], REST_Controller::HTTP_NOT_FOUND);
// }
/////////////////////
}
public function SaveAllBatchSchedule_post()

43
Apollo/api/application/models/Hallticket_model.php
View File

@ -10,7 +10,7 @@
class Hallticket_model extends CI_Model
{
/*
* get university details
* created by velz
@ -122,7 +122,7 @@ class Hallticket_model extends CI_Model
and bsm.CourseID=semmaster.CourseID
LEFT JOIN T_Batch_Schedule_Child bsc ON bsc.SchId = bsm.SchId and bsc.SubjectID=semchild.SubjectID
LEFT JOIN T_SubjectMaster sm ON sm.SubjectID=semchild.SubjectID
WHERE semchild.isActive = '1' and bsm.SchId='".$mapid."'
WHERE semchild.isActive = '1' and bsm.SchId='".$mapid."'
group by semchild.SubjectID,semchild.MapID";
$b=$this->db->query($sql);
//print_r($b);
@ -135,8 +135,8 @@ group by semchild.SubjectID,semchild.MapID";
$this->db->select('T_Batch_Schedule_Child.SchId,T_Batch_Schedule_Child.SubjectID,T_Batch_Schedule_Child.ScheduleDate,T_Batch_Schedule_Child.FromTime,T_Batch_Schedule_Child.ToTime,T_Batch_Schedule_Child.SchChildId,T_Batch_Schedule_Child.SchId');
$this->db->from('T_Batch_Schedule_Master SCM');
$this->db->join('T_Batch_Schedule_Child','T_Batch_Schedule_Child.SchId = SCM.SchId');
//$this->db->where('SCM.BranchCode',$branchcode);
// $this->db->where('T_Batch_Schedule_Child.SchId',$mapid);
$this->db->where('SCM.BranchCode',$branchcode);
$this->db->where('T_Batch_Schedule_Child.SchId',$mapid);
$this->db->where('T_Batch_Schedule_Child.SubjectID',$row->SubjectID);
$existsheduledetails = $this->db->get();
//print_r($existsheduledetails);
@ -200,16 +200,16 @@ group by semchild.SubjectID,semchild.MapID";
public function getExistDetailsfileupload($universityID,$courseIDS,$branchId)
{
// print_r($courseIDS);
// echo $universityID;
$i=0;
foreach($courseIDS as $c)
{
// $tempCourseArray= $c['CourseID'];
$this->db->select ('count(*) as count');
$this->db->select ('count(*) as count,T_SemSubMap_Child.SubjectID');
$this->db->from('T_SemSubMap_Master');
$this->db->join('T_SemSubMap_Child','T_SemSubMap_Child.MapID=T_SemSubMap_Master.MapID');
$this->db->where('UniversityID',$universityID);
$this->db->where('CourseID',$c);
$result = $this->db->get();
@ -235,6 +235,35 @@ public function getExistDetailsfileupload($universityID,$courseIDS,$branchId)
* @params university id and CourseID
* created by Bala
* */
public function getSubjectMappingDetails($universityID,$courseIDS,$branchId)
{
foreach($courseIDS as $c)
{
// $tempCourseArray= $c['CourseID'];
$this->db->select ('T_SubjectMaster.SubjectCode');
$this->db->from('T_SemSubMap_Master');
$this->db->join('T_SemSubMap_Child','T_SemSubMap_Child.MapID=T_SemSubMap_Master.MapID');
$this->db->join('T_SubjectMaster','T_SubjectMaster.SubjectID=T_SemSubMap_Child.SubjectID');
$this->db->where('T_SemSubMap_Master.UniversityID',$universityID);
$this->db->where('T_SemSubMap_Master.CourseID',$c);
$this->db->where('T_SubjectMaster.BranchCode',$branchId);
$result = $this->db->get();
}
return $result->result();
}
/*
* check existing data,only batchschedule.
* @params university id and CourseID
* created by Bala
* */
public function getExistDetails($universityID,$courseIDS,$branchId)
{

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

@ -146,6 +146,10 @@ $scope.universitySearchData = '';
$scope.OpenWindowStatus = false;
$scope.editId = -1;
$scope.courselist ='';
$scope.loadfee='';
$scope.feecheck=false;
$scope.setEditId = function (P)
{ //alert(JSON.stringify(P));
@ -173,11 +177,16 @@ $scope.universitySearchData = '';
$scope.feeInfo=response.data.details;
console.log($scope.feeInfo);
$scope.editId = P.ID;
$scope.courselist =true;
$scope.feecheck=false;
} else {
$scope.feeInfo="";
$scope.loadfee = "No Records Found";
$scope.courselist =false;
$scope.feecheck=true;
$scope.editId = P.ID;
}
});

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

@ -14,7 +14,7 @@ app.controller('schCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableP
$scope.myModelAdd = {
"date": "",
"periodStart": "",
"periodStart": "",
"periodEnd":"",
};
@ -384,7 +384,7 @@ $scope.UploadFileData = function (FileDetails,myModel,courseDetails) {
swal("", "Saved Successfully", "success");
$state.go($state.current, {}, {reload: true});
} else {
swal("", "Please Mapping the course supject", "error");
swal("",response.data.message, "error");
$state.go($state.current, {}, {reload: true});
}
},function(error){

13
Apollo/assets/js/controllers/studentCtrl.js
View File

@ -721,12 +721,15 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams",
$scope.editId = -1;
$scope.editCourseId = -1;
$scope.setEditId = function (unique_id, id) {
// alert()
$scope.editId = unique_id;
$scope.editCourseId = -1;
$scope.studentViewPage = -1;
}
$scope.setEditCourseId = function (unique_id,id) {
$scope.list = false;
$scope.getStudentCourseList(id);
$scope.currentStudentId = id;
@ -837,6 +840,8 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams",
// get Student Course List
$scope.getStudentCourseList = function (studentId) {
console.log('in')
$scope.courseEditLoading = true;
$scope.list = true;
$scope.courseEdit = false;
@ -1740,11 +1745,15 @@ app.controller('studentSuperAdminCtrl', ["$scope", "toaster", "$filter", "ngTabl
$scope.editId = -1;
$scope.editCourseId = -1;
$scope.setEditId = function (uniqe_id ,id) {
// alert()
$scope.editId = uniqe_id;
$scope.editCourseId = -1;
}
$scope.setEditCourseId = function (uniqe_id ,id) {
//alert('1');
$scope.list = false;
$scope.getStudentCourseList(id);
$scope.currentStudentId = id;
@ -1752,6 +1761,7 @@ app.controller('studentSuperAdminCtrl', ["$scope", "toaster", "$filter", "ngTabl
$scope.editCourseId = uniqe_id;
$scope.editId = -1;
$scope.courseEditLoading = true;
$scope.courselist = true;
}
@ -1879,6 +1889,9 @@ app.controller('studentSuperAdminCtrl', ["$scope", "toaster", "$filter", "ngTabl
$scope.studentCourseList = response.data.course_details;
// $scope.stucour = $scope.studentCourse[0];
} else {
$scope.courselist = false;
$scope.courseEditLoading='';
}
});
}

12
Apollo/assets/views/edit_course.html
View File

@ -1,6 +1,8 @@
<form name="Form" id="form" novalidate>
<div class="row">
<div class="col-md-12">
<div class="col-md-12">
<fieldset>
@ -26,7 +28,15 @@
<!-- {{feeInfo}} -->
<div class="col-md-12">
<!-- <div ng-if="feecheck==true">
<div align="center" style="font-weight: bold; font-size:20 ">
{{loadfee}}
</div>
</div> -->
<div ng-if="courselist == false" class="text-center">
<h3>No Records Found</h3>
</div>
<div class="col-md-12" ng-if="courselist == true">
<!-- {{feeInfo}} -->
<div class="table-responsive">
<table id="datatable" class="table table-hover">

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

@ -167,6 +167,8 @@
<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>

5
Apollo/assets/views/hallticket/batchshedule.html
View File

@ -16,7 +16,7 @@
}
a {
color: #007AFF;
color: #007AFF;
}
</style>
@ -167,7 +167,8 @@
<fieldset>
<js-xls onread="readUploadBatchDetails" onerror="error"></js-xls>
<br>
<a href="https://www.w3schools.com/html/" target="_top">Sample Format</a>
<a target="_blank" href="C:\xampp\htdocs\apollodec\Apollo\images\Batchschedule.xlsx">Sample Format</a>
<button type="button" class="btn btn-success btn-o" style="float: right" ng-click="UploadFileData(extractFileDetails,myModel,selectedCourseNameC)"> Submit</button>
</fieldset>

2
Apollo/assets/views/hallticket/editShedule.html
View File

@ -6,7 +6,7 @@
<legend>
Update Schedule Details
</legend>
<div class="row" >
<div class="row" >
<div class="panel panel-white" id="sub">
<div class="panel-heading border-light">
<!--<h4 class="panel-title text-pink">Schedule Details</h4>

7
Apollo/assets/views/student/editStudentCourseDetails.html
View File

@ -6,12 +6,15 @@
})
</script>
<div ng-if="courseEditLoading == true" class="text-center">
<!--<img src="assets/images/ajax_loader_blue.gif" style="width: 5%; height: 30%">-->
<!-- <img src="assets/images/ajax_loader_blue.gif" style="width: 5%; height: 30%"> -->
<h3>Fetching ...</h3>
</div>
<div ng-if="courselist == false" class="text-center">
<h3>No Records Found</h3>
</div>
<div class="col-md-12">
<fieldset ng-if="courseEditLoading == false">
<fieldset ng-if="courseEditLoading == false && courselist == true">
<legend>
Course Details
</legend>

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

@ -167,7 +167,7 @@
</th>
</tr>
</thead>
<tbody dir-paginate="p in data|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10| filter:query as results">
<tbody dir-paginate="p in data|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10| filter:query as results" pagination-id="startSearchList">
<tr>
<td>
<i class="glyphicon glyphicon-list-alt" tooltip="Status Details" ng-click="statusUpdate(p.ID);"></i>
@ -307,7 +307,7 @@
</tr>
</tbody>
</table>
<dir-pagination-controls max-size="10" direction-links="true" boundary-links="true">
<dir-pagination-controls pagination-id="startSearchList" max-size="10" direction-links="true" boundary-links="true">
</dir-pagination-controls>
</div>
@ -460,7 +460,7 @@
<th>Amount</th>
</thead>
<tbody dir-paginate="p in draftListDetails|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10| filter:query as results">
<tbody dir-paginate="p in draftListDetails|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10| filter:query as results" pagination-id="draftListDetails">
<tr>
<td>
<i class="ti-receipt" tooltip="Add To List" ng-click="addToList(p.ID);"></i>
@ -673,7 +673,7 @@
</tr>
</tbody>
</table>
<dir-pagination-controls max-size="10" direction-links="true" boundary-links="true">
<dir-pagination-controls pagination-id="draftListDetails" max-size="10" direction-links="true" boundary-links="true">
</dir-pagination-controls>
</div>
</div>
@ -779,7 +779,7 @@
<th>CourseFee</th>
<th>Amount</th>
</thead>
<tbody dir-paginate="p in unMatchedRecordDetails|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10| filter:query as results">
<tbody dir-paginate="p in unMatchedRecordDetails|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10| filter:query as results" pagination-id="missMatchListDetails" >
<tr>
<td>{{p.FormID}}</td>
<td>{{p.FormType}}</td>
@ -791,7 +791,7 @@
</tr>
</tbody>
</table>
<dir-pagination-controls max-size="10" direction-links="true" boundary-links="true">
<dir-pagination-controls pagination-id="missMatchListDetails" max-size="10" direction-links="true" boundary-links="true">
</dir-pagination-controls>
</div>
</div>

BIN
Apollo/images/Batchschedule.xlsx Normal file
View File

Binary file not shown.