SEM in batch sechedule issue no 1614
This commit is contained in:
venbatechnologies@gmail.com
parent
5d22a7454a
commit
ed05f4c77a
@ -389,6 +389,8 @@ $route['getStudentListForRegistrer'] = 'Reregister_Controller/getStudentListForR
|
||||
$route['getSubject'] = 'Reregister_Controller/getSubject';
|
||||
$route['getUniversityCourseDetailsforms'] = 'Reregister_Controller/getUniversityCourseDetailsforms';
|
||||
|
||||
$route['CourseSemDetails'] = 'HallTickets_Controller/CourseSemDetails';
|
||||
|
||||
///PROMOTE BATCH AND
|
||||
$route['getUniversityBatchDetails'] = 'Reregister_Controller/getUniversityBatchDetails';
|
||||
$route['getStudentListForPromoteBatch'] = 'Reregister_Controller/getStudentListForPromoteBatch';
|
||||
|
||||
@ -98,6 +98,30 @@ class HallTickets_Controller extends REST_Controller {
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
public function CourseSemDetails_post()
|
||||
{
|
||||
$CourseID = $this->post('CourseId');
|
||||
|
||||
$GetCourseDetails = $this->Hallticket_model->Get_Select_CourseDetails($CourseID);
|
||||
|
||||
if ($GetCourseDetails)
|
||||
{
|
||||
$GetCourseDetails['status'] = REST_Controller::HTTP_OK;
|
||||
|
||||
$this->response($GetCourseDetails, REST_Controller::HTTP_OK);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
$this->response([
|
||||
'message' => 'No records found!',
|
||||
'status' => REST_Controller::HTTP_NOT_FOUND
|
||||
], REST_Controller::HTTP_NOT_FOUND);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
@ -184,6 +208,7 @@ class HallTickets_Controller extends REST_Controller {
|
||||
$courseIDS = $this->post('courseID');
|
||||
$requestedBy = $this->post('requestedBy');
|
||||
$branchId = $this->post('branchId');
|
||||
$Sem_Year = $this->post('Sem_Year');
|
||||
$tempCourseArray = array();
|
||||
foreach($courseIDS as $val)
|
||||
{
|
||||
@ -193,7 +218,7 @@ class HallTickets_Controller extends REST_Controller {
|
||||
//print_r($value);
|
||||
}
|
||||
|
||||
$data['subjectDetails'] = $this->Hallticket_model->getExistDetails($universityID,$tempCourseArray,$branchId);
|
||||
$data['subjectDetails'] = $this->Hallticket_model->getExistDetails($universityID,$tempCourseArray,$branchId,$Sem_Year);
|
||||
// print_r( $data['subjectDetails']);
|
||||
// die();
|
||||
//$data['semesterDetails'] = $this->Hallticket_model->getSemesterDetails($universityID,$tempCourseArray);
|
||||
@ -414,14 +439,16 @@ class HallTickets_Controller extends REST_Controller {
|
||||
//$courseid= $this->post('getcourseid');
|
||||
$requestedBy = $this->post('requestedBy');
|
||||
$branchId = $this->post('branchId');
|
||||
|
||||
$Sem_Year = $this->post('Sem_Year');
|
||||
$Cdate = new DateTime('now',new DateTimeZone('Asia/Kolkata'));
|
||||
$CreatedOn = $Cdate->format('Y-m-d H:i:s');
|
||||
$CourseDatialArray = $this->post('courseDetails');
|
||||
foreach($CourseDatialArray as $coursedetails)
|
||||
{
|
||||
$course=$coursedetails;
|
||||
$schedulemaster = array('UniversityID'=>$university,'CourseID'=>$course,'BranchCode'=>$branchId,'CreatedBy'=>$requestedBy,'CreatedOn'=>$CreatedOn);
|
||||
$schedulemasteradd = $this->Hallticket_model->AddBatchScheduleMaster($schedulemaster,$detailArray);
|
||||
$schedulemaster = array('UniversityID'=>$university,'CourseID'=>$course,'BranchCode'=>$branchId,'CreatedBy'=>$requestedBy,'CreatedOn'=>$CreatedOn,'SEM_Year'=>$Sem_Year);
|
||||
$schedulemasteradd = $this->Hallticket_model->AddBatchScheduleMaster($schedulemaster,$detailArray,$Sem_Year);
|
||||
|
||||
}
|
||||
//print_r($CourseDatialArray);
|
||||
|
||||
@ -289,18 +289,29 @@ class Employee_model extends CI_Model
|
||||
} else {
|
||||
// res for Admin
|
||||
$staffId = $this->selfGetEmpId($reqUserID);
|
||||
$subQuery = "SELECT t1.BranchCode, t1.BranchName
|
||||
FROM T_BranchMaster as t1
|
||||
LEFT JOIN T_Staff_BranchAccess as t2 ON t2.StaffID = '$staffId'
|
||||
WHERE t1.BranchCode='$branchId' and t2.ListCode='$listcode'
|
||||
// $subQuery = "SELECT t1.BranchCode, t1.BranchName
|
||||
// FROM T_BranchMaster as t1
|
||||
// LEFT JOIN T_Staff_BranchAccess as t2 ON t2.StaffID = '$staffId'
|
||||
// WHERE t1.BranchCode='$branchId' and t2.ListCode='$listcode'
|
||||
|
||||
AND t1.IsActive = 1
|
||||
AND t2.IsActive = 1
|
||||
group by t1.BranchCode";
|
||||
// AND t1.IsActive = 1
|
||||
// AND t2.IsActive = 1
|
||||
// group by t1.BranchCode";
|
||||
|
||||
|
||||
$subQuery="SELECT t1.BranchCode, t1.BranchName
|
||||
FROM T_BranchMaster as t1
|
||||
LEFT JOIN T_Staff_BranchAccess as t2 ON t2.BranchCode = t1.BranchCode
|
||||
WHERE t2.StaffID='$staffId' and t2.ListCode='$listcode' AND t1.IsActive = 1 AND t2.IsActive = 1 group by t1.BranchCode";
|
||||
|
||||
|
||||
$mBranchDetails = $this->db->query($subQuery);
|
||||
$results['MeasterBranchDetailStatus'] = true;
|
||||
$results['branch_details'] = $mBranchDetails->result();
|
||||
}
|
||||
|
||||
|
||||
// print_r($this->db->last_query());die();
|
||||
return $results;
|
||||
|
||||
}
|
||||
|
||||
@ -200,7 +200,7 @@ group by semchild.SubjectID,semchild.MapID";
|
||||
}
|
||||
public function getExistDetailsfileupload($universityID,$courseIDS,$branchId)
|
||||
{
|
||||
|
||||
|
||||
|
||||
$i=0;
|
||||
foreach($courseIDS as $c)
|
||||
@ -266,22 +266,43 @@ public function getSubjectMappingDetails($universityID,$courseIDS,$branchId)
|
||||
* created by Bala
|
||||
* */
|
||||
|
||||
public function getExistDetails($universityID,$courseIDS,$branchId)
|
||||
public function getExistDetails($universityID,$courseIDS,$branchId,$Sem_Year)
|
||||
{
|
||||
|
||||
// echo $Sem_Year;
|
||||
// echo substr($Sem_Year, -1);
|
||||
$sem_yr_no ='';
|
||||
|
||||
if($Sem_Year !='Regular')
|
||||
{
|
||||
$sem_yr_no = substr($Sem_Year, -1);
|
||||
}
|
||||
|
||||
else
|
||||
{
|
||||
$sem_yr_no ='';
|
||||
}
|
||||
|
||||
$i=0;
|
||||
foreach($courseIDS as $c)
|
||||
{
|
||||
|
||||
// $tempCourseArray= $c['CourseID'];
|
||||
|
||||
$this->db->select ('count(*) as count');
|
||||
$this->db->select ('count(*) as count');
|
||||
$this->db->from('T_Batch_Schedule_Master');
|
||||
$this->db->where('UniversityID',$universityID);
|
||||
$this->db->where('CourseID', $c);
|
||||
|
||||
if($Sem_Year !='Regular')
|
||||
{
|
||||
$this->db->where('SEM_Year =',$Sem_Year);
|
||||
}
|
||||
// $this->db->where('BranchCode',$branchId);
|
||||
$result = $this->db->get();
|
||||
$res = $result->result();
|
||||
|
||||
//print_r($this->db->last_query());die();
|
||||
|
||||
if($res[0]->count > 0 )
|
||||
{
|
||||
@ -305,6 +326,10 @@ public function getSubjectMappingDetails($universityID,$courseIDS,$branchId)
|
||||
$this->db->join('T_SemSubMap_Master SMM','SMM.mapID = SC.mapID');
|
||||
$this->db->where('SMM.UniversityID',$universityID);
|
||||
$this->db->where('SMM.CourseID',$c);
|
||||
if($sem_yr_no != '')
|
||||
{
|
||||
$this->db->where('SMM.SemesterID',$sem_yr_no);
|
||||
}
|
||||
$result = $this->db->get();
|
||||
return $result->result();
|
||||
}
|
||||
@ -1393,9 +1418,13 @@ public function getSubjectMappingDetails($universityID,$courseIDS,$branchId)
|
||||
|
||||
}
|
||||
|
||||
public function AddBatchScheduleMaster($schedulemaster,$detailArray)
|
||||
public function AddBatchScheduleMaster($schedulemaster,$detailArray,$Sem_Year)
|
||||
{
|
||||
|
||||
$Sem_Year = $Sem_Year;
|
||||
|
||||
//echo $Sem_Year;die();
|
||||
|
||||
$this->db->trans_start();
|
||||
$this->db->insert('T_Batch_Schedule_Master', $schedulemaster);
|
||||
$insert_id = $this->db->affected_rows();
|
||||
@ -1547,4 +1576,30 @@ public function getSubjectMappingDetails($universityID,$courseIDS,$branchId)
|
||||
return $result_array;
|
||||
}
|
||||
|
||||
|
||||
|
||||
public function Get_Select_CourseDetails($CourseID)
|
||||
{
|
||||
$this->db->select('CourseID,Sem_Year');
|
||||
$this->db->from('T_Course_Fees_Details');
|
||||
$this->db->where('CourseID',$CourseID);
|
||||
|
||||
$CourseDetails = $this->db->get()->result();
|
||||
|
||||
if($CourseDetails)
|
||||
{
|
||||
$result_array['searchst'] = true;
|
||||
$result_array['details'] = $CourseDetails;
|
||||
}
|
||||
|
||||
else
|
||||
{
|
||||
$result_array['searchst'] = false;
|
||||
$result_array['details'] = "No records found!";
|
||||
}
|
||||
|
||||
//print_r($result_array);die();
|
||||
return $result_array;
|
||||
}
|
||||
|
||||
}
|
||||
@ -124,6 +124,7 @@ app.controller('schCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableP
|
||||
|
||||
//Assign Courses to Course array for Multiple select
|
||||
$scope.getuniversity = function(){
|
||||
|
||||
$scope.selectedUniversityCourseName = $scope.myModel.universityName.courseDetails;
|
||||
if($scope.selectedUniversityCourseName.length == 0){ swal('No Courses Available','','info'); }
|
||||
$scope.selectedCourseNameC = {
|
||||
@ -133,6 +134,55 @@ app.controller('schCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableP
|
||||
}
|
||||
|
||||
|
||||
$scope.Sem_Year_Details='';
|
||||
|
||||
$scope.check = function(selectedCourseNameC)
|
||||
{
|
||||
var first_CourseId = selectedCourseNameC.first();
|
||||
|
||||
console.log(first_CourseId)
|
||||
if((first_CourseId == '')||(first_CourseId == undefined) ||(first_CourseId == null))
|
||||
{
|
||||
$scope.Sem_Year_Details='';
|
||||
}
|
||||
|
||||
|
||||
var get_CourseSem_details = {
|
||||
|
||||
method: 'POST',
|
||||
url: apiPoint.url + 'CourseSemDetails/',
|
||||
headers: {
|
||||
'Content-Type': 'application/json'
|
||||
},
|
||||
data: {
|
||||
CourseId: first_CourseId,
|
||||
branch: JSON.parse(localStorage.getItem('localObj')).localBranchID
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
$http(get_CourseSem_details).then(function (response) {
|
||||
|
||||
// console.log(response.data.status);
|
||||
if(response.data.status == 200)
|
||||
{
|
||||
$scope.Sem_Year_Details = response.data.details
|
||||
|
||||
//console.log($scope.Sem_Year_Details);
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
|
||||
}
|
||||
|
||||
Array.prototype.first = function ()
|
||||
{
|
||||
return this[0];
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
* get course semester,subjects details
|
||||
* created by TamilBala
|
||||
@ -141,7 +191,7 @@ app.controller('schCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableP
|
||||
var course='';
|
||||
$scope.getSemSubDetails = function(UID,COURSES){
|
||||
course=COURSES;
|
||||
//alert(course)
|
||||
//console.log($scope.myModel.Sem_Year);return false;
|
||||
var firstError = null;
|
||||
if (form.$invalid) {
|
||||
|
||||
@ -162,7 +212,8 @@ app.controller('schCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableP
|
||||
else
|
||||
{
|
||||
|
||||
|
||||
var Sem_Year =$scope.myModel.Sem_Year;
|
||||
|
||||
if(UID == undefined || UID == '')
|
||||
{
|
||||
swal("Select University");
|
||||
@ -173,7 +224,15 @@ app.controller('schCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableP
|
||||
swal("Select Course");
|
||||
return false;
|
||||
}
|
||||
$scope.editId=1;
|
||||
|
||||
// if(Sem_Year == undefined || Sem_Year =='')
|
||||
// {
|
||||
// swal("Select Sem/Year");
|
||||
// return false;
|
||||
|
||||
// }
|
||||
|
||||
$scope.editId=1;
|
||||
$scope.semDropDownShowLoading = false;
|
||||
$scope.semDropDownShow = false;
|
||||
$scope.semDropDownShowLoading = true;
|
||||
@ -186,6 +245,7 @@ app.controller('schCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableP
|
||||
data: {
|
||||
universityID : UID,
|
||||
courseID : COURSES,
|
||||
Sem_Year : Sem_Year,
|
||||
requestedBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
|
||||
branchId:JSON.parse(localStorage.getItem('localObj')).localBranchID
|
||||
}
|
||||
@ -399,6 +459,8 @@ $scope.UploadFileData = function (FileDetails,myModel,courseDetails) {
|
||||
$scope.saveAll= function(myModel,courseDetails,subjectsDetails)
|
||||
{
|
||||
$scope.courseDetailsArray=courseDetails.list;
|
||||
|
||||
//console.log(myModel.Sem_Year);return false;
|
||||
|
||||
$scope.scheduledDetails=[];
|
||||
|
||||
@ -466,6 +528,7 @@ $scope.UploadFileData = function (FileDetails,myModel,courseDetails) {
|
||||
//getcourseid :courseDetails.list[0],
|
||||
courseDetails : $scope.courseDetailsArray,
|
||||
scheduleDetails : $scope.scheduledDetails,
|
||||
Sem_Year : myModel.Sem_Year,
|
||||
requestedBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
|
||||
branchId:JSON.parse(localStorage.getItem('localObj')).localBranchID
|
||||
|
||||
|
||||
@ -116,7 +116,8 @@
|
||||
<form name="Form" id="form" novalidate ng-submit="batchschedule.submit(Form, myModelAdd,'zoom-in')" method="post">
|
||||
<fieldset>
|
||||
<legend>Search</legend>
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="row">
|
||||
<div class="col-md-3 form-group">
|
||||
<label>
|
||||
University
|
||||
@ -139,7 +140,8 @@
|
||||
<!-- <option value=""> Select Course</option> -->
|
||||
<!-- </select> -->
|
||||
|
||||
<ui-select multiple ng-model="selectedCourseNameC.list" tabindex="2" >
|
||||
<ui-select multiple ng-model="selectedCourseNameC.list" tabindex="2"
|
||||
ng-change="check(selectedCourseNameC.list);">
|
||||
|
||||
<ui-select-match placeholder="Select Courses" >
|
||||
{{$item.CourseName}}
|
||||
@ -152,18 +154,51 @@
|
||||
<!-- <pre>{{selectedCourseNameC.list | json}}</pre> -->
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<!-- <div class="col-md-3">
|
||||
|
||||
<label>Exam Attendance</label>
|
||||
<select class="form-control" name="exam_schedule" tabindex="1" id="exam_schedule"
|
||||
ng-model="myModel.exam_schedule">
|
||||
<option value="-1"> Select University</option>
|
||||
<option value="Morning"> Morning</option>
|
||||
<option value="AfterNoon"> AfterNoon</option>
|
||||
</select>
|
||||
|
||||
</div> -->
|
||||
|
||||
|
||||
<div class="col-md-3 form-group">
|
||||
<label>
|
||||
Sem/Year
|
||||
</label>
|
||||
<select class="form-control" name="Sem_Year" tabindex="1" id="Sem_Year"
|
||||
ng-model="myModel.Sem_Year" placeholder="Select Batch/Sem">
|
||||
<!-- <option value="-1"> Select Sem/Year</option> -->
|
||||
|
||||
<option ng-repeat="sem_yr in Sem_Year_Details" value="{{sem_yr.Sem_Year}}">{{sem_yr.Sem_Year}}</option>
|
||||
</select>
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
<div class="col-md-2 form-group">
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-12">
|
||||
<div class="col-md-3 form-group">
|
||||
<br>
|
||||
<button type="button" ladda="ldloading1.zoom_in" tabindex="3" class="btn btn-wide btn-success" data-style="zoom-in" ng-click="getSemSubDetails(myModel.universityName.universityID,selectedCourseNameC);">MANUAL SCHDULE</button>
|
||||
|
||||
</div>
|
||||
<div class="col-md-1 form group">
|
||||
<div class="col-md-3 form group">
|
||||
<br>
|
||||
<br>
|
||||
<lable style="color:green ;font-size:14px"> (OR) </lable>
|
||||
</div>
|
||||
<div class="col-md-3 form-group">
|
||||
</div>
|
||||
<div class="col-md-3 form-group">
|
||||
<fieldset>
|
||||
<js-xls onread="readUploadBatchDetails" onerror="error"></js-xls>
|
||||
<br>
|
||||
@ -174,6 +209,8 @@
|
||||
</fieldset>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="row" ng-if="semDropDownShowLoading">
|
||||
<div class="col-md-12 form-group">
|
||||
|
||||
334
Apollo/assets/views/hallticket/batchshedule1.html
Normal file
334
Apollo/assets/views/hallticket/batchshedule1.html
Normal file
@ -0,0 +1,334 @@
|
||||
<style>
|
||||
b.fa {
|
||||
display: inline-block;
|
||||
border-radius: 60px;
|
||||
box-shadow: 0px 0px 2px #FF6600;
|
||||
padding: 0.5em 0.6em;
|
||||
|
||||
|
||||
}
|
||||
b.fa1 {
|
||||
display: inline-block;
|
||||
border-radius: 60px;
|
||||
box-shadow: 0px 0px 2px green;
|
||||
padding: 0.5em 0.6em;
|
||||
|
||||
|
||||
}
|
||||
a {
|
||||
color: #007AFF;
|
||||
}
|
||||
|
||||
</style>
|
||||
<!-- start: PAGE TITLE -->
|
||||
<section id="page-title">
|
||||
<div class="row">
|
||||
<div class="col-sm-8">
|
||||
|
||||
<h1 class="mainTitle" translate="Batch Schedule">{{ mainTitle }}</h1>
|
||||
|
||||
<span class="mainDescription">Allocate Batch schedule </span>
|
||||
|
||||
</div>
|
||||
<!-- <div ncy-breadcrumb></div>-->
|
||||
</div>
|
||||
</section>
|
||||
<!-- end: PAGE TITLE -->
|
||||
<!-- start: LIST GROUP -->
|
||||
|
||||
<div class="container-fluid container-fullw bg-white" ng-controller="schCtrl" data-ng-init="init()">
|
||||
|
||||
<tabset class="tabbable">
|
||||
<tab heading="View Schedule" id="semDetails">
|
||||
<fieldset>
|
||||
<div class="row" ng-if="semDetailsLoadingStatus">
|
||||
<!-- <div class="col-md-12">
|
||||
<center><h1>{{semDetailsLoadingTxt}}</h1></center>
|
||||
</div> -->
|
||||
|
||||
|
||||
<div class="table-responsive">
|
||||
<table class="table table-hover" id="batchsch">
|
||||
<thead>
|
||||
<tr>
|
||||
<!-- <th></th> -->
|
||||
|
||||
<th>University Name</th>
|
||||
<th>Course Name</th>
|
||||
<th>Action</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<!--<pre>{{universitycourse |json}} </pre>-->
|
||||
<tbody dir-paginate="c in universitycourse | filter:search:strict | itemsPerPage:10">
|
||||
<tr>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<td>{{c.UniversityName}}</td>
|
||||
<td>{{c.CourseName}}</td>
|
||||
<td ng-if="p.IsDefault==true" id="{{c.SubjectID}}">
|
||||
<td ng-if="p.IsDefault==true" id="{{c.UniversityID}}">
|
||||
<td ng-if="p.IsDefault==true" id="{{c.CourseID}}">
|
||||
<td ng-if="p.IsDefault==true" id="{{c.SchId}}">
|
||||
|
||||
|
||||
<td>
|
||||
|
||||
<a class="text-azure" id="editRowBtn{{c.SchId}}" ng-click="setEditId(c.UniversityID,c.CourseID,c.SchId,c.SubjectID,c);"><b class="fa fa-hover fa-pencil " aria-hidden="true"></b>
|
||||
</a>
|
||||
|
||||
</td>
|
||||
|
||||
</tr>
|
||||
<tr ng-show="editId === c.UniversityID && courseCode ===c.CourseID" ng-if="editId === c.UniversityID && courseCode ===c.CourseID">
|
||||
<td colspan="6" ng-include src="'assets/views/hallticket/editShedule.html'"></td>
|
||||
</tr>
|
||||
<div class="row" ng-if="semDropDownShowLoading1">
|
||||
<div class="col-md-12 form-group">
|
||||
<center><h1>Loading...</h1></center>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
</tbody>
|
||||
|
||||
</table>
|
||||
<dir-pagination-controls max-size="10" direction-links="true" boundary-links="true">
|
||||
</dir-pagination-controls>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
</fieldset>
|
||||
</tab>
|
||||
<tab heading="Add Schedule" id="addSem">
|
||||
<div class="row">
|
||||
<!-- <form name="Form" id="form" novalidate method="post"> -->
|
||||
|
||||
<form name="Form" id="form" novalidate ng-submit="batchschedule.submit(Form, myModelAdd,'zoom-in')" method="post">
|
||||
<fieldset>
|
||||
<legend>Search</legend>
|
||||
<div class="row">
|
||||
<div class="col-md-3 form-group">
|
||||
<label>
|
||||
University
|
||||
</label>
|
||||
<select class="form-control" name="university" tabindex="1" id="university"
|
||||
ng-model="myModel.universityName"
|
||||
ng-options="i.universityName for i in university" ng-change="getuniversity();">
|
||||
<option value="-1"> Select University</option>
|
||||
</select>
|
||||
<!-- <pre>{{myModel.universityName | json}}</pre> -->
|
||||
|
||||
</div>
|
||||
<div class="col-md-3 form-group">
|
||||
<label>
|
||||
Course
|
||||
</label>
|
||||
<!-- <select class="form-control" name="course" tabindex="4" id="course" -->
|
||||
<!-- ng-model="myModel.courseName" -->
|
||||
<!-- ng-options="courseDetails.CourseID as courseDetails.CourseName for courseDetails in myModel.universityName.courseDetails" ng-change="getStudentDetails(Form,myModel);getSubjectDetails(myModel.universityName,myModel.courseName);"> -->
|
||||
<!-- <option value=""> Select Course</option> -->
|
||||
<!-- </select> -->
|
||||
|
||||
<ui-select multiple ng-model="selectedCourseNameC.list" tabindex="2" ng-change="check(selectedCourseNameC.list);" >
|
||||
|
||||
<ui-select-match placeholder="Select Courses" >
|
||||
{{$item.CourseName}}
|
||||
</ui-select-match>
|
||||
<ui-select-choices
|
||||
repeat="x.CourseID as x in selectedUniversityCourseName | filter:$select.search" >
|
||||
{{x.CourseName}}
|
||||
</ui-select-choices>
|
||||
</ui-select>
|
||||
<!-- <pre>{{selectedCourseNameC.list | json}}</pre> -->
|
||||
|
||||
</div>
|
||||
|
||||
<!-- </div>
|
||||
|
||||
<div> -->
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<div class="col-md-3 form-group">
|
||||
<label>
|
||||
Sem/Year
|
||||
</label>
|
||||
<select class="form-control" name="Sem_Year" tabindex="1" id="Sem_Year"
|
||||
ng-model="myModel.Sem_Year" placeholder="Select Batch/Sem">
|
||||
<!-- <option value="-1"> Select Sem/Year</option> -->
|
||||
|
||||
<option ng-repeat="sem_yr in Sem_Year_Details" value="{{sem_yr.Sem_Year}}">{{sem_yr.Sem_Year}}</option>
|
||||
</select>
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<div class="col-md-3 form-group">
|
||||
<br>
|
||||
<button type="button" ladda="ldloading1.zoom_in" tabindex="3" class="btn btn-wide btn-success" data-style="zoom-in" ng-click="getSemSubDetails(myModel.universityName.universityID,selectedCourseNameC);">MANUAL SCHDULE</button>
|
||||
|
||||
</div>
|
||||
|
||||
<!-- </div> -->
|
||||
|
||||
<div>
|
||||
<div class="col-md-3 form group">
|
||||
<br>
|
||||
<br>
|
||||
<lable style="color:green ;font-size:14px"> (OR) </lable>
|
||||
</div>
|
||||
<div class="col-md-3 form-group">
|
||||
<fieldset>
|
||||
<js-xls onread="readUploadBatchDetails" onerror="error"></js-xls>
|
||||
<br>
|
||||
<!-- <a href="C:\xampp\htdocs\apollodec\Apollo\images\Batchschedule.xlsx">Sample Format</a>-->
|
||||
<a href="images/Sampleformat/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>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="row" ng-if="semDropDownShowLoading">
|
||||
<div class="col-md-12 form-group">
|
||||
<center><h1>Loading...</h1></center>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
<div class="row" ng-if="semDropDownShow">
|
||||
<div class="panel panel-white" id="sub">
|
||||
<div class="panel-heading border-light">
|
||||
<!--<h4 class="panel-title text-pink">Schedule Details</h4>
|
||||
<paneltool class="panel-tools" tool-collapse="tool-collapse" tool-refresh="load1" tool-dismiss="tool-dismiss"></paneltool>-->
|
||||
<div class="col-md-3">
|
||||
<h4 class="panel-title text-green">Subject</h4>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<h4 class="panel-title text-green">Date</h4>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<h4 class="panel-title text-green">Start Time</h4>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<h4 class="panel-title text-green">End Time</h4>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div collapse="panel2" ng-init="panel2=false" class="panel-wrapper">
|
||||
<div class="panel-body panel-scroll height-250" perfect-scrollbar wheel-propagation="false" suppress-scroll-x="true">
|
||||
|
||||
<div class="row" ng-repeat="p in subjects">
|
||||
|
||||
<div class="col-md-3 form-group">
|
||||
<label class="text-blue"> <b><!--Subject {{$index+1}}--></b>
|
||||
</label>
|
||||
|
||||
<input type="text" placeholder="Enter Subject"
|
||||
class="form-control" name="scheduleSubject{{$index}}" id="scheduleSubject{{$index}}" tabindex="4"
|
||||
ng-model="p.Subject.SubjectName" ng-pattern="/^[a-zA-Z0-9-./\s]*$/" readonly/>
|
||||
</div>
|
||||
|
||||
|
||||
<div data-ng-controller="DatepickerDemoCtrl">
|
||||
<div class="col-md-3 form-group">
|
||||
<label class="text-blue"> <!--<b>Date</b>-->
|
||||
</label>
|
||||
<input type="text" tabindex="4" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="p.ScheduleDate"
|
||||
is-open="startOpen" ng-init="startOpen = false" name="scheduleDate{{$index+1}}" id="scheduleDate{{$index+1}}" datepicker-options="dateOptions"
|
||||
placeholder="Select Date" close-text="Close"
|
||||
show-button-bar="true"/>
|
||||
</div>
|
||||
<div class="col-md-3" style="margin-top: 17px;">
|
||||
<div class="form-group">
|
||||
<!-- <label class="text-blue"> <b>Start Time</b>
|
||||
</label>-->
|
||||
<!-- <timepicker class="control-label" -->
|
||||
<!-- ng-model="p.ScheduleStartTime" -->
|
||||
<!-- hour-step="hstep" -->
|
||||
<!-- minute-step="hstep" -->
|
||||
<!-- show-meridian="ismeridian"></timepicker> -->
|
||||
<input type="text" placeholder="09:00AM"
|
||||
class="form-control" name="scheduleFromTime{{$index}}" id="scheduleFromTime{{$index}}" tabindex="4"
|
||||
ng-model="p.ScheduleStartTime" ng-pattern="" size="10" ng-blur="validateTime(p.ScheduleStartTime,$event);">
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-3" style="margin-top: 17px;">
|
||||
<div class="form-group">
|
||||
<!-- <label class="text-blue"> <b>End Time</b>
|
||||
</label>-->
|
||||
<!--<timepicker class="control-label"
|
||||
ng-model="p.ScheduleEndTime"
|
||||
hour-step="hstep"
|
||||
minute-step="hstep"
|
||||
show-meridian="ismeridian"></timepicker>-->
|
||||
|
||||
<!-- <timepicker class="control-label" -->
|
||||
<!-- ng-model="p.ScheduleEndTime" -->
|
||||
<!-- ng-change="changed()" -->
|
||||
<!-- hour-step="hstep" -->
|
||||
<!-- minute-step="hstep" -->
|
||||
<!-- show-meridian="ismeridian"></timepicker> -->
|
||||
|
||||
<input type="text" placeholder="10:00PM"
|
||||
class="form-control" name="scheduleEndTime{{$index}}" id="scheduleEndTime{{$index}}" tabindex="4"
|
||||
ng-model="p.ScheduleEndTime" ng-pattern="" size="10" ng-blur="validateTime(p.ScheduleEndTime,$event);">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-12 form-group" ng-if="semDropDownShow">
|
||||
<div class="pull-right">
|
||||
<br>
|
||||
<button type="button" ladda="ldloading1.zoom_in" tabindex="" class="btn btn-wide btn-success" data-style="zoom-in" ng-disabled="saveButtonDisabled" ng-click="saveAll(myModel,selectedCourseNameC,subjects);">{{saveButtonTxt}}</button>
|
||||
<input type="button" class="btn btn-warning btn-wide" tabindex="3" value="Cancel"
|
||||
ng-click="remove();">
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</fieldset>
|
||||
</form>
|
||||
</div>
|
||||
</tab>
|
||||
|
||||
</tabset>
|
||||
</div>
|
||||
<div class="table-responsive">
|
||||
|
||||
|
||||
|
||||
<!-- end: LIST GROUP -->
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user