--- dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/dawa/DawaTask.java	2016/04/20 13:51:24	3012
+++ dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/dawa/DawaTask.java	2016/04/29 11:23:06	3029
@@ -3,9 +3,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.TreeMap;
-import java.util.TreeSet;
 
 import dk.daoas.adressevedligehold.MailSender;
 import dk.daoas.adressevedligehold.beans.Address;
@@ -25,13 +23,16 @@
 
 public class DawaTask extends Task {
 	
-	final String kommentarTemplate = "Oprettet via DAWA";
+	final static String KOMMENTAR_TEMPLATE = "Oprettet via DAWA";
 	
 	private TaskLogger logger = TaskLogger.getInstance(); 
 	
 	private short regionCode;
 	private String regionName;
 	
+	int antalBehandlede = 0;
+	int antalKommuner = 0;
+	
 	
 	
 	DatabaseCoverageUpdate db = new DatabaseCoverageUpdate();
@@ -83,6 +84,8 @@
 		int totalAntalUkendt = 0;
 		int totalAntalDobbelt = 0;
 		
+		antalKommuner = kommuner.size();
+		
 		
 		StringBuilder sb = new StringBuilder();
 		
@@ -125,7 +128,7 @@
 				if (fundet == false) {
 					dawaAddr.gadeid = gade.gadeids.iterator().next();
 					dawaAddr.state = AddressState.CREATED;
-					dawaAddr.kommentar = kommentarTemplate;
+					dawaAddr.kommentar = KOMMENTAR_TEMPLATE;
 					nyeAdresser.add(dawaAddr);
 				}			
 			}
@@ -133,7 +136,7 @@
 			
 			db.saveNewAddresses(nyeAdresser);
 			
-			logger.info("Save to db done - sending report mail");
+			logger.info("Save to db done - adding to report mail");
 			
 			List<Address> saveOK = new ArrayList<>();
 			List<Address> saveFail = new ArrayList<>();
@@ -149,6 +152,9 @@
 			totalAntalFejl += saveFail.size();
 			totalAntalUkendt += ukendteDAV.size();
 			totalAntalDobbelt += dobbeltGadeidDAV.size();
+			
+			
+			antalBehandlede++;
 	
 			
 			sb.append("<h2>Kommune: " + kommunenavn + "</h2>\n");
@@ -175,6 +181,7 @@
 				sb.append(dav.getKey() + " : " + dav.getValue() + "<br>\n");
 			}						
 		}
+		logger.info("Sendingreport mail");
 		
 		headerSB.append("Antal Inserts: " + totalAntalNye + "<br>\n");
 		headerSB.append("Antal insert fails: " + totalAntalFejl + "<br>\n");
@@ -221,7 +228,12 @@
 
 	@Override
 	public double getPercentCompleted() {
-		return 0;
+		if (antalKommuner == 0) {
+			return 0;	
+		}
+		
+		return  (antalBehandlede / ((double)antalKommuner) ) * 100.0;
+		
 	}