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.

Sign up for GitHub

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

Jump to bottom

Merge Development #310

Merged
merged 26 commits into from
Jul 17, 2024
Merged

Merge Development #310

merged 26 commits into from
Jul 17, 2024

Commits on Jul 10, 2024

  1. view / url for calculate_billing_month

    @aaronk
    aaronk committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    063277c View commit details
    Browse the repository at this point in the history

  2. start of template

    @aaronk
    aaronk committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    899ddc4 View commit details
    Browse the repository at this point in the history

  3. Add billing month GET url to render the template. Need django-filter;… 

    … not sure how claire is setting this up
    @aaronk
    aaronk committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    05d8a68 View commit details
    Browse the repository at this point in the history

  4. Added jquery-ui back in 

    Added project usage url from ProductUsageViewSet, but should do custom SQL
    @aaronk
    aaronk committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    9f9d8c3 View commit details
    Browse the repository at this point in the history

  5. Straight SQL for product usage fetching 

    DataTable display is working
    @aaronk
    aaronk committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    cf02891 View commit details
    Browse the repository at this point in the history

  6. paging etc

    @aaronk
    aaronk committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    68598eb View commit details
    Browse the repository at this point in the history

  7. Calculate billing month works now. Properly takes recalculate and err… 

    …ors only flags.
    @aaronk
    aaronk committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    ef5aa69 View commit details
    Browse the repository at this point in the history

  8. link for billing month

    @aaronk
    aaronk committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    e3595ee View commit details
    Browse the repository at this point in the history

  9. probably don't need year and month; order by org, person

    @aaronk
    aaronk committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    d7bbcf1 View commit details
    Browse the repository at this point in the history

  10. Billing record listing page

    @aaronk
    aaronk committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    8fffdb5 View commit details
    Browse the repository at this point in the history

  11. tweak

    @aaronk
    aaronk committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    00168a4 View commit details
    Browse the repository at this point in the history

  12. summary footer, but it doesn't work because of ajax loading

    @aaronk
    aaronk committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    72e72e5 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2024

  1. Send notification to billing contacts 

    Using a local version of the ifxbilling view because I'm still getting errors when
trying to parse the request body when jquery ajax sends the post
    @aaronk
    aaronk committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    2205e36 View commit details
    Browse the repository at this point in the history

  2. Notify lab managers works. single select for organizations

    @aaronk
    aaronk committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    e512b5c View commit details
    Browse the repository at this point in the history

  3. Merge pull request #306 from fasrc/cp_minoredits 

    Cp minoredits
    @claire-peters
    claire-peters authored Jul 11, 2024
    Configuration menu
    Copy the full SHA
    1833b2f View commit details
    Browse the repository at this point in the history

  4. Lock down admin permissions, handle errors in ajax calls

    @aaronk
    aaronk committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    2b6d114 View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2024

  1. Cp picc (#307) 

    * add user requester cc to coldfront allocation admin emails

* minor refactors and corrections

* add email unit tests

* comment out actions for flake 8 and import sorting

---------

Co-authored-by: geistling <[email protected]>
    @claire-peters
    claire-peters and claire-peters authored Jul 17, 2024
    Configuration menu
    Copy the full SHA
    30671cf View commit details
    Browse the repository at this point in the history

  2. Merge pull request #308 from fasrc/ajk_cbm 

    Billing UI elements
    @claire-peters
    claire-peters authored Jul 17, 2024
    Configuration menu
    Copy the full SHA
    9a0f534 View commit details
    Browse the repository at this point in the history

  3. fix error message generation for signal

    @claire-peters
    claire-peters committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    59e9444 View commit details
    Browse the repository at this point in the history

  4. add info to email logging error

    @claire-peters
    claire-peters committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    c42fd4f View commit details
    Browse the repository at this point in the history

  5. update to Django 4.2.14 and django-q2

    @claire-peters
    claire-peters committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    8e4afa0 View commit details
    Browse the repository at this point in the history

  6. update dependencies

    @claire-peters
    claire-peters committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    3892e06 View commit details
    Browse the repository at this point in the history

  7. change verify config to boolean

    @claire-peters
    claire-peters committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    16858df View commit details
    Browse the repository at this point in the history

  8. Merge pull request #309 from fasrc/cp_dev_adjustments 

    Dev adjustments
    @claire-peters
    claire-peters authored Jul 17, 2024
    Configuration menu
    Copy the full SHA
    f3d77db View commit details
    Browse the repository at this point in the history

  9. change path create to get_or_create in sftocf allocation creation hel… 

    …per function
    @claire-peters
    claire-peters committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    5740a37 View commit details
    Browse the repository at this point in the history

  10. update deprecated pandas method in id_import_new_allocations

    @claire-peters
    claire-peters committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    d9291c8 View commit details
    Browse the repository at this point in the history