From my previous tajweed calsses, my teacher has explicitly mentioned harf waaw being part the idghaam kaamil category, but it also has ghunnah. therefore, the categories you have are incorrect.

Question
assalaamu alaikum,

re: idghaam kaamil / idghaam naaqis

When going over these lessons, you only have two categories for idghaam. You have Kaamil and Naaqis. You refer:

Kaamil as idghaam bighayr ghunnah, and
naaqis  as idghaam bighunnah

HOWEVER,

From my previous tajweed classes, my teacher has explicitly mentioned harf waaw being part the idghaam kaamil category, but it also has ghunnah. Therefore, the categories you have are incorrect. (look in the quran and see if noon saakinah followed by waaw has shaddah on it, this will imply it is idghaam kaamil).

i am sorry, i am looking to get my book back and will most definitely quote you with page numbers.

but please do reply and clarify whether there are actually more categories - I'm only relying on my memory at the moment!

jazaakAllahu khair

wassalaamu alaikum

Answer
Wa alaikum assalaam wa rahmatullahi wa barakatuh. 
The categories posted on the site are correct.  The saakinah or tanween makes an incomplete idghaam into the , and the ghunnah left over from the is the sign that this merging is incomplete. 
In the Medinah printing complex print of the Qur'an, there is no shaddah on the or when there is an idhgaam of the saakinah or tanween into the or .   Some prints of the Qur'an have a shaddah, but this is not considered correct by most scholars of tajweed and thus there is no shaddah present in most of the printings of the Qur'an. 
Idghaam kaamil, or complete merging means that the letter and all of its characteristics have merged into the next letter.  This is not the case with the merging into the  and . The ghunnah is an instrinic part of the letter , and the fact that there a ghunnah remains during the idhgam shows that the merging is not complete, thus it is idghaam naaqis, or incomplete merging.

We suggest you review your notes and your textbook.  You may also benefit from the following PDF:  http://www.abouttajweed.com/downloads/useful-documents/the-manners-of-those-seeking-knowledge/download.html