X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=views%2Fcourse.pug;h=87788e348a085b6baa50cdd3d41d9067853f572c;hb=db5571d67f6b6b3b841fa1eeaf2099cecf2bcffc;hp=16552ceeecf188ebd05fa26944b1fbe15d3ce55f;hpb=e99c53fb3be56eb4c685dd061eef0e5b5bf22b73;p=qomet.git

diff --git a/views/course.pug b/views/course.pug
index 16552ce..87788e3 100644
--- a/views/course.pug
+++ b/views/course.pug
@@ -56,9 +56,6 @@ block content
 						.input-field
 							textarea#assessmentEdition.materialize-textarea(v-model="assessmentText")
 							label(for="assessmentEdition") Assessment in text format
-						.input-field
-							textarea#conclusion.materialize-textarea(v-model="assessment.conclusion")
-							label(for="conclusion") Conclusion
 				.modal-footer
 					.center-align
 						a.modal-action.modal-close.waves-effect.waves-light.btn-flat(href="#!") Done
@@ -89,12 +86,13 @@ block content
 						tbody
 							tr.grade(v-for="student in studentList(group)")
 								td {{ student.number }}
-								td(v-for="(assessment,i) in assessmentArray" @click="togglePresence(student.number,i)") {{ grade(i,student.number) }}
+								td(v-for="(assessment,i) in assessmentArray" @click="togglePresence(student.number,i)")
+									| {{ grade(i,student.number) }}
 				.modal-footer
 					.center-align
 						a.modal-action.modal-close.waves-effect.waves-light.btn-flat(href="#!") Close
 		.row(v-show="mode=='view'")
-			.col.s12.m10.offset-m1.l8.offset-l2.xl6.offset-xl3
+			.col.s12.m10.offset-m1
 				if teacher
 					h4.title(@click="toggleDisplay('students')") Students
 					.card(v-show="display=='students'")
@@ -105,13 +103,11 @@ block content
 							thead
 								tr
 									th Number
-									th Forename
 									th Name
 									th Group
 							tbody
 								tr.student(v-for="student in studentList(0)")
 									td {{ student.number }}
-									td {{ student.forename }}
 									td {{ student.name }}
 									td {{ student.group }}
 				h4.title(@click="toggleDisplay('assessments')") Assessments
@@ -119,18 +115,20 @@ block content
 					if teacher
 						.center-align
 							a.on-left.waves-effect.waves-light.btn.modal-trigger(href="#newAssessment") New assessment
-							input#password(type="password" v-model="monitorPwd" @keyup.enter="setPassword" placeholder="Password" title="Monitoring password")
+							input#password(type="password" v-model="monitorPwd" @keyup.enter="setPassword"
+									placeholder="Password" title="Monitoring password")
 					table
 						thead
 							tr
 								th Name
-								th Coefficient
+								th Mode
 								th #Questions
 								th Time
 						tbody
-							tr.assessment(v-for="(assessment,i) in assessmentArray" @click.left="actionAssessment(i)" @contextmenu.prevent="deleteAssessment(assessment)")
+							tr.assessment(v-for="(assessment,i) in assessmentArray" :class="{idle:!assessment.active}"
+									@click.left="actionAssessment(i)" @contextmenu.prevent="deleteAssessment(assessment)")
 								td {{ assessment.name }}
-								td {{ assessment.coefficient }}
+								td {{ assessment.mode }}
 								td {{ assessment.questions.reduce( (a,b) => { return b.active ? a+1 : a; }, 0) }}
 								td {{ assessment.time }}
 				if teacher
@@ -144,18 +142,16 @@ block content
 							li.tab
 								a(href="#group0") All
 							li.tab(v-for="group in groupList()")
-								a(:href="groupId(group,'hash')") G.{{ group }}
+								a(:href="groupId(group,'#')") G.{{ group }}
 						table.result(:id="groupId(group)" v-for="group in [0].concat(groupList())" @click="showDetails(group)")
 							thead
 								tr
 									th Number
-									th Forename
 									th Name
 									th Final
 							tbody
 								tr.grade(v-for="student in studentList(group)")
 									td {{ student.number }}
-									td {{ student.forename }}
 									td {{ student.name }}
 									td grade...
 									//td {{ grades[student.number].final }}
@@ -163,7 +159,7 @@ block content
 									td(colspan="4") Stats: range= stdev= mean=
 		if teacher
 			.row(v-show="mode=='edit'")
-				.col.s12.m10.offset-m1.l8.offset-l2.xl6.offset-xl3
+				.col.s12.m10.offset-m1
 					h4 {{ assessment.name }}
 					.card
 						.center-align
@@ -180,18 +176,17 @@ block content
 									label.on-left(:for="checkBoxFixedId(i)") Fixed
 									input(:id="checkBoxActiveId(i)" type="checkbox" v-model="question.active")
 									label(:for="checkBoxActiveId(i)") Active
-							.conclusion(v-html="assessment.conclusion")
 						.center-align
 							button.waves-effect.waves-light.btn.on-left(@click="mode='view'") Cancel
 							button.waves-effect.waves-light.btn(@click="updateAssessment") Send
 
 block append javascripts
 	script(src="//cdnjs.cloudflare.com/ajax/libs/PapaParse/4.3.6/papaparse.min.js")
-	script(src="/javascripts/utils/sha1.js")
-	script(src="/javascripts/utils/validation.js")
 	script.
 		let assessmentArray = !{JSON.stringify(assessmentArray)};
 		const course = !{JSON.stringify(course)};
 		const initials = "#{initials}";
 		const admin = #{teacher};
+	script(src="/javascripts/utils/sha1.js")
+	script(src="/javascripts/utils/validation.js")
 	script(src="/javascripts/course.js")