NCI-Agency/anet#1723: Small code refactoring
NCI-Agency/anet#1723: Small code refactoring

In the ReportCollection code, always use the calendar format related
code before other formats (for consistency).

NCI-Agency/anet,NCI-Agency/anet,NCI-Agency/anet,NCI-Agency/anet,NCI-Agency/anet