[#650] objective or subjective test (#738)

open-learning-exchange · Apr 17, 2017 · 063a4ec · 063a4ec
1 parent 60e3636
commit 063a4ec
Show file tree

Hide file tree

Showing 5 changed files with 69 additions and 17 deletions.
diff --git a/app/MyApp/app/Router.js b/app/MyApp/app/Router.js
@@ -2425,6 +2425,7 @@ $(function() {
                             courseId: courseId
                         })
                         Cstep.set("totalMarks", 0);
+                        Cstep.set("stepType", "Objective");
                         var lForm = new App.Views.LevelForm({
                             model: Cstep
                         })
@@ -2437,7 +2438,7 @@ $(function() {
                         lForm.sliders();
                         $("input[name='step']").attr("disabled", true);
                         $("input[name='passingPercentage']").attr("readonly",true);
- +                      $("input[name='passingPercentage']").val(10)
+                        $("input[name='passingPercentage']").val(10)
                         if (totalLevels != -1) {
                             var tl = parseInt(totalLevels) + 1
                             $("input[name='step']").val(tl)

diff --git a/app/MyApp/app/collections/CourseStepQuestions.js b/app/MyApp/app/collections/CourseStepQuestions.js
@@ -4,10 +4,13 @@ $(function() {
 
         model: App.Models.CourseQuestion,
         url: function() {
-            if (this.keys != 'undefined')
+            if (this.stepId != "" && this.stepId != undefined) {
+                return App.Server + '/coursequestion/_design/bell/_view/questionsByCourseStepId/?key="' +this.stepId + '"&include_docs=true'
+            } else if (this.keys != 'undefined') {
                 return App.Server + '/coursequestion/_all_docs?include_docs=true&keys=[' + this.keys + ']'
-            else
+            } else {
                 return App.Server + '/coursequestion/_all_docs?include_docs=true'
+            }
         },
 
         parse: function(response) {
@@ -25,4 +28,4 @@ $(function() {
 
     })
 
-})
+})
diff --git a/app/MyApp/app/models/CourseStep.js b/app/MyApp/app/models/CourseStep.js
@@ -45,7 +45,7 @@ $(function() {
             },
             passingPercentage: { //Least marks to be obtained for passing any step
                 type: 'Text',
-            },
+            }
         },
         saveAttachment: function(formEl, fileEl, revEl) {
             // Work with this doc in the files database

diff --git a/app/MyApp/app/views/CourseStepQuestionRow.js b/app/MyApp/app/views/CourseStepQuestionRow.js
@@ -1,4 +1,4 @@
-$(function() {
+ $(function() {
 
     App.Views.CourseStepQuestionRow = Backbone.View.extend({
 
@@ -25,17 +25,38 @@ $(function() {
                 CourseStepQuestionObject.set({
                     'questionslist': CourseStepQuestions
                 })
+                var that =  this
                 CourseStepQuestionObject.save(null, {
                    success: function() {
-
                         questionModel.destroy();
+                        var stepQuestion =  new App.Collections.CourseStepQuestions();
+                        stepQuestion.stepId = that.Id
+                        stepQuestion.fetch({
+                            async: false
+                        });
+                        var courseStep = new App.Models.CourseStep({
+                            _id: that.Id
+                        })
+                        courseStep.fetch({
+                            async: false
+                        })
+                        for (var i = 0; i < stepQuestion.length; i++) {
+                            if(stepQuestion.models[i].attributes.Type != "Multiple Choice"){
+                                break;
+                            } else {
+                                if (i == stepQuestion.length-1) {
+                                    courseStep.set("stepType", "Objective");
+                                    courseStep.save();
+                                }
+                            }
+                        }
                    }
                 });
             },
             "click .edit_coursestep_question": function(event) {
-               var courseQuizEdit = new App.Views.TestView();
-               courseQuizEdit.questionModel = this.model;
-               courseQuizEdit.coursesavefunction(this.Id, true, this.model);
+                var courseQuizEdit = new App.Views.TestView();
+                courseQuizEdit.questionModel = this.model;
+                courseQuizEdit.coursesavefunction(this.Id, true, this.model);
             }
 
         },

diff --git a/app/MyApp/app/views/TestView.js b/app/MyApp/app/views/TestView.js
@@ -300,17 +300,44 @@ $(function() {
                             },
                             async: false
                         });
-                    } else {
-                            var courseStepModel = new App.Models.CourseStep({
+                        if (questionObject.attributes.Type != "Multiple Choice") {
+                            var Cstep = new App.Models.CourseStep({
                                 _id: csId
                             })
-                            courseStepModel.fetch({
+                            Cstep.fetch({
                                 async: false
                             })
-                            var totalMarks = parseInt(courseStepModel.get('totalMarks'));
-                            var input_marks = parseInt(questionObject.attributes.Marks);
-                            courseStepModel.set('totalMarks', (totalMarks+input_marks));
-                            courseStepModel.save();
+                            if(Cstep.attributes.stepType == "Objective"){
+                                Cstep.set("stepType", "Subjective");
+                                Cstep.save();
+                            }
+                        }
+                    } else {
+                        var stepQuestion =  new App.Collections.CourseStepQuestions();
+                        stepQuestion.stepId = csId
+                        stepQuestion.fetch({
+                            async: false
+                        });
+                        var courseStepModel = new App.Models.CourseStep({
+                            _id: csId
+                        })
+                        courseStepModel.fetch({
+                            async: false
+                        })
+                        for (var i = 0; i < stepQuestion.length; i++) {
+                            if(stepQuestion.models[i].attributes.Type != "Multiple Choice"){
+                                courseStepModel.set("stepType", "Subjective");
+                                break;
+                            } else {
+                                if (i == stepQuestion.length-1) {
+                                    courseStepModel.set("stepType", "Objective");
+                                }
+                            }
+                        }
+                        var totalMarks = parseInt(courseStepModel.get('totalMarks'));
+                        var input_marks = parseInt(questionObject.attributes.Marks);
+                        courseStepModel.set('totalMarks', (totalMarks+input_marks));
+                        courseStepModel.save();
                         alert(App.languageDict.attributes.question_Edit);
                         window.location.reload();
                     }