Merge pull request #27 from coding-blocks/negative_marking

Negative marking

Author: jatinkatyal13

app/models/choice.js

@@ -3,7 +3,5 @@ import DS from "ember-data";
 export default DS.Model.extend({
   title: DS.attr(),
   description: DS.attr(),
-  positiveWeight: DS.attr(),
-  negativeWeight: DS.attr(),
   question: DS.belongsTo('question')
 })

app/models/question.js

@@ -5,6 +5,8 @@ export default DS.Model.extend({
   description: DS.attr(),
   explanation: DS.attr(),
   difficulty: DS.attr(),
+  positiveScore: DS.attr(),
+  negativeScore: DS.attr(),
   user: DS.belongsTo('user'),
   choices: DS.hasMany('choice'),
   tags: DS.hasMany('tag')

app/pods/components/question-editor/template.hbs

@@ -42,6 +42,22 @@
     </div>
   </div>
 
+  <div class="row justiy-content-center align-items-center">
+    <div class="col-1">
+      <label>Positive Score</label>
+    </div>
+    <div class="col-5">
+      {{input type="number" class="input-text" value=question.positiveScore}}
+    </div>
+
+    <div class="col-1">
+      <label>Negative Score</label>
+    </div>
+    <div class="col-5">
+      {{input type="number" class="input-text" value=question.negativeScore}}
+    </div>
+  </div>
+
   {{#unless question.isNew}}
 
     <div class="button-dashed add-choice">

config/environment.js

@@ -36,9 +36,9 @@ module.exports = function(environment) {
     // ENV.APP.LOG_VIEW_LOOKUPS = true;
     ENV.ONEAUTH = {
       clientID: "2636937167",
-      callbackURL: "http://localhost:4200/callback"
+      callbackURL: process.env.ONEAUTH_CALLBACK_URL || "http://localhost:4200/callback"
     }
-    ENV.apiHost = 'http://localhost:8080'
+    ENV.apiHost = process.env.API_HOST || 'http://localhost:8080'
     ENV.sentry.development = true
   }