moved conditions to cell
moved calendar to a directive

for reuse