P6 Calendar - Shift working

Hello Everyone,

I have 2 criterias for an activity

1. It can be done only in Day time (0600 to 1800)

2. Activity cannot be left undone even if its 90% finished.

e.g. Activity duration is 4 Hrs. and its starting on 1500 - then it should automatically moved onto next day.

While doing baseline i managed to make it happen wih help of Constraints & change in logic.

However, my worry is while in operation if this situation arises then P6 will just schedule it with current logic. that means activity will be split between 2 Days (1500 to 1800 3Hrs + 0600 to 0700 1hrs next day).

Is there any way to get this things right throughout?