Compare commits

..

3 Commits

Author SHA1 Message Date
Trevor Vallender f728a2e9cf Improve exercise schema 2023-12-29 14:42:32 +00:00
Trevor Vallender 7ff8075d64 Remove foods 2023-12-29 14:37:38 +00:00
Trevor Vallender c4d64e40a5 Diary entry basic functionality
Entries can be created, edited and viewed.
2023-12-29 14:35:35 +00:00
8 changed files with 15 additions and 29 deletions

View File

@ -50,8 +50,6 @@ class DiaryEntriesController < ApplicationController
:work_stress_level,
:life_stress_level,
:sleep_quality_level,
# exercise
# food
)
end
end

View File

@ -1,3 +0,0 @@
class Food < ApplicationRecord
validates :name, presence: true
end

View File

@ -1,9 +0,0 @@
class CreateFoods < ActiveRecord::Migration[7.1]
def change
create_table :foods do |t|
t.text :name, null: false
t.timestamps
end
end
end

View File

@ -0,0 +1,5 @@
class DropFoods < ActiveRecord::Migration[7.1]
def change
drop_table :foods
end
end

View File

@ -0,0 +1,6 @@
class RenameAtOnExercises < ActiveRecord::Migration[7.1]
def change
remove_column :exercises, :at
add_column :exercises, :occurred_at, :datetime
end
end

10
db/schema.rb generated
View File

@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema[7.1].define(version: 2023_12_29_121659) do
ActiveRecord::Schema[7.1].define(version: 2023_12_29_143820) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@ -87,21 +87,15 @@ ActiveRecord::Schema[7.1].define(version: 2023_12_29_121659) do
create_table "exercises", force: :cascade do |t|
t.bigint "exercise_type_id", null: false
t.time "at"
t.float "amount", null: false
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.bigint "diary_entry_id", null: false
t.datetime "occurred_at"
t.index ["diary_entry_id"], name: "index_exercises_on_diary_entry_id"
t.index ["exercise_type_id"], name: "index_exercises_on_exercise_type_id"
end
create_table "foods", force: :cascade do |t|
t.text "name", null: false
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
end
create_table "microposts", force: :cascade do |t|
t.bigint "user_id", null: false
t.datetime "created_at", null: false

View File

@ -1,11 +1,11 @@
one:
exercise_type: running
at: 2023-12-29 11:41:45
occurred_at: 2023-12-29 11:41:45
amount: 5
diary_entry: one
two:
exercise_type: cycling
at: 2023-12-29 11:41:45
occurred_at: 2023-12-29 11:41:45
amount: 10.5
diary_entry: two

View File

@ -1,5 +0,0 @@
one:
name: Pizza
two:
name: Banana