Thanks for your responses. I've had a think about it too and I feel that the initial psychologist was also trying to say that anger is there, but what we decide to do with it is the choice.
I resolved the issue with my friend at work - turns out that she was also frustrated with my manager and my yelling at her was the final straw. Her hand in my face was her way of saying 'I can't deal with this now even if you are apologising'. We're cool again.
From the beginning of this term/year it has been a horror run. I've had worse years, but I find that I have been highly charged with emotion for the last couple of months. However I am starting to see a light at the end of the tunnel as things are slowly changing.
Maybe this was just one of those times that you have to hang on white knuckled and just get through.
Bookmarks