Commit Graph

318 Commits

Author SHA1 Message Date
Jonathan Bobel
a0e64304d6 Merge branch 'main' of https://github.com/GSA/notifications-admin into 1484-dashboard-visualizations 2024-07-23 11:54:00 -04:00
Jonathan Bobel
4af04ff183 Merge branch 'main' of https://github.com/GSA/notifications-admin into 1484-dashboard-visualizations
# Conflicts:
#	package-lock.json
#	package.json
2024-07-23 11:39:49 -04:00
Kenneth Kehl
9af1d922d3 merge from main 2024-07-23 07:20:05 -07:00
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
Kenneth Kehl
bf556eb408 make settings button invisible if you don't have permission to manage settings 2024-07-16 13:01:12 -07:00
Kenneth Kehl
8489fb9e61 update flake8-pytest-style-plugin 2024-07-15 08:07:18 -07:00
Jonathan Bobel
d301502957 JS cleanrup
Table styles and updates
Removing chart.js
2024-07-11 12:59:14 -04:00
Kenneth Kehl
058a999ed0 ugh 2024-07-11 09:38:32 -07: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
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
Carlo Costino
79df8288df Updated dependencies - 6/14/2024
This changeset updates Python dependencies that Dependabot has flagged in addition to several others that were due for updates.  It also reformats a test file via black.

Signed-off-by: Carlo Costino <carlo.costino@gsa.gov>
2024-06-14 10:22:01 -04:00
Jonathan Bobel
9d22b99e9b Updates after merge 2024-06-10 10:20:33 -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
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
Andrew Shumway
3f2dcc3022 Merge main fix conflicts 2024-04-15 10:45:23 -06:00
Kenneth Kehl
ae5561862d fix tests, eliminate or tweak bogus incoming or foreign number tests 2024-04-11 15:39:50 -07:00
Carlo Costino
cc20c02839 Merge pull request #1370 from GSA/1213-clean-up-usage-content
1213 - Removed the Usage page and updated the Dashboard Landing page
2024-04-03 19:10:33 -04:00
Carlo Costino
6b2ab54870 Merge pull request #1326 from GSA/805-make-dashboard-links-clickable
805 make dashboard links clickable
2024-04-03 19:03:41 -04:00
Jonathan Bobel
2c57d0d373 1213 - Removed the Usage page and updated the Dashboard Landing page 2024-03-28 15:58:02 -04:00
Andrew Shumway
d4ca4cfc44 Merge branch 'main' of https://github.com/GSA/notifications-admin into sms-allowance-dashboardbug 2024-03-27 10:11:24 -06:00
Andrew Shumway
c9c8882dc9 Fix test 2024-03-27 10:10:56 -06:00
Andrew Shumway
c4401b3394 Merge branch 'main' of https://github.com/GSA/notifications-admin into sms-allowance-dashboardbug 2024-03-26 10:04:14 -06:00
Jonathan Bobel
de003a8722 Removed "failure" area so the user can get to all the statuses from the Dashboard Landing screen. A better way to view all statuses will come with a Dashboard redesign. 2024-03-19 12:10:43 -04:00
Beverly Nguyen
e9b9072ae6 updated datetimes based on style guide 2024-03-18 15:10:26 -07:00
Kenneth Kehl
4742cc77b5 change batch file report to look like full csv report 2024-02-21 07:45:21 -08:00
Beverly Nguyen
ef5ed8ecab updated pytest 2024-02-12 15:29:26 -08:00
Andrew Shumway
5a440863af Fix trial mode allowance bug 2024-02-07 14:43:39 -07:00
Andrew Shumway
6999d72f76 Fix dashboard bug/usage page 2024-02-07 09:38:18 -07:00
Carlo Costino
a5eb311f83 Merge pull request #1129 from GSA/1114-reviseexpand-on-recent-batch-table-on-the-dashboard-page
Revise/expand on "Recent Batch" table on the dashboard page.
2024-01-26 15:03:08 -05:00
Beverly Nguyen
1b4754386c update testing for signout and accept invite 2024-01-26 11:29:03 -08:00
Beverly Nguyen
35b38f838c fixed testing for dashboard.py 2024-01-26 11:16:45 -08:00
Beverly Nguyen
45ffa70c3c fixing mocker patch for jobs 2024-01-26 09:43:41 -08:00
Jonathan Bobel
d9875ef287 Content updates for Pricing, Trial Mode, and various areas of changing "message parts" 2024-01-25 14:55:17 -05:00
Beverly Nguyen
9ab6bcbb37 update dashboard test 2024-01-12 13:58:56 -08:00
Beverly Nguyen
ddd80fb927 Merge remote-tracking branch 'origin/main' into 855-make-individual-message-send-reports-less-ephemeral 2024-01-12 13:35:58 -08:00
Beverly Nguyen
34ea3812d6 added new test table to dashboard 2024-01-09 15:48:16 -08:00
Beverly Nguyen
653c7d8624 fix style checks 2024-01-08 15:33:24 -08:00
Beverly Nguyen
ec1d9a49bf updated dashboard 2024-01-08 14:53:34 -08:00
Beverly Nguyen
751947c421 updated dashboard.py def 2024-01-05 12:45:21 -08:00
Jonathan Bobel
5a243904b6 Updated the tests to include the Settings page 2024-01-05 12:07:20 -05:00
Jonathan Bobel
f1e678760b Updating tests, but need to add a new one to test the new secondary navivation 2024-01-04 15:23:01 -05:00
Kenneth Kehl
d218fd2178 notify-admin-529 remove provider view 2023-12-06 13:40:15 -08:00