Merge branches 'master' and 'master' of https://bitbucket.org/venbainformationtechnology/apollodec
This commit is contained in:
commit
f5711cfe7b
@ -36,6 +36,9 @@ class Course_Controller extends REST_Controller {
|
|||||||
$details['CourseID'] = $this->post('courseID');
|
$details['CourseID'] = $this->post('courseID');
|
||||||
$details['CourseName'] = $this->post('courseName');
|
$details['CourseName'] = $this->post('courseName');
|
||||||
$details['UniversityID'] = $this->post('universityName');
|
$details['UniversityID'] = $this->post('universityName');
|
||||||
|
$details['Specilization1'] = $this->post('specilization1');
|
||||||
|
$details['Specilization2'] = $this->post('specilization2');
|
||||||
|
|
||||||
//$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');
|
||||||
@ -130,6 +133,8 @@ class Course_Controller extends REST_Controller {
|
|||||||
$now->setTimezone(new DateTimezone('Asia/Kolkata'));
|
$now->setTimezone(new DateTimezone('Asia/Kolkata'));
|
||||||
$details['CourseID'] = $this->post('courseCode');
|
$details['CourseID'] = $this->post('courseCode');
|
||||||
$details['CourseName'] = $this->post('courseName');
|
$details['CourseName'] = $this->post('courseName');
|
||||||
|
$details['Specilization1'] = $this->post('specilization1');
|
||||||
|
$details['Specilization2'] = $this->post('specilization2');
|
||||||
$details['IsActive'] = $this->post('status');
|
$details['IsActive'] = $this->post('status');
|
||||||
$details['PC'] = $this->post('provFess');
|
$details['PC'] = $this->post('provFess');
|
||||||
$details['DC'] = $this->post('degreeAmount');
|
$details['DC'] = $this->post('degreeAmount');
|
||||||
@ -138,6 +143,7 @@ class Course_Controller extends REST_Controller {
|
|||||||
$details['OtherFees'] = $this->post('otherAmount');
|
$details['OtherFees'] = $this->post('otherAmount');
|
||||||
$details['UpdatedBy'] = $this->post('updatedBy');
|
$details['UpdatedBy'] = $this->post('updatedBy');
|
||||||
$details['UpdatedOn'] = $now->format('Y-m-d H:i:s');
|
$details['UpdatedOn'] = $now->format('Y-m-d H:i:s');
|
||||||
|
$existCourseID = $this->post('existCourseID');
|
||||||
$jsonRegularFeesData=$this->post('regularFeesAmounts');
|
$jsonRegularFeesData=$this->post('regularFeesAmounts');
|
||||||
$jsonLateralFeesData=$this->post('lateralFeesAmounts');
|
$jsonLateralFeesData=$this->post('lateralFeesAmounts');
|
||||||
$jsonSemFeesData=$this->post('semFeesAmounts');
|
$jsonSemFeesData=$this->post('semFeesAmounts');
|
||||||
@ -151,7 +157,7 @@ class Course_Controller extends REST_Controller {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$updateDetails = $this->course_model->updateCourse($details,$jsonSemFeesData);// Check if the users data store contains users (in case the database result returns NULL)
|
$updateDetails = $this->course_model->updateCourse($details,$jsonSemFeesData,$existCourseID);// Check if the users data store contains users (in case the database result returns NULL)
|
||||||
if ($updateDetails)
|
if ($updateDetails)
|
||||||
{
|
{
|
||||||
$updateDetails['status'] = REST_Controller::HTTP_OK;
|
$updateDetails['status'] = REST_Controller::HTTP_OK;
|
||||||
|
|||||||
@ -69,7 +69,7 @@ class Course_model extends CI_Model {
|
|||||||
|
|
||||||
public function getCourse()
|
public function getCourse()
|
||||||
{
|
{
|
||||||
$this->db->select('CU.CourseID,CU.CourseName,CU.FeesType,CU.PC,CU.DC,CU.TC,CU.MC,CU.OtherFees,CU.IsActive,US.UniversityID,US.UniversityName');
|
$this->db->select('CU.CourseID,CU.CourseName,CU.FeesType,CU.Specilization1,CU.Specilization2,CU.PC,CU.DC,CU.TC,CU.MC,CU.OtherFees,CU.IsActive,US.UniversityID,US.UniversityName');
|
||||||
$this->db->from(COURSE.' as CU');
|
$this->db->from(COURSE.' as CU');
|
||||||
$this->db->join(UNIVERSITY.' as US', 'US.UniversityID = CU.UniversityID');
|
$this->db->join(UNIVERSITY.' as US', 'US.UniversityID = CU.UniversityID');
|
||||||
$this->db->order_by('CU.CreatedOn','DESC');
|
$this->db->order_by('CU.CreatedOn','DESC');
|
||||||
@ -83,6 +83,8 @@ class Course_model extends CI_Model {
|
|||||||
$fetchData['CourseID']=$row->CourseID;
|
$fetchData['CourseID']=$row->CourseID;
|
||||||
$fetchData['CourseName']=$row->CourseName;
|
$fetchData['CourseName']=$row->CourseName;
|
||||||
$fetchData['FeesType']=$row->FeesType;
|
$fetchData['FeesType']=$row->FeesType;
|
||||||
|
$fetchData['Specilization1']=$row->Specilization1;
|
||||||
|
$fetchData['Specilization2']=$row->Specilization2;
|
||||||
$fetchData['PC']=$row->PC;
|
$fetchData['PC']=$row->PC;
|
||||||
$fetchData['DC']=$row->DC;
|
$fetchData['DC']=$row->DC;
|
||||||
$fetchData['TC']=$row->TC;
|
$fetchData['TC']=$row->TC;
|
||||||
|
|||||||
@ -18,7 +18,10 @@ app.controller('courseCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab
|
|||||||
"transferAmount":"",
|
"transferAmount":"",
|
||||||
"degreeAmount":"",
|
"degreeAmount":"",
|
||||||
"migrationAmount":"",
|
"migrationAmount":"",
|
||||||
"otherAmount":""
|
"otherAmount":"",
|
||||||
|
"specilization1":"",
|
||||||
|
"specilization2":"",
|
||||||
|
|
||||||
};
|
};
|
||||||
$rootScope.myModel1 = {
|
$rootScope.myModel1 = {
|
||||||
"ListName": "",
|
"ListName": "",
|
||||||
@ -125,7 +128,8 @@ app.controller('courseCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab
|
|||||||
}
|
}
|
||||||
angular.element('.ng-invalid[name=' + firstError + ']').focus();
|
angular.element('.ng-invalid[name=' + firstError + ']').focus();
|
||||||
// swal("The form cannot be submitted because it contains validation errors!", "Errors are marked with a red, dashed border!", "error");
|
// swal("The form cannot be submitted because it contains validation errors!", "Errors are marked with a red, dashed border!", "error");
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
if(semYearModel.program=='Y001' && semYearModel.programName!="" || semYearModel.FeesAmount!=""){
|
if(semYearModel.program=='Y001' && semYearModel.programName!="" || semYearModel.FeesAmount!=""){
|
||||||
|
|
||||||
$scope.addMoreItems.push({
|
$scope.addMoreItems.push({
|
||||||
@ -137,6 +141,11 @@ app.controller('courseCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(regularModel.FeesAmount=='' && lateralModel.FeesAmount=='' && $scope.addMoreItems.length==0){
|
||||||
|
swal("Failed!", 'Please Enter Single/Sem-Year Fees ', "error");
|
||||||
|
|
||||||
|
}
|
||||||
|
else{
|
||||||
$scope.ldloading1 = {};
|
$scope.ldloading1 = {};
|
||||||
|
|
||||||
$scope.ldloading1[loading.replace('-', '_')] = true;
|
$scope.ldloading1[loading.replace('-', '_')] = true;
|
||||||
@ -162,7 +171,9 @@ app.controller('courseCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab
|
|||||||
regularFeesAmounts:regularModel,
|
regularFeesAmounts:regularModel,
|
||||||
lateralFeesAmounts:lateralModel,
|
lateralFeesAmounts:lateralModel,
|
||||||
semFeesAmounts:$scope.addMoreItems,
|
semFeesAmounts:$scope.addMoreItems,
|
||||||
createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID
|
createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
|
||||||
|
specilization1:myModel.specilization1,
|
||||||
|
specilization2:myModel.specilization2
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
$http(addCourse).then(function (response) {
|
$http(addCourse).then(function (response) {
|
||||||
@ -176,6 +187,9 @@ app.controller('courseCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab
|
|||||||
swal("Failed!", response.data.message, "error");
|
swal("Failed!", response.data.message, "error");
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -243,7 +257,10 @@ app.controller('courseCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab
|
|||||||
lateralFeesAmounts:lateral,
|
lateralFeesAmounts:lateral,
|
||||||
semFeesAmounts:$rootScope.updateMoreItems,
|
semFeesAmounts:$rootScope.updateMoreItems,
|
||||||
status: myModel.IsActive,
|
status: myModel.IsActive,
|
||||||
updatedBy: JSON.parse(localStorage.getItem('localObj')).localUserID
|
updatedBy: JSON.parse(localStorage.getItem('localObj')).localUserID,
|
||||||
|
specilization1:myModel.Specilization1,
|
||||||
|
specilization2:myModel.Specilization2,
|
||||||
|
existCourseID:myModel.CourseID
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
$http(update).then(function (response) {
|
$http(update).then(function (response) {
|
||||||
@ -258,7 +275,7 @@ app.controller('courseCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab
|
|||||||
|
|
||||||
} else {
|
} else {
|
||||||
$scope.ldloading[loading.replace('-', '_')] = false;
|
$scope.ldloading[loading.replace('-', '_')] = false;
|
||||||
$rootScope.init();
|
// $rootScope.init();
|
||||||
swal("Failed!", response.data.message, "error");
|
swal("Failed!", response.data.message, "error");
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
@ -158,7 +158,7 @@
|
|||||||
|
|
||||||
<input type="text" placeholder="Enter Course ID"
|
<input type="text" placeholder="Enter Course ID"
|
||||||
tabindex="2" class="form-control" name="coursecode" ng-maxlength="20"
|
tabindex="2" class="form-control" name="coursecode" ng-maxlength="20"
|
||||||
ng-model="myModel.courseCode" ng-pattern="/^[a-zA-Z0-9-\s]*$/" required/>
|
ng-model="myModel.courseCode" ng-pattern="/^[a-zA-Z0-9-]*$/" required/>
|
||||||
<span class="error text-small block"
|
<span class="error text-small block"
|
||||||
ng-if="Form.coursecode.$dirty && Form.coursecode.$error.required">Course id is required</span>
|
ng-if="Form.coursecode.$dirty && Form.coursecode.$error.required">Course id is required</span>
|
||||||
<span class="error text-small block"
|
<span class="error text-small block"
|
||||||
@ -184,6 +184,7 @@
|
|||||||
<!--<span class="success text-small"-->
|
<!--<span class="success text-small"-->
|
||||||
<!--ng-if="Form.stopname.$valid">Thank You!</span>-->
|
<!--ng-if="Form.stopname.$valid">Thank You!</span>-->
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!--<div class="col-md-3 form-group"
|
<!--<div class="col-md-3 form-group"
|
||||||
ng-class="{'has-error':Form.fees.$dirty && Form.fees.$invalid, 'has-success':Form.fees.$valid}">
|
ng-class="{'has-error':Form.fees.$dirty && Form.fees.$invalid, 'has-success':Form.fees.$valid}">
|
||||||
<label>
|
<label>
|
||||||
@ -223,6 +224,40 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-md-6 form-group"
|
||||||
|
ng-class="{'has-error':Form.specilization1.$dirty && Form.specilization1.$invalid}">
|
||||||
|
<label>
|
||||||
|
Specilization 1
|
||||||
|
</label>
|
||||||
|
|
||||||
|
<input type="text" placeholder="Enter Specilization 1"
|
||||||
|
tabindex="4" class="form-control" name="specilization1"
|
||||||
|
ng-model="myModel.specilization1" ng-pattern="/^[a-zA-Z0-9-./\s]*$/"/>
|
||||||
|
<!--<span class="error text-small block"
|
||||||
|
ng-if="Form.specilization1.$dirty && Form.specilization1.$error.required">Specilization 1 is required</span>-->
|
||||||
|
<span class="error text-small block"
|
||||||
|
ng-if="Form.specilization1.$dirty && Form.specilization1.$error.pattern">Invalid Specilization 1 </span>
|
||||||
|
<!--<span class="success text-small"-->
|
||||||
|
<!--ng-if="Form.specilization1.$valid">Thank You!</span>-->
|
||||||
|
</div>
|
||||||
|
<div class="col-md-6 form-group"
|
||||||
|
ng-class="{'has-error':Form.specilization2.$dirty && Form.specilization2.$invalid}">
|
||||||
|
<label>
|
||||||
|
Specilization 2
|
||||||
|
</label>
|
||||||
|
|
||||||
|
<input type="text" placeholder="Enter Specilization 2"
|
||||||
|
tabindex="5" class="form-control" name="specilization2"
|
||||||
|
ng-model="myModel.specilization2" ng-pattern="/^[a-zA-Z0-9-./\s]*$/"/>
|
||||||
|
<!--<span class="error text-small block"
|
||||||
|
ng-if="Form.specilization1.$dirty && Form.specilization1.$error.required">Specilization 1 is required</span>-->
|
||||||
|
<span class="error text-small block"
|
||||||
|
ng-if="Form.specilization2.$dirty && Form.specilization2.$error.pattern">Invalid Specilization 2 </span>
|
||||||
|
<!--<span class="success text-small"-->
|
||||||
|
<!--ng-if="Form.specilization1.$valid">Thank You!</span>-->
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -245,7 +280,7 @@
|
|||||||
</label>
|
</label>
|
||||||
|
|
||||||
<input type="text" placeholder="Enter Regular Fees Amt"
|
<input type="text" placeholder="Enter Regular Fees Amt"
|
||||||
autofocus tabindex="5" class="form-control" name="regularFees" id="regularFees" ng-maxlength="8"
|
autofocus tabindex="6" class="form-control" name="regularFees" id="regularFees" ng-maxlength="8"
|
||||||
ng-model="myModelRegular.FeesAmount" ng-pattern="/^[0-9]*$/"/>
|
ng-model="myModelRegular.FeesAmount" ng-pattern="/^[0-9]*$/"/>
|
||||||
|
|
||||||
<span class="error text-small block"
|
<span class="error text-small block"
|
||||||
@ -258,7 +293,7 @@
|
|||||||
</label>
|
</label>
|
||||||
|
|
||||||
<input type="text" placeholder="Enter Lateral Fees Amt"
|
<input type="text" placeholder="Enter Lateral Fees Amt"
|
||||||
autofocus tabindex="5" class="form-control" name="lateralFees" id="lateralFees" ng-maxlength="8"
|
autofocus tabindex="7" class="form-control" name="lateralFees" id="lateralFees" ng-maxlength="8"
|
||||||
ng-model="myModelLateral.FeesAmount" ng-pattern="/^[0-9]*$/"/>
|
ng-model="myModelLateral.FeesAmount" ng-pattern="/^[0-9]*$/"/>
|
||||||
|
|
||||||
<span class="error text-small block"
|
<span class="error text-small block"
|
||||||
@ -290,7 +325,7 @@
|
|||||||
</label>
|
</label>
|
||||||
|
|
||||||
<input type="text" placeholder="Enter Sem/year"
|
<input type="text" placeholder="Enter Sem/year"
|
||||||
tabindex="6" class="form-control" name="sem_year"
|
tabindex="8" class="form-control" name="sem_year"
|
||||||
ng-model="myModelSemYear.programName" ng-pattern="/^[a-zA-Z0-9-./\s]*$/"/>
|
ng-model="myModelSemYear.programName" ng-pattern="/^[a-zA-Z0-9-./\s]*$/"/>
|
||||||
<!--<span class="error text-small block"
|
<!--<span class="error text-small block"
|
||||||
ng-if="Form.sem_year.$dirty && Form.sem_year.$error.required">Sem/Year is required</span>-->
|
ng-if="Form.sem_year.$dirty && Form.sem_year.$error.required">Sem/Year is required</span>-->
|
||||||
@ -304,7 +339,7 @@
|
|||||||
</label>
|
</label>
|
||||||
|
|
||||||
<input type="text" placeholder="Enter Fees Amount"
|
<input type="text" placeholder="Enter Fees Amount"
|
||||||
autofocus tabindex="7" class="form-control" name="feesAmount" id="feesAmount" ng-maxlength="8"
|
autofocus tabindex="9" class="form-control" name="feesAmount" id="feesAmount" ng-maxlength="8"
|
||||||
ng-model="myModelSemYear.FeesAmount" ng-pattern="/^[0-9]*$/"/>
|
ng-model="myModelSemYear.FeesAmount" ng-pattern="/^[0-9]*$/"/>
|
||||||
<!--<span class="error text-small block"
|
<!--<span class="error text-small block"
|
||||||
ng-if="Form.feesAmount.$dirty && Form.feesAmount.$invalid"
|
ng-if="Form.feesAmount.$dirty && Form.feesAmount.$invalid"
|
||||||
@ -363,7 +398,7 @@
|
|||||||
</label>
|
</label>
|
||||||
|
|
||||||
<input type="text" placeholder="Enter Prov Cert Fees"
|
<input type="text" placeholder="Enter Prov Cert Fees"
|
||||||
autofocus tabindex="8" class="form-control" name="provFess" id="provFess" ng-maxlength="8"
|
autofocus tabindex="10" class="form-control" name="provFess" id="provFess" ng-maxlength="8"
|
||||||
ng-model="myModel.provFess" ng-pattern="/^[0-9]*$/">
|
ng-model="myModel.provFess" ng-pattern="/^[0-9]*$/">
|
||||||
<span class="error text-small block"
|
<span class="error text-small block"
|
||||||
ng-if="Form.provFess.$error.maxlength || Form.provFess.$error.pattern">Enter a valid amount</span>
|
ng-if="Form.provFess.$error.maxlength || Form.provFess.$error.pattern">Enter a valid amount</span>
|
||||||
@ -379,7 +414,7 @@
|
|||||||
</label>
|
</label>
|
||||||
|
|
||||||
<input type="text" placeholder="Enter transfer Cert Fees"
|
<input type="text" placeholder="Enter transfer Cert Fees"
|
||||||
autofocus tabindex="9" class="form-control" name="transferAmount" id="transferAmount" ng-maxlength="8"
|
autofocus tabindex="11" class="form-control" name="transferAmount" id="transferAmount" ng-maxlength="8"
|
||||||
ng-model="myModel.transferAmount" ng-pattern="/^[0-9]*$/">
|
ng-model="myModel.transferAmount" ng-pattern="/^[0-9]*$/">
|
||||||
<span class="error text-small block"
|
<span class="error text-small block"
|
||||||
ng-if="Form.transferAmount.$error.maxlength || Form.transferAmount.$error.pattern">Enter a valid amount</span>
|
ng-if="Form.transferAmount.$error.maxlength || Form.transferAmount.$error.pattern">Enter a valid amount</span>
|
||||||
@ -394,7 +429,7 @@
|
|||||||
</label>
|
</label>
|
||||||
|
|
||||||
<input type="text" placeholder="Enter Degree Cert Fees"
|
<input type="text" placeholder="Enter Degree Cert Fees"
|
||||||
autofocus tabindex="10" class="form-control" name="degreeAmount" id="degreeAmount" ng-maxlength="8"
|
autofocus tabindex="12" class="form-control" name="degreeAmount" id="degreeAmount" ng-maxlength="8"
|
||||||
ng-model="myModel.degreeAmount" ng-pattern="/^[0-9]*$/">
|
ng-model="myModel.degreeAmount" ng-pattern="/^[0-9]*$/">
|
||||||
<span class="error text-small block"
|
<span class="error text-small block"
|
||||||
ng-if="Form.degreeAmount.$error.maxlength || Form.degreeAmount.$error.pattern">Enter a valid amount</span>
|
ng-if="Form.degreeAmount.$error.maxlength || Form.degreeAmount.$error.pattern">Enter a valid amount</span>
|
||||||
@ -407,7 +442,7 @@
|
|||||||
</label>
|
</label>
|
||||||
|
|
||||||
<input type="text" placeholder="Enter Migration Cert Fees"
|
<input type="text" placeholder="Enter Migration Cert Fees"
|
||||||
autofocus tabindex="11" class="form-control" name="migrationAmount" id="migrationAmount" ng-maxlength="8"
|
autofocus tabindex="13" class="form-control" name="migrationAmount" id="migrationAmount" ng-maxlength="8"
|
||||||
ng-model="myModel.migrationAmount" ng-pattern="/^[0-9]*$/">
|
ng-model="myModel.migrationAmount" ng-pattern="/^[0-9]*$/">
|
||||||
<span class="error text-small block"
|
<span class="error text-small block"
|
||||||
ng-if="Form.migrationAmount.$error.maxlength || Form.migrationAmount.$error.pattern">Enter a valid amount</span>
|
ng-if="Form.migrationAmount.$error.maxlength || Form.migrationAmount.$error.pattern">Enter a valid amount</span>
|
||||||
@ -422,7 +457,7 @@
|
|||||||
</label>
|
</label>
|
||||||
|
|
||||||
<input type="text" placeholder="Enter Other Fees"
|
<input type="text" placeholder="Enter Other Fees"
|
||||||
autofocus tabindex="12" class="form-control" name="otherAmount" id="otherAmount" ng-maxlength="8"
|
autofocus tabindex="14" class="form-control" name="otherAmount" id="otherAmount" ng-maxlength="8"
|
||||||
ng-model="myModel.otherAmount" ng-pattern="/^[0-9]*$/">
|
ng-model="myModel.otherAmount" ng-pattern="/^[0-9]*$/">
|
||||||
<span class="error text-small block"
|
<span class="error text-small block"
|
||||||
ng-if="Form.otherAmount.$error.maxlength || Form.otherAmount.$error.pattern">Enter a valid amount</span>
|
ng-if="Form.otherAmount.$error.maxlength || Form.otherAmount.$error.pattern">Enter a valid amount</span>
|
||||||
@ -438,13 +473,13 @@
|
|||||||
|
|
||||||
<div class="col-md-12">
|
<div class="col-md-12">
|
||||||
<div class="pull-right">
|
<div class="pull-right">
|
||||||
<button type="submit" ladda="ldloading1.zoom_in" tabindex="13" class="btn btn-wide btn-success" data-style="zoom-in">
|
<button type="submit" ladda="ldloading1.zoom_in" tabindex="15" class="btn btn-wide btn-success" data-style="zoom-in">
|
||||||
Submit
|
Submit
|
||||||
</button>
|
</button>
|
||||||
<!-- <button type="submit" class="btn btn-success btn-o" tabindex="8">
|
<!-- <button type="submit" class="btn btn-success btn-o" tabindex="8">
|
||||||
Submit
|
Submit
|
||||||
</button>-->
|
</button>-->
|
||||||
<button type="reset" class="btn btn-warning btn-wide" tabindex="14" ng-click="courseForm.reset(Form);"
|
<button type="reset" class="btn btn-warning btn-wide" tabindex="16" ng-click="courseForm.reset(Form);"
|
||||||
ng-click="branchForm.reset(Form)">
|
ng-click="branchForm.reset(Form)">
|
||||||
Reset
|
Reset
|
||||||
</button>
|
</button>
|
||||||
|
|||||||
@ -16,8 +16,8 @@
|
|||||||
</label>
|
</label>
|
||||||
|
|
||||||
<input type="text" placeholder="Enter Course ID"
|
<input type="text" placeholder="Enter Course ID"
|
||||||
tabindex="1" class="form-control" name="coursecode"
|
tabindex="2" class="form-control" name="coursecode"
|
||||||
ng-model="p.CourseID" ng-pattern="/^[a-zA-Z0-9-\s]*$/" readonly required/>
|
ng-model="p.CourseID" ng-pattern="/^[a-zA-Z0-9-]*$/" readonly required/>
|
||||||
<span class="error text-small block"
|
<span class="error text-small block"
|
||||||
ng-if="Form.coursecode.$dirty && Form.coursecode.$error.required">Course id is required</span>
|
ng-if="Form.coursecode.$dirty && Form.coursecode.$error.required">Course id is required</span>
|
||||||
<span class="error text-small block"
|
<span class="error text-small block"
|
||||||
@ -26,6 +26,7 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<div class="col-md-3 form-group"
|
<div class="col-md-3 form-group"
|
||||||
ng-class="{'has-error':Form.coursename.$dirty && Form.coursename.$invalid, 'has-success':Form.coursename.$valid}">
|
ng-class="{'has-error':Form.coursename.$dirty && Form.coursename.$invalid, 'has-success':Form.coursename.$valid}">
|
||||||
<label>
|
<label>
|
||||||
@ -33,7 +34,7 @@
|
|||||||
</label>
|
</label>
|
||||||
|
|
||||||
<input type="text" placeholder="Enter Course Name"
|
<input type="text" placeholder="Enter Course Name"
|
||||||
tabindex="2" class="form-control" name="coursename"
|
tabindex="3" class="form-control" name="coursename"
|
||||||
ng-model="p.CourseName" ng-pattern="/^[a-zA-Z-./\s]*$/" required/>
|
ng-model="p.CourseName" ng-pattern="/^[a-zA-Z-./\s]*$/" required/>
|
||||||
<span class="error text-small block"
|
<span class="error text-small block"
|
||||||
ng-if="Form.coursename.$dirty && Form.coursename.$error.required">Course name is required</span>
|
ng-if="Form.coursename.$dirty && Form.coursename.$error.required">Course name is required</span>
|
||||||
@ -48,7 +49,7 @@
|
|||||||
<label>
|
<label>
|
||||||
University <span class="symbol required"></span>
|
University <span class="symbol required"></span>
|
||||||
</label>
|
</label>
|
||||||
<select class="form-control" name="university" tabindex="3" id="university"
|
<select class="form-control" name="university" tabindex="4" id="university"
|
||||||
ng-model="p.UniversityID"
|
ng-model="p.UniversityID"
|
||||||
ng-options="details.UniversityID as details.UniversityName for details in university"
|
ng-options="details.UniversityID as details.UniversityName for details in university"
|
||||||
disabled required>
|
disabled required>
|
||||||
@ -88,18 +89,50 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-md-6 form-group"
|
||||||
|
ng-class="{'has-error':Form.specilization1.$dirty && Form.specilization1.$invalid}">
|
||||||
|
<label>
|
||||||
|
Specilization 1
|
||||||
|
</label>
|
||||||
|
|
||||||
|
<input type="text" placeholder="Enter Specilization 1"
|
||||||
|
tabindex="5" class="form-control" name="specilization1"
|
||||||
|
ng-model="p.Specilization1" ng-pattern="/^[a-zA-Z0-9-./\s]*$/"/>
|
||||||
|
<!--<span class="error text-small block"
|
||||||
|
ng-if="Form.specilization1.$dirty && Form.specilization1.$error.required">Specilization 1 is required</span>-->
|
||||||
|
<span class="error text-small block"
|
||||||
|
ng-if="Form.specilization1.$dirty && Form.specilization1.$error.pattern">Invalid Specilization 1 </span>
|
||||||
|
<!--<span class="success text-small"-->
|
||||||
|
<!--ng-if="Form.specilization1.$valid">Thank You!</span>-->
|
||||||
|
</div>
|
||||||
|
<div class="col-md-6 form-group"
|
||||||
|
ng-class="{'has-error':Form.specilization2.$dirty && Form.specilization2.$invalid}">
|
||||||
|
<label>
|
||||||
|
Specilization 2
|
||||||
|
</label>
|
||||||
|
|
||||||
|
<input type="text" placeholder="Enter Specilization 2"
|
||||||
|
tabindex="6" class="form-control" name="specilization2"
|
||||||
|
ng-model="p.Specilization2" ng-pattern="/^[a-zA-Z0-9-./\s]*$/"/>
|
||||||
|
<!--<span class="error text-small block"
|
||||||
|
ng-if="Form.specilization1.$dirty && Form.specilization1.$error.required">Specilization 1 is required</span>-->
|
||||||
|
<span class="error text-small block"
|
||||||
|
ng-if="Form.specilization2.$dirty && Form.specilization2.$error.pattern">Invalid Specilization 2 </span>
|
||||||
|
<!--<span class="success text-small"-->
|
||||||
|
<!--ng-if="Form.specilization1.$valid">Thank You!</span>-->
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
|
|
||||||
<div class="col-md-6">
|
<div class="col-md-6">
|
||||||
<div class="row">
|
<div class="row" ng-if="myModelRegular1.program=='P001'">
|
||||||
<div class="col-md-12">
|
<div class="col-md-12">
|
||||||
|
|
||||||
<fieldset> <legend> Single </legend>
|
<fieldset>
|
||||||
|
<legend> Single </legend>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
|
|
||||||
<div class="col-md-6 form-group" ng-class="{'has-error':Form.regularFees.$dirty && Form.regularFees.$invalid}" ng-if="myModelRegular1.program=='P001'">
|
<div class="col-md-6 form-group" ng-class="{'has-error':Form.regularFees.$dirty && Form.regularFees.$invalid}" ng-if="myModelRegular1.program=='P001'">
|
||||||
@ -108,7 +141,7 @@
|
|||||||
</label>
|
</label>
|
||||||
|
|
||||||
<input type="text" placeholder="Enter Regular Fees Amt"
|
<input type="text" placeholder="Enter Regular Fees Amt"
|
||||||
autofocus tabindex="5" class="form-control" name="regularFees" id="regularFees" ng-maxlength="8"
|
autofocus tabindex="7" class="form-control" name="regularFees" id="regularFees" ng-maxlength="8"
|
||||||
ng-model="myModelRegular1.FeesAmount" ng-pattern="/^[0-9]*$/"/>
|
ng-model="myModelRegular1.FeesAmount" ng-pattern="/^[0-9]*$/"/>
|
||||||
|
|
||||||
<span class="error text-small block"
|
<span class="error text-small block"
|
||||||
@ -121,7 +154,7 @@
|
|||||||
</label>
|
</label>
|
||||||
|
|
||||||
<input type="text" placeholder="Enter Lateral Fees Amt"
|
<input type="text" placeholder="Enter Lateral Fees Amt"
|
||||||
autofocus tabindex="5" class="form-control" name="lateralFees" id="lateralFees" ng-maxlength="8"
|
autofocus tabindex="8" class="form-control" name="lateralFees" id="lateralFees" ng-maxlength="8"
|
||||||
ng-model="myModelLateral1.FeesAmount" ng-pattern="/^[0-9]*$/"/>
|
ng-model="myModelLateral1.FeesAmount" ng-pattern="/^[0-9]*$/"/>
|
||||||
|
|
||||||
<span class="error text-small block"
|
<span class="error text-small block"
|
||||||
@ -137,7 +170,7 @@
|
|||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="row">
|
<div class="row" ng-if="updateMoreItems.length!=0">
|
||||||
|
|
||||||
<div class="col-md-12">
|
<div class="col-md-12">
|
||||||
<fieldset>
|
<fieldset>
|
||||||
@ -154,7 +187,7 @@
|
|||||||
</label>
|
</label>
|
||||||
|
|
||||||
<input type="text" placeholder="Enter Sem/year"
|
<input type="text" placeholder="Enter Sem/year"
|
||||||
tabindex="6" class="form-control" name="sem_year"
|
tabindex="9" class="form-control" name="sem_year"
|
||||||
ng-model="myModelSemYear1.programName" ng-pattern="/^[a-zA-Z0-9-./\s]*$/"/>
|
ng-model="myModelSemYear1.programName" ng-pattern="/^[a-zA-Z0-9-./\s]*$/"/>
|
||||||
<!--<span class="error text-small block"
|
<!--<span class="error text-small block"
|
||||||
ng-if="Form.sem_year.$dirty && Form.sem_year.$error.required">Sem/Year is required</span>-->
|
ng-if="Form.sem_year.$dirty && Form.sem_year.$error.required">Sem/Year is required</span>-->
|
||||||
@ -168,7 +201,7 @@
|
|||||||
</label>
|
</label>
|
||||||
|
|
||||||
<input type="text" placeholder="Enter Fees Amount"
|
<input type="text" placeholder="Enter Fees Amount"
|
||||||
autofocus tabindex="7" class="form-control" name="feesAmount" id="feesAmount" ng-maxlength="8"
|
autofocus tabindex="10" class="form-control" name="feesAmount" id="feesAmount" ng-maxlength="8"
|
||||||
ng-model="myModelSemYear1.FeesAmount" ng-pattern="/^[0-9]*$/"/>
|
ng-model="myModelSemYear1.FeesAmount" ng-pattern="/^[0-9]*$/"/>
|
||||||
<!--<span class="error text-small block"
|
<!--<span class="error text-small block"
|
||||||
ng-if="Form.feesAmount.$dirty && Form.feesAmount.$invalid"
|
ng-if="Form.feesAmount.$dirty && Form.feesAmount.$invalid"
|
||||||
@ -230,7 +263,7 @@
|
|||||||
</label>
|
</label>
|
||||||
|
|
||||||
<input type="text" placeholder="Enter Prov Cert Fees"
|
<input type="text" placeholder="Enter Prov Cert Fees"
|
||||||
autofocus tabindex="8" class="form-control" name="provFess" id="provFess" ng-maxlength="8"
|
autofocus tabindex="11" class="form-control" name="provFess" id="provFess" ng-maxlength="8"
|
||||||
ng-model="p.PC" ng-pattern="/^[0-9]*$/">
|
ng-model="p.PC" ng-pattern="/^[0-9]*$/">
|
||||||
<span class="error text-small block"
|
<span class="error text-small block"
|
||||||
ng-if="Form.provFess.$error.maxlength || Form.provFess.$error.pattern">Enter a valid amount</span>
|
ng-if="Form.provFess.$error.maxlength || Form.provFess.$error.pattern">Enter a valid amount</span>
|
||||||
@ -246,7 +279,7 @@
|
|||||||
</label>
|
</label>
|
||||||
|
|
||||||
<input type="text" placeholder="Enter transfer Cert Fees"
|
<input type="text" placeholder="Enter transfer Cert Fees"
|
||||||
autofocus tabindex="9" class="form-control" name="transferAmount" id="transferAmount" ng-maxlength="8"
|
autofocus tabindex="12" class="form-control" name="transferAmount" id="transferAmount" ng-maxlength="8"
|
||||||
ng-model="p.TC" ng-pattern="/^[0-9]*$/">
|
ng-model="p.TC" ng-pattern="/^[0-9]*$/">
|
||||||
<span class="error text-small block"
|
<span class="error text-small block"
|
||||||
ng-if="Form.transferAmount.$error.maxlength || Form.transferAmount.$error.pattern">Enter a valid amount</span>
|
ng-if="Form.transferAmount.$error.maxlength || Form.transferAmount.$error.pattern">Enter a valid amount</span>
|
||||||
@ -263,7 +296,7 @@
|
|||||||
</label>
|
</label>
|
||||||
|
|
||||||
<input type="text" placeholder="Enter Degree Cert Fees"
|
<input type="text" placeholder="Enter Degree Cert Fees"
|
||||||
autofocus tabindex="10" class="form-control" name="degreeAmount" id="degreeAmount" ng-maxlength="8"
|
autofocus tabindex="13" class="form-control" name="degreeAmount" id="degreeAmount" ng-maxlength="8"
|
||||||
ng-model="p.DC" ng-pattern="/^[0-9]*$/">
|
ng-model="p.DC" ng-pattern="/^[0-9]*$/">
|
||||||
<span class="error text-small block"
|
<span class="error text-small block"
|
||||||
ng-if="Form.degreeAmount.$error.maxlength || Form.degreeAmount.$error.pattern">Enter a valid amount</span>
|
ng-if="Form.degreeAmount.$error.maxlength || Form.degreeAmount.$error.pattern">Enter a valid amount</span>
|
||||||
@ -276,7 +309,7 @@
|
|||||||
</label>
|
</label>
|
||||||
|
|
||||||
<input type="text" placeholder="Enter Migration Cert Fees"
|
<input type="text" placeholder="Enter Migration Cert Fees"
|
||||||
autofocus tabindex="11" class="form-control" name="migrationAmount" id="migrationAmount" ng-maxlength="8"
|
autofocus tabindex="14" class="form-control" name="migrationAmount" id="migrationAmount" ng-maxlength="8"
|
||||||
ng-model="p.MC" ng-pattern="/^[0-9]*$/">
|
ng-model="p.MC" ng-pattern="/^[0-9]*$/">
|
||||||
<span class="error text-small block"
|
<span class="error text-small block"
|
||||||
ng-if="Form.migrationAmount.$error.maxlength || Form.migrationAmount.$error.pattern">Enter a valid amount</span>
|
ng-if="Form.migrationAmount.$error.maxlength || Form.migrationAmount.$error.pattern">Enter a valid amount</span>
|
||||||
@ -292,7 +325,7 @@
|
|||||||
</label>
|
</label>
|
||||||
|
|
||||||
<input type="text" placeholder="Enter Other Fees"
|
<input type="text" placeholder="Enter Other Fees"
|
||||||
autofocus tabindex="12" class="form-control" name="otherAmount" id="otherAmount" ng-maxlength="8"
|
autofocus tabindex="15" class="form-control" name="otherAmount" id="otherAmount" ng-maxlength="8"
|
||||||
ng-model="p.OtherFees" ng-pattern="/^[0-9]*$/">
|
ng-model="p.OtherFees" ng-pattern="/^[0-9]*$/">
|
||||||
<span class="error text-small block"
|
<span class="error text-small block"
|
||||||
ng-if="Form.otherAmount.$error.maxlength || Form.otherAmount.$error.pattern">Enter a valid amount</span>
|
ng-if="Form.otherAmount.$error.maxlength || Form.otherAmount.$error.pattern">Enter a valid amount</span>
|
||||||
@ -313,11 +346,11 @@
|
|||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-md-12">
|
<div class="col-md-12">
|
||||||
<div class="pull-right">
|
<div class="pull-right">
|
||||||
<button type="submit" ladda="ldloading.zoom_in" tabindex="9" class="btn btn-wide btn-success" data-style="zoom-in" ng-click="updateCourse(p,Form,myModelRegular1,myModelLateral1,myModelSemYear1,'zoom-in')">
|
<button type="submit" ladda="ldloading.zoom_in" tabindex="16" class="btn btn-wide btn-success" data-style="zoom-in" ng-click="updateCourse(p,Form,myModelRegular1,myModelLateral1,myModelSemYear1,'zoom-in')">
|
||||||
Save
|
Save
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
<input type="button" class="btn btn-warning btn-wide" tabindex="10" value="Cancel"
|
<input type="button" class="btn btn-warning btn-wide" tabindex="17" value="Cancel"
|
||||||
ng-click="cancel();">
|
ng-click="cancel();">
|
||||||
|
|
||||||
</input>
|
</input>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user