From 7d4b64fb1bdbc1d312f80be61c9ca44cfdd0c818 Mon Sep 17 00:00:00 2001 From: Cliff Eby Date: Sat, 23 Aug 2014 21:14:40 -0400 Subject: [PATCH 01/27] Adding Qas and Takers --- gruntfile.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gruntfile.js b/gruntfile.js index ca48bbd883..a977357986 100644 --- a/gruntfile.js +++ b/gruntfile.js @@ -31,7 +31,7 @@ module.exports = function(grunt) { clientViews: { files: watchFiles.clientViews, options: { - livereload: true, + livereload: true } }, clientJS: { @@ -59,7 +59,7 @@ module.exports = function(grunt) { }, csslint: { options: { - csslintrc: '.csslintrc', + csslintrc: '.csslintrc' }, all: { src: watchFiles.clientCSS From 6ecf6ff011b6b0f67abffdadcd9430a414a24654 Mon Sep 17 00:00:00 2001 From: Cliff Eby Date: Sat, 23 Aug 2014 21:27:57 -0400 Subject: [PATCH 02/27] Adding Qas and Takers --- app/models/qa.server.model.js | 133 +++++++++++++ app/models/taker.server.model.js | 174 ++++++++++++++++++ app/routes/qas.server.routes.js | 19 ++ app/routes/takers.server.routes.js | 19 ++ .../modules/qas/config/qas.client.config.js | 11 ++ .../modules/qas/config/qas.client.routes.js | 25 +++ .../qas/controllers/qas.client.controller.js | 164 +++++++++++++++++ public/modules/qas/qas.client.module.js | 4 + .../qas/services/qas.client.service.js | 13 ++ .../qas/tests/qas.client.controller.test.js | 163 ++++++++++++++++ .../qas/views/create-qa.client.view.html | 98 ++++++++++ .../qas/views/edit-qa.client.view.html | 99 ++++++++++ .../qas/views/list-qas.client.view.html | 19 ++ .../qas/views/view-qa.client.view.html | 24 +++ .../takers/config/takers.client.config.js | 12 ++ .../takers/config/takers.client.routes.js | 27 +++ .../controllers/takers.client.controller.js | 85 +++++++++ .../takers/services/takers.client.service.js | 13 ++ public/modules/takers/takers.client.module.js | 4 + .../tests/taker.client.controller.test.js | 58 ++++++ .../tests/takers.client.controller.test.js | 58 ++++++ .../views/create-taker.client.view.html | 23 +++ .../takers/views/edit-taker.client.view.html | 23 +++ .../takers/views/list-takers.client.view.html | 19 ++ public/modules/takers/views/take.html | 63 +++++++ .../takers/views/view-taker.client.view.html | 21 +++ 26 files changed, 1371 insertions(+) create mode 100644 app/models/qa.server.model.js create mode 100644 app/models/taker.server.model.js create mode 100644 app/routes/qas.server.routes.js create mode 100644 app/routes/takers.server.routes.js create mode 100644 public/modules/qas/config/qas.client.config.js create mode 100644 public/modules/qas/config/qas.client.routes.js create mode 100644 public/modules/qas/controllers/qas.client.controller.js create mode 100644 public/modules/qas/qas.client.module.js create mode 100644 public/modules/qas/services/qas.client.service.js create mode 100644 public/modules/qas/tests/qas.client.controller.test.js create mode 100644 public/modules/qas/views/create-qa.client.view.html create mode 100644 public/modules/qas/views/edit-qa.client.view.html create mode 100644 public/modules/qas/views/list-qas.client.view.html create mode 100644 public/modules/qas/views/view-qa.client.view.html create mode 100644 public/modules/takers/config/takers.client.config.js create mode 100644 public/modules/takers/config/takers.client.routes.js create mode 100644 public/modules/takers/controllers/takers.client.controller.js create mode 100644 public/modules/takers/services/takers.client.service.js create mode 100644 public/modules/takers/takers.client.module.js create mode 100644 public/modules/takers/tests/taker.client.controller.test.js create mode 100644 public/modules/takers/tests/takers.client.controller.test.js create mode 100644 public/modules/takers/views/create-taker.client.view.html create mode 100644 public/modules/takers/views/edit-taker.client.view.html create mode 100644 public/modules/takers/views/list-takers.client.view.html create mode 100644 public/modules/takers/views/take.html create mode 100644 public/modules/takers/views/view-taker.client.view.html diff --git a/app/models/qa.server.model.js b/app/models/qa.server.model.js new file mode 100644 index 0000000000..d317777085 --- /dev/null +++ b/app/models/qa.server.model.js @@ -0,0 +1,133 @@ +'use strict'; + +/** + * Module dependencies. + */ +var mongoose = require('mongoose'), + Schema = mongoose.Schema; + +// +// Answer Schema +// +var AnswerSchema = new mongoose.Schema({ + text: String, + selectedAnswer: Boolean}); +/** + * Qa Schema + */ +var QaSchema = new Schema({ + created: { + type: Date, + default: Date.now + }, + question: { + type: String, + default: '', + trim: true + }, + questionNumber: { + type: String, + default: '', + trim: true + }, + imageURL: { + type: String, + default: '', + trim: true + }, + choices: [AnswerSchema], + hint: { + type: String, + default: '', + trim: true + }, + user: { + type: Schema.ObjectId, + ref: 'User' + }, + difficulty: { + type: String, + default: 'Easy', + trim: true + }, + type: { + type: String, + default: 'FIB', + trim: true + }, + hintOn: { + type: Boolean, + default: false, + trim: true + }, + timeOn: { + type: Boolean, + default: false, + trim: true + }, + fifty50On: { + type: Boolean, + default: false, + trim: true + }, + randomizeQuestionsOn: { + type: Boolean, + default: false, + trim: true + }, + randomizeAnswersOn: { + type: Boolean, + default: false, + trim: true + + } +}); + +//console.log(AnswerSchema); +var QuizSchema = new Schema({ + created: { + type: Date, + default: Date.now + }, + name: { + type: String, + default: '', + trim: true + }, + quizNumber: { + type: String, + default: '', + trim: true + }, + category: { + type: String, + default: '', + trim: true + }, + keyWords: { + type: String, + default: '', + trim: true + }, + qas: [QaSchema] + }); +/** + * Validations + */ +QaSchema.path('question').validate(function(question) { + return question.length; +}, 'Question cannot be blank'); + +/** + * Statics + */ +QaSchema.statics = { + load: function(id, cb) { + this.findOne({ + _id: id + }).populate('user', 'displayName').exec(cb); + } +}; +//console.log(QaSchema); +mongoose.model('Qa', QaSchema); +mongoose.model('Answer', AnswerSchema); \ No newline at end of file diff --git a/app/models/taker.server.model.js b/app/models/taker.server.model.js new file mode 100644 index 0000000000..e2f4db4dd1 --- /dev/null +++ b/app/models/taker.server.model.js @@ -0,0 +1,174 @@ +'use strict'; + +/** + * Module dependencies. + */ +var mongoose = require('mongoose'), + Schema = mongoose.Schema; + var takerAnswerSchema = new mongoose.Schema({ + text: String, + correctAnswer: Boolean}); +/** + * QA Schema + */ +var takerQASchema = new Schema({ + created: { + type: Date, + default: Date.now + }, + question: { + type: String, + default: '', + trim: true + }, + questionNumber: { + type: String, + default: '', + trim: true + }, + imageURL: { + type: String, + default: '', + trim: true + }, + choices: [takerAnswerSchema], + hint: { + type: String, + default: '', + trim: true + }, + user: { + type: Schema.ObjectId, + ref: 'User' + }, + difficulty: { + type: String, + default: 'Easy', + trim: true + }, + type: { + type: String, + default: 'FIB', + trim: true + }, + hintOn: { + type: Boolean, + default: false, + trim: true + }, + timeOn: { + type: Boolean, + default: false, + trim: true + }, + fifty50On: { + type: Boolean, + default: false, + trim: true + }, + randomizeQuestionsOn: { + type: Boolean, + default: false, + trim: true + }, + randomizeAnswersOn: { + type: Boolean, + default: false, + trim: true + + } +}); + + +/** + * Statics + */ +takerQASchema.statics = { + load: function(id, cb) { + this.findOne({ + _id: id + }).populate('user', 'displayName').exec(cb); + } +}; +// +// AnswerCorrect Schema +// +var AnswerSelectedSchema = new mongoose.Schema({ + text: String, + isSelected: Number}); + + + +var TakerAnswersSchema = new Schema({ + updated: { + type: Date, + default: Date.now + }, + questionViewed: { + type: Boolean, + default: false + }, + questionAnswered: { + type: Boolean, + default: false + }, + questionNumber: { + type: String, + default: '', + trim: true + }, + answer: [AnswerSelectedSchema] + +}); + +//console.log(TakerResultsSchema); + + +var TakerSchema = new Schema({ + updated: { + type: Date, + default: Date.now + }, + + quizNumber: { + type: Number, + default: 0 + }, + trialNumber: { + type: Number, + default: 0 + }, + trialOptions: { + type: String, + default: '', + trim: true + }, + results: [TakerAnswersSchema], + qa:[takerQASchema] + +}); + + //Validations + +//QASchema.path('question').validate(function(question) { +// return question.length; +//}, 'Question cannot be blank'); + + + // Statics + + TakerSchema.statics = { + load: function(id, cb) { + this.findOne({ + _id: id + }).populate('user', 'displayName').exec(cb); + } +}; + +mongoose.model('takerQA', takerQASchema); +mongoose.model('takerAnswer', takerAnswerSchema); +mongoose.model('AnswerSelected', AnswerSelectedSchema); +mongoose.model('TakerAnswers', TakerAnswersSchema); +mongoose.model('Taker', TakerSchema); + + diff --git a/app/routes/qas.server.routes.js b/app/routes/qas.server.routes.js new file mode 100644 index 0000000000..68f1d840c5 --- /dev/null +++ b/app/routes/qas.server.routes.js @@ -0,0 +1,19 @@ +'use strict'; +//Routes... +module.exports = function(app) { + var users = require('../../app/controllers/users'); + var qas = require('../../app/controllers/qas'); + + // Qas Routes + app.route('/qas') + .get(qas.list) + .post(users.requiresLogin, qas.create); + + app.route('/qas/:qaId') + .get(qas.read) + .put(users.requiresLogin, qas.hasAuthorization, qas.update) + .delete(users.requiresLogin, qas.hasAuthorization, qas.delete); + + // Finish by binding the Qa middleware + app.param('qaId', qas.qaByID); +}; \ No newline at end of file diff --git a/app/routes/takers.server.routes.js b/app/routes/takers.server.routes.js new file mode 100644 index 0000000000..1b26b0deed --- /dev/null +++ b/app/routes/takers.server.routes.js @@ -0,0 +1,19 @@ +'use strict'; + +module.exports = function(app) { + var users = require('../../app/controllers/users'); + var takers = require('../../app/controllers/takers'); + + // Takers Routes + app.route('/takers') + .get(takers.list) + .post(users.requiresLogin, takers.create); + + app.route('/takers/:takerId') + .get(takers.read) + .put(users.requiresLogin, takers.hasAuthorization, takers.update) + .delete(users.requiresLogin, takers.hasAuthorization, takers.delete); + + // Finish by binding the Taker middleware + app.param('takerId', takers.takerByID); +}; \ No newline at end of file diff --git a/public/modules/qas/config/qas.client.config.js b/public/modules/qas/config/qas.client.config.js new file mode 100644 index 0000000000..3d90803b75 --- /dev/null +++ b/public/modules/qas/config/qas.client.config.js @@ -0,0 +1,11 @@ +'use strict'; + +// Configuring the Articles module. +angular.module('qas').run(['Menus', + function(Menus) { + // Set top bar menu items + Menus.addMenuItem('topbar', 'Qas', 'qas', 'dropdown', '/qas(/create)?'); + Menus.addSubMenuItem('topbar', 'qas', 'List Qas', 'qas'); + Menus.addSubMenuItem('topbar', 'qas', 'New Qa', 'qas/create'); + } +]); \ No newline at end of file diff --git a/public/modules/qas/config/qas.client.routes.js b/public/modules/qas/config/qas.client.routes.js new file mode 100644 index 0000000000..36457fb828 --- /dev/null +++ b/public/modules/qas/config/qas.client.routes.js @@ -0,0 +1,25 @@ +'use strict'; + +//Setting up route... +angular.module('qas').config(['$stateProvider', + function($stateProvider) { + // Qas state routing + $stateProvider. + state('listQas', { + url: '/qas', + templateUrl: 'modules/qas/views/list-qas.client.view.html' + }). + state('createQa', { + url: '/qas/create', + templateUrl: 'modules/qas/views/create-qa.client.view.html' + }). + state('viewQa', { + url: '/qas/:qaId', + templateUrl: 'modules/qas/views/view-qa.client.view.html' + }). + state('editQa', { + url: '/qas/:qaId/edit', + templateUrl: 'modules/qas/views/edit-qa.client.view.html' + }); + } +]); \ No newline at end of file diff --git a/public/modules/qas/controllers/qas.client.controller.js b/public/modules/qas/controllers/qas.client.controller.js new file mode 100644 index 0000000000..bfea388c3f --- /dev/null +++ b/public/modules/qas/controllers/qas.client.controller.js @@ -0,0 +1,164 @@ +'use strict'; + +// Qas controller... +angular.module('qas').controller('QasController', ['$scope', '$stateParams', '$location', 'Authentication', 'Qas', + function ($scope, $stateParams, $location, Authentication, Qas) { + $scope.authentication = Authentication; + + // Create new Qa + $scope.typeDropdown = [ + { + 'label': 'FIB', + 'value': 1 + }, + { + 'label': 'TF', + 'value': 2 + }, + { + 'label': 'MC', + 'value': 3 + }, + { + 'label': 'Matching', + 'value': 4 + } + ]; + $scope.difficultyDropdown = [ + { + 'label': 'Easy', + 'value': 1 + }, + { + 'label': 'Medium', + 'value': 2 + }, + { + 'label': 'Hard', + 'value': 3 + }, + { + 'label': 'Impossible', + 'value': 4 + } + ]; + + + $scope.qa = new Qas({ + question: '', + answer: '', + choices: [ + { text: '', correctAnswer: false }, + { text: '', correctAnswer: false} + ], + content: '' + }); + //$scope.taker = new Taker({ + // quizNumber: '9999'}); + console.log('From Scope1 taker', $scope.taker); + $scope.qa.choices.correctAnswer; + // Create and validate qa entries + $scope.create = function () { + console.log("From QA CReate"); + var qa = $scope.qa; + // Grab data from input boxes + qa.question = this.question; + qa.imageURL = this.imageURL; + qa.choices.text = [ + { text: this.text }, + { text: this.text } + ]; + qa.content = this.content; + qa.hint = this.hint; + qa.hintOn = this.hintOn; + qa.timeOn = this.timeOn; + qa.fifty50On = this.fifty50On; + qa.randomizeQuestionsOn = this.randomizeQuestionsOn; + qa.randomizeAnswersOn = this.randomizeAnswersOn; + + console.log('From qa 1', qa); + // Check that question was entered + console.log('qa.question.length', qa.question.length); + if (qa.question.length > 0) { + var choiceCount = 0; + //Loop through choices to get at least two + for (var i = 0, ln = qa.choices.length; i < ln; i++) { + var choice = qa.choices[i]; + if (choice.text.length > 0) { + choiceCount++; + } + } + if (choiceCount > 1) { + // Call API to save to database + qa.$save(function (response) { + $location.path('qas/' + response._id); + }); + } else { + alert('You must have at least two choices'); + } + } else { + alert('You must have a question'); + } + }; + + // Method to add an additional choice option + $scope.addChoice = function () { + $scope.qa.choices.push({ text: this.text, correctAnswer: false }); + }; + + $scope.remove = function (qa) { + if (qa) { + qa.$remove(); + + for (var i in $scope.qas) { + if ($scope.qas[i] === qa) { + $scope.qas.splice(i, 1); + } + } + } else { + $scope.qa.$remove(function () { + $location.path('qas'); + }); + } + }; + + $scope.update = function () { + var qa = $scope.qa; + console.log('From update', qa); + if (!qa.updated) { + qa.updated = []; + } + qa.updated.push(new Date().getTime()); + + qa.$update(function () { + $location.path('qas/' + qa._id); + }); + }; + + $scope.find = function () { + Qas.query(function (qas) { + $scope.qas = qas; + }); + }; + + $scope.findOne = function () { + Qas.get({ + qaId: $stateParams.qaId + }, function (qa) { + $scope.qa = qa; + }); + }; + $scope.deleteChoice = function (ev) { + var ss = ev.target.innerText.toString() - 1; + console.log(ss); + var qa = $scope.qa; + console.log(qa); + $scope.qa.choices.splice(ss, 1); + }; + + } + + + +]); + diff --git a/public/modules/qas/qas.client.module.js b/public/modules/qas/qas.client.module.js new file mode 100644 index 0000000000..49cad3f2cc --- /dev/null +++ b/public/modules/qas/qas.client.module.js @@ -0,0 +1,4 @@ +'use strict'; + +// Use applicaion configuration module to register a new module +ApplicationConfiguration.registerModule('qas'); \ No newline at end of file diff --git a/public/modules/qas/services/qas.client.service.js b/public/modules/qas/services/qas.client.service.js new file mode 100644 index 0000000000..f92714de09 --- /dev/null +++ b/public/modules/qas/services/qas.client.service.js @@ -0,0 +1,13 @@ +'use strict'; + +//Qas service used to communicate Qas REST endpoints +angular.module('qas').factory('Qas', ['$resource', + function($resource) { + return $resource('qas/:qaId', { qaId: '@_id' + }, { + update: { + method: 'PUT' + } + }); + } +]); \ No newline at end of file diff --git a/public/modules/qas/tests/qas.client.controller.test.js b/public/modules/qas/tests/qas.client.controller.test.js new file mode 100644 index 0000000000..e841df9621 --- /dev/null +++ b/public/modules/qas/tests/qas.client.controller.test.js @@ -0,0 +1,163 @@ +'use strict'; + +(function() { + // Qas Controller Spec + describe('Qas Controller Tests', function() { + // Initialize global variables + var QasController, + scope, + $httpBackend, + $stateParams, + $location; + + // The $resource service augments the response object with methods for updating and deleting the resource. + // If we were to use the standard toEqual matcher, our tests would fail because the test values would not match + // the responses exactly. To solve the problem, we define a new toEqualData Jasmine matcher. + // When the toEqualData matcher compares two objects, it takes only object properties into + // account and ignores methods. + beforeEach(function() { + jasmine.addMatchers({ + toEqualData: function(util, customEqualityTesters) { + return { + compare: function(actual, expected) { + return { + pass: angular.equals(actual, expected) + }; + } + }; + } + }); + }); + + // Then we can start by loading the main application module + beforeEach(module(ApplicationConfiguration.applicationModuleName)); + + // The injector ignores leading and trailing underscores here (i.e. _$httpBackend_). + // This allows us to inject a service but then attach it to a variable + // with the same name as the service. + beforeEach(inject(function($controller, $rootScope, _$location_, _$stateParams_, _$httpBackend_) { + // Set a new global scope + scope = $rootScope.$new(); + + // Point global variables to injected services + $stateParams = _$stateParams_; + $httpBackend = _$httpBackend_; + $location = _$location_; + + // Initialize the Qas controller. + QasController = $controller('QasController', { + $scope: scope + }); + })); + + it('$scope.find() should create an array with at least one Qa object fetched from XHR', inject(function(Qas) { + // Create sample Qa using the Qas service + var sampleQa = new Qas({ + name: 'New Qa' + }); + + // Create a sample Qas array that includes the new Qa + var sampleQas = [sampleQa]; + + // Set GET response + $httpBackend.expectGET('qas').respond(sampleQas); + + // Run controller functionality + scope.find(); + $httpBackend.flush(); + + // Test scope value + expect(scope.qas).toEqualData(sampleQas); + })); + + it('$scope.findOne() should create an array with one Qa object fetched from XHR using a qaId URL parameter', inject(function(Qas) { + // Define a sample Qa object + var sampleQa = new Qas({ + name: 'New Qa' + }); + + // Set the URL parameter + $stateParams.qaId = '525a8422f6d0f87f0e407a33'; + + // Set GET response + $httpBackend.expectGET(/qas\/([0-9a-fA-F]{24})$/).respond(sampleQa); + + // Run controller functionality + scope.findOne(); + $httpBackend.flush(); + + // Test scope value + expect(scope.qa).toEqualData(sampleQa); + })); + + it('$scope.create() with valid form data should send a POST request with the form input values and then locate to new object URL', inject(function(Qas) { + // Create a sample Qa object + var sampleQaPostData = new Qas({ + name: 'New Qa' + }); + + // Create a sample Qa response + var sampleQaResponse = new Qas({ + _id: '525cf20451979dea2c000001', + name: 'New Qa' + }); + + // Fixture mock form input values + scope.name = 'New Qa'; + + // Set POST response + $httpBackend.expectPOST('qas', sampleQaPostData).respond(sampleQaResponse); + + // Run controller functionality + scope.create(); + $httpBackend.flush(); + + // Test form inputs are reset + expect(scope.name).toEqual(''); + + // Test URL redirection after the Qa was created + expect($location.path()).toBe('/qas/' + sampleQaResponse._id); + })); + + it('$scope.update() should update a valid Qa', inject(function(Qas) { + // Define a sample Qa put data + var sampleQaPutData = new Qas({ + _id: '525cf20451979dea2c000001', + name: 'New Qa' + }); + + // Mock Qa in scope + scope.qa = sampleQaPutData; + + // Set PUT response + $httpBackend.expectPUT(/qas\/([0-9a-fA-F]{24})$/).respond(); + + // Run controller functionality + scope.update(); + $httpBackend.flush(); + + // Test URL location to new object + expect($location.path()).toBe('/qas/' + sampleQaPutData._id); + })); + + it('$scope.remove() should send a DELETE request with a valid qaId and remove the Qa from the scope', inject(function(Qas) { + // Create new Qa object + var sampleQa = new Qas({ + _id: '525a8422f6d0f87f0e407a33' + }); + + // Create new Qas array and include the Qa + scope.qas = [sampleQa]; + + // Set expected DELETE response + $httpBackend.expectDELETE(/qas\/([0-9a-fA-F]{24})$/).respond(204); + + // Run controller functionality + scope.remove(sampleQa); + $httpBackend.flush(); + + // Test array after successful delete + expect(scope.qas.length).toBe(0); + })); + }); +}()); \ No newline at end of file diff --git a/public/modules/qas/views/create-qa.client.view.html b/public/modules/qas/views/create-qa.client.view.html new file mode 100644 index 0000000000..cf16d47edd --- /dev/null +++ b/public/modules/qas/views/create-qa.client.view.html @@ -0,0 +1,98 @@ +
+
+

New Big QA

+
+
+
+
+
+ + +
+ +
+ + + +
+ + + +
+ +
+
+ +
+
+ +
+
+
+
+
+
+
+
+ + +
+ +
+ +
+
+ +
+
+ +
+ +
+
+ +
+ + +
+
+ + +
+
+ + +
+ Allow Hint + Timed + 50/50 + Randomize Answers + Randomize Questions + + + + +
+
+ +
+
diff --git a/public/modules/qas/views/edit-qa.client.view.html b/public/modules/qas/views/edit-qa.client.view.html new file mode 100644 index 0000000000..a8e1077b04 --- /dev/null +++ b/public/modules/qas/views/edit-qa.client.view.html @@ -0,0 +1,99 @@ +
+
+

Edit Qa

+
+
+
+
+ + +
+ +
+
+
+ + +
+ + + +
+ + + + +
+
+ + +
+ + +
+ +
+
+ + +
+ +
+
+ +
+
+ + +
+ +
+
+
+
+
+
+
+
+
+ + + + + + +
+ Allow Hint + Timed + 50/50 + Randomize Answers + Randomize Questions + + + + + + +
+
+
+ +
+
\ No newline at end of file diff --git a/public/modules/qas/views/list-qas.client.view.html b/public/modules/qas/views/list-qas.client.view.html new file mode 100644 index 0000000000..159210d967 --- /dev/null +++ b/public/modules/qas/views/list-qas.client.view.html @@ -0,0 +1,19 @@ +
+
+

LIST

+ +
+
+ + {{qa.created | date:'medium'}} / {{qa.user.displayName}} +

{{qa.question}}

+ +

{{qa.choices.length}}

+ + + +
+
+ No qas yet, why don't you create one? +
+
\ No newline at end of file diff --git a/public/modules/qas/views/view-qa.client.view.html b/public/modules/qas/views/view-qa.client.view.html new file mode 100644 index 0000000000..6865bf5907 --- /dev/null +++ b/public/modules/qas/views/view-qa.client.view.html @@ -0,0 +1,24 @@ +
+
+

{{qa.question}}

+
+ +
+ + + + + + +
+ + Updated on {{qa.created | date:'mediumDate'}} by {{qa.user.displayName}} + +

+ {{qa.question}} +
+ +

{{choices.text}}
+

+ +
\ No newline at end of file diff --git a/public/modules/takers/config/takers.client.config.js b/public/modules/takers/config/takers.client.config.js new file mode 100644 index 0000000000..b5e11106e4 --- /dev/null +++ b/public/modules/takers/config/takers.client.config.js @@ -0,0 +1,12 @@ +'use strict'; + +// Configuring the Takers module +angular.module('takers').run(['Menus', + function(Menus) { + // Set top bar menu items + Menus.addMenuItem('topbar', 'Takers', 'takers', 'dropdown', '/takers(/create)?'); + Menus.addSubMenuItem('topbar', 'takers', 'List Takers', 'takers'); + Menus.addSubMenuItem('topbar', 'takers', 'New Taker', 'takers/create'); + Menus.addSubMenuItem('topbar', 'takers', 'Take', 'takers/'); + } +]); \ No newline at end of file diff --git a/public/modules/takers/config/takers.client.routes.js b/public/modules/takers/config/takers.client.routes.js new file mode 100644 index 0000000000..17d3d1be1d --- /dev/null +++ b/public/modules/takers/config/takers.client.routes.js @@ -0,0 +1,27 @@ +'use strict'; + +//Setting up route +angular.module('takers').config(['$stateProvider', + function($stateProvider) { + // Takers state routing + $stateProvider. + state('listTakers', { + url: '/takers', + templateUrl: 'modules/takers/views/take.html' + }). + + state('createTaker', { + url: '/takers/create', + templateUrl: 'modules/takers/views/create-taker.client.view.html' + }). + + state('viewTaker', { + url: '/takers/:takerId', + templateUrl: 'modules/takers/views/view-taker.client.view.html' + }). + state('editTaker', { + url: '/takers/:takerId/edit', + templateUrl: 'modules/takers/views/edit-taker.client.view.html' + }); + } +]); \ No newline at end of file diff --git a/public/modules/takers/controllers/takers.client.controller.js b/public/modules/takers/controllers/takers.client.controller.js new file mode 100644 index 0000000000..d79dcab075 --- /dev/null +++ b/public/modules/takers/controllers/takers.client.controller.js @@ -0,0 +1,85 @@ +'use strict'; + +angular.module('takers').controller('TakersController', ['$scope', '$stateParams', '$location', 'Authentication', 'Articles', + function($scope, $stateParams, $location, Authentication, Qas, Takers) { + $scope.authentication = Authentication; + // Takers controller logic + var taker = new Takers(); + //taker.qa = qas; + $scope.taker = new Takers({ + quizNumber: '0', + trialNumber: '0', + trialOptions: '', + results: [{ questionViewed: false, questionAnswered: false, + questionNumber: '', answer:[{selection: '0', answer: '0'}]}] + + }); + console.log('From ScopeTaker', $scope.taker); + $scope.find = function() { + Qas.query(function(qas) { + $scope.qas = qas; + + }); + }; + console.log('From ScopeTaker', $scope.qas); + // Create and validate taker entries + $scope.next = function () { + + $scope.questionIndex++; + taker.questionViewed = true; + taker.$save(function (response) { + $location.path('takers/' + response._id); + }); + console.log('next', $scope.questionIndex); + + }; + $scope.prev = function() { + $scope.questionIndex--; + console.log('prev',$scope.questionIndex); + }; + + $scope.answerToggled = function() { + //var taker = $scope.taker; + // Grab data from input boxes + + //console.log(taker); + //taker.qa.question = qas[questionIndex].question; + //taker.questionNumber = $scope.questionNumber; + console.log('toggledtaker',taker); + for (var i=0, ln = taker.qa[$scope.questionIndex].choices.length; i +
+

New Taker

+
+
+
+
+
+ +
+ +
+
+
+ +
+
+ +
+
+
+
+ \ No newline at end of file diff --git a/public/modules/takers/views/edit-taker.client.view.html b/public/modules/takers/views/edit-taker.client.view.html new file mode 100644 index 0000000000..a7bbbad0ea --- /dev/null +++ b/public/modules/takers/views/edit-taker.client.view.html @@ -0,0 +1,23 @@ +
+
+

Edit Taker

+
+
+
+
+
+ +
+ +
+
+
+ +
+
+ +
+
+
+
+
\ No newline at end of file diff --git a/public/modules/takers/views/list-takers.client.view.html b/public/modules/takers/views/list-takers.client.view.html new file mode 100644 index 0000000000..a0d59302c8 --- /dev/null +++ b/public/modules/takers/views/list-takers.client.view.html @@ -0,0 +1,19 @@ +
+
+

Takers

+
+
+ + + Posted on + + by + + +

+ +
+
+ No Takers yet, why don't you create one? +
+
\ No newline at end of file diff --git a/public/modules/takers/views/take.html b/public/modules/takers/views/take.html new file mode 100644 index 0000000000..1533058e26 --- /dev/null +++ b/public/modules/takers/views/take.html @@ -0,0 +1,63 @@ +
+
+

Take Quiz

+

+
+
+
+ +
+ + + + +
+ +
+
+ +
+ +
+ + + +
+
+
+ +
+ +
+
+ +
+ +
+
+ +
+
+ +
+
+
+
+
+
+
+
+
+ + + + + + +
+
+ +
+ + + \ No newline at end of file diff --git a/public/modules/takers/views/view-taker.client.view.html b/public/modules/takers/views/view-taker.client.view.html new file mode 100644 index 0000000000..a3c84f1acc --- /dev/null +++ b/public/modules/takers/views/view-taker.client.view.html @@ -0,0 +1,21 @@ +
+
+

+
+
+ + + + + + +
+ + + Posted on + + by + + + +
\ No newline at end of file From 44b1d330a6894fc535ef1de69e166b25042bb062 Mon Sep 17 00:00:00 2001 From: Cliff Eby Date: Sat, 23 Aug 2014 21:34:15 -0400 Subject: [PATCH 03/27] Adding Qas and Takers --- app/controllers/qas.server.controller.js | 129 ++++++++++++++++++++ app/controllers/takers.server.controller.js | 128 +++++++++++++++++++ 2 files changed, 257 insertions(+) create mode 100644 app/controllers/qas.server.controller.js create mode 100644 app/controllers/takers.server.controller.js diff --git a/app/controllers/qas.server.controller.js b/app/controllers/qas.server.controller.js new file mode 100644 index 0000000000..4ff4a6a9e7 --- /dev/null +++ b/app/controllers/qas.server.controller.js @@ -0,0 +1,129 @@ +'use strict'; + +/** + * Module dependencies... + */ +var mongoose = require('mongoose'), + Qa = mongoose.model('Qa'), + _ = require('lodash'); + +/** + * Get the error message from error object + */ +var getErrorMessage = function(err) { + var message = ''; + + if (err.code) { + switch (err.code) { + case 11000: + case 11001: + message = 'Qa already exists'; + break; + default: + message = 'Something went wrong'; + } + } else { + for (var errName in err.errors) { + if (err.errors[errName].message) message = err.errors[errName].message; + } + } + + return message; +}; + +/** + * Create a Qa + */ +exports.create = function(req, res) { + var qa = new Qa(req.body); + qa.user = req.user; + + qa.save(function(err) { + if (err) { + return res.send(400, { + message: getErrorMessage(err) + }); + } else { + res.jsonp(qa); + } + }); +}; + +/** + * * + * Show the current Qa + */ +exports.read = function(req, res) { + res.jsonp(req.qa); +}; + +/** + * Update a Qa + */ +exports.update = function(req, res) { + var qa = req.qa ; + + qa = _.extend(qa , req.body); + + qa.save(function(err) { + if (err) { + return res.send(400, { + message: getErrorMessage(err) + }); + } else { + res.jsonp(qa); + } + }); +}; + +/** + * Delete an Qa + */ +exports.delete = function(req, res) { + var qa = req.qa ; + + qa.remove(function(err) { + if (err) { + return res.send(400, { + message: getErrorMessage(err) + }); + } else { + res.jsonp(qa); + } + }); +}; + +/** + * List of Qas + */ +exports.list = function(req, res) { Qa.find().sort('-created').populate('user', 'displayName').exec(function(err, qas) { + if (err) { + return res.send(400, { + message: getErrorMessage(err) + }); + } else { + res.jsonp(qas); + } + }); +}; + +/** + * Qa middleware + */ +exports.qaByID = function(req, res, next, id) { Qa.findById(id).populate('user', 'displayName').exec(function(err, qa) { + if (err) return next(err); + if (! qa) return next(new Error('Failed to load Qa ' + id)); + req.qa = qa ; + next(); + }); +}; + +/** + * Qa authorization middleware + */ +exports.hasAuthorization = function(req, res, next) { + if (req.qa.user.id !== req.user.id) { + return res.send(403, 'User is not authorized'); + } + next(); +}; \ No newline at end of file diff --git a/app/controllers/takers.server.controller.js b/app/controllers/takers.server.controller.js new file mode 100644 index 0000000000..27faa175ac --- /dev/null +++ b/app/controllers/takers.server.controller.js @@ -0,0 +1,128 @@ +'use strict'; + +/** + * Module dependencies. + */ +var mongoose = require('mongoose'), + Taker = mongoose.model('Taker'), + _ = require('lodash'); + +/** + * Get the error message from error object + */ +var getErrorMessage = function(err) { + var message = ''; + + if (err.code) { + switch (err.code) { + case 11000: + case 11001: + message = 'Taker already exists'; + break; + default: + message = 'Something went wrong'; + } + } else { + for (var errName in err.errors) { + if (err.errors[errName].message) message = err.errors[errName].message; + } + } + + return message; +}; + +/** + * Create a Taker + */ +exports.create = function(req, res) { + var taker = new Taker(req.body); + taker.user = req.user; + + taker.save(function(err) { + if (err) { + return res.send(400, { + message: getErrorMessage(err) + }); + } else { + res.jsonp(taker); + } + }); +}; + +/** + * Show the current Taker + */ +exports.read = function(req, res) { + res.jsonp(req.taker); +}; + +/** + * Update a Taker + */ +exports.update = function(req, res) { + var taker = req.taker ; + + taker = _.extend(taker , req.body); + + taker.save(function(err) { + if (err) { + return res.send(400, { + message: getErrorMessage(err) + }); + } else { + res.jsonp(taker); + } + }); +}; + +/** + * Delete an Taker + */ +exports.delete = function(req, res) { + var taker = req.taker ; + + taker.remove(function(err) { + if (err) { + return res.send(400, { + message: getErrorMessage(err) + }); + } else { + res.jsonp(taker); + } + }); +}; + +/** + * List of Takers + */ +exports.list = function(req, res) { Taker.find().sort('-created').populate('user', 'displayName').exec(function(err, takers) { + if (err) { + return res.send(400, { + message: getErrorMessage(err) + }); + } else { + res.jsonp(takers); + } + }); +}; + +/** + * Taker middleware + */ +exports.takerByID = function(req, res, next, id) { Taker.findById(id).populate('user', 'displayName').exec(function(err, taker) { + if (err) return next(err); + if (! taker) return next(new Error('Failed to load Taker ' + id)); + req.taker = taker ; + next(); + }); +}; + +/** + * Taker authorization middleware + */ +exports.hasAuthorization = function(req, res, next) { + if (req.taker.user.id !== req.user.id) { + return res.send(403, 'User is not authorized'); + } + next(); +}; \ No newline at end of file From 75c58999a2d503f690e0d27504469bc2b0ddf4b1 Mon Sep 17 00:00:00 2001 From: Cliff Eby Date: Sat, 23 Aug 2014 21:36:25 -0400 Subject: [PATCH 04/27] Adding Qas and Takers --- app/tests/qa.server.model.test.js | 64 ++++++++++++++++++++++++++++ app/tests/taker.server.model.test.js | 64 ++++++++++++++++++++++++++++ 2 files changed, 128 insertions(+) create mode 100644 app/tests/qa.server.model.test.js create mode 100644 app/tests/taker.server.model.test.js diff --git a/app/tests/qa.server.model.test.js b/app/tests/qa.server.model.test.js new file mode 100644 index 0000000000..0d1306cd64 --- /dev/null +++ b/app/tests/qa.server.model.test.js @@ -0,0 +1,64 @@ +'use strict'; + +/** + * Module dependencies. + */ +var should = require('should'), + mongoose = require('mongoose'), + User = mongoose.model('User'), + Qa = mongoose.model('Qa'); + +/** + * Globals + */ +var user, qa; + +/** + * Unit tests + */ +describe('Qa Model Unit Tests:', function() { + beforeEach(function(done) { + user = new User({ + firstName: 'Full', + lastName: 'Name', + displayName: 'Full Name', + email: 'test@test.com', + username: 'username', + password: 'password' + }); + + user.save(function() { + qa = new Qa({ + name: 'Qa Name', + user: user + }); + + done(); + }); + }); + + describe('Method Save', function() { + it('should be able to save without problems', function(done) { + return qa.save(function(err) { + should.not.exist(err); + done(); + }); + }); + + it('should be able to show an error when try to save without name', function(done) { + qa.name = ''; + + return qa.save(function(err) { + should.exist(err); + done(); + }); + }); + }); + + afterEach(function(done) { + Qa.remove().exec(); + User.remove().exec(); + + done(); + }); +}); \ No newline at end of file diff --git a/app/tests/taker.server.model.test.js b/app/tests/taker.server.model.test.js new file mode 100644 index 0000000000..f55980cd93 --- /dev/null +++ b/app/tests/taker.server.model.test.js @@ -0,0 +1,64 @@ +'use strict'; + +/** + * Module dependencies. + */ +var should = require('should'), + mongoose = require('mongoose'), + User = mongoose.model('User'), + Taker = mongoose.model('Taker'); + +/** + * Globals + */ +var user, taker; + +/** + * Unit tests + */ +describe('Taker Model Unit Tests:', function() { + beforeEach(function(done) { + user = new User({ + firstName: 'Full', + lastName: 'Name', + displayName: 'Full Name', + email: 'test@test.com', + username: 'username', + password: 'password' + }); + + user.save(function() { + taker = new Taker({ + name: 'Taker Name', + user: user + }); + + done(); + }); + }); + + describe('Method Save', function() { + it('should be able to save without problems', function(done) { + return taker.save(function(err) { + should.not.exist(err); + done(); + }); + }); + + it('should be able to show an error when try to save without name', function(done) { + taker.name = ''; + + return taker.save(function(err) { + should.exist(err); + done(); + }); + }); + }); + + afterEach(function(done) { + Taker.remove().exec(); + User.remove().exec(); + + done(); + }); +}); \ No newline at end of file From 5e423ede351cc0b09a6dc30b9c99f0cb6b39b1c3 Mon Sep 17 00:00:00 2001 From: Cliff Eby Date: Sun, 24 Aug 2014 21:19:25 -0400 Subject: [PATCH 05/27] Adding a Service --- .../qas/controllers/qas.client.controller.js | 74 +++++++++++++------ public/modules/qas/qas.client.module.js | 2 +- .../qas/services/qas.client.service1.js | 23 ++++++ .../qas/services/qas.client.service2.js | 36 +++++++++ .../qas/views/list-qas.client.view.html | 1 + 5 files changed, 114 insertions(+), 22 deletions(-) create mode 100644 public/modules/qas/services/qas.client.service1.js create mode 100644 public/modules/qas/services/qas.client.service2.js diff --git a/public/modules/qas/controllers/qas.client.controller.js b/public/modules/qas/controllers/qas.client.controller.js index bfea388c3f..583014adbb 100644 --- a/public/modules/qas/controllers/qas.client.controller.js +++ b/public/modules/qas/controllers/qas.client.controller.js @@ -1,29 +1,40 @@ 'use strict'; // Qas controller... -angular.module('qas').controller('QasController', ['$scope', '$stateParams', '$location', 'Authentication', 'Qas', - function ($scope, $stateParams, $location, Authentication, Qas) { +angular.module('qas').controller('QasController', ['$scope', '$stateParams', '$location', 'Authentication', + 'Qas','CalculatorService','MathService', + function ($scope, $stateParams, $location, Authentication, Qas, CalculatorService, MathService ) { $scope.authentication = Authentication; + $scope.doSquare = CalculatorService.square(16); + //$scope.doSquare = MathService.multiply(4,4); + // $scope.doit = MathService.multiply(4,4); + $scope.doit = CalculatorService.square(4); + $scope.doit = CalculatorService.cube(9); + $scope.doit = MathService.add(3,4); + + + // Create new Qa - $scope.typeDropdown = [ - { - 'label': 'FIB', - 'value': 1 - }, - { - 'label': 'TF', - 'value': 2 - }, - { - 'label': 'MC', - 'value': 3 - }, - { - 'label': 'Matching', - 'value': 4 - } - ]; + $scope.typeDropdown = "AAA"; +// $scope.typeDropdown = [ +// { +// 'label': 'FIB', +// 'value': 1 +// }, +// { +// 'label': 'TF', +// 'value': 2 +// }, +// { +// 'label': 'MC', +// 'value': 3 +// }, +// { +// 'label': 'Matching', +// 'value': 4 +// } +// ]; $scope.difficultyDropdown = [ { 'label': 'Easy', @@ -160,5 +171,26 @@ angular.module('qas').controller('QasController', ['$scope', '$stateParams', '$l -]); +]) + .service('MathService', function() { + + this.add = function(a, b) { return a + b }; + + this.subtract = function(a, b) { return a - b }; + + this.multiply = function(a, b) { return a * b }; + + this.divide = function(a, b) { return a / b }; + + }) + + .service('CalculatorService', function(MathService){ + + this.square = function(a) { return MathService.multiply(a,a); }; + this.cce = function(a) {return a+a*1000}; + this.cube = function(a) { return MathService.multiply(a, MathService.multiply(a,a)); }; + + }); + +; diff --git a/public/modules/qas/qas.client.module.js b/public/modules/qas/qas.client.module.js index 49cad3f2cc..abf27a7ec1 100644 --- a/public/modules/qas/qas.client.module.js +++ b/public/modules/qas/qas.client.module.js @@ -1,4 +1,4 @@ 'use strict'; -// Use applicaion configuration module to register a new module +// Use application configuration module to register a new module ApplicationConfiguration.registerModule('qas'); \ No newline at end of file diff --git a/public/modules/qas/services/qas.client.service1.js b/public/modules/qas/services/qas.client.service1.js new file mode 100644 index 0000000000..61738f53d6 --- /dev/null +++ b/public/modules/qas/services/qas.client.service1.js @@ -0,0 +1,23 @@ +/** + * Created by EbyC on 8/24/2014. + */ +'use strict'; + +//Qas service used to communicate Qas REST endpoints +angular.module('qas').service('MathService', [ function() { + + this.add = function(a, b) { return a + b }; + + this.subtract = function(a, b) { return a - b }; + + this.multiply = function(a, b) { return a * b }; + + this.divide = function(a, b) { return a / b }; + }]) + + .service('CalculatorService', [ function(MathService){ + + this.square = function(a) { return MathService.multiply(a,a); }; + this.cube = function(a) { return MathService.multiply(a, MathService.multiply(a,a)); }; + + }]); diff --git a/public/modules/qas/services/qas.client.service2.js b/public/modules/qas/services/qas.client.service2.js new file mode 100644 index 0000000000..1d1b4c970a --- /dev/null +++ b/public/modules/qas/services/qas.client.service2.js @@ -0,0 +1,36 @@ +/** + * Created by EbyC on 8/24/2014. + */ +'use strict'; + +//Qas service used to communicate Qas REST endpoints +angular.module('qas').service('qasInitService', [ function() { + + this.init = function() { return [ + { + 'label': 'FIB', + 'value': 1 + }, + { + 'label': 'TF', + 'value': 2 + }, + { + 'label': 'MC', + 'value': 3 + }, + { + 'label': 'Matching', + 'value': 4 + } + ]; + }; + + this.subtract = function(a, b) { return a - b }; + + this.multiply = function(a, b) { return a * b }; + + this.divide = function(a, b) { return a / b }; + }]) + + ; diff --git a/public/modules/qas/views/list-qas.client.view.html b/public/modules/qas/views/list-qas.client.view.html index 159210d967..91a3018377 100644 --- a/public/modules/qas/views/list-qas.client.view.html +++ b/public/modules/qas/views/list-qas.client.view.html @@ -9,6 +9,7 @@

LIST

{{qa.question}}

{{qa.choices.length}}

+

{{doit}}

From 554cc075d68d9e49fede76d069ac3a1864be88be Mon Sep 17 00:00:00 2001 From: cliffeby Date: Mon, 25 Aug 2014 13:10:45 -0400 Subject: [PATCH 06/27] Adding a Service --- .../qas/controllers/qas.client.controller.js | 39 ++++++++++--------- .../qas/services/qas.client.service1.js | 10 +++-- 2 files changed, 26 insertions(+), 23 deletions(-) diff --git a/public/modules/qas/controllers/qas.client.controller.js b/public/modules/qas/controllers/qas.client.controller.js index 583014adbb..d45eb2ab31 100644 --- a/public/modules/qas/controllers/qas.client.controller.js +++ b/public/modules/qas/controllers/qas.client.controller.js @@ -12,6 +12,7 @@ angular.module('qas').controller('QasController', ['$scope', '$stateParams', '$l $scope.doit = CalculatorService.square(4); $scope.doit = CalculatorService.cube(9); $scope.doit = MathService.add(3,4); + $scope.doit = CalculatorService.cce(77); @@ -172,25 +173,25 @@ angular.module('qas').controller('QasController', ['$scope', '$stateParams', '$l ]) - .service('MathService', function() { - - this.add = function(a, b) { return a + b }; - - this.subtract = function(a, b) { return a - b }; - - this.multiply = function(a, b) { return a * b }; - - this.divide = function(a, b) { return a / b }; - - }) - - .service('CalculatorService', function(MathService){ - - this.square = function(a) { return MathService.multiply(a,a); }; - this.cce = function(a) {return a+a*1000}; - this.cube = function(a) { return MathService.multiply(a, MathService.multiply(a,a)); }; - - }); +// .service('MathService', function() { +// +// this.add = function(a, b) { return a + b }; +// +// this.subtract = function(a, b) { return a - b }; +// +// this.multiply = function(a, b) { return a * b }; +// +// this.divide = function(a, b) { return a / b }; +// +// }) + +// .service('CalculatorService', function(MathService){ +// +// this.square = function(a) { return MathService.multiply(a,a); }; +// this.cce = function(a) {return a+a*1000}; +// this.cube = function(a) { return MathService.multiply(a, MathService.multiply(a,a)); }; +// +// }); ; diff --git a/public/modules/qas/services/qas.client.service1.js b/public/modules/qas/services/qas.client.service1.js index 61738f53d6..d7a06f8904 100644 --- a/public/modules/qas/services/qas.client.service1.js +++ b/public/modules/qas/services/qas.client.service1.js @@ -15,9 +15,11 @@ angular.module('qas').service('MathService', [ function() { this.divide = function(a, b) { return a / b }; }]) - .service('CalculatorService', [ function(MathService){ + .service('CalculatorService', function(MathService){ - this.square = function(a) { return MathService.multiply(a,a); }; - this.cube = function(a) { return MathService.multiply(a, MathService.multiply(a,a)); }; +this.square = function(a) { return MathService.multiply(a,a); }; +this.cce = function(a) {return a+a*1000}; +this.cube = function(a) { return MathService.multiply(a, MathService.multiply(a,a)); }; - }]); +}); +// }]); From 5567c2573309e20908d03b178297b52045fc26cf Mon Sep 17 00:00:00 2001 From: cliffeby Date: Mon, 25 Aug 2014 13:58:55 -0400 Subject: [PATCH 07/27] Adding init Service --- .../qas/controllers/qas.client.controller.js | 49 ++----------- .../qas/services/qas.client.service1.js | 19 +++-- .../qas/services/qas.client.service2.js | 70 +++++++++++-------- 3 files changed, 53 insertions(+), 85 deletions(-) diff --git a/public/modules/qas/controllers/qas.client.controller.js b/public/modules/qas/controllers/qas.client.controller.js index d45eb2ab31..e490c61b33 100644 --- a/public/modules/qas/controllers/qas.client.controller.js +++ b/public/modules/qas/controllers/qas.client.controller.js @@ -2,59 +2,18 @@ // Qas controller... angular.module('qas').controller('QasController', ['$scope', '$stateParams', '$location', 'Authentication', - 'Qas','CalculatorService','MathService', - function ($scope, $stateParams, $location, Authentication, Qas, CalculatorService, MathService ) { + 'Qas','CalculatorService','MathService','qasInitService', + function ($scope, $stateParams, $location, Authentication, Qas, CalculatorService, MathService, qasInitService ) { $scope.authentication = Authentication; - $scope.doSquare = CalculatorService.square(16); - //$scope.doSquare = MathService.multiply(4,4); - // $scope.doit = MathService.multiply(4,4); - $scope.doit = CalculatorService.square(4); - $scope.doit = CalculatorService.cube(9); - $scope.doit = MathService.add(3,4); $scope.doit = CalculatorService.cce(77); // Create new Qa - $scope.typeDropdown = "AAA"; -// $scope.typeDropdown = [ -// { -// 'label': 'FIB', -// 'value': 1 -// }, -// { -// 'label': 'TF', -// 'value': 2 -// }, -// { -// 'label': 'MC', -// 'value': 3 -// }, -// { -// 'label': 'Matching', -// 'value': 4 -// } -// ]; - $scope.difficultyDropdown = [ - { - 'label': 'Easy', - 'value': 1 - }, - { - 'label': 'Medium', - 'value': 2 - }, - { - 'label': 'Hard', - 'value': 3 - }, - { - 'label': 'Impossible', - 'value': 4 - } - ]; + $scope.typeDropdown = qasInitService.typeDropdown(); + $scope.difficultyDropdown = qasInitService.difficultyDropdown(); $scope.qa = new Qas({ question: '', diff --git a/public/modules/qas/services/qas.client.service1.js b/public/modules/qas/services/qas.client.service1.js index d7a06f8904..85e2309417 100644 --- a/public/modules/qas/services/qas.client.service1.js +++ b/public/modules/qas/services/qas.client.service1.js @@ -3,23 +3,20 @@ */ 'use strict'; -//Qas service used to communicate Qas REST endpoints -angular.module('qas').service('MathService', [ function() { - - this.add = function(a, b) { return a + b }; +angular.module('qas') + .service('MathService', [ function() { + this.add = function(a, b) { return a + b }; this.subtract = function(a, b) { return a - b }; - this.multiply = function(a, b) { return a * b }; - this.divide = function(a, b) { return a / b }; }]) .service('CalculatorService', function(MathService){ -this.square = function(a) { return MathService.multiply(a,a); }; -this.cce = function(a) {return a+a*1000}; -this.cube = function(a) { return MathService.multiply(a, MathService.multiply(a,a)); }; + this.square = function(a) { return MathService.multiply(a,a); }; + this.cce = function(a) {return a+a*1000}; + this.cube = function(a) { return MathService.multiply(a, MathService.multiply(a,a)); }; + + }); -}); -// }]); diff --git a/public/modules/qas/services/qas.client.service2.js b/public/modules/qas/services/qas.client.service2.js index 1d1b4c970a..609866dd8a 100644 --- a/public/modules/qas/services/qas.client.service2.js +++ b/public/modules/qas/services/qas.client.service2.js @@ -4,33 +4,45 @@ 'use strict'; //Qas service used to communicate Qas REST endpoints -angular.module('qas').service('qasInitService', [ function() { +angular.module('qas') + .service('qasInitService', [ function() { - this.init = function() { return [ - { - 'label': 'FIB', - 'value': 1 - }, - { - 'label': 'TF', - 'value': 2 - }, - { - 'label': 'MC', - 'value': 3 - }, - { - 'label': 'Matching', - 'value': 4 - } - ]; - }; - - this.subtract = function(a, b) { return a - b }; - - this.multiply = function(a, b) { return a * b }; - - this.divide = function(a, b) { return a / b }; - }]) - - ; + this.typeDropdown = function() { return [ + { + 'label': 'FIB', + 'value': 1 + }, + { + 'label': 'TF', + 'value': 2 + }, + { + 'label': 'MC', + 'value': 3 + }, + { + 'label': 'Matching', + 'value': 4 + } + ]; + }; + this.difficultyDropdown = function() { return [ + { + 'label': 'Easy', + 'value': 1 + }, + { + 'label': 'Medium', + 'value': 2 + }, + { + 'label': 'Hard', + 'value': 3 + }, + { + 'label': 'Impossible', + 'value': 4 + } + ]; + } + }]); From e460d409aaf44c8df4b693940de9f3219263e7f2 Mon Sep 17 00:00:00 2001 From: cliffeby Date: Mon, 25 Aug 2014 23:18:36 -0400 Subject: [PATCH 08/27] Working on Initializing data in service --- .../qas/controllers/qas.client.controller.js | 54 ++++--------------- .../qas/services/qas.client.service2.js | 13 ++++- 2 files changed, 22 insertions(+), 45 deletions(-) diff --git a/public/modules/qas/controllers/qas.client.controller.js b/public/modules/qas/controllers/qas.client.controller.js index e490c61b33..105f565861 100644 --- a/public/modules/qas/controllers/qas.client.controller.js +++ b/public/modules/qas/controllers/qas.client.controller.js @@ -5,33 +5,24 @@ angular.module('qas').controller('QasController', ['$scope', '$stateParams', '$l 'Qas','CalculatorService','MathService','qasInitService', function ($scope, $stateParams, $location, Authentication, Qas, CalculatorService, MathService, qasInitService ) { $scope.authentication = Authentication; - +//Test of Calculator and Math Service $scope.doit = CalculatorService.cce(77); - - - // Create new Qa +// Initialize Dropdown labels $scope.typeDropdown = qasInitService.typeDropdown(); - $scope.difficultyDropdown = qasInitService.difficultyDropdown(); - $scope.qa = new Qas({ - question: '', - answer: '', - choices: [ - { text: '', correctAnswer: false }, - { text: '', correctAnswer: false} - ], - content: '' - }); + var qa = new Qas(); + $scope.qa = qasInitService.init(qa); //$scope.taker = new Taker({ // quizNumber: '9999'}); - console.log('From Scope1 taker', $scope.taker); - $scope.qa.choices.correctAnswer; + + $scope.qa.choices.correctAnswer; // Create and validate qa entries $scope.create = function () { - console.log("From QA CReate"); - var qa = $scope.qa; + // console.log("From QA CReate"); + qa = $scope.qa; + console.log('qa', qa); // Grab data from input boxes qa.question = this.question; qa.imageURL = this.imageURL; @@ -126,31 +117,6 @@ angular.module('qas').controller('QasController', ['$scope', '$stateParams', '$l console.log(qa); $scope.qa.choices.splice(ss, 1); }; - } - - - -]) -// .service('MathService', function() { -// -// this.add = function(a, b) { return a + b }; -// -// this.subtract = function(a, b) { return a - b }; -// -// this.multiply = function(a, b) { return a * b }; -// -// this.divide = function(a, b) { return a / b }; -// -// }) - -// .service('CalculatorService', function(MathService){ -// -// this.square = function(a) { return MathService.multiply(a,a); }; -// this.cce = function(a) {return a+a*1000}; -// this.cube = function(a) { return MathService.multiply(a, MathService.multiply(a,a)); }; -// -// }); - -; +]); diff --git a/public/modules/qas/services/qas.client.service2.js b/public/modules/qas/services/qas.client.service2.js index 609866dd8a..30b6e99d1d 100644 --- a/public/modules/qas/services/qas.client.service2.js +++ b/public/modules/qas/services/qas.client.service2.js @@ -44,5 +44,16 @@ angular.module('qas') 'value': 4 } ]; - } + }; + + this.init = function(qa){return ({ + question: 'a', + answer: 'b', + choices: [ + { text: '', correctAnswer: false }, + { text: '', correctAnswer: false} + ], + content: '' + });} + }]); From 2daebefba799cccf21afa4541e5d3aaa0d50a83f Mon Sep 17 00:00:00 2001 From: cliffeby Date: Tue, 26 Aug 2014 23:12:15 -0400 Subject: [PATCH 09/27] Working on Initializing data in service --- .../qas/controllers/qas.client.controller.js | 12 ++++++------ .../modules/qas/services/qas.client.service2.js | 16 +++++++++++++--- .../modules/qas/views/create-qa.client.view.html | 2 +- 3 files changed, 20 insertions(+), 10 deletions(-) diff --git a/public/modules/qas/controllers/qas.client.controller.js b/public/modules/qas/controllers/qas.client.controller.js index 105f565861..9ec67d3b00 100644 --- a/public/modules/qas/controllers/qas.client.controller.js +++ b/public/modules/qas/controllers/qas.client.controller.js @@ -11,22 +11,22 @@ angular.module('qas').controller('QasController', ['$scope', '$stateParams', '$l // Initialize Dropdown labels $scope.typeDropdown = qasInitService.typeDropdown(); $scope.difficultyDropdown = qasInitService.difficultyDropdown(); - var qa = new Qas(); $scope.qa = qasInitService.init(qa); - //$scope.taker = new Taker({ - // quizNumber: '9999'}); - $scope.qa.choices.correctAnswer; + // $scope.qa.choices.correctAnswer; // Create and validate qa entries $scope.create = function () { - // console.log("From QA CReate"); - qa = $scope.qa; + var qa = new Qas(); + qa = qasInitService.init(qa); + console.log('$scope.qa', $scope.qa); + //qa = $scope.qa; console.log('qa', qa); // Grab data from input boxes qa.question = this.question; qa.imageURL = this.imageURL; qa.choices.text = [ + { text: this.text }, { text: this.text }, { text: this.text } ]; diff --git a/public/modules/qas/services/qas.client.service2.js b/public/modules/qas/services/qas.client.service2.js index 30b6e99d1d..44f82d3681 100644 --- a/public/modules/qas/services/qas.client.service2.js +++ b/public/modules/qas/services/qas.client.service2.js @@ -47,13 +47,23 @@ angular.module('qas') }; this.init = function(qa){return ({ - question: 'a', - answer: 'b', + question: '', + questionNumber: "", + imageURL:"", choices: [ { text: '', correctAnswer: false }, + { text: '', correctAnswer: false}, { text: '', correctAnswer: false} ], - content: '' + content: '', + hint:"", + difficulty:"", + type:"", + hintOn:false, + timeOn:false, + fifty50On:false, + randomizeQuestionsOn:false, + randomizeAnswersOn:false });} }]); diff --git a/public/modules/qas/views/create-qa.client.view.html b/public/modules/qas/views/create-qa.client.view.html index cf16d47edd..8f83dd24f4 100644 --- a/public/modules/qas/views/create-qa.client.view.html +++ b/public/modules/qas/views/create-qa.client.view.html @@ -67,7 +67,7 @@

New Big QA

- From acf836cb54be79308c9723b81af3a5f997f39b4c Mon Sep 17 00:00:00 2001 From: cliffeby Date: Tue, 9 Sep 2014 23:17:14 -0400 Subject: [PATCH 10/27] getting create() to function --- .../controllers/articles.client.controller.js | 1 + .../qas/controllers/qas.client.controller.js | 61 ++++++------ .../qas/services/qas.client.service2.js | 4 +- .../qas/views/create-qa.client.view.html | 23 +++-- .../was/services/was.client.service2.js | 69 +++++++++++++ .../was/views/create-wa.client.view.html | 98 +++++++++++++++++++ 6 files changed, 214 insertions(+), 42 deletions(-) create mode 100644 public/modules/was/services/was.client.service2.js create mode 100644 public/modules/was/views/create-wa.client.view.html diff --git a/public/modules/articles/controllers/articles.client.controller.js b/public/modules/articles/controllers/articles.client.controller.js index 364987eb9e..ee02cd230a 100644 --- a/public/modules/articles/controllers/articles.client.controller.js +++ b/public/modules/articles/controllers/articles.client.controller.js @@ -9,6 +9,7 @@ angular.module('articles').controller('ArticlesController', ['$scope', '$statePa title: this.title, content: this.content }); + // console.log(response); article.$save(function(response) { $location.path('articles/' + response._id); diff --git a/public/modules/qas/controllers/qas.client.controller.js b/public/modules/qas/controllers/qas.client.controller.js index 9ec67d3b00..f1626d2591 100644 --- a/public/modules/qas/controllers/qas.client.controller.js +++ b/public/modules/qas/controllers/qas.client.controller.js @@ -11,61 +11,62 @@ angular.module('qas').controller('QasController', ['$scope', '$stateParams', '$l // Initialize Dropdown labels $scope.typeDropdown = qasInitService.typeDropdown(); $scope.difficultyDropdown = qasInitService.difficultyDropdown(); - var qa = new Qas(); - $scope.qa = qasInitService.init(qa); - // $scope.qa.choices.correctAnswer; + $scope.qa = qasInitService.init(); + //var qa = $scope.qa; // Create and validate qa entries $scope.create = function () { - var qa = new Qas(); - qa = qasInitService.init(qa); - console.log('$scope.qa', $scope.qa); - //qa = $scope.qa; - console.log('qa', qa); - // Grab data from input boxes - qa.question = this.question; - qa.imageURL = this.imageURL; - qa.choices.text = [ - { text: this.text }, - { text: this.text }, - { text: this.text } - ]; - qa.content = this.content; - qa.hint = this.hint; - qa.hintOn = this.hintOn; - qa.timeOn = this.timeOn; - qa.fifty50On = this.fifty50On; - qa.randomizeQuestionsOn = this.randomizeQuestionsOn; - qa.randomizeAnswersOn = this.randomizeAnswersOn; + var qa = new Qas({ + question: this.question, + imageURL: this.imageURL, + choices: [{ + text: this.text, selectedAnswer: false + }, {text: this.text, selectedAnswer: this.correctAnswer + }, {text: this.text, selectedAnswer: this.correctAnswer + }], + hint: this.hint, - console.log('From qa 1', qa); + hintOn: this.hintOn, + timeOn: this.timeOn, + fifty50On: this.fifty50On, + randomizeQuestionsOn: this.randomizeQuestionsOn, + randomizeAnswersOn: this.randomizeAnswersOn + }); + + qa.choices = $scope.qa.choices; + console.log('From qa 1',qa);console.log('From $qa 1',$scope.qa); // Check that question was entered console.log('qa.question.length', qa.question.length); if (qa.question.length > 0) { var choiceCount = 0; //Loop through choices to get at least two + console.log('qa if', qa); for (var i = 0, ln = qa.choices.length; i < ln; i++) { - var choice = qa.choices[i]; - if (choice.text.length > 0) { + var choice = qa.choices[i].text; + console.log('choice', choice, " i", i); + if (choice.length > 0) { choiceCount++; } } if (choiceCount > 1) { // Call API to save to database - qa.$save(function (response) { - $location.path('qas/' + response._id); - }); + + } else { alert('You must have at least two choices'); } } else { alert('You must have a question'); } + console.log('qaFinal',qa); + qa.$save(function(response) { + $location.path('qas/' + response._id)}); }; // Method to add an additional choice option $scope.addChoice = function () { - $scope.qa.choices.push({ text: this.text, correctAnswer: false }); + console.log('qa add', $scope.qa); + $scope.qa.choices.push({ text: this.text, selectedAnswer: false }); }; $scope.remove = function (qa) { diff --git a/public/modules/qas/services/qas.client.service2.js b/public/modules/qas/services/qas.client.service2.js index 44f82d3681..023b016d61 100644 --- a/public/modules/qas/services/qas.client.service2.js +++ b/public/modules/qas/services/qas.client.service2.js @@ -46,8 +46,8 @@ angular.module('qas') ]; }; - this.init = function(qa){return ({ - question: '', + this.init = function(){return ({ + question: 'dffdfdfdf', questionNumber: "", imageURL:"", choices: [ diff --git a/public/modules/qas/views/create-qa.client.view.html b/public/modules/qas/views/create-qa.client.view.html index 8f83dd24f4..3b14df887c 100644 --- a/public/modules/qas/views/create-qa.client.view.html +++ b/public/modules/qas/views/create-qa.client.view.html @@ -2,10 +2,11 @@

New Big QA

+
- +
-
+
@@ -17,7 +18,7 @@

New Big QA

- +
@@ -27,13 +28,13 @@

New Big QA

- + + +
- +
@@ -89,10 +90,12 @@

New Big QA

- - +
+ +
- +
+ diff --git a/public/modules/was/services/was.client.service2.js b/public/modules/was/services/was.client.service2.js new file mode 100644 index 0000000000..f9dc9d95c1 --- /dev/null +++ b/public/modules/was/services/was.client.service2.js @@ -0,0 +1,69 @@ +/** + * Created by EbyC on 8/24/2014. + */ +'use strict'; + +//Qas service used to communicate Was REST endpoints +angular.module('was') + .service('wasInitService', [ function() { + + this.typeDropdown = function() { return [ + { + 'label': 'FIB', + 'value': 1 + }, + { + 'label': 'TF', + 'value': 2 + }, + { + 'label': 'MC', + 'value': 3 + }, + { + 'label': 'Matching', + 'value': 4 + } + ]; + }; + this.difficultyDropdown = function() { return [ + { + 'label': 'Easy', + 'value': 1 + }, + { + 'label': 'Medium', + 'value': 2 + }, + { + 'label': 'Hard', + 'value': 3 + }, + { + 'label': 'Impossible', + 'value': 4 + } + ]; + }; + + this.init = function(wa){return ({ + question: '', + questionNumber: "", + imageURL:"", + choices: [ + { text: '', correctAnswer: false }, + { text: '', correctAnswer: false}, + { text: '', correctAnswer: false} + ], + content: '', + hint:"", + difficulty:"", + type:"", + hintOn:false, + timeOn:false, + fifty50On:false, + randomizeQuestionsOn:false, + randomizeAnswersOn:false + });} + + }]); diff --git a/public/modules/was/views/create-wa.client.view.html b/public/modules/was/views/create-wa.client.view.html new file mode 100644 index 0000000000..948a5ff495 --- /dev/null +++ b/public/modules/was/views/create-wa.client.view.html @@ -0,0 +1,98 @@ +
+
+

New Big WA

+
+
+
+
+
+ + +
+ +
+ + + +
+ + + +
+ +
+
+ +
+
+ +
+
+
+
+
+
+
+
+ + +
+ +
+ +
+
+ +
+
+ +
+ +
+
+ +
+ + +
+
+ + +
+
+ + +
+ Allow Hint + Timed + 50/50 + Randomize Answers + Randomize Questions + + + + +
+
+ +
+
From 9f8e298fe5c9914e419bbf43f583847f8cbad87c Mon Sep 17 00:00:00 2001 From: cliffeby Date: Wed, 10 Sep 2014 08:19:55 -0400 Subject: [PATCH 11/27] Adding init Service --- .../modules/articles/services/articles.client.service.js | 9 +++------ public/modules/qas/services/qas.client.service.js | 4 +--- public/modules/qas/views/create-qa.client.view.html | 6 +++--- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/public/modules/articles/services/articles.client.service.js b/public/modules/articles/services/articles.client.service.js index deeb7da58c..59e7355f59 100644 --- a/public/modules/articles/services/articles.client.service.js +++ b/public/modules/articles/services/articles.client.service.js @@ -3,12 +3,9 @@ //Articles service used for communicating with the articles REST endpoints angular.module('articles').factory('Articles', ['$resource', function($resource) { - return $resource('articles/:articleId', { - articleId: '@_id' - }, { - update: { - method: 'PUT' - } + return $resource('articles/:articleId', {articleId: '@_id' + },{ + update: {method: 'PUT'} }); } ]); \ No newline at end of file diff --git a/public/modules/qas/services/qas.client.service.js b/public/modules/qas/services/qas.client.service.js index f92714de09..a1d2e6bdee 100644 --- a/public/modules/qas/services/qas.client.service.js +++ b/public/modules/qas/services/qas.client.service.js @@ -5,9 +5,7 @@ angular.module('qas').factory('Qas', ['$resource', function($resource) { return $resource('qas/:qaId', { qaId: '@_id' }, { - update: { - method: 'PUT' - } + update: {method: 'PUT'} }); } ]); \ No newline at end of file diff --git a/public/modules/qas/views/create-qa.client.view.html b/public/modules/qas/views/create-qa.client.view.html index 3b14df887c..6220bcd71e 100644 --- a/public/modules/qas/views/create-qa.client.view.html +++ b/public/modules/qas/views/create-qa.client.view.html @@ -28,9 +28,9 @@

New Big QA

- - - +
From ce0042c28c353cf2f2d3521f3c712efb31ef009f Mon Sep 17 00:00:00 2001 From: cliffeby Date: Thu, 11 Sep 2014 22:38:00 -0400 Subject: [PATCH 12/27] getting create() to function --- .../qas/controllers/qas.client.controller.js | 17 +++++++++++------ .../qas/views/create-qa.client.view.html | 8 +++++++- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/public/modules/qas/controllers/qas.client.controller.js b/public/modules/qas/controllers/qas.client.controller.js index f1626d2591..fc2081812c 100644 --- a/public/modules/qas/controllers/qas.client.controller.js +++ b/public/modules/qas/controllers/qas.client.controller.js @@ -11,6 +11,8 @@ angular.module('qas').controller('QasController', ['$scope', '$stateParams', '$l // Initialize Dropdown labels $scope.typeDropdown = qasInitService.typeDropdown(); $scope.difficultyDropdown = qasInitService.difficultyDropdown(); + //$scope.dd = difficultyDropdown[i]; + // $scope.td = typeDropdown[i]; $scope.qa = qasInitService.init(); //var qa = $scope.qa; @@ -20,12 +22,13 @@ angular.module('qas').controller('QasController', ['$scope', '$stateParams', '$l question: this.question, imageURL: this.imageURL, choices: [{ - text: this.text, selectedAnswer: false - }, {text: this.text, selectedAnswer: this.correctAnswer - }, {text: this.text, selectedAnswer: this.correctAnswer + text: this.text, selectedAnswer: false //doesn't work + }, {text: this.text, selectedAnswer: this.correctAnswer //doesn't work + }, {text: this.text, selectedAnswer: this.correctAnswer //doesn't work }], - hint: this.hint, - + hint: this.hint, //doesn't work + type: this.td, //doesn't work + difficulty: this.difficulty, hintOn: this.hintOn, timeOn: this.timeOn, fifty50On: this.fifty50On, @@ -33,7 +36,9 @@ angular.module('qas').controller('QasController', ['$scope', '$stateParams', '$l randomizeAnswersOn: this.randomizeAnswersOn }); - qa.choices = $scope.qa.choices; + qa.choices = $scope.qa.choices; + qa.difficulty = $scope.dd.label; + qa.type = $scope.td.label; console.log('From qa 1',qa);console.log('From $qa 1',$scope.qa); // Check that question was entered console.log('qa.question.length', qa.question.length); diff --git a/public/modules/qas/views/create-qa.client.view.html b/public/modules/qas/views/create-qa.client.view.html index 6220bcd71e..859d569be7 100644 --- a/public/modules/qas/views/create-qa.client.view.html +++ b/public/modules/qas/views/create-qa.client.view.html @@ -2,6 +2,10 @@

New Big QA

+ + {{td.label}}
@@ -80,7 +84,9 @@

New Big QA

- +
Allow Hint Timed From 6610899d4e8c85df9986d0ef848ef7ccbabcbe38 Mon Sep 17 00:00:00 2001 From: cliffeby Date: Tue, 23 Sep 2014 23:17:26 -0400 Subject: [PATCH 13/27] adding modal and quiz --- app/models/qa.server.model.js | 34 +- public/dist/application.js | 397 +++++++++++++++++- public/dist/application.min.js | 2 +- .../qas/controllers/qas.client.controller.js | 78 +++- .../qas/services/qas.client.service2.js | 106 +++-- .../qas/views/create-qa.client.view.html | 3 + .../qas/views/edit-qa.client.view.html | 4 + public/modules/qas/views/modal-qa.client.html | 14 + .../qas/views/view-qa.client.view.html | 10 +- .../was/services/was.client.service2.js | 69 --- .../was/views/create-wa.client.view.html | 98 ----- 11 files changed, 535 insertions(+), 280 deletions(-) create mode 100644 public/modules/qas/views/modal-qa.client.html delete mode 100644 public/modules/was/services/was.client.service2.js delete mode 100644 public/modules/was/views/create-wa.client.view.html diff --git a/app/models/qa.server.model.js b/app/models/qa.server.model.js index d317777085..95dd22b1d0 100644 --- a/app/models/qa.server.model.js +++ b/app/models/qa.server.model.js @@ -80,37 +80,15 @@ var QaSchema = new Schema({ default: false, trim: true - } + }, + quizId: { + type: Number, + default: 0 + } }); //console.log(AnswerSchema); -var QuizSchema = new Schema({ - created: { - type: Date, - default: Date.now - }, - name: { - type: String, - default: '', - trim: true - }, - quizNumber: { - type: String, - default: '', - trim: true - }, - category: { - type: String, - default: '', - trim: true - }, - keyWords: { - type: String, - default: '', - trim: true - }, - qas: [QaSchema] - }); + /** * Validations */ diff --git a/public/dist/application.js b/public/dist/application.js index f59c8fee04..b5f3f6245f 100644 --- a/public/dist/application.js +++ b/public/dist/application.js @@ -44,6 +44,10 @@ angular.element(document).ready(function () { ApplicationConfiguration.registerModule('articles');'use strict'; // Use Applicaion configuration module to register a new module ApplicationConfiguration.registerModule('core');'use strict'; +// Use application configuration module to register a new module +ApplicationConfiguration.registerModule('qas');'use strict'; +// Use applicaion configuration module to register a new module +ApplicationConfiguration.registerModule('takers');'use strict'; // Use Applicaion configuration module to register a new module ApplicationConfiguration.registerModule('users');'use strict'; // Configuring the Articles module @@ -89,6 +93,7 @@ angular.module('articles').controller('ArticlesController', [ title: this.title, content: this.content }); + // console.log(response); article.$save(function (response) { $location.path('articles/' + response._id); $scope.title = ''; @@ -176,16 +181,20 @@ angular.module('core').controller('HomeController', [ //Menu service used for managing menus angular.module('core').service('Menus', [function () { // Define a set of default roles - this.defaultRoles = ['user']; + this.defaultRoles = ['*']; // Define the menus object this.menus = {}; // A private function for rendering decision var shouldRender = function (user) { if (user) { - for (var userRoleIndex in user.roles) { - for (var roleIndex in this.roles) { - if (this.roles[roleIndex] === user.roles[userRoleIndex]) { - return true; + if (!!~this.roles.indexOf('*')) { + return true; + } else { + for (var userRoleIndex in user.roles) { + for (var roleIndex in this.roles) { + if (this.roles[roleIndex] === user.roles[userRoleIndex]) { + return true; + } } } } @@ -245,7 +254,7 @@ angular.module('core').service('Menus', [function () { menuItemClass: menuItemType, uiRoute: menuItemUIRoute || '/' + menuItemURL, isPublic: isPublic === null || typeof isPublic === 'undefined' ? this.menus[menuId].isPublic : isPublic, - roles: roles || this.defaultRoles, + roles: roles === null || typeof roles === 'undefined' ? this.menus[menuId].roles : roles, position: position || 0, items: [], shouldRender: shouldRender @@ -266,7 +275,7 @@ angular.module('core').service('Menus', [function () { link: menuItemURL, uiRoute: menuItemUIRoute || '/' + menuItemURL, isPublic: isPublic === null || typeof isPublic === 'undefined' ? this.menus[menuId].items[itemIndex].isPublic : isPublic, - roles: roles || this.defaultRoles, + roles: roles === null || typeof roles === 'undefined' ? this.menus[menuId].items[itemIndex].roles : roles, position: position || 0, shouldRender: shouldRender }); @@ -306,6 +315,380 @@ angular.module('core').service('Menus', [function () { //Adding the topbar menu this.addMenu('topbar'); }]);'use strict'; +// Configuring the Articles module. +angular.module('qas').run([ + 'Menus', + function (Menus) { + // Set top bar menu items + Menus.addMenuItem('topbar', 'Qas', 'qas', 'dropdown', '/qas(/create)?'); + Menus.addSubMenuItem('topbar', 'qas', 'List Qas', 'qas'); + Menus.addSubMenuItem('topbar', 'qas', 'New Qa', 'qas/create'); + } +]);'use strict'; +//Setting up route... +angular.module('qas').config([ + '$stateProvider', + function ($stateProvider) { + // Qas state routing + $stateProvider.state('listQas', { + url: '/qas', + templateUrl: 'modules/qas/views/list-qas.client.view.html' + }).state('createQa', { + url: '/qas/create', + templateUrl: 'modules/qas/views/create-qa.client.view.html' + }).state('viewQa', { + url: '/qas/:qaId', + templateUrl: 'modules/qas/views/view-qa.client.view.html' + }).state('editQa', { + url: '/qas/:qaId/edit', + templateUrl: 'modules/qas/views/edit-qa.client.view.html' + }); + } +]);'use strict'; +// Qas controller... +angular.module('qas').controller('QasController', [ + '$scope', + '$stateParams', + '$location', + 'Authentication', + 'Qas', + 'CalculatorService', + 'MathService', + 'qasInitService', + function ($scope, $stateParams, $location, Authentication, Qas, CalculatorService, MathService, qasInitService) { + $scope.authentication = Authentication; + //Test of Calculator and Math Service + $scope.doit = CalculatorService.cce(77); + // Initialize Dropdown labels + $scope.typeDropdown = qasInitService.typeDropdown(); + $scope.difficultyDropdown = qasInitService.difficultyDropdown(); + $scope.qa = qasInitService.init(); + // Create and validate qa entries + $scope.create = function () { + var qa = new Qas({ + question: this.question, + imageURL: this.imageURL, + choices: [ + { + text: this.text, + selectedAnswer: false + }, + { + text: this.text, + selectedAnswer: this.correctAnswer + }, + { + text: this.text, + selectedAnswer: this.correctAnswer + } + ], + hint: this.hint, + type: this.td, + difficulty: this.difficulty, + hintOn: this.hintOn, + timeOn: this.timeOn, + fifty50On: this.fifty50On, + randomizeQuestionsOn: this.randomizeQuestionsOn, + randomizeAnswersOn: this.randomizeAnswersOn + }); + // Hack to load these variables. Not handled above??? + qa.choices = $scope.qa.choices; + qa.difficulty = $scope.dd.label; + qa.type = $scope.td.label; + // Check that question was entered + if (qa.question.length > 0) { + var choiceCount = 0; + //Loop through choices to get at least two + console.log('qa if', qa); + for (var i = 0, ln = qa.choices.length; i < ln; i++) { + var choice = qa.choices[i].text; + console.log('choice', choice, ' i', i); + if (choice.length > 0) { + choiceCount++; + } + } + if (choiceCount > 1) { + } else { + alert('You must have at least two choices'); + } + } else { + alert('You must have a question'); + } + console.log('qaFinal', qa); + qa.$save(function (response) { + $location.path('qas/' + response._id); + }); + }; + // Method to add an additional choice option + $scope.addChoice = function () { + console.log('qa add', $scope.qa); + $scope.qa.choices.push({ + text: this.text, + selectedAnswer: false + }); + }; + $scope.remove = function (qa) { + if (qa) { + qa.$remove(); + for (var i in $scope.qas) { + if ($scope.qas[i] === qa) { + $scope.qas.splice(i, 1); + } + } + } else { + $scope.qa.$remove(function () { + $location.path('qas'); + }); + } + }; + $scope.update = function () { + var qa = $scope.qa; + console.log('From update', qa); + if (!qa.updated) { + qa.updated = []; + } + qa.updated.push(new Date().getTime()); + qa.$update(function () { + $location.path('qas/' + qa._id); + }); + }; + $scope.find = function () { + Qas.query(function (qas) { + $scope.qas = qas; + }); + }; + $scope.findOne = function () { + Qas.get({ qaId: $stateParams.qaId }, function (qa) { + $scope.qa = qa; + }); + }; + $scope.deleteChoice = function (ev) { + var ss = ev.target.innerText.toString() - 1; + console.log(ss); + var qa = $scope.qa; + console.log(qa); + $scope.qa.choices.splice(ss, 1); + }; + } +]);'use strict'; +//Qas service used to communicate Qas REST endpoints +angular.module('qas').factory('Qas', [ + '$resource', + function ($resource) { + return $resource('qas/:qaId', { qaId: '@_id' }, { update: { method: 'PUT' } }); + } +]);/** + * Created by EbyC on 8/24/2014. + */ +'use strict'; +angular.module('qas').service('MathService', [function () { + this.add = function (a, b) { + return a + b; + }; + this.subtract = function (a, b) { + return a - b; + }; + this.multiply = function (a, b) { + return a * b; + }; + this.divide = function (a, b) { + return a / b; + }; + }]).service('CalculatorService', function (MathService) { + this.square = function (a) { + return MathService.multiply(a, a); + }; + this.cce = function (a) { + return a + a * 1000; + }; + this.cube = function (a) { + return MathService.multiply(a, MathService.multiply(a, a)); + }; +});/** + * Created by EbyC on 8/24/2014. + */ +'use strict'; +//Qas service used to communicate Qas REST endpoints +angular.module('qas').service('qasInitService', [function () { + this.typeDropdown = function () { + return [ + { + 'label': 'FIB', + 'value': 1 + }, + { + 'label': 'TF', + 'value': 2 + }, + { + 'label': 'MC', + 'value': 3 + }, + { + 'label': 'Matching', + 'value': 4 + } + ]; + }; + this.difficultyDropdown = function () { + return [ + { + 'label': 'Easy', + 'value': 1 + }, + { + 'label': 'Medium', + 'value': 2 + }, + { + 'label': 'Hard', + 'value': 3 + }, + { + 'label': 'Impossible', + 'value': 4 + } + ]; + }; + this.init = function () { + return { + choices: [ + { + text: '', + correctAnswer: false + }, + { + text: '', + correctAnswer: false + }, + { + text: '', + correctAnswer: false + } + ] + }; + }; + }]);'use strict'; +// Configuring the Takers module +angular.module('takers').run([ + 'Menus', + function (Menus) { + // Set top bar menu items + Menus.addMenuItem('topbar', 'Takers', 'takers', 'dropdown', '/takers(/create)?'); + Menus.addSubMenuItem('topbar', 'takers', 'List Takers', 'takers'); + Menus.addSubMenuItem('topbar', 'takers', 'New Taker', 'takers/create'); + Menus.addSubMenuItem('topbar', 'takers', 'Take', 'takers/'); + } +]);'use strict'; +//Setting up route +angular.module('takers').config([ + '$stateProvider', + function ($stateProvider) { + // Takers state routing + $stateProvider.state('listTakers', { + url: '/takers', + templateUrl: 'modules/takers/views/take.html' + }).state('createTaker', { + url: '/takers/create', + templateUrl: 'modules/takers/views/create-taker.client.view.html' + }).state('viewTaker', { + url: '/takers/:takerId', + templateUrl: 'modules/takers/views/view-taker.client.view.html' + }).state('editTaker', { + url: '/takers/:takerId/edit', + templateUrl: 'modules/takers/views/edit-taker.client.view.html' + }); + } +]);'use strict'; +angular.module('takers').controller('TakersController', [ + '$scope', + '$stateParams', + '$location', + 'Authentication', + 'Articles', + function ($scope, $stateParams, $location, Authentication, Qas, Takers) { + $scope.authentication = Authentication; + // Takers controller logic + var taker = new Takers(); + //taker.qa = qas; + $scope.taker = new Takers({ + quizNumber: '0', + trialNumber: '0', + trialOptions: '', + results: [{ + questionViewed: false, + questionAnswered: false, + questionNumber: '', + answer: [{ + selection: '0', + answer: '0' + }] + }] + }); + console.log('From ScopeTaker', $scope.taker); + $scope.find = function () { + Qas.query(function (qas) { + $scope.qas = qas; + }); + }; + console.log('From ScopeTaker', $scope.qas); + // Create and validate taker entries + $scope.next = function () { + $scope.questionIndex++; + taker.questionViewed = true; + taker.$save(function (response) { + $location.path('takers/' + response._id); + }); + console.log('next', $scope.questionIndex); + }; + $scope.prev = function () { + $scope.questionIndex--; + console.log('prev', $scope.questionIndex); + }; + $scope.answerToggled = function () { + //var taker = $scope.taker; + // Grab data from input boxes + //console.log(taker); + //taker.qa.question = qas[questionIndex].question; + //taker.questionNumber = $scope.questionNumber; + console.log('toggledtaker', taker); + for (var i = 0, ln = taker.qa[$scope.questionIndex].choices.length; i < ln; i++) { + //taker.results.answer.selection[i] = $scope.results.answer.selection[i]; + //console.log(taker.results[$scope.questionIndex].answer.isSelected[i],$scope.choice[i].selectedAnswer) + taker.results[$scope.questionIndex].answer.isSelected[i] = $scope.choice[i].selectedAnswer; + taker.updated.push(new Date().getTime()); + } + ; + console.log('From taker 1', taker); + // Check that question was entered + taker.$save(function (response) { + $location.path('takers/' + response._id); + }); + console.log(taker); + }; + $scope.find = function () { + Qas.query(function (qas) { + // $scope.qas = qas; + taker.qa = qas; + $scope.taker = taker; + console.log('From ScopeTaker1', qas[0].questionNumber, taker.qa[0].question, $scope.qas, taker); + }); + $scope.questionIndex = 0; + }; + $scope.findOne = function () { + takers.get({ qasId: $stateParams.qasId }, function (qas) { + $scope.taker = qas; + }); + }; + } +]);'use strict'; +//Takers service used to communicate Takers REST endpoints +angular.module('takers').factory('Takers', [ + '$resource', + function ($resource) { + return $resource('takers/:takerId', { takerId: '@_id' }, { update: { method: 'PUT' } }); + } +]);'use strict'; // Config HTTP Error Handling angular.module('users').config([ '$httpProvider', diff --git a/public/dist/application.min.js b/public/dist/application.min.js index 7c75a13709..1e663897bd 100644 --- a/public/dist/application.min.js +++ b/public/dist/application.min.js @@ -1 +1 @@ -"use strict";var ApplicationConfiguration=function(){var applicationModuleName="mean",applicationModuleVendorDependencies=["ngResource","ngAnimate","ui.router","ui.bootstrap","ui.utils"],registerModule=function(moduleName,dependencies){angular.module(moduleName,dependencies||[]),angular.module(applicationModuleName).requires.push(moduleName)};return{applicationModuleName:applicationModuleName,applicationModuleVendorDependencies:applicationModuleVendorDependencies,registerModule:registerModule}}();angular.module(ApplicationConfiguration.applicationModuleName,ApplicationConfiguration.applicationModuleVendorDependencies),angular.module(ApplicationConfiguration.applicationModuleName).config(["$locationProvider",function($locationProvider){$locationProvider.hashPrefix("!")}]),angular.element(document).ready(function(){"#_=_"===window.location.hash&&(window.location.hash="#!"),angular.bootstrap(document,[ApplicationConfiguration.applicationModuleName])}),ApplicationConfiguration.registerModule("articles"),ApplicationConfiguration.registerModule("core"),ApplicationConfiguration.registerModule("users"),angular.module("articles").run(["Menus",function(Menus){Menus.addMenuItem("topbar","Articles","articles","dropdown","/articles(/create)?"),Menus.addSubMenuItem("topbar","articles","List Articles","articles"),Menus.addSubMenuItem("topbar","articles","New Article","articles/create")}]),angular.module("articles").config(["$stateProvider",function($stateProvider){$stateProvider.state("listArticles",{url:"/articles",templateUrl:"modules/articles/views/list-articles.client.view.html"}).state("createArticle",{url:"/articles/create",templateUrl:"modules/articles/views/create-article.client.view.html"}).state("viewArticle",{url:"/articles/:articleId",templateUrl:"modules/articles/views/view-article.client.view.html"}).state("editArticle",{url:"/articles/:articleId/edit",templateUrl:"modules/articles/views/edit-article.client.view.html"})}]),angular.module("articles").controller("ArticlesController",["$scope","$stateParams","$location","Authentication","Articles",function($scope,$stateParams,$location,Authentication,Articles){$scope.authentication=Authentication,$scope.create=function(){var article=new Articles({title:this.title,content:this.content});article.$save(function(response){$location.path("articles/"+response._id),$scope.title="",$scope.content=""},function(errorResponse){$scope.error=errorResponse.data.message})},$scope.remove=function(article){if(article){article.$remove();for(var i in $scope.articles)$scope.articles[i]===article&&$scope.articles.splice(i,1)}else $scope.article.$remove(function(){$location.path("articles")})},$scope.update=function(){var article=$scope.article;article.$update(function(){$location.path("articles/"+article._id)},function(errorResponse){$scope.error=errorResponse.data.message})},$scope.find=function(){$scope.articles=Articles.query()},$scope.findOne=function(){$scope.article=Articles.get({articleId:$stateParams.articleId})}}]),angular.module("articles").factory("Articles",["$resource",function($resource){return $resource("articles/:articleId",{articleId:"@_id"},{update:{method:"PUT"}})}]),angular.module("core").config(["$stateProvider","$urlRouterProvider",function($stateProvider,$urlRouterProvider){$urlRouterProvider.otherwise("/"),$stateProvider.state("home",{url:"/",templateUrl:"modules/core/views/home.client.view.html"})}]),angular.module("core").controller("HeaderController",["$scope","Authentication","Menus",function($scope,Authentication,Menus){$scope.authentication=Authentication,$scope.isCollapsed=!1,$scope.menu=Menus.getMenu("topbar"),$scope.toggleCollapsibleMenu=function(){$scope.isCollapsed=!$scope.isCollapsed},$scope.$on("$stateChangeSuccess",function(){$scope.isCollapsed=!1})}]),angular.module("core").controller("HomeController",["$scope","Authentication",function($scope,Authentication){$scope.authentication=Authentication}]),angular.module("core").service("Menus",[function(){this.defaultRoles=["user"],this.menus={};var shouldRender=function(user){if(!user)return this.isPublic;for(var userRoleIndex in user.roles)for(var roleIndex in this.roles)if(this.roles[roleIndex]===user.roles[userRoleIndex])return!0;return!1};this.validateMenuExistance=function(menuId){if(menuId&&menuId.length){if(this.menus[menuId])return!0;throw new Error("Menu does not exists")}throw new Error("MenuId was not provided")},this.getMenu=function(menuId){return this.validateMenuExistance(menuId),this.menus[menuId]},this.addMenu=function(menuId,isPublic,roles){return this.menus[menuId]={isPublic:isPublic||!1,roles:roles||this.defaultRoles,items:[],shouldRender:shouldRender},this.menus[menuId]},this.removeMenu=function(menuId){this.validateMenuExistance(menuId),delete this.menus[menuId]},this.addMenuItem=function(menuId,menuItemTitle,menuItemURL,menuItemType,menuItemUIRoute,isPublic,roles,position){return this.validateMenuExistance(menuId),this.menus[menuId].items.push({title:menuItemTitle,link:menuItemURL,menuItemType:menuItemType||"item",menuItemClass:menuItemType,uiRoute:menuItemUIRoute||"/"+menuItemURL,isPublic:null===isPublic||"undefined"==typeof isPublic?this.menus[menuId].isPublic:isPublic,roles:roles||this.defaultRoles,position:position||0,items:[],shouldRender:shouldRender}),this.menus[menuId]},this.addSubMenuItem=function(menuId,rootMenuItemURL,menuItemTitle,menuItemURL,menuItemUIRoute,isPublic,roles,position){this.validateMenuExistance(menuId);for(var itemIndex in this.menus[menuId].items)this.menus[menuId].items[itemIndex].link===rootMenuItemURL&&this.menus[menuId].items[itemIndex].items.push({title:menuItemTitle,link:menuItemURL,uiRoute:menuItemUIRoute||"/"+menuItemURL,isPublic:null===isPublic||"undefined"==typeof isPublic?this.menus[menuId].items[itemIndex].isPublic:isPublic,roles:roles||this.defaultRoles,position:position||0,shouldRender:shouldRender});return this.menus[menuId]},this.removeMenuItem=function(menuId,menuItemURL){this.validateMenuExistance(menuId);for(var itemIndex in this.menus[menuId].items)this.menus[menuId].items[itemIndex].link===menuItemURL&&this.menus[menuId].items.splice(itemIndex,1);return this.menus[menuId]},this.removeSubMenuItem=function(menuId,submenuItemURL){this.validateMenuExistance(menuId);for(var itemIndex in this.menus[menuId].items)for(var subitemIndex in this.menus[menuId].items[itemIndex].items)this.menus[menuId].items[itemIndex].items[subitemIndex].link===submenuItemURL&&this.menus[menuId].items[itemIndex].items.splice(subitemIndex,1);return this.menus[menuId]},this.addMenu("topbar")}]),angular.module("users").config(["$httpProvider",function($httpProvider){$httpProvider.interceptors.push(["$q","$location","Authentication",function($q,$location,Authentication){return{responseError:function(rejection){switch(rejection.status){case 401:Authentication.user=null,$location.path("signin");break;case 403:}return $q.reject(rejection)}}}])}]),angular.module("users").config(["$stateProvider",function($stateProvider){$stateProvider.state("profile",{url:"/settings/profile",templateUrl:"modules/users/views/settings/edit-profile.client.view.html"}).state("password",{url:"/settings/password",templateUrl:"modules/users/views/settings/change-password.client.view.html"}).state("accounts",{url:"/settings/accounts",templateUrl:"modules/users/views/settings/social-accounts.client.view.html"}).state("signup",{url:"/signup",templateUrl:"modules/users/views/authentication/signup.client.view.html"}).state("signin",{url:"/signin",templateUrl:"modules/users/views/authentication/signin.client.view.html"}).state("forgot",{url:"/password/forgot",templateUrl:"modules/users/views/password/forgot-password.client.view.html"}).state("reset-invlaid",{url:"/password/reset/invalid",templateUrl:"modules/users/views/password/reset-password-invalid.client.view.html"}).state("reset-success",{url:"/password/reset/success",templateUrl:"modules/users/views/password/reset-password-success.client.view.html"}).state("reset",{url:"/password/reset/:token",templateUrl:"modules/users/views/password/reset-password.client.view.html"})}]),angular.module("users").controller("AuthenticationController",["$scope","$http","$location","Authentication",function($scope,$http,$location,Authentication){$scope.authentication=Authentication,$scope.authentication.user&&$location.path("/"),$scope.signup=function(){$http.post("/auth/signup",$scope.credentials).success(function(response){$scope.authentication.user=response,$location.path("/")}).error(function(response){$scope.error=response.message})},$scope.signin=function(){$http.post("/auth/signin",$scope.credentials).success(function(response){$scope.authentication.user=response,$location.path("/")}).error(function(response){$scope.error=response.message})}}]),angular.module("users").controller("PasswordController",["$scope","$stateParams","$http","$location","Authentication",function($scope,$stateParams,$http,$location,Authentication){$scope.authentication=Authentication,$scope.authentication.user&&$location.path("/"),$scope.askForPasswordReset=function(){$scope.success=$scope.error=null,$http.post("/auth/forgot",$scope.credentials).success(function(response){$scope.credentials=null,$scope.success=response.message}).error(function(response){$scope.credentials=null,$scope.error=response.message})},$scope.resetUserPassword=function(){$scope.success=$scope.error=null,$http.post("/auth/reset/"+$stateParams.token,$scope.passwordDetails).success(function(response){$scope.passwordDetails=null,Authentication.user=response,$location.path("/password/reset/success")}).error(function(response){$scope.error=response.message})}}]),angular.module("users").controller("SettingsController",["$scope","$http","$location","Users","Authentication",function($scope,$http,$location,Users,Authentication){$scope.user=Authentication.user,$scope.user||$location.path("/"),$scope.hasConnectedAdditionalSocialAccounts=function(){for(var i in $scope.user.additionalProvidersData)return!0;return!1},$scope.isConnectedSocialAccount=function(provider){return $scope.user.provider===provider||$scope.user.additionalProvidersData&&$scope.user.additionalProvidersData[provider]},$scope.removeUserSocialAccount=function(provider){$scope.success=$scope.error=null,$http.delete("/users/accounts",{params:{provider:provider}}).success(function(response){$scope.success=!0,$scope.user=Authentication.user=response}).error(function(response){$scope.error=response.message})},$scope.updateUserProfile=function(isValid){if(isValid){$scope.success=$scope.error=null;var user=new Users($scope.user);user.$update(function(response){$scope.success=!0,Authentication.user=response},function(response){$scope.error=response.data.message})}else $scope.submitted=!0},$scope.changeUserPassword=function(){$scope.success=$scope.error=null,$http.post("/users/password",$scope.passwordDetails).success(function(){$scope.success=!0,$scope.passwordDetails=null}).error(function(response){$scope.error=response.message})}}]),angular.module("users").factory("Authentication",[function(){var _this=this;return _this._data={user:window.user},_this._data}]),angular.module("users").factory("Users",["$resource",function($resource){return $resource("users",{},{update:{method:"PUT"}})}]); \ No newline at end of file +"use strict";var ApplicationConfiguration=function(){var applicationModuleName="mean",applicationModuleVendorDependencies=["ngResource","ngAnimate","ui.router","ui.bootstrap","ui.utils"],registerModule=function(moduleName,dependencies){angular.module(moduleName,dependencies||[]),angular.module(applicationModuleName).requires.push(moduleName)};return{applicationModuleName:applicationModuleName,applicationModuleVendorDependencies:applicationModuleVendorDependencies,registerModule:registerModule}}();angular.module(ApplicationConfiguration.applicationModuleName,ApplicationConfiguration.applicationModuleVendorDependencies),angular.module(ApplicationConfiguration.applicationModuleName).config(["$locationProvider",function($locationProvider){$locationProvider.hashPrefix("!")}]),angular.element(document).ready(function(){"#_=_"===window.location.hash&&(window.location.hash="#!"),angular.bootstrap(document,[ApplicationConfiguration.applicationModuleName])}),ApplicationConfiguration.registerModule("articles"),ApplicationConfiguration.registerModule("core"),ApplicationConfiguration.registerModule("qas"),ApplicationConfiguration.registerModule("takers"),ApplicationConfiguration.registerModule("users"),angular.module("articles").run(["Menus",function(Menus){Menus.addMenuItem("topbar","Articles","articles","dropdown","/articles(/create)?"),Menus.addSubMenuItem("topbar","articles","List Articles","articles"),Menus.addSubMenuItem("topbar","articles","New Article","articles/create")}]),angular.module("articles").config(["$stateProvider",function($stateProvider){$stateProvider.state("listArticles",{url:"/articles",templateUrl:"modules/articles/views/list-articles.client.view.html"}).state("createArticle",{url:"/articles/create",templateUrl:"modules/articles/views/create-article.client.view.html"}).state("viewArticle",{url:"/articles/:articleId",templateUrl:"modules/articles/views/view-article.client.view.html"}).state("editArticle",{url:"/articles/:articleId/edit",templateUrl:"modules/articles/views/edit-article.client.view.html"})}]),angular.module("articles").controller("ArticlesController",["$scope","$stateParams","$location","Authentication","Articles",function($scope,$stateParams,$location,Authentication,Articles){$scope.authentication=Authentication,$scope.create=function(){var article=new Articles({title:this.title,content:this.content});article.$save(function(response){$location.path("articles/"+response._id),$scope.title="",$scope.content=""},function(errorResponse){$scope.error=errorResponse.data.message})},$scope.remove=function(article){if(article){article.$remove();for(var i in $scope.articles)$scope.articles[i]===article&&$scope.articles.splice(i,1)}else $scope.article.$remove(function(){$location.path("articles")})},$scope.update=function(){var article=$scope.article;article.$update(function(){$location.path("articles/"+article._id)},function(errorResponse){$scope.error=errorResponse.data.message})},$scope.find=function(){$scope.articles=Articles.query()},$scope.findOne=function(){$scope.article=Articles.get({articleId:$stateParams.articleId})}}]),angular.module("articles").factory("Articles",["$resource",function($resource){return $resource("articles/:articleId",{articleId:"@_id"},{update:{method:"PUT"}})}]),angular.module("core").config(["$stateProvider","$urlRouterProvider",function($stateProvider,$urlRouterProvider){$urlRouterProvider.otherwise("/"),$stateProvider.state("home",{url:"/",templateUrl:"modules/core/views/home.client.view.html"})}]),angular.module("core").controller("HeaderController",["$scope","Authentication","Menus",function($scope,Authentication,Menus){$scope.authentication=Authentication,$scope.isCollapsed=!1,$scope.menu=Menus.getMenu("topbar"),$scope.toggleCollapsibleMenu=function(){$scope.isCollapsed=!$scope.isCollapsed},$scope.$on("$stateChangeSuccess",function(){$scope.isCollapsed=!1})}]),angular.module("core").controller("HomeController",["$scope","Authentication",function($scope,Authentication){$scope.authentication=Authentication}]),angular.module("core").service("Menus",[function(){this.defaultRoles=["*"],this.menus={};var shouldRender=function(user){if(!user)return this.isPublic;if(~this.roles.indexOf("*"))return!0;for(var userRoleIndex in user.roles)for(var roleIndex in this.roles)if(this.roles[roleIndex]===user.roles[userRoleIndex])return!0;return!1};this.validateMenuExistance=function(menuId){if(menuId&&menuId.length){if(this.menus[menuId])return!0;throw new Error("Menu does not exists")}throw new Error("MenuId was not provided")},this.getMenu=function(menuId){return this.validateMenuExistance(menuId),this.menus[menuId]},this.addMenu=function(menuId,isPublic,roles){return this.menus[menuId]={isPublic:isPublic||!1,roles:roles||this.defaultRoles,items:[],shouldRender:shouldRender},this.menus[menuId]},this.removeMenu=function(menuId){this.validateMenuExistance(menuId),delete this.menus[menuId]},this.addMenuItem=function(menuId,menuItemTitle,menuItemURL,menuItemType,menuItemUIRoute,isPublic,roles,position){return this.validateMenuExistance(menuId),this.menus[menuId].items.push({title:menuItemTitle,link:menuItemURL,menuItemType:menuItemType||"item",menuItemClass:menuItemType,uiRoute:menuItemUIRoute||"/"+menuItemURL,isPublic:null===isPublic||"undefined"==typeof isPublic?this.menus[menuId].isPublic:isPublic,roles:null===roles||"undefined"==typeof roles?this.menus[menuId].roles:roles,position:position||0,items:[],shouldRender:shouldRender}),this.menus[menuId]},this.addSubMenuItem=function(menuId,rootMenuItemURL,menuItemTitle,menuItemURL,menuItemUIRoute,isPublic,roles,position){this.validateMenuExistance(menuId);for(var itemIndex in this.menus[menuId].items)this.menus[menuId].items[itemIndex].link===rootMenuItemURL&&this.menus[menuId].items[itemIndex].items.push({title:menuItemTitle,link:menuItemURL,uiRoute:menuItemUIRoute||"/"+menuItemURL,isPublic:null===isPublic||"undefined"==typeof isPublic?this.menus[menuId].items[itemIndex].isPublic:isPublic,roles:null===roles||"undefined"==typeof roles?this.menus[menuId].items[itemIndex].roles:roles,position:position||0,shouldRender:shouldRender});return this.menus[menuId]},this.removeMenuItem=function(menuId,menuItemURL){this.validateMenuExistance(menuId);for(var itemIndex in this.menus[menuId].items)this.menus[menuId].items[itemIndex].link===menuItemURL&&this.menus[menuId].items.splice(itemIndex,1);return this.menus[menuId]},this.removeSubMenuItem=function(menuId,submenuItemURL){this.validateMenuExistance(menuId);for(var itemIndex in this.menus[menuId].items)for(var subitemIndex in this.menus[menuId].items[itemIndex].items)this.menus[menuId].items[itemIndex].items[subitemIndex].link===submenuItemURL&&this.menus[menuId].items[itemIndex].items.splice(subitemIndex,1);return this.menus[menuId]},this.addMenu("topbar")}]),angular.module("qas").run(["Menus",function(Menus){Menus.addMenuItem("topbar","Qas","qas","dropdown","/qas(/create)?"),Menus.addSubMenuItem("topbar","qas","List Qas","qas"),Menus.addSubMenuItem("topbar","qas","New Qa","qas/create")}]),angular.module("qas").config(["$stateProvider",function($stateProvider){$stateProvider.state("listQas",{url:"/qas",templateUrl:"modules/qas/views/list-qas.client.view.html"}).state("createQa",{url:"/qas/create",templateUrl:"modules/qas/views/create-qa.client.view.html"}).state("viewQa",{url:"/qas/:qaId",templateUrl:"modules/qas/views/view-qa.client.view.html"}).state("editQa",{url:"/qas/:qaId/edit",templateUrl:"modules/qas/views/edit-qa.client.view.html"})}]),angular.module("qas").controller("QasController",["$scope","$stateParams","$location","Authentication","Qas","CalculatorService","MathService","qasInitService",function($scope,$stateParams,$location,Authentication,Qas,CalculatorService,MathService,qasInitService){$scope.authentication=Authentication,$scope.doit=CalculatorService.cce(77),$scope.typeDropdown=qasInitService.typeDropdown(),$scope.difficultyDropdown=qasInitService.difficultyDropdown(),$scope.qa=qasInitService.init(),$scope.create=function(){var qa=new Qas({question:this.question,imageURL:this.imageURL,choices:[{text:this.text,selectedAnswer:!1},{text:this.text,selectedAnswer:this.correctAnswer},{text:this.text,selectedAnswer:this.correctAnswer}],hint:this.hint,type:this.td,difficulty:this.difficulty,hintOn:this.hintOn,timeOn:this.timeOn,fifty50On:this.fifty50On,randomizeQuestionsOn:this.randomizeQuestionsOn,randomizeAnswersOn:this.randomizeAnswersOn});if(qa.choices=$scope.qa.choices,qa.difficulty=$scope.dd.label,qa.type=$scope.td.label,qa.question.length>0){var choiceCount=0;console.log("qa if",qa);for(var i=0,ln=qa.choices.length;ln>i;i++){var choice=qa.choices[i].text;console.log("choice",choice," i",i),choice.length>0&&choiceCount++}choiceCount>1||alert("You must have at least two choices")}else alert("You must have a question");console.log("qaFinal",qa),qa.$save(function(response){$location.path("qas/"+response._id)})},$scope.addChoice=function(){console.log("qa add",$scope.qa),$scope.qa.choices.push({text:this.text,selectedAnswer:!1})},$scope.remove=function(qa){if(qa){qa.$remove();for(var i in $scope.qas)$scope.qas[i]===qa&&$scope.qas.splice(i,1)}else $scope.qa.$remove(function(){$location.path("qas")})},$scope.update=function(){var qa=$scope.qa;console.log("From update",qa),qa.updated||(qa.updated=[]),qa.updated.push((new Date).getTime()),qa.$update(function(){$location.path("qas/"+qa._id)})},$scope.find=function(){Qas.query(function(qas){$scope.qas=qas})},$scope.findOne=function(){Qas.get({qaId:$stateParams.qaId},function(qa){$scope.qa=qa})},$scope.deleteChoice=function(ev){var ss=ev.target.innerText.toString()-1;console.log(ss);var qa=$scope.qa;console.log(qa),$scope.qa.choices.splice(ss,1)}}]),angular.module("qas").factory("Qas",["$resource",function($resource){return $resource("qas/:qaId",{qaId:"@_id"},{update:{method:"PUT"}})}]),angular.module("qas").service("MathService",[function(){this.add=function(a,b){return a+b},this.subtract=function(a,b){return a-b},this.multiply=function(a,b){return a*b},this.divide=function(a,b){return a/b}}]).service("CalculatorService",function(MathService){this.square=function(a){return MathService.multiply(a,a)},this.cce=function(a){return a+1e3*a},this.cube=function(a){return MathService.multiply(a,MathService.multiply(a,a))}}),angular.module("qas").service("qasInitService",[function(){this.typeDropdown=function(){return[{label:"FIB",value:1},{label:"TF",value:2},{label:"MC",value:3},{label:"Matching",value:4}]},this.difficultyDropdown=function(){return[{label:"Easy",value:1},{label:"Medium",value:2},{label:"Hard",value:3},{label:"Impossible",value:4}]},this.init=function(){return{choices:[{text:"",correctAnswer:!1},{text:"",correctAnswer:!1},{text:"",correctAnswer:!1}]}}}]),angular.module("takers").run(["Menus",function(Menus){Menus.addMenuItem("topbar","Takers","takers","dropdown","/takers(/create)?"),Menus.addSubMenuItem("topbar","takers","List Takers","takers"),Menus.addSubMenuItem("topbar","takers","New Taker","takers/create"),Menus.addSubMenuItem("topbar","takers","Take","takers/")}]),angular.module("takers").config(["$stateProvider",function($stateProvider){$stateProvider.state("listTakers",{url:"/takers",templateUrl:"modules/takers/views/take.html"}).state("createTaker",{url:"/takers/create",templateUrl:"modules/takers/views/create-taker.client.view.html"}).state("viewTaker",{url:"/takers/:takerId",templateUrl:"modules/takers/views/view-taker.client.view.html"}).state("editTaker",{url:"/takers/:takerId/edit",templateUrl:"modules/takers/views/edit-taker.client.view.html"})}]),angular.module("takers").controller("TakersController",["$scope","$stateParams","$location","Authentication","Articles",function($scope,$stateParams,$location,Authentication,Qas,Takers){$scope.authentication=Authentication;var taker=new Takers;$scope.taker=new Takers({quizNumber:"0",trialNumber:"0",trialOptions:"",results:[{questionViewed:!1,questionAnswered:!1,questionNumber:"",answer:[{selection:"0",answer:"0"}]}]}),console.log("From ScopeTaker",$scope.taker),$scope.find=function(){Qas.query(function(qas){$scope.qas=qas})},console.log("From ScopeTaker",$scope.qas),$scope.next=function(){$scope.questionIndex++,taker.questionViewed=!0,taker.$save(function(response){$location.path("takers/"+response._id)}),console.log("next",$scope.questionIndex)},$scope.prev=function(){$scope.questionIndex--,console.log("prev",$scope.questionIndex)},$scope.answerToggled=function(){console.log("toggledtaker",taker);for(var i=0,ln=taker.qa[$scope.questionIndex].choices.length;ln>i;i++)taker.results[$scope.questionIndex].answer.isSelected[i]=$scope.choice[i].selectedAnswer,taker.updated.push((new Date).getTime());console.log("From taker 1",taker),taker.$save(function(response){$location.path("takers/"+response._id)}),console.log(taker)},$scope.find=function(){Qas.query(function(qas){taker.qa=qas,$scope.taker=taker,console.log("From ScopeTaker1",qas[0].questionNumber,taker.qa[0].question,$scope.qas,taker)}),$scope.questionIndex=0},$scope.findOne=function(){takers.get({qasId:$stateParams.qasId},function(qas){$scope.taker=qas})}}]),angular.module("takers").factory("Takers",["$resource",function($resource){return $resource("takers/:takerId",{takerId:"@_id"},{update:{method:"PUT"}})}]),angular.module("users").config(["$httpProvider",function($httpProvider){$httpProvider.interceptors.push(["$q","$location","Authentication",function($q,$location,Authentication){return{responseError:function(rejection){switch(rejection.status){case 401:Authentication.user=null,$location.path("signin");break;case 403:}return $q.reject(rejection)}}}])}]),angular.module("users").config(["$stateProvider",function($stateProvider){$stateProvider.state("profile",{url:"/settings/profile",templateUrl:"modules/users/views/settings/edit-profile.client.view.html"}).state("password",{url:"/settings/password",templateUrl:"modules/users/views/settings/change-password.client.view.html"}).state("accounts",{url:"/settings/accounts",templateUrl:"modules/users/views/settings/social-accounts.client.view.html"}).state("signup",{url:"/signup",templateUrl:"modules/users/views/authentication/signup.client.view.html"}).state("signin",{url:"/signin",templateUrl:"modules/users/views/authentication/signin.client.view.html"}).state("forgot",{url:"/password/forgot",templateUrl:"modules/users/views/password/forgot-password.client.view.html"}).state("reset-invlaid",{url:"/password/reset/invalid",templateUrl:"modules/users/views/password/reset-password-invalid.client.view.html"}).state("reset-success",{url:"/password/reset/success",templateUrl:"modules/users/views/password/reset-password-success.client.view.html"}).state("reset",{url:"/password/reset/:token",templateUrl:"modules/users/views/password/reset-password.client.view.html"})}]),angular.module("users").controller("AuthenticationController",["$scope","$http","$location","Authentication",function($scope,$http,$location,Authentication){$scope.authentication=Authentication,$scope.authentication.user&&$location.path("/"),$scope.signup=function(){$http.post("/auth/signup",$scope.credentials).success(function(response){$scope.authentication.user=response,$location.path("/")}).error(function(response){$scope.error=response.message})},$scope.signin=function(){$http.post("/auth/signin",$scope.credentials).success(function(response){$scope.authentication.user=response,$location.path("/")}).error(function(response){$scope.error=response.message})}}]),angular.module("users").controller("PasswordController",["$scope","$stateParams","$http","$location","Authentication",function($scope,$stateParams,$http,$location,Authentication){$scope.authentication=Authentication,$scope.authentication.user&&$location.path("/"),$scope.askForPasswordReset=function(){$scope.success=$scope.error=null,$http.post("/auth/forgot",$scope.credentials).success(function(response){$scope.credentials=null,$scope.success=response.message}).error(function(response){$scope.credentials=null,$scope.error=response.message})},$scope.resetUserPassword=function(){$scope.success=$scope.error=null,$http.post("/auth/reset/"+$stateParams.token,$scope.passwordDetails).success(function(response){$scope.passwordDetails=null,Authentication.user=response,$location.path("/password/reset/success")}).error(function(response){$scope.error=response.message})}}]),angular.module("users").controller("SettingsController",["$scope","$http","$location","Users","Authentication",function($scope,$http,$location,Users,Authentication){$scope.user=Authentication.user,$scope.user||$location.path("/"),$scope.hasConnectedAdditionalSocialAccounts=function(){for(var i in $scope.user.additionalProvidersData)return!0;return!1},$scope.isConnectedSocialAccount=function(provider){return $scope.user.provider===provider||$scope.user.additionalProvidersData&&$scope.user.additionalProvidersData[provider]},$scope.removeUserSocialAccount=function(provider){$scope.success=$scope.error=null,$http.delete("/users/accounts",{params:{provider:provider}}).success(function(response){$scope.success=!0,$scope.user=Authentication.user=response}).error(function(response){$scope.error=response.message})},$scope.updateUserProfile=function(isValid){if(isValid){$scope.success=$scope.error=null;var user=new Users($scope.user);user.$update(function(response){$scope.success=!0,Authentication.user=response},function(response){$scope.error=response.data.message})}else $scope.submitted=!0},$scope.changeUserPassword=function(){$scope.success=$scope.error=null,$http.post("/users/password",$scope.passwordDetails).success(function(){$scope.success=!0,$scope.passwordDetails=null}).error(function(response){$scope.error=response.message})}}]),angular.module("users").factory("Authentication",[function(){var _this=this;return _this._data={user:window.user},_this._data}]),angular.module("users").factory("Users",["$resource",function($resource){return $resource("users",{},{update:{method:"PUT"}})}]); \ No newline at end of file diff --git a/public/modules/qas/controllers/qas.client.controller.js b/public/modules/qas/controllers/qas.client.controller.js index fc2081812c..0c70ac2963 100644 --- a/public/modules/qas/controllers/qas.client.controller.js +++ b/public/modules/qas/controllers/qas.client.controller.js @@ -1,9 +1,9 @@ 'use strict'; // Qas controller... -angular.module('qas').controller('QasController', ['$scope', '$stateParams', '$location', 'Authentication', - 'Qas','CalculatorService','MathService','qasInitService', - function ($scope, $stateParams, $location, Authentication, Qas, CalculatorService, MathService, qasInitService ) { +angular.module('qas').controller('QasController', ['$scope','$modal', '$stateParams', '$location', 'Authentication', + 'Qas','Quizzes', 'CalculatorService', 'MathService', 'qasInitService', + function ($scope, $modal, $stateParams, $location, Authentication, Qas,Quizzes, CalculatorService, MathService, qasInitService) { $scope.authentication = Authentication; //Test of Calculator and Math Service $scope.doit = CalculatorService.cce(77); @@ -11,21 +11,22 @@ angular.module('qas').controller('QasController', ['$scope', '$stateParams', '$l // Initialize Dropdown labels $scope.typeDropdown = qasInitService.typeDropdown(); $scope.difficultyDropdown = qasInitService.difficultyDropdown(); - //$scope.dd = difficultyDropdown[i]; - // $scope.td = typeDropdown[i]; $scope.qa = qasInitService.init(); - //var qa = $scope.qa; - // Create and validate qa entries + // Create and validate qa entries $scope.create = function () { - var qa = new Qas({ + var qa = new Qas({ question: this.question, imageURL: this.imageURL, - choices: [{ - text: this.text, selectedAnswer: false //doesn't work - }, {text: this.text, selectedAnswer: this.correctAnswer //doesn't work - }, {text: this.text, selectedAnswer: this.correctAnswer //doesn't work - }], + choices: [ + { + text: this.text, selectedAnswer: false //doesn't work + }, + {text: this.text, selectedAnswer: this.correctAnswer //doesn't work + }, + {text: this.text, selectedAnswer: this.correctAnswer //doesn't work + } + ], hint: this.hint, //doesn't work type: this.td, //doesn't work difficulty: this.difficulty, @@ -36,12 +37,12 @@ angular.module('qas').controller('QasController', ['$scope', '$stateParams', '$l randomizeAnswersOn: this.randomizeAnswersOn }); +// Hack to load these variables. Not handled above??? qa.choices = $scope.qa.choices; qa.difficulty = $scope.dd.label; qa.type = $scope.td.label; - console.log('From qa 1',qa);console.log('From $qa 1',$scope.qa); + // Check that question was entered - console.log('qa.question.length', qa.question.length); if (qa.question.length > 0) { var choiceCount = 0; //Loop through choices to get at least two @@ -63,9 +64,10 @@ angular.module('qas').controller('QasController', ['$scope', '$stateParams', '$l } else { alert('You must have a question'); } - console.log('qaFinal',qa); - qa.$save(function(response) { - $location.path('qas/' + response._id)}); + console.log('qaFinal', qa); + qa.$save(function (response) { + $location.path('qas/' + response._id) + }); }; // Method to add an additional choice option @@ -116,6 +118,11 @@ angular.module('qas').controller('QasController', ['$scope', '$stateParams', '$l $scope.qa = qa; }); }; + $scope.getQuizzes = function() { + Quizzes.query(function(quizzes){ + $scope.quizzes = quizzes; + }); + }; $scope.deleteChoice = function (ev) { var ss = ev.target.innerText.toString() - 1; console.log(ss); @@ -123,6 +130,41 @@ angular.module('qas').controller('QasController', ['$scope', '$stateParams', '$l console.log(qa); $scope.qa.choices.splice(ss, 1); }; + $scope.saveToOtherQuiz = function(){ + var modalInstance = $modal.open({ + templateUrl: 'modules/qas/views/modal-qa.client.html', + controller: ModalInstanceCtrl, + resolve: { + items: function () { + return $scope.items; + } + } + }); + + modalInstance.result.then(function (selectedItem) { + $scope.selected = selectedItem; + + }, function () { + console.log('Modal dismissed at: ' + new Date()); + }); + }; + var ModalInstanceCtrl = function ($scope, $modalInstance, Quizzes) { + + Quizzes.query(function(quizzes){ + $scope.quizzes = quizzes; + }); + $scope.selected = { + // quizzes: $scope.quizzes[0] + }; + + $scope.ok = function () { + $modalInstance.close($scope.selected.item); + }; + + $scope.cancel = function () { + $modalInstance.dismiss('cancel'); + }; + }; } ]); diff --git a/public/modules/qas/services/qas.client.service2.js b/public/modules/qas/services/qas.client.service2.js index 023b016d61..ce1ea174ac 100644 --- a/public/modules/qas/services/qas.client.service2.js +++ b/public/modules/qas/services/qas.client.service2.js @@ -5,65 +5,57 @@ //Qas service used to communicate Qas REST endpoints angular.module('qas') - .service('qasInitService', [ function() { + .service('qasInitService', [ function () { - this.typeDropdown = function() { return [ - { - 'label': 'FIB', - 'value': 1 - }, - { - 'label': 'TF', - 'value': 2 - }, - { - 'label': 'MC', - 'value': 3 - }, - { - 'label': 'Matching', - 'value': 4 - } - ]; + this.typeDropdown = function () { + return [ + { + 'label': 'FIB', + 'value': 1 + }, + { + 'label': 'TF', + 'value': 2 + }, + { + 'label': 'MC', + 'value': 3 + }, + { + 'label': 'Matching', + 'value': 4 + } + ]; + }; + this.difficultyDropdown = function () { + return [ + { + 'label': 'Easy', + 'value': 1 + }, + { + 'label': 'Medium', + 'value': 2 + }, + { + 'label': 'Hard', + 'value': 3 + }, + { + 'label': 'Impossible', + 'value': 4 + } + ]; }; - this.difficultyDropdown = function() { return [ - { - 'label': 'Easy', - 'value': 1 - }, - { - 'label': 'Medium', - 'value': 2 - }, - { - 'label': 'Hard', - 'value': 3 - }, - { - 'label': 'Impossible', - 'value': 4 - } - ]; - }; - this.init = function(){return ({ - question: 'dffdfdfdf', - questionNumber: "", - imageURL:"", - choices: [ - { text: '', correctAnswer: false }, - { text: '', correctAnswer: false}, - { text: '', correctAnswer: false} - ], - content: '', - hint:"", - difficulty:"", - type:"", - hintOn:false, - timeOn:false, - fifty50On:false, - randomizeQuestionsOn:false, - randomizeAnswersOn:false - });} + this.init = function () { + return ({ + choices: [ + { text: '', correctAnswer: false }, + { text: '', correctAnswer: false}, + { text: '', correctAnswer: false} + ] + }); + } }]); diff --git a/public/modules/qas/views/create-qa.client.view.html b/public/modules/qas/views/create-qa.client.view.html index 859d569be7..4a55d6833e 100644 --- a/public/modules/qas/views/create-qa.client.view.html +++ b/public/modules/qas/views/create-qa.client.view.html @@ -6,6 +6,9 @@

New Big QA

{{td.label}} + {{td.label}}
diff --git a/public/modules/qas/views/edit-qa.client.view.html b/public/modules/qas/views/edit-qa.client.view.html index a8e1077b04..fc62088a1f 100644 --- a/public/modules/qas/views/edit-qa.client.view.html +++ b/public/modules/qas/views/edit-qa.client.view.html @@ -89,7 +89,11 @@

Edit Qa

+ +
+ +
diff --git a/public/modules/qas/views/modal-qa.client.html b/public/modules/qas/views/modal-qa.client.html new file mode 100644 index 0000000000..b2adb5c5d7 --- /dev/null +++ b/public/modules/qas/views/modal-qa.client.html @@ -0,0 +1,14 @@ + +
+ + Selected: {{ selected.quiz }} +
+
+ + +
+ diff --git a/public/modules/qas/views/view-qa.client.view.html b/public/modules/qas/views/view-qa.client.view.html index 6865bf5907..7414cce405 100644 --- a/public/modules/qas/views/view-qa.client.view.html +++ b/public/modules/qas/views/view-qa.client.view.html @@ -1,6 +1,6 @@
-

{{qa.question}}

+

{{quiz.name}}

@@ -12,13 +12,19 @@

{{qa.question}}

- Updated on {{qa.created | date:'mediumDate'}} by {{qa.user.displayName}} + Updated on:{{qa.created | date:'mediumDate'}} by {{qa.user.displayName}} + + + + Quiz name and Id {{quiz.name}} - {{quiz.Id}}

{{qa.question}}

{{choices.text}}
+
{{qa.user.displayName}}
+
{{quiz.name}}

\ No newline at end of file diff --git a/public/modules/was/services/was.client.service2.js b/public/modules/was/services/was.client.service2.js deleted file mode 100644 index f9dc9d95c1..0000000000 --- a/public/modules/was/services/was.client.service2.js +++ /dev/null @@ -1,69 +0,0 @@ -/** - * Created by EbyC on 8/24/2014. - */ -'use strict'; - -//Qas service used to communicate Was REST endpoints -angular.module('was') - .service('wasInitService', [ function() { - - this.typeDropdown = function() { return [ - { - 'label': 'FIB', - 'value': 1 - }, - { - 'label': 'TF', - 'value': 2 - }, - { - 'label': 'MC', - 'value': 3 - }, - { - 'label': 'Matching', - 'value': 4 - } - ]; - }; - this.difficultyDropdown = function() { return [ - { - 'label': 'Easy', - 'value': 1 - }, - { - 'label': 'Medium', - 'value': 2 - }, - { - 'label': 'Hard', - 'value': 3 - }, - { - 'label': 'Impossible', - 'value': 4 - } - ]; - }; - - this.init = function(wa){return ({ - question: '', - questionNumber: "", - imageURL:"", - choices: [ - { text: '', correctAnswer: false }, - { text: '', correctAnswer: false}, - { text: '', correctAnswer: false} - ], - content: '', - hint:"", - difficulty:"", - type:"", - hintOn:false, - timeOn:false, - fifty50On:false, - randomizeQuestionsOn:false, - randomizeAnswersOn:false - });} - - }]); diff --git a/public/modules/was/views/create-wa.client.view.html b/public/modules/was/views/create-wa.client.view.html deleted file mode 100644 index 948a5ff495..0000000000 --- a/public/modules/was/views/create-wa.client.view.html +++ /dev/null @@ -1,98 +0,0 @@ -
-
-

New Big WA

-
-
-
-
-
- - -
- -
- - - -
- - - -
- -
-
- -
-
- -
-
-
-
-
-
-
-
- - -
- -
- -
-
- -
-
- -
- -
-
- -
- - -
-
- - -
-
- - -
- Allow Hint - Timed - 50/50 - Randomize Answers - Randomize Questions - - - - -
-
- -
-
From 1ecca6f94b849d20eb4b16c30db6c3424b77e60b Mon Sep 17 00:00:00 2001 From: cliffeby Date: Tue, 23 Sep 2014 23:21:07 -0400 Subject: [PATCH 14/27] adding modal and quiz --- app/models/quiz.server.model.js | 44 +++++ .../quizzes/config/quizzes.client.config.js | 11 ++ .../quizzes/config/quizzes.client.routes.js | 25 +++ .../controllers/quizzes.client.controller.js | 72 ++++++++ .../modules/quizzes/quizzes.client.module.js | 4 + .../services/quizzes.client.service.js | 13 ++ .../tests/quizzes.client.controller.test.js | 163 ++++++++++++++++++ .../views/create-quiz.client.view.html | 28 +++ .../quizzes/views/edit-quiz.client.view.html | 27 +++ .../views/list-quizzes.client.view.html | 19 ++ .../quizzes/views/view-quiz.client.view.html | 21 +++ 11 files changed, 427 insertions(+) create mode 100644 app/models/quiz.server.model.js create mode 100644 public/modules/quizzes/config/quizzes.client.config.js create mode 100644 public/modules/quizzes/config/quizzes.client.routes.js create mode 100644 public/modules/quizzes/controllers/quizzes.client.controller.js create mode 100644 public/modules/quizzes/quizzes.client.module.js create mode 100644 public/modules/quizzes/services/quizzes.client.service.js create mode 100644 public/modules/quizzes/tests/quizzes.client.controller.test.js create mode 100644 public/modules/quizzes/views/create-quiz.client.view.html create mode 100644 public/modules/quizzes/views/edit-quiz.client.view.html create mode 100644 public/modules/quizzes/views/list-quizzes.client.view.html create mode 100644 public/modules/quizzes/views/view-quiz.client.view.html diff --git a/app/models/quiz.server.model.js b/app/models/quiz.server.model.js new file mode 100644 index 0000000000..b6c1f2c21d --- /dev/null +++ b/app/models/quiz.server.model.js @@ -0,0 +1,44 @@ +'use strict'; + +/** + * Module dependencies. + */ +var mongoose = require('mongoose'), + Schema = mongoose.Schema; + +/** + * Quiz Schema + */ +var QuizSchema = new Schema({ + name: { + type: String, + default: '', + required: 'Please fill Quiz name', + trim: true + }, + created: { + type: Date, + default: Date.now + }, + user: { + type: Schema.ObjectId, + ref: 'User' + }, + quizNumber: { + type: String, + default: '', + trim: true + }, + category: { + type: String, + default: '', + trim: true + }, + keyWords: { + type: String, + default: '', + trim: true + } +}); + +mongoose.model('Quiz', QuizSchema); \ No newline at end of file diff --git a/public/modules/quizzes/config/quizzes.client.config.js b/public/modules/quizzes/config/quizzes.client.config.js new file mode 100644 index 0000000000..7de326c95e --- /dev/null +++ b/public/modules/quizzes/config/quizzes.client.config.js @@ -0,0 +1,11 @@ +'use strict'; + +// Configuring the Articles module +angular.module('quizzes').run(['Menus', + function(Menus) { + // Set top bar menu items + Menus.addMenuItem('topbar', 'Quizzes', 'quizzes', 'dropdown', '/quizzes(/create)?'); + Menus.addSubMenuItem('topbar', 'quizzes', 'List Quizzes', 'quizzes'); + Menus.addSubMenuItem('topbar', 'quizzes', 'New Quiz', 'quizzes/create'); + } +]); \ No newline at end of file diff --git a/public/modules/quizzes/config/quizzes.client.routes.js b/public/modules/quizzes/config/quizzes.client.routes.js new file mode 100644 index 0000000000..ffeb5e3ef9 --- /dev/null +++ b/public/modules/quizzes/config/quizzes.client.routes.js @@ -0,0 +1,25 @@ +'use strict'; + +//Setting up route +angular.module('quizzes').config(['$stateProvider', + function($stateProvider) { + // Quizzes state routing + $stateProvider. + state('listQuizzes', { + url: '/quizzes', + templateUrl: 'modules/quizzes/views/list-quizzes.client.view.html' + }). + state('createQuiz', { + url: '/quizzes/create', + templateUrl: 'modules/quizzes/views/create-quiz.client.view.html' + }). + state('viewQuiz', { + url: '/quizzes/:quizId', + templateUrl: 'modules/quizzes/views/view-quiz.client.view.html' + }). + state('editQuiz', { + url: '/quizzes/:quizId/edit', + templateUrl: 'modules/quizzes/views/edit-quiz.client.view.html' + }); + } +]); \ No newline at end of file diff --git a/public/modules/quizzes/controllers/quizzes.client.controller.js b/public/modules/quizzes/controllers/quizzes.client.controller.js new file mode 100644 index 0000000000..1dcae6c5aa --- /dev/null +++ b/public/modules/quizzes/controllers/quizzes.client.controller.js @@ -0,0 +1,72 @@ +'use strict'; + +// Quizzes controller +angular.module('quizzes').controller('QuizzesController', ['$scope', '$stateParams', '$location', + 'Authentication', 'Quizzes','qasInitService', + function($scope, $stateParams, $location, Authentication, Quizzes, qasInitService ) { + $scope.authentication = Authentication; + + // Create new Quiz + $scope.create = function() { + // Create new Quiz object + var quiz = new Quizzes ({ + name: this.name, + category: this.category, + keyword: this.keyword, + number: this.number + }); + + // Redirect after save + quiz.$save(function(response) { + $location.path('quizzes/' + response._id); + }, function(errorResponse) { + $scope.error = errorResponse.data.message; + }); + console.log(quiz); + // Clear form fields + this.name = ''; + this.keyword = ''; + this.category = ''; + this.number = 999; + }; + + // Remove existing Quiz + $scope.remove = function( quiz ) { + if ( quiz ) { quiz.$remove(); + + for (var i in $scope.quizzes ) { + if ($scope.quizzes [i] === quiz ) { + $scope.quizzes.splice(i, 1); + } + } + } else { + $scope.quiz.$remove(function() { + $location.path('quizzes'); + }); + } + }; + + // Update existing Quiz + $scope.update = function() { + var quiz = $scope.quiz ; + + quiz.$update(function() { + $location.path('quizzes/' + quiz._id); + }, function(errorResponse) { + $scope.error = errorResponse.data.message; + }); + }; + + // Find a list of Quizzes + $scope.find = function() { + $scope.quizzes = Quizzes.query(); + }; + + // Find existing Quiz + $scope.findOne = function() { + $scope.quiz = Quizzes.get({ + quizId: $stateParams.quizId + }); + }; + } +]); \ No newline at end of file diff --git a/public/modules/quizzes/quizzes.client.module.js b/public/modules/quizzes/quizzes.client.module.js new file mode 100644 index 0000000000..81eedf8b04 --- /dev/null +++ b/public/modules/quizzes/quizzes.client.module.js @@ -0,0 +1,4 @@ +'use strict'; + +// Use applicaion configuration module to register a new module +ApplicationConfiguration.registerModule('quizzes'); \ No newline at end of file diff --git a/public/modules/quizzes/services/quizzes.client.service.js b/public/modules/quizzes/services/quizzes.client.service.js new file mode 100644 index 0000000000..3740607cd7 --- /dev/null +++ b/public/modules/quizzes/services/quizzes.client.service.js @@ -0,0 +1,13 @@ +'use strict'; + +//Quizzes service used to communicate Quizzes REST endpoints +angular.module('quizzes').factory('Quizzes', ['$resource', + function($resource) { + return $resource('quizzes/:quizId', { quizId: '@_id' + }, { + update: { + method: 'PUT' + } + }); + } +]); \ No newline at end of file diff --git a/public/modules/quizzes/tests/quizzes.client.controller.test.js b/public/modules/quizzes/tests/quizzes.client.controller.test.js new file mode 100644 index 0000000000..268001b8c5 --- /dev/null +++ b/public/modules/quizzes/tests/quizzes.client.controller.test.js @@ -0,0 +1,163 @@ +'use strict'; + +(function() { + // Quizzes Controller Spec + describe('Quizzes Controller Tests', function() { + // Initialize global variables + var QuizzesController, + scope, + $httpBackend, + $stateParams, + $location; + + // The $resource service augments the response object with methods for updating and deleting the resource. + // If we were to use the standard toEqual matcher, our tests would fail because the test values would not match + // the responses exactly. To solve the problem, we define a new toEqualData Jasmine matcher. + // When the toEqualData matcher compares two objects, it takes only object properties into + // account and ignores methods. + beforeEach(function() { + jasmine.addMatchers({ + toEqualData: function(util, customEqualityTesters) { + return { + compare: function(actual, expected) { + return { + pass: angular.equals(actual, expected) + }; + } + }; + } + }); + }); + + // Then we can start by loading the main application module + beforeEach(module(ApplicationConfiguration.applicationModuleName)); + + // The injector ignores leading and trailing underscores here (i.e. _$httpBackend_). + // This allows us to inject a service but then attach it to a variable + // with the same name as the service. + beforeEach(inject(function($controller, $rootScope, _$location_, _$stateParams_, _$httpBackend_) { + // Set a new global scope + scope = $rootScope.$new(); + + // Point global variables to injected services + $stateParams = _$stateParams_; + $httpBackend = _$httpBackend_; + $location = _$location_; + + // Initialize the Quizzes controller. + QuizzesController = $controller('QuizzesController', { + $scope: scope + }); + })); + + it('$scope.find() should create an array with at least one Quiz object fetched from XHR', inject(function(Quizzes) { + // Create sample Quiz using the Quizzes service + var sampleQuiz = new Quizzes({ + name: 'New Quiz' + }); + + // Create a sample Quizzes array that includes the new Quiz + var sampleQuizzes = [sampleQuiz]; + + // Set GET response + $httpBackend.expectGET('quizzes').respond(sampleQuizzes); + + // Run controller functionality + scope.find(); + $httpBackend.flush(); + + // Test scope value + expect(scope.quizzes).toEqualData(sampleQuizzes); + })); + + it('$scope.findOne() should create an array with one Quiz object fetched from XHR using a quizId URL parameter', inject(function(Quizzes) { + // Define a sample Quiz object + var sampleQuiz = new Quizzes({ + name: 'New Quiz' + }); + + // Set the URL parameter + $stateParams.quizId = '525a8422f6d0f87f0e407a33'; + + // Set GET response + $httpBackend.expectGET(/quizzes\/([0-9a-fA-F]{24})$/).respond(sampleQuiz); + + // Run controller functionality + scope.findOne(); + $httpBackend.flush(); + + // Test scope value + expect(scope.quiz).toEqualData(sampleQuiz); + })); + + it('$scope.create() with valid form data should send a POST request with the form input values and then locate to new object URL', inject(function(Quizzes) { + // Create a sample Quiz object + var sampleQuizPostData = new Quizzes({ + name: 'New Quiz' + }); + + // Create a sample Quiz response + var sampleQuizResponse = new Quizzes({ + _id: '525cf20451979dea2c000001', + name: 'New Quiz' + }); + + // Fixture mock form input values + scope.name = 'New Quiz'; + + // Set POST response + $httpBackend.expectPOST('quizzes', sampleQuizPostData).respond(sampleQuizResponse); + + // Run controller functionality + scope.create(); + $httpBackend.flush(); + + // Test form inputs are reset + expect(scope.name).toEqual(''); + + // Test URL redirection after the Quiz was created + expect($location.path()).toBe('/quizzes/' + sampleQuizResponse._id); + })); + + it('$scope.update() should update a valid Quiz', inject(function(Quizzes) { + // Define a sample Quiz put data + var sampleQuizPutData = new Quizzes({ + _id: '525cf20451979dea2c000001', + name: 'New Quiz' + }); + + // Mock Quiz in scope + scope.quiz = sampleQuizPutData; + + // Set PUT response + $httpBackend.expectPUT(/quizzes\/([0-9a-fA-F]{24})$/).respond(); + + // Run controller functionality + scope.update(); + $httpBackend.flush(); + + // Test URL location to new object + expect($location.path()).toBe('/quizzes/' + sampleQuizPutData._id); + })); + + it('$scope.remove() should send a DELETE request with a valid quizId and remove the Quiz from the scope', inject(function(Quizzes) { + // Create new Quiz object + var sampleQuiz = new Quizzes({ + _id: '525a8422f6d0f87f0e407a33' + }); + + // Create new Quizzes array and include the Quiz + scope.quizzes = [sampleQuiz]; + + // Set expected DELETE response + $httpBackend.expectDELETE(/quizzes\/([0-9a-fA-F]{24})$/).respond(204); + + // Run controller functionality + scope.remove(sampleQuiz); + $httpBackend.flush(); + + // Test array after successful delete + expect(scope.quizzes.length).toBe(0); + })); + }); +}()); \ No newline at end of file diff --git a/public/modules/quizzes/views/create-quiz.client.view.html b/public/modules/quizzes/views/create-quiz.client.view.html new file mode 100644 index 0000000000..6056d1a1a9 --- /dev/null +++ b/public/modules/quizzes/views/create-quiz.client.view.html @@ -0,0 +1,28 @@ +
+
+

New Quiz

+
+
+
+
+
+ +
+ + + + + + +
+
+
+ +
+
+ +
+
+
+
+
\ No newline at end of file diff --git a/public/modules/quizzes/views/edit-quiz.client.view.html b/public/modules/quizzes/views/edit-quiz.client.view.html new file mode 100644 index 0000000000..763fc0b3af --- /dev/null +++ b/public/modules/quizzes/views/edit-quiz.client.view.html @@ -0,0 +1,27 @@ +
+
+

Edit Quiz

+
+
+
+
+
+ +
+ + + + + +
+
+
+ +
+
+ +
+
+
+
+
\ No newline at end of file diff --git a/public/modules/quizzes/views/list-quizzes.client.view.html b/public/modules/quizzes/views/list-quizzes.client.view.html new file mode 100644 index 0000000000..9ae90d2c87 --- /dev/null +++ b/public/modules/quizzes/views/list-quizzes.client.view.html @@ -0,0 +1,19 @@ +
+
+

Quizzes

+
+
+ + + Posted on + + by + + +

+ +
+
+ No Quizzes yet, why don't you create one? +
+
\ No newline at end of file diff --git a/public/modules/quizzes/views/view-quiz.client.view.html b/public/modules/quizzes/views/view-quiz.client.view.html new file mode 100644 index 0000000000..1696a97c67 --- /dev/null +++ b/public/modules/quizzes/views/view-quiz.client.view.html @@ -0,0 +1,21 @@ +
+
+

+
+
+ + + + + + +
+ + + Posted on + + by + + + +
\ No newline at end of file From 3659012dfe7f8f0e060d5a37221f52b6141c6bd0 Mon Sep 17 00:00:00 2001 From: cliffeby Date: Wed, 24 Sep 2014 14:38:18 -0400 Subject: [PATCH 15/27] Add list quizzes to menu --- public/modules/qas/config/qas.client.config.js | 1 + public/modules/qas/config/qas.client.routes.js | 6 +++++- .../qas/views/listquizzes-qas.client.view.html | 18 ++++++++++++++++++ 3 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 public/modules/qas/views/listquizzes-qas.client.view.html diff --git a/public/modules/qas/config/qas.client.config.js b/public/modules/qas/config/qas.client.config.js index 3d90803b75..e065b7d531 100644 --- a/public/modules/qas/config/qas.client.config.js +++ b/public/modules/qas/config/qas.client.config.js @@ -7,5 +7,6 @@ angular.module('qas').run(['Menus', Menus.addMenuItem('topbar', 'Qas', 'qas', 'dropdown', '/qas(/create)?'); Menus.addSubMenuItem('topbar', 'qas', 'List Qas', 'qas'); Menus.addSubMenuItem('topbar', 'qas', 'New Qa', 'qas/create'); + Menus.addSubMenuItem('topbar', 'qas', 'List Quizzes', 'listquizzes'); } ]); \ No newline at end of file diff --git a/public/modules/qas/config/qas.client.routes.js b/public/modules/qas/config/qas.client.routes.js index 36457fb828..07bbd22149 100644 --- a/public/modules/qas/config/qas.client.routes.js +++ b/public/modules/qas/config/qas.client.routes.js @@ -20,6 +20,10 @@ angular.module('qas').config(['$stateProvider', state('editQa', { url: '/qas/:qaId/edit', templateUrl: 'modules/qas/views/edit-qa.client.view.html' - }); + }). + state('listQasQuizzes', { + url: '/listQuizzes', + templateUrl: 'modules/qas/views/listquizzes-qa.client.view.html' + }); } ]); \ No newline at end of file diff --git a/public/modules/qas/views/listquizzes-qas.client.view.html b/public/modules/qas/views/listquizzes-qas.client.view.html new file mode 100644 index 0000000000..fc47a1afbb --- /dev/null +++ b/public/modules/qas/views/listquizzes-qas.client.view.html @@ -0,0 +1,18 @@ +
+
+

LIST Quiz

+ +
+
+ + {{quiz.created | date:'medium'}} / {{quiz.user.displayName}} +

{{quiz.question}}

+ + + + +
+
+ No quiz yet, why don't you create one? +
+
\ No newline at end of file From 29b15d05ac65b997ab7923010ccde8147acee4aa Mon Sep 17 00:00:00 2001 From: cliffeby Date: Sun, 28 Sep 2014 23:08:32 -0400 Subject: [PATCH 16/27] adding modal and quiz --- app/routes/qas.server.routes.js | 7 ++++++- public/modules/qas/config/qas.client.config.js | 2 +- public/modules/qas/config/qas.client.routes.js | 4 ++-- public/modules/qas/controllers/qas.client.controller.js | 5 +++++ public/modules/qas/views/listquizzes-qas.client.view.html | 4 ++-- 5 files changed, 16 insertions(+), 6 deletions(-) diff --git a/app/routes/qas.server.routes.js b/app/routes/qas.server.routes.js index 68f1d840c5..6ed1afc02b 100644 --- a/app/routes/qas.server.routes.js +++ b/app/routes/qas.server.routes.js @@ -2,9 +2,14 @@ //Routes... module.exports = function(app) { var users = require('../../app/controllers/users'); - var qas = require('../../app/controllers/qas'); + var qas = require('../../app/controllers/qas'); + var quizzes = require('../../app/controllers/qas'); // Qas Routes + app.route('/listQasQuizzes') + .get(quizzes.list) + .post(users.requiresLogin, quizzes.create); + app.route('/qas') .get(qas.list) .post(users.requiresLogin, qas.create); diff --git a/public/modules/qas/config/qas.client.config.js b/public/modules/qas/config/qas.client.config.js index e065b7d531..bfb1dc4731 100644 --- a/public/modules/qas/config/qas.client.config.js +++ b/public/modules/qas/config/qas.client.config.js @@ -7,6 +7,6 @@ angular.module('qas').run(['Menus', Menus.addMenuItem('topbar', 'Qas', 'qas', 'dropdown', '/qas(/create)?'); Menus.addSubMenuItem('topbar', 'qas', 'List Qas', 'qas'); Menus.addSubMenuItem('topbar', 'qas', 'New Qa', 'qas/create'); - Menus.addSubMenuItem('topbar', 'qas', 'List Quizzes', 'listquizzes'); + Menus.addSubMenuItem('topbar', 'qas', 'List Quizzes', 'listQasQuizzes'); } ]); \ No newline at end of file diff --git a/public/modules/qas/config/qas.client.routes.js b/public/modules/qas/config/qas.client.routes.js index 07bbd22149..c67c7a20dd 100644 --- a/public/modules/qas/config/qas.client.routes.js +++ b/public/modules/qas/config/qas.client.routes.js @@ -22,8 +22,8 @@ angular.module('qas').config(['$stateProvider', templateUrl: 'modules/qas/views/edit-qa.client.view.html' }). state('listQasQuizzes', { - url: '/listQuizzes', - templateUrl: 'modules/qas/views/listquizzes-qa.client.view.html' + url: '/listQasQuizzes', + templateUrl: 'modules/qas/views/listquizzes-qas.client.view.html' }); } ]); \ No newline at end of file diff --git a/public/modules/qas/controllers/qas.client.controller.js b/public/modules/qas/controllers/qas.client.controller.js index 0c70ac2963..5912611f97 100644 --- a/public/modules/qas/controllers/qas.client.controller.js +++ b/public/modules/qas/controllers/qas.client.controller.js @@ -111,6 +111,11 @@ angular.module('qas').controller('QasController', ['$scope','$modal', '$statePar }); }; + $scope.findQuizzes = function () { + Quizzes.query(function (quizzes) { + $scope.quizzes = quizzes; + }); + }; $scope.findOne = function () { Qas.get({ qaId: $stateParams.qaId diff --git a/public/modules/qas/views/listquizzes-qas.client.view.html b/public/modules/qas/views/listquizzes-qas.client.view.html index fc47a1afbb..2fbb623b5d 100644 --- a/public/modules/qas/views/listquizzes-qas.client.view.html +++ b/public/modules/qas/views/listquizzes-qas.client.view.html @@ -1,4 +1,4 @@ -
+

LIST Quiz

@@ -6,7 +6,7 @@

LIST Quiz

{{quiz.created | date:'medium'}} / {{quiz.user.displayName}} -

{{quiz.question}}

+

{{quiz.name}}

 From 6ae63b6c19e6ba6f75852bb9338d1b0236ec6166 Mon Sep 17 00:00:00 2001 From: cliffeby Date: Mon, 29 Sep 2014 20:36:23 -0400 Subject: [PATCH 17/27] use mongolab rather than local mongodb --- .../qas/controllers/qas.client.controller.js | 6 +---- server.js | 23 +++++++++++++++---- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/public/modules/qas/controllers/qas.client.controller.js b/public/modules/qas/controllers/qas.client.controller.js index 5912611f97..7632977260 100644 --- a/public/modules/qas/controllers/qas.client.controller.js +++ b/public/modules/qas/controllers/qas.client.controller.js @@ -123,11 +123,7 @@ angular.module('qas').controller('QasController', ['$scope','$modal', '$statePar $scope.qa = qa; }); }; - $scope.getQuizzes = function() { - Quizzes.query(function(quizzes){ - $scope.quizzes = quizzes; - }); - }; + $scope.deleteChoice = function (ev) { var ss = ev.target.innerText.toString() - 1; console.log(ss); diff --git a/server.js b/server.js index e13d20d72b..a389dfeb14 100755 --- a/server.js +++ b/server.js @@ -12,12 +12,25 @@ var init = require('./config/init')(), */ // Bootstrap db connection -var db = mongoose.connect(config.db, function(err) { - if (err) { - console.error('\x1b[31m', 'Could not connect to MongoDB!'); - console.log(err); - } +var db = mongoose.connect('mongodb://cce:cce@ds039860.mongolab.com:39860/meandb', function(err) { + if (err) { + console.error('\x1b[31m', 'Could not connect to MongoLabDB!'); + console.log(err); + } }); +//var db = mongoose.connect('mongodb://cliffeby:stanx2@ds039860.mongolab.com:39860/meandb', function(err) { +// if (err) { +// console.error('\x1b[31m', 'Could not connect to MongoLabDB!'); +// console.log(err); +// } +//}); +//var db = mongoose.connect(config.db, function(err) { +// if (err) { +// console.error('\x1b[31m', 'Could not connect to MongoDB!'); +// console.log(err); +// } +//}); + // Init the express application var app = require('./config/express')(db); From b4d1080eac6e312945c38463d6745e3f1076a47c Mon Sep 17 00:00:00 2001 From: Cliff Eby Date: Thu, 9 Oct 2014 16:55:58 -0400 Subject: [PATCH 18/27] Add quiz selection --- README.md | 7 + app/controllers/quizzes.server.controller.js | 129 ++++++++++++++++++ app/routes/quizzes.server.routes.js | 24 ++++ .../qas/controllers/qas.client.controller.js | 77 ++++++----- .../qas/views/create-qa.client.view.html | 1 + .../controllers/quizzes.client.controller.js | 8 +- server.js | 24 ++-- 7 files changed, 219 insertions(+), 51 deletions(-) create mode 100644 app/controllers/quizzes.server.controller.js create mode 100644 app/routes/quizzes.server.routes.js diff --git a/README.md b/README.md index dec285d123..cedfc00cf6 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,13 @@ Before you begin we recommend you read about the basic building blocks that asse * AngularJS - Angular's [Official Website](http://angularjs.org/) is a great starting point. You can also use [Thinkster Popular Guide](http://www.thinkster.io/), and the [Egghead Videos](https://egghead.io/). * Node.js - Start by going through [Node.js Official Website](http://nodejs.org/) and this [StackOverflow Thread](http://stackoverflow.com/questions/2353818/how-do-i-get-started-with-node-js), which should get you going with the Node.js platform in no time. +## Use MongoLabs +// var db = mongoose.connect('mongodb://cliffeby:cce1234@ds039860.mongolab.com:39860/meandb', function(err) { +// if (err) { +// console.error('\x1b[31m', 'Could not connect to MongoLabsDB!'); +// console.log(err); +// } +// }); ## Prerequisites Make sure you have installed all these prerequisites on your development machine. diff --git a/app/controllers/quizzes.server.controller.js b/app/controllers/quizzes.server.controller.js new file mode 100644 index 0000000000..1925645ada --- /dev/null +++ b/app/controllers/quizzes.server.controller.js @@ -0,0 +1,129 @@ +'use strict'; + +/** + * Module dependencies... + */ +var mongoose = require('mongoose'), + Quiz = mongoose.model('Quiz'), + _ = require('lodash'); + +/** + * Get the error message from error object + */ +var getErrorMessage = function(err) { + var message = ''; + + if (err.code) { + switch (err.code) { + case 11000: + case 11001: + message = 'Quiz already exists'; + break; + default: + message = 'Something went wrong'; + } + } else { + for (var errName in err.errors) { + if (err.errors[errName].message) message = err.errors[errName].message; + } + } + + return message; +}; + +/** + * Create a Quiz + */ +exports.create = function(req, res) { + var quiz = new Quiz(req.body); + quiz.user = req.user; + + quiz.save(function(err) { + if (err) { + return res.send(400, { + message: getErrorMessage(err) + }); + } else { + res.jsonp(quiz); + } + }); +}; + +/** + * * + * Show the current Quiz + */ +exports.read = function(req, res) { + res.jsonp(req.quiz); +}; + +/** + * Update a Quiz + */ +exports.update = function(req, res) { + var quiz = req.quiz ; + + quiz = _.extend(quiz , req.body); + + quiz.save(function(err) { + if (err) { + return res.send(400, { + message: getErrorMessage(err) + }); + } else { + res.jsonp(quiz); + } + }); +}; + +/** + * Delete an Quiz + */ +exports.delete = function(req, res) { + var quiz = req.quiz ; + + quiz.remove(function(err) { + if (err) { + return res.send(400, { + message: getErrorMessage(err) + }); + } else { + res.jsonp(quiz); + } + }); +}; + +/** + * List of quizzes + */ +exports.list = function(req, res) { Quiz.find().sort('-created').populate('user', 'displayName').exec(function(err, quizzes) { + if (err) { + return res.send(400, { + message: getErrorMessage(err) + }); + } else { + res.jsonp(quizzes); + } + }); +}; + +/** + * Quiz middleware + */ +exports.quizByID = function(req, res, next, id) { Quiz.findById(id).populate('user', 'displayName').exec(function(err, quiz) { + if (err) return next(err); + if (! quiz) return next(new Error('Failed to load Quiz ' + id)); + req.quiz = quiz ; + next(); + }); +}; + +/** + * Quiz authorization middleware + */ +exports.hasAuthorization = function(req, res, next) { + if (req.quiz.user.id !== req.user.id) { + return res.send(403, 'User is not authorized'); + } + next(); +}; \ No newline at end of file diff --git a/app/routes/quizzes.server.routes.js b/app/routes/quizzes.server.routes.js new file mode 100644 index 0000000000..3cb01cef46 --- /dev/null +++ b/app/routes/quizzes.server.routes.js @@ -0,0 +1,24 @@ +'use strict'; +//Routes... +module.exports = function(app) { + var users = require('../../app/controllers/users'); + var qas = require('../../app/controllers/qas'); + var quizzes = require('../../app/controllers/quizzes'); + + // Qas Routes +// app.route('/listQasQuizzes') +// .get(quizzes.list) +// .post(users.requiresLogin, quizzes.create); + + app.route('/quizzes') + .get(quizzes.list) + .post(users.requiresLogin, quizzes.create); + + app.route('/quizzes/:quizId') + .get(quizzes.read) + .put(users.requiresLogin, quizzes.hasAuthorization, quizzes.update) + .delete(users.requiresLogin, quizzes.hasAuthorization, qas.delete); + + // Finish by binding the Qa middleware + app.param('quizId', quizzes.quizByID); +}; \ No newline at end of file diff --git a/public/modules/qas/controllers/qas.client.controller.js b/public/modules/qas/controllers/qas.client.controller.js index 7632977260..a352e9efd2 100644 --- a/public/modules/qas/controllers/qas.client.controller.js +++ b/public/modules/qas/controllers/qas.client.controller.js @@ -123,6 +123,13 @@ angular.module('qas').controller('QasController', ['$scope','$modal', '$statePar $scope.qa = qa; }); }; + $scope.findQuizzesOne = function () { + Quizzes.get({ + quizId: $stateParams.quizId + }, function (quiz) { + $scope.quiz = quiz; + }); + }; $scope.deleteChoice = function (ev) { var ss = ev.target.innerText.toString() - 1; @@ -131,41 +138,41 @@ angular.module('qas').controller('QasController', ['$scope','$modal', '$statePar console.log(qa); $scope.qa.choices.splice(ss, 1); }; - $scope.saveToOtherQuiz = function(){ - var modalInstance = $modal.open({ - templateUrl: 'modules/qas/views/modal-qa.client.html', - controller: ModalInstanceCtrl, - resolve: { - items: function () { - return $scope.items; - } - } - }); - - modalInstance.result.then(function (selectedItem) { - $scope.selected = selectedItem; - - }, function () { - console.log('Modal dismissed at: ' + new Date()); - }); - }; - var ModalInstanceCtrl = function ($scope, $modalInstance, Quizzes) { - - Quizzes.query(function(quizzes){ - $scope.quizzes = quizzes; - }); - $scope.selected = { - // quizzes: $scope.quizzes[0] - }; - - $scope.ok = function () { - $modalInstance.close($scope.selected.item); - }; - - $scope.cancel = function () { - $modalInstance.dismiss('cancel'); - }; - }; +// $scope.saveToOtherQuiz = function(){ +// var modalInstance = $modal.open({ +// templateUrl: 'modules/qas/views/modal-qa.client.html', +// controller: ModalInstanceCtrl, +// resolve: { +// items: function () { +// return $scope.items; +// } +// } +// }); +// +// modalInstance.result.then(function (selectedItem) { +// $scope.selected = selectedItem; +// +// }, function () { +// console.log('Modal dismissed at: ' + new Date()); +// }); +// }; +// var ModalInstanceCtrl = function ($scope, $modalInstance, Quizzes) { +// +// Quizzes.query(function(quizzes){ +// $scope.quizzes = quizzes; +// }); +// $scope.selected = { +// // quizzes: $scope.quizzes[0] +// }; +// +// $scope.ok = function () { +// $modalInstance.close($scope.selected.item); +// }; +// +// $scope.cancel = function () { +// $modalInstance.dismiss('cancel'); +// }; +// }; } ]); diff --git a/public/modules/qas/views/create-qa.client.view.html b/public/modules/qas/views/create-qa.client.view.html index 4a55d6833e..a19ff09cda 100644 --- a/public/modules/qas/views/create-qa.client.view.html +++ b/public/modules/qas/views/create-qa.client.view.html @@ -1,6 +1,7 @@

New Big QA

+

+
\ No newline at end of file +
diff --git a/public/modules/quizzes/views/create-quiz.client.view.html b/public/modules/quizzes/views/create-quiz.client.view.html index 6056d1a1a9..4b54d62ef5 100644 --- a/public/modules/quizzes/views/create-quiz.client.view.html +++ b/public/modules/quizzes/views/create-quiz.client.view.html @@ -9,9 +9,11 @@

New Quiz

- +

+

+

diff --git a/server.js b/server.js index a389dfeb14..558e991abc 100755 --- a/server.js +++ b/server.js @@ -12,24 +12,24 @@ var init = require('./config/init')(), */ // Bootstrap db connection -var db = mongoose.connect('mongodb://cce:cce@ds039860.mongolab.com:39860/meandb', function(err) { - if (err) { - console.error('\x1b[31m', 'Could not connect to MongoLabDB!'); - console.log(err); - } -}); -//var db = mongoose.connect('mongodb://cliffeby:stanx2@ds039860.mongolab.com:39860/meandb', function(err) { +//var db = mongoose.connect('mongodb://cce:cce@ds039860.mongolab.com:39860/meandb', function(err) { // if (err) { // console.error('\x1b[31m', 'Could not connect to MongoLabDB!'); // console.log(err); // } //}); -//var db = mongoose.connect(config.db, function(err) { -// if (err) { -// console.error('\x1b[31m', 'Could not connect to MongoDB!'); -// console.log(err); -// } +//var db = mongoose.connect('mongodb://cliffeby:stanx2@ds039860.mongolab.com:39860/meandb', function(err) { +// if (err) { +// console.error('\x1b[31m', 'Could not connect to MongoLabDB!'); +// console.log(err); +// } //}); +var db = mongoose.connect(config.db, function(err) { + if (err) { + console.error('\x1b[31m', 'Could not connect to MongoDB!'); + console.log(err); + } +}); // Init the express application From 35e4b8564abdf75101e7f80f4cff8f7c7f511e65 Mon Sep 17 00:00:00 2001 From: Cliff Eby Date: Thu, 30 Oct 2014 13:20:12 -0400 Subject: [PATCH 23/27] Add quiz selection V1 --- app/models/qa.server.model.js | 4 +-- app/routes/quizzes.server.routes.js | 2 +- app/routes/takers.server.routes.js | 10 +++++-- .../qas/controllers/qas.client.controller.js | 17 +++++++---- .../qas/services/qas.client.service2.js | 9 ++++++ .../qas/views/create-qa.client.view.html | 5 ++-- .../qas/views/list-qas.client.view.html | 5 ++-- .../takers/config/takers.client.config.js | 3 +- .../takers/config/takers.client.routes.js | 7 ++++- .../controllers/takers.client.controller.js | 28 +++++++++---------- .../views/listquizzes-takers.client.view.html | 20 +++++++++++++ 11 files changed, 79 insertions(+), 31 deletions(-) create mode 100644 public/modules/takers/views/listquizzes-takers.client.view.html diff --git a/app/models/qa.server.model.js b/app/models/qa.server.model.js index bc3df12e27..bd6f3c328b 100644 --- a/app/models/qa.server.model.js +++ b/app/models/qa.server.model.js @@ -82,7 +82,7 @@ var QaSchema = new Schema({ }, qaQuizId: { - type: Number, + type: String, default: 999 }, qaQuizName: { @@ -116,4 +116,4 @@ QaSchema.statics = { }; //console.log(QaSchema); mongoose.model('Qa', QaSchema); -mongoose.model('Answer', AnswerSchema); \ No newline at end of file +mongoose.model('Answer', AnswerSchema); diff --git a/app/routes/quizzes.server.routes.js b/app/routes/quizzes.server.routes.js index 3cb01cef46..4ad5563a34 100644 --- a/app/routes/quizzes.server.routes.js +++ b/app/routes/quizzes.server.routes.js @@ -21,4 +21,4 @@ module.exports = function(app) { // Finish by binding the Qa middleware app.param('quizId', quizzes.quizByID); -}; \ No newline at end of file +}; diff --git a/app/routes/takers.server.routes.js b/app/routes/takers.server.routes.js index 1b26b0deed..918c323921 100644 --- a/app/routes/takers.server.routes.js +++ b/app/routes/takers.server.routes.js @@ -3,12 +3,16 @@ module.exports = function(app) { var users = require('../../app/controllers/users'); var takers = require('../../app/controllers/takers'); - + var qas = require('../../app/controllers/takers'); + var quizzes = require('../../app/controllers/takers'); // Takers Routes + + //app.route('/listTakersQuizzes') + // .get(quizzes.list) + // .post(users.requiresLogin, quizzes.create); app.route('/takers') .get(takers.list) .post(users.requiresLogin, takers.create); - app.route('/takers/:takerId') .get(takers.read) .put(users.requiresLogin, takers.hasAuthorization, takers.update) @@ -16,4 +20,4 @@ module.exports = function(app) { // Finish by binding the Taker middleware app.param('takerId', takers.takerByID); -}; \ No newline at end of file +}; diff --git a/public/modules/qas/controllers/qas.client.controller.js b/public/modules/qas/controllers/qas.client.controller.js index 657d79a452..15129f2ae7 100644 --- a/public/modules/qas/controllers/qas.client.controller.js +++ b/public/modules/qas/controllers/qas.client.controller.js @@ -12,8 +12,11 @@ angular.module('qas').controller('QasController', ['$scope','$rootScope','$modal $scope.typeDropdown = qasInitService.typeDropdown(); $scope.difficultyDropdown = qasInitService.difficultyDropdown(); + var selectedQuiz = qasInitService.getSelectedQuiz(); + //console.log('call to qasServiceQuiz',fixedQuiz); + $scope.qa = qasInitService.init(); - // Create and validate qa entries +// Create and validate qa entries $scope.create = function () { var qa = new Qas({ question: this.question, @@ -29,19 +32,21 @@ angular.module('qas').controller('QasController', ['$scope','$rootScope','$modal ], hint: this.hint, type: this.td, //doesn't work - difficulty: this.difficulty, + difficulty: this.difficulty, //doesn't work hintOn: this.hintOn, timeOn: this.timeOn, fifty50On: this.fifty50On, randomizeQuestionsOn: this.randomizeQuestionsOn, - randomizeAnswersOn: this.randomizeAnswersOn + randomizeAnswersOn: this.randomizeAnswersOn, + questionNumber: this.questionNumber }); // Hack to load these variables. Not handled above??? qa.choices = $scope.qa.choices; qa.difficulty = $scope.dd.label; qa.type = $scope.td.label; - + qa.qaQuizName = selectedQuiz[0]; + qa.qaQuizId = selectedQuiz[1]; // Check that question was entered if (qa.question.length > 0) { var choiceCount = 0; @@ -124,7 +129,9 @@ angular.module('qas').controller('QasController', ['$scope','$rootScope','$modal }); }; $scope.findQuizzesOne = function (quiz) { - $scope.quiz = quiz; + // $scope.quiz = quiz; + var data = [quiz.name,quiz._id]; + qasInitService.saveSelectedQuiz(data); $rootScope.qname = quiz.name; diff --git a/public/modules/qas/services/qas.client.service2.js b/public/modules/qas/services/qas.client.service2.js index ce1ea174ac..44e7264bc9 100644 --- a/public/modules/qas/services/qas.client.service2.js +++ b/public/modules/qas/services/qas.client.service2.js @@ -6,6 +6,15 @@ //Qas service used to communicate Qas REST endpoints angular.module('qas') .service('qasInitService', [ function () { + var data; + this.saveSelectedQuiz = function (item){ + data = item + //console.log("service data",data); + return; + }; + this.getSelectedQuiz = function () { + return data; + }; this.typeDropdown = function () { return [ diff --git a/public/modules/qas/views/create-qa.client.view.html b/public/modules/qas/views/create-qa.client.view.html index cd652682ba..c893f47963 100644 --- a/public/modules/qas/views/create-qa.client.view.html +++ b/public/modules/qas/views/create-qa.client.view.html @@ -1,7 +1,8 @@ -
+

New Big QA

{{qname}}

+

{{fixedQuiz}}

50/50 Randomize Answers Randomize Questions -
diff --git a/public/modules/qas/views/list-qas.client.view.html b/public/modules/qas/views/list-qas.client.view.html index 91a3018377..d67573fe96 100644 --- a/public/modules/qas/views/list-qas.client.view.html +++ b/public/modules/qas/views/list-qas.client.view.html @@ -5,7 +5,8 @@

LIST

- {{qa.created | date:'medium'}} / {{qa.user.displayName}} + {{qa.created | date:'medium'}} / {{qa.user.displayName}} + / {{qa.qaQuizName}} / {{qa.qaQuizId}}

{{qa.question}}

{{qa.choices.length}}

@@ -17,4 +18,4 @@

{{qa.question}}

No qas yet, why don't you create one?
-
\ No newline at end of file +
diff --git a/public/modules/takers/config/takers.client.config.js b/public/modules/takers/config/takers.client.config.js index b5e11106e4..41f1396998 100644 --- a/public/modules/takers/config/takers.client.config.js +++ b/public/modules/takers/config/takers.client.config.js @@ -8,5 +8,6 @@ angular.module('takers').run(['Menus', Menus.addSubMenuItem('topbar', 'takers', 'List Takers', 'takers'); Menus.addSubMenuItem('topbar', 'takers', 'New Taker', 'takers/create'); Menus.addSubMenuItem('topbar', 'takers', 'Take', 'takers/'); + Menus.addSubMenuItem('topbar', 'takers', 'List Quizzes', 'listTakersQuizzes'); } -]); \ No newline at end of file +]); diff --git a/public/modules/takers/config/takers.client.routes.js b/public/modules/takers/config/takers.client.routes.js index 17d3d1be1d..e8636aed44 100644 --- a/public/modules/takers/config/takers.client.routes.js +++ b/public/modules/takers/config/takers.client.routes.js @@ -22,6 +22,11 @@ angular.module('takers').config(['$stateProvider', state('editTaker', { url: '/takers/:takerId/edit', templateUrl: 'modules/takers/views/edit-taker.client.view.html' + }). + state('listTakersQuizzes', { + url: '/listTakersQuizzes', + templateUrl: 'modules/takers/views/listquizzes-takers.client.view.html' }); + } -]); \ No newline at end of file +]); diff --git a/public/modules/takers/controllers/takers.client.controller.js b/public/modules/takers/controllers/takers.client.controller.js index d79dcab075..5d88bf70bf 100644 --- a/public/modules/takers/controllers/takers.client.controller.js +++ b/public/modules/takers/controllers/takers.client.controller.js @@ -1,20 +1,20 @@ 'use strict'; -angular.module('takers').controller('TakersController', ['$scope', '$stateParams', '$location', 'Authentication', 'Articles', - function($scope, $stateParams, $location, Authentication, Qas, Takers) { +angular.module('takers').controller('TakersController', ['$scope', '$stateParams', '$location', 'Authentication', 'Qas', 'Quizzes','Takers', + function($scope, $stateParams, $location, Authentication, Qas, Quizzes, Takers) { $scope.authentication = Authentication; // Takers controller logic - var taker = new Takers(); - //taker.qa = qas; - $scope.taker = new Takers({ - quizNumber: '0', - trialNumber: '0', - trialOptions: '', - results: [{ questionViewed: false, questionAnswered: false, - questionNumber: '', answer:[{selection: '0', answer: '0'}]}] - - }); - console.log('From ScopeTaker', $scope.taker); + //var taker = new Takers(); + ////taker.qa = qas; + //$scope.taker = new Takers({ + // quizNumber: '0', + // trialNumber: '0', + // trialOptions: '', + // results: [{ questionViewed: false, questionAnswered: false, + // questionNumber: '', answer:[{selection: '0', answer: '0'}]}] + // + //}); + //console.log('From ScopeTaker', $scope.taker); $scope.find = function() { Qas.query(function(qas) { $scope.qas = qas; @@ -82,4 +82,4 @@ angular.module('takers').controller('TakersController', ['$scope', '$stateParams } -]); \ No newline at end of file +]); diff --git a/public/modules/takers/views/listquizzes-takers.client.view.html b/public/modules/takers/views/listquizzes-takers.client.view.html new file mode 100644 index 0000000000..2146f2da93 --- /dev/null +++ b/public/modules/takers/views/listquizzes-takers.client.view.html @@ -0,0 +1,20 @@ +
+
+

LIST Quiz

+ +
+
+ +
+ {{quiz.created | date:'medium'}} / {{quiz.user.displayName}} +

{{quiz.name}} + select

+ + +
+ +
+
+ No quiz yet, why don't you create one? +
+
From c987c52b56c4f6ee4dd8d70751c5e4986bff4c26 Mon Sep 17 00:00:00 2001 From: Cliff Eby Date: Sat, 1 Nov 2014 18:57:02 -0400 Subject: [PATCH 24/27] Add quiz selection V1 --- app/models/quiz.server.model.js | 6 +- .../quizzes/config/quizzes.client.config.js | 5 +- .../controllers/quizzes.client.controller.js | 12 ++- .../quizzes/views/edit-quiz.client.view.html | 17 +++- .../takers/config/takers.client.routes.js | 13 ++- .../controllers/takers.client.controller.js | 95 +++++++++---------- .../views/listquizzes-takers.client.view.html | 2 +- public/modules/takers/views/take.html | 9 +- 8 files changed, 89 insertions(+), 70 deletions(-) diff --git a/app/models/quiz.server.model.js b/app/models/quiz.server.model.js index b6c1f2c21d..96c16fc932 100644 --- a/app/models/quiz.server.model.js +++ b/app/models/quiz.server.model.js @@ -38,7 +38,9 @@ var QuizSchema = new Schema({ type: String, default: '', trim: true - } + }, + qa: [{ type: Schema.ObjectId, ref: 'Qa' }] + }); -mongoose.model('Quiz', QuizSchema); \ No newline at end of file +mongoose.model('Quiz', QuizSchema); diff --git a/public/modules/quizzes/config/quizzes.client.config.js b/public/modules/quizzes/config/quizzes.client.config.js index 7de326c95e..4985dce2c1 100644 --- a/public/modules/quizzes/config/quizzes.client.config.js +++ b/public/modules/quizzes/config/quizzes.client.config.js @@ -6,6 +6,7 @@ angular.module('quizzes').run(['Menus', // Set top bar menu items Menus.addMenuItem('topbar', 'Quizzes', 'quizzes', 'dropdown', '/quizzes(/create)?'); Menus.addSubMenuItem('topbar', 'quizzes', 'List Quizzes', 'quizzes'); - Menus.addSubMenuItem('topbar', 'quizzes', 'New Quiz', 'quizzes/create'); + Menus.addSubMenuItem('topbar', 'quizzes', 'Create Quiz', 'quizzes/create'); + } -]); \ No newline at end of file +]); diff --git a/public/modules/quizzes/controllers/quizzes.client.controller.js b/public/modules/quizzes/controllers/quizzes.client.controller.js index f2e765efd4..2b58dc47ac 100644 --- a/public/modules/quizzes/controllers/quizzes.client.controller.js +++ b/public/modules/quizzes/controllers/quizzes.client.controller.js @@ -2,8 +2,8 @@ // Quizzes controller angular.module('quizzes').controller('QuizzesController', ['$scope', '$stateParams', '$location', - 'Authentication', 'Quizzes','qasInitService', - function($scope, $stateParams, $location, Authentication, Quizzes, qasInitService ) { + 'Authentication', 'Quizzes','Qas','qasInitService', + function($scope, $stateParams, $location, Authentication, Quizzes,Qas, qasInitService ) { $scope.authentication = Authentication; // Create new Quiz @@ -62,11 +62,17 @@ angular.module('quizzes').controller('QuizzesController', ['$scope', '$statePara $scope.quizzes = Quizzes.query(); }; + // Find a list of Questions + $scope.findQas = function() { + $scope.qas = Qas.query(); + }; + // Find existing Quiz $scope.findOne = function() { $scope.quiz = Quizzes.get({ quizId: $stateParams.quizId }); + console.log("from quuizctrl.findOne",$scope.quiz); }; } -]); \ No newline at end of file +]); diff --git a/public/modules/quizzes/views/edit-quiz.client.view.html b/public/modules/quizzes/views/edit-quiz.client.view.html index 763fc0b3af..a827ec13dd 100644 --- a/public/modules/quizzes/views/edit-quiz.client.view.html +++ b/public/modules/quizzes/views/edit-quiz.client.view.html @@ -1,6 +1,6 @@
-

Edit Quiz

+

Edit Quiz1

@@ -18,10 +18,21 @@

Edit Quiz

-
+
+
+ + + Posted on + + by + + +

+ +
-
\ No newline at end of file +
diff --git a/public/modules/takers/config/takers.client.routes.js b/public/modules/takers/config/takers.client.routes.js index e8636aed44..185608b587 100644 --- a/public/modules/takers/config/takers.client.routes.js +++ b/public/modules/takers/config/takers.client.routes.js @@ -5,10 +5,15 @@ angular.module('takers').config(['$stateProvider', function($stateProvider) { // Takers state routing $stateProvider. - state('listTakers', { - url: '/takers', - templateUrl: 'modules/takers/views/take.html' - }). + state('listTakers', { + url: '/takers', + templateUrl: 'modules/takers/views/take.html' + }). + + state('takers', { + url: '/takers', + templateUrl: 'modules/takers/views/take.html' + }). state('createTaker', { url: '/takers/create', diff --git a/public/modules/takers/controllers/takers.client.controller.js b/public/modules/takers/controllers/takers.client.controller.js index 5d88bf70bf..00c150f02a 100644 --- a/public/modules/takers/controllers/takers.client.controller.js +++ b/public/modules/takers/controllers/takers.client.controller.js @@ -4,24 +4,25 @@ angular.module('takers').controller('TakersController', ['$scope', '$stateParams function($scope, $stateParams, $location, Authentication, Qas, Quizzes, Takers) { $scope.authentication = Authentication; // Takers controller logic - //var taker = new Takers(); - ////taker.qa = qas; - //$scope.taker = new Takers({ - // quizNumber: '0', - // trialNumber: '0', - // trialOptions: '', - // results: [{ questionViewed: false, questionAnswered: false, - // questionNumber: '', answer:[{selection: '0', answer: '0'}]}] - // - //}); - //console.log('From ScopeTaker', $scope.taker); - $scope.find = function() { - Qas.query(function(qas) { - $scope.qas = qas; - }); - }; - console.log('From ScopeTaker', $scope.qas); + $scope.taker = new Takers({ + quizNumber: '0', + trialNumber: '0', + trialOptions: '', + results: [{ questionViewed: false, questionAnswered: false, + questionNumber: '', answer:[{selection: '0', answer: '0'}]}] + + }); + console.log('From ScopeTaker', $scope.taker); + //$scope.find = function() { + // Takers.query(function(qas) { + // $scope.qas = qas; + // $scope.taker.qa = qas; + // + // + // }); + //}; + // console.log('From ScopeTaker', $scope.qas); // Create and validate taker entries $scope.next = function () { @@ -40,46 +41,40 @@ angular.module('takers').controller('TakersController', ['$scope', '$stateParams $scope.answerToggled = function() { //var taker = $scope.taker; - // Grab data from input boxes - + ////Grab data from input boxes + // //console.log(taker); //taker.qa.question = qas[questionIndex].question; //taker.questionNumber = $scope.questionNumber; - console.log('toggledtaker',taker); - for (var i=0, ln = taker.qa[$scope.questionIndex].choices.length; iLIST Quiz
{{quiz.created | date:'medium'}} / {{quiz.user.displayName}}

{{quiz.name}} - select

+ select
diff --git a/public/modules/takers/views/take.html b/public/modules/takers/views/take.html index 1533058e26..f457222cf1 100644 --- a/public/modules/takers/views/take.html +++ b/public/modules/takers/views/take.html @@ -7,15 +7,15 @@

- + - +
-
+
- +
@@ -60,4 +60,3 @@

- \ No newline at end of file From 95347fd49c1f6459a86a077dfd36c5e000e14d0a Mon Sep 17 00:00:00 2001 From: Cliff Eby Date: Mon, 3 Nov 2014 21:48:13 -0500 Subject: [PATCH 25/27] General updates --- .../quizzes/views/edit-quiz.client.view.html | 28 ++++++++++++++----- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/public/modules/quizzes/views/edit-quiz.client.view.html b/public/modules/quizzes/views/edit-quiz.client.view.html index a827ec13dd..7ea3aadf7f 100644 --- a/public/modules/quizzes/views/edit-quiz.client.view.html +++ b/public/modules/quizzes/views/edit-quiz.client.view.html @@ -5,31 +5,45 @@

Edit Quiz1

-
+ +
- + + +
+
+ + Allow Hint + Timed
+ 50/50 + Randomize Answers
+ Randomize Questions
-
- + + +
+ - Posted on + - by -

From 26a40693e77daa1163edf52db8fe1322060fd025 Mon Sep 17 00:00:00 2001 From: Cliff Eby Date: Tue, 4 Nov 2014 13:02:53 -0500 Subject: [PATCH 26/27] General updates --- app/models/qa.server.model.js | 18 +++++--- app/models/quiz.server.model.js | 26 +++++++++++ .../qas/views/edit-qa.client.view.html | 6 +-- .../controllers/quizzes.client.controller.js | 43 +++++++++++++++++-- .../views/create-quiz.client.view.html | 16 ++++++- .../quizzes/views/edit-quiz.client.view.html | 8 ++-- 6 files changed, 97 insertions(+), 20 deletions(-) diff --git a/app/models/qa.server.model.js b/app/models/qa.server.model.js index bd6f3c328b..217eebb165 100644 --- a/app/models/qa.server.model.js +++ b/app/models/qa.server.model.js @@ -11,7 +11,10 @@ var mongoose = require('mongoose'), // var AnswerSchema = new mongoose.Schema({ text: String, - selectedAnswer: Boolean}); + selectedAnswer: { + type: Boolean, + default: false + }}); /** * Qa Schema */ @@ -20,10 +23,15 @@ var QaSchema = new Schema({ type: Date, default: Date.now }, - question: { - type: String, - default: '', - trim: true + selected: { + type: Boolean, + default: false + }, + question: { + type: String, + default: '', + trim: true + }, questionNumber: { type: String, diff --git a/app/models/quiz.server.model.js b/app/models/quiz.server.model.js index 96c16fc932..6330dc7032 100644 --- a/app/models/quiz.server.model.js +++ b/app/models/quiz.server.model.js @@ -39,6 +39,32 @@ var QuizSchema = new Schema({ default: '', trim: true }, + hintOn: { + type: Boolean, + default: false, + trim: true + }, + timeOn: { + type: Boolean, + default: false, + trim: true + }, + fifty50On: { + type: Boolean, + default: false, + trim: true + }, + randomizeQuestionsOn: { + type: Boolean, + default: false, + trim: true + }, + randomizeAnswersOn: { + type: Boolean, + default: false, + trim: true + + }, qa: [{ type: Schema.ObjectId, ref: 'Qa' }] }); diff --git a/public/modules/qas/views/edit-qa.client.view.html b/public/modules/qas/views/edit-qa.client.view.html index fc62088a1f..aec514799d 100644 --- a/public/modules/qas/views/edit-qa.client.view.html +++ b/public/modules/qas/views/edit-qa.client.view.html @@ -26,16 +26,14 @@

Edit Qa

- - -
+
@@ -100,4 +98,4 @@

Edit Qa

-
\ No newline at end of file + diff --git a/public/modules/quizzes/controllers/quizzes.client.controller.js b/public/modules/quizzes/controllers/quizzes.client.controller.js index 2b58dc47ac..b338891e65 100644 --- a/public/modules/quizzes/controllers/quizzes.client.controller.js +++ b/public/modules/quizzes/controllers/quizzes.client.controller.js @@ -5,7 +5,7 @@ angular.module('quizzes').controller('QuizzesController', ['$scope', '$statePara 'Authentication', 'Quizzes','Qas','qasInitService', function($scope, $stateParams, $location, Authentication, Quizzes,Qas, qasInitService ) { $scope.authentication = Authentication; - + $scope.difficultyDropdown = qasInitService.difficultyDropdown(); // Create new Quiz $scope.create = function() { // Create new Quiz object @@ -13,7 +13,12 @@ angular.module('quizzes').controller('QuizzesController', ['$scope', '$statePara name: this.name, category: this.category, keyWords: this.keyWords, - quizNumber: this.quizNumber + quizNumber: this.quizNumber, + hintOn: this.hintOn, + timeOn: this.timeOn, + fifty50On: this.fifty50On, + randomizeQuestionsOn: this.randomizeQuestionsOn, + randomizeAnswersOn: this.randomizeAnswersOn }); // Redirect after save @@ -28,6 +33,11 @@ angular.module('quizzes').controller('QuizzesController', ['$scope', '$statePara this.keyWords = ''; this.category = ''; this.quizNumber = ''; + this.hintOn = ""; + this.timeOn = ""; + this.fifty50On = ""; + this.randomizeQuestionsOn = ""; + this.randomizeAnswersOn = ""; }; // Remove existing Quiz @@ -69,10 +79,35 @@ angular.module('quizzes').controller('QuizzesController', ['$scope', '$statePara // Find existing Quiz $scope.findOne = function() { - $scope.quiz = Quizzes.get({ + var quiz; + var qas = Qas.query(); + quiz = Quizzes.get({ quizId: $stateParams.quizId }); - console.log("from quuizctrl.findOne",$scope.quiz); + $scope.quiz = quiz; + $scope.qas = qas; + $scope.quiz.qa = []; + + //if (qas.choices[0].selectedAnswer) + //{ + // $scope.qas.sAnswer[0]=qas[0].choices[0].text + //}; + $scope.todos =qas; + //[ + // {text:'learn angular', done:true, a:[1,2]}, + // {text:'build an angular app', done:false, a:[3,2]}]; + + console.log('todo',qas,Object.keys($scope.todos).length,$scope.todos); + var oldTodos = $scope.todos; + $scope.todos = []; + angular.forEach(oldTodos, function(todo) { + $scope.todos.push(todo); + }); + + console.log($scope.todos); + + + console.log("from quuizctrl.findOne",$scope.quiz,$scope.quiz.qa); }; } ]); diff --git a/public/modules/quizzes/views/create-quiz.client.view.html b/public/modules/quizzes/views/create-quiz.client.view.html index 4b54d62ef5..e9c5ceac04 100644 --- a/public/modules/quizzes/views/create-quiz.client.view.html +++ b/public/modules/quizzes/views/create-quiz.client.view.html @@ -5,7 +5,7 @@

New Quiz

-
+
@@ -17,7 +17,19 @@

New Quiz

+
+
+
+ {{dd.label}} + Allow Hint + Timed
+ 50/50 + Randomize Answers
+ Randomize Questions
+
@@ -27,4 +39,4 @@

New Quiz

- \ No newline at end of file + diff --git a/public/modules/quizzes/views/edit-quiz.client.view.html b/public/modules/quizzes/views/edit-quiz.client.view.html index 7ea3aadf7f..f8a743271a 100644 --- a/public/modules/quizzes/views/edit-quiz.client.view.html +++ b/public/modules/quizzes/views/edit-quiz.client.view.html @@ -19,11 +19,9 @@

Edit Quiz1


- + {{dd.label}} Allow Hint Timed
50/50 From b336110cc638be0877f59da72cb145d913a8aa36 Mon Sep 17 00:00:00 2001 From: Cliff Eby Date: Mon, 22 Dec 2014 08:16:23 -0500 Subject: [PATCH 27/27] General updates --- app/models/qa.server.model.js | 9 ++++++ .../qas/controllers/qas.client.controller.js | 26 +++++++-------- .../controllers/quizzes.client.controller.js | 32 ++++++++++++++++--- .../quizzes/views/edit-quiz.client.view.html | 14 ++++---- server.js | 32 ++++++++----------- 5 files changed, 70 insertions(+), 43 deletions(-) diff --git a/app/models/qa.server.model.js b/app/models/qa.server.model.js index 217eebb165..6524d7aec4 100644 --- a/app/models/qa.server.model.js +++ b/app/models/qa.server.model.js @@ -15,6 +15,14 @@ var AnswerSchema = new mongoose.Schema({ type: Boolean, default: false }}); + +var qaQuizSchema = new mongoose.Schema({ + name: String, + id: Number, + selected: { + type: Boolean, + default: false + }}); /** * Qa Schema */ @@ -97,6 +105,7 @@ var QaSchema = new Schema({ type: String, default: 'Quiz' }, + qaQuiz: [qaQuizSchema], quiz: { type: Schema.ObjectId, ref: 'Quiz' diff --git a/public/modules/qas/controllers/qas.client.controller.js b/public/modules/qas/controllers/qas.client.controller.js index 15129f2ae7..8c2beccc5a 100644 --- a/public/modules/qas/controllers/qas.client.controller.js +++ b/public/modules/qas/controllers/qas.client.controller.js @@ -18,12 +18,12 @@ angular.module('qas').controller('QasController', ['$scope','$rootScope','$modal $scope.qa = qasInitService.init(); // Create and validate qa entries $scope.create = function () { - var qa = new Qas({ + var quiz = new Quizzes(); + quiz.qa = new Qas({ question: this.question, imageURL: this.imageURL, choices: [ - { - text: this.text, selectedAnswer: false //doesn't work + {text: this.text, selectedAnswer: false //doesn't work }, {text: this.text, selectedAnswer: this.correctAnswer //doesn't work }, @@ -42,18 +42,18 @@ angular.module('qas').controller('QasController', ['$scope','$rootScope','$modal }); // Hack to load these variables. Not handled above??? - qa.choices = $scope.qa.choices; - qa.difficulty = $scope.dd.label; - qa.type = $scope.td.label; - qa.qaQuizName = selectedQuiz[0]; - qa.qaQuizId = selectedQuiz[1]; + quiz.qa.choices = $scope.qa.choices; + // quiz.qa.difficulty = $scope.quiz.dd.label; + // quiz.qa.type = $scope.quiz.td.label; + quiz.qa.qaQuizName = selectedQuiz[0]; + quiz.qa.qaQuizId = selectedQuiz[1]; // Check that question was entered - if (qa.question.length > 0) { + if (quiz.qa.question.length > 0) { var choiceCount = 0; //Loop through choices to get at least two - console.log('qa if', qa); - for (var i = 0, ln = qa.choices.length; i < ln; i++) { - var choice = qa.choices[i].text; + console.log('qa if', quiz.qa,qa); + for (var i = 0, ln = quiz.qa.choices.length; i < ln; i++) { + var choice = quiz.qa.choices[i].text; console.log('choice', choice, " i", i); if (choice.length > 0) { choiceCount++; @@ -69,7 +69,7 @@ angular.module('qas').controller('QasController', ['$scope','$rootScope','$modal } else { alert('You must have a question'); } - console.log('qaFinal', qa); + console.log('qaFinal', quiz,qa); qa.$save(function (response) { $location.path('qas/' + response._id) }); diff --git a/public/modules/quizzes/controllers/quizzes.client.controller.js b/public/modules/quizzes/controllers/quizzes.client.controller.js index b338891e65..ae7bb486b7 100644 --- a/public/modules/quizzes/controllers/quizzes.client.controller.js +++ b/public/modules/quizzes/controllers/quizzes.client.controller.js @@ -16,7 +16,7 @@ angular.module('quizzes').controller('QuizzesController', ['$scope', '$statePara quizNumber: this.quizNumber, hintOn: this.hintOn, timeOn: this.timeOn, - fifty50On: this.fifty50On, + randomizeQuestionsOn: this.randomizeQuestionsOn, randomizeAnswersOn: this.randomizeAnswersOn }); @@ -58,7 +58,32 @@ angular.module('quizzes').controller('QuizzesController', ['$scope', '$statePara // Update existing Quiz $scope.update = function() { - var quiz = $scope.quiz ; + + var qas = $scope.qas ; + var quiz= $scope.quiz; + var index = 0; + angular.forEach(qas, function(qa){ + if(qa.selected){ + qa.qaQuizName = 'no go it'; + quiz.qa[index]=(qa); + index++; + console.log('from ang.forEach', quiz.qa); + } + console.log('From update', qa); + + if (!qa.updated) { + qa.updated = []; + } + qa.updated.push(new Date().getTime()); + + qa.$update(function () { + $location.path('qas/' + qa._id); + }); + }); + + //quiz.qa= angular.copy(qas); + + console.log('quiz',quiz,quiz.qa); quiz.$update(function() { $location.path('quizzes/' + quiz._id); @@ -86,7 +111,6 @@ angular.module('quizzes').controller('QuizzesController', ['$scope', '$statePara }); $scope.quiz = quiz; $scope.qas = qas; - $scope.quiz.qa = []; //if (qas.choices[0].selectedAnswer) //{ @@ -107,7 +131,7 @@ angular.module('quizzes').controller('QuizzesController', ['$scope', '$statePara console.log($scope.todos); - console.log("from quuizctrl.findOne",$scope.quiz,$scope.quiz.qa); + console.log("from quuizctrl.findOne",$scope.quiz,$scope.qas); }; } ]); diff --git a/public/modules/quizzes/views/edit-quiz.client.view.html b/public/modules/quizzes/views/edit-quiz.client.view.html index f8a743271a..c1d920e7d9 100644 --- a/public/modules/quizzes/views/edit-quiz.client.view.html +++ b/public/modules/quizzes/views/edit-quiz.client.view.html @@ -35,15 +35,13 @@

Edit Quiz1

-
- - - - - - - +
+ + + + {{qa.question}} {{qa.user.displayName}}
+
diff --git a/server.js b/server.js index 558e991abc..91e5c75bac 100755 --- a/server.js +++ b/server.js @@ -12,25 +12,20 @@ var init = require('./config/init')(), */ // Bootstrap db connection -//var db = mongoose.connect('mongodb://cce:cce@ds039860.mongolab.com:39860/meandb', function(err) { -// if (err) { -// console.error('\x1b[31m', 'Could not connect to MongoLabDB!'); -// console.log(err); -// } -//}); -//var db = mongoose.connect('mongodb://cliffeby:stanx2@ds039860.mongolab.com:39860/meandb', function(err) { -// if (err) { -// console.error('\x1b[31m', 'Could not connect to MongoLabDB!'); -// console.log(err); -// } -//}); -var db = mongoose.connect(config.db, function(err) { - if (err) { - console.error('\x1b[31m', 'Could not connect to MongoDB!'); - console.log(err); - } +var db = mongoose.connect('mongodb://cce:cce@ds039860.mongolab.com:39860/meandb', function(err) { + if (err) { + console.error('\x1b[31m', 'Could not connect to MongoLabDB!'); + console.log(err); + } }); +//var db = mongoose.connect(config.db, function(err) { +// if (err) { +// console.error('\x1b[31m', 'Could not connect to MongoDB!'); +// console.log(err); +// } +//}); + // Init the express application var app = require('./config/express')(db); @@ -42,7 +37,8 @@ require('./config/passport')(); app.listen(config.port); // Expose app + exports = module.exports = app; // Logging initialization -console.log('MEAN.JS application started on port ' + config.port); \ No newline at end of file +console.log('MEAN.JS application started on port ' + config.port);