Adds double booking flag to close issue #120.

CampFireManager / cfm2

CampFireManager is a talk scheduling tool for conferences - such as barcamps or fixed schedule conferences

http://campfiremanager.info

16 stars 9 forks source link

Adds double booking flag to close issue #120. #170

Closed JonTheNiceGuy closed 11 years ago

JonTheNiceGuy commented 11 years ago

Added new "hasOverlap" boolean to Talk objects
Adds new grey triangle flag to MainScreen, and a more complete flag on the Object_Talk and Timetable screens (visible only to workers and admins on the last two screens). Object_Talk includes a hyperlink to get you to at least one of the conflicted talks (aside from this one, assuming multiple conflicts!)

JonTheNiceGuy commented 11 years ago

Please can you review this one @NotBobTheBuilder

NotBobTheBuilder commented 11 years ago

I've found a bug in this - the only talk in one slot thinks it is clashing with a talk in the next slot in the same room, though the same isn't true in the other direction.

I'll debug and get back to you.

NotBobTheBuilder commented 11 years ago

I haven't found the cause of the bug - but it looks like on line 227 of the Talk class we iterate through every talk to see if there's a clash - even those in a different slot, which aren't (as far as I can think) possible to clash with.

Perhaps it would be more sensible to only check for those in the same slot? Is there a $slot->getTalks method?

JonTheNiceGuy commented 11 years ago

Hmmm, maybe Object_talk::brokerByColumn? Also, perhaps it's the for loop at line 222?

NotBobTheBuilder commented 11 years ago

Also, the warnings don't show if you're not logged in - is this desired behaviour?

I assume it wouldn't matter too much since workers & admins would be logged in anyway

JonTheNiceGuy commented 11 years ago

Damnit, this pulled back in the #116 fix too :(