Skip to content
Snippets Groups Projects

Prázdné protokoly

Merged Martin Mareš requested to merge mj/points into devel
2 files
+ 13
2
Compare changes
  • Side-by-side
  • Inline

Files

+ 9
2
@@ -141,6 +141,8 @@ def user_flags(u: db.User) -> Markup:
@@ -141,6 +141,8 @@ def user_flags(u: db.User) -> Markup:
def sol_editable_points(s: Optional[db.Solution]) -> str:
def sol_editable_points(s: Optional[db.Solution]) -> str:
if s is None:
if s is None:
return 'X'
return 'X'
 
elif s.is_empty:
 
return 'P'
elif s.points is None:
elif s.points is None:
return ""
return ""
else:
else:
@@ -148,10 +150,15 @@ def sol_editable_points(s: Optional[db.Solution]) -> str:
@@ -148,10 +150,15 @@ def sol_editable_points(s: Optional[db.Solution]) -> str:
@app.template_filter()
@app.template_filter()
def sol_display_points(s: Optional[db.Solution]) -> Union[str, Markup]:
def sol_display_points(s: Optional[db.Solution], user: bool = False) -> Union[str, Markup]:
if s is None:
if s is None:
return ''
return ''
 
elif s.is_empty:
 
return Markup('<span title="Prázdný protokol">∅</span>')
elif s.points is None:
elif s.points is None:
return Markup('<span class="unknown">?</span>')
if user:
 
return ''
 
else:
 
return Markup('<span class="unknown">?</span>')
else:
else:
return util_format.format_decimal(s.points)
return util_format.format_decimal(s.points)
Loading