WallyHackenslacker/MASA
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Change button style and layout

Browse Source
This commit is contained in:
Reynaldo Reyes
2016-04-13 00:13:11 -04:30
parent 08c9146ea5
commit 1aa1dac74d
14 changed files with 47 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/partials/course/course_create.controller.js
View File

@@ -6,8 +6,8 @@
.controller('CourseCreateCtrl', CourseCreateCtrl) .controller('CourseCreateCtrl', CourseCreateCtrl)
CourseCreateCtrl.$inject = CourseCreateCtrl.$inject =
['$scope','$rootScope', '$modal', '$location', 'professors']; ['$scope','$rootScope', '$modal', '$state', 'professors'];
function CourseCreateCtrl($scope, $rootScope, $modal, $location, professors) { function CourseCreateCtrl($scope, $rootScope, $modal, $state, professors) {
var vm = this; var vm = this;
vm.submitted = false; vm.submitted = false;
vm.mayorque = false; vm.mayorque = false;
@@ -50,13 +50,11 @@
professors.update({ id: professorid }, vm.professor, professors.update({ id: professorid }, vm.professor,
function(){ function(){
$rootScope.botonOk = true; $rootScope.botonOk = true;
$rootScope.urlLo = 'listarMateria';
$rootScope.mensaje = $rootScope.mensaje =
"Materia " + vm.course.name + " creada"; "Materia " + vm.course.name + " creada";
}, },
function(){ function(){
$rootScope.botonOk = true; $rootScope.botonOk = true;
$rootScope.urlLo = 'listarMateria';
$rootScope.mensaje = $rootScope.mensaje =
"Error creando la materia " + vm.course.name; "Error creando la materia " + vm.course.name;
}); });
@@ -67,21 +65,12 @@
} }
$scope.ok = function (urlLo) { $scope.ok = function (urlLo) {
$location.url(urlLo); $state.go('CourseList');
$scope.modalInstance.dismiss('cancel'); $scope.modalInstance.dismiss('cancel');
}; };
$scope.cancel = function () { $scope.cancel = function () {
$scope.modalInstance.dismiss('cancel'); $scope.modalInstance.dismiss('cancel');
}; };
$rootScope.open = function($event) {
$event.preventDefault();
$event.stopPropagation();
$rootScope.opened = true;
};
return vm;
}; };
})(); })();

8
app/partials/course/course_list.controller.js
View File

@@ -69,13 +69,5 @@
$scope.cancel = function () { $scope.cancel = function () {
$scope.modalInstance.dismiss('cancel'); $scope.modalInstance.dismiss('cancel');
}; };
$rootScope.open = function($event) {
$event.preventDefault();
$event.stopPropagation();
$rootScope.opened = true;
};
return vm;
}; };
})(); })();

8
app/partials/professor/professor_create.controller.js
View File

@@ -65,12 +65,8 @@
$scope.modalInstance.dismiss('cancel'); $scope.modalInstance.dismiss('cancel');
}; };
$rootScope.open = function($event) { vm.back = function () {
$event.preventDefault(); $state.go('ProfessorList');
$event.stopPropagation();
$rootScope.opened = true;
}; };
return vm;
}; };
})(); })();

3
app/partials/professor/professor_create.html
View File

@@ -93,7 +93,8 @@
<label>&nbsp;</label> <label>&nbsp;</label>
<p class="input-group"> <p class="input-group">
<span class="input-group-btn"> <span class="input-group-btn">
<button type="submit" class="btn-primary btn">Agregar Profesor</button> <button type="submit" class="btn-success btn">Agregar Profesor</button>
<button type="button" class="btn-warning btn" style="margin: 10px" ng-click="vm.back()">Regresar</button>
</span> </span>
</p> </p>
</div> </div>

7
app/partials/professor/professor_update.controller.js
View File

@@ -63,11 +63,8 @@
$scope.modalInstance.dismiss('cancel'); $scope.modalInstance.dismiss('cancel');
}; };
$rootScope.open = function($event) { vm.back = function () {
$event.preventDefault(); $state.go('ProfessorList');
$event.stopPropagation();
$rootScope.opened = true;
}; };
return vm;
}; };
})(); })();

3
app/partials/professor/professor_update.html
View File

@@ -53,7 +53,8 @@
<label>&nbsp;</label> <label>&nbsp;</label>
<p class="input-group"> <p class="input-group">
<span class="input-group-btn"> <span class="input-group-btn">
<button type="submit" class="btn-primary btn">Modificar Profesor</button> <button type="submit" class="btn-success btn">Modificar Profesor</button>
<button type="button" class="btn-warning btn" style="margin: 10px" ng-click="vm.back()">Regresar</button>
</span> </span>
</p> </p>
</div> </div>

14
app/partials/report/section_report.html
View File

@@ -1,7 +1,13 @@
<div class="row clearfix"> <div class="row clearfix">
<h4>Reportes de Secciones</h4> <h4>Reportes de Secciones</h4>
<br> <br>
</br> <button class = "btn-warning btn"
type = "button"
style = "margin: 10px"
ng-click = "vm.back()">
Regresar
</button>
<br>
<div> <div>
<table class="table table-bordered table-striped"> <table class="table table-bordered table-striped">
<thead> <thead>
@@ -48,10 +54,4 @@
</tbody> </tbody>
</table> </table>
</div> </div>
<button class = "btn-warning btn"
type = "button"
style = "margin: 10px"
ng-click = "vm.back()">
Regresar
</button>
</div> </div>

14
app/partials/report/student_report.html
View File

