diff --git a/app/partials/course/course_create.controller.js b/app/partials/course/course_create.controller.js index c976968..aa2d90b 100644 --- a/app/partials/course/course_create.controller.js +++ b/app/partials/course/course_create.controller.js @@ -6,8 +6,8 @@ .controller('CourseCreateCtrl', CourseCreateCtrl) CourseCreateCtrl.$inject = - ['$scope','$rootScope', '$modal', '$location', 'professors']; - function CourseCreateCtrl($scope, $rootScope, $modal, $location, professors) { + ['$scope','$rootScope', '$modal', '$state', 'professors']; + function CourseCreateCtrl($scope, $rootScope, $modal, $state, professors) { var vm = this; vm.submitted = false; vm.mayorque = false; @@ -50,13 +50,11 @@ professors.update({ id: professorid }, vm.professor, function(){ $rootScope.botonOk = true; - $rootScope.urlLo = 'listarMateria'; $rootScope.mensaje = "Materia " + vm.course.name + " creada"; }, function(){ $rootScope.botonOk = true; - $rootScope.urlLo = 'listarMateria'; $rootScope.mensaje = "Error creando la materia " + vm.course.name; }); @@ -67,21 +65,12 @@ } $scope.ok = function (urlLo) { - $location.url(urlLo); + $state.go('CourseList'); $scope.modalInstance.dismiss('cancel'); }; $scope.cancel = function () { $scope.modalInstance.dismiss('cancel'); - }; - - $rootScope.open = function($event) { - $event.preventDefault(); - $event.stopPropagation(); - - $rootScope.opened = true; - }; - - return vm; + }; }; })(); \ No newline at end of file diff --git a/app/partials/course/course_list.controller.js b/app/partials/course/course_list.controller.js index c6d5b3e..0a6627a 100644 --- a/app/partials/course/course_list.controller.js +++ b/app/partials/course/course_list.controller.js @@ -68,14 +68,6 @@ $scope.cancel = function () { $scope.modalInstance.dismiss('cancel'); - }; - - $rootScope.open = function($event) { - $event.preventDefault(); - $event.stopPropagation(); - $rootScope.opened = true; - }; - - return vm; + }; }; })(); \ No newline at end of file diff --git a/app/partials/professor/professor_create.controller.js b/app/partials/professor/professor_create.controller.js index 113367b..ac9f221 100644 --- a/app/partials/professor/professor_create.controller.js +++ b/app/partials/professor/professor_create.controller.js @@ -65,12 +65,8 @@ $scope.modalInstance.dismiss('cancel'); }; - $rootScope.open = function($event) { - $event.preventDefault(); - $event.stopPropagation(); - $rootScope.opened = true; - }; - - return vm; + vm.back = function () { + $state.go('ProfessorList'); + }; }; })(); \ No newline at end of file diff --git a/app/partials/professor/professor_create.html b/app/partials/professor/professor_create.html index 057c6b2..195eb38 100644 --- a/app/partials/professor/professor_create.html +++ b/app/partials/professor/professor_create.html @@ -93,7 +93,8 @@

- + +

diff --git a/app/partials/professor/professor_update.controller.js b/app/partials/professor/professor_update.controller.js index bb843ac..267acef 100644 --- a/app/partials/professor/professor_update.controller.js +++ b/app/partials/professor/professor_update.controller.js @@ -63,11 +63,8 @@ $scope.modalInstance.dismiss('cancel'); }; - $rootScope.open = function($event) { - $event.preventDefault(); - $event.stopPropagation(); - $rootScope.opened = true; - }; - return vm; + vm.back = function () { + $state.go('ProfessorList'); + }; }; })(); \ No newline at end of file diff --git a/app/partials/professor/professor_update.html b/app/partials/professor/professor_update.html index 4a01eb2..6fe8bab 100644 --- a/app/partials/professor/professor_update.html +++ b/app/partials/professor/professor_update.html @@ -53,7 +53,8 @@

- + +

diff --git a/app/partials/report/section_report.html b/app/partials/report/section_report.html index daa4e11..899e7d6 100644 --- a/app/partials/report/section_report.html +++ b/app/partials/report/section_report.html @@ -1,7 +1,13 @@

Reportes de Secciones

-
-
+
+ +
@@ -48,10 +54,4 @@
-
\ No newline at end of file diff --git a/app/partials/report/student_report.html b/app/partials/report/student_report.html index de5ea98..40a40e3 100644 --- a/app/partials/report/student_report.html +++ b/app/partials/report/student_report.html @@ -1,7 +1,13 @@

Reportes de Estudiantes


-
+ +
@@ -35,10 +41,4 @@
-
\ No newline at end of file diff --git a/app/partials/section/section_create.controller.js b/app/partials/section/section_create.controller.js index 4b8b7a3..3fdbab0 100644 --- a/app/partials/section/section_create.controller.js +++ b/app/partials/section/section_create.controller.js @@ -129,6 +129,8 @@ $rootScope.opened = true; }; - return vm; + vm.back = function () { + $state.go('SectionList'); + }; }; })(); \ No newline at end of file diff --git a/app/partials/section/section_create.html b/app/partials/section/section_create.html index b440097..248d0a6 100644 --- a/app/partials/section/section_create.html +++ b/app/partials/section/section_create.html @@ -63,7 +63,8 @@

- + +

diff --git a/app/partials/section/section_list.controller.js b/app/partials/section/section_list.controller.js index 580e735..47e6c6d 100644 --- a/app/partials/section/section_list.controller.js +++ b/app/partials/section/section_list.controller.js @@ -77,12 +77,6 @@ }); }; - vm.eliminarMatriculaSplice = function (index, rsplice) { - if(rsplice){ - - } - }; - /*************************Fin de Eliminar Matricula*******************/ vm.modificarMatricula = function (index) { @@ -91,12 +85,6 @@ $state.go('SectionUpdate'); }; - $rootScope.open = function($event) { - $event.preventDefault(); - $event.stopPropagation(); - $rootScope.opened = true; - }; - $scope.ok = function (urlLo) { $state.go('SectionList'); $scope.modalInstance.dismiss('cancel'); @@ -109,7 +97,5 @@ vm.back = function () { $state.go('CourseList'); }; - - return vm; }; })(); \ No newline at end of file diff --git a/app/partials/section/section_list.html b/app/partials/section/section_list.html index 93d5e56..7fa6d0f 100644 --- a/app/partials/section/section_list.html +++ b/app/partials/section/section_list.html @@ -1,7 +1,10 @@

Listado de Secciones


- + + + +

@@ -57,5 +60,4 @@
- Regresar
\ No newline at end of file diff --git a/app/partials/section/section_update.html b/app/partials/section/section_update.html index 0139078..b0e9eec 100644 --- a/app/partials/section/section_update.html +++ b/app/partials/section/section_update.html @@ -1,7 +1,11 @@

Estudiantes Inscritos en {{ vm.section.course }} - Seccion {{ vm.section.name }} - Semestre {{ vm.section.semester }}


-

+ + + + +
@@ -47,7 +51,4 @@
-
- Regresar -
\ No newline at end of file diff --git a/app/partials/students/student_create.html b/app/partials/students/student_create.html index 9b038c2..74e1f14 100644 --- a/app/partials/students/student_create.html +++ b/app/partials/students/student_create.html @@ -71,13 +71,14 @@

- +

- Regresar + \ No newline at end of file