Enhancement: Closes #378

- added missing fields and corrected the calculation of the the
curricular year, now passing the execution year selected and not
assuming the current one