I am sure it can be done by modifying the table. If we have a table, logic and calculation can be part of the table or avoid any calculation or loop.

Adding weekend to table is not to solve the flaw which I mentioned but to avoid checking saturday and Sunday logic.