Merge pull request #5 from virtual-labs/dev

Dev

Author: sravanthimodepu

experiment-descriptor.json

@@ -13,6 +13,13 @@
       "unit-type": "task",
       "content-type": "text"
     },
+    {
+      "target": "objective.html",
+      "source": "objective.md",
+      "label": "Objective",
+      "unit-type": "task",
+      "content-type": "text"
+    },
     {
       "target": "pretest.html",
       "source": "pretest.json",
@@ -33,6 +40,13 @@
       "label": "Simulation",
       "unit-type": "task",
       "content-type": "simulation"
+    },
+    {
+      "target": "posttest.html",
+      "source": "posttest.json",
+      "label": "Posttest",
+      "unit-type": "task",
+      "content-type": "assesment"
     }
   ]
 }

experiment/objective.md

@@ -1 +1 @@
-To learn to solve problems related to Recursion using Computer Programming.
+- To learn to solve problems related to Recursion using Computer Programming.

experiment/posttest.json

@@ -1,18 +1,46 @@
 [
-{"question":"This is a Sample Question 1?",
+{"question":"1. A continue statement causes execution to skip to:",
 "answers":{
-            "a":"answer1",
-            "b":"answer2",
-            "c":"answer3",
-            "d":"answer4"
+            "a":"the end of the program",
+            "b":"the first statement after the loop",
+            "c":"the statement following the continue statement",
+            "d":"the next iteration of the loop"
+          },
+"correctAnswer":"d"},
+
+{"question":"2. The statement i++; is equivalent to:",
+"answers":{
+            "a":"i = i + i;",
+            "b":"i = i + 1;",
+            "c":"i = i - 1;",
+            "d":"i - - ;"
+          },
+"correctAnswer":"b"},
+
+{"question":"3. Another word for 'looping' is:",
+"answers":{
+            "a":"recapitulation ",
+            "b":"tintinabulation ",
+            "c":"iteration",
+            "d":"reiteration"
+          },
+"correctAnswer":"c"},
+
+{"question":"4. Which looping process is best used when the number of iterations is known?",
+"answers":{
+            "a":"for",
+            "b":"while",
+            "c":"do-while",
+            "d":"all of the above"
           },
 "correctAnswer":"a"},
-{"question":"This is a Sample Question 2?",
+
+{"question":"5.  Which of the following is not an infinite loop.",
 "answers":{
-            "a":"answer1",
-            "b":"answer2",
-            "c":"answer3",
-            "d":"answer4"
+            "a":"int i = 1 ; while ( 1 ) { i++ ; }",
+            "b":"for( int i =1; i < 10 ; i--) printf('Hello World');",
+            "c":"for(int i =1; i<100; i++) printf('Hello World');",
+            "d":"int i = 0; do{ i-- printf('%d ',i); }while(i>0);"
           },
-"correctAnswer":"c"} 
+"correctAnswer":"c"}
 ]

experiment/pretest.json

@@ -42,52 +42,6 @@
             "c":"do-while",
             "d":"No looping peocess check condition at the end"
           },
-"correctAnswer":"c"},
-
-{"question":"6. A continue statement causes execution to skip to:",
-"answers":{
-            "a":"the end of the program",
-            "b":"the first statement after the loop",
-            "c":"the statement following the continue statement",
-            "d":"the next iteration of the loop"
-          },
-"correctAnswer":"d"},
-
-{"question":"7. The statement i++; is equivalent to:",
-"answers":{
-            "a":"i = i + i;",
-            "b":"i = i + 1;",
-            "c":"i = i - 1;",
-            "d":"i - - ;"
-          },
-"correctAnswer":"b"},
-
-{"question":"8. Another word for 'looping' is:",
-"answers":{
-            "a":"recapitulation ",
-            "b":"tintinabulation ",
-            "c":"iteration",
-            "d":"reiteration"
-          },
-"correctAnswer":"c"},
-
-{"question":"9. Which looping process is best used when the number of iterations is known?",
-"answers":{
-            "a":"for",
-            "b":"while",
-            "c":"do-while",
-            "d":"all of the above"
-          },
-"correctAnswer":"a"},
-
-{"question":"10.  Which of the following is not an infinite loop.",
-"answers":{
-            "a":"int i = 1 ; while ( 1 ) { i++ ; }",
-            "b":"for( int i =1; i < 10 ; i--) printf('Hello World');",
-            "c":"for(int i =1; i<100; i++) printf('Hello World');",
-            "d":"int i = 0; do{ i-- printf('%d ',i); }while(i>0);"
-          },
 "correctAnswer":"c"}
 
-
 ]

experiment/simulation/exp6/default.css

@@ -33,21 +33,21 @@ h4,h5,h6,pre,code,p {
 
 header#site_head {
 
-	background: url(images/bck_head.jpg);
+	/*background: url(images/bck_head.jpg);*/
 
 	/* create a shadow of dark pinkish red */
 
-	x-shadow: inset 0px -2px 3px #480508;
+	/*x-shadow: inset 0px -2px 3px #480508;
 	-khtml-box-shadow: inset 0px -2px 3px #480508;
 	-webkit-box-shadow: inset 0px -2px 3px #480508;
-	box-shadow: inset 0px -2px 3px #480508;
+	box-shadow: inset 0px -2px 3px #480508;*/
 
 	/* solid border of greyish white */
 
-	border-bottom: 1px solid #fffffb;
+	/*border-bottom: 1px solid #fffffb;
 	height: 40px;
 	width: 100%;
-	display: block;
+	display: block;*/
 }
 /* header of 960px width */
 

experiment/simulation/exp6/lab.html

@@ -207,7 +207,7 @@
 		<div class="header_cont"> <!-- 960px header-->
 			<!-- LOGO of the company-->
 			<div id="logo">
-			<h1> Recursion </h1>
+			<!--<h1> Recursion </h1>-->
 			</div>
 
 			<div id="help-menu">
@@ -289,4 +289,4 @@ <h4> HINTS </h4><br/>
 
 
 
-</body></html>
+</body></html>