From 64766afcbd95ab4c677ee67ecd0745add4ad9ba2 Mon Sep 17 00:00:00 2001 From: Alexandre Terrasa Date: Fri, 9 Jun 2017 14:47:50 -0400 Subject: [PATCH] nitweb: move grades model to grades module Signed-off-by: Alexandre Terrasa --- share/nitweb/javascripts/grades.js | 43 +++++++++++++++++++++++++++++++++++- share/nitweb/javascripts/model.js | 41 ---------------------------------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/share/nitweb/javascripts/grades.js b/share/nitweb/javascripts/grades.js index bddf1e1..72eadbc 100644 --- a/share/nitweb/javascripts/grades.js +++ b/share/nitweb/javascripts/grades.js @@ -16,7 +16,7 @@ (function() { angular - .module('grades', ['ngSanitize', 'model']) + .module('grades', ['ngSanitize']) .config(function($stateProvider, $locationProvider) { $stateProvider @@ -28,6 +28,47 @@ }) }) + .factory('Feedback', [ '$http', function($http) { + return { + loadEntityStars: function(id, cb, cbErr) { + $http.get('/api/feedback/stars/' + id) + .success(cb) + .error(cbErr); + }, + loadEntityStarsDimension: function(id, dimension, cb, cbErr) { + $http.get('/api/feedback/stars/' + id + '/dimension/' + dimension) + .success(cb) + .error(cbErr); + }, + postEntityStarDimension: function(id, dimension, rating, cb, cbErr) { + $http.post('/api/feedback/stars/' + id + '/dimension/' + dimension, + {rating: rating}) + .success(cb) + .error(cbErr); + }, + loadMostRated: function(cb, cbErr) { + $http.get('/api/feedback/grades/most') + .success(cb) + .error(cbErr); + }, + loadBestRated: function(cb, cbErr) { + $http.get('/api/feedback/grades/best') + .success(cb) + .error(cbErr); + }, + loadWorstRated: function(cb, cbErr) { + $http.get('/api/feedback/grades/worst') + .success(cb) + .error(cbErr); + }, + loadUsersRatings: function(cb, cbErr) { + $http.get('/api/feedback/grades/users') + .success(cb) + .error(cbErr); + }, + } + }]) + .controller('GradesCtrl', ['Feedback', '$scope', function(Feedback, $scope) { this.loadMostRated = function() { diff --git a/share/nitweb/javascripts/model.js b/share/nitweb/javascripts/model.js index 13f5e7f..4078ac2 100644 --- a/share/nitweb/javascripts/model.js +++ b/share/nitweb/javascripts/model.js @@ -20,47 +20,6 @@ angular .module('model', []) - .factory('Feedback', [ '$http', function($http) { - return { - loadEntityStars: function(id, cb, cbErr) { - $http.get(apiUrl + '/feedback/stars/' + id) - .success(cb) - .error(cbErr); - }, - loadEntityStarsDimension: function(id, dimension, cb, cbErr) { - $http.get(apiUrl + '/feedback/stars/' + id + '/dimension/' + dimension) - .success(cb) - .error(cbErr); - }, - postEntityStarDimension: function(id, dimension, rating, cb, cbErr) { - $http.post(apiUrl + '/feedback/stars/' + id + '/dimension/' + dimension, - {rating: rating}) - .success(cb) - .error(cbErr); - }, - loadMostRated: function(cb, cbErr) { - $http.get(apiUrl + '/feedback/grades/most') - .success(cb) - .error(cbErr); - }, - loadBestRated: function(cb, cbErr) { - $http.get(apiUrl + '/feedback/grades/best') - .success(cb) - .error(cbErr); - }, - loadWorstRated: function(cb, cbErr) { - $http.get(apiUrl + '/feedback/grades/worst') - .success(cb) - .error(cbErr); - }, - loadUsersRatings: function(cb, cbErr) { - $http.get(apiUrl + '/feedback/grades/users') - .success(cb) - .error(cbErr); - }, - } - }]) - .factory('Metrics', [ '$http', function($http) { return { loadStructuralMetrics: function(id, cb, cbErr) { -- 1.7.9.5