This repository has been archived by the owner on Dec 28, 2023. It is now read-only.
Allocation details page #366
Merged
Conversation
This file contains 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
adbatista
suggested changes
Mar 23, 2023
Comment on lines
8
to
12
| allocation = Allocation.find(params[:id]) | ||
|
|
||
| @allocation_forecast = RevenueForecastService.allocation_forecast(allocation) | ||
| @allocation = allocation.decorate | ||
| @allocation_punches = allocation.user_punches |
There was a problem hiding this comment.
@allocation = Allocation.find(params[:id]).decorate
@allocation_forecast = RevenueForecastService.allocation_forecast(allocation)allocation_punches seems unecessary
fabiosammy
reviewed
Mar 23, 2023
| <td class="px-4 py-3"> | ||
| <div class="flex items-center text-sm"> | ||
| <p class="text-sm text-gray-600 dark:text-gray-400 font-semibold"> | ||
| <%= "#{allocation[:month]}/#{allocation[:year]}" %> |
There was a problem hiding this comment.
Why not decorate it too?
| @@ -0,0 +1,224 @@ | |||
| <% content_for :page_title do %> | |||
There was a problem hiding this comment.
This view seems too big. Can you split it into three partials? For each table
samkevin1
force-pushed
the
new-admin-allocation-info
branch
3 times, most recently
from
9db8997 to
a19cd41
Compare
adbatista
reviewed
Mar 28, 2023
| <td class="px-4 py-3"> | ||
| <div class="flex items-center text-sm"> | ||
| <p class="text-sm text-gray-600 dark:text-gray-400 font-semibold"> | ||
| <%= allocation[:working_hours] %> |
samkevin1
force-pushed
the
new-admin-allocation-info
branch
from
a19cd41 to
ea8ff25
Compare
samkevin1
force-pushed
the
new-admin-allocation-chart
branch
from
864ec38 to
3122bbe
Compare
samkevin1
force-pushed
the
new-admin-allocation-info
branch
from
ea8ff25 to
ddccac3
Compare
samkevin1
force-pushed
the
new-admin-allocation-chart
branch
from
3122bbe to
294be66
Compare
samkevin1
force-pushed
the
new-admin-allocation-info
branch
2 times, most recently
from
31231f3 to
fb9581f
Compare
samkevin1
force-pushed
the
new-admin-allocation-chart
branch
from
5ea7f4b to
4224db4
Compare
samkevin1
force-pushed
the
new-admin-allocation-info
branch
from
fb9581f to
ecbbced
Compare
samkevin1
force-pushed
the
new-admin-allocation-chart
branch
from
4224db4 to
76c483f
Compare
samkevin1
force-pushed
the
new-admin-allocation-info
branch
from
ecbbced to
dd464e4
Compare
samkevin1
force-pushed
the
new-admin-allocation-chart
branch
from
76c483f to
920a833
Compare
samkevin1
force-pushed
the
new-admin-allocation-info
branch
2 times, most recently
from
434bec1 to
cd49db4
Compare
samkevin1
force-pushed
the
new-admin-allocation-info
branch
from
cd49db4 to
d8cbeeb
Compare
samkevin1
force-pushed
the
new-admin-allocation-info
branch
from
d8cbeeb to
ca0dc08
Compare
adbatista
reviewed
Apr 12, 2023
| it 'returns the allocation forecast' do | ||
| get :show, params: { id: allocation.id } | ||
|
|
||
| forecast = subject.instance_variable_get(:@allocation_forecast) |
There was a problem hiding this comment.
would be nice to test the rendered page
adbatista
approved these changes
May 4, 2023
adbatista
pushed a commit
that referenced
this pull request
Jul 14, 2023
* feat: create new_admin/monitoring route * feat: copy windmill-dashboard style * feat: remove windmill dependencies * feat: create mentorings dashboard * feat: add grouped mentors and mentees table * feat: add navbar switch tabs * change rows text style * add mentors gravatar * add style to tab button for new mentoring page * add initial class for bg color for tab buttons * Add Header for new_admin layout * Add Sidebar for new_admin layout * Add Header and Sidebar into new_admin layout * Add toggle to switch to Dark mode * Layout fixes * Save theme in local storage * Update theme icon * Add profile image to header * Add dynamic page title * Update sidebar links * Add mentoring icon to sidebar * feat: New admin allocation chart (#363) * feat: create allocation chart table * Creating allocation chart decorator * Changing sidebar icon * Changing allocation decorator * Fixing indentation and I18n call * Changing allocation decorator and adding AllocationController tests * Changing svg files used on the sidebar * Changing controller tests approach * Allocation details page (#366) * Allocation details page * Refactoring 'show' allocations view into smaller components * Adding tests * CSS fixes for light theme * Changing behaviour of some tests * feat: page for punch info (#367) * Page for punch info * Adding tests * Edit allocation page (#376) Co-authored-by: Alessandro Dias Batista <[email protected]> * feature: new admin page for user info (#388) * New admin page for user info * Adding tests --------- Co-authored-by: Alessandro Dias Batista <[email protected]> * feat: new admin page for user allocations (#395) * new admin page for user allocations * feature test for user allocations tab * add I18n translations * finish user allocation details and tests * fix: add route path in allocations page and fix allocation translation in show page * improve test assertions * feat: new admin page for user performance evaluations (#402) * new admin page for user allocations * feature test for user allocations tab * finish user allocation details and tests * improve test assertions * new admin page for user allocations * add translations in locale files * new admin page for user evaluations * feat: add message for no performance evaluations * fix: query to performance evaluations * fix: performance evaluations button in tab menu * fix: create decorator to display correct evaluation date * refactor: change performance evaluations query to use merge function * fix: typo in 'performance' word * refactor: add composable matchers * fix: delete feature test inside controller spec * feat: new admin user english evaluation page (#403) * new admin page for user allocations * feature test for user allocations tab * finish user allocation details and tests * improve test assertions * new admin page for user allocations * Adding tests * update locale files * new admin page for user english evaluations * fix: evaluator name in assert condition * fix: decorator to display correct date * fix: delete feature test inside controller spec * refactor: add composable matchers * refactor: change english evaluation query with merge method --------- Co-authored-by: Samuel <[email protected]> * feat: new admin user punches (#416) * new admin page for user allocations * feature test for user allocations tab * finish user allocation details and tests * improve test assertions * new admin page for user allocations * Adding tests * add event listener to make punches tab active after filter punches * new admin page for user punches * add translations in locale files * new admin user punches page * test: add spec for filter_by_date punch scope * test: spec for punch decorator extra_hour translation * fix: delete feature test inside controller spec * fix: add spacing to avoid overlapping elements in Capybara spec * test: filter feature test * fix: add literal words in the asserts * fix: delete 'all' from query * fix: from the fix: add composable matchers in the spec --------- Co-authored-by: Samuel <[email protected]> * Fix regressions in new admin pages (#468) * fix regressions introduced by (#388) * fix regressions introduced by (#402) --------- Co-authored-by: felipe.richter <[email protected]> Co-authored-by: feliperli <[email protected]> Co-authored-by: André Moreira <[email protected]> Co-authored-by: Antonio Paulino <[email protected]> Co-authored-by: EmersonAraki <[email protected]> Co-authored-by: mateusbw <[email protected]> Co-authored-by: samkevin1 <[email protected]> Co-authored-by: Alessandro Dias Batista <[email protected]> Co-authored-by: u can call me Fabi <[email protected]> Co-authored-by: Samuel <[email protected]> Co-authored-by: Daniel M Brasil <[email protected]>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Page for details on a specific allocation:
Issue: #381