[25560] IContactSelectorDialog, fix search condition, and images

elexis · Aug 29, 2023 · c924c57 · c924c57
1 parent a540119
commit c924c57
Showing 1 changed file with 14 additions and 6 deletions.
diff --git a/bundles/ch.elexis.core.ui.e4/src/ch/elexis/core/ui/e4/dialog/IContactSelectorDialog.java b/bundles/ch.elexis.core.ui.e4/src/ch/elexis/core/ui/e4/dialog/IContactSelectorDialog.java
@@ -29,6 +29,7 @@
 import ch.elexis.core.services.IModelService;
 import ch.elexis.core.services.IQuery;
 import ch.elexis.core.services.IQuery.COMPARATOR;
+import ch.elexis.core.types.Gender;
 import ch.elexis.core.ui.icons.Images;
 
 public class IContactSelectorDialog extends TitleAreaDialog {
@@ -45,7 +46,7 @@ public class IContactSelectorDialog extends TitleAreaDialog {
 	private List<? extends IContact> initialInput;
 	private String _message;
 	private String _title;
-	
+
 	public IContactSelectorDialog(Shell parentShell, IModelService coreModelService) {
 		this(parentShell, coreModelService, IContact.class);
 	}
@@ -60,7 +61,7 @@ public IContactSelectorDialog(Shell parentShell, IModelService coreModelService,
 	@Override
 	public void create() {
 		super.create();
-		if(_title != null) {
+		if (_title != null) {
 			super.setTitle(_title);
 		} else {
 			setTitle(Messages.Core_Please_Select_Contact);
@@ -112,6 +113,9 @@ public Image getImage(Object element) {
 				IContact contact = ((IContact) element);
 				if (contact.isOrganization() || contact.isLaboratory()) {
 					return Images.IMG_ORGANISATION.getImage();
+				} else if (contact.isPatient()) {
+					return (Gender.MALE == contact.asIPatient().getGender()) ? Images.IMG_MANN.getImage()
+							: Images.IMG_FRAU.getImage();
 				}
 				return Images.IMG_PERSON.getImage();
 			}
@@ -135,10 +139,14 @@ public Image getImage(Object element) {
 	private void refresh() {
 		String _text = text.getText();
 		if (StringUtils.isNotBlank(_text) && _text.length() > 2) {
+			String value = "%" + _text + "%";
+
 			IQuery<? extends IContact> query = coreModelService.getQuery(queryClass);
-			query.and(ModelPackage.Literals.ICONTACT__DESCRIPTION1, COMPARATOR.LIKE, "%" + _text + "%");
-			query.or(ModelPackage.Literals.ICONTACT__DESCRIPTION2, COMPARATOR.LIKE, "%" + _text + "%");
-			query.or(ModelPackage.Literals.ICONTACT__DESCRIPTION3, COMPARATOR.LIKE, "%" + _text + "%");
+			query.startGroup();
+			query.and(ModelPackage.Literals.ICONTACT__DESCRIPTION1, COMPARATOR.LIKE, value, true);
+			query.or(ModelPackage.Literals.ICONTACT__DESCRIPTION2, COMPARATOR.LIKE, value, true);
+			query.or(ModelPackage.Literals.ICONTACT__DESCRIPTION3, COMPARATOR.LIKE, value, true);
+			query.andJoinGroups();
 			query.limit(50);
 			tableViewerContacts.setInput(query.execute());
 		} else {
@@ -166,7 +174,7 @@ public IContact getSelectedContact() {
 	public void setMessage(String message) {
 		this._message = message;
 	}
-	
+
 	@Override
 	public void setTitle(String title) {
 		this._title = title;