Commit eafa680f authored by Marco Descher's avatar Marco Descher
Browse files

[14501] Cleanup

parent 866edadf

bundles/es.core.connector.elexis/META-INF/MANIFEST.MF

+1 −2
Original line number Diff line number Diff line
@@ -35,6 +35,5 @@ Export-Package: info.elexis.server.core.connector.elexis, 
 info.elexis.server.core.connector.elexis.common,

 info.elexis.server.core.connector.elexis.instances,

 info.elexis.server.core.connector.elexis.locking,

 info.elexis.server.core.connector.elexis.services,

 info.elexis.server.core.connector.elexis.services.util

 info.elexis.server.core.connector.elexis.services

Bundle-Activator: info.elexis.server.core.connector.elexis.internal.Activator

bundles/es.core.connector.elexis/OSGI-INF/info.elexis.server.core.connector.elexis.services.internal.CoreModelServiceHolder.xml→bundles/es.core.connector.elexis/OSGI-INF/info.elexis.server.core.connector.elexis.internal.services.CoreModelServiceHolder.xml

+2 −2
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="info.elexis.server.core.connector.elexis.services.internal.CoreModelServiceHolder">

<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="info.elexis.server.core.connector.elexis.internal.services.CoreModelServiceHolder">

   <reference bind="setModelService" interface="ch.elexis.core.services.IModelService" name="ModelService" target="(service.model.name=ch.elexis.core.model)"/>

   <implementation class="info.elexis.server.core.connector.elexis.services.internal.CoreModelServiceHolder"/>

   <implementation class="info.elexis.server.core.connector.elexis.internal.services.CoreModelServiceHolder"/>

</scr:component>
 
 No newline at end of file

bundles/es.core.connector.elexis/OSGI-INF/info.elexis.server.core.connector.elexis.services.LocalLockService.xml→bundles/es.core.connector.elexis/OSGI-INF/info.elexis.server.core.connector.elexis.internal.services.LocalLockService.xml

+2 −2
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.3.0" name="info.elexis.server.core.connector.elexis.services.LocalLockService">

<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.3.0" name="info.elexis.server.core.connector.elexis.internal.services.LocalLockService">

   <service>

      <provide interface="ch.elexis.core.services.ILocalLockService"/>

   </service>

   <reference cardinality="1..1" field="contextService" interface="ch.elexis.core.services.IContextService" name="contextService"/>

   <reference cardinality="1..1" field="lockService" interface="info.elexis.server.core.connector.elexis.locking.ILockService" name="lockService"/>

   <reference cardinality="1..1" field="storeToStringService" interface="ch.elexis.core.services.IStoreToStringService" name="storeToStringService"/>

   <implementation class="info.elexis.server.core.connector.elexis.services.LocalLockService"/>

   <implementation class="info.elexis.server.core.connector.elexis.internal.services.LocalLockService"/>

</scr:component>
 
 No newline at end of file

bundles/es.core.connector.elexis/src/info/elexis/server/core/connector/elexis/billable/VerrechenbarEigenleistung.java

deleted100644 → 0
+0 −91
Original line number Diff line number Diff line 
//package info.elexis.server.core.connector.elexis.billable;

//

//import java.util.List;

//

//import org.eclipse.core.runtime.IStatus;

//import org.slf4j.Logger;

//import org.slf4j.LoggerFactory;

//

//import ch.rgw.tools.Money;

//import ch.rgw.tools.TimeTool;

//import info.elexis.server.core.connector.elexis.billable.optifier.DefaultOptifier;

//import info.elexis.server.core.connector.elexis.jpa.model.annotated.Behandlung;

//import info.elexis.server.core.connector.elexis.jpa.model.annotated.Eigenleistung;

//import info.elexis.server.core.connector.elexis.jpa.model.annotated.Fall;

//import info.elexis.server.core.connector.elexis.jpa.model.annotated.Kontakt;

//import info.elexis.server.core.connector.elexis.jpa.model.annotated.Verrechnet;

//

//public class VerrechenbarEigenleistung implements IBillable<Eigenleistung> {

//

//	protected Logger log = LoggerFactory.getLogger(VerrechenbarEigenleistung.class);

//

//	private final Eigenleistung eigenleistung;

//

//	public VerrechenbarEigenleistung(Eigenleistung eigenleistung) {

//		this.eigenleistung = eigenleistung;

//	}

//

//	@Override

//	public List<Object> getActions(Object arg0) {

//		return null;

