Commit 41dffdc1 authored by Miguel Luis D. Bandelaria's avatar Miguel Luis D. Bandelaria

fix: merge and cache conflicts resolved

parents 0eb7daee 98087ae9
...@@ -11,7 +11,11 @@ class Assignment(models.Model): ...@@ -11,7 +11,11 @@ class Assignment(models.Model):
name = models.CharField(max_length=50) name = models.CharField(max_length=50)
description = models.CharField(max_length=500) description = models.CharField(max_length=500)
max_points = models.IntegerField(default=0) max_points = models.IntegerField(default=0)
#def set_passing_score():
# return (max_points * 60) / 100
passing_score = models.IntegerField(default=0) passing_score = models.IntegerField(default=0)
def _str_(self): def _str_(self):
return self.name return self.name
\ No newline at end of file
\ No newline at end of file
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