sem course map add subject
This commit is contained in:
parent
57ee69e4ce
commit
3584fd6cc6
@ -198,6 +198,8 @@ $route['AllgetUniversity'] = 'Report/getAllUniversity';
|
||||
$route['NewregDetails'] = 'Report/NewregDetails';
|
||||
$route['feepaidDetails'] = 'Report/feepaidDetails';
|
||||
|
||||
$route['getSubjectDetaillist'] = 'HallTickets_Controller/getSubjectDetaillist';
|
||||
|
||||
/* Add New Contact Group */
|
||||
$route['addNewGroup'] = 'Broadcast_Controller/addNewGroup';
|
||||
$route['getGroups'] = 'Broadcast_Controller/getGroups';
|
||||
|
||||
@ -530,4 +530,31 @@ class HallTickets_Controller extends REST_Controller {
|
||||
}
|
||||
|
||||
|
||||
|
||||
public function getSubjectDetaillist_post()
|
||||
{
|
||||
$sub['SubjectCode'] =$this->post('SubjectCode');
|
||||
$sub['requestedBy'] = $this->post('requestedBy');
|
||||
$sub['branchId'] = $this->post('branchCode');
|
||||
$sublistdet = $this->Hallticket_model->GetSubListDetails($sub);
|
||||
if($sublistdet)
|
||||
{
|
||||
$sublistdet['status'] = REST_Controller::HTTP_OK;
|
||||
// Set the response and exit
|
||||
$this->response($sublistdet, 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);
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
@ -1373,4 +1373,32 @@ class Hallticket_model extends CI_Model
|
||||
|
||||
// }
|
||||
|
||||
|
||||
|
||||
public function GetSubListDetails($sub)
|
||||
{
|
||||
$this->db->select('SubjectCode,SubjectID,SubjectName');
|
||||
$this->db->from('T_SubjectMaster');
|
||||
$this->db->where('T_SubjectMaster.BranchCode',$sub['branchId']);
|
||||
$this->db->where('T_SubjectMaster.SubjectCode',$sub['SubjectCode']);
|
||||
$subDetails = $this->db->get()->result();
|
||||
|
||||
|
||||
// print_r($subDetails);
|
||||
// die();
|
||||
|
||||
if($subDetails)
|
||||
{
|
||||
$result_array['searchst'] = true;
|
||||
$result_array['details'] = $subDetails;
|
||||
}
|
||||
|
||||
else
|
||||
{
|
||||
$result_array['searchst'] = false;
|
||||
$result_array['details'] = "No records found!";
|
||||
}
|
||||
return $result_array;
|
||||
}
|
||||
|
||||
}
|
||||
@ -89,6 +89,7 @@ app.controller('semcoursemapCtrl', ["$scope","$rootScope","toaster", "$filter",
|
||||
|
||||
$scope.semDetailsLoadingStatus = true;
|
||||
$scope.semDetailsLoadingTxt = "Loading...";
|
||||
$scope.Issub=0;
|
||||
|
||||
var getUniv = {
|
||||
method: 'POST',
|
||||
@ -171,7 +172,13 @@ app.controller('semcoursemapCtrl', ["$scope","$rootScope","toaster", "$filter",
|
||||
* get course semester,subjects details
|
||||
* created by velz
|
||||
* */
|
||||
|
||||
$scope.UniID='';
|
||||
$scope.Courses='';
|
||||
$scope.getSemSubDetails = function(UID,COURSES){
|
||||
$scope.Issub=0;
|
||||
$scope.UniID=UID;
|
||||
$scope.Courses=COURSES;
|
||||
|
||||
var firstError = null;
|
||||
if (form.$invalid) {
|
||||
@ -698,5 +705,226 @@ app.controller('semcoursemapCtrl', ["$scope","$rootScope","toaster", "$filter",
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
$scope.Issub=0;
|
||||
$scope.addsubject=function()
|
||||
{
|
||||
//alert('in');
|
||||
$scope.Issub=1;
|
||||
|
||||
}
|
||||
|
||||
$scope.sublist ='';
|
||||
$scope.Semval='';
|
||||
$scope.Yearval='';
|
||||
|
||||
$scope.AddnewSubject=function(form, myModel)
|
||||
{
|
||||
|
||||
|
||||
|
||||
if($scope.courseMode==1)
|
||||
{
|
||||
//alert('year');
|
||||
$scope.Yearval =myModel.Year;
|
||||
$scope.Semval='';
|
||||
|
||||
//console.log($scope.Yearval);
|
||||
// return false;
|
||||
}
|
||||
else
|
||||
{
|
||||
//alert('sem');
|
||||
$scope.Semval = myModel.Sem;
|
||||
$scope.Yearval='';
|
||||
|
||||
//console.log($scope.Semval);
|
||||
//return false
|
||||
}
|
||||
|
||||
|
||||
var subcode = myModel.SubjectCode;
|
||||
var subname = myModel.SubjectName;
|
||||
|
||||
|
||||
|
||||
|
||||
var addSubject = {
|
||||
method: 'POST',
|
||||
url: apiPoint.url + 'addSubjectDetails/',
|
||||
headers: {
|
||||
'Content-Type': 'application/json'
|
||||
},
|
||||
data: {
|
||||
SubjectCode:myModel.SubjectCode,
|
||||
SubjectName:myModel.SubjectName,
|
||||
Status: myModel.switchsetting,
|
||||
createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
|
||||
branchCode:JSON.parse(localStorage.getItem('localObj')).localBranchID
|
||||
|
||||
}
|
||||
};
|
||||
|
||||
$http(addSubject).then(function (response) {
|
||||
if (response.data.status==200 && response.data.SubjectStatus) {
|
||||
|
||||
|
||||
swal("Success!", response.data.message, "success");
|
||||
// $scope.getSemSubDetails($scope.UniID,$scope.Courses);
|
||||
|
||||
$scope.Issub=0;
|
||||
// myModel.SubjectCode ='';
|
||||
// myModel.SubjectName ='';
|
||||
// $state.go($state.current, {}, {reload: true});
|
||||
|
||||
|
||||
|
||||
|
||||
var getsubject = {
|
||||
method: 'POST',
|
||||
url: apiPoint.url + 'getSemesterSubjectDetails/',
|
||||
headers: {
|
||||
'Content-Type': 'application/json'
|
||||
},
|
||||
data: {
|
||||
universityID : $scope.UniID,
|
||||
courseID : $scope.Courses,
|
||||
requestedBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
|
||||
branchId:JSON.parse(localStorage.getItem('localObj')).localBranchID
|
||||
}
|
||||
};
|
||||
$http(getsubject).then(function (response) {
|
||||
|
||||
if(response.data.status == 200)
|
||||
{
|
||||
$scope.semDropDownShowLoading = false;
|
||||
$scope.semDropDownShow = true;
|
||||
$scope.subjects = [];// For Main Dropdown
|
||||
$scope.subjectsFromDBtoComapare = [];
|
||||
//$scope.semesters = response.data.semesterDetails;
|
||||
$scope.subjectsFromDB = response.data.subjectDetails; //Store Response Data to subjectsFromDB
|
||||
|
||||
angular.forEach($scope.subjectsFromDB,function(value,key){
|
||||
$scope.subjects.push(value);// For Main Dropdown
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
console.log('append fn');
|
||||
// console.log($scope.subjectsFromDB);
|
||||
// console.log($scope.subjects);
|
||||
angular.forEach($scope.subjectsFromDB,function(value,key)
|
||||
{
|
||||
// console.log(value.SubjectCode)
|
||||
|
||||
if(value.SubjectCode == subcode)
|
||||
{
|
||||
//console.log('inside if')
|
||||
|
||||
if($scope.courseMode==0)
|
||||
{
|
||||
//console.log('inside coursemode');
|
||||
//console.log($scope.Semval);
|
||||
if($scope.Semval=='SEM1')
|
||||
{
|
||||
$scope.selectedSubjetcsSem1C.list.push(value);
|
||||
$scope.removeSelectedSubjetcs(value);
|
||||
}
|
||||
|
||||
if($scope.Semval=='SEM2')
|
||||
{
|
||||
$scope.selectedSubjetcsSem2C.list.push(value);
|
||||
$scope.removeSelectedSubjetcs(value);
|
||||
}
|
||||
|
||||
if($scope.Semval=='SEM3')
|
||||
{
|
||||
$scope.selectedSubjetcsSem3C.list.push(value);
|
||||
$scope.removeSelectedSubjetcs(value);
|
||||
}
|
||||
if($scope.Semval=='SEM4')
|
||||
{
|
||||
$scope.selectedSubjetcsSem4C.list.push(value);
|
||||
$scope.removeSelectedSubjetcs(value);
|
||||
}
|
||||
if($scope.Semval=='SEM5')
|
||||
{
|
||||
$scope.selectedSubjetcsSem5C.list.push(value);
|
||||
$scope.removeSelectedSubjetcs(value);
|
||||
}
|
||||
if($scope.Semval=='SEM6')
|
||||
{
|
||||
$scope.selectedSubjetcsSem6C.list.push(value);
|
||||
$scope.removeSelectedSubjetcs(value);
|
||||
}
|
||||
if($scope.Semval=='SEM7')
|
||||
{
|
||||
$scope.selectedSubjetcsSem7C.list.push(value);
|
||||
$scope.removeSelectedSubjetcs(value);
|
||||
}
|
||||
if($scope.Semval=='SEM8')
|
||||
{
|
||||
$scope.selectedSubjetcsSem8C.list.push(value);
|
||||
$scope.removeSelectedSubjetcs(value);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
else if($scope.courseMode==1)
|
||||
{
|
||||
|
||||
console.log('else');
|
||||
if($scope.Yearval=='YEAR1')
|
||||
{
|
||||
console.log('y1if')
|
||||
|
||||
$scope.selectedSubjetcsSem1C.list.push(value);
|
||||
$scope.removeSelectedSubjetcs(value);
|
||||
}
|
||||
if($scope.Yearval=='YEAR2')
|
||||
{
|
||||
$scope.selectedSubjetcsSem3C.list.push(value);
|
||||
$scope.removeSelectedSubjetcs(value);
|
||||
}
|
||||
if($scope.Yearval=='YEAR3')
|
||||
{
|
||||
$scope.selectedSubjetcsSem5C.list.push(value);
|
||||
$scope.removeSelectedSubjetcs(value);
|
||||
}
|
||||
|
||||
if($scope.Yearval=='YEAR4')
|
||||
{
|
||||
$scope.selectedSubjetcsSem7C.list.push(value);
|
||||
$scope.removeSelectedSubjetcs(value);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
|
||||
},function(error){
|
||||
|
||||
swal('Some Thing Went Wrong!','Try Later','error')
|
||||
// $state.go($state.current, {}, {reload: true});
|
||||
});
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
} else {
|
||||
//$scope.ldloading1[loading.replace('-', '_')] = false;
|
||||
swal("Failed!", response.data.message, "error");
|
||||
}
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
}]);
|
||||
|
||||
@ -348,6 +348,165 @@
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<div class="col-md-12 form-group">
|
||||
<div class="col-md-3 form-group" ng-if="semDropDownShow">
|
||||
<a ng-click="addsubject();">Add New Subject</a>
|
||||
</div>
|
||||
<div class="col-md-12 form-group" ng-if="Issub==1">
|
||||
|
||||
<form name="Form" id="form" novalidate ng-submit="subjectFORM.submit(Form, myModel, 'zoom-in')" method="post">
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<fieldset>
|
||||
<legend>Subject</legend>
|
||||
|
||||
|
||||
<div class="row">
|
||||
|
||||
<div class="col-md-4 form-group" ng-if="courseMode == 0">
|
||||
|
||||
<label>
|
||||
Semester
|
||||
<span
|
||||
class="symbol required"></span>
|
||||
</label>
|
||||
<select class="form-control" tabindex="3" class="cs-select cs-skin-elastic" name="Sem" ng-model="myModel.Sem">
|
||||
|
||||
<option value="" selected>Select Semester</option>
|
||||
<option value="SEM1">SEM1</option>
|
||||
<option value="SEM2">SEM2</option>
|
||||
<option value="SEM3">SEM3</option>
|
||||
<option value="SEM4">SEM4</option>
|
||||
<option value="SEM5">SEM5</option>
|
||||
<option value="SEM6">SEM6</option>
|
||||
<option value="SEM7">SEM7</option>
|
||||
<option value="SEM8">SEM8</option>
|
||||
|
||||
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="col-md-4 form-group" ng-if="courseMode == 1">
|
||||
|
||||
<label>
|
||||
Year
|
||||
<span
|
||||
class="symbol required"></span>
|
||||
</label>
|
||||
<select class="form-control" tabindex="3" class="cs-select cs-skin-elastic" name="Year" ng-model="myModel.Year" >
|
||||
|
||||
<option value="" selected>Select Year</option>
|
||||
<option value="YEAR1">YEAR1</option>
|
||||
<option value="YEAR2">YEAR2</option>
|
||||
<option value="YEAR3">YEAR3</option>
|
||||
<option value="YEAR4">YEAR4</option>
|
||||
|
||||
|
||||
</select>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<div class="col-md-4 form-group"
|
||||
ng-class="{'has-error':Form.SubjectCode.$dirty && Form.SubjectCode.$invalid,'has-success':Form.SubjectCode.$valid}">
|
||||
<label>
|
||||
Subject Code
|
||||
<span
|
||||
class="symbol required"></span>
|
||||
</label>
|
||||
|
||||
<input type="text" placeholder="Enter Subject Code"
|
||||
autofocus tabindex="1" disallow-spaces="" class="form-control" name="SubjectCode"
|
||||
ng-model="myModel.SubjectCode" ng-pattern="" required />
|
||||
<span class="error text-small block"
|
||||
|
||||
ng-if="Form.SubjectCode.$dirty && Form.SubjectCode.$error.required">Subject code is required</span>
|
||||
<span class="error text-small block"
|
||||
ng-if="Form.SubjectCode.$dirty && Form.SubjectCode.$error.pattern">Enter a valid subject code</span>
|
||||
|
||||
</div>
|
||||
<div class="col-md-4 form-group"
|
||||
ng-class="{'has-error':Form.SubjectName.$dirty && Form.SubjectName.$invalid,'has-success':Form.SubjectName.$valid}">
|
||||
<label>
|
||||
Subject Name
|
||||
<span
|
||||
class="symbol required"></span>
|
||||
</label>
|
||||
|
||||
<input type="text" placeholder="Enter SubjectName"
|
||||
tabindex="2" class="form-control" name="SubjectName"
|
||||
ng-model="myModel.SubjectName" ng-pattern="" required />
|
||||
<span class="error text-small block"
|
||||
ng-if="Form.SubjectName.$dirty && Form.SubjectName.$error.required"> Subject name is required</span>
|
||||
<span class="error text-small block"
|
||||
ng-if="Form.SubjectName.$dirty && Form.SubjectName.$error.pattern">Invalid subject name </span>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
<div class="col-md-4">
|
||||
<label>
|
||||
Active/De-Active
|
||||
</label>
|
||||
<div ng-switch="myModel.switchsetting">
|
||||
<div ng-switch-when="true">
|
||||
<switch ng-model="myModel.switchsetting" ng-init="myModel.switchsetting = true" class="green"></switch>
|
||||
|
||||
</div>
|
||||
<div ng-switch-when="false">
|
||||
<switch ng-model="myModel.switchsetting" ng-init="myModel.switchsetting = false" class="green"></switch>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
<div ng-switch-default>
|
||||
<switch ng-model="myModel.switchsetting" ng-init="myModel.switchsetting = true" class="green"></switch>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
</br>
|
||||
<div class="row">
|
||||
<div class="col-md-11">
|
||||
<div class="pull-right">
|
||||
<button ng-disabled="disableButton" tabindex="3" class="btn btn-wide btn-success" ng-click="AddnewSubject(Form, myModel);"
|
||||
data-style="zoom-in"> Submit </button>
|
||||
|
||||
<button type="reset" class="btn btn-warning btn-wide" tabindex="4" ng-click="subjectFORM.reset(Form);">
|
||||
|
||||
Reset
|
||||
</button>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
</fieldset>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<hr>
|
||||
<div class="row" ng-if="semDropDownShowLoading">
|
||||
<div class="col-md-12 form-group">
|
||||
|
||||
Loading…
Reference in New Issue
Block a user