Commit Graph

4547 Commits

Author SHA1 Message Date
Jonathan Bobel
ba2b5fea37 Merge branch '1544-data-viz-total-message-allowance' into 1484-dashboard-visualizations
# Conflicts:
#	app/assets/sass/uswds/_data-visualization.scss
#	app/assets/sass/uswds/styles.scss
#	app/templates/views/dashboard/dashboard.html
#	app/templates/views/dashboard/template-statistics.html
#	gulpfile.js
#	package-lock.json
2024-07-17 11:23:53 -04:00
Jonathan Bobel
d301502957 JS cleanrup
Table styles and updates
Removing chart.js
2024-07-11 12:59:14 -04:00
Jonathan Bobel
7f288598ba Deleting chart.js
Updates to the dashboard html
Test updates
2024-07-10 10:13:24 -04:00
Jonathan Bobel
0b2868a8d3 Merge branch 'main' of https://github.com/GSA/notifications-admin into 1544-data-viz-total-message-allowance
# Conflicts:
#	app/main/views/dashboard.py
#	package-lock.json
#	package.json
2024-07-04 13:25:03 -04:00
Jonathan Bobel
74f4d730a8 Merge branch 'main' of https://github.com/GSA/notifications-admin into 1484-dashboard-visualizations
# Conflicts:
#	app/main/views/dashboard.py
#	app/templates/views/dashboard/dashboard.html
#	package-lock.json
#	package.json
2024-07-04 13:07:35 -04:00
Carlo Costino
ffd935c4b6 Merge pull request #1629 from GSA/1256-bug-tour-steps-needs-to-be-adjusted-for-the-new-preview-page
made changes/fixes to tour flow
2024-07-03 14:37:07 -04:00
Carlo Costino
28efb2716b Merge pull request #1618 from GSA/1612-add-in-new-endpoint-for-weekly-by-user_id
1612 add in new endpoint for week stats by user
2024-07-03 14:21:49 -04:00
Beverly Nguyen
b8a4303a97 Merge branch 'main' into 1256-bug-tour-steps-needs-to-be-adjusted-for-the-new-preview-page 2024-07-02 16:02:29 -07:00
Beverly Nguyen
e72af9671b removed print 2024-06-24 16:54:31 -07:00
Beverly Nguyen
44baaf665a fixed testing 2024-06-24 15:33:48 -07:00
Andrew Shumway
7027cae3de pull main 2024-06-24 10:45:33 -06:00
Beverly Nguyen
fba6187fd9 Merge branch 'main' into 1612-add-in-new-endpoint-for-weekly-by-user_id 2024-06-20 19:37:43 -07:00
Kenneth Kehl
3b6ccc031a fix format? 2024-06-20 13:16:45 -07:00
Jonathan Bobel
6c44a297b8 Was failing because of package-lock mismatch 2024-06-18 09:35:03 -04:00
Jonathan Bobel
fc15ab6a9f Merge branch 'main' of https://github.com/GSA/notifications-admin into 1544-data-viz-total-message-allowance
# Conflicts:
#	.ds.baseline
#	package-lock.json
#	poetry.lock
2024-06-18 08:26:26 -04:00
Beverly Nguyen
30a3c9ce73 merge main 2024-06-17 17:39:57 -07:00
Beverly Nguyen
a1f2deda8f added test_fetch_daily_stats_by_user test 2024-06-17 17:32:24 -07:00
Beverly Nguyen
3594694de2 added fetch by user 2024-06-17 12:36:21 -07:00
Beverly Nguyen
6be4f878e4 fixed end2end 2024-06-11 16:22:38 -07:00
Beverly Nguyen
c8fb1b2f91 fixed import errors 2024-06-11 15:28:46 -07:00
Beverly Nguyen
7b8db70552 fixed testing 2024-06-11 14:01:40 -07:00
Beverly Nguyen
89bd835cd8 update testing 2024-06-11 12:35:59 -07:00
Andrew Shumway
35e27ff25a Merge main 2024-06-10 10:44:09 -06:00
Andrew Shumway
a401562735 Add report options 1/3/5-day 2024-06-10 10:15:22 -06:00
Jonathan Bobel
9d22b99e9b Updates after merge 2024-06-10 10:20:33 -04:00
Jonathan Bobel
9b84f59bf8 Merge branch 'main' of https://github.com/GSA/notifications-admin into 1544-data-viz-total-message-allowance 2024-06-10 10:02:24 -04:00
Carlo Costino
9f9614d292 Merge pull request #1596 from GSA/1305-delivery-status-content-update
Delivery status content updates
2024-06-08 00:33:34 -04:00
Jonathan Bobel
b9beb50313 Merge branch 'main' of https://github.com/GSA/notifications-admin into 1544-data-viz-total-message-allowance
# Conflicts:
#	.ds.baseline
#	app/assets/javascripts/chartDashboard.js
#	app/main/views/dashboard.py
2024-06-07 16:51:32 -04:00
Beverly Nguyen
33f8f4c000 fix import sort 2024-06-06 10:50:24 -07:00
Jonathan Bobel
934f8927c6 Updated content, removed test no longer needed 2024-06-06 13:50:08 -04:00
Beverly Nguyen
c0b2c42473 removed imported unused style issue 2024-06-06 10:42:49 -07:00
Beverly Nguyen
f98cff8d40 fixed linting issues 2024-06-06 10:01:58 -07:00
Beverly Nguyen
61253963f7 added socketiotestclent 2024-06-06 00:48:08 -07:00
Jonathan Bobel
1f84db7861 This is covered in the js test now 2024-06-05 12:08:52 -04:00
Kenneth Kehl
2f366ff65c code review feedback 2024-05-31 09:41:36 -07:00
Kenneth Kehl
df032ba76d remove mock_aws where its not useful 2024-05-30 07:58:30 -07:00
Kenneth Kehl
e694b9a5f6 clean up mock_s3_download 2024-05-29 14:49:06 -07:00
Kenneth Kehl
9368f6a496 remove some fixtures 2024-05-29 14:18:08 -07:00
Kenneth Kehl
17fec1c99e use moto to mock s3 2024-05-28 11:27:57 -07:00
Kenneth Kehl
16dc4512dd fix si.edu 2024-05-21 07:38:23 -07:00
Kenneth Kehl
622255e5a6 merges 2024-05-20 13:19:14 -07:00
Kenneth Kehl
9ba5e3b917 code review feedback 2024-05-20 12:09:49 -07:00
Carlo Costino
fe9e25ba6f Merge pull request #1542 from GSA/add-utils
Localize notification_utils to the admin
2024-05-17 17:26:58 -04:00
Carlo Costino
3a42aafad2 Merge pull request #1470 from GSA/1463-convert-basehtml-template-to-become-the-new-main-template
Switch to the new base.html template
2024-05-17 14:11:04 -04:00
Carlo Costino
9a83ba7475 Localize notification_utils to the admin
This changeset pulls in all of the notification_utils code directly into the admin and removes it as an external dependency. We are doing this to cut down on operational maintenance of the project and will begin removing parts of it no longer needed for the admin.

Signed-off-by: Carlo Costino <carlo.costino@gsa.gov>
2024-05-16 10:37:37 -04:00
Kenneth Kehl
d47f9933d2 add check for government email addresses 2024-05-13 13:39:51 -07:00
Kenneth Kehl
e973c11d3b write new tests 2024-05-10 07:52:07 -07:00
Kenneth Kehl
c578175e53 write new tests 2024-05-10 07:51:32 -07:00
Kenneth Kehl
11beff2541 get it working 2024-05-09 14:04:30 -07:00
Kenneth Kehl
26988d255f remove logged_in_elsewhere as per code review feedback 2024-05-08 12:45:01 -07:00