Skip to content
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

Add My Tasks view & dashboard widget #1285

Open
wants to merge 82 commits into
base: develop
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
82 commits
Select commit Hold shift + click to select a range
88a624a
Add scaffold for "My Tasks" view
nicolachr Aug 9, 2024
644dca9
Add scaffold for my tasks dashboard widget
nicolachr Aug 9, 2024
7e607bc
Add task list to dashboard widget
nicolachr Aug 9, 2024
c7b8922
Add color sorting - dashboard widget
nicolachr Aug 9, 2024
a43a4a2
Add methodology badge - dashboard widget
nicolachr Aug 9, 2024
e9afc01
Add link to "My Tasks" view to sidebar
nicolachr Aug 9, 2024
48f32a8
Add table placeholder to "My Tasks" view
nicolachr Aug 9, 2024
128bf3d
lint
MattBudz Aug 12, 2024
428d648
add dataTable
MattBudz Aug 12, 2024
9e705ec
ensure `due_date` exists before applying classes
MattBudz Aug 12, 2024
bc81e2c
simplify view by moving due date logic to helper
MattBudz Aug 12, 2024
a337a33
Add styling to tasks datable fields
nicolachr Aug 13, 2024
d358240
Add icon to All tasks link - dashboard widget
nicolachr Aug 13, 2024
4062aea
define `@tasks` for the dashboard widget
MattBudz Aug 13, 2024
4d7a59f
Merge branch 'tasks/my-tasks' of https://github.com/dradis/dradis-ce …
nicolachr Aug 13, 2024
6116d33
Update code to dynamically show tasks - dashboard widget
nicolachr Aug 13, 2024
f213f74
Update widget color sorting to match default badges' colours
nicolachr Aug 13, 2024
85d98e6
fix indent size
MattBudz Aug 13, 2024
1a584c3
loop over tasks once to improve performance
MattBudz Aug 13, 2024
da05974
sort tasks in the widget and limit to 3 per group
MattBudz Aug 13, 2024
6379502
DRY up the view
MattBudz Aug 13, 2024
ef411b3
add `+ more` counters
MattBudz Aug 13, 2024
8534790
slim down the widget height
MattBudz Aug 13, 2024
e6b8aab
Change Tasks link name to My Tasks - sidebar
nicolachr Aug 14, 2024
0a6a432
check if tomorrow/future records exist
MattBudz Aug 14, 2024
8ab41fd
use a single list of tasks limited to 5
MattBudz Aug 14, 2024
5258657
Fix contrast issues with badges
nicolachr Aug 14, 2024
e1581c6
Merge branch 'tasks/my-tasks' of https://github.com/dradis/dradis-ce …
nicolachr Aug 14, 2024
636b1d2
sort due date column by date in my tasks view
MattBudz Aug 14, 2024
5e079c2
Merge branch 'tasks/my-tasks' of https://github.com/dradis/dradis-ce …
MattBudz Aug 14, 2024
2ad638e
Remove color sorting borders from tasks - dashboard widget
nicolachr Aug 14, 2024
0e45cda
add specs for my tasks view
MattBudz Aug 14, 2024
03e481e
Add due-date badge in tasks - dashboard widget
nicolachr Aug 14, 2024
afb08e6
Add tooltip to avatar images in "My Tasks" view
nicolachr Aug 14, 2024
7b26c07
Align avatar images when wrapped
nicolachr Aug 14, 2024
f6b98a8
clean up WIP code
MattBudz Aug 14, 2024
38cc0eb
refactor `due_date_badge` for consistency
MattBudz Aug 14, 2024
720578d
Make Methodology less prominent - dashboard widget
nicolachr Aug 16, 2024
4216070
Update task link color & background color (hover) - dashboard widget
nicolachr Aug 16, 2024
003acd7
Remove unused dark-orange warning badge
nicolachr Aug 16, 2024
d4b8c10
Add empty states - dashboard widget & "My Tasks" view
nicolachr Aug 16, 2024
5d00861
update empty state copy
MattBudz Aug 16, 2024
d696d84
update specs
MattBudz Aug 16, 2024
cf5bb6c
remove unused style
MattBudz Aug 16, 2024
8876d60
prevent linking whitespace
MattBudz Aug 16, 2024
5a948cd
remove blank line
MattBudz Aug 16, 2024
75d251a
revert changes to `db/schema.rb`
MattBudz Aug 16, 2024
80a8d1b
Update Changelog
nicolachr Aug 16, 2024
023d203
Correct template of Changelog
nicolachr Aug 16, 2024
212fb07
fix text-truncate not working
MattBudz Aug 16, 2024
488547a
only render records for the current_project
MattBudz Aug 16, 2024
9496a9d
guard against project having no cards when displaying assigned tasks
caitmich Aug 19, 2024
54533ca
improve parity with pro
MattBudz Aug 20, 2024
e49d147
Revert change to '$orange' variable
nicolachr Aug 21, 2024
610d87b
improve pro parity
MattBudz Aug 21, 2024
1857d78
update controller for better pro parity
MattBudz Aug 21, 2024
af0c23f
Update app/controllers/tasks_controller.rb
nicolachr Aug 28, 2024
c047e18
get assigned tasks from the user
MattBudz Aug 29, 2024
ce7841d
clean up controller action
MattBudz Aug 29, 2024
314d4cf
remove pro-only code
MattBudz Aug 29, 2024
0686b46
use modern syntax
MattBudz Aug 29, 2024
dd1a74c
remove `@tasks_limit` and use helper methods
MattBudz Aug 29, 2024
80b50a7
Merge branch 'develop' into tasks/my-tasks
MattBudz Aug 29, 2024
3289473
set `@tasks` with a shared helper method
MattBudz Aug 29, 2024
2f606d1
Merge branch 'tasks/my-tasks' of https://github.com/dradis/dradis-ce …
MattBudz Aug 29, 2024
8d8d36f
consistency
MattBudz Aug 29, 2024
ba6643d
remove pro-only block
MattBudz Sep 5, 2024
7d14d91
apply code review suggestion
MattBudz Sep 5, 2024
2a75a5b
improve naming
MattBudz Sep 5, 2024
a31aea6
fix tasks not being scoped in project-level widget
MattBudz Sep 9, 2024
fee1bfc
fix cell y-alignment - was uneven due to avatar
MattBudz Sep 9, 2024
d4c5137
simplify tasks helper
MattBudz Sep 12, 2024
790039a
improve pro parity
MattBudz Sep 12, 2024
8336f8b
fix `+ N more` count
MattBudz Sep 12, 2024
a507cf3
improve readability
MattBudz Sep 12, 2024
18e2d53
remove old comment
MattBudz Sep 12, 2024
6425e54
ensure users have permission to view cards
MattBudz Sep 23, 2024
f60c9b4
use `private` for consistency
MattBudz Sep 23, 2024
42cd66a
Merge branch 'develop' into tasks/my-tasks
MattBudz Sep 23, 2024
81ee43b
improve readability and pro-parity
MattBudz Sep 23, 2024
ef97e54
re-add `List` column to give users and quick way to see completed car…
MattBudz Oct 2, 2024
f6e34b2
add list to default columns
MattBudz Oct 2, 2024
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
Prev Previous commit
Next Next commit
improve readability
MattBudz committed Sep 12, 2024
commit a507cf3b4e7bab581a77f285ad02a35a74961871
2 changes: 1 addition & 1 deletion app/controllers/tasks_controller.rb
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ class TasksController < AuthenticatedController
def index
@default_columns = ['Title', 'Methodology', 'Due Date', 'Assigned']

if params[:project_id].present?
if current_project
@local_storage_key = "project.ce.project_#{current_project.id}.tasks_datatable"
@tasks = assigned_cards(current_project.id)
end