diff --git a/.gitignore b/.gitignore
index 1081b2e3d05bb134486137a9e8b7f9b1405565de..257b15a07d5968520df7f8d2e42835e41ed6d12f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,4 +17,4 @@ tests/.coverage
build/
tests/report/
db.sqlite3
-env/
+env-grady/
diff --git a/core/migrations/0027_submissiontype_description.py b/core/migrations/0027_submissiontype_description.py
new file mode 100644
index 0000000000000000000000000000000000000000..3e2c9f1c9b47da146c5067e5c1f00ebea464027b
--- /dev/null
+++ b/core/migrations/0027_submissiontype_description.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.6 on 2017-03-14 17:23
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('core', '0026_submission_seen'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='submissiontype',
+ name='description',
+ field=models.TextField(default=2),
+ preserve_default=False,
+ ),
+ ]
diff --git a/core/migrations/0028_auto_20170314_1726.py b/core/migrations/0028_auto_20170314_1726.py
new file mode 100644
index 0000000000000000000000000000000000000000..3993e2d96e216708709698ac0e40e168613f3d4c
--- /dev/null
+++ b/core/migrations/0028_auto_20170314_1726.py
@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.6 on 2017-03-14 17:26
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('core', '0027_submissiontype_description'),
+ ]
+
+ operations = [
+ migrations.RenameField(
+ model_name='submissiontype',
+ old_name='description',
+ new_name='correction_guideline',
+ ),
+ migrations.RenameField(
+ model_name='submissiontype',
+ old_name='guideline',
+ new_name='possible_solution',
+ ),
+ migrations.RenameField(
+ model_name='submissiontype',
+ old_name='solution',
+ new_name='task_description',
+ ),
+ ]
diff --git a/core/migrations/0029_feedback_empty.py b/core/migrations/0029_feedback_empty.py
new file mode 100644
index 0000000000000000000000000000000000000000..c691b2a64ff3201eee3a5d72330254114c8b8c24
--- /dev/null
+++ b/core/migrations/0029_feedback_empty.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.6 on 2017-03-15 13:48
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('core', '0028_auto_20170314_1726'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='feedback',
+ name='empty',
+ field=models.BooleanField(default=True),
+ ),
+ ]
diff --git a/core/migrations/0030_auto_20170315_1444.py b/core/migrations/0030_auto_20170315_1444.py
new file mode 100644
index 0000000000000000000000000000000000000000..d2f08c00e768ac06ba306f2cb0dda451bb5cc102
--- /dev/null
+++ b/core/migrations/0030_auto_20170315_1444.py
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.6 on 2017-03-15 14:44
+from __future__ import unicode_literals
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+ ('core', '0029_feedback_empty'),
+ ]
+
+ operations = [
+ migrations.RemoveField(
+ model_name='feedback',
+ name='of_reviewer',
+ ),
+ migrations.AddField(
+ model_name='feedback',
+ name='of_reviewer',
+ field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='reviewed_submissions', to=settings.AUTH_USER_MODEL),
+ ),
+ ]
diff --git a/core/migrations/0031_auto_20170315_1603.py b/core/migrations/0031_auto_20170315_1603.py
new file mode 100644
index 0000000000000000000000000000000000000000..274486c360d33bb9c0dd9690fef964500df2abdb
--- /dev/null
+++ b/core/migrations/0031_auto_20170315_1603.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.6 on 2017-03-15 16:03
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('core', '0030_auto_20170315_1444'),
+ ]
+
+ operations = [
+ migrations.RemoveField(
+ model_name='submission',
+ name='final_feedback',
+ ),
+ migrations.AlterField(
+ model_name='feedback',
+ name='of_submission',
+ field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='feedback', to='core.Submission'),
+ ),
+ ]
diff --git a/core/migrations/0032_auto_20170315_1609.py b/core/migrations/0032_auto_20170315_1609.py
new file mode 100644
index 0000000000000000000000000000000000000000..9e870eb465155b2f1a42692b33835b71e373597e
--- /dev/null
+++ b/core/migrations/0032_auto_20170315_1609.py
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.6 on 2017-03-15 16:09
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('core', '0031_auto_20170315_1603'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='submission',
+ name='final_feedback',
+ field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='core.Feedback'),
+ ),
+ migrations.AlterField(
+ model_name='feedback',
+ name='of_submission',
+ field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='feedback_list', to='core.Submission'),
+ ),
+ ]
diff --git a/core/models.py b/core/models.py
index bd9d40162959566f2d503d82ebdce5aa06f1dd04..8ca5713285dee9e927012d739fbea46f0a0650ce 100644
--- a/core/models.py
+++ b/core/models.py
@@ -1,5 +1,5 @@
-from random import sample
from string import ascii_lowercase
+from random import sample
from django.contrib.auth.models import User
from django.db import models
@@ -9,13 +9,18 @@ MAX_FEEDBACK_PER_SUBMISSION = 3
SLUG_LENGTH = 16
+def random_slug():
+ return ''.join(sample(ascii_lowercase, SLUG_LENGTH))
+
+
class SubmissionType(models.Model):
# Fields
name = models.CharField(max_length=50)
full_score = models.PositiveIntegerField(default=0)
- solution = models.TextField()
- guideline = models.TextField()
+ task_description = models.TextField()
+ possible_solution = models.TextField()
+ correction_guideline = models.TextField()
class Meta:
verbose_name = "SubmissionType"
@@ -31,7 +36,7 @@ class Student(models.Model):
matrikel_no = models.PositiveIntegerField(unique=True, default=0)
user = models.OneToOneField(
User, on_delete=models.CASCADE,
- limit_choices_to={'groups__name': 'Students'}
+ limit_choices_to={'groups__name': 'Students'},
)
class Meta:
@@ -45,7 +50,7 @@ class Student(models.Model):
class Submission(models.Model):
# Fields
- slug = models.SlugField(editable=False, unique=True)
+ slug = models.SlugField(editable=False, unique=True, default=random_slug)
seen = models.BooleanField(default=False)
type = models.ForeignKey(
SubmissionType,
@@ -68,7 +73,6 @@ class Submission(models.Model):
def save(self, *args, **kwargs):
self.status = SubmissionStatus.objects.create()
- self.slug = ''.join(sample(ascii_lowercase, SLUG_LENGTH))
super(Submission, self).save(*args, **kwargs)
def __str__(self):
@@ -146,8 +150,9 @@ class SubmissionStatus(models.Model):
class Feedback(models.Model):
# Fields
text = models.TextField()
- slug = models.SlugField(editable=False, unique=True)
+ slug = models.SlugField(editable=False, unique=True, default=random_slug)
final = models.BooleanField(default=False)
+ empty = models.BooleanField(default=True)
score = models.PositiveIntegerField(default=0)
of_submission = models.ForeignKey(
Submission,
@@ -158,21 +163,17 @@ class Feedback(models.Model):
related_name='corrected_submissions',
limit_choices_to={'groups__name': 'Tutors'}
)
- of_reviewer = models.ManyToManyField(
+ of_reviewer = models.ForeignKey(
User,
- related_name='reviewd_submissions',
+ related_name='reviewed_submissions',
limit_choices_to={'groups__name': 'Reviewers'},
- blank=True
+ blank=True, null=True
)
class Meta:
verbose_name = "Feedback"
verbose_name_plural = "Feedback Set"
- def save(self, *args, **kwargs):
- self.slug = ''.join(sample(ascii_lowercase, SLUG_LENGTH))
- super(Feedback, self).save(*args, **kwargs)
-
def __str__(self):
return 'Feedback for {}'.format(self.of_submission)
@@ -194,7 +195,7 @@ class Feedback(models.Model):
Feedback -- the feedback or none if no feedback was assigned
"""
tutor_feedback = cls.objects.filter(
- of_tutor=user, final=False,
+ of_tutor=user, empty=True,
)
return tutor_feedback[0] if tutor_feedback else None
@@ -206,11 +207,34 @@ class Feedback(models.Model):
[list] -- a QuerySet of tasks that have been assigned to this tutor
"""
tutor_feedback = cls.objects.filter(of_tutor=user)
- assert len(tutor_feedback.objects.filter(final=False)) <= 1
+ assert len(tutor_feedback.objects.filter(empty=True)) <= 1
return tutor_feedback
- def finalize_feedback(self):
+ def finalize_feedback(self, user):
+ """ Used to mark feedback as final (reviewed)
+
+ This makes it uneditable by the tutor
+
+ Arguments:
+ user {[type]} -- [description]
+ """
self.final = True
+ self.of_reviewer = user
+ self.of_submission.final_feedback = self
+ self.save()
+
+ def unfinalize_feedback(self):
+ """ Used to mark feedback as final (reviewed)
+
+ This makes it uneditable by the tutor
+
+ Arguments:
+ user {[type]} -- [description]
+ """
+ self.final = False
+ self.of_reviewer = None
+ self.of_submission.final_feedback = None
+ self.save()
def unassign_tutor(self):
self.of_submission.status.status = SubmissionStatus.READY
diff --git a/core/static/lib/js/tether.min.js b/core/static/lib/js/tether.min.js
new file mode 100755
index 0000000000000000000000000000000000000000..a31d2a15192dfedbef1935ff81782c99d0741b76
--- /dev/null
+++ b/core/static/lib/js/tether.min.js
@@ -0,0 +1 @@
+!function(t,e){"function"==typeof define&&define.amd?define(e):"object"==typeof exports?module.exports=e(require,exports,module):t.Tether=e()}(this,function(t,e,o){"use strict";function n(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function i(t){var e=t.getBoundingClientRect(),o={};for(var n in e)o[n]=e[n];if(t.ownerDocument!==document){var r=t.ownerDocument.defaultView.frameElement;if(r){var s=i(r);o.top+=s.top,o.bottom+=s.top,o.left+=s.left,o.right+=s.left}}return o}function r(t){var e=getComputedStyle(t)||{},o=e.position,n=[];if("fixed"===o)return[t];for(var i=t;(i=i.parentNode)&&i&&1===i.nodeType;){var r=void 0;try{r=getComputedStyle(i)}catch(s){}if("undefined"==typeof r||null===r)return n.push(i),n;var a=r,f=a.overflow,l=a.overflowX,h=a.overflowY;/(auto|scroll)/.test(f+h+l)&&("absolute"!==o||["relative","absolute","fixed"].indexOf(r.position)>=0)&&n.push(i)}return n.push(t.ownerDocument.body),t.ownerDocument!==document&&n.push(t.ownerDocument.defaultView),n}function s(){A&&document.body.removeChild(A),A=null}function a(t){var e=void 0;t===document?(e=document,t=document.documentElement):e=t.ownerDocument;var o=e.documentElement,n=i(t),r=P();return n.top-=r.top,n.left-=r.left,"undefined"==typeof n.width&&(n.width=document.body.scrollWidth-n.left-n.right),"undefined"==typeof n.height&&(n.height=document.body.scrollHeight-n.top-n.bottom),n.top=n.top-o.clientTop,n.left=n.left-o.clientLeft,n.right=e.body.clientWidth-n.width-n.left,n.bottom=e.body.clientHeight-n.height-n.top,n}function f(t){return t.offsetParent||document.documentElement}function l(){var t=document.createElement("div");t.style.width="100%",t.style.height="200px";var e=document.createElement("div");h(e.style,{position:"absolute",top:0,left:0,pointerEvents:"none",visibility:"hidden",width:"200px",height:"150px",overflow:"hidden"}),e.appendChild(t),document.body.appendChild(e);var o=t.offsetWidth;e.style.overflow="scroll";var n=t.offsetWidth;o===n&&(n=e.clientWidth),document.body.removeChild(e);var i=o-n;return{width:i,height:i}}function h(){var t=arguments.length<=0||void 0===arguments[0]?{}:arguments[0],e=[];return Array.prototype.push.apply(e,arguments),e.slice(1).forEach(function(e){if(e)for(var o in e)({}).hasOwnProperty.call(e,o)&&(t[o]=e[o])}),t}function u(t,e){if("undefined"!=typeof t.classList)e.split(" ").forEach(function(e){e.trim()&&t.classList.remove(e)});else{var o=new RegExp("(^| )"+e.split(" ").join("|")+"( |$)","gi"),n=c(t).replace(o," ");g(t,n)}}function d(t,e){if("undefined"!=typeof t.classList)e.split(" ").forEach(function(e){e.trim()&&t.classList.add(e)});else{u(t,e);var o=c(t)+(" "+e);g(t,o)}}function p(t,e){if("undefined"!=typeof t.classList)return t.classList.contains(e);var o=c(t);return new RegExp("(^| )"+e+"( |$)","gi").test(o)}function c(t){return t.className instanceof t.ownerDocument.defaultView.SVGAnimatedString?t.className.baseVal:t.className}function g(t,e){t.setAttribute("class",e)}function m(t,e,o){o.forEach(function(o){-1===e.indexOf(o)&&p(t,o)&&u(t,o)}),e.forEach(function(e){p(t,e)||d(t,e)})}function n(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function v(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}function y(t,e){var o=arguments.length<=2||void 0===arguments[2]?1:arguments[2];return t+o>=e&&e>=t-o}function b(){return"undefined"!=typeof performance&&"undefined"!=typeof performance.now?performance.now():+new Date}function w(){for(var t={top:0,left:0},e=arguments.length,o=Array(e),n=0;e>n;n++)o[n]=arguments[n];return o.forEach(function(e){var o=e.top,n=e.left;"string"==typeof o&&(o=parseFloat(o,10)),"string"==typeof n&&(n=parseFloat(n,10)),t.top+=o,t.left+=n}),t}function C(t,e){return"string"==typeof t.left&&-1!==t.left.indexOf("%")&&(t.left=parseFloat(t.left,10)/100*e.width),"string"==typeof t.top&&-1!==t.top.indexOf("%")&&(t.top=parseFloat(t.top,10)/100*e.height),t}function O(t,e){return"scrollParent"===e?e=t.scrollParents[0]:"window"===e&&(e=[pageXOffset,pageYOffset,innerWidth+pageXOffset,innerHeight+pageYOffset]),e===document&&(e=e.documentElement),"undefined"!=typeof e.nodeType&&!function(){var t=e,o=a(e),n=o,i=getComputedStyle(e);if(e=[n.left,n.top,o.width+n.left,o.height+n.top],t.ownerDocument!==document){var r=t.ownerDocument.defaultView;e[0]+=r.pageXOffset,e[1]+=r.pageYOffset,e[2]+=r.pageXOffset,e[3]+=r.pageYOffset}$.forEach(function(t,o){t=t[0].toUpperCase()+t.substr(1),"Top"===t||"Left"===t?e[o]+=parseFloat(i["border"+t+"Width"]):e[o]-=parseFloat(i["border"+t+"Width"])})}(),e}var E=function(){function t(t,e){for(var o=0;o<e.length;o++){var n=e[o];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(t,n.key,n)}}return function(e,o,n){return o&&t(e.prototype,o),n&&t(e,n),e}}(),x=void 0;"undefined"==typeof x&&(x={modules:[]});var A=null,T=function(){var t=0;return function(){return++t}}(),S={},P=function(){var t=A;t||(t=document.createElement("div"),t.setAttribute("data-tether-id",T()),h(t.style,{top:0,left:0,position:"absolute"}),document.body.appendChild(t),A=t);var e=t.getAttribute("data-tether-id");return"undefined"==typeof S[e]&&(S[e]=i(t),M(function(){delete S[e]})),S[e]},W=[],M=function(t){W.push(t)},_=function(){for(var t=void 0;t=W.pop();)t()},k=function(){function t(){n(this,t)}return E(t,[{key:"on",value:function(t,e,o){var n=arguments.length<=3||void 0===arguments[3]?!1:arguments[3];"undefined"==typeof this.bindings&&(this.bindings={}),"undefined"==typeof this.bindings[t]&&(this.bindings[t]=[]),this.bindings[t].push({handler:e,ctx:o,once:n})}},{key:"once",value:function(t,e,o){this.on(t,e,o,!0)}},{key:"off",value:function(t,e){if("undefined"!=typeof this.bindings&&"undefined"!=typeof this.bindings[t])if("undefined"==typeof e)delete this.bindings[t];else for(var o=0;o<this.bindings[t].length;)this.bindings[t][o].handler===e?this.bindings[t].splice(o,1):++o}},{key:"trigger",value:function(t){if("undefined"!=typeof this.bindings&&this.bindings[t]){for(var e=0,o=arguments.length,n=Array(o>1?o-1:0),i=1;o>i;i++)n[i-1]=arguments[i];for(;e<this.bindings[t].length;){var r=this.bindings[t][e],s=r.handler,a=r.ctx,f=r.once,l=a;"undefined"==typeof l&&(l=this),s.apply(l,n),f?this.bindings[t].splice(e,1):++e}}}}]),t}();x.Utils={getActualBoundingClientRect:i,getScrollParents:r,getBounds:a,getOffsetParent:f,extend:h,addClass:d,removeClass:u,hasClass:p,updateClasses:m,defer:M,flush:_,uniqueId:T,Evented:k,getScrollBarSize:l,removeUtilElements:s};var B=function(){function t(t,e){var o=[],n=!0,i=!1,r=void 0;try{for(var s,a=t[Symbol.iterator]();!(n=(s=a.next()).done)&&(o.push(s.value),!e||o.length!==e);n=!0);}catch(f){i=!0,r=f}finally{try{!n&&a["return"]&&a["return"]()}finally{if(i)throw r}}return o}return function(e,o){if(Array.isArray(e))return e;if(Symbol.iterator in Object(e))return t(e,o);throw new TypeError("Invalid attempt to destructure non-iterable instance")}}(),E=function(){function t(t,e){for(var o=0;o<e.length;o++){var n=e[o];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(t,n.key,n)}}return function(e,o,n){return o&&t(e.prototype,o),n&&t(e,n),e}}(),z=function(t,e,o){for(var n=!0;n;){var i=t,r=e,s=o;n=!1,null===i&&(i=Function.prototype);var a=Object.getOwnPropertyDescriptor(i,r);if(void 0!==a){if("value"in a)return a.value;var f=a.get;if(void 0===f)return;return f.call(s)}var l=Object.getPrototypeOf(i);if(null===l)return;t=l,e=r,o=s,n=!0,a=l=void 0}};if("undefined"==typeof x)throw new Error("You must include the utils.js file before tether.js");var j=x.Utils,r=j.getScrollParents,a=j.getBounds,f=j.getOffsetParent,h=j.extend,d=j.addClass,u=j.removeClass,m=j.updateClasses,M=j.defer,_=j.flush,l=j.getScrollBarSize,s=j.removeUtilElements,Y=function(){if("undefined"==typeof document)return"";for(var t=document.createElement("div"),e=["transform","WebkitTransform","OTransform","MozTransform","msTransform"],o=0;o<e.length;++o){var n=e[o];if(void 0!==t.style[n])return n}}(),L=[],D=function(){L.forEach(function(t){t.position(!1)}),_()};!function(){var t=null,e=null,o=null,n=function i(){return"undefined"!=typeof e&&e>16?(e=Math.min(e-16,250),void(o=setTimeout(i,250))):void("undefined"!=typeof t&&b()-t<10||(null!=o&&(clearTimeout(o),o=null),t=b(),D(),e=b()-t))};"undefined"!=typeof window&&"undefined"!=typeof window.addEventListener&&["resize","scroll","touchmove"].forEach(function(t){window.addEventListener(t,n)})}();var X={center:"center",left:"right",right:"left"},F={middle:"middle",top:"bottom",bottom:"top"},H={top:0,left:0,middle:"50%",center:"50%",bottom:"100%",right:"100%"},N=function(t,e){var o=t.left,n=t.top;return"auto"===o&&(o=X[e.left]),"auto"===n&&(n=F[e.top]),{left:o,top:n}},U=function(t){var e=t.left,o=t.top;return"undefined"!=typeof H[t.left]&&(e=H[t.left]),"undefined"!=typeof H[t.top]&&(o=H[t.top]),{left:e,top:o}},V=function(t){var e=t.split(" "),o=B(e,2),n=o[0],i=o[1];return{top:n,left:i}},R=V,q=function(t){function e(t){var o=this;n(this,e),z(Object.getPrototypeOf(e.prototype),"constructor",this).call(this),this.position=this.position.bind(this),L.push(this),this.history=[],this.setOptions(t,!1),x.modules.forEach(function(t){"undefined"!=typeof t.initialize&&t.initialize.call(o)}),this.position()}return v(e,t),E(e,[{key:"getClass",value:function(){var t=arguments.length<=0||void 0===arguments[0]?"":arguments[0],e=this.options.classes;return"undefined"!=typeof e&&e[t]?this.options.classes[t]:this.options.classPrefix?this.options.classPrefix+"-"+t:t}},{key:"setOptions",value:function(t){var e=this,o=arguments.length<=1||void 0===arguments[1]?!0:arguments[1],n={offset:"0 0",targetOffset:"0 0",targetAttachment:"auto auto",classPrefix:"tether"};this.options=h(n,t);var i=this.options,s=i.element,a=i.target,f=i.targetModifier;if(this.element=s,this.target=a,this.targetModifier=f,"viewport"===this.target?(this.target=document.body,this.targetModifier="visible"):"scroll-handle"===this.target&&(this.target=document.body,this.targetModifier="scroll-handle"),["element","target"].forEach(function(t){if("undefined"==typeof e[t])throw new Error("Tether Error: Both element and target must be defined");"undefined"!=typeof e[t].jquery?e[t]=e[t][0]:"string"==typeof e[t]&&(e[t]=document.querySelector(e[t]))}),d(this.element,this.getClass("element")),this.options.addTargetClasses!==!1&&d(this.target,this.getClass("target")),!this.options.attachment)throw new Error("Tether Error: You must provide an attachment");this.targetAttachment=R(this.options.targetAttachment),this.attachment=R(this.options.attachment),this.offset=V(this.options.offset),this.targetOffset=V(this.options.targetOffset),"undefined"!=typeof this.scrollParents&&this.disable(),"scroll-handle"===this.targetModifier?this.scrollParents=[this.target]:this.scrollParents=r(this.target),this.options.enabled!==!1&&this.enable(o)}},{key:"getTargetBounds",value:function(){if("undefined"==typeof this.targetModifier)return a(this.target);if("visible"===this.targetModifier){if(this.target===document.body)return{top:pageYOffset,left:pageXOffset,height:innerHeight,width:innerWidth};var t=a(this.target),e={height:t.height,width:t.width,top:t.top,left:t.left};return e.height=Math.min(e.height,t.height-(pageYOffset-t.top)),e.height=Math.min(e.height,t.height-(t.top+t.height-(pageYOffset+innerHeight))),e.height=Math.min(innerHeight,e.height),e.height-=2,e.width=Math.min(e.width,t.width-(pageXOffset-t.left)),e.width=Math.min(e.width,t.width-(t.left+t.width-(pageXOffset+innerWidth))),e.width=Math.min(innerWidth,e.width),e.width-=2,e.top<pageYOffset&&(e.top=pageYOffset),e.left<pageXOffset&&(e.left=pageXOffset),e}if("scroll-handle"===this.targetModifier){var t=void 0,o=this.target;o===document.body?(o=document.documentElement,t={left:pageXOffset,top:pageYOffset,height:innerHeight,width:innerWidth}):t=a(o);var n=getComputedStyle(o),i=o.scrollWidth>o.clientWidth||[n.overflow,n.overflowX].indexOf("scroll")>=0||this.target!==document.body,r=0;i&&(r=15);var s=t.height-parseFloat(n.borderTopWidth)-parseFloat(n.borderBottomWidth)-r,e={width:15,height:.975*s*(s/o.scrollHeight),left:t.left+t.width-parseFloat(n.borderLeftWidth)-15},f=0;408>s&&this.target===document.body&&(f=-11e-5*Math.pow(s,2)-.00727*s+22.58),this.target!==document.body&&(e.height=Math.max(e.height,24));var l=this.target.scrollTop/(o.scrollHeight-s);return e.top=l*(s-e.height-f)+t.top+parseFloat(n.borderTopWidth),this.target===document.body&&(e.height=Math.max(e.height,24)),e}}},{key:"clearCache",value:function(){this._cache={}}},{key:"cache",value:function(t,e){return"undefined"==typeof this._cache&&(this._cache={}),"undefined"==typeof this._cache[t]&&(this._cache[t]=e.call(this)),this._cache[t]}},{key:"enable",value:function(){var t=this,e=arguments.length<=0||void 0===arguments[0]?!0:arguments[0];this.options.addTargetClasses!==!1&&d(this.target,this.getClass("enabled")),d(this.element,this.getClass("enabled")),this.enabled=!0,this.scrollParents.forEach(function(e){e!==t.target.ownerDocument&&e.addEventListener("scroll",t.position)}),e&&this.position()}},{key:"disable",value:function(){var t=this;u(this.target,this.getClass("enabled")),u(this.element,this.getClass("enabled")),this.enabled=!1,"undefined"!=typeof this.scrollParents&&this.scrollParents.forEach(function(e){e.removeEventListener("scroll",t.position)})}},{key:"destroy",value:function(){var t=this;this.disable(),L.forEach(function(e,o){e===t&&L.splice(o,1)}),0===L.length&&s()}},{key:"updateAttachClasses",value:function(t,e){var o=this;t=t||this.attachment,e=e||this.targetAttachment;var n=["left","top","bottom","right","middle","center"];"undefined"!=typeof this._addAttachClasses&&this._addAttachClasses.length&&this._addAttachClasses.splice(0,this._addAttachClasses.length),"undefined"==typeof this._addAttachClasses&&(this._addAttachClasses=[]);var i=this._addAttachClasses;t.top&&i.push(this.getClass("element-attached")+"-"+t.top),t.left&&i.push(this.getClass("element-attached")+"-"+t.left),e.top&&i.push(this.getClass("target-attached")+"-"+e.top),e.left&&i.push(this.getClass("target-attached")+"-"+e.left);var r=[];n.forEach(function(t){r.push(o.getClass("element-attached")+"-"+t),r.push(o.getClass("target-attached")+"-"+t)}),M(function(){"undefined"!=typeof o._addAttachClasses&&(m(o.element,o._addAttachClasses,r),o.options.addTargetClasses!==!1&&m(o.target,o._addAttachClasses,r),delete o._addAttachClasses)})}},{key:"position",value:function(){var t=this,e=arguments.length<=0||void 0===arguments[0]?!0:arguments[0];if(this.enabled){this.clearCache();var o=N(this.targetAttachment,this.attachment);this.updateAttachClasses(this.attachment,o);var n=this.cache("element-bounds",function(){return a(t.element)}),i=n.width,r=n.height;if(0===i&&0===r&&"undefined"!=typeof this.lastSize){var s=this.lastSize;i=s.width,r=s.height}else this.lastSize={width:i,height:r};var h=this.cache("target-bounds",function(){return t.getTargetBounds()}),u=h,d=C(U(this.attachment),{width:i,height:r}),p=C(U(o),u),c=C(this.offset,{width:i,height:r}),g=C(this.targetOffset,u);d=w(d,c),p=w(p,g);for(var m=h.left+p.left-d.left,v=h.top+p.top-d.top,y=0;y<x.modules.length;++y){var b=x.modules[y],O=b.position.call(this,{left:m,top:v,targetAttachment:o,targetPos:h,elementPos:n,offset:d,targetOffset:p,manualOffset:c,manualTargetOffset:g,scrollbarSize:S,attachment:this.attachment});if(O===!1)return!1;"undefined"!=typeof O&&"object"==typeof O&&(v=O.top,m=O.left)}var E={page:{top:v,left:m},viewport:{top:v-pageYOffset,bottom:pageYOffset-v-r+innerHeight,left:m-pageXOffset,right:pageXOffset-m-i+innerWidth}},A=this.target.ownerDocument,T=A.defaultView,S=void 0;return A.body.scrollWidth>T.innerWidth&&(S=this.cache("scrollbar-size",l),E.viewport.bottom-=S.height),A.body.scrollHeight>T.innerHeight&&(S=this.cache("scrollbar-size",l),E.viewport.right-=S.width),(-1===["","static"].indexOf(A.body.style.position)||-1===["","static"].indexOf(A.body.parentElement.style.position))&&(E.page.bottom=A.body.scrollHeight-v-r,E.page.right=A.body.scrollWidth-m-i),"undefined"!=typeof this.options.optimizations&&this.options.optimizations.moveElement!==!1&&"undefined"==typeof this.targetModifier&&!function(){var e=t.cache("target-offsetparent",function(){return f(t.target)}),o=t.cache("target-offsetparent-bounds",function(){return a(e)}),n=getComputedStyle(e),i=o,r={};if(["Top","Left","Bottom","Right"].forEach(function(t){r[t.toLowerCase()]=parseFloat(n["border"+t+"Width"])}),o.right=A.body.scrollWidth-o.left-i.width+r.right,o.bottom=A.body.scrollHeight-o.top-i.height+r.bottom,E.page.top>=o.top+r.top&&E.page.bottom>=o.bottom&&E.page.left>=o.left+r.left&&E.page.right>=o.right){var s=e.scrollTop,l=e.scrollLeft;E.offset={top:E.page.top-o.top+s-r.top,left:E.page.left-o.left+l-r.left}}}(),this.move(E),this.history.unshift(E),this.history.length>3&&this.history.pop(),e&&_(),!0}}},{key:"move",value:function(t){var e=this;if("undefined"!=typeof this.element.parentNode){var o={};for(var n in t){o[n]={};for(var i in t[n]){for(var r=!1,s=0;s<this.history.length;++s){var a=this.history[s];if("undefined"!=typeof a[n]&&!y(a[n][i],t[n][i])){r=!0;break}}r||(o[n][i]=!0)}}var l={top:"",left:"",right:"",bottom:""},u=function(t,o){var n="undefined"!=typeof e.options.optimizations,i=n?e.options.optimizations.gpu:null;if(i!==!1){var r=void 0,s=void 0;t.top?(l.top=0,r=o.top):(l.bottom=0,r=-o.bottom),t.left?(l.left=0,s=o.left):(l.right=0,s=-o.right),l[Y]="translateX("+Math.round(s)+"px) translateY("+Math.round(r)+"px)","msTransform"!==Y&&(l[Y]+=" translateZ(0)")}else t.top?l.top=o.top+"px":l.bottom=o.bottom+"px",t.left?l.left=o.left+"px":l.right=o.right+"px"},d=!1;if((o.page.top||o.page.bottom)&&(o.page.left||o.page.right)?(l.position="absolute",u(o.page,t.page)):(o.viewport.top||o.viewport.bottom)&&(o.viewport.left||o.viewport.right)?(l.position="fixed",u(o.viewport,t.viewport)):"undefined"!=typeof o.offset&&o.offset.top&&o.offset.left?!function(){l.position="absolute";var n=e.cache("target-offsetparent",function(){return f(e.target)});f(e.element)!==n&&M(function(){e.element.parentNode.removeChild(e.element),n.appendChild(e.element)}),u(o.offset,t.offset),d=!0}():(l.position="absolute",u({top:!0,left:!0},t.page)),!d){for(var p=!0,c=this.element.parentNode;c&&1===c.nodeType&&"BODY"!==c.tagName;){if("static"!==getComputedStyle(c).position){p=!1;break}c=c.parentNode}p||(this.element.parentNode.removeChild(this.element),this.element.ownerDocument.body.appendChild(this.element))}var g={},m=!1;for(var i in l){var v=l[i],b=this.element.style[i];b!==v&&(m=!0,g[i]=v)}m&&M(function(){h(e.element.style,g)})}}}]),e}(k);q.modules=[],x.position=D;var I=h(q,x),B=function(){function t(t,e){var o=[],n=!0,i=!1,r=void 0;try{for(var s,a=t[Symbol.iterator]();!(n=(s=a.next()).done)&&(o.push(s.value),!e||o.length!==e);n=!0);}catch(f){i=!0,r=f}finally{try{!n&&a["return"]&&a["return"]()}finally{if(i)throw r}}return o}return function(e,o){if(Array.isArray(e))return e;if(Symbol.iterator in Object(e))return t(e,o);throw new TypeError("Invalid attempt to destructure non-iterable instance")}}(),j=x.Utils,a=j.getBounds,h=j.extend,m=j.updateClasses,M=j.defer,$=["left","top","right","bottom"];x.modules.push({position:function(t){var e=this,o=t.top,n=t.left,i=t.targetAttachment;if(!this.options.constraints)return!0;var r=this.cache("element-bounds",function(){return a(e.element)}),s=r.height,f=r.width;if(0===f&&0===s&&"undefined"!=typeof this.lastSize){var l=this.lastSize;f=l.width,s=l.height}var u=this.cache("target-bounds",function(){return e.getTargetBounds()}),d=u.height,p=u.width,c=[this.getClass("pinned"),this.getClass("out-of-bounds")];this.options.constraints.forEach(function(t){var e=t.outOfBoundsClass,o=t.pinnedClass;e&&c.push(e),o&&c.push(o)}),c.forEach(function(t){["left","top","right","bottom"].forEach(function(e){c.push(t+"-"+e)})});var g=[],v=h({},i),y=h({},this.attachment);return this.options.constraints.forEach(function(t){var r=t.to,a=t.attachment,l=t.pin;"undefined"==typeof a&&(a="");var h=void 0,u=void 0;if(a.indexOf(" ")>=0){var c=a.split(" "),m=B(c,2);u=m[0],h=m[1]}else h=u=a;var b=O(e,r);("target"===u||"both"===u)&&(o<b[1]&&"top"===v.top&&(o+=d,v.top="bottom"),o+s>b[3]&&"bottom"===v.top&&(o-=d,v.top="top")),"together"===u&&("top"===v.top&&("bottom"===y.top&&o<b[1]?(o+=d,v.top="bottom",o+=s,y.top="top"):"top"===y.top&&o+s>b[3]&&o-(s-d)>=b[1]&&(o-=s-d,v.top="bottom",y.top="bottom")),"bottom"===v.top&&("top"===y.top&&o+s>b[3]?(o-=d,v.top="top",o-=s,y.top="bottom"):"bottom"===y.top&&o<b[1]&&o+(2*s-d)<=b[3]&&(o+=s-d,v.top="top",y.top="top")),"middle"===v.top&&(o+s>b[3]&&"top"===y.top?(o-=s,y.top="bottom"):o<b[1]&&"bottom"===y.top&&(o+=s,y.top="top"))),("target"===h||"both"===h)&&(n<b[0]&&"left"===v.left&&(n+=p,v.left="right"),n+f>b[2]&&"right"===v.left&&(n-=p,v.left="left")),"together"===h&&(n<b[0]&&"left"===v.left?"right"===y.left?(n+=p,v.left="right",n+=f,y.left="left"):"left"===y.left&&(n+=p,v.left="right",n-=f,y.left="right"):n+f>b[2]&&"right"===v.left?"left"===y.left?(n-=p,v.left="left",n-=f,y.left="right"):"right"===y.left&&(n-=p,v.left="left",n+=f,y.left="left"):"center"===v.left&&(n+f>b[2]&&"left"===y.left?(n-=f,y.left="right"):n<b[0]&&"right"===y.left&&(n+=f,y.left="left"))),("element"===u||"both"===u)&&(o<b[1]&&"bottom"===y.top&&(o+=s,y.top="top"),o+s>b[3]&&"top"===y.top&&(o-=s,y.top="bottom")),("element"===h||"both"===h)&&(n<b[0]&&("right"===y.left?(n+=f,y.left="left"):"center"===y.left&&(n+=f/2,y.left="left")),n+f>b[2]&&("left"===y.left?(n-=f,y.left="right"):"center"===y.left&&(n-=f/2,y.left="right"))),"string"==typeof l?l=l.split(",").map(function(t){return t.trim()}):l===!0&&(l=["top","left","right","bottom"]),l=l||[];var w=[],C=[];o<b[1]&&(l.indexOf("top")>=0?(o=b[1],w.push("top")):C.push("top")),o+s>b[3]&&(l.indexOf("bottom")>=0?(o=b[3]-s,w.push("bottom")):C.push("bottom")),n<b[0]&&(l.indexOf("left")>=0?(n=b[0],w.push("left")):C.push("left")),n+f>b[2]&&(l.indexOf("right")>=0?(n=b[2]-f,w.push("right")):C.push("right")),w.length&&!function(){var t=void 0;t="undefined"!=typeof e.options.pinnedClass?e.options.pinnedClass:e.getClass("pinned"),g.push(t),w.forEach(function(e){g.push(t+"-"+e)})}(),C.length&&!function(){var t=void 0;t="undefined"!=typeof e.options.outOfBoundsClass?e.options.outOfBoundsClass:e.getClass("out-of-bounds"),g.push(t),C.forEach(function(e){g.push(t+"-"+e)})}(),(w.indexOf("left")>=0||w.indexOf("right")>=0)&&(y.left=v.left=!1),(w.indexOf("top")>=0||w.indexOf("bottom")>=0)&&(y.top=v.top=!1),(v.top!==i.top||v.left!==i.left||y.top!==e.attachment.top||y.left!==e.attachment.left)&&(e.updateAttachClasses(y,v),e.trigger("update",{attachment:y,targetAttachment:v}))}),M(function(){e.options.addTargetClasses!==!1&&m(e.target,g,c),m(e.element,g,c)}),{top:o,left:n}}});var j=x.Utils,a=j.getBounds,m=j.updateClasses,M=j.defer;x.modules.push({position:function(t){var e=this,o=t.top,n=t.left,i=this.cache("element-bounds",function(){return a(e.element)}),r=i.height,s=i.width,f=this.getTargetBounds(),l=o+r,h=n+s,u=[];o<=f.bottom&&l>=f.top&&["left","right"].forEach(function(t){var e=f[t];(e===n||e===h)&&u.push(t)}),n<=f.right&&h>=f.left&&["top","bottom"].forEach(function(t){var e=f[t];(e===o||e===l)&&u.push(t)});var d=[],p=[],c=["left","top","right","bottom"];return d.push(this.getClass("abutted")),c.forEach(function(t){d.push(e.getClass("abutted")+"-"+t)}),u.length&&p.push(this.getClass("abutted")),u.forEach(function(t){p.push(e.getClass("abutted")+"-"+t)}),M(function(){e.options.addTargetClasses!==!1&&m(e.target,p,d),m(e.element,p,d)}),!0}});var B=function(){function t(t,e){var o=[],n=!0,i=!1,r=void 0;try{for(var s,a=t[Symbol.iterator]();!(n=(s=a.next()).done)&&(o.push(s.value),!e||o.length!==e);n=!0);}catch(f){i=!0,r=f}finally{try{!n&&a["return"]&&a["return"]()}finally{if(i)throw r}}return o}return function(e,o){if(Array.isArray(e))return e;if(Symbol.iterator in Object(e))return t(e,o);throw new TypeError("Invalid attempt to destructure non-iterable instance")}}();return x.modules.push({position:function(t){var e=t.top,o=t.left;if(this.options.shift){var n=this.options.shift;"function"==typeof this.options.shift&&(n=this.options.shift.call(this,{top:e,left:o}));var i=void 0,r=void 0;if("string"==typeof n){n=n.split(" "),n[1]=n[1]||n[0];var s=n,a=B(s,2);i=a[0],r=a[1],i=parseFloat(i,10),r=parseFloat(r,10)}else i=n.top,r=n.left;return e+=i,o+=r,{top:e,left:o}}}}),I});
\ No newline at end of file
diff --git a/core/static/res/brand.png b/core/static/res/brand.png
new file mode 100644
index 0000000000000000000000000000000000000000..5dfdb7913e235b0e63d195afc1d27f1b4ad04c86
Binary files /dev/null and b/core/static/res/brand.png differ
diff --git a/core/static/res/favicon.png b/core/static/res/favicon.png
new file mode 100644
index 0000000000000000000000000000000000000000..f536cef3471a2164c065c482fb6e006ef054cf4f
Binary files /dev/null and b/core/static/res/favicon.png differ
diff --git a/core/templates/base.html b/core/templates/base.html
index 4033e30e1e249d33d093fe9ec34f347c124f5dcf..1b5e91e57e1ddb1e52239e8dcf89dd468b7e7d0a 100644
--- a/core/templates/base.html
+++ b/core/templates/base.html
@@ -1,6 +1,5 @@
{% load staticfiles %}
-
<!DOCTYPE html>
<html lang="en">
<head>
@@ -11,24 +10,34 @@
<title>Grady - {% block title %}Wellcome to correction hell!{% endblock %}</title>
+ {# Favicon #}
+ <link rel="shortcut icon" href="{% static 'res/favicon.png' %}">
+
{# CSS includes #}
<link rel="stylesheet" href="{% static 'lib/css/bootstrap.min.css' %}">
<link rel="stylesheet" href="{% static 'lib/css/codemirror.css' %}">
<link rel="stylesheet" href="{% static 'lib/css/custom.css' %}">
<link rel="stylesheet" href="{% static 'lib/css/dialog.css' %}">
+
+
{# Importing the stuff for codemirror #}
<script src="{% static 'lib/js/codemirror.js' %}"></script>
<script src="{% static 'lib/js/vim.js' %}"></script>
<script src="{% static 'lib/js/dialog.js' %}"></script>
<script src="{% static 'lib/js/searchcursor.js' %}"></script>
+
{# Load other javascript #}
<script src="{% static 'lib/js/jquery-3.1.1.min.js' %}"></script>
+ <script src="{% static 'lib/js/tether.min.js' %}"></script>
<script src="{% static 'lib/js/bootstrap.min.js' %}"></script>
-
</head>
+{# Navbar contaning: Brand - Title - Page Title <---> (Username - Logout || Login form) #}
<nav class="navbar navbar-toggleable-md navbar-light bg-faded">
- <a class="navbar-brand" href="{% url 'index' %}">Grady</a>
+ <a class="navbar-brand" href="{% url 'index' %}">
+ <img src="{% static 'res/brand.png' %}" width="30" height="30" class="d-inline-block align-top" alt="">
+ Grady
+ </a>
<ul class="nav nav-pills mr-auto">
<li class="nav-item"><div class="nav-text">{% block nav_title %}{% endblock nav_title %}</div></li>
diff --git a/core/templates/core/feedback_form.html b/core/templates/core/feedback_form.html
index 4668e3ca31c0f6eed853c7f3d5b3ef48aa04c86d..a54ad21c56ef688014ca6bf738be0362fb6731e4 100644
--- a/core/templates/core/feedback_form.html
+++ b/core/templates/core/feedback_form.html
@@ -4,27 +4,61 @@
{% block title %} Editing Feedback {% endblock %}
-{% block body_block %}
+{% load staticfiles %}
+{% block body_block %}
<div class="row m-2">
<div class="col-auto m-2">
<h2>The student submitted:</h2>
<textarea id="student_text">
- {{ submission.text }}
+ {{ feedback.of_submission.text }}
</textarea>
+ <div class="my-2">
+ <a class="btn btn-primary" data-toggle="collapse" href="#collapsed_task" aria-expanded="false" aria-controls="collapsed_task">Task</a>
+ <a class="btn btn-primary" data-toggle="collapse" href="#possible_solution" aria-expanded="false" aria-controls="possible_solution">Solution</a>
+ <a class="btn btn-primary" data-toggle="collapse" href="#correction_guideline" aria-expanded="false" aria-controls="correction_guideline">Guideline</a>
+ <a class="btn btn-primary" data-toggle="collapse" href="#custom_feedback" aria-expanded="false" aria-controls="custom_feedback">Custom feedback</a>
+ <button type="button" id="collapseAllOpen" class="btn btn-secondary">Open All</button>
+ <button type="button" id="collapseAllClose" class="btn btn-secondary">Close All</button>
+ </div>
+ <div class="collapse my-2" id="collapsed_task">
+ <div class="card card-block">
+ {{ feedback.of_submission.type.task_description }}
+ </div>
+ </div>
+ <div class="collapse my-2" id="possible_solution">
+ <div class="card card-block">
+ {{ feedback.of_submission.type.possible_solution }}
+ </div>
+ </div>
+ <div class="collapse my-2" id="correction_guideline">
+ <div class="card card-block">
+ {{ feedback.of_submission.type.correction_guideline }}
+ </div>
+ </div>
+ <div class="collapse my-2" id="custom_feedback">
+ <div class="card card-block">
+ Compiler output / custom feedback goes here.
+ </div>
+ </div>
</div>
<div class="col-auto m-2">
<h2>Please provide your feedback here:</h2>
- <form action="{% url 'FeedbackEdit' feedback_slug %}" method="post" id="form1">
+ <form action="{% url 'FeedbackEdit' feedback.slug %}" method="post" id="form1">
{% csrf_token %}
{% for field in form %}
{% if field.name == "score" %}
- <div class="form-inline m-2">
+ <div class="form-inline my-2">
<label for="id_{{ field.name }}">{{ field.name|capfirst }}:</label>
- <div class="form-group">
{{ field }}
- </div>
+ {% if not feedback.final %}
+ <button type="submit" form="form1" class="btn btn-success mx-1" name="update" value="Submit">Submit</button>
+ <a href="{% url 'FeedbackDelete' feedback.slug %}" class="btn btn-danger" name="delete" value="Delete">Delete</a>
+ {% else %}
+ <button class="btn btn-success mx-1" value="Submit" disabled>Submit</button>
+ <button class="btn btn-danger" value="Delete" disabled>Delete</button>
+ {% endif %}
</div>
{% else %}
<div> {{ field }} </div>
@@ -34,29 +68,42 @@
</div>
</div>
-<div class="row justify-content-md-center m-2">
- <div class="col col-2">
- <button type="submit" form="form1" class="btn btn-primary" name="update" value="Submit">Submit</button>
- <a href="{% url 'FeedbackDelete' feedback_slug %}" class="btn btn-primary" name="delete" value="Delete">Delete</a>
- </div>
-</div>
{% endblock %}
{% block script_block %}
<script>
-var studentTextArea = document.getElementById('student_text');
-var editorTutor = CodeMirror.fromTextArea(studentTextArea, {
- lineNumbers: true,
- readOnly: true,
-});
-editorTutor.setSize(600, 500);
-
-var tutorTextArea = document.getElementById('id_text');
-var editorTutor = CodeMirror.fromTextArea(tutorTextArea, {
- lineNumbers: true,
- keyMap: "vim",
-});
-editorTutor.setSize(600, 500);
+ $(document).ready(function(){
+ $('#collapseAllClose').hide();
+
+ $('#collapseAllOpen').click(function(){
+ $('.collapse').collapse('show');
+ $('#collapseAllOpen').hide();
+ $('#collapseAllClose').show();
+ });
+
+ $('#collapseAllClose').click(function(){
+ $('.collapse').collapse('hide');
+ $('#collapseAllClose').hide();
+ $('#collapseAllOpen').show();
+ });
+ });
+ var studentTextArea = document.getElementById('student_text');
+ var editorTutor = CodeMirror.fromTextArea(studentTextArea, {
+ lineNumbers: true,
+ readOnly: true,
+ });
+ editorTutor.setSize(600, 500);
+
+ var tutorTextArea = document.getElementById('id_text');
+ var editorTutor = CodeMirror.fromTextArea(tutorTextArea, {
+ lineNumbers: true,
+ {% if not feedback.final %}
+ keyMap: "vim",
+ {% else %}
+ readOnly: true,
+ {% endif %}
+ });
+ editorTutor.setSize(600, 500);
</script>
{% endblock script_block %}
diff --git a/core/templates/core/feedback_static.html b/core/templates/core/feedback_static.html
deleted file mode 100644
index 2d99603045be125dea53405348d2b4c074dacd3e..0000000000000000000000000000000000000000
--- a/core/templates/core/feedback_static.html
+++ /dev/null
@@ -1,27 +0,0 @@
-{% extends "base.html" %}
-
-{% block nav_title %} Feedback View {% endblock nav_title %}
-
-
-{% block body_block %}
-
- <div class="row m-2">
- <h1>This is the view for {{ feedback }}</h1>
- </div>
-
- <div class="row m-2">
- <h2>The student {{ feedback.of_submission.student }} has submitted:</h2>
- <pre>{{ feedback.of_submission.text }}</pre>
- <h2> {{ feedback.of_tutor }} has created this feedback:</h2>
- <pre>{{ feedback.text }}</pre>
- <p>The final score based on this feedback is <code>{{ feedback.score }}</code>. </p>
- </div>
-
-
-
- {% if not feedback.of_reviwer %}
- <h2>Nobody reviewed this feedback so far</h2>
- {% endif %}
-{% endblock body_block %}
-
-
diff --git a/core/templates/core/reviewer_startpage.html b/core/templates/core/reviewer_startpage.html
new file mode 100644
index 0000000000000000000000000000000000000000..564a1aadb7a850683feefbc0a312ccebce947194
--- /dev/null
+++ b/core/templates/core/reviewer_startpage.html
@@ -0,0 +1,58 @@
+{% extends 'base.html' %}
+
+{% load staticfiles %}
+
+{% block nav_title %} Ready for an exam, captian? {% endblock nav_title %}
+
+{% block body_block %}
+<div class="row-md-auto my-4 page-header">
+ {% if feedback_list|length == 0 %}
+ <h2>Nobody has provided any feedback, yet. Maybe you have to kick some ass?</h2>
+ {% else %}
+ {% if feedback_list|length == 1 %}
+ <h2>Well, one is better than nothing</h2>
+ {% else %}
+ <h2>So far {{feedback_list|length}} feedback constributions were provided</h2>
+ {% endif %}
+</div>
+
+<div class="row-md-auto my-2">
+ <table class="table">
+ <thead>
+ <tr>
+ <th></th>
+ <th>Submission Type</th>
+ <th>Student</th>
+ <th>Score</th>
+ <th>Tutor</th>
+ <th></th>
+ </tr>
+ </thead>
+ <tbody>
+ {% for feedback in feedback_list %}
+ <tr>
+ <td class="align-middle"> {% if feedback.final %}
+ <span class="badge badge-success">Final</span>
+ {% endif %}</td>
+ <td class="align-middle"> {{ feedback.of_submission.type }} </td>
+ <td class="align-middle"> {{ feedback.of_submission.student }} </td>
+ <td class="align-middle"> {{ feedback.score}} </td>
+ <td class="align-middle"> {{ feedback.of_tutor}} </td>
+ <td class="align-middle">
+ <a href="{% url 'FeedbackDelete' feedback.slug %}" class="btn btn-primary" name="delete" value="Delete">Delete</a>
+ <a href="{% url 'FeedbackEdit' feedback.slug %}" class="btn btn-primary" name="delete" value="View">View</a>
+ {% if not feedback.final %}
+ <a class="btn btn-primary" href="{% url 'FeedbackMarkFinal' feedback.slug %}"> Mark final </a>
+ {% else %}
+ <a class="btn btn-secondary" href="{% url 'FeedbackMarkNotFinal' feedback.slug %}"> Undo </a>
+ {% endif %}
+ </td>
+ </tr>
+ {% endfor %}
+ </tbody>
+ </table>
+</div>
+
+{% endif %}
+
+{% endblock body_block %}
diff --git a/core/templates/core/student_startpage.html b/core/templates/core/student_startpage.html
index 175fc5c1e5f2b7e4ea154e4a678f180d298f191f..1f3754484282ed79c771bb4e45a81bfb2c3a5daa 100644
--- a/core/templates/core/student_startpage.html
+++ b/core/templates/core/student_startpage.html
@@ -6,12 +6,12 @@
{% block body_block %}
-<div class="rwo m-2">
- <h2>Hello {{ student }}! You can review your exam</h2>
+<div class="rwo my-3">
+ <h2>Hello {{ student.student }}</h2>
</div>
-<div class="row m-2">
+<div class="row my-2">
<table class="table">
<thead>
<th></th>
@@ -27,11 +27,13 @@
{% endif %}</td>
<td class="align-middle">{{ submission.type }}</td>
<td class="align-middle">
- {% if submission.final_feedback %}
- submission.final_feedback.score
- {% else %}
- <span class="badge badge-danger">No Feedback</span>
- {% endif %}
+ {% with submission.feedback_list.all|first as feedback %}
+ {% if feedback.final %}
+ <code><code> {{ feedback.score}} / {{submission.type.full_score}} </code></code>
+ {% else %}
+ <span class="badge badge-danger">No Feedback</span>
+ {% endif %}
+ {% endwith %}
</td>
<td class="align-middle"><a class="btn btn-primary" href="{% url 'SubmissionView' submission.slug %}">View</a></td>
</tr>
diff --git a/core/templates/core/submission_view.html b/core/templates/core/submission_view.html
index 96ac50edc17a9efc7cbdeb6a1b75883662ec35a3..0721755267a2e5a47923c5f5b16e258c47e0c372 100644
--- a/core/templates/core/submission_view.html
+++ b/core/templates/core/submission_view.html
@@ -1,38 +1,50 @@
{% extends "base.html" %}
-{% block nav_title %} Submission View {% endblock nav_title %}
+{% block nav_title %} Student Exam View {% endblock nav_title %}
-{% block body_block %}
-
- <div class="row m-2">
- <h2>This is the view for</h2><br>
- <ul>
- <li>Submission Type: {{ submission.type }} </li>
- <li>Student: {{ submission.student }} </li>
- </ul>
- </div>
- <div class="row m-2">
- <h2>The student {{ submission.student }} has submitted:</h2>
- </div>
+{% block body_block %}
+ {% with submission.feedback_list.all|first as feedback %}
<div class="row">
- <textarea id="submission_text">{{ submission.text }}</textarea>
- <h2> {{ submission.of_tutor }} has created this submission:</h2>
- <pre>{{ submission.text }}</pre>
- <p>The final score based on this submission is <code>{{ submission.score }}</code>. </p>
-
+ <div class="col-4 my-5">
+ <div class="card">
+ <div class="card-block">
+ <h4 class="card-title">Submission Information</h4>
+ <ul class="list-group list-group-flush">
+ <li class="list-group-item"><strong class="mr-2">Submission Type: </strong> {{ submission.type }} </li>
+ <li class="list-group-item"><strong class="mr-2">Student: </strong> {{ submission.student }}</li>
+ <li class="list-group-item"><strong class="mr-2">Score: </strong> <code> {{ feedback.score}} / {{submission.type.full_score}} </code> </li>
+ </ul>
+ </div>
+ </div>
+ </div>
+
+ <div class="col my">
+ <p><h2> Your submission: </h2></p>
+ <p><textarea id="textarea_submission">{{ feedback.of_submission.text }}</textarea id="textareaSubmission"></p>
+ <p><h2> Feedback: </h2></p>
+ <p><textarea id="textarea_feedback">{{ feedback.text }}</textarea id="textareaSubmission"></p>
+ </div>
</div>
-
+ {% endwith %}
{% endblock body_block %}
+
{% block script_block %}
<script>
-var studentTextArea = $('#submission_text');
-var editor = CodeMirror.fromTextArea(studentTextArea, {
- lineNumbers: true,
- readOnly: true,
-});
-editor.setSize(600, 500);
-
+ var studentTextArea = document.getElementById('textarea_submission');
+ var editorTutor = CodeMirror.fromTextArea(studentTextArea, {
+ lineNumbers: true,
+ readOnly: true,
+ });
+ editorTutor.setSize(600, 500);
+
+ var tutorTextArea = document.getElementById('textarea_feedback');
+ var editorTutor = CodeMirror.fromTextArea(tutorTextArea, {
+ lineNumbers: true,
+ readOnly: true,
+ });
+ editorTutor.setSize(600, 500);
+</script>
{% endblock script_block %}
diff --git a/core/templates/core/tutor_startpage.html b/core/templates/core/tutor_startpage.html
index 47f49dcddf61e425f00d6910bdbded8904d3cc12..c04713848eebb375bb0786bcf69c35acd5ceaa16 100644
--- a/core/templates/core/tutor_startpage.html
+++ b/core/templates/core/tutor_startpage.html
@@ -16,7 +16,7 @@
{% endif %}
</div>
-<div class="row-md-auto m-2">
+<div class="row-md-auto my-2">
<table class="table">
<thead>
<tr>
@@ -32,11 +32,11 @@
<td> {{ feedback.score}} </td>
<td>
{% if feedback.final %}
- <a class="btn btn-primary" href="{% url 'FeedbackEdit' feedback.slug %}"> Edit </a>
+ <a class="btn btn-secondary" href="{% url 'FeedbackEdit' feedback.slug %}"> View </a>
{% else %}
- <a class="btn btn-primary" href="{% url 'FeedbackEdit' feedback.slug %}"> Create </a>
+ <a class="btn btn-primary" href="{% url 'FeedbackEdit' feedback.slug %}"> Edit </a>
+ <a href="{% url 'FeedbackDelete' feedback.slug %}" class="btn btn-primary" name="delete" value="Delete">Delete</a>
{% endif %}
- <a href="{% url 'FeedbackDelete' feedback.slug %}" class="btn btn-primary" name="delete" value="Delete">Delete</a>
</td>
</tr>
{% endfor %}
@@ -46,7 +46,7 @@
{% endif %}
-<div class="row-md-auto m-4">
+<div class="row-md-auto my-4">
<a role="button" class="btn btn-danger btn-xl" href="{% url 'FeedbackCreate' %}">Give me work</a>
</div>
{% endblock body_block %}
diff --git a/core/urls.py b/core/urls.py
index 89094831d9eb1e4ae4cd3dfa6bebc37f87ff1b86..2f5b255813cd30c0cdc6059a4878f984ae4bea22 100644
--- a/core/urls.py
+++ b/core/urls.py
@@ -11,8 +11,9 @@ urlpatterns = [
url(r'^finished/$', views.finished, name='end'),
url(r'^feedback/edit/(?P<feedback_slug>\w+)/$', views.FeedbackEdit.as_view(), name='FeedbackEdit'),
- url(r'^feedback/view/(?P<feedback_slug>\w+)/$', views.feedback, name='FeedbackView'),
url(r'^feedback/delete/(?P<feedback_slug>\w+)/$', views.delete_feedback, name='FeedbackDelete'),
+ url(r'^feedback/markfinal/(?P<feedback_slug>\w+)/$', views.markfinal_feedback, name='FeedbackMarkFinal'),
+ url(r'^feedback/markfinal/(?P<feedback_slug>\w+)/undo/$', views.markunfinal_feedback, name='FeedbackMarkNotFinal'),
url(r'^feedback/create/$', views.create_feedback, name='FeedbackCreate'),
url(r'^submission/view/(?P<slug>\w+)/$', views.SubmissionView.as_view(), name='SubmissionView'),
diff --git a/core/views.py b/core/views.py
index 8c048003926c12317a015f576059d5afe853d64d..01d1b0967a029370cd1cc62465b53b59f1220782 100644
--- a/core/views.py
+++ b/core/views.py
@@ -30,7 +30,6 @@ def index(request):
context = {
'boldmessage': 'Delbert Grady says hey there world!',
'submission_t': SubmissionType.objects.all(),
- 'submissions': Submission.objects.all(),
}
return render(request, 'core/index.html', context)
@@ -104,14 +103,6 @@ def reviewer_view(request):
return render(request, 'core/reviewer_startpage.html', context)
-@group_required('Tutors', 'Reviewers')
-def feedback(request, feedback_slug):
- context = {'feedback': Feedback.objects.get(slug=feedback_slug)}
-
- # Go render the response and return it to the client.
- return render(request, 'core/feedback.html', context)
-
-
@group_required('Tutors', 'Reviewers')
def create_feedback(request):
Submission.assign_tutor(request.user)
@@ -125,13 +116,25 @@ def create_feedback(request):
def delete_feedback(request, feedback_slug):
""" Hook to ensure object is owned by request.user. """
instance = Feedback.objects.get(slug=feedback_slug)
- if not instance.of_tutor == request.user:
- return Http404
+ if instance.of_tutor != request.user and not in_groups(request.user, ('Reviewers', )):
+ raise Http404
instance.unassign_tutor()
instance.delete()
return HttpResponseRedirect(reverse('start'))
+def markfinal_feedback(request, feedback_slug):
+ instance = Feedback.objects.get(slug=feedback_slug)
+ instance.finalize_feedback(request.user)
+ return HttpResponseRedirect(reverse('start'))
+
+
+def markunfinal_feedback(request, feedback_slug):
+ instance = Feedback.objects.get(slug=feedback_slug)
+ instance.unfinalize_feedback()
+ return HttpResponseRedirect(reverse('start'))
+
+
@group_required('Tutors', 'Reviewers')
def finished(request):
return HttpResponse("Ich habe fertig.")
@@ -159,27 +162,20 @@ class FeedbackEdit(UpdateView):
"""
If the form is valid, redirect to the supplied URL.
"""
- if form.is_valid():
- form.instance.finalize_feedback()
+ if form.is_valid() and not form.instance.final:
+ form.instance.empty = False
form.save()
return HttpResponseRedirect(self.get_success_url())
- def get_context_data(self, **kwargs):
- feedback = self.get_object()
- context = {
- 'is_reviewed': not feedback.of_reviewer.all(),
- 'feedback_slug': feedback.slug,
- 'submission': feedback.of_submission,
- 'submission_type': feedback.of_submission.type,
- }
- return super(FeedbackEdit, self).get_context_data(**context)
-
class SubmissionView(DetailView):
template_name = 'core/submission_view.html'
model = Submission
+ @method_decorator(group_required('Reviewers', 'Students'))
+ def dispatch(self, *args, **kwargs):
+ return super(SubmissionView, self).dispatch(*args, **kwargs)
+
def get_object(self):
return Submission.objects.get(slug=self.kwargs['slug'])
-
diff --git a/populatedb.py b/populatedb.py
index 6fe18b04e74032492be3c334353bd0b66e4ff78e..9989bd03bf1cdc56aba69e33c333c233f017a69b 100644
--- a/populatedb.py
+++ b/populatedb.py
@@ -11,9 +11,6 @@ from django.contrib.auth.models import Group, User
from core.models import Feedback, Student, Submission, SubmissionType
-
-
-
blob1 = r""" # '\[gap\]([\w\W]+?)\[\/gap\]'
# '\[select\]([\w\W]+?)\[\/select\]'
# '\[numeric\]([\w\W]+?)\[\/numeric\]'
@@ -133,8 +130,9 @@ def add_submission_type(name, score):
task = SubmissionType()
task.name = name
task.full_score = score
- task.solution = "So sollte das mal aussehen"
- task.guideline = "So solltest du das programmieren"
+ task.task_description = "Das hat der Student zu sehen bekommen. (Aufgabenstellung)"
+ task.possible_solution = "So könnte das mal aussehen"
+ task.correction_guideline = "So solltest du das korrigiert werden"
task.save()
print(f"- Created Task {task.name}")
return task