CAL/FQA-1298:Add,Edit,Delete,DragDrop -> finish dev & UT