DEICH-4072: Campaigns ending today should count as active. Simplify code.

Merged Magnus Westergaard requested to merge DEICH-4072 into master

Closes DEICH-4072

Merge request reports