Skip to content

P
Pariksha
Commit e5db01e4 authored by Samarth Joshi's avatar Samarth Joshi
Browse files
Options

Merge conflict start quis

parent 9f120fa8
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 7 deletions
quiz/templates/student.html
View file @ e5db01e4
...@@ -3,22 +3,18 @@ ...@@ -3,22 +3,18 @@
<title>Pariksha</title> <title>Pariksha</title>
<script> <script>
function start_quiz() { function start_quiz(x) {
window.open("/quiz/?q=1", "_blank", "fullscreen=yes"); window.open("/quiz/?q="+x, "_blank", "fullscreen=yes");
} }
</script> </script>
</head> </head>
<body> <body>
<center><h1><a>Welcome Student{{user}}</a></h1> <center><h1><a>Welcome Student{{user}}</a></h1>
<<<<<<< HEAD
<br><h1><a onclick="start_quiz()">Start Quiz</a></h1>
=======
<br><h1><a href="/quiz/?q=0">Start Quiz</a></h1> <br><h1><a href="/quiz/?q=0">Start Quiz</a></h1>
{%for quiz in quizId%} {%for quiz in quizId%}
<br><h1><a href="/quiz/?q={{quiz.0}}">Start Quiz Code:{{quiz.1}}</a></h1> <br><h1><a onclick="start_quiz({{quiz.0}})">Start Quiz Code:{{quiz.1}}</a></h1>
{%endfor%} {%endfor%}
<br><h1><a href="/quiz/?q={{quizID}}">{{quizcode}}</a></h1> <br><h1><a href="/quiz/?q={{quizID}}">{{quizcode}}</a></h1>
>>>>>>> 7eb030a176476698dd4d0fc0c98759b1ec498a1b
<br><h1><a href="/submissions/">View Previous Quizzes</a></h1> <br><h1><a href="/submissions/">View Previous Quizzes</a></h1>
</body> </body>
</html> </html>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment