Compare commits
8 Commits
main
...
7c6977f4a6
Author | SHA1 | Date | |
---|---|---|---|
7c6977f4a6 | |||
fcee38d33b | |||
0cc7113a8b | |||
107a77d6f8 | |||
1a3048b5f2 | |||
4b9065ca4b | |||
acdac071ed | |||
90472e443c |
1
.gitignore
vendored
1
.gitignore
vendored
@ -3,7 +3,6 @@ blt
|
||||
|
||||
# Local data files
|
||||
data/
|
||||
tmp/
|
||||
|
||||
# Compiled assets
|
||||
public/css/
|
||||
|
@ -1,8 +1,6 @@
|
||||
package models
|
||||
|
||||
import (
|
||||
"strconv"
|
||||
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
@ -18,7 +16,3 @@ type Benchmark struct {
|
||||
// has many results
|
||||
Results []Result
|
||||
}
|
||||
|
||||
func (b *Benchmark) StringID() string {
|
||||
return strconv.Itoa(int(b.ID))
|
||||
}
|
||||
|
@ -1,8 +1,6 @@
|
||||
package models
|
||||
|
||||
import (
|
||||
"strconv"
|
||||
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
@ -21,12 +19,3 @@ type Test struct {
|
||||
// has many results
|
||||
Results []Result
|
||||
}
|
||||
|
||||
func (t *Test) SelectedBenchmarks() []string {
|
||||
benchmarks := t.Benchmarks
|
||||
ids := make([]string, len(benchmarks))
|
||||
for i, b := range benchmarks {
|
||||
ids[i] = strconv.Itoa(int(b.ID))
|
||||
}
|
||||
return ids
|
||||
}
|
||||
|
@ -30,9 +30,9 @@
|
||||
<label for="test_benchmarks">
|
||||
Benchmarks to Test:
|
||||
<select id="test_benchmarks" class="u-full-width" name="test_benchmarks" multiple>
|
||||
{{ $selectedBenchmarks := .selectedBenchmarks }}
|
||||
{{ $testBenchmarks := .test.Benchmarks }}
|
||||
{{ range $bm := .benchmarks }}
|
||||
<option value="{{ $bm.ID }}" {{ if contains $selectedBenchmarks $bm.StringID }}selected{{ end }}>{{ $bm.Name }}</option>
|
||||
<option value="{{ $bm.ID }}" {{ if contains $testBenchmarks $bm.ID }}selected{{ end }}>{{ $bm.Name }}</option>
|
||||
{{ end }}
|
||||
</select>
|
||||
</label>
|
||||
|
@ -99,47 +99,6 @@ func TestGetEdit(c flamego.Context, t template.Template, data template.Data) {
|
||||
models.DB.Find(&benchmarks)
|
||||
data["benchmarks"] = benchmarks
|
||||
|
||||
// determine which benchmarks are selected in a test
|
||||
selectedBenchmarks := test.SelectedBenchmarks()
|
||||
data["selectedBenchmarks"] = selectedBenchmarks
|
||||
|
||||
data["title"] = fmt.Sprintf("Editing Test: %s", test.Name)
|
||||
t.HTML(http.StatusOK, "test/edit")
|
||||
}
|
||||
|
||||
func TestPostEdit(c flamego.Context, form forms.TestForm, errs binding.Errors) {
|
||||
if len(errs) > 0 {
|
||||
var err error
|
||||
switch errs[0].Category {
|
||||
case binding.ErrorCategoryValidation:
|
||||
err = errs[0].Err.(validator.ValidationErrors)[0]
|
||||
default:
|
||||
err = errs[0].Err
|
||||
}
|
||||
log.Fatal(err)
|
||||
}
|
||||
|
||||
// find test ID from request
|
||||
testID := c.Param("test_id")
|
||||
|
||||
// find hardware from DB
|
||||
var test models.Test
|
||||
models.DB.Preload("Hardware").Preload("Benchmarks").First(&test, testID)
|
||||
|
||||
test := models.Test{
|
||||
Name: form.Name,
|
||||
Description: form.Description,
|
||||
HardwareID: form.Hardware,
|
||||
}
|
||||
|
||||
_ = models.DB.Create(&test)
|
||||
|
||||
// bind benchmarks to test
|
||||
for _, v := range form.Benchmarks {
|
||||
var benchmark models.Benchmark
|
||||
models.DB.First(&benchmark, v) // find benchmark
|
||||
models.DB.Model(&test).Association("Benchmarks").Append(&benchmark)
|
||||
}
|
||||
|
||||
c.Redirect(fmt.Sprintf("/test/%d", test.ID))
|
||||
}
|
||||
|
Reference in New Issue
Block a user