Compare commits
No commits in common. "107b17c11f3c14bda2289136796499ce8f2d0590" and "6cd3907dc34589367af648d20cfa915a81cd596e" have entirely different histories.
107b17c11f
...
6cd3907dc3
@ -16,7 +16,7 @@
|
||||
let warn_already_used = false;
|
||||
let w = null;
|
||||
let gradesP = null;
|
||||
let stats = {"mean": 0, "min": 999, "max": 0};
|
||||
let mean = 0;
|
||||
|
||||
$: w = data.work;
|
||||
$: refresh_submission(data.work);
|
||||
@ -34,10 +34,8 @@
|
||||
let sum = 0;
|
||||
for (const grade of grades) {
|
||||
sum += grade.score;
|
||||
if (stats.min > grade.score) stats.min = grade.score;
|
||||
if (stats.max < grade.score) stats.max = grade.score;
|
||||
}
|
||||
stats.mean = sum / grades.length;
|
||||
mean = sum / grades.length;
|
||||
});
|
||||
}
|
||||
</script>
|
||||
@ -54,10 +52,8 @@
|
||||
<SurveyBadge class="ms-2" survey={w} />
|
||||
</div>
|
||||
|
||||
{#if $user && $user.is_admin && (edit || w.endAvailability() < Date.now())}
|
||||
{#if edit}
|
||||
<WorkAdmin work={w} on:saved={() => edit = false} />
|
||||
{/if}
|
||||
{#if $user && $user.is_admin && edit}
|
||||
<WorkAdmin work={w} on:saved={() => edit = false} />
|
||||
|
||||
{#if w.description}
|
||||
<hr>
|
||||
@ -66,12 +62,7 @@
|
||||
|
||||
<hr>
|
||||
<div class="d-flex justify-content-between align-items-center">
|
||||
<h3 class="mt-3">
|
||||
Notes
|
||||
<small class="text-muted">
|
||||
{#if stats.mean > 0}(moyenne : {Math.round(stats.mean*100)/100}, min : {stats.min}, max : {stats.max}){/if}
|
||||
</small>
|
||||
</h3>
|
||||
<h3 class="mt-3">Notes</h3>
|
||||
<button
|
||||
class="btn btn-light"
|
||||
on:click={() => refresh_grades(w)}
|
||||
@ -86,13 +77,14 @@
|
||||
<span>Chargement des notes …</span>
|
||||
</div>
|
||||
{:then grades}
|
||||
<p>
|
||||
|
||||
<table class="table table-hover table-striped table-sm mb-0">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Login</th>
|
||||
<th>Note</th>
|
||||
<th>
|
||||
Note
|
||||
{#if mean > 0}(moyenne : {Math.round(mean*100)/100}){/if}
|
||||
</th>
|
||||
<th>Commentaire</th>
|
||||
<th>Date de la note</th>
|
||||
</tr>
|
||||
@ -123,7 +115,7 @@
|
||||
<button
|
||||
class="btn btn-sm btn-danger mx-1"
|
||||
title="Supprimer la note"
|
||||
on:click={() => { grade.delete().then(() => refresh_grades(w)); }}
|
||||
on:click={() => { grade.delete(); refresh_grades(w); }}
|
||||
>
|
||||
<i class="bi bi-trash"></i>
|
||||
</button>
|
||||
|
13
works.go
13
works.go
@ -472,19 +472,6 @@ func (u *User) GetMyWorkGrade(w *Work) (g WorkGrade, err error) {
|
||||
}
|
||||
|
||||
func (w *Work) AddGrade(grade WorkGrade) error {
|
||||
u := User{Id: grade.IdUser}
|
||||
|
||||
// Search a previous record
|
||||
g, err := u.GetMyWorkGrade(w)
|
||||
if err != nil && err != sql.ErrNoRows {
|
||||
return err
|
||||
} else if err == nil {
|
||||
_, err = g.Delete()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
return w.AddGrades([]WorkGrade{grade})
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user