Commit 28f528df authored by slogic-sa's avatar slogic-sa Committed by Thomas Huster
Browse files

[15587] Sticker Bearbeitung - Patienten-Details/Konsultation ermöglichen (#365)

parent 856de7bc

bundles/ch.elexis.core.ui/src/ch/elexis/core/ui/views/controls/StickerComposite.java

+32 −20
Original line number Diff line number Diff line
@@ -52,11 +52,12 @@ public class StickerComposite extends Composite { 
		ColumnLayout cwl = new ColumnLayout();

		cwl.maxNumColumns = 4;

		cwl.horizontalSpacing = 1;

		cwl.bottomMargin = 1;

		cwl.topMargin = 1;

		cwl.bottomMargin = 10;

		cwl.topMargin = 0;

		cwl.rightMargin = 1;

		cwl.leftMargin = 1;

		setLayout(cwl);

		setBackground(parent.getBackground());

		this.toolkit = toolkit;

		this.setVisible(false);

	}
@@ -78,6 +79,7 @@ public class StickerComposite extends Composite { 
		for (Control cc : getChildren()) {

			cc.dispose();

		}

		this.setVisible(false);

		List<ISticker> etis = p.getStickers();

		if (etis == null)

			return;
@@ -90,23 +92,7 @@ public class StickerComposite extends Composite { 
					stickerForm.setMenu(menu);

					stickerForm.setLayoutData(new ColumnLayoutData());

					

					final MenuItem miAdd = new MenuItem(menu, SWT.NONE);

					miAdd.setText("Sticker hinzufügen");

					miAdd.addSelectionListener(new SelectionAdapter() {

						

						@Override

						public void widgetSelected(SelectionEvent e){

							

							AssignStickerDialog assignStickerDialog =

								new AssignStickerDialog(getShell(), p);

							if (assignStickerDialog.open() == MessageDialog.OK) {

								// refresh

								setPatient(p);

								getParent().getParent().layout(true);

							}

						}

						

					});

					MenuItem miAdd = createMenuItemAdd(p, menu);

					final MenuItem miRemove = new MenuItem(menu, SWT.NONE);

					miRemove.setData("sticker", et);

					miRemove.setText("Sticker entfernen");
@@ -137,11 +123,37 @@ public class StickerComposite extends Composite { 
				}

			}

		} else {

			this.setVisible(false);

			this.setVisible(true);

			Menu menu = new Menu(this);

		    setMenu(menu);

			createMenuItemAdd(p, menu);

		}

		layout();

	}



	private MenuItem createMenuItemAdd(final Patient p, Menu menu){

		final MenuItem miAdd = new MenuItem(menu, SWT.NONE);

		miAdd.setText("Sticker hinzufügen");

		miAdd.addSelectionListener(new SelectionAdapter() {

			

			@Override

			public void widgetSelected(SelectionEvent e){

				

				AssignStickerDialog assignStickerDialog =

					new AssignStickerDialog(getShell(), p);

				if (assignStickerDialog.open() == MessageDialog.OK) {

					// refresh

					setPatient(p);

					getParent().getParent().layout(true);

				}

			}

			

		});

		miAdd.setEnabled(

			CoreHub.acl.request(AccessControlDefaults.KONTAKT_ETIKETTE));

		return miAdd;

	}

	

	public Composite createForm(Composite parent, ISticker st){

		Composite ret = new Composite(parent, SWT.NONE);