--- dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/AddressReport.java	2016/01/24 21:48:55	2838
+++ dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/AddressReport.java	2016/01/28 10:57:26	2860
@@ -15,9 +15,14 @@
 import dk.daoas.adressevedligehold.beans.Address.AddressState;
 import dk.daoas.adressevedligehold.util.TimingHelper;
 
+/* 
+ * TODO: detail rapport pr postnr
+ * TODO: ved mangel oversigten - skeln mellem om det er nye/CREATED eller om det er gamle kendte adresser
+ */
+
 public class AddressReport {
 	
-	class NumEntry {
+	static class NumEntry {
 		int open = 0;
 		int closed = 0;
 		int modified = 0;
@@ -38,7 +43,7 @@
 			this.created += other.created;
 		}
 	}
-	class WeekEntry {
+	static class WeekEntry {
 		NumEntry man = new NumEntry();
 		NumEntry tir = new NumEntry();
 		NumEntry ons = new NumEntry();
@@ -68,7 +73,7 @@
 		}
 	}
 	
-	
+	AddressManager addrManager;
 	List<Address> addressList;
 	int entryCount;
 	EntryUgedage ugedage;
@@ -78,6 +83,7 @@
 	
 	//TODO: Afviste adresser
 	public AddressReport(AddressManager addrManager, int entryCount, EntryUgedage ugedage, AddressSource source, TimingHelper timer, boolean writeBack ) {
+		this.addrManager = addrManager;
 		addressList = addrManager.getAddressList();
 		this.entryCount = entryCount;
 		this.ugedage = ugedage;
@@ -93,40 +99,44 @@
 		String reportData = getReportData();
 		String subject = "Indlæsnings rapport for " + source.getDistributor();
 		
-		
-        Properties props = new Properties();
-        props.put("mail.smtp.host", "10.30.1.28");
-        //props.put("mail.smtp.host", "192.168.12.10");
-        
-        try {
-        	// create some properties and get the default Session
-        	Session session = Session.getDefaultInstance(props, null);
-        	session.setDebug(false);
-        	
-        	MimeMessage msg = new MimeMessage(session);
-			msg.setFrom( new InternetAddress("no-reply@daoas.dk") );
-			
-			
-			msg.setRecipient(Message.RecipientType.TO, new InternetAddress("thn@daoas.dk") );//TODO: mulighed for at ændre modtager mail
-			msg.setSubject( subject );			
-			msg.setContent(reportData, "text/html; charset=utf-8");
-			
-			Transport.send(msg);
-			
-        	
-    	} catch (MessagingException e) {
-			System.out.println("Unable to send report mail " + e.getMessage() );
-		}
-        	
+		AddressReport.sendMail(subject, reportData);
 		
 	}
 	
+	public static void sendMail(String subject, String htmlBody) {
+	       Properties props = new Properties();
+	        props.put("mail.smtp.host", "10.30.1.28");
+	        //props.put("mail.smtp.host", "192.168.12.10");
+	        
+	        try {
+	        	// create some properties and get the default Session
+	        	Session session = Session.getDefaultInstance(props, null);
+	        	session.setDebug(false);
+	        	
+	        	MimeMessage msg = new MimeMessage(session);
+				msg.setFrom( new InternetAddress("no-reply@daoas.dk") );
+				
+				
+				msg.setRecipient(Message.RecipientType.TO, new InternetAddress("thn@daoas.dk") );//TODO: mulighed for at ændre modtager mail
+				msg.setSubject( subject );			
+				msg.setContent(htmlBody, "text/html; charset=utf-8");
+				
+				Transport.send(msg);
+				
+	        	
+	    	} catch (MessagingException e) {
+				System.out.println("Unable to send report mail " + e.getMessage() );
+			}		
+	}
+	
+	
 	public String getReportData() {
 	
 		WeekEntry total = new WeekEntry();
 		HashMap<Short, WeekEntry> postnrEntries = new HashMap<Short,WeekEntry>();
 		
 		
+		int antalUdenKommunekodeNy = 0;
 		int antalUdenKommunekode = 0;
 		int antalUdenLatitude = 0;
 		int antalUdenDBKBane = 0;
@@ -134,6 +144,10 @@
 		// first gather the intel
 		for (Address a : addressList) {
 			if (a.kommunekode == 0 || a.vejkode == 0) {
+				if (a.state == AddressState.CREATED) { 
+					antalUdenKommunekodeNy++;
+				}
+				
 				antalUdenKommunekode++;
 			}
 			
@@ -179,6 +193,7 @@
 		sb.append("Tidsforbrug: ").append( timer.getElapsed() ).append("ms. <br>");
 		sb.append("Skriv til DB: ").append( writeBack ).append("<br>");
 		sb.append("Antal entries: " ).append( entryCount ).append("<br>");
+		sb.append("Antal afviste: " ).append( addrManager.getAfvistAntal() ).append("<br>");
 		
 		sb.append("<h2>Data Mangler</h2>\n");
 		sb.append("<pre>");