From 13018794d5ffea90bd27906fb04cd28647a164e0 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 24 Sep 2022 10:16:33 +0200
Subject: [PATCH] Add new icons

---
 .../icons/types/svg/organisationContact.svg                   | 1 +
 org.argeo.app.theme.default/icons/types/svg/report.svg        | 1 +
 org.argeo.app.ui/src/org/argeo/app/ui/SuiteIcon.java          | 4 +++-
 .../src/org/argeo/app/ui/people/PeopleEntryArea.java          | 4 ++--
 4 files changed, 7 insertions(+), 3 deletions(-)
 create mode 100644 org.argeo.app.theme.default/icons/types/svg/organisationContact.svg
 create mode 100644 org.argeo.app.theme.default/icons/types/svg/report.svg

diff --git a/org.argeo.app.theme.default/icons/types/svg/organisationContact.svg b/org.argeo.app.theme.default/icons/types/svg/organisationContact.svg
new file mode 100644
index 0000000..2e9077b
--- /dev/null
+++ b/org.argeo.app.theme.default/icons/types/svg/organisationContact.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 500 500"><defs><style>.cls-1{fill:#177f95;}.cls-2{fill:#fff;}</style></defs><title>Artboard 150</title><circle class="cls-1" cx="246.5" cy="242.5" r="232.5"/><rect class="cls-2" x="270.83" y="129.04" width="143.1" height="245.14"/><rect class="cls-1" x="341.05" y="165.41" width="44.23" height="44.23"/><rect class="cls-1" x="341.05" y="234.3" width="44.23" height="44.23"/><rect class="cls-1" x="341.05" y="305.07" width="44.23" height="44.23"/><rect class="cls-2" x="103.93" y="75.68" width="215.69" height="318.14"/><rect class="cls-1" x="138.11" y="114.48" width="59.03" height="59.03"/><rect class="cls-1" x="230.8" y="114.51" width="59.03" height="59.03"/><rect class="cls-1" x="137.82" y="213.95" width="59.03" height="59.03"/><rect class="cls-1" x="234.02" y="213.95" width="59.03" height="59.03"/><rect class="cls-1" x="137.82" y="305.31" width="59.03" height="59.03"/><rect class="cls-1" x="235.65" y="302.89" width="59.03" height="59.03"/></svg>
\ No newline at end of file
diff --git a/org.argeo.app.theme.default/icons/types/svg/report.svg b/org.argeo.app.theme.default/icons/types/svg/report.svg
new file mode 100644
index 0000000..fb79d12
--- /dev/null
+++ b/org.argeo.app.theme.default/icons/types/svg/report.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 500 500"><defs><style>.cls-1{fill:#177f95;}.cls-2{fill:#fff;}</style></defs><title>Artboard 151</title><rect class="cls-1" x="73.53" y="66" width="365.95" height="340"/><rect class="cls-2" x="89.27" y="112.97" width="335.53" height="22.37"/><rect class="cls-2" x="89.27" y="155.03" width="335.53" height="22.37"/><rect class="cls-2" x="89.27" y="197.08" width="335.53" height="22.37"/><rect class="cls-2" x="89.27" y="239.13" width="335.53" height="22.37"/><rect class="cls-2" x="89.27" y="281.18" width="335.53" height="22.37"/><rect class="cls-2" x="89.27" y="323.24" width="335.53" height="22.37"/><rect class="cls-2" x="89.27" y="365.29" width="335.53" height="22.37"/><rect class="cls-1" x="183.58" y="108.05" width="13.42" height="286.32"/><rect class="cls-1" x="317.79" y="107.16" width="13.42" height="286.32"/></svg>
\ No newline at end of file
diff --git a/org.argeo.app.ui/src/org/argeo/app/ui/SuiteIcon.java b/org.argeo.app.ui/src/org/argeo/app/ui/SuiteIcon.java
index 5f29b50..bef2271 100644
--- a/org.argeo.app.ui/src/org/argeo/app/ui/SuiteIcon.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/SuiteIcon.java
@@ -6,9 +6,11 @@ import org.argeo.api.cms.ux.CmsIcon;
 public enum SuiteIcon implements CmsIcon {
 	add, save, close, closeAll, search, delete, logout, dashboard,
 	// people
-	people, group, person, organisation, addressBook, users,
+	people, group, person, organisation, addressBook, users, organisationContact,
 	// library
 	documents, document, folder,
+	// management
+	report,
 	// admin and settings
 	settings, user,
 	// misc
diff --git a/org.argeo.app.ui/src/org/argeo/app/ui/people/PeopleEntryArea.java b/org.argeo.app.ui/src/org/argeo/app/ui/people/PeopleEntryArea.java
index 09907cb..8ef935c 100644
--- a/org.argeo.app.ui/src/org/argeo/app/ui/people/PeopleEntryArea.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/people/PeopleEntryArea.java
@@ -109,7 +109,7 @@ public class PeopleEntryArea implements SwtUiProvider, CmsUiProvider {
 
 			@Override
 			public String getText(HierarchyUnit model) {
-				return model.getHierarchyUnitName();
+				return model.getHierarchyUnitLabel(CurrentUser.locale());
 			}
 
 			@Override
@@ -177,7 +177,7 @@ public class PeopleEntryArea implements SwtUiProvider, CmsUiProvider {
 				else if (role.isContentClass(LdapObjs.inetOrgPerson.qName()))
 					return SuiteIcon.person;
 				else if (role.isContentClass(LdapObjs.organization.qName()))
-					return SuiteIcon.organisation;
+					return SuiteIcon.organisationContact;
 				else if (role.isContentClass(LdapObjs.groupOfNames.qName()))
 					return SuiteIcon.group;
 				else
-- 
2.30.2