Commit Graph

9908 Commits

Author SHA1 Message Date
Jonathan Bobel
9a59a09bf8 Show templates even if there is just 1 2024-08-13 15:06:08 -04:00
Jonathan Bobel
0fabcabeb3 Merge branch 'main' of https://github.com/GSA/notifications-admin into 1674-match-recent-batches-to-wireframe
# Conflicts:
#	tests/app/main/views/test_dashboard.py
#	tests/javascripts/activityChart.test.js
2024-08-13 14:57:01 -04:00
Beverly Nguyen
a0e177b99b add comments 2024-08-12 11:51:20 -07:00
Beverly Nguyen
96d6415578 add comments 2024-08-12 11:47:56 -07:00
Beverly Nguyen
de27071112 fixed js errors 2024-08-09 14:49:16 -07:00
Beverly Nguyen
2cbab8727f fixed isort 2024-08-09 14:33:53 -07:00
Beverly Nguyen
a6e7e15643 Merge branch 'main' into 1810-clean-up-data-viz-ui-component 2024-08-09 14:29:51 -07:00
Beverly Nguyen
9e6f87ace1 removed socket io 2024-08-09 14:29:14 -07:00
Carlo Costino
7d22f23217 Merge pull request #1830 from GSA/1824-data-viz-changes
1824 data viz changes
2024-08-09 15:59:11 -04:00
Kenneth Kehl
191b591ac0 merge from main 2024-08-09 11:40:44 -07:00
Jonathan Bobel
832932f3b8 Updates to styles and js 2024-08-09 10:33:51 -04:00
Jonathan Bobel
45bc6a9173 test updates 2024-08-08 16:53:56 -04:00
Jonathan Bobel
a395ad0281 Multiples of 8 2024-08-08 16:30:34 -04:00
Jonathan Bobel
28bc4befbe Small changes to the data viz colors and chart sizing 2024-08-08 16:29:35 -04:00
Jonathan Bobel
064cae7c31 Merge branch 'main' of https://github.com/GSA/notifications-admin into 1674-match-recent-batches-to-wireframe
# Conflicts:
#	tests/javascripts/activityChart.test.js
2024-08-08 15:07:03 -04:00
Jonathan Bobel
c778ad092b Removing reports column and adjusting tests 2024-08-08 14:42:15 -04:00
Beverly Nguyen
86748c3317 js lint 2024-08-07 17:03:25 -07:00
Beverly Nguyen
2bb398a962 fixing console errors 2024-08-07 15:54:54 -07:00
Beverly Nguyen
c6f1ae37a4 fixing console errors 2024-08-07 15:47:33 -07:00
Beverly Nguyen
f65655e56c fixing console errors 2024-08-07 15:42:46 -07:00
Beverly Nguyen
5797e989fd fixing console errors 2024-08-07 15:33:08 -07:00
Beverly Nguyen
4bfbd9f71f fixing console errors 2024-08-07 15:27:43 -07:00
Jonathan Bobel
e7e3bac36c Updates to the activity table(s) on the dashboard 2024-08-07 16:20:40 -04:00
Beverly Nguyen
ad2151b637 fix 400 errors 2024-08-06 17:28:14 -07:00
Jonathan Bobel
1a528626de Merge branch '1669-toggle-between-recent-activity-and-all-activity' into 1674-match-recent-batches-to-wireframe 2024-08-06 15:28:46 -04:00
Jonathan Bobel
b01ca6bb15 Updates to the template table and removing the table being replicated 2 times 2024-08-06 15:03:57 -04:00
Beverly Nguyen
bdbdaaae8a avoid jobs with job status cancelled 2024-08-05 13:06:51 -07:00
Jonathan Bobel
d6079a463d Adding the ability to switch tables in the js
Updating css
Testing updated js
2024-08-05 16:05:54 -04:00
Jonathan Bobel
7ac6400827 Merge branch 'main' of https://github.com/GSA/notifications-admin into 1669-toggle-between-recent-activity-and-all-activity 2024-08-05 09:34:50 -04:00
Kenneth Kehl
af59b13836 code review feedback 2024-08-02 14:30:35 -07:00
Kenneth Kehl
79786df09c merge from main 2024-08-02 14:29:46 -07:00
Cliff Hill
0fe73f6973 Trying this now.
Signed-off-by: Cliff Hill <clifford.hill@gsa.gov>
2024-08-02 15:14:17 -04:00
Cliff Hill
65da623458 Done stuff to make serialization work hopefully.
Signed-off-by: Cliff Hill <clifford.hill@gsa.gov>
2024-08-02 15:01:55 -04:00
Cliff Hill
6b8be20ed2 Black & isort.
Signed-off-by: Cliff Hill <clifford.hill@gsa.gov>
2024-08-02 14:50:52 -04:00
Cliff Hill
27ee039b2d iDumping object as a JSON.
Signed-off-by: Cliff Hill <clifford.hill@gsa.gov>
2024-08-02 14:42:29 -04:00
Cliff Hill
03466d0184 Removing pformat from the change.
Signed-off-by: Cliff Hill <clifford.hill@gsa.gov>
2024-08-02 14:37:06 -04:00
Cliff Hill
131d99a4df iAdding some logging for Bev.
Signed-off-by: Cliff Hill <clifford.hill@gsa.gov>
2024-08-02 14:02:44 -04:00
Beverly Nguyen
da33213730 Merge branch 'main' into 1484-dashboard-visualizations 2024-08-01 15:42:44 -07:00
Carlo Costino
da34acaf76 Merge pull request #1743 from GSA/1677-user-story-view-table-of-all-jobs-sent-with-my-service
new activity page
2024-08-01 15:00:38 -04:00
Beverly Nguyen
97ae46d57b table th color changed 2024-08-01 09:34:57 -07:00
Carlo Costino
989aaf747f Merge pull request #1784 from GSA/1676-individual-job-table-updates
1676 - Updates to Job status page
2024-07-31 23:35:41 -04:00
Jonathan Bobel
42db905026 Creating 2 tables to be put tied into the dropdown event 2024-07-31 16:00:06 -04:00
Jonathan Bobel
7715e6b275 Removing commented code - PR comment 2024-07-31 12:15:55 -04:00
Jonathan Bobel
71cca74779 Updates to dashboard and py tests for dashboard 2024-07-31 11:34:19 -04:00
Jonathan Bobel
d12d2418a5 Addressing some PR comments 2024-07-31 10:25:59 -04:00
Jonathan Bobel
5680f5c98f Merge branch 'main' of https://github.com/GSA/notifications-admin into 1484-dashboard-visualizations 2024-07-31 10:01:35 -04:00
Jonathan Bobel
4df7eb57d7 Adjusting tests 2024-07-30 14:24:02 -04:00
Kenneth Kehl
86a2017f91 fix flake 8 2024-07-30 10:30:32 -07:00
Kenneth Kehl
a8fad883f1 fix keystring 2024-07-30 10:17:04 -07:00
Jonathan Bobel
1912ffbbcf Merge branch 'main' of https://github.com/GSA/notifications-admin into 1484-dashboard-visualizations
# Conflicts:
#	app/assets/sass/uswds/_uswds-theme-custom-styles.scss
#	app/templates/views/dashboard/dashboard.html
#	gulpfile.js
#	tests/app/main/views/test_dashboard.py
2024-07-30 10:45:53 -04:00