sem set for regular
This commit is contained in:
parent
9a8793d432
commit
2a0a85e797
@ -40,6 +40,9 @@ class Course_Controller extends REST_Controller {
|
|||||||
$details['Specilization2'] = $this->post('specilization2');
|
$details['Specilization2'] = $this->post('specilization2');
|
||||||
$details['BranchCode'] = $this->post('branchCode');
|
$details['BranchCode'] = $this->post('branchCode');
|
||||||
|
|
||||||
|
$coursedetails = $this->post('numberofsem');
|
||||||
|
|
||||||
|
|
||||||
//$details['FeesType'] = $this->post('feesType');
|
//$details['FeesType'] = $this->post('feesType');
|
||||||
$details['PC'] = $this->post('provFess');
|
$details['PC'] = $this->post('provFess');
|
||||||
$details['DC'] = $this->post('degreeAmount');
|
$details['DC'] = $this->post('degreeAmount');
|
||||||
@ -50,6 +53,7 @@ class Course_Controller extends REST_Controller {
|
|||||||
$details['CreatedOn'] = $now->format('Y-m-d H:i:s');
|
$details['CreatedOn'] = $now->format('Y-m-d H:i:s');
|
||||||
$details['IsActive'] = $this->post('status');
|
$details['IsActive'] = $this->post('status');
|
||||||
$jsonRegularFeesData=$this->post('regularFeesAmounts');
|
$jsonRegularFeesData=$this->post('regularFeesAmounts');
|
||||||
|
// print_r($jsonRegularFeesData);die();
|
||||||
$jsonLateralFeesData=$this->post('lateralFeesAmounts');
|
$jsonLateralFeesData=$this->post('lateralFeesAmounts');
|
||||||
$jsonSemFeesData=$this->post('semFeesAmounts');
|
$jsonSemFeesData=$this->post('semFeesAmounts');
|
||||||
// push regular,lateral fees into same array
|
// push regular,lateral fees into same array
|
||||||
@ -62,7 +66,7 @@ class Course_Controller extends REST_Controller {
|
|||||||
// get subject details
|
// get subject details
|
||||||
//$subjectDetails=$this->post('subjects');
|
//$subjectDetails=$this->post('subjects');
|
||||||
|
|
||||||
$courseDetails = $this->course_model->addCourse($details,$jsonSemFeesData);// $subjectDetails Check if the users data store contains users (in case the database result returns NULL)
|
$courseDetails = $this->course_model->addCourse($details,$jsonSemFeesData,$coursedetails);// $subjectDetails Check if the users data store contains users (in case the database result returns NULL)
|
||||||
if ($courseDetails)
|
if ($courseDetails)
|
||||||
{
|
{
|
||||||
$courseDetails['status'] = REST_Controller::HTTP_OK;
|
$courseDetails['status'] = REST_Controller::HTTP_OK;
|
||||||
|
|||||||
@ -15,7 +15,7 @@ class Course_model extends CI_Model {
|
|||||||
* created by kms
|
* created by kms
|
||||||
* */
|
* */
|
||||||
|
|
||||||
public function addCourse($arrayDetails=null,$jsonSemFeesData=null) //$subjectDetails=null
|
public function addCourse($arrayDetails=null,$jsonSemFeesData=null,$coursedetails=null) //$subjectDetails=null
|
||||||
{
|
{
|
||||||
$this->db->select('CourseCode');
|
$this->db->select('CourseCode');
|
||||||
$this->db->where('CourseCode', $arrayDetails['CourseCode']);
|
$this->db->where('CourseCode', $arrayDetails['CourseCode']);
|
||||||
@ -36,6 +36,7 @@ class Course_model extends CI_Model {
|
|||||||
$insertFeesArray['FeesType'] =$row['FeesType'];
|
$insertFeesArray['FeesType'] =$row['FeesType'];
|
||||||
$insertFeesArray['FeesAmount'] =$row['FeesAmount'];
|
$insertFeesArray['FeesAmount'] =$row['FeesAmount'];
|
||||||
$insertFeesArray['Sem_Year'] =$row['programName'];
|
$insertFeesArray['Sem_Year'] =$row['programName'];
|
||||||
|
$insertFeesArray['semnumber'] =$coursedetails;
|
||||||
$insertFeesArray['UpdatedOn'] =$arrayDetails['CreatedOn'];
|
$insertFeesArray['UpdatedOn'] =$arrayDetails['CreatedOn'];
|
||||||
$insertFeesArray['UpdatedBy'] =$arrayDetails['CreatedBy'];
|
$insertFeesArray['UpdatedBy'] =$arrayDetails['CreatedBy'];
|
||||||
$this->db->insert(COURSE_FEES, $insertFeesArray);
|
$this->db->insert(COURSE_FEES, $insertFeesArray);
|
||||||
|
|||||||
@ -490,6 +490,9 @@ class Fees_status_model extends CI_Model
|
|||||||
|
|
||||||
public function updateFees($feesPaidDetails=null,$courseID=null,$feesName=null,$smsDetails=null)
|
public function updateFees($feesPaidDetails=null,$courseID=null,$feesName=null,$smsDetails=null)
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if($feesPaidDetails['UpdatedBy']=='All'){
|
if($feesPaidDetails['UpdatedBy']=='All'){
|
||||||
$this->db->select('BranchID');
|
$this->db->select('BranchID');
|
||||||
$this->db->where('FeesID', $feesPaidDetails['FeesId']);
|
$this->db->where('FeesID', $feesPaidDetails['FeesId']);
|
||||||
@ -1889,7 +1892,30 @@ $REGID='';
|
|||||||
* created by kms
|
* created by kms
|
||||||
* */
|
* */
|
||||||
public function entryForAllStatus($feesDetails=null,$courseID=null,$feesName=null){
|
public function entryForAllStatus($feesDetails=null,$courseID=null,$feesName=null){
|
||||||
$singleFeesDetails=["SEM 1","SEM 2","SEM 3","SEM 4","SEM 5","SEM 6","SEM 7","SEM 8"];
|
//$singleFeesDetails=["SEM 1","SEM 2","SEM 3","SEM 4","SEM 5","SEM 6","SEM 7","SEM 8"];
|
||||||
|
|
||||||
|
$this->db->select('semnumber');
|
||||||
|
$this->db->from('T_Course_Fees_Details');
|
||||||
|
$this->db->where('CourseID',$courseID);
|
||||||
|
|
||||||
|
$Details = $this->db->get();
|
||||||
|
|
||||||
|
$results = $Details->result();
|
||||||
|
|
||||||
|
$semnum = $results[0]->semnumber;
|
||||||
|
|
||||||
|
//echo $semnum;die();
|
||||||
|
|
||||||
|
|
||||||
|
$i=$semnum;
|
||||||
|
for($j=0;$j<$i;$j++)
|
||||||
|
{
|
||||||
|
$k=$j+1;
|
||||||
|
$singleFeesDetails[$j] = 'SEM '.$k.'';
|
||||||
|
}
|
||||||
|
|
||||||
|
//print_r($singleFeesDetails);die();
|
||||||
|
|
||||||
// get pick list expected status
|
// get pick list expected status
|
||||||
$this->db->select('ListCode,ListName');
|
$this->db->select('ListCode,ListName');
|
||||||
if(strtoupper($feesName)==DMC_CONST){
|
if(strtoupper($feesName)==DMC_CONST){
|
||||||
|
|||||||
@ -48,6 +48,9 @@ app.controller('courseCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab
|
|||||||
"ListName": "",
|
"ListName": "",
|
||||||
"programListName":""
|
"programListName":""
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* edit course details
|
* edit course details
|
||||||
* created by kms
|
* created by kms
|
||||||
@ -172,9 +175,21 @@ app.controller('courseCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab
|
|||||||
* @params myModel
|
* @params myModel
|
||||||
* created by kms
|
* created by kms
|
||||||
* */
|
* */
|
||||||
|
|
||||||
|
|
||||||
|
$scope.MyModelsem={
|
||||||
|
|
||||||
|
"numberofsem":'',
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
$scope.courseForm = {
|
$scope.courseForm = {
|
||||||
submit: function (form, myModel,regularModel,lateralModel,semYearModel,loading,addMoreItems) {
|
submit: function (form, myModel,MyModelsem,regularModel,lateralModel,semYearModel,loading,addMoreItems) {
|
||||||
var firstError = null;
|
var firstError = null;
|
||||||
|
|
||||||
|
//console.log(MyModelsem.numberofsem);return false;
|
||||||
|
|
||||||
if (form.$invalid) {
|
if (form.$invalid) {
|
||||||
var field = null, firstError = null;
|
var field = null, firstError = null;
|
||||||
for (field in form) {
|
for (field in form) {
|
||||||
@ -250,6 +265,7 @@ app.controller('courseCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab
|
|||||||
createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
|
createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
|
||||||
specilization1:myModel.specilization1,
|
specilization1:myModel.specilization1,
|
||||||
specilization2:myModel.specilization2,
|
specilization2:myModel.specilization2,
|
||||||
|
numberofsem:MyModelsem.numberofsem,
|
||||||
// subjects:myModel.subject,
|
// subjects:myModel.subject,
|
||||||
branchCode:JSON.parse(localStorage.getItem('localObj')).localBranchID
|
branchCode:JSON.parse(localStorage.getItem('localObj')).localBranchID
|
||||||
}
|
}
|
||||||
|
|||||||
@ -125,7 +125,7 @@
|
|||||||
|
|
||||||
<tab heading="Add Course" id="addcourse">
|
<tab heading="Add Course" id="addcourse">
|
||||||
<div>
|
<div>
|
||||||
<form name="Form" id="form" novalidate ng-submit="courseForm.submit(Form, myModel,myModelRegular,myModelLateral,myModelSemYear, 'zoom-in',addMoreItems)" method="post">
|
<form name="Form" id="form" novalidate ng-submit="courseForm.submit(Form, myModel,MyModelsem,myModelRegular,myModelLateral,myModelSemYear, 'zoom-in',addMoreItems)" method="post">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
|
|
||||||
<div class="col-md-12">
|
<div class="col-md-12">
|
||||||
@ -329,6 +329,26 @@
|
|||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<div class="col-md-6 form-group" ng-class="{'has-error':Form.numberofsem.$dirty && Form.numberofsem.$invalid}">
|
||||||
|
<label>Number of Semesters</label>
|
||||||
|
|
||||||
|
|
||||||
|
<input type="text" placeholder="Enter Number of Semesters"
|
||||||
|
autofocus tabindex="8" class="form-control" name="numberofsem" id="numberofsem" ng-maxlength="8"
|
||||||
|
ng-model="MyModelsem.numberofsem" ng-pattern="/^[0-9]*$/"
|
||||||
|
ng-disabled="myModelSemYear.programName!='' || myModelSemYear.FeesAmount!='' || addMoreItems.length!=0" />
|
||||||
|
|
||||||
|
<span class="error text-small block"
|
||||||
|
ng-if="Form.numberofsem.$dirty && Form.numberofsem.$error.maxlength || Form.numberofsem.$error.pattern">Enter a valid number</span>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user