Update repo with several changes

This commit is contained in:
Reynaldo Reyes
2016-04-27 20:34:27 -04:30
parent 38aaff259a
commit 0b3440abba
27 changed files with 316 additions and 146 deletions

View File

@@ -7,6 +7,6 @@
courses.$inject = ['$resource','$rootScope'];
function courses($resource, $rootScope){
return $resource('http://'+$rootScope.domainUrl+'/courses/:id', null);
return $resource('http://'+$rootScope.domainUrl+'/professors/:id/courses', null);
};
})();

View File

@@ -6,12 +6,10 @@
.controller('CourseCreateCtrl', CourseCreateCtrl)
CourseCreateCtrl.$inject =
['$scope','$rootScope', '$modal', '$state', 'professors'];
['$scope', '$rootScope', '$modal', '$state', 'professors'];
function CourseCreateCtrl($scope, $rootScope, $modal, $state, professors) {
var vm = this;
vm.submitted = false;
vm.mayorque = false;
$rootScope.mensaje = "";
$scope.mensaje = "";
var professorid = $rootScope.professorId;
professors.get({ id: professorid },
@@ -34,14 +32,12 @@
};
$scope.modalInstance = $modal.open({
animation: $rootScope.animationsEnabled,
templateUrl:
'/partials/course/modal/create_course_modal.html',
scope: $scope,
size: 'sm',
resolve: {
items: function () {
return $rootScope.items;
}
}
});
@@ -49,13 +45,13 @@
vm.professor.courses.push(vm.course);
professors.update({ id: professorid }, vm.professor,
function(){
$rootScope.botonOk = true;
$rootScope.mensaje =
$scope.botonOk = true;
$scope.mensaje =
"Materia " + vm.course.name + " creada";
},
function(){
$rootScope.botonOk = true;
$rootScope.mensaje =
$scope.botonOk = true;
$scope.mensaje =
"Error creando la materia " + vm.course.name;
});
}else{
@@ -72,5 +68,9 @@
$scope.cancel = function () {
$scope.modalInstance.dismiss('cancel');
};
vm.back = function () {
$state.go('CourseList');
};
};
})();

View File

@@ -62,7 +62,6 @@
</div>
</div>
</div>
<div class="row clearfix"><div class="col-md-12 column"><br><br></div></div>
</div>
</div>
<div class="row clearfix">
@@ -71,8 +70,8 @@
<label>&nbsp;</label>
<p class="input-group">
<span class="input-group-btn">
<button type="submit" class="btn-primary btn">
Crear Materia</button>
<button type="submit" class="btn-success btn">Crear Materia</button>
<button type="button" class="btn-warning btn" style="margin: 10px" ng-click="vm.back()">Regresar</button>
</span>
</p>
</div>

View File

@@ -25,20 +25,18 @@
};
vm.eliminarMateriaModal = function (index) {
$rootScope.index = index;
$rootScope.botonOk = true;
$rootScope.otroBotonOk = false;
$rootScope.botonCancelar = true;
$rootScope.rsplice = false;
$rootScope.mensaje = "¿Seguro que desea eliminar la materia?";
$scope.index = index;
$scope.botonOk = true;
$scope.otroBotonOk = false;
$scope.botonCancelar = true;
var name = vm.course[index].name;
$scope.mensaje = "¿Seguro que desea eliminar la Materia "+name+"?";
$scope.modalInstance = $modal.open({
animation: $rootScope.animationsEnabled,
templateUrl: '/partials/course/modal/delete_course_modal.html',
scope: $scope,
size: 'sm',
resolve: {
items: function () {
return "";
}
}
});
@@ -46,18 +44,18 @@
};
vm.eliminarMateria = function (index) {
$rootScope.botonOk = false;
$rootScope.otroBotonOk = true;
$rootScope.botonCancelar = false;
$scope.botonOk = false;
$scope.otroBotonOk = true;
$scope.botonCancelar = false;
var name = vm.course[index].name;
vm.professor.courses.splice(index, 1);
professors.update({ id: professorid }, vm.professor,
function () {
$rootScope.mensaje = "Materia " + name + " eliminada";
$scope.mensaje = "Materia " + name + " eliminada";
},
function () {
$rootScope.mensaje = "Error eliminando la materia" + name;
$scope.mensaje = "Error eliminando la materia" + name;
});
};

View File

@@ -1,5 +1,5 @@
<div class="row clearfix">
<h4>Lista de Materias</h4>
<h4>Listado de Materias</h4>
<div class="row clearfix"><div class="col-md-12 column"><br><br></div>
</div>
<div>