Resolve conflicts and update to latest changes

4 files changed, 502 insertions, 296 deletions

diff --git a/yaksh/documentation/moderator_docs/creating_course.rst b/yaksh/documentation/moderator_docs/creating_course.rst
index d4dc5f8..5aaddf5 100644
--- a/yaksh/documentation/moderator_docs/creating_course.rst
+++ b/yaksh/documentation/moderator_docs/creating_course.rst
@@ -3,26 +3,30 @@ Courses
 =======
 
 For students to take a quiz, it is imperative for the moderator to create a course first. 
+A course can contain several modules and a module can contain several lessons and/or quizzes.
+
+To create modules, lessons and quizzes go to the :doc:`creating_lessons_modules`
+and :doc:`creating_quiz` section of the documentation.
 
 Setting up a new course
 -----------------------
     To create a course, click on the Add New Course button on the moderator's dashboard. This will lead you to a create add course page, where you need to fill in the following fields.
 
-        .. image:: ../images/create_course.png
+        .. image:: ../images/create_course.jpg
 
-        * Name
+        * **Name**
             Name of the Course
-        * Enrollment
+        * **Enrollment**
              Open enrollment is open to all students. Enroll Request requires students to send a request which the moderator can accept or reject.
-        * Active
+        * **Active**
             If the course should be active for students to take the quiz. The status of the course can be edited later.
-        * Code
+        * **Code**
             If the course should be hidden and only accessible to students possessing the correct course code.
-        * Instructions
+        * **Instructions**
             Instructions for the course
-        * Start Date and Time for enrollment of course
+        * **Start Date and Time for enrollment of course**
             If the enrollment of the course should be available only after a set date and time
-        * End Date and Time for enrollment of course
+        * **End Date and Time for enrollment of course**
             If the enrollment of the course should be available only before a set date and time
 
 
@@ -37,21 +41,77 @@ Features in Courses
 
      The following features are available for courses
 
-        * Course Name
-            Clicking on course name link will display all the enrolled, rejected and requested students list. Moderator can accept or reject the student.
-        * Quiz Name
-            Clicking on the quiz name will let you edit the quiz.
-        * Question Paper
-            Click on the **Add** link to create a Question Paper for associated Quiz.
-            If a question paper is already created, click on the Question Paper link to edit question paper.
-        * Add Teacher
-            Clicking on Add teacher can let you add teachers for the course. The teachers can edit and modify only the specific course that are allotted to them.
-        * Teachers added to the course
+        * **Course Name**
+            Click on course name link to view all the enrolled, rejected and requested students list. Moderator can accept or reject the student.
+        * **Module Name**
+            Click to edit a module added to the course
+        * **Lesson or Quiz Name**
+            Click to edit a Lesson or Quiz added to the course
+
+            In edit quiz you can also attempt the quiz in two modes - 
+                * **God Mode** - In God mode you can attempt quiz without any time or eligibilty constraints.
+                * **User Mode** - In user mode you can attempt quiz the way normal users will attempt i.e.
+                    
+                    * Quiz will have the same duration as that of the original quiz.
+                    * Quiz won't start if the course is inactive or the quiz time has expired.
+        * **Add Quizzes/Lessons for <module-name>**
+            Click to add/delete lessons or quizzes.
+        * **Design Course**
+            Click to add/delete modules of a course.
+        * **Add Teacher**
+            Click to add teachers for the course. The teachers can edit and modify only the specific course that are allotted to them.
+        * **Clone Course**
+            Click to create a copy of a course along with its modules, lessons and quizzes.
+        * **Teachers added to the course**
             This shows all the teachers added to a particular course.
-        * Download CSV for the entire course
+        * **Download CSV for the entire course**
             This downloads the CSV file containing the performance of all students in every quiz for a given course.
-        * Edit Course
-            Clicking on the edit course button will let you edit the details of an existing course.
+        * **Edit Course**
+            Click to edit the details of an existing course.
+        * **Deactivate/Activate Course**
+            Click to deactivate or activate the course.
+        * **My Courses**
+            Click to show all the courses created by you.
+        * **Allotted courses**
+            Click to view all the courses allotted to you.
+        * **Add New Course**
+            Click to open course form to create new course.
+        * **Add/View Quizzes**
+            Click to view all the quizzes created by you or add new quiz.
+        * **Add/View Lessons**
+            Click to view all the lessons created by you or add new lesson.
+        * **Add/View Modules**
+            Click to view all the modules created by you or add new module.
+
+
+Design a Course
+---------------
+    
+    Clicking on **Design Course** will show the below page.
+
+    .. image:: ../images/design_course.jpg
+
+    **Available Modules** contains all the modules that are not added to a course.
+
+    To add a module to the course select the checkbox besides the desired module to be added and click **Add to course** button.
+
+    **Chosen Modules** contains all the modules that are added to a course.
+
+    Following parameters can be changed while designing a course:
+
+        **Order** - Order in which modules are shown to a student.
+
+            To change a module's order change the value to a desired order in the textbox under **Order** column and click **Change order**.
+
+        **Check Prerequisite** - Check if previous module is completed. Default value is **Yes**.
+            For e.g., Assuming a course contains modules **Demo Module** and **Python module** in the given order; a student has to first complete **Demo module** to attempt **Python Module** if the **Check Prerequisite** value for **Python Module** is checked **Yes**.
+
+            **Currently** column shows the current value of **Check Prerequisite** which in this case is **Yes**.
+
+            Select the checkbox from **Change** column under **Check Prerequisite** and click **Change Prerequisite** button to change the value.
+
+    To remove a module from the course select the checkbox beside every module and click **Remove from course** button.
+    
 
 Features in Course Details
 --------------------------
@@ -62,17 +122,15 @@ Features in Course Details
 
     Following are the features for course details -
 
-        * Requests
+        * **Requests**
             This is a list of students who have requested to be enrolled in the course. Moderator can enroll or reject selected students.
-        * Enrolled
+        * **Enrolled**
             This is a list of students who have been enrolled in the course. Moderator can reject enrolled students.
-        * Rejected
+        * **Rejected**
             This is a list of students who have been rejected for enrollment in a course. Moderator can enroll rejected students.
-        * Deactivate/Activate Course
-            Clicking on this will deactivate or activate the course.
-        * Upload Users
+        * **Upload Users**
             Create and enroll users automatically by uploading a csv of the users. The mandatory fields for this csv are - **firstname, lastname, email**. Other fields like **username, password, institute, roll_no, department, remove** fields are optionals.
-        * Clone Course
-            This will create a clone of the course for the moderator.
-        * Send Mail
+        * **Send Mail**
             Moderator can send mail to all enrolled students or selected students.
+        * **View Course Status**
+            View students' progress through the course.
diff --git a/yaksh/documentation/moderator_docs/creating_lessons_modules.rst b/yaksh/documentation/moderator_docs/creating_lessons_modules.rst
new file mode 100644
index 0000000..5131dd1
--- /dev/null
+++ b/yaksh/documentation/moderator_docs/creating_lessons_modules.rst
@@ -0,0 +1,91 @@
+.. _creating_lessons_modules:
+
+===================
+Lessons and Modules
+===================
+
+Courses can have lessons and quizzes encapsulated using a module.
+
+	* **What is a lesson?**
+		A lesson can be any markdown text with/or an embedded video of a particular topic.
+
+	* **What is a module?**
+		A Module is a collection of lessons and courses clubbed together by similar idea/content. A module can have its own description as a markdown text with/or an embedded video.
+
+
+Setting up a Lesson
+-----------------------
+
+	To create a new lesson or edit any existing lesson click on **Add/View Lessons** from courses page.
+
+	.. image:: ../images/view_lessons.jpg
+
+	This page shows all the lessons created by you.
+
+	Click on **Add new Lesson** to add new lesson. Click on the **lesson name** to edit a lesson.
+
+	.. image:: ../images/add_lesson.jpg
+
+	* **Name** - Name of the lesson.
+	* **Description** - Description can be any markdown text or embedded video link.
+	* **Active** - Activate/Deactivate a lesson
+	* **Lesson files** - Add files to the lesson which will be available for students to view and download. All the uploaded files will be shown below.
+
+	Click on **Save** to save a lesson.
+
+	Click on **Preview Lesson Description** to preview lesson description. Markdown text from the description is converted to html and is displayed below.
+
+	Select the checkbox beside each uploaded file and click on **Delete files** to remove files from the lesson.
+
+	Click on **Embed Video Link** to embed a video. On clicking a pop-up will be shown.
+
+	.. image:: ../images/embed_video.jpg
+
+	Enter the url and click on **Submit** a html div is generated in the text area below.
+	Click on the button below the textarea to copy the textarea content. This html div can then be added in the lesson description.
+
+
+Setting up a Module
+-----------------------
+
+	To create a new module or edit any existing module click on **Add/View Modules** from courses page.
+
+	.. image:: ../images/view_modules.jpg
+
+	This page shows all the modules created by you.
+
+	Creating a new module or editing an existing module is similar to a lesson creation with a difference that a module has no option to upload files.
+
+
+Design a Module
+---------------
+
+	To add lessons or quizzes to a module click on **Add Quizzes/Lessons for <module-name>**.
+
+	.. image:: ../images/design_module.jpg
+
+	**Available Lessons and quizzes** contains all the lessons and quizzes that are not added to a module.
+
+	To add a lesson or a quiz to the module select the checkbox beside every lesson or quiz and click **Add to Module** button.
+
+	**Choosen Lesson and quizzes** contains all the lessons and quizzes that are added to a module.
+
+	A lesson or quiz added to a module becomes a unit. A unit has following parameters to change:
+
+		**Order** - Order in which units are shown to a student.
+
+			To change a unit's order change the value in the textbox under **Order** column and click **Change order**.
+
+		**Check Prerequisite** - Check if previous unit is completed. Default value is **Yes**.
+			For e.g. A student has to first complete **Yaksh Demo quiz** to attempt **Demo Lesson** if the **Check Prerequisite** value for **Demo Lesson** is checked **Yes**.
+
+			**Currently** column shows the current value of **Check Prerequisite** which in this case is **Yes**.
+
+			Select the checkbox from **Change** column under **Check Prerequisite** and click **Change Prerequisite** button to change the value.
+
+	To remove a lesson or a quiz from the module select the checkbox beside every lesson or quiz and click **Remove from Module** button.
+
+
+
+
+
diff --git a/yaksh/documentation/moderator_docs/creating_question.rst b/yaksh/documentation/moderator_docs/creating_question.rst
index 78b6f2c..82bb6e5 100644
--- a/yaksh/documentation/moderator_docs/creating_question.rst
+++ b/yaksh/documentation/moderator_docs/creating_question.rst
@@ -5,315 +5,356 @@ Questions
 Setting up questions
 --------------------
 
