forked from doubtfire-lms/doubtfire-api
-
Notifications
You must be signed in to change notification settings - Fork 129
Feature/Create 'tutor_times' table and 'TutorTime' Model #51
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
martindolores
wants to merge
4
commits into
thoth-tech:development
Choose a base branch
from
martindolores:feature/create-tutor-times-table
base: development
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
ca5b893
- Create 'tutor_times' table and 'TutorTime' model
martindolores 36a44e7
- remove unnecessary comment from migration
martindolores 10617e2
- add suggested changes to convert time_spent to decimal type
martindolores 844065c
- change to delete on cascade
martindolores File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| class TutorTime < ApplicationRecord | ||
| belongs_to :user | ||
| belongs_to :task | ||
|
|
||
| validates :user_id, presence: true | ||
| validates :task_id, presence: true | ||
| validates :time_spent, presence: true, numericality: { greater_than_or_equal_to: 0 } | ||
|
|
||
| def time_spent_in_hours | ||
| time_spent.to_f / 60 | ||
| end | ||
| end | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| class CreateTutorTimes < ActiveRecord::Migration[7.1] | ||
| def change | ||
| create_table :tutor_times do |t| | ||
| t.references :user, null: false, foreign_key: true | ||
martindolores marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| t.references :task, null: false, foreign_key: true | ||
| t.integer :time_spent, null: false, default: 0 | ||
martindolores marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
martindolores marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| t.timestamps | ||
| end | ||
| end | ||
| end | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.