update WAR to use unadjusted end dates
update WAR to use ES Query classes
use dict comprehension
remove unused import
Merge pull request #4593 from dimagi/monitoring

update WAR to use unadjusted end dates