@@ -1,7 +1,13 @@
<div class="row clearfix"> <div class="row clearfix">
<h4>Reportes de Estudiantes</h4> <h4>Reportes de Estudiantes</h4>
<br> <br>
</br> <button class = "btn-warning btn"
type = "button"
style = "margin: 10px"
ng-click = "vm.back()">
Regresar
</button>
<br>
<div> <div>
<table class="table table-bordered table-striped"> <table class="table table-bordered table-striped">
<thead> <thead>
@@ -35,10 +41,4 @@
</tbody> </tbody>
</table> </table>
</div> </div>
<button class = "btn-warning btn"
type = "button"
style = "margin: 10px"
ng-click = "vm.back()">
Regresar
</button>
</div> </div>

4
app/partials/section/section_create.controller.js
View File

@@ -129,6 +129,8 @@
$rootScope.opened = true; $rootScope.opened = true;
}; };
return vm; vm.back = function () {
$state.go('SectionList');
};
}; };
})(); })();

3
app/partials/section/section_create.html
View File

@@ -63,7 +63,8 @@
<label>&nbsp;</label> <label>&nbsp;</label>
<p class="input-group"> <p class="input-group">
<span class="input-group-btn"> <span class="input-group-btn">
<button type="submit" class="btn-primary btn">Crear Matricula</button> <button type="submit" class="btn-success btn">Crear Sección</button>
<button type="button" class="btn-warning btn" style="margin: 10px" ng-click="vm.back()">Regresar</button>
</span> </span>
</p> </p>
</div> </div>

14
app/partials/section/section_list.controller.js
View File

@@ -77,12 +77,6 @@
}); });
}; };
vm.eliminarMatriculaSplice = function (index, rsplice) {
if(rsplice){
}
};
/*************************Fin de Eliminar Matricula*******************/ /*************************Fin de Eliminar Matricula*******************/
vm.modificarMatricula = function (index) { vm.modificarMatricula = function (index) {
@@ -91,12 +85,6 @@
$state.go('SectionUpdate'); $state.go('SectionUpdate');
}; };
$rootScope.open = function($event) {
$event.preventDefault();
$event.stopPropagation();
$rootScope.opened = true;
};
$scope.ok = function (urlLo) { $scope.ok = function (urlLo) {
$state.go('SectionList'); $state.go('SectionList');
$scope.modalInstance.dismiss('cancel'); $scope.modalInstance.dismiss('cancel');
@@ -109,7 +97,5 @@
vm.back = function () { vm.back = function () {
$state.go('CourseList'); $state.go('CourseList');
}; };
return vm;
}; };
})(); })();

4
app/partials/section/section_list.html
View File

@@ -1,7 +1,10 @@
<div class="row clearfix"> <div class="row clearfix">
<h4>Listado de Secciones</h4></br> <h4>Listado de Secciones</h4></br>
<div> <div>
<span class="input-group-btn">
<button class="btn-success btn" ng-click="vm.createSection()" style="margin: 10px"> Crear Sección </button> <button class="btn-success btn" ng-click="vm.createSection()" style="margin: 10px"> Crear Sección </button>
<button type="button" class="btn-warning btn" style="margin: 10px" ng-click="vm.back()">Regresar</button>
</span>
</br> </br>
</br> </br>
<table class="table table-bordered table-striped"> <table class="table table-bordered table-striped">
@@ -57,5 +60,4 @@
</tbody> </tbody>
</table> </table>
</div> </div>
<a class="btn-warning btn" style="margin: 10px" ng-click="vm.back()">Regresar</a>
</div> </div>

9
app/partials/section/section_update.html
View File

@@ -1,7 +1,11 @@
<div class="row clearfix"> <div class="row clearfix">
<h4>Estudiantes Inscritos en {{ vm.section.course }} - Seccion {{ vm.section.name }} - Semestre {{ vm.section.semester }}</h4> <h4>Estudiantes Inscritos en {{ vm.section.course }} - Seccion {{ vm.section.name }} - Semestre {{ vm.section.semester }}</h4>
<br> <br>
<button class="btn-success btn" ng-click="vm.addStudent()" style="margin: 10px"> Agregar Estudiante </button><br><br> <span class="input-group-btn">
<button class="btn-success btn" ng-click="vm.addStudent()" style="margin: 10px"> Agregar Estudiante </button>
<button type="button" class="btn-warning btn" style="margin: 10px" ng-click="vm.back()">Regresar</button>
</span>
<br>
<div> <div>
<table class="table table-bordered table-striped"> <table class="table table-bordered table-striped">
<thead> <thead>
@@ -47,7 +51,4 @@
</tbody> </tbody>
</table> </table>
</div> </div>
<div class="container-fluid ">
<a class="btn-warning btn" style="margin: 10px" ng-click="vm.back()">Regresar</a>
</div>
</div> </div>

5
app/partials/students/student_create.html
View File

@@ -71,13 +71,14 @@
<label>&nbsp;</label> <label>&nbsp;</label>
<p class="input-group"> <p class="input-group">
<span class="input-group-btn"> <span class="input-group-btn">
<button type="submit" class="btn-primary btn"> <button type="submit" class="btn-success btn">
Agregar Alumno </button> Agregar Alumno </button>
<button type="button" class="btn-warning btn" style="margin: 10px" ng-click="vm.back()">Regresar</button>
</span> </span>
</p> </p>
</div> </div>
</div> </div>
</div> </div>
</form> </form>
<a class="btn-warning btn" style="margin: 10px" ng-click="vm.back()">Regresar</a>
</div> </div>