Consolidated WBL and Shop Hours Report for State Reporting

I want to be able to combine WBL hours logged with Shop Hours added by vocational teachers into a single report for all students. This is necessary for end-of-year state reporting to have a single source for total hours across both categories. Currently, these must be exported separately and merged manually.