course details changes done
This commit is contained in:
parent
ab1c561657
commit
3bac60e4fb
@ -27,31 +27,6 @@ app.controller('courseCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab
|
||||
|
||||
|
||||
|
||||
/*
|
||||
* edit course details
|
||||
* created by kms
|
||||
* */
|
||||
$scope.editId = -1;
|
||||
$rootScope.setEditId = function (pid,p) {
|
||||
// find index for fees type drop down list
|
||||
for(var i in $scope.feesDetails) {
|
||||
if($scope.feesDetails[i].ListCode==p.FeesType){
|
||||
$rootScope.myModel1.ListName=$scope.feesDetails[i];
|
||||
}
|
||||
}
|
||||
$scope.editId = pid;
|
||||
};
|
||||
|
||||
/*
|
||||
* cancel edit div
|
||||
* created by kms
|
||||
* */
|
||||
$scope.cancel = function () {
|
||||
$rootScope.init();
|
||||
$scope.editId = -1;
|
||||
|
||||
};
|
||||
|
||||
// sorting function for table params
|
||||
$scope.sort = function(keyname){
|
||||
$scope.sortKey = keyname; //set the sortKey to the param passed
|
||||
@ -64,8 +39,7 @@ app.controller('courseCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab
|
||||
* created by kms
|
||||
* */
|
||||
$scope.courseForm = {
|
||||
submit: function (form, myModel,loading,addMoreItems) {
|
||||
|
||||
submit: function (form, myModel,regularModel,lateralModel,semYearModel,loading,addMoreItems) {
|
||||
var firstError = null;
|
||||
if (form.$invalid) {
|
||||
var field = null, firstError = null;
|
||||
@ -82,25 +56,14 @@ app.controller('courseCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab
|
||||
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");
|
||||
} else {
|
||||
if(myModel.programListName=='P001'){
|
||||
if(semYearModel.program=='Y001' && semYearModel.programName!="" || semYearModel.FeesAmount!=""){
|
||||
|
||||
$scope.addMoreItems.push({
|
||||
program: myModel.programListName,
|
||||
FeesName: 'Regular',
|
||||
FeesAmount: myModel.feesAmount
|
||||
});
|
||||
}
|
||||
else if(myModel.programListName=='P002'){
|
||||
$scope.addMoreItems.push({
|
||||
program: myModel.programListName,
|
||||
FeesName: 'Lateral Entry',
|
||||
FeesAmount: myModel.feesAmount
|
||||
});
|
||||
}
|
||||
else if(myModel.programListName=='Y001'){
|
||||
$scope.addMoreItems.push({
|
||||
program: myModel.programListName,
|
||||
FeesName: myModel.semYear,
|
||||
FeesAmount: myModel.feesAmount
|
||||
program: semYearModel.program,
|
||||
programName:semYearModel.programName,
|
||||
FeesName: semYearModel.FeesName,
|
||||
FeesType:semYearModel.FeesType,
|
||||
FeesAmount: semYearModel.FeesAmount
|
||||
});
|
||||
}
|
||||
|
||||
@ -126,7 +89,9 @@ app.controller('courseCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab
|
||||
degreeAmount:myModel.degreeAmount,
|
||||
migrationAmount:myModel.migrationAmount,
|
||||
otherAmount:myModel.otherAmount,
|
||||
feesAmounts:$scope.addMoreItems,
|
||||
regularFeesAmounts:regularModel,
|
||||
lateralFeesAmounts:lateralModel,
|
||||
semFeesAmounts:$scope.addMoreItems,
|
||||
createdBy: JSON.parse(localStorage.getItem('localObj')).localUserID
|
||||
}
|
||||
};
|
||||
@ -157,7 +122,7 @@ app.controller('courseCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab
|
||||
* update the course details
|
||||
* created by kms
|
||||
* */
|
||||
$scope.updateCourse = function (myModel, form, loading) {
|
||||
$scope.updateCourse = function (myModel, form,regular,lateral,semYear, loading) {
|
||||
var firstError = null;
|
||||
if (form.$invalid) {
|
||||
var field = null, firstError = null;
|
||||
@ -174,6 +139,16 @@ app.controller('courseCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab
|
||||
}
|
||||
angular.element('.ng-invalid[name=' + firstError + ']').focus();
|
||||
} else {
|
||||
if(semYear.programName!="" || semYear.FeesAmount!=""){
|
||||
$rootScope.updateMoreItems.push({
|
||||
ID:"",
|
||||
program: semYear.program,
|
||||
programName:semYear.programName,
|
||||
FeesName: semYear.FeesName,
|
||||
FeesType:semYear.FeesType,
|
||||
FeesAmount: semYear.FeesAmount
|
||||
});
|
||||
}
|
||||
$scope.ldloading = {};
|
||||
|
||||
$scope.ldloading[loading.replace('-', '_')] = true;
|
||||
@ -194,6 +169,9 @@ app.controller('courseCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab
|
||||
migrationAmount:myModel.MC,
|
||||
otherAmount:myModel.OtherFees,
|
||||
feesAmounts:myModel.feesStructures,
|
||||
regularFeesAmounts:regular,
|
||||
lateralFeesAmounts:lateral,
|
||||
semFeesAmounts:$rootScope.updateMoreItems,
|
||||
status: myModel.IsActive,
|
||||
updatedBy: JSON.parse(localStorage.getItem('localObj')).localUserID
|
||||
}
|
||||
@ -201,12 +179,16 @@ app.controller('courseCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab
|
||||
$http(update).then(function (response) {
|
||||
if (response.data.status==200 && response.data.courseStatus) {
|
||||
$scope.ldloading[loading.replace('-', '_')] = false;
|
||||
swal("Success!", response.data.message, "success");
|
||||
$scope.editId = -1;
|
||||
$rootScope.updateMoreItems=[];
|
||||
$rootScope.init();
|
||||
swal("Success!", response.data.message, "success");
|
||||
|
||||
$scope.editId = -1;
|
||||
|
||||
|
||||
} else {
|
||||
$scope.ldloading[loading.replace('-', '_')] = false;
|
||||
$rootScope.init();
|
||||
swal("Failed!", response.data.message, "error");
|
||||
}
|
||||
});
|
||||
@ -242,8 +224,48 @@ app.controller('courseCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab
|
||||
$scope.university=response.data.universityDetails;
|
||||
$scope.feesDetails=response.data.feesDetails;
|
||||
$scope.myModel.ListName=$scope.feesDetails[0];
|
||||
|
||||
$scope.myModel.programListName=$scope.myModel.ListName.programType[0].ListCode;
|
||||
|
||||
// single sitting regular course details in model
|
||||
|
||||
$scope.myModelRegular = {
|
||||
"FeesType":$scope.feesDetails[0].ListCode,
|
||||
"FeesName":$scope.feesDetails[0].ListName,
|
||||
"program":$scope.feesDetails[0].programType[0].ListCode,
|
||||
"programName":$scope.feesDetails[0].programType[0].ListName,
|
||||
"FeesAmount":"",
|
||||
|
||||
};
|
||||
// single sitting lateral course details in model
|
||||
|
||||
$scope.myModelLateral = {
|
||||
"FeesType":$scope.feesDetails[0].ListCode,
|
||||
"FeesName":$scope.feesDetails[0].ListName,
|
||||
"program":$scope.feesDetails[0].programType[1].ListCode,
|
||||
"programName":$scope.feesDetails[0].programType[1].ListName,
|
||||
"FeesAmount":"",
|
||||
|
||||
};
|
||||
// single sitting Sem_Year course details in model
|
||||
|
||||
$scope.myModelSemYear = {
|
||||
"FeesType":$scope.feesDetails[1].ListCode,
|
||||
"FeesName":$scope.feesDetails[1].ListName,
|
||||
"program":$scope.feesDetails[1].programType[0].ListCode,
|
||||
"programName":"",
|
||||
"FeesAmount":"",
|
||||
|
||||
};
|
||||
$rootScope.myModelSemYear1 = {
|
||||
"FeesType":$scope.feesDetails[1].ListCode,
|
||||
"FeesName":$scope.feesDetails[1].ListName,
|
||||
"program":$scope.feesDetails[1].programType[0].ListCode,
|
||||
"programName":"",
|
||||
"FeesAmount":"",
|
||||
|
||||
};
|
||||
|
||||
|
||||
} else {
|
||||
|
||||
@ -274,6 +296,7 @@ app.controller('courseCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab
|
||||
* */
|
||||
$scope.addMoreItems = [];
|
||||
$rootScope.addMoreFeesItems = function (model,form) {
|
||||
|
||||
var firstError = null;
|
||||
if (form.$invalid) {
|
||||
var field = null, firstError = null;
|
||||
@ -288,16 +311,157 @@ app.controller('courseCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
angular.element('.ng-invalid[name=' + firstError + ']').focus();
|
||||
} else {
|
||||
}
|
||||
|
||||
else if(model.programName==''){
|
||||
swal("Warning!", "Please Enter Sem/Year Name", "warning");
|
||||
|
||||
}
|
||||
else if(model.FeesAmount==''){
|
||||
swal("Warning!", "Please Enter Fees Amount", "warning");
|
||||
|
||||
}
|
||||
else {
|
||||
|
||||
$scope.addMoreItems.push({
|
||||
program: model.programListName,
|
||||
FeesName: model.semYear,
|
||||
FeesAmount: model.feesAmount
|
||||
program: model.program,
|
||||
programName:model.programName,
|
||||
FeesName: model.FeesName,
|
||||
FeesType:model.FeesType,
|
||||
FeesAmount: model.FeesAmount
|
||||
});
|
||||
$scope.myModel.semYear="";
|
||||
$scope.myModel.feesAmount="";
|
||||
$scope.myModelSemYear = {
|
||||
"FeesType":$scope.feesDetails[1].ListCode,
|
||||
"FeesName":$scope.feesDetails[1].ListName,
|
||||
"program":$scope.feesDetails[1].programType[0].ListCode,
|
||||
"programName":"",
|
||||
"FeesAmount":"",
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* edit course details
|
||||
* created by kms
|
||||
* */
|
||||
$rootScope.updateMoreItems = [];
|
||||
$scope.editId = -1;
|
||||
$rootScope.setEditId = function (pid,p) {
|
||||
// find index for fees type drop down list
|
||||
|
||||
angular.forEach(p.feesStructures, function(value, key){
|
||||
|
||||
if(value.ProgramType=="P001"){
|
||||
|
||||
// single sitting regular course details in model
|
||||
|
||||
$rootScope.myModelRegular1 = {
|
||||
"ID":value.ID,
|
||||
"FeesType":$scope.feesDetails[0].ListCode,
|
||||
"FeesName":$scope.feesDetails[0].ListName,
|
||||
"program":value.ProgramType,
|
||||
"programName":value.Sem_Year,
|
||||
"FeesAmount":value.FeesAmount,
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
else if(value.ProgramType=="P002"){
|
||||
// single sitting lateral course details in model
|
||||
$rootScope.myModelLateral1 = {
|
||||
"ID":value.ID,
|
||||
"FeesType":$scope.feesDetails[0].ListCode,
|
||||
"FeesName":$scope.feesDetails[0].ListName,
|
||||
"program":value.ProgramType,
|
||||
"programName":value.Sem_Year,
|
||||
"FeesAmount":value.FeesAmount,
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
else if(value.ProgramType=="Y001"){
|
||||
|
||||
// Sem_Year course details in model
|
||||
|
||||
$rootScope.updateMoreItems.push({
|
||||
"ID":value.ID,
|
||||
"FeesType":$scope.feesDetails[1].ListCode,
|
||||
"FeesName":$scope.feesDetails[1].ListName,
|
||||
"program":value.ProgramType,
|
||||
"programName":value.Sem_Year,
|
||||
"FeesAmount":value.FeesAmount,
|
||||
});
|
||||
|
||||
}
|
||||
});
|
||||
|
||||
$scope.editId = pid;
|
||||
};
|
||||
|
||||
/*
|
||||
* cancel edit div
|
||||
* created by kms
|
||||
* */
|
||||
$scope.cancel = function () {
|
||||
$rootScope.init();
|
||||
$scope.editId = -1;
|
||||
|
||||
};
|
||||
/*
|
||||
* get update more fees item array
|
||||
* created by kms
|
||||
* */
|
||||
|
||||
$rootScope.updateMoreFeesItems = function (model,form) {
|
||||
var firstError = null;
|
||||
if (form.$invalid) {
|
||||
var field = null, firstError = null;
|
||||
for (field in form) {
|
||||
if (field[0] != '$') {
|
||||
if (firstError === null && !form[field].$valid) {
|
||||
firstError = form[field].$stop_name;
|
||||
}
|
||||
|
||||
if (form[field].$pristine) {
|
||||
form[field].$dirty = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
angular.element('.ng-invalid[name=' + firstError + ']').focus();
|
||||
}
|
||||
|
||||
else if( model==undefined || model.programName==''){
|
||||
swal("Warning!", "Please Enter Sem/Year Name", "warning");
|
||||
|
||||
}
|
||||
else if(model==undefined || model==undefined){
|
||||
swal("Warning!", "Please Enter Fees Amount", "warning");
|
||||
|
||||
}
|
||||
else {
|
||||
|
||||
$rootScope.updateMoreItems.push({
|
||||
ID:"",
|
||||
program: model.program,
|
||||
programName:model.programName,
|
||||
FeesName: model.FeesName,
|
||||
FeesType:model.FeesType,
|
||||
FeesAmount: model.FeesAmount
|
||||
});
|
||||
$rootScope.myModelSemYear1 = {
|
||||
"FeesType":$scope.feesDetails[1].ListCode,
|
||||
"FeesName":$scope.feesDetails[1].ListName,
|
||||
"program":$scope.feesDetails[1].programType[0].ListCode,
|
||||
"programName":"",
|
||||
"FeesAmount":"",
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
}
|
||||
@ -306,4 +470,5 @@ app.controller('courseCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTab
|
||||
|
||||
|
||||
|
||||
|
||||
}]);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user