Make some changes to a condition logic and to charts setting

It is necessary solve two bugs to a Laravel application regard the condition logic and setting of charts builder. The application use php 7.4. if it is necessary you must do changes to the database and the backend