Bug fixes

* Fixed the bug that would display blank entries on the calendar
* Fixed an issue which would send blank equipment ID to the database entry script