From ef45185c4c44fe59c834cd5cac042cf94a2fc88f Mon Sep 17 00:00:00 2001
From: ryounes <ryounes@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Fri, 19 Aug 2011 17:33:58 +0000
Subject: [PATCH] Add department to mailing address list view

---
 productMods/config/listViewConfig-mailingAddress.xml      | 4 +++-
 .../partials/individual/propStatement-mailingAddress.ftl  | 8 ++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/productMods/config/listViewConfig-mailingAddress.xml b/productMods/config/listViewConfig-mailingAddress.xml
index 207b96a5..42412962 100644
--- a/productMods/config/listViewConfig-mailingAddress.xml
+++ b/productMods/config/listViewConfig-mailingAddress.xml
@@ -12,7 +12,8 @@
         SELECT DISTINCT ?subclass 
                         ?address
                         ?localName
-                        ?label    
+                        ?label   
+                        ?dept
                         ?street                    
                         ?city 
                         ?state
@@ -23,6 +24,7 @@
             ?subject ?property ?address 
             LET ( ?localName := afn:localname(?address) )
             OPTIONAL { ?address rdfs:label ?label  }
+            OPTIONAL { ?address core:addressDepartment ?dept }
             OPTIONAL { ?address core:addressStreet ?street  }
             OPTIONAL { ?address core:addressCity ?city  }
             OPTIONAL { ?address core:addressState ?state  }
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-mailingAddress.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-mailingAddress.ftl
index c3f98161..ca951c01 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-mailingAddress.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-mailingAddress.ftl
@@ -12,10 +12,14 @@
      next statement -->
 <#macro showAddress statement>
  
-    <#if ( statement.street?has_content || statement.city?has_content || statement.state?has_content ||
-         statement.postalCode?has_content || statement.country?has_content )>
+    <#if ( statement.dept?has_content || statement.street?has_content || statement.city?has_content || 
+           statement.state?has_content ||statement.postalCode?has_content || statement.country?has_content )>
          
         <div class="adr">
+            <#if statement.dept?has_content>
+                <div class="address-dept">${statement.dept}</div>
+            </#if>
+            
             <#if statement.street?has_content>
                 <div class="street-address">${statement.street}</div>
             </#if>