diff options
| -rw-r--r-- | model/recipe.go | 26 | ||||
| -rw-r--r-- | model/recipe_step.go | 9 | ||||
| -rw-r--r-- | model/sql/steps-for-recipe.sql | 3 | ||||
| -rw-r--r-- | view/html/recipe.html | 5 |
4 files changed, 32 insertions, 11 deletions
diff --git a/model/recipe.go b/model/recipe.go index 2b3953f..c6aa63c 100644 --- a/model/recipe.go +++ b/model/recipe.go @@ -6,6 +6,7 @@ type Recipe struct { Portions string // FIXME has to be uint URL string Notes string + Steps []RecipeStep } func (d *Recipe) FromDB() error { @@ -14,13 +15,36 @@ func (d *Recipe) FromDB() error { return err } - return db.QueryRow(query, d.Id).Scan( + err = db.QueryRow(query, d.Id).Scan( &d.Id, &d.Title, &d.Portions, &d.URL, &d.Notes, ) + if err != nil { + return err + } + + query, err = GetSql(`steps-for-recipe`) + if err != nil { + return err + } + + rows, err := db.Query(query, d.Id) + if err != nil { + return err + } + for rows.Next() { + var step RecipeStep + err = rows.Scan(&step.Text) + if err != nil { + return err + } + d.Steps = append(d.Steps, step) + } + + return nil } func (d *Recipe) ToDB() error { diff --git a/model/recipe_step.go b/model/recipe_step.go index 980d312..dc2a831 100644 --- a/model/recipe_step.go +++ b/model/recipe_step.go @@ -1,9 +1,5 @@ package model -import ( - "log" -) - type RecipeStep struct { Id string // FIXME has to be uint RecipeId string // FIXME has to be uint @@ -11,10 +7,6 @@ type RecipeStep struct { Text string } -func (d *RecipeStep) String() string { - return d.Text -} - func (d *RecipeStep) FromDB() error { query, err := GetSql(`recipe-step-select`) if err != nil { @@ -28,6 +20,5 @@ func (d *RecipeStep) FromDB() error { &d.Text, ) - log.Printf("d.Text: %s %s %s %s\n", d.Id, d.RecipeId, d.Index, d.Text) return err } diff --git a/model/sql/steps-for-recipe.sql b/model/sql/steps-for-recipe.sql new file mode 100644 index 0000000..4a2a3c8 --- /dev/null +++ b/model/sql/steps-for-recipe.sql @@ -0,0 +1,3 @@ +SELECT text FROM recipe_steps +WHERE recipe_id=? +ORDER BY "index" ASC; diff --git a/view/html/recipe.html b/view/html/recipe.html index acf346f..82b426b 100644 --- a/view/html/recipe.html +++ b/view/html/recipe.html @@ -12,7 +12,10 @@ <p>Portions: {{.Portions}}</p> <p><a href="{{.URL}}">original recipe</a></p> <p>{{.Notes}}</p> - <a href="/recipes/{{.Id}}/edit"><button>edit</button></a> + <a href="/recipes/{{.Id}}/edit"><button>edit</button></a>{{range .Steps}} + <section> + <p>{{.Text}}</p> + </section>{{end}} </main> {{ template "footer" }} </body> |