-	Setting up questions is the most important part of the Yaksh experience. Questions can be of multiple types i.e Multiple choice questions (MCQ), Multiple correct choices (MCC), Coding questions and assignment upload types.
+    Setting up questions is the most important part of the Yaksh experience. Questions can be of multiple types i.e Multiple choice questions (MCQ), Multiple correct choices (MCC), Coding questions, assignment upload, fill in the blanks.
 
-	To set up a question click on the questions link in the navigation bar.
+    To set up a question click on the questions link in the navigation bar.
 
-	.. image:: ../images/questions.jpg 
-	
-	To add a question click on the **Add Question** button
+    .. image:: ../images/questions.jpg 
+    
+    To add a question click on the **Add Question** button
 
-	.. image:: ../images/add_question.jpg
+    .. image:: ../images/add_question.jpg
 
-	* **Summary**- Summary or the name of the question.
+    * **Summary**- Summary or the name of the question.
 
-	* **Language** - Programming language on which the question is based.
+    * **Language** - Programming language on which the question is based.
 
-	* **Type** - Type of the question. i.e Multiple Choice, Multiple Correct Choice, Code and Assignment Upload.
+    * **Type** - Type of the question. i.e Multiple Choice, Multiple Correct Choice, Code, Assignment Upload etc.
 
-	* **Points** - Points is the marks for a question.
+    * **Points** - Points is the marks for a question.
 
-	* **Description** - The actual question description is to be written. 
+    * **Description** - The actual question description in HTML format.
 
-		.. note::  To add code snippets in questions please use html <code> and <br> tags.
+        .. note::  To add code snippets in questions please use html <code> and <br> tags.
 
-	* **Tags** - Type of label or metadata tag making it easier to find specific type of questions.
+    * **Tags** - Type of label or metadata tag making it easier to find specific type of questions.
 
-	* **Snippet** - Snippet is used to give any default value or default code or command. This will be displayed in the students answer form. This is used only for code questions.
+    * **Solution** - Add solution for the question.
 
-	* **Partial Grading** - Click this checkbox to enable partial grading feature.
+    * **Snippet** - Snippet is used to give any default value or default code or command. This will be displayed in the students answer form. This is used only for code questions.
 
-	* **File** - File field is used to upload files if there is any file based question.
-		For e.g. The question is reading a file say **dummy.txt** and print its content.
-		You can then upload a file **dummy.txt** which will be available to the student while attempting the quiz.
+    * **Minimum time(in minutes)** - This value can be set for questions which will be added to a Exercise. Exercise time will depend on this time.
 
-		* Some file features:
-			1. To delete a file click the delete checkbox and click on Delete Selected Files button.
-			2. To extract a file for e.g. say **dummy.zip** click the extract checkbox and click on Save button.
-				If **extract** is selected, the file will be extracted while checking
-				the student submitted code.
-			3. To hide any file from student click the hide checkbox and click on Save button.
+    * **Partial Grading** - Click this checkbox to enable partial grading feature.
 
