diff --git a/Apollo/api/application/controllers/Reregister_Controller.php b/Apollo/api/application/controllers/Reregister_Controller.php new file mode 100644 index 00000000..89eac9e0 --- /dev/null +++ b/Apollo/api/application/controllers/Reregister_Controller.php @@ -0,0 +1,36 @@ +load->model('Reregister_model', 'Reregister_model'); + + } + + + + + + +} \ No newline at end of file diff --git a/Apollo/api/application/models/Reregister_model.php b/Apollo/api/application/models/Reregister_model.php new file mode 100644 index 00000000..cba1a571 --- /dev/null +++ b/Apollo/api/application/models/Reregister_model.php @@ -0,0 +1,16 @@ +
REREGISTRATION
', + title: 'REREGISTRATION', + ncyBreadcrumb: { + label: 'RE REGISTRATION' + } + }).state('app.reregistration.reregistrationform',{ + url:'/reregistrationform', + templateUrl:"assets/views/reregistration/reregistrationform.html", + title:'Re Registration Form', + resolve: loadSequence('ladda', 'angular-ladda', 'reregistrationformCtrl','ngTable','ui.select','spin', 'ui.mask'), + ncyBreadcrumb: { + label: 'Re Registration Form' + } + + }).state('app.reregistration.batchmoment',{ + url:'/batchmoment', + templateUrl:"assets/views/reregistration/batchmoment.html", + title:'Re Registration Form', + resolve: loadSequence('ladda', 'angular-ladda', 'BatchmomentCtrl','ngTable','ui.select','spin', 'ui.mask'), + ncyBreadcrumb: { + label: 'Re Registration Form' + } + }); // $locationProvider.html5Mode(true); diff --git a/Apollo/assets/js/controllers/reregistrationformCtrl.js b/Apollo/assets/js/controllers/reregistrationformCtrl.js new file mode 100644 index 00000000..504e2e83 --- /dev/null +++ b/Apollo/assets/js/controllers/reregistrationformCtrl.js @@ -0,0 +1,15 @@ +'use strict'; +/** + * controllers for ng-table + * Simple table with sorting and filtering on AngularJS + */ +app.controller('reregistrationformCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableParams", "API_POINTS", "$localStorage", "$http", "$state","$modal","$log", function ($scope,$rootScope,toaster, $filter, ngTableParams, apiPoint, $localStorage, $http, $state,$modal,$log) { + $scope.myModel = { + "universityName":"", + "courseName":"", + "batchName":"" + }; + + + +}]); \ No newline at end of file diff --git a/Apollo/assets/js/controllers/schCtrl.js b/Apollo/assets/js/controllers/schCtrl.js index 54a1757f..92807e81 100755 --- a/Apollo/assets/js/controllers/schCtrl.js +++ b/Apollo/assets/js/controllers/schCtrl.js @@ -34,7 +34,7 @@ app.controller('schCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableP $scope.semDropDownShowLoading1 = false; $scope.semDetailsLoadingStatus1 = false; $scope.semDetailsLoadingTxt1 = ""; - $scope.setEditId = function (pid,cid,schid,subid,c) { + $scope.setEditId = function (pid,cid,schid,subid,c) { var branchid=JSON.parse(localStorage.getItem('localObj')).localBranchID; $scope.semDetailsLoadingStatus1 = true; $scope.semDetailsLoadingTxt1 = "Loading..."; @@ -118,85 +118,7 @@ app.controller('schCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableP $scope.reverse = !$scope.reverse; //if true make it false and vice versa } - /* - * init function - * created by TamilBala - * */ - $scope.init = function () { - - var branchid=JSON.parse(localStorage.getItem('localObj')).localBranchID; - //alert(branchid); - $scope.semDetailsLoadingStatus = true; - $scope.semDetailsLoadingTxt = "Loading..."; - - var getUniv = { - method: 'POST', - url: apiPoint.url + 'getUniversityCourseDetails/', - headers: { - 'Content-Type': 'application/json' - }, - data: { - requestedBy: JSON.parse(localStorage.getItem('localObj')).localUserID, - branchId:JSON.parse(localStorage.getItem('localObj')).localBranchID - - } - }; - - - $http(getUniv).then(function (response) { - if (response.data.status==200 && response.data.universityStatus) { - $scope.university=response.data.univerSityDetails; - - - - } else { - - $scope.university=""; - - } - }); - - $scope.selectedCourseNameC = { - list: $scope.selectedCourseName, - } - - /* - * getUnivid function - * created by TamilBala - * */ - - var getUnivid = { - method: 'POST', - url: apiPoint.url + 'getUniversityCourseId/', - headers: { - 'Content-Type': 'application/json' - }, - data: { - //requestedBy: JSON.parse(localStorage.getItem('localObj')).localUserID, - branchCode:branchid, - - } - }; - $http(getUnivid).then(function (response) { - if (response.data.status==200) - { - - $scope.universitycourse=response.data.getUnivDetailsinfo; - - - - } else { - - - $scope.universitycourse=""; - - } - }); - - - - - } + //Assign Courses to Course array for Multiple select @@ -446,6 +368,7 @@ app.controller('schCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableP if (response.data.status==200) { swal(" ", "Saved successfully,", "success"); + $scope.init(); } },function(error){ @@ -493,9 +416,11 @@ app.controller('schCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableP $http(update).then(function (response) { if (response.data.status==200 ) { // $scope.ldloading[loading.replace('-', '_')] = false; - //$scope.editId = -1; - $scope.init(); - swal("", "Saved Successfully.", "success"); + // + + swal("", "Saved Successfully.", "success"); + //$scope.editId = -1; + // $scope.init(); } else { @@ -551,6 +476,86 @@ app.controller('schCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableP } + /* + * init function + * created by TamilBala + * */ + $scope.init = function () { + + + var branchid=JSON.parse(localStorage.getItem('localObj')).localBranchID; + //alert(branchid); + $scope.semDetailsLoadingStatus = true; + $scope.semDetailsLoadingTxt = "Loading..."; + + var getUniv = { + method: 'POST', + url: apiPoint.url + 'getUniversityCourseDetails/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + requestedBy: JSON.parse(localStorage.getItem('localObj')).localUserID, + branchId:JSON.parse(localStorage.getItem('localObj')).localBranchID + + } + }; + + + $http(getUniv).then(function (response) { + if (response.data.status==200 && response.data.universityStatus) { + $scope.university=response.data.univerSityDetails; + + + + } else { + + $scope.university=""; + + } + }); + + $scope.selectedCourseNameC = { + list: $scope.selectedCourseName, + } + + /* + * getUnivid function + * created by TamilBala + * */ + + var getUnivid = { + method: 'POST', + url: apiPoint.url + 'getUniversityCourseId/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + //requestedBy: JSON.parse(localStorage.getItem('localObj')).localUserID, + branchCode:branchid, + + } + }; + $http(getUnivid).then(function (response) { + if (response.data.status==200) + { + + $scope.universitycourse=response.data.getUnivDetailsinfo; + + + + } else { + + + $scope.universitycourse=""; + + } + }); + + + + + } $scope.batchschedule={ @@ -563,4 +568,4 @@ $scope.batchschedule={ }, }; -}]); +}]); \ No newline at end of file diff --git a/Apollo/assets/views/partials/nav.html b/Apollo/assets/views/partials/nav.html index 301bbe22..ee22c626 100755 --- a/Apollo/assets/views/partials/nav.html +++ b/Apollo/assets/views/partials/nav.html @@ -341,6 +341,35 @@ +
  • + +
    +
    + +
    +
    + RE REGISTRATION +
    +
    +     + + + +
  • diff --git a/Apollo/assets/views/reregistration/batchmoment.html b/Apollo/assets/views/reregistration/batchmoment.html new file mode 100644 index 00000000..348bd776 --- /dev/null +++ b/Apollo/assets/views/reregistration/batchmoment.html @@ -0,0 +1,49 @@ + + +
    +
    +
    + +

    {{ mainTitle }}

    + + BATCH MOMENT + +
    +
    +
    +
    + + + +
    +
    + + + + + + + + + diff --git a/Apollo/assets/views/reregistration/reregistrationform.html b/Apollo/assets/views/reregistration/reregistrationform.html new file mode 100644 index 00000000..79e87414 --- /dev/null +++ b/Apollo/assets/views/reregistration/reregistrationform.html @@ -0,0 +1,49 @@ + + +
    +
    +
    + +

    {{ mainTitle }}

    + + Re Registration Per Semesters + +
    +
    +
    +
    + + + +
    +
    + + + + + + + + +