Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/models/user.rb
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ def token_for_text?(a_token)
validates :username, presence: true, uniqueness: { case_sensitive: false }
validates :email, presence: true, uniqueness: { case_sensitive: false }, format: { with: /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i }
validates :student_id, uniqueness: true, allow_nil: true
validates :total_tutor_time, presence: true, numericality: { greater_than_or_equal_to: 0.0 }
validate :can_change_to_role?, if: :will_save_change_to_role_id?

# Queries
Expand Down
5 changes: 5 additions & 0 deletions db/migrate/20250326085802_add_total_tutor_time_to_users.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
class AddTotalTutorTimeToUsers < ActiveRecord::Migration[7.1]
def change
add_column :users, :total_tutor_time, :decimal, precision: 10, scale: 2, null: false, default: 0.0
end
end
3 changes: 2 additions & 1 deletion db/schema.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.

ActiveRecord::Schema[7.1].define(version: 2024_05_28_223908) do
ActiveRecord::Schema[7.1].define(version: 2025_03_26_085802) do
create_table "activity_types", charset: "utf8", collation: "utf8_unicode_ci", force: :cascade do |t|
t.string "name", null: false
t.string "abbreviation", null: false
Expand Down Expand Up @@ -509,6 +509,7 @@
t.string "tii_eula_version"
t.datetime "tii_eula_date"
t.boolean "tii_eula_version_confirmed", default: false, null: false
t.decimal "total_tutor_time", precision: 10, scale: 2, default: "0.0", null: false
t.index ["login_id"], name: "index_users_on_login_id", unique: true
t.index ["role_id"], name: "index_users_on_role_id"
end
Expand Down