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

Various fixes

Browse Source
This commit is contained in:
Reynaldo Reyes
2016-05-20 23:00:34 -04:00
parent b220f21065
commit 48e8b73111
55 changed files with 714 additions and 690 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/partials/professor/modal/create_professor_modal.html
View File

@@ -2,9 +2,9 @@
<h3 class="modal-title">Crear Profesor</h3>
</div>
<div style="text-align: center" class="modal-body">
{{ mensaje }}
{{ vm.mensaje }}
</div>
<div class="modal-footer">
<button class="btn btn-primary" ng-show="botonOk" type="button"
ng-click="ok(urlLo)">OK</button>
<button class="btn btn-primary" ng-show="vm.botonOk" type="button"
ng-click="ok()">OK</button>
</div>

16
app/partials/professor/modal/list_professor_modal.html
View File

@@ -2,13 +2,19 @@
<h3 class="modal-title">Eliminar Profesor</h3>
</div>
<div style="text-align: center" class="modal-body">
{{ mensaje }}
{{ vm.mensaje }}
</div>
<div class="modal-footer">
<button class="btn btn-primary" ng-show="acceptButton" type="button"
ng-click="ok(urlLo)">Aceptar</button>
<button class="btn btn-primary" ng-show="botonOK" type="button"
<button class="btn btn-primary"
ng-show="vm.acceptButton"
type="button"
ng-click="ok()">Aceptar</button>
<button class="btn btn-primary"
ng-show="vm.botonOK"
type="button"
ng-click="vm.eliminarProfesor(index)">OK</button>
<button class="btn btn-warning" ng-show="botonCancelar" type="button"
<button class="btn btn-warning"
ng-show="vm.botonCancelar"
type="button"
ng-click="cancel()">Cancel</button>
</div>

12
app/partials/professor/modal/update_professor_modal.html
View File

@@ -2,11 +2,15 @@
<h3 class="modal-title">Modificar Profesor</h3>
</div>
<div style="text-align: center" class="modal-body">
{{ mensaje }}
{{ vm.mensaje }}
</div>
<div class="modal-footer">
<button class="btn btn-primary" ng-show="botonOk" type="button"
ng-click="ok(urlLo)">OK</button>
<button class="btn btn-warning" ng-show="botonCancelar" type="button"
<button class="btn btn-primary"
ng-show="vm.botonOk"
type="button"
ng-click="ok()">OK</button>
<button class="btn btn-warning"
ng-show="vm.botonCancelar"
type="button"
ng-click="cancel()">Cancel</button>
</div>

31
app/partials/professor/professor.module.js
View File

