fixed macro for convert string to date, added macro to convert to date time