Simplify code and fix minor decimal issue in web

EV-186

Simplify the code checking in the java class and re-calculate
increase instead of trusting submitted value. Fix order of calculations
in the webpage to make sure the increase is refreshed first before the
salary total.