@@ -18,17 +18,10 @@
$stateProvider
.state('ProfessorList', {
parent: 'index',
url: '/ProfessorList',
views: {
sidebar: {
templateUrl: 'partials/sidebar/sidebar.html',
controller: 'SidebarCtrl'
},
navbar: {
templateUrl: 'partials/sidebar/navbar.html'
},
content: {
'content@': {
templateUrl: 'partials/professor/professor_list.html',
controller: 'ProfessorListCtrl',
controllerAs: 'vm'
@@ -37,16 +30,10 @@
})
.state('ProfessorCreate', {
parent: 'index',
url: '/ProfessorCreate',
views: {
sidebar: {
templateUrl: 'partials/sidebar/sidebar.html',
controller: 'SidebarCtrl'
},
navbar: {
templateUrl: 'partials/sidebar/navbar.html'
},
content: {
'content@': {
templateUrl: 'partials/professor/professor_create.html',
controller: 'ProfessorCreateCtrl',
controllerAs: 'vm'
@@ -55,16 +42,10 @@
})
.state('ProfessorUpdate', {
parent: 'index',
url: '/ProfessorUpdate',
views: {
sidebar: {
templateUrl: 'partials/sidebar/sidebar.html',
controller: 'SidebarCtrl'
},
navbar: {
templateUrl: 'partials/sidebar/navbar.html'
},
content: {
'content@': {
templateUrl: 'partials/professor/professor_update.html',
controller: 'ProfessorUpdateCtrl',
controllerAs: 'vm'

33
app/partials/professor/professor.services.js
View File

@@ -10,11 +10,34 @@
.value('profesorSeleccionado',{})
.value('data',{});
professors.$inject = ['$resource','$rootScope'];
function professors($resource, $rootScope){
return $resource('http://'+$rootScope.domainUrl+'/professors/:id', null,
{
'update': {method:'PUT'}
professors.$inject = ['$resource','$rootScope','authentication'];
function professors($resource, $rootScope, authentication){
return $resource('http://'+$rootScope.domainUrl+'/professors/:id', {}, {
get: {
method: 'GET',
headers: {
Authorization: 'Bearer '+ authentication.getToken()
}
},
update: {
method: 'PUT',
headers: {
Authorization: 'Bearer '+ authentication.getToken()
}
},
delete: {
method: 'DELETE',
headers: {
Authorization: 'Bearer '+ authentication.getToken()
}
},
query: {
method: 'GET',
isArray:true,
headers: {
Authorization: 'Bearer '+ authentication.getToken()
}
}
});
};
})();

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

@@ -6,11 +6,12 @@
.controller('ProfessorCreateCtrl', ProfessorCreateCtrl)
ProfessorCreateCtrl.$inject =
['$scope','$rootScope', '$state', 'professors', '$modal'];
function ProfessorCreateCtrl($scope, $rootScope, $state, professors, $modal){
['$scope', '$state', 'professors', '$modal','authentication'];
function ProfessorCreateCtrl($scope, $state, professors, $modal, authentication){
var vm = this;
$rootScope.mensaje = "";
vm.botonOk = false;
vm.mensaje = "";
vm.submit = function() {
if (vm.data_input_form.$valid){
@@ -24,39 +25,32 @@
"password": vm.profesor.Password
};
$rootScope.botonOk = false;
$scope.modalInstance = $modal.open({
animation: $rootScope.animationsEnabled,
templateUrl: 'partials/professor/modal/create_professor_modal.html',
scope: $scope,
size: 'sm',
resolve: {
items: function () {
return $rootScope.items;
}
}
});
professors.save(professor,
function(){
$rootScope.botonOk = true;
$rootScope.mensaje =
function(data){
authentication.saveToken(data.token);
vm.botonOk = true;
vm.mensaje =
"Profesor " + vm.profesor.Apellido + ", " + vm.profesor.Nombre + " agregado";
},
function(){
$rootScope.botonOk = true;
$rootScope.urlLo = 'listarProfesor';
$rootScope.mensaje =
vm.botonOk = true;
vm.mensaje =
"Error al agregar al profesor " + vm.profesor.Apellido + ", " + vm.profesor.Nombre;
});
}else{
vm.submitted = true;
}
}
$scope.ok = function (urlLo) {
$scope.ok = function () {
$state.go('ProfessorList');
$scope.modalInstance.dismiss('cancel');
};

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

@@ -78,7 +78,7 @@
</div>
<div class="col-md-4 column">
<label for="password">Contraseña *</label>
<input type="password" class="form-control" ng-model="vm.profesor.Password" maxlength="8" required/>
<input type="password" class="form-control" ng-model="vm.profesor.Password" maxlength="20" required/>
<div class="error" ng-show="vm.submitted && vm.data_input_form.password.$invalid">
<small class="error" ng-show="vm.data_input_form.password.$error.required">
La Contraseña del Profesor es obligatorio.

57
app/partials/professor/professor_list.controller.js
View File

@@ -6,14 +6,11 @@
.controller('ProfessorListCtrl', ProfessorListCtrl)
ProfessorListCtrl.$inject =
[ '$scope', '$rootScope', '$state', 'professors', '$modal', 'profesorSeleccionado' ];
function ProfessorListCtrl( $scope, $rootScope, $state, professors, $modal, profesorSeleccionado ){
[ '$scope', '$state', 'professors', '$modal', 'profesorSeleccionado' ];
function ProfessorListCtrl( $scope, $state, professors, $modal, profesorSeleccionado ){
var vm = this;
vm.lista = true;
$rootScope.actOk = false;
$rootScope.loading = true;
$rootScope.table = false;
var profesorArray = [];
professors.query(
@@ -28,8 +25,6 @@
Correo: value.email
});
});
$rootScope.loading = false;
$rootScope.table = true;
vm.listaProfesor = profesorArray;
},
@@ -38,50 +33,42 @@
});
vm.eliminarProfesorModal = function (index) {
$rootScope.index = index;
$rootScope.botonOK = true;
$rootScope.botonCancelar = true;
$rootScope.acceptButton = false;
$scope.index = index;
vm.botonOK = true;
vm.botonCancelar = true;
vm.acceptButton = false;
$rootScope.rsplice = false;
$rootScope.mensaje = "¿Seguro que desea eliminar el Profesor?";
vm.rsplice = false;
vm.mensaje = "¿Seguro que desea eliminar el Profesor?";
$scope.modalInstance = $modal.open({
animation: $rootScope.animationsEnabled,
templateUrl: 'partials/professor/modal/list_professor_modal.html',
scope: $scope,
size: 'sm',
resolve: {
items: function () {
return "";
}
}
size: 'sm'
});
};
vm.eliminarProfesor = function (index) {
$rootScope.botonOK = false;
$rootScope.acceptButton = true;
$rootScope.botonCancelar = false;
vm.botonOK = false;
vm.acceptButton = true;
vm.botonCancelar = false;
professors.delete({id: vm.profesor[index]._id},
function () {
$rootScope.rsplice = true;
$rootScope.mensaje =
vm.rsplice = true;
vm.mensaje =
"Profesor " + vm.profesor[index].name + " eliminado";
},
function () {
$rootScope.listarProfesorsLoading = false;
$rootScope.mensaje =
vm.mensaje =
"Error eliminando al Profesor " + vm.profesor[index].name;
});
};
vm.removeProfesorSplice = function(index, rsplice) {
if(rsplice){
if(vm.rsplice){
vm.listaProfesor.splice(index, 1);
$rootScope.rsplice = false;
vm.rsplice = false;
}
};
@@ -95,13 +82,7 @@
$state.go('ProfessorUpdate');
};
$rootScope.open = function($event) {
$event.preventDefault();
$event.stopPropagation();
$rootScope.opened = true;
};
$scope.ok = function (urlLo) {
$scope.ok = function () {
$state.reload();
$scope.modalInstance.dismiss('cancel');
};
@@ -109,7 +90,5 @@
$scope.cancel = function () {
$scope.modalInstance.dismiss('cancel');
};
return vm;
};
})();

18
app/partials/professor/professor_list.html
View File

@@ -7,18 +7,12 @@
<tr>
<th width="20%">
Cedula
<span ng-show="sortType == 'Cedula' && !sortReverse" class="fa fa-caret-down"></span>
<span ng-show="sortType == 'Cedula' && sortReverse" class="fa fa-caret-up"></span>
</th>
<th width="20%">
Nombre
<span ng-show="sortType == 'Nombre' && !sortReverse" class="fa fa-caret-down"></span>
<span ng-show="sortType == 'Nombre' && sortReverse" class="fa fa-caret-up"></span>
</th>
<th width="20%">
Apellido
<span ng-show="sortType == 'Apellido' && !sortReverse" class="fa fa-caret-down"></span>
<span ng-show="sortType == 'Apellido' && sortReverse" class="fa fa-caret-up"></span>
</th>
<th width="20%" style="text-align: center">
Modificar
@@ -34,10 +28,18 @@
<td style="vertical-align:middle">{{ profesor.Nombre }}</td>
<td style="vertical-align:middle">{{ profesor.Apellido }}</td>
<td style="text-align: center">
<span title="Click aqui para Modificar un Profesor" class="glyphicon glyphicon-edit" aria-hidden="true" ng-click="vm.modificarProfesor($index)" style="cursor:pointer"></span>
<span title="Haga click para Modificar un Profesor"
class="glyphicon glyphicon-edit"
aria-hidden="true"
ng-click="vm.modificarProfesor($index)"
style="cursor:pointer"></span>
</td>
<td style="text-align: center">
<span title="Click aqui para Eliminar un Profesor" class="glyphicon glyphicon-remove" aria-hidden="true" ng-click="vm.eliminarProfesorModal($index)" style="cursor:pointer"></span>
<span title="Haga click para Eliminar un Profesor"
class="glyphicon glyphicon-remove"
aria-hidden="true"
ng-click="vm.eliminarProfesorModal($index)"
style="cursor:pointer"></span>
</td>
</tr>
</tbody>

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

@@ -6,13 +6,14 @@
.controller('ProfessorUpdateCtrl', ProfessorUpdateCtrl)
ProfessorUpdateCtrl.$inject =
['$scope','$rootScope', '$state', 'professors', '$modal', 'profesorSeleccionado' ];
function ProfessorUpdateCtrl ( $scope, $rootScope, $state, professors, $modal, profesorSeleccionado ){
['$scope', '$state', 'professors', '$modal', 'profesorSeleccionado' ];
function ProfessorUpdateCtrl ( $scope, $state, professors, $modal, profesorSeleccionado ){
var vm = this;
vm.botonOk = false;
vm.mensaje = "";
vm.profesor = profesorSeleccionado;
$rootScope.mensaje = "";
$rootScope.actOk = false;
vm.submit = function() {
@@ -26,35 +27,28 @@
"password": vm.profesor.Password
};
$rootScope.botonOk = false;
$scope.modalInstance = $modal.open({
animation: $rootScope.animationsEnabled,
templateUrl: 'partials/professor/modal/update_professor_modal.html',
scope: $scope,
size: 'sm',
resolve: {
items: function () {
return $rootScope.items;
}
}
});
professors.update({ id: vm.profesor._id}, professor,
function(){
$rootScope.botonOk = true;
$rootScope.botonCancelar = false;
$rootScope.mensaje =
vm.botonOk = true;
vm.botonCancelar = false;
vm.mensaje =
"Profesor " + vm.profesor.Apellido + ", " + vm.profesor.Nombre + " actualizado";
},
function(){
$rootScope.botonOk = true;
$rootScope.botonCancelar = false;
$rootScope.mensaje =
vm.botonOk = true;
vm.botonCancelar = false;
vm.mensaje =
"Error al modificar al profesor " + vm.profesor.Apellido + ", " + vm.profesor.Nombre;
});
}
$scope.ok = function (urlLo) {
$scope.ok = function () {
$state.go('ProfessorList');
$scope.modalInstance.dismiss('cancel');
};