The Portuguese government has said it expects water supplies in parts of Almada to return to normal within the next two to three weeks, following ongoing disruption caused by infrastructure problems.