Well at least now you don't have to listen to her, haha!
On a serious note, I'm sorry her awful behavior has consumed so much of your time and life! So glad you'll be moving soon and it will all be behind you!
I am in CA too (very near Napa,) and we had a problem with a previous landlord, so I looked into the codes as well. The landlord MUST give you at least 48 hours notice before entering the property for any reason outside of an emergency (like flood or fire.) Also, unless it is stipulated IN...