Datetime events++
Modal add event
Fixed tests