//	}

//

//	@Override

//	public String getCode() {

//		return eigenleistung.getCode();

//	}

//

//	@Override

//	public String getCodeSystemCode() {

//		return "999";

//	}

//

//	@Override

//	public String getCodeSystemName() {

//		return "Eigenleistung";

//	}

//

//	@Override

//	public String getId() {

//		return eigenleistung.getId();

//	}

//

//	@Override

//	public String getText() {

//		return eigenleistung.getDescription();

//	}

//

//	@Override

//	public IStatus add(Behandlung kons, Kontakt userContact, Kontakt mandatorContact, float count) {

//		return new DefaultOptifier().add(this, kons, userContact, mandatorContact, count);

//	}

//

//	@Override

//	public IStatus removeFromConsultation(Verrechnet vr, Kontakt mandatorContact) {

//		return new DefaultOptifier().remove(vr);

//	}

//

//	@Override

//	public Eigenleistung getEntity() {

//		return eigenleistung;

//	}

//

//	@Override

//	public int getTP(TimeTool date, Fall fall) {

//		String salePrice = eigenleistung.getSalePrice();

//		Money m = new Money();

//		m.addCent(salePrice);

//		return m.getCents();

//	}

//

//	@Override

//	public double getFactor(TimeTool dat, Fall fall) {

//		return 1.0;

//	}

//

//	@Override

//	public VatInfo getVatInfo() {

//		return VatInfo.VAT_DEFAULT;

//	}

//

//}

bundles/es.core.connector.elexis/src/info/elexis/server/core/connector/elexis/billable/VerrechenbarPhysioLeistung.java

deleted100644 → 0
+0 −85
Original line number Diff line number Diff line 
//package info.elexis.server.core.connector.elexis.billable;

//

//import java.util.List;

//

//import org.eclipse.core.runtime.IStatus;

//

//import ch.rgw.tools.TimeTool;

//import info.elexis.server.core.connector.elexis.billable.optifier.DefaultOptifier;

//import info.elexis.server.core.connector.elexis.jpa.model.annotated.Behandlung;

//import info.elexis.server.core.connector.elexis.jpa.model.annotated.Fall;

//import info.elexis.server.core.connector.elexis.jpa.model.annotated.Kontakt;

//import info.elexis.server.core.connector.elexis.jpa.model.annotated.PhysioLeistung;

//import info.elexis.server.core.connector.elexis.jpa.model.annotated.Verrechnet;

//import info.elexis.server.core.connector.elexis.services.FallService;

//import info.elexis.server.core.connector.elexis.services.VerrechnetService;

//

//public class VerrechenbarPhysioLeistung implements IBillable<PhysioLeistung> {

//

//	private final PhysioLeistung physioLeistung;

//

//	public VerrechenbarPhysioLeistung(PhysioLeistung physioLeistung) {

//		this.physioLeistung = physioLeistung;

//	}

//

//	@Override

//	public String getCodeSystemName() {

//		return "Physiotherapie";

//	}

//

//	@Override

//	public String getCodeSystemCode() {

//		return "311";

//	}

//

//	@Override

//	public String getId() {

//		return physioLeistung.getId();

//	}

//

//	@Override

//	public String getCode() {

//		return physioLeistung.getZiffer();

//	}

//

//	@Override

//	public String getText() {

//		return physioLeistung.getTitel();

//	}

//

//	@Override

//	public List<Object> getActions(Object context) {

//		return null;

//	}

//

//	@Override

//	public PhysioLeistung getEntity() {

//		return physioLeistung;

//	}

//

//	@Override

//	public int getTP(TimeTool date, Fall fall) {

//		return Integer.parseInt(physioLeistung.getTp());

//	}

//

//	@Override

//	public double getFactor(TimeTool date, Fall fall) {

//		String billingSystem = FallService.getAbrechnungsSystem(fall);

//		return VerrechnetService.getVKMultiplikator(date, billingSystem);

//	}

//

//	@Override

//	public IStatus add(Behandlung kons, Kontakt userContact, Kontakt mandatorContact, float count) {

//		return new DefaultOptifier().add(this, kons, userContact, mandatorContact, count);

//	}

//

//	@Override

//	public IStatus removeFromConsultation(Verrechnet vr, Kontakt mandatorContact) {

//		return new DefaultOptifier().remove(vr);

//	}

//

//	@Override

//	public VatInfo getVatInfo() {

//		return VatInfo.VAT_DEFAULT;

//	}

//}