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

Develop/alex #220

Merged
merged 10 commits into from
Jul 28, 2023
Merged

Develop/alex #220

merged 10 commits into from
Jul 28, 2023

Commits on Jul 27, 2023

  1. Added missed School report at district level

    @arybakov-cgi
    arybakov-cgi committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    0887290 View commit details
    Browse the repository at this point in the history

  2. Fix wrong school report

    @arybakov-cgi
    arybakov-cgi committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    1406d19 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'grad-release' of https://github.com/bcgov/EDUC-GRAD-DIS… 

    …TRIBUTION-API into develop/alex

# Conflicts:
#	api/src/main/java/ca/bc/gov/educ/api/distribution/process/YearEndMergeProcess.java
    @arybakov-cgi
    arybakov-cgi committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    06ced75 View commit details
    Browse the repository at this point in the history

  4. Fix tests

    @arybakov-cgi
    arybakov-cgi committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    2567447 View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2023

  1. GRAD2-2261: School Reports for Year-End are not being created for all… 

    … School Category run types and are not being added to the SCHOOL REPORTS table in GRAD
    @arybakov-cgi
    arybakov-cgi committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    17fb994 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'grad-release' of https://github.com/bcgov/EDUC-GRAD-DIS… 

    …TRIBUTION-API into develop/alex
    @arybakov-cgi
    arybakov-cgi committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    a5aa8b0 View commit details
    Browse the repository at this point in the history

  3. GRAD2-2261: School Reports for Year-End are not being created for all… 

    … School Category run types and are not being added to the SCHOOL REPORTS table in GRAD
    @arybakov-cgi
    arybakov-cgi committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    1107712 View commit details
    Browse the repository at this point in the history

  4. Optimized implementation for school report generation

    @arybakov-cgi
    arybakov-cgi committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    de099a9 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'grad-release' of https://github.com/bcgov/EDUC-GRAD-DIS… 

    …TRIBUTION-API into develop/alex

# Conflicts:
#	api/src/main/java/ca/bc/gov/educ/api/distribution/service/PostingDistributionService.java
    @arybakov-cgi
    arybakov-cgi committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    ed7dc4d View commit details
    Browse the repository at this point in the history

  6. Resolve merge conflict

    @arybakov-cgi
    arybakov-cgi committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    20dfba5 View commit details
    Browse the repository at this point in the history