-		.. Note::  We only support **zip** extension for **extract file** feature.
+    * **Grade Assignment Upload** - Click this checkbox if the assignment upload based question needs evaluation. Evaluation is done with **Hook based TestCase** only.
+
+    * **File** - File field is used to upload files if there is any file based question.
+        For e.g. The question is reading a file say **dummy.txt** and print its content.
+        You can then upload a file **dummy.txt** which will be available to the student while attempting the quiz.
+
+        * Some file features:
+            1. To delete a file click the delete checkbox and click on **Delete Selected Files button**.
+            2. To extract a file for e.g. say **dummy.zip** click the extract checkbox and click on Save button.
+                If **extract** is selected, the file will be extracted while checking
+                the student submitted code.
+            3. To hide any file from student click the hide checkbox and click on Save button.
+
+        .. Note::  We only support **zip** extension for **extract file** feature.
 
 
 How to write Test cases
 -----------------------
-	
-	The following explains different methods to write test cases.
-
-	* **Create Standard Test Case**
-
-		Select Standard from Add Test Case field.
-
-		* For Python:
-			.. image:: ../images/python_standard_testcase.jpg
-			   :width: 80%
-
-			In the test case field write a python assert to check the user code.
-			For e.g. :: 
-				
-				assert add(1, 2) == 3
-			
-			for program of addition.
-
-		* For C, C++, Java and Bash:
-			Sample Moderator code
-
-			For C and C++:
-				.. image:: ../images/cpp_standard_testcase.jpg
-					:width: 80%
-
-				Consider a Program to add three numbers.
-				The code in the Test case field should be as follows: ::
-
-					#include <stdio.h>
-					#include <stdlib.h>
-
-					extern int add(int, int, int);
-
-					template <class T>
-					void check(T expect,T result)
-					{
-						if (expect == result)
-						{
-						printf("\nCorrect:\n Expected %d got %d \n",expect,result);
-						}
-						else
-						{
-						printf("\nIncorrect:\n Expected %d got %d \n",expect,result);
-						exit (1);
-						}
-					}
-
-					int main(void)
-					{
-						int result;
-						result = add(0,0,0);
-						printf("Input submitted to the function: 0, 0, 0");
-						check(0, result);
-						result = add(2,3,3);
-						printf("Input submitted to the function: 2, 3, 3");
-						check(8,result);
-						printf("All Correct\n");
-					}
-
-				Assuming Students answer to be as below: ::
-
-					int add(int a, int b, int c)
-					{
-						return a+b+c;
-					}
-
-				.. Note::  1. In the above example, **add** in the main function is obtained from student code.
-						2. Please make sure that the student code function and testcase calling function should be same which in this case is **add**.
-
-			For Java:
-				.. image:: ../images/java_standard_testcase.jpg
-					:width: 80%
-
-				Consider a Program to find square of a number.
-				The code in the Test case Field should be as follows: ::
-					class main
-					{
-						public static <E> void check(E expect, E result)
-						{
-							if(result.equals(expect))
-							{
-								System.out.println("Correct:\nOutput expected "+expect+" and got "+result);
-							}
-							else
-							{
-								System.out.println("Incorrect:\nOutput expected "+expect+" but got "+result);
-								System.exit(1);
-							}
-						}
-						public static void main(String arg[])
-						{
-							Test t = new Test();
-							int result, input, output;
-							input = 0; output = 0;
-							result = t.square_num(input);
-							System.out.println("Input submitted to the function: "+input);
-							check(output, result);
-							input = 5; output = 25;
-							result = t.square_num(input);
-							System.out.println("Input submitted to the function: "+input);
-							check(output, result);
-							input = 6; output = 36;
-							result = t.square_num(input);
-							System.out.println("Input submitted to the function: "+input);
-							check(output, result);
-						}
-					}
-
-				Assuming Students answer to be as below: ::
-
-					class Test
-					{
-						int square_num(int num)
-						{
-							return num*num;
-						}
-					}
-
-				.. Note::	1. For Java, class name should always be **main** in testcase.
-
-							2. In the above example, **Test** is the class of student's code.
-							3. Please make sure that the student's code class and calling class in testcase is always **Test**. (square_num is the function inside Test class.)
-
-			For Bash:
-				.. image:: ../images/bash_standard_testcase.jpg
-					:width: 80%
-
-				In **Test case** Field write your bash script.
-					For e.g. the question is to move to a particular directory and read a file
-					**test.txt**
-					The Test case code shown is: ::
-
-						#!/bin/bash
-						cd $1
-						cat $2
-
-				In **Test case args** Field type your Command line arguments.
-
-					In this case the test case args are: ::
-
-						somedata/  test.txt
-
-					.. Note:: 1. **Test case args** field is used only for bash.
-							  2. Each argument should be separated by **space**.
-							  3. This field can be left blank.
-
-
-		Check Delete Field if a test case is to be removed.
-
-		Finally click on Save to save the test case.
-
-
-	* **Create Standard Input/Output Based Test Case**
+    
+    The following explains different methods to write test cases.
+
+    * **Create Standard Test Case**
+
+        Select Standard from Add Test Case field. Sample Testcases are given for all 
+        languages.
+
+        * **For Python:**
+            .. image:: ../images/python_standard_testcase.jpg
+               :width: 80%
+
+            In the test case field write a python assert to check the user code.
+            For e.g. :: 
+
+                assert add(1, 2) == 3
+
+            for program of addition.
+
+        * **For C, C++:**
+
+            .. image:: ../images/cpp_standard_testcase.jpg
+                :width: 80%
+
+            Consider a Program to add three numbers.
+            The code in the Test case field should be as follows: ::
+
+                #include <stdio.h>
+                #include <stdlib.h>
+
+                extern int add(int, int, int);
+
+                template <class T>
+                void check(T expect,T result)
+                {
+                    if (expect == result)
+                    {
+                    printf("\nCorrect:\n Expected %d got %d \n",expect,result);
+                    }
+                    else
+                    {
+                    printf("\nIncorrect:\n Expected %d got %d \n",expect,result);
+                    exit (1);
+                    }
+                }
+
+                int main(void)
+                {
+                    int result;
+                    result = add(0,0,0);
+                    printf("Input submitted to the function: 0, 0, 0");
+                    check(0, result);
+                    result = add(2,3,3);
+                    printf("Input submitted to the function: 2, 3, 3");
+                    check(8,result);
+                    printf("All Correct\n");
+                }
+
+            Assuming Students answer to be as below: ::
+
+                int add(int a, int b, int c)
+                {
+                    return a+b+c;
+                }
+
+            .. Note::  1. In the above example, **add** in the main function is obtained from student code.
+                    2. Please make sure that the student code function and testcase calling function should be same which in this case is **add**.
+
+        * **For Java:**
+            .. image:: ../images/java_standard_testcase.jpg
+                :width: 80%
+
+            Consider a Program to find square of a number.
+            The code in the Test case Field should be as follows: ::
+
+                class main
+                {
+                    public static <E> void check(E expect, E result)
+                    {
+                        if(result.equals(expect))
+                        {
+                            System.out.println("Correct:\nOutput expected "+expect+" and got "+result);
+                        }
+                        else
+                        {
+                            System.out.println("Incorrect:\nOutput expected "+expect+" but got "+result);
+                            System.exit(1);
+                        }
+                    }
+                    public static void main(String arg[])
+                    {
+                        Test t = new Test();
+                        int result, input, output;
+                        input = 0; output = 0;
+                        result = t.square_num(input);
+                        System.out.println("Input submitted to the function: "+input);
+                        check(output, result);
+                        input = 5; output = 25;
+                        result = t.square_num(input);
+                        System.out.println("Input submitted to the function: "+input);
+                        check(output, result);
+                        input = 6; output = 36;
+                        result = t.square_num(input);
+                        System.out.println("Input submitted to the function: "+input);
+                        check(output, result);
+                    }
+                }
+
+            Assuming Students answer to be as below: ::
+
+                class Test
+                {
+                    int square_num(int num)
+                    {
+                        return num*num;
+                    }
+                }
+
+            .. Note::   1. For Java, class name should always be **main** in testcase.
+
+                        2. In the above example, **Test** is the class of student's code.
+                        3. Please make sure that the student's code class and calling class in testcase is always **Test**. (square_num is the function inside Test class.)
+
+        * **For Bash:**
+            .. image:: ../images/bash_standard_testcase.jpg
+                :width: 80%
+
+            In **Test case** Field write your bash script.
+                For e.g. the question is to move to a particular directory and read a file
+                **test.txt**
+                The Test case code shown is: ::
+
+                    cd $1
+                    cat $2
+
+            In **Test case args** Field type your Command line arguments.
+
+                In this case the test case args are: ::
+
+                    somedata/  test.txt
+
+                .. Note:: 1. **Test case args** field is used only for bash.
+                          2. Each argument should be separated by **space**.
+                          3. This field can be left blank.
+
+
+        Check Delete Field if a test case is to be removed.
+
+        Finally click on Save to save the test case.
+
+
+    * **Create Standard Input/Output Based Test Case**
             
-			Select StdIO from Add Test Case field.
+            Select StdIO from Add Test Case field.
+
+                .. image:: ../images/stdio_testcase.jpg
+                    :width: 80%
+
+            In Expected input field, enter the value(s) that will be passed to the students' code through a standard I/O stream.
+
+            .. note::  If there are multiple input values in a test case, enter the values in new line.
+
+            In Expected Output Field, enter the expected output for that test case. For e.g type 3 if the output of the user code is 3.
+
+            Setting up Standard Input/Output Based questions is same for all languages.
 
-				.. image:: ../images/stdio_testcase.jpg
-					:width: 80%
+    * **Create MCQ or MCC Based Test Case**
 
-			In Expected input field, enter the value(s) that will be passed to the students' code through a standard I/O stream.
+        Select MCQ/MCC from Add Test Case field.
 
-			.. note::  If there are multiple input values in a test case, enter the values in new line.
+            Fig (a) showing MCQ based testcase
 
-			In Expected Output Field, enter the expected output for that test case. For e.g type 3 if the output of the user code is 3.
+            .. image:: ../images/mcq_testcase.jpg
+                :width: 80%
 
-			Setting up Standard Input/Output Based questions is same for all languages.
+            Fig (b) showing MCC based testcase
 
-	* **Create MCQ or MCC Based Test Case**
+            .. image:: ../images/mcc_testcase.jpg
+                :width: 80%
 
-		Select MCQ/MCC from Add Test Case field.
+        In Options Field type the option check the correct checkbox if the current option is correct and click on Save button to save each option.
 
-			Fig (a) showing MCQ based testcase
+        For MCC based question, check the correct checkbox for multiple correct options.
 
-			.. image:: ../images/mcq_testcase.jpg
-				:width: 80%
+    * **Create Hook based Test Case**
 
-			Fig (b) showing MCC based testcase
+        Select Hook from Add Test Case field.
 
-			.. image:: ../images/mcc_testcase.jpg
-				:width: 80%
+        In Hook based test case type, moderator is provided with a evaluator function
+        called **check_answer** which is provided with a parameter called **user_answer**.
 
-		In Options Field type the option check the correct checkbox if the current option is correct and click on Save button to save each option.
+        **user_answer** is the code of the student in string format.
 
-		For MCC based question, check the correct checkbox for multiple correct options.
+        .. note :: For assignment upload type question there will be no **user answer** File uploaded by student will be the answer.
 
-	* **Create Hook based Test Case**
+        Suppose the student needs to upload a file say **new.txt** as assignment.
+        Sample Hook code for this will be as shown below. ::
 
-		Select Hook from Add Test Case field.
+            def check_answer(user_answer):
+                ''' Evaluates user answer to return -
+                success - Boolean, indicating if code was executed correctly
+                mark_fraction - Float, indicating fraction of the weight to a test case
+                error - String, error message if success is false
 
-		In Hook based test case type, moderator is provided with a evaluator function
-		called **check_answer** which is provided with a parameter called **user_answer**.
+                In case of assignment upload there will be no user answer '''
 
-		**user_answer** is the code of the student in string format.
+                success = False
+                err = "Incorrect Answer" # Please make this more specific
+                mark_fraction = 0.0
 
-		A moderator can check the string for specific words in the user answer
-		and/or compile and execute the user answer (using standard python libraries) to 
-		evaluate and hence return the mark fraction.
+                try:
+                    with open('new.txt', 'r') as f:
+                        if "Hello, World!" in f.read():
+                            success = True
+                            err = "Correct Answer"
+                            mark_fraction = 1.0
+                        else:
+                            err = "Did not found string Hello, World! in file."
+                except IOError:
+                    err = "File new.txt not found."
+                return success, err, mark_fraction
 
 
-		.. image:: ../images/hook_testcase.jpg
-				:width: 80%
+        A moderator can check the string for specific words in the user answer
+        and/or compile and execute the user answer (using standard python libraries) to 
+        evaluate and hence return the mark fraction.
 
-	* **Create Integer Based Test Case**
 
-			Select **Answer in Integer** from Type field.
+        .. image:: ../images/hook_testcase.jpg
+                :width: 80%
 
-			Select Integer from Add Test Case field.
+    * **Create Integer Based Test Case**
 
-			In the Correct field, add the correct integer value for the question.
+            Select **Answer in Integer** from Type field.
 
-			.. image:: ../images/integer_testcase.jpg
-				:width: 80%
+            Select Integer from Add Test Case field.
 
-	* **Create String Based Test Case**
+            In the Correct field, add the correct integer value for the question.
 
-			Select **Answer in String** from Type field.
+            .. image:: ../images/integer_testcase.jpg
+                :width: 80%
 
-			Select **String** from Add Test Case field.
+    * **Create String Based Test Case**
 
-			In the **Correct** field, add the exact string answer for the question.
+            Select **Answer in String** from Type field.
 
-			In **String Check** field, select if the checking of the string answer
-			 should be case sensitive or not.
+            Select **String** from Add Test Case field.
 
-			.. image:: ../images/string_testcase.jpg
-				:width: 80%
+            In the **Correct** field, add the exact string answer for the question.
 
-	* **Create Float Based Test Case**
+            In **String Check** field, select if the checking of the string answer
+             should be case sensitive or not.
 
-			Select **Answer in Float** from Type field.
+            .. image:: ../images/string_testcase.jpg
+                :width: 80%
 
-			Select **Float** from Add Test Case field.
+    * **Create Float Based Test Case**
 
-			In the **Correct** field, add the correct float value for the question.
+            Select **Answer in Float** from Type field.
 
-			In the **Error Margin** field, add the margin of error that will be allowed.
+            Select **Float** from Add Test Case field.
 
-			.. image:: ../images/float_testcase.jpg
-				:width: 80%
+            In the **Correct** field, add the correct float value for the question.
+
+            In the **Error Margin** field, add the margin of error that will be allowed.
+
+            .. image:: ../images/float_testcase.jpg
+                :width: 80%
 
 
 Features in Question
 --------------------
-	
-	* **Download Questions**
+    
+    * **Download Questions**
 
-			Select questions from the list of questions displayed on the Questions page. Click on the Download Selected button to download the questions. This will create a zip file of the Questions selected.
+            Select questions from the list of questions displayed on the Questions page. Click on the Download Selected button to download the questions. This will create a zip file of the Questions selected.
 
-	* **Upload Questions**
-			
-			Click on the browse button. This will open up a window. Select the zip file of questions and click Ok and then click on Upload file button, questions will be uploaded and displayed on the Questions page.
+    * **Upload Questions**
+            
+            Click on the browse button. This will open up a window. Select the zip file of questions and click Ok and then click on Upload file button, questions will be uploaded and displayed on the Questions page.
 
-				Zip file should contain **questions_dump.yaml** from which questions will be loaded.
-				Zip file can contain files related to questions.
+                Zip file should contain **questions_dump.yaml** from which questions will be loaded.
+                Zip file can contain files related to questions.
 
-	* **Test Questions**
-			
-			Select questions from the list of question displayed on the Questions page. Click on Test selected button. This will take you to a quiz with the selected questions. 
+    * **Test Questions**
+            
+            Select questions from the list of question displayed on the Questions page. Click on Test selected button. This will take you to a quiz with the selected questions. 
+
+            .. Note:: This will not create an actual quiz but a trial quiz. This quiz is hidden from the students and only for moderator to view. You can delete the quiz from moderator's dashboard.
+
+    * **Filter Questions**
+            
+            You can filter questions based on type of question, language of question or marks of question.
+                1. Click Select Question Type to filter question based on type of the question.
+                2. Click Select Language to filter question based on language of the question.
+                3. Click Select marks to filter question based on mark of the question.
 
-			.. Note:: This will not create an actual quiz but a trial quiz. This quiz is hidden from the students and only for moderator to view. You can delete the quiz from moderator's dashboard.
+    * **Search by tags**
 
-	* **Filter Questions**
-			
-			You can filter questions based on type of question, language of question or marks of question.
-				1. Click Select Question Type to filter question based on type of the question.
-				2. Click Select Language to filter question based on language of the question.
-				3. Click Select marks to filter question based on mark of the question.
+            1. You can search the questions by tags added during question creation.
+            2. Click on the Available tags to view all the available tags. Select any tag from available tags and click **Search**.
+            3. Enter the tag in the search bar and click on **Search** respective questions will be displayed.
 
diff --git a/yaksh/documentation/moderator_docs/creating_quiz.rst b/yaksh/documentation/moderator_docs/creating_quiz.rst
index 3f227ef..8b93188 100644
--- a/yaksh/documentation/moderator_docs/creating_quiz.rst
+++ b/yaksh/documentation/moderator_docs/creating_quiz.rst
@@ -1,44 +1,68 @@
+.. _creating_quiz:
+
 =======
 Quizzes
 =======
 
 Quizzes are intrinsically associated with a course, hence to view and/or edit a quiz, we need to navigate to the courses page.
 
-In courses page click on **Add Quiz** button to create a new quiz.
+Clicking on Add/View Quizzes from courses page will open the page as shown below
+
+.. image:: ../images/view_quizzes.jpg
 
+This page shows all the quizzes and exercise created.
 
 Creating a Quiz
 ---------------	
+
+	Click on **Add New Quiz** button to add a quiz.
+
 	.. image:: ../images/add_quiz.jpg
 	
 	.. note :: It is important to have created or uploaded questions before creating a quiz. 
 
-	In courses click on **Add Quiz** button to add a quiz.
-	
-	* **Course** - Select a course from Course field. This field is mandatory.
 	* **Start Date and Time of quiz** - The date and time after which the quiz can be taken.
 	* **End Date and Time of quiz** - The date and time after which the quiz is deactivated and cannot be attempted.
 	* **Duration** - Duration of quiz to be written in minutes.
-	* **Active** - If the quiz is active or not.
+	* **Active** - Check the checkbox to activate/deactivate quiz.
 	* **Description** - Description or name of the quiz.
 	* **Passing Percentage** - Minimum percentage required to pass the test.
-	* **Prerequisite** - Set a prerequisite quiz to be passed before attempting the current quiz.
-	* **Language** - Programming language on which the quiz is based.
 	* **Attempts allowed** - Number of attempts that a student can take of the current quiz.
-	* **Number of Days** - Number of days between attempts.
+	* **Time Between Quiz Attempts in hours** - For a quiz with multiple attempts this value can be set so that student can attempt again after the specified time.
 	* **Instructions for students** - Additional instructions for students can be added. Some default instructions are already provided.
 	* **Allow student to view answer paper** - Click on this checkbox to allow student to view their answer paper.
+	* **Allow student to skip questions** - Click on this checkbox to allow/disallow student to skip questions for a quiz. Value defaults to allow skipping questions.
+	* **Weightage** - Every quiz will have weightage depending on which grades will be calculated.
 
 	Once a quiz parameters have been set click on **Save** button to save the quiz.
 
-To create a Question paper, Click on **Add** link located besides the created quiz in courses page.
+To create a Question paper, Click on **Add** link located besides the created quiz.
+
+Creating a Exercise
+-------------------	
+
+	Click on **Add New Exercise** button to add a exercise.
+
+	.. image:: ../images/add_exercise.jpg
+
+	Exercise is similar to quiz with a difference that exercise has infinite attempts and 
+	infinite time. It also does not allow a student to skip the question.
+	Each question in an exercise can be timed i.e. time to solve a particular question.
+	Once the question time expires, question solution is shown to the student.
+
+	All the parameters are set by default only below parameters can be changed.
+
+	* **Description** - Description or name of the exercise.
+	* **Allow student to view answer paper** - Click on this checkbox to allow student to view their answer paper.
+	* **Active** - Select the checkbox to activate/deactivate exercise. Default value is active.
+
 
 Designing Question Paper
 ------------------------
 
 	.. image:: ../images/design_questionpaper.jpg
 
-	A quiz can have fixed as well as random questions. Fixed questions are those question that are bound to appear for every student taking the quiz. In random questions a pool of questions is given and number of questions to be picked from the pool is set. Hence for different students, different questions from the pool will appear.
+	A quiz/exercise can have fixed as well as random questions. Fixed questions are those question that are bound to appear for every student taking the quiz. In random questions a pool of questions is given and number of questions to be picked from the pool is set. Hence for different students, different questions from the pool will appear.
 
 	To add questions to a questionpaper
 
@@ -48,25 +72,17 @@ Designing Question Paper
 	* Click on save question paper to save it or preview question paper to preview it.
 
 
-Editing a Quiz
---------------
-
-	In Courses page, click on the quiz link to edit the quiz. Then change the parameters and click on design question paper to save it. This will redirect you to the moderator dashboard.
+Editing a Quiz/Exercise
+-----------------------
 
-	In edit quiz you can also attempt the quiz in two modes - 
-		* **God Mode** - In God mode you can attempt quiz without any time or eligibilty constraints.
-		* **User Mode** - In user mode you can attempt quiz the way normal users will attempt i.e.
-			
-			* Quiz will have the same duration as that of the original quiz.
-			* Quiz won't start if the course is inactive or the quiz time has expired.
-			* You will be notified about quiz prerequisites.(You can still attempt the quiz though)
+	Click on the quiz/exercise link to edit, change the parameters and click on Save.
 
 
 Editing a QuestionPaper
 -----------------------
 
 
-	Click on the Question Paper for a Quiz link besides Quiz in courses page and follow steps from Design Question Paper.
+	Click on the Question Paper for a <Quiz-name/Exercise-name> besides Quiz/Exercise and follow steps from Design Question Paper.
 
 	If the questions are already added to a Question Paper then they are shown in the 
 	**Fixed Questions currently in the paper** section.