Skip to content

Commit

Permalink
hacklabr#600 - updating changes ClassEvaluationsController
Browse files Browse the repository at this point in the history
  • Loading branch information
fredericksilva committed Jun 20, 2016
1 parent 4d9b14e commit dd4eddf
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions core/static/js/certificate/controllers.js
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@
]);

module.controller('ClassEvaluationsController',
['$scope', '$modal', '$window', '$routeParams', 'CertificationProcess', 'Evaluation', 'Class', 'ClassIdGetter',
function($scope, $modal, $window, $routeParams, CertificationProcess, Evaluation, Class, ClassIdGetter) {
['$scope', '$uibModal', '$window', '$routeParams', 'CertificationProcess', 'Evaluation', 'Class', 'ClassIdGetter',
function($scope, $uibModal, $window, $routeParams, CertificationProcess, Evaluation, Class, ClassIdGetter) {
$scope.errors = {};
$scope.evaluations = [];

Expand Down Expand Up @@ -145,11 +145,11 @@
}

$scope.addStudentEvaluation = function () {
var modalInstance = $modal.open(
var modalInstance = $uibModal.open(
{
animation: true,
templateUrl: 'addStudentModal.html',
controller: ['$scope', '$modalInstance', 'processes', 'evaluation', 'students', AddStudentModalCtrl],
controller: ['$scope', '$uibModalInstance', 'processes', 'evaluation', 'students', AddStudentModalCtrl],
resolve: {
processes: function () {
return $scope.certification_processes;
Expand Down Expand Up @@ -188,7 +188,7 @@

};

var AddStudentModalCtrl = function ($scope, $modalInstance, processes, evaluation, students) {
var AddStudentModalCtrl = function ($scope, $uibModalInstance, processes, evaluation, students) {
$scope.certification_processes = processes;
$scope.class_students = students;
$scope.evaluation = evaluation;
Expand All @@ -202,20 +202,20 @@
}

$scope.cancel = function () {
$modalInstance.dismiss();
$uibModalInstance.dismiss();
};

$scope.save = function(){
$modalInstance.close($scope.certification_processes);
$uibModalInstance.close($scope.certification_processes);
}
}

$scope.createEvaluation = function (isEdit) {
var modalInstance = $modal.open(
var modalInstance = $uibModal.open(
{
animation: true,
templateUrl: 'createEvaluationModal.html',
controller: ['$scope', '$modalInstance', 'klass_id', 'evaluation', CreateUpdateEvaluationModalCtrl],
controller: ['$scope', '$uibModalInstance', 'klass_id', 'evaluation', CreateUpdateEvaluationModalCtrl],
resolve: {
klass_id: function () {
return $scope.klass_id;
Expand Down Expand Up @@ -249,15 +249,15 @@
$scope.evaluation = $scope.class_evaluations[$index];
};

var CreateUpdateEvaluationModalCtrl = function ($scope, $modalInstance, klass_id, evaluation) {
var CreateUpdateEvaluationModalCtrl = function ($scope, $uibModalInstance, klass_id, evaluation) {
if(!evaluation){
$scope.evaluation = new Evaluation();
} else {
$scope.evaluation = evaluation;
}

$scope.cancel = function () {
$modalInstance.dismiss();
$uibModalInstance.dismiss();
};

$scope.openCalendar = function(e, b){
Expand All @@ -274,7 +274,7 @@
$scope.save = function(){
// Write validation
$scope.evaluation.klass = klass_id;
$modalInstance.close($scope.evaluation);
$uibModalInstance.close($scope.evaluation);
}
}

Expand Down

0 comments on commit dd4eddf

Please sign in to comment.