Skip to content

GitLab

elexis-3-core
elexis-3-core
Source
Select Git revision
...
Target
Select Git revision
 
Commits (102)
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1571 additions and 1118 deletions
.gitlab-ci.yml
View file @ 9be26af4
# Build script used by gitlab.medelexis.ch
variables:
ORIGIN_BRANCH: "3.4"
ORIGIN_BRANCH: "3.6"
stages:
- build
......
Elexis.setup
View file @ 9be26af4
......@@ -55,7 +55,7 @@
<setupTask
xsi:type="setup:PreferenceTask"
key="/instance/org.eclipse.ui.ide/WORKSPACE_NAME"
value="Elexis (${scope.project.stream.name})"/>
value="E ${core.git.clone.checkoutBranch}"/>
</setupTask>
</setupTask>
<setupTask
......@@ -232,8 +232,8 @@
</setupTask>
<setupTask
xsi:type="pde:TargetPlatformTask"
id="ch.elexis.target.juno-target.target"
name="Juno for Elexis 3.0"/>
id="ch.elexis.target.elexis-prepare.target"
name="Prepare Target"/>
<project name="Medelexis"
label="">
<setupTask
......
bundles/ch.elexis.core.application/plugin.properties
View file @ 9be26af4
......@@ -53,6 +53,8 @@ elexis.templatePrintView = Print template
elexis.textCategory = documents
elexis.textView = Letters
perspective.description.0 = A perspective for creating and printing bill
sidebar.activities = Services
sidebar.articles = Articles
sidebar.bbs = Bulletin Board
......
bundles/ch.elexis.core.application/plugin_de.properties
View file @ 9be26af4
......@@ -53,6 +53,8 @@ elexis.templatePrintView = Vorlage Drucken
elexis.textCategory = Dokumente
elexis.textView = Briefe
perspective.description.0 = Eine Perspektive zum Rechnungen erstellen und ausdrucken
sidebar.activities = Leistungen
sidebar.articles = Artikel
sidebar.bbs = Schwarzes Brett
......
bundles/ch.elexis.core.application/plugin_en.properties
View file @ 9be26af4
......@@ -53,6 +53,8 @@ elexis.templatePrintView = Print template
elexis.textCategory = Documents
elexis.textView = letters
perspective.description.0 = A perspective for creating and printing bill
sidebar.activities = Services
sidebar.articles = items
sidebar.bbs = Bulletin board
......
bundles/ch.elexis.core.application/plugin_fr.properties
View file @ 9be26af4
......@@ -53,6 +53,8 @@ elexis.templatePrintView = Imprimer mod\u00E8le
elexis.textCategory = Papiers
elexis.textView = Courrier
perspective.description.0 = perspective pour cr\u00E9er et imprimer des factures\n
sidebar.activities = Services
sidebar.articles = Article
sidebar.bbs = Tableau d'affichage
......
bundles/ch.elexis.core.application/plugin_it.properties
View file @ 9be26af4
......@@ -53,6 +53,8 @@ elexis.templatePrintView = modello di stampa
elexis.textCategory = documenti
elexis.textView = lettere
perspective.description.0 = Una prospettiva per la creazione e la stampa delle fatture
sidebar.activities = servizi
sidebar.articles = articolo
sidebar.bbs = albo
......
bundles/ch.elexis.core.data/plugin.xml
View file @ 9be26af4
......@@ -56,6 +56,16 @@
class="ch.elexis.core.data.util.PatientDataAccessor"
name="Patient">
</DataAccess>
<TextPlaceHolder
name="Kostentraeger"
resolver="ch.elexis.core.data.text.resolver.FallKostentraegerResolver"
type="ch.elexis.data.Fall">
</TextPlaceHolder>
<TextPlaceHolder
name="Kostenträger"
resolver="ch.elexis.core.data.text.resolver.FallKostentraegerResolver"
type="ch.elexis.data.Fall">
</TextPlaceHolder>
</extension>
<extension
point="org.eclipse.core.runtime.preferences">
......
bundles/ch.elexis.core.data/src/ch/elexis/core/data/text/resolver/FallKostentraegerResolver.java 0 → 100644
View file @ 9be26af4
package ch.elexis.core.data.text.resolver;
import java.util.Optional;
import ch.elexis.core.data.interfaces.text.ITextResolver;
import ch.elexis.core.data.util.FallDataAccessor;
import ch.elexis.data.Fall;
import ch.elexis.data.Kontakt;
public class FallKostentraegerResolver implements ITextResolver {
/**
* @see FallDataAccessor#getObject(String, ch.elexis.data.PersistentObject, String, String[])
*/
@Override
public Optional<String> resolve(Object object) {
if (object instanceof Fall) {
Kontakt costBearer = ((Fall) object).getCostBearer();
if (costBearer != null) {
String label = costBearer.getLabel();
String fullName = label.substring(0, label.indexOf(","));
return Optional.of(fullName);
}
}
return Optional.empty();
}
}
bundles/ch.elexis.core.data/src/ch/elexis/core/data/util/FallDataAccessor.java
View file @ 9be26af4
......@@ -61,6 +61,7 @@ public class FallDataAccessor implements IDataAccess {
if (descriptor.equalsIgnoreCase(KOSTENTRAEGER)
|| descriptor.equalsIgnoreCase(KOSTENTRAEGER_UMLAUT)) {
// WARN does not seem to be called anymore - see FallKostentraegerResolver
result = new Result<Object>(costBearer.getPostAnschrift(true));
} else if (descriptor.equalsIgnoreCase(KOSTENTRAEGER_KUERZEL)
......
bundles/ch.elexis.core.data/src/ch/elexis/data/Artikel.java
View file @ 9be26af4
......@@ -11,18 +11,12 @@
*******************************************************************************/
package ch.elexis.data;
import java.lang.reflect.InvocationTargetException;
import java.util.List;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.eclipse.core.runtime.IProgressMonitor;
import ch.elexis.core.data.activator.CoreHub;
import ch.elexis.core.data.interfaces.IFall;
import ch.elexis.core.data.util.IRunnableWithProgress;
import ch.elexis.core.model.IStockEntry;
import ch.elexis.core.model.article.IArticle;
import ch.rgw.tools.Money;
import ch.rgw.tools.StringTool;
......@@ -49,25 +43,12 @@ public class Artikel extends VerrechenbarAdapter implements IArticle {
public static final String FLD_NAME = "Name";
public static final String FLD_ATC_CODE = "ATC_code";
/** Deprecated - will be removed in 3.3 (https://redmine.medelexis.ch/issues/5204) **/
@Deprecated
public static final String LIEFERANT_ID = "LieferantID";
@Deprecated
public static final String ISTBESTAND = "Istbestand";
@Deprecated
public static final String ANBRUCH = "Anbruch";
@Deprecated
public static final String MINBESTAND = "Minbestand";
@Deprecated
public static final String MAXBESTAND = "Maxbestand";
/** END **/
public static final Pattern NAME_VE_PATTERN = Pattern.compile(".+ ([0-9]+) Stk.*");
static {
addMapping(TABLENAME, LIEFERANT_ID, FLD_NAME, MAXBESTAND, MINBESTAND, ISTBESTAND,
FLD_EK_PREIS, FLD_VK_PREIS, FLD_TYP, FLD_EXTINFO, FLD_EAN, FLD_SUB_ID,
EIGENNAME + "=Name_intern", FLD_CODECLASS, FLD_KLASSE, FLD_ATC_CODE, FLD_EXTID);
addMapping(TABLENAME, FLD_NAME, FLD_EK_PREIS, FLD_VK_PREIS, FLD_TYP,
FLD_EXTINFO, FLD_EAN, FLD_SUB_ID, EIGENNAME + "=Name_intern",
FLD_CODECLASS, FLD_KLASSE, FLD_ATC_CODE, FLD_EXTID);
Xid.localRegisterXIDDomainIfNotExists(XID_PHARMACODE, FLD_PHARMACODE,
Xid.ASSIGNMENT_REGIONAL);
}
......@@ -77,83 +58,6 @@ public class Artikel extends VerrechenbarAdapter implements IArticle {
return TABLENAME;
}
/**
* @param qbe
* @param clazz
* @deprecated to be removed in 3.3
* @see https://redmine.medelexis.ch/issues/5204
*/
public static void transferAllStockInformationToNew32StockModel(Query<? extends Artikel> qbe,
Class<? extends Artikel> clazz){
if (!CoreHub.globalCfg.get(clazz.getSimpleName() + "StocksMigratedTo32", false)) {
IRunnableWithProgress irwp = new IRunnableWithProgress() {
@Override
public void run(IProgressMonitor monitor)
throws InvocationTargetException, InterruptedException{
log.debug("Migrating stock information");
qbe.startGroup();
qbe.add(ISTBESTAND, Query.GREATER, "0");
qbe.or();
qbe.add(MAXBESTAND, Query.GREATER, "0");
qbe.endGroup();
List<? extends Artikel> stockArticles = qbe.execute();
monitor.beginTask(
"Migrating " + clazz.getSimpleName() + " to new stock format.",
stockArticles.size());
Stock stdStock = Stock.load(Stock.DEFAULT_STOCK_ID);
for (Artikel art : stockArticles) {
if (art.isProduct()) {
log.warn("Article is product with stock [{}].", art.getId());
continue;
}
log.debug("Migrating stock information for [{}]", art.getLabel());
IStockEntry se = CoreHub.getStockService().storeArticleInStock(stdStock,
art.storeToString());
String[] fields = new String[] {
MINBESTAND, ISTBESTAND, MAXBESTAND, LIEFERANT_ID
};
String[] values = art.get(false, fields);
String anbruch = art.getExt(ANBRUCH);
if (anbruch != null && anbruch.length() > 0) {
int anbruchValue = 0;
try {
anbruchValue = Integer.valueOf(anbruch);
} catch (NumberFormatException nfe) {
log.warn(
"Error converting fraction value [{}] for id [{}], setting 0.",
anbruch, art.getId(), nfe);
}
se.setFractionUnits(anbruchValue);
art.setExt(ANBRUCH, null);
}
for (int i = 0; i < values.length; i++) {
if (values[i] != null && values[i].length() > 0) {
if (i == 0) {
se.setMinimumStock(StringTool.parseSafeInt(values[i]));
} else if (i == 1) {
se.setCurrentStock(StringTool.parseSafeInt(values[i]));
} else if (i == 2) {
se.setMaximumStock(StringTool.parseSafeInt(values[i]));
} else if (i == 3) {
se.setProvider(values[i]);
}
}
}
for (String field : fields) {
art.set(field, null);
}
monitor.worked(1);
}
CoreHub.globalCfg.set(clazz.getSimpleName() + "StocksMigratedTo32", true);
CoreHub.globalCfg.flush();
monitor.done();
}
};
PersistentObject.cod.showProgress(irwp, "Migrate stock format to 3.2");
}
}
public String getXidDomain(){
return XID_PHARMACODE;
}
......
bundles/ch.elexis.core.data/src/ch/elexis/data/Bestellung.java
View file @ 9be26af4
......@@ -13,16 +13,12 @@
package ch.elexis.data;
import java.lang.reflect.InvocationTargetException;
import java.util.Comparator;
import java.util.List;
import org.eclipse.core.runtime.IProgressMonitor;
import ch.elexis.core.constants.Preferences;
import ch.elexis.core.constants.StringConstants;
import ch.elexis.core.data.activator.CoreHub;
import ch.elexis.core.data.util.IRunnableWithProgress;
import ch.elexis.core.jdt.Nullable;
import ch.elexis.core.model.IOrder;
import ch.elexis.core.model.IOrderEntry;
......@@ -48,8 +44,6 @@ public class Bestellung extends PersistentObject implements IOrder {
static {
addMapping(TABLENAME, FLD_ITEMS + "=S:C:Contents", //$NON-NLS-1$
FLD_JOINT_BESTELLUNGEN_ENTRIES + "=LIST:BESTELLUNG:" + BestellungEntry.TABLENAME);
transferAllOrdersToNew32OrderModel();
}
@Override
......@@ -57,78 +51,6 @@ public class Bestellung extends PersistentObject implements IOrder {
return TABLENAME;
}
/**
* @deprecated to be removed in 3.3
* @see https://redmine.medelexis.ch/issues/5204
*/
private static void transferAllOrdersToNew32OrderModel(){
if (!CoreHub.globalCfg.get("OrdersMigratedTo32", false)) {
IRunnableWithProgress irwp = new IRunnableWithProgress() {
@Override
public void run(IProgressMonitor monitor)
throws InvocationTargetException, InterruptedException{
Stock defStock = Stock.load(Stock.DEFAULT_STOCK_ID);
List<Bestellung> orders = new Query<Bestellung>(Bestellung.class).execute();
orders.sort(new BestellungDateComparator());
int migrateCount = 0;
for (Bestellung order : orders) {
if (migrateCount <= 30) {
migrate(order, defStock);
migrateCount++;
} else {
order.delete();
}
}
CoreHub.globalCfg.set("OrdersMigratedTo32", true);
CoreHub.globalCfg.flush();
}
private void migrate(Bestellung order, Stock defStock){
String[] it = checkNull(order.get(FLD_ITEMS)).split(StringConstants.SEMICOLON);
for (String i : it) {
String[] fld = i.split(StringConstants.COMMA);
if (fld.length == 2) {
Artikel art = Artikel.load(fld[0]);
if (art == null || !art.exists()) {
PersistentObject poFromString =
CoreHub.poFactory.createFromString(fld[0]);
if (poFromString != null) {
art = (Artikel) poFromString;
}
}
if (art != null && art.exists()) {
int count = 1;
try {
count = Integer.parseInt(fld[1]);
} catch (NumberFormatException nfe) {}
String providerId = art.get(Artikel.LIEFERANT_ID);
Kontakt provider = null;
if (providerId != null && providerId.length() > 0) {
Kontakt load = Kontakt.load(providerId);
if (load.exists()) {
provider = load;
}
}
new BestellungEntry(order, art, defStock, provider, count);
} else {
log.warn("Article for 'Bestellung' not found via [" + fld[0] + "]");
}
}
}
order.set(FLD_ITEMS, null);
}
};
PersistentObject.cod.showProgress(irwp, "Migrate orders format to 3.2");
}
}
public static Bestellung load(String id){
return new Bestellung(id);
}
......
bundles/ch.elexis.core.eigenartikel/src/ch/elexis/core/eigenartikel/Eigenartikel.java
View file @ 9be26af4
/*******************************************************************************
* Copyright (c) 2006-2016, G. Weirich and Elexis
* Copyright (c) 2006-2018, G. Weirich and Elexis
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
......@@ -9,6 +9,7 @@
* G. Weirich - initial implementation
* M. Descher - extracted from elexis main and adapted for usage
* <office@medevit.at> - 3.2 format introduction (products and items)
* <office@medevit.at> - 3.6 removal of 3.2 format conversion
*******************************************************************************/
package ch.elexis.core.eigenartikel;
......@@ -18,23 +19,17 @@ import static ch.elexis.core.model.eigenartikel.Constants.FLD_EXT_HI_COST_ABSORP
import static ch.elexis.core.model.eigenartikel.Constants.FLD_EXT_MEASUREMENT_UNIT;
import static ch.elexis.core.model.eigenartikel.Constants.FLD_EXT_PACKAGE_SIZE_STRING;
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import org.eclipse.core.runtime.IProgressMonitor;
import ch.elexis.core.constants.StringConstants;
import ch.elexis.core.data.activator.CoreHub;
import ch.elexis.core.data.interfaces.IOptifier;
import ch.elexis.core.data.interfaces.IVerrechenbar;
import ch.elexis.core.data.util.IRunnableWithProgress;
import ch.elexis.core.model.eigenartikel.Constants;
import ch.elexis.core.model.eigenartikel.EigenartikelTyp;
import ch.elexis.data.Artikel;
import ch.elexis.data.Konsultation;
import ch.elexis.data.PersistentObject;
import ch.elexis.data.Query;
import ch.rgw.tools.JdbcLink;
import ch.rgw.tools.Money;
......@@ -44,29 +39,6 @@ public class Eigenartikel extends Artikel {
private static IOptifier OPTIFIER;
static {
final String isConvertedTo32Key = "Eigenartikel32Format";
boolean converted = CoreHub.globalCfg.get(isConvertedTo32Key, false);
if (!converted) {
log.info("Migrating Eigenartikel to v3.2");
IRunnableWithProgress irwp = new IRunnableWithProgress() {
@Override
public void run(IProgressMonitor monitor)
throws InvocationTargetException, InterruptedException{
EigenartikelDatabaseConverter.performConversionTo32Format(monitor);
}
};
PersistentObject.cod.showProgress(irwp, "Migrate Eigenartikel to v3.2");
CoreHub.globalCfg.set(isConvertedTo32Key, true);
}
transferAllStockInformationToNew32StockModel(new Query<Eigenartikel>(Eigenartikel.class),
Eigenartikel.class);
}
public static final String TYPNAME = Constants.TYPE_NAME;
public Eigenartikel(final String articleName, final String productName){
......
bundles/ch.elexis.core.eigenartikel/src/ch/elexis/core/eigenartikel/EigenartikelDatabaseConverter.java deleted 100644 → 0
View file @ 41a906b6
package ch.elexis.core.eigenartikel;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
import org.eclipse.core.runtime.IProgressMonitor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import ch.elexis.data.PersistentObject;
import ch.elexis.data.Query;
import static ch.elexis.core.eigenartikel.Eigenartikel.*;
/**
* @deprecated remove in 3.3
* @see https://redmine.medelexis.ch/issues/5204
*/
public class EigenartikelDatabaseConverter {
private static Logger log = LoggerFactory.getLogger(EigenartikelDatabaseConverter.class);
/**
* Convert the Eigenartikel contained in the ARTIKEL table to the 3.2 format
* @deprecated
* @see https://redmine.medelexis.ch/issues/5204
*/
public static void performConversionTo32Format(IProgressMonitor pm){
List<Eigenartikel> qre = new Query<Eigenartikel>(Eigenartikel.class).execute();
String taskName = "Converting " + qre.size() + " Eigenartikel to 3.2 format.";
log.info(taskName);
pm.beginTask(taskName, qre.size());
for (Eigenartikel ea : qre) {
String[] values =
ea.get(false, FLD_EAN, FLD_SUB_ID, LIEFERANT_ID, FLD_EK_PREIS, FLD_VK_PREIS);
long count = Arrays.asList(values).stream().filter(Objects::nonNull)
.filter(p -> p.length() > 0).count();
if (count > 0) {
// convert condition already met, no HashMap resolve required
EigenartikelDatabaseConverter.convertTo32PackageProduct(ea);
continue;
}
String ext = ea.getExt(VERPACKUNGSEINHEIT);
if (ext != null && ext.length() > 0) {
EigenartikelDatabaseConverter.convertTo32PackageProduct(ea);
}
log.debug("Converted " + ea.getLabel());
pm.worked(1);
}
log.info("Done");
pm.done();
}
/**
* Convert a single Eigenartikel to the 3.2 package product format
*
* @param ea
*/
public static void convertTo32PackageProduct(Eigenartikel ea){
String parent = ea.get(FLD_EXTID);
if (parent != null && parent.length() > 0) {
if (new Query<Eigenartikel>(Eigenartikel.class, PersistentObject.FLD_ID, parent)
.size() > 0) {
log.info("Skipping " + ea.getId() + " as a parent is already referenced.");
return;
}
}
Eigenartikel eaProduct = new Eigenartikel(ea.getName(), ea.getInternalName());
eaProduct.set(new String[] {
FLD_ATC_CODE, FLD_CODECLASS
}, ea.getATC_code(), "U");
ea.set(new String[] {
FLD_EXTID, FLD_CODECLASS
}, eaProduct.getId(), "U");
}
}
bundles/ch.elexis.core.findings.templates/plugin.properties
View file @ 9be26af4
pluginName = Elexis Findings Templates
providerName = elexis.info
bundles/ch.elexis.core.findings.templates/plugin_de.properties
View file @ 9be26af4
pluginName = Elexis Befundvorlagen
providerName = elexis.info
bundles/ch.elexis.core.findings.templates/plugin_fr.properties
View file @ 9be26af4
pluginName = Les conclusions d'Elexis
providerName = elexis.info
bundles/ch.elexis.core.findings.templates/plugin_it.properties
View file @ 9be26af4
pluginName = Risultati Elexis
providerName = elexis.info
bundles/ch.elexis.core.hl7.v2x/src/ch/elexis/hl7/HL7Writer.java
View file @ 9be26af4
......@@ -447,8 +447,13 @@ public abstract class HL7Writer {
email = kontakt.getEmail();
fax = kontakt.getFax();
}
xtn.getPhoneNumber().setValue(phone1);
xtn.getEmailAddress().setValue(email);
if (phone1 != null) {
phone1 = phone1.replaceAll("[^\\d.]", "");
xtn.getPhoneNumber().setValue(phone1);
}
if (email != null) {
xtn.getEmailAddress().setValue(email);
}
xtn.getXtn2_TelecommunicationUseCode().setValue(""); //$NON-NLS-1$
xtn.getXtn3_TelecommunicationEquipmentType().setValue(""); //$NON-NLS-1$
xtn.getXtn5_CountryCode().setValue(""); //$NON-NLS-1$
......
bundles/ch.elexis.core.hl7.v2x/src/ch/elexis/hl7/v22/HL7_ORU_R01.java
View file @ 9be26af4
......@@ -188,8 +188,10 @@ public class HL7_ORU_R01 extends HL7Writer {
String pid8_patientSex = pid.getPid8_Sex().getValue();
FT[] nteAfterPid_patientNotesAndCommentsArray =
oru.getPATIENT_RESULT().getPATIENT().getNTE().getComment();
String nteAfterPid_patientNotesAndComments =
String.join("\n", nteAfterPid_patientNotesAndCommentsArray[0].getValue());
String nteAfterPid_patientNotesAndComments = String.join("\n",
(nteAfterPid_patientNotesAndCommentsArray.length > 0)
? nteAfterPid_patientNotesAndCommentsArray[0].getValue()
: null);
if ("W".equals(pid8_patientSex.toUpperCase()))
pid8_patientSex = "F";
String orc2_placerOrderNumber = oru.getPATIENT_RESULT().getORDER_OBSERVATION()
......
bundles/ch.elexis.core.l10n/src/ch/elexis/core/l10n/Messages.java
View file @ 9be26af4
......@@ -5,7 +5,32 @@ import org.eclipse.osgi.util.NLS;
public class Messages extends NLS {
public static final String BUNDLE_NAME = "ch.elexis.core.l10n.messages";
public static String ArticleDefaultSignatureComposite_applicationInstruction;
public static String AddressType_SECONDARY_RESIDENCE;
public static String AddressType_HOLIDAY_HOME;
public static String AddressType_PRINCIPAL_RESIDENCE;
public static String AddressType_PLACE_OF_RESIDENCE;
public static String AddressType_EMPLOYER;
public static String AddressType_FAMILY_FRIENDS;
public static String AddressType_ATTACHMENT_FIGURE;
public static String AddressType_PRISON;
public static String AddressType_NURSING_HOME;
public static String AddressType_OTHER;
public static String RelationshipType_A_GENERIC;
public static String RelationshipType_BUSINESS_EMPLOYER;
public static String RelationshipType_BUSINESS_EMPLOYEE;
public static String RelationshipType_FAMILY_PARENT;
public static String RelationshipType_FAMILY_CHILD;
public static String RelationshipType_FAMILY_GUARDIAN;
public static String RelationshipType_FAMILY_ICE;
public static String RelationshipType_FAMILY_ALTERNATIVE;
public static String RelationshipType_WELFARE_GENERAL_PRACTITIONER;
public static String RelationshipType_WELFARE_PATIENT;
public static String RelationshipType_WELFARE_CONSULTANT;
public static String RelationshipType_WELFARE_INSURER;
public static String RelationshipType_WELFARE_INSUREE;
public static String ArticleDefaultSignatureComposite_applicationInstruction;
public static String ArticleDefaultSignatureComposite_dispensation;
public static String ArticleDefaultSignatureComposite_dosage;
public static String ArticleDefaultSignatureComposite_evening;
......@@ -1211,6 +1236,7 @@ public class Messages extends NLS {
public static String ReminderView_activatePatientAction;
public static String ReminderView_activatePatientTooltip;
public static String ReminderView_toggleSelectPatientActionTooltip;
public static String ReminderView_defaultPatientRelatedTooltip;
public static String ReminderView_deleteAction;
public static String ReminderView_deleteToolTip;
public static String ReminderView_foreignAction;
......@@ -1453,6 +1479,7 @@ public class Messages extends NLS {
public static String VerrechnungsDisplay_fixMedication;
public static String BriefAuswahlNotAllowedToRunStresstess;
public static String ReminderView_txtSearch_message;
public static String ReminderPref_defaultPatientRelated;
public static String LimitedText_MaxLengthReached;
public static String CreatePrescriptionHelper_InfoDispensationArtikelstammTitel;
public static String CreatePrescriptionHelper_InfoDispensationArtikelstammUpate;
......
bundles/ch.elexis.core.l10n/src/ch/elexis/core/l10n/messages.properties
View file @ 9be26af4
......@@ -89,11 +89,11 @@ AccessControlDefaults_Access = Access
AccessControlDefaults_Administration = Administration
AccessControlDefaults_Bills = bills
AccessControlDefaults_Bills = Bills
AccessControlDefaults_CaseCopy = copy
AccessControlDefaults_CaseReopen = reopen
AccessControlDefaults_CaseReopen = Reopen
AccessControlDefaults_CaseSpecialFields = special case-fields in case view
......@@ -101,7 +101,7 @@ AccessControlDefaults_ChangeCaseSpecialFields = edit hidden case-fields in case
AccessControlDefaults_DefineCaseSpecialFields = define special case-fields in billing system
AccessControlDefaults_EditLaboratoryParameter = edit laboratory parameter
AccessControlDefaults_EditLaboratoryParameter = Edit laboratory parameter
AccessControlDefaults_GroupAdminLaboratory = Labor
......@@ -115,29 +115,29 @@ AccessControlDefaults_actions = Actions
AccessControlDefaults_assign = assign
AccessControlDefaults_bills = bills
AccessControlDefaults_bills = Bills
AccessControlDefaults_change = change
AccessControlDefaults_changeBilled = change billed
AccessControlDefaults_changeMandator = change mandator
AccessControlDefaults_changeMandator = Change mandator
AccessControlDefaults_changeMedication = change medication
AccessControlDefaults_changeMedication = Change medication
AccessControlDefaults_changeStateManually = change state manually
AccessControlDefaults_changeSysTemplates = edit system templates
AccessControlDefaults_changeTemplates = edit templates
AccessControlDefaults_changeTemplates = Edit templates
AccessControlDefaults_chargeAll = charge for all mandators
AccessControlDefaults_chargeAll = Charge for all mandators
AccessControlDefaults_checkLabValues = check labresults
AccessControlDefaults_checkLabValues = Check labresults
AccessControlDefaults_consultation = consultation
AccessControlDefaults_consultation = Consultation
AccessControlDefaults_contact = contact
AccessControlDefaults_contact = Contact
AccessControlDefaults_create = create
......@@ -147,13 +147,13 @@ AccessControlDefaults_data = data
AccessControlDefaults_dataImport = data import
AccessControlDefaults_databaseConnection = database connection
AccessControlDefaults_databaseConnection = Database connection
AccessControlDefaults_databaseUtilities = database reorganization
AccessControlDefaults_delete = delete
AccessControlDefaults_deleteCase = case
AccessControlDefaults_deleteCase = Case
AccessControlDefaults_display = display
......@@ -299,6 +299,26 @@ AddElementToBlockDialog_blockSelection = Blockselection
AddElementToBlockDialog_selectBlock = Please select the Block, to which you would like to add this Code
AddressType_ATTACHMENT_FIGURE = attachment figure
AddressType_EMPLOYER = employer
AddressType_FAMILY_FRIENDS = family friends
AddressType_HOLIDAY_HOME = holiday home
AddressType_NURSING_HOME = nursing home
AddressType_OTHER = other
AddressType_PLACE_OF_RESIDENCE = place of residence
AddressType_PRINCIPAL_RESIDENCE = principal residence
AddressType_PRISON = prison
AddressType_SECONDARY_RESIDENCE = secondary residence
AnschriftEingabeDialog_city = City
AnschriftEingabeDialog_country = Country
......@@ -3641,7 +3661,7 @@ PatListeContentProvider_LoadingData = loading data...
PatListeContentProvider_LoadingPatients = loading patient list
PatientDetailView2_patientDetailViewName = patient detail
PatientDetailView2_patientDetailViewName = Patient detail
PatientErfassenDialog_Name = Surname
......@@ -3981,6 +4001,32 @@ RecordElement_CreatedBy = \ erstellt von
RecordElement_EntryDate = \nEintrag vom
RelationshipType_A_GENERIC = generic
RelationshipType_BUSINESS_EMPLOYEE = employee
RelationshipType_BUSINESS_EMPLOYER = employer
RelationshipType_FAMILY_ALTERNATIVE = alternate contact
RelationshipType_FAMILY_CHILD = child
RelationshipType_FAMILY_GUARDIAN = guardian
RelationshipType_FAMILY_ICE = ice contact
RelationshipType_FAMILY_PARENT = parent
RelationshipType_WELFARE_CONSULTANT = consultant
RelationshipType_WELFARE_GENERAL_PRACTITIONER = general practitioner
RelationshipType_WELFARE_INSUREE = insuree
RelationshipType_WELFARE_INSURER = insurer
RelationshipType_WELFARE_PATIENT = patient
ReminderDetailDialog_btnClosed_text = closed
ReminderDetailDialog_btnDue_text = due
......@@ -4007,6 +4053,8 @@ ReminderDetailDialog_txtDescription_message = description
ReminderDetailDialog_txtSubject_message = subject
ReminderPref_defaultPatientRelated = Neue patientenbezogene Pendenzen standardm\u00E4ssig nur beim Patienten anzeigen
ReminderPrefences_Reminders = Reminders
ReminderPrefences_SetColors = choose colors for display
......@@ -4017,11 +4065,13 @@ ReminderView_activatePatientAction = activate patient
ReminderView_activatePatientTooltip = activate patient record that belongs to this reminder
ReminderView_defaultPatientRelatedTooltip = Falls aktiv, wird die Pendenz nur beim aktuell angew\u00E4hlten Patienten angezeigt\nDer Vorgabewert kann unter Einstellungen..Anwender..Pendenzen ge\u00E4ndert werden
ReminderView_deleteAction = delete
ReminderView_deleteToolTip = delete selected reminder
ReminderView_foreignAction = foreign
ReminderView_foreignAction = Alle
ReminderView_foreignTooltip = show reminders of other users as well
......@@ -5149,7 +5199,7 @@ VerrechnungsDisplay_removeElements = remove position(s)
ViewerConfigurer_createNew = Create New ...
Visibility_ALWAYS = show always
Visibility_ALWAYS = show always in reminders
Visibility_ON_PATIENT_SELECTION = with selected patient
......
bundles/ch.elexis.core.l10n/src/ch/elexis/core/l10n/messages_de.properties
View file @ 9be26af4
......@@ -299,6 +299,26 @@ AddElementToBlockDialog_blockSelection = Blockauswahl
AddElementToBlockDialog_selectBlock = W\u00E4hlen Sie bitte den Block, zu dem Sie diesen Code zuf\u00FCgen m\u00F6chten
AddressType_ATTACHMENT_FIGURE = Bezugsperson Adresse
AddressType_EMPLOYER = Arbeitgeber Adresse
AddressType_FAMILY_FRIENDS = Familienfreunde Adresse
AddressType_HOLIDAY_HOME = Ferienunterkunft
AddressType_NURSING_HOME = Pflegeheim
AddressType_OTHER = andere
AddressType_PLACE_OF_RESIDENCE = Wohnsitz
AddressType_PRINCIPAL_RESIDENCE = Hauptadresse
AddressType_PRISON = Justizanstalt
AddressType_SECONDARY_RESIDENCE = Nebenadresse
AnschriftEingabeDialog_city = Ort
AnschriftEingabeDialog_country = Land
......@@ -3741,7 +3761,7 @@ Patientenblatt2_birthdate = Geburtsdatum
Patientenblatt2_civilState = Zivilstand
Patientenblatt2_contactForAdditionalAddress = Kontakt f\u00FCr Zusatzadresse
Patientenblatt2_contactForAdditionalAddress = Bezugskontakte
Patientenblatt2_diagnosesLbl = Diagnosen
......@@ -3981,6 +4001,46 @@ RecordElement_CreatedBy = \ erstellt von
RecordElement_EntryDate = \nEintrag vom
RelationshipType.A_GENERIC = generic
RelationshipType.BUSINESS_EMPLOYEE = employee
RelationshipType.BUSINESS_EMPLOYER = employer
RelationshipType.FAMILY_ALTERNATIVE = alternate contact
RelationshipType.FAMILY_CHILD = child
RelationshipType.FAMILY_GUARDIAN = guardian
RelationshipType.FAMILY_ICE = ice contact
RelationshipType.FAMILY_PARENT = parent
RelationshipType.WELFARE_CONSULTANT = consultant
RelationshipType.WELFARE_GENERAL_PRACTITIONER = general practitioner
RelationshipType.WELFARE_INSUREE = insuree
RelationshipType.WELFARE_INSURER = insurer
RelationshipType.WELFARE_PATIENT = patient
RelationshipType_A_GENERIC = undefiniert
RelationshipType_BUSINESS_EMPLOYEE = Arbeitnehmer
RelationshipType_BUSINESS_EMPLOYER = Arbeitgeber
RelationshipType_FAMILY_ALTERNATIVE = Sonstiger Vertreter
RelationshipType_FAMILY_CHILD = Kind
RelationshipType_FAMILY_GUARDIAN = Vormund
RelationshipType_FAMILY_ICE = Notfallkontakt
RelationshipType_FAMILY_PARENT = Elter
RelationshipType_WELFARE_CONSULTANT = Facharzt
RelationshipType_WELFARE_GENERAL_PRACTITIONER = Hausarzt
RelationshipType_WELFARE_INSUREE = Versicherungsnehmer
RelationshipType_WELFARE_INSURER = Versicherer
RelationshipType_WELFARE_PATIENT = Patient
ReminderDetailDialog_btnClosed_text = Erledigt
ReminderDetailDialog_btnDue_text = F\u00E4llig
......@@ -4007,6 +4067,8 @@ ReminderDetailDialog_txtDescription_message = Beschreibung
ReminderDetailDialog_txtSubject_message = Betreff
ReminderPref_defaultPatientRelated = Neue patientenbezogene Pendenzen standardm\u00E4ssig nur beim Patienten anzeigen
ReminderPrefences_Reminders = Pendenzen
ReminderPrefences_SetColors = Farben f\u00FCr die Anzeige einstellen
......@@ -4017,11 +4079,13 @@ ReminderView_activatePatientAction = Patient aktivieren
ReminderView_activatePatientTooltip = Patient aktivieren, der zu dieser Pendenz geh\u00F6rt
ReminderView_defaultPatientRelatedTooltip = Falls aktiv, wird die Pendenz nur beim aktuell angew\u00E4hlten Patienten angezeigt\nDer Vorgabewert kann unter Einstellungen..Anwender..Pendenzen ge\u00E4ndert werden
ReminderView_deleteAction = L\u00F6schen
ReminderView_deleteToolTip = Markierten Reminder l\u00F6schen
ReminderView_foreignAction = Fremde
ReminderView_foreignAction = Alle
ReminderView_foreignTooltip = Auch Reminders anderer Anwender anzeigen
......
bundles/ch.elexis.core.l10n/src/ch/elexis/core/l10n/messages_en.properties
View file @ 9be26af4
......@@ -85,11 +85,11 @@ AbstractConnection_PleaseWait = Please wait..
AbstractProperties_message_FileNotFound = Can not read file {0}!
AccessControlDefaults_Access = access
AccessControlDefaults_Access = Access
AccessControlDefaults_Administration = administration
AccessControlDefaults_Bills = bills
AccessControlDefaults_Bills = Bills
AccessControlDefaults_CaseCopy = copy
......@@ -115,7 +115,7 @@ AccessControlDefaults_actions = Actions
AccessControlDefaults_assign = assign
AccessControlDefaults_bills = bills
AccessControlDefaults_bills = Bills
AccessControlDefaults_change = to change
......@@ -135,7 +135,7 @@ AccessControlDefaults_chargeAll = Charge for all clients
AccessControlDefaults_checkLabValues = Check off the lab
AccessControlDefaults_consultation = consultation
AccessControlDefaults_consultation = Consultation
AccessControlDefaults_contact = Contact
......@@ -153,7 +153,7 @@ AccessControlDefaults_databaseUtilities = Cleanup
AccessControlDefaults_delete = Clear
AccessControlDefaults_deleteCase = case
AccessControlDefaults_deleteCase = Case
AccessControlDefaults_display = Show
......@@ -299,6 +299,26 @@ AddElementToBlockDialog_blockSelection = block selection
AddElementToBlockDialog_selectBlock = Please select the block to which you want to add this code
AddressType_ATTACHMENT_FIGURE = attachment figure
AddressType_EMPLOYER = employer
AddressType_FAMILY_FRIENDS = family friends
AddressType_HOLIDAY_HOME = holiday home
AddressType_NURSING_HOME = nursing home
AddressType_OTHER = other
AddressType_PLACE_OF_RESIDENCE = place of residence
AddressType_PRINCIPAL_RESIDENCE = principal residence
AddressType_PRISON = prison
AddressType_SECONDARY_RESIDENCE = secondary residence
AnschriftEingabeDialog_city = place
AnschriftEingabeDialog_country = country
......@@ -3981,6 +4001,32 @@ RecordElement_CreatedBy = \ created by
RecordElement_EntryDate = \nentry of
RelationshipType_A_GENERIC = generic
RelationshipType_BUSINESS_EMPLOYEE = employee
RelationshipType_BUSINESS_EMPLOYER = employer
RelationshipType_FAMILY_ALTERNATIVE = alternate contact
RelationshipType_FAMILY_CHILD = child
RelationshipType_FAMILY_GUARDIAN = guardian
RelationshipType_FAMILY_ICE = ice contact
RelationshipType_FAMILY_PARENT = parent
RelationshipType_WELFARE_CONSULTANT = consultant
RelationshipType_WELFARE_GENERAL_PRACTITIONER = general practitioner
RelationshipType_WELFARE_INSUREE = insuree
RelationshipType_WELFARE_INSURER = insurer
RelationshipType_WELFARE_PATIENT = patient
ReminderDetailDialog_btnClosed_text = Done
ReminderDetailDialog_btnDue_text = Due
......@@ -4007,7 +4053,9 @@ ReminderDetailDialog_txtDescription_message = description
ReminderDetailDialog_txtSubject_message = Subject
ReminderPrefences_Reminders = pending
ReminderPref_defaultPatientRelated = By defaul show newly created reminders only when patient is selected
ReminderPrefences_Reminders = Reminders
ReminderPrefences_SetColors = Set the colors for the display
......@@ -4017,11 +4065,13 @@ ReminderView_activatePatientAction = Activate patient
ReminderView_activatePatientTooltip = Activate the patient who belongs to this pendency
ReminderView_defaultPatientRelatedTooltip = If active the reminder will only be shown when the patient is selected.\nYou may change the default value under Preferences..User..Reminder
ReminderView_deleteAction = Clear
ReminderView_deleteToolTip = Delete highlighted reminder
ReminderView_foreignAction = stranger
ReminderView_foreignAction = all
ReminderView_foreignTooltip = Also show Reminders other users
......@@ -5135,7 +5185,7 @@ VerrechnungsDisplay_removeElements = Remove position (s)
ViewerConfigurer_createNew = Create new...
Visibility_ALWAYS = Always show in Pendenzen
Visibility_ALWAYS = Always show in reminders
Visibility_ON_PATIENT_SELECTION = Display only for the patient
......
bundles/ch.elexis.core.ui.contacts/plugin.properties
View file @ 9be26af4
category.contactManagement.name = Kontaktverwaltung
command.addContact.organisation.label = Organisation erfassen
command.addContact.person.label = Person erfassen
command.advancedFilterCommand.label = Filter
command.advancedFilterCommand.name = advanced filter dialog
command.contactMarkAsDeleted.label = Als gel\u00F6scht markieren
command.contactRemoveMarkAsDeleted.label = Kontakt wiederherstellen
command.eraseContactFromDatabase.label = Kontakt l\u00F6schen
command.focusIntelligentSearch.name = focus intelligent search
command.openStickerPreferencePage.label = Sticker konfigurieren ...
command.openStickerPreferencePage.name = open sticker preference page
decorator.contactType.label = ContactTypeDecorator
elexis.addressPerspective = adresses
elexis.contactDetailView = Contact detail
menu.roles.label = Rollen
menu.sorter.label = Sortieren nach ...
menu.sticker.label = Sticker ...
page.name.2 = view
propertyTab.cases.label = F\u00E4lle
propertyTab.masterData.label = Stammdaten
propertyTab.system.label = System
sidebar.contacts = Contacts
view.contactProperties.description = This adapted property view only listens to selections made within the Kontakte view.
view.contactProperties.name = Kontakt Eigenschaften
view.contacts.name = Kontakte
bundles/ch.elexis.core.ui.contacts/plugin_de.properties
View file @ 9be26af4
category.contactManagement.name = Kontaktverwaltung
command.addContact.organisation.label = Organisation erfassen
command.addContact.person.label = Person erfassen
command.advancedFilterCommand.label = Filter
command.advancedFilterCommand.name = advanced filter dialog
command.contactMarkAsDeleted.label = Als gel\u00F6scht markieren
command.contactRemoveMarkAsDeleted.label = Kontakt wiederherstellen
command.eraseContactFromDatabase.label = Kontakt l\u00F6schen
command.focusIntelligentSearch.name = focus intelligent search
command.openStickerPreferencePage.label = Sticker konfigurieren ...
command.openStickerPreferencePage.name = open sticker preference page
decorator.contactType.label = KontaktTypDecorator
elexis.addressPerspective = Adressen
elexis.contactDetailView = Details zum Kontakt
menu.roles.label = Rollen
menu.sorter.label = Sortieren nach ...
menu.sticker.label = Sticker
page.name.2 = Ansicht
propertyTab.cases.label = F\u00E4lle
propertyTab.masterData.label = Stammdaten
propertyTab.system.label = System
sidebar.contacts = Contacts
view.contactProperties.description = In dieser angepassten Property-Ansicht werden nur die in der Ansicht "Kontakte" getroffenen Auswahlen angezeigt.
view.contactProperties.name = Kontakt Eigenschaften
view.contacts.name = Kontakte
bundles/ch.elexis.core.ui.contacts/plugin_en.properties
View file @ 9be26af4
category.contactManagement.name = contact management
command.addContact.organisation.label = add organisation
command.addContact.person.label = add person
command.advancedFilterCommand.label = filter
command.advancedFilterCommand.name = advanced filter dialog
command.contactMarkAsDeleted.label = mark as deleted
command.contactRemoveMarkAsDeleted.label = restore contact
command.eraseContactFromDatabase.label = delete contact
command.focusIntelligentSearch.name = focus intelligent search
command.openStickerPreferencePage.label = open sticker preference page
command.openStickerPreferencePage.name = open sticker preference page
decorator.contactType.label = KontaktTypDecorator
elexis.addressPerspective = addresses
elexis.contactDetailView = Details about the contact
menu.roles.label = roles
menu.sorter.label = sort by ...
menu.sticker.label = Sticker ...
page.name.2 = view
propertyTab.cases.label = cases
propertyTab.masterData.label = base data
propertyTab.system.label = system
sidebar.contacts = Contacts
view.contactProperties.description = This custom property view displays only the selections made in the Contacts view.
view.contactProperties.name = Contact properties
view.contacts.name = contacts
bundles/ch.elexis.core.ui.contacts/plugin_fr.properties
View file @ 9be26af4
category.contactManagement.name = gestion des contacts
command.addContact.organisation.label = organisation record
command.addContact.person.label = Personne invent\u00E9e
command.advancedFilterCommand.label = filtre
command.advancedFilterCommand.name = dialogue Filtre avanc\u00E9
command.contactMarkAsDeleted.label = Marquer comme supprim\u00E9
command.contactRemoveMarkAsDeleted.label = restaurer les contacts
command.eraseContactFromDatabase.label = supprimer le contact
command.focusIntelligentSearch.name = concentrer recherche intelligente
command.openStickerPreferencePage.label = Configurez le sticker ...
command.openStickerPreferencePage.name = page de pr\u00E9f\u00E9rence sticker ouvert
decorator.contactType.label = KontaktTypDecorator
elexis.addressPerspective = adresses
elexis.contactDetailView = Coordonn\u00E9es
menu.roles.label = rouleau
menu.sorter.label = Trier par ...
menu.sticker.label = Autocollant ...
page.name.2 = vue
propertyTab.cases.label = cas
propertyTab.masterData.label = donn\u00E9es de base
propertyTab.system.label = syst\u00E8me
sidebar.contacts = contacts
view.contactProperties.description = Cette vue de propri\u00E9t\u00E9 personnalis\u00E9e n'affiche que les s\u00E9lections effectu\u00E9es dans la vue Contacts.
view.contactProperties.name = propri\u00E9t\u00E9s de contact
view.contacts.name = contacts
bundles/ch.elexis.core.ui.contacts/plugin_it.properties
View file @ 9be26af4
category.contactManagement.name = gestione dei contatti
command.addContact.organisation.label = organizzazione di registrazione
command.addContact.person.label = Persona inventata
command.advancedFilterCommand.label = filtro
command.advancedFilterCommand.name = dialogo filtro avanzato
command.contactMarkAsDeleted.label = Segnare come cancellato
command.contactRemoveMarkAsDeleted.label = ripristinare i contatti
command.eraseContactFromDatabase.label = eliminazione di contatti
command.focusIntelligentSearch.name = messa a fuoco di ricerca intelligente
command.openStickerPreferencePage.label = Configura adesivo ...
command.openStickerPreferencePage.name = Pagina preferenza aperto adesivo
decorator.contactType.label = KontaktTypDecorator
elexis.addressPerspective = indirizzi
elexis.contactDetailView = I recapiti
menu.roles.label = rotolo
menu.sorter.label = Ordina per ...
menu.sticker.label = Adesivo ...
page.name.2 = vista
propertyTab.cases.label = casi
propertyTab.masterData.label = dati anagrafici
propertyTab.system.label = sistema
sidebar.contacts = Contatti
view.contactProperties.description = Questa vista delle propriet\u00E0 personalizzate mostra solo le selezioni effettuate nella vista Contatti.
view.contactProperties.name = propriet\u00E0 Contatti
view.contacts.name = contatti
bundles/ch.elexis.core.ui.contacts/src/ch/elexis/core/ui/contacts/views/PatientDetailView.java
View file @ 9be26af4
......@@ -207,7 +207,7 @@ public class PatientDetailView extends ViewPart implements IUnlockable, IActivat
// bezugs kontakte
{
ExpandableComposite ecZA = WidgetFactory.createExpandableComposite(toolkit, scrldfrm,
Messages.Patientenblatt2_additionalAdresses); // $NON-NLS-1$
Messages.Patientenblatt2_contactForAdditionalAddress); // $NON-NLS-1$
ecZA.setExpanded(CoreHub.localCfg.get(KEY_PATIENTENBLATT + ecZA.getText(), false));
ecZA.addExpansionListener(new SectionExpansionHandler());
inpZusatzAdresse = new ListDisplay<BezugsKontakt>(ecZA, SWT.NONE, new ListDisplay.LDListener() {
......@@ -296,7 +296,7 @@ public class PatientDetailView extends ViewPart implements IUnlockable, IActivat
{
ExpandableComposite compAdditionalAddresses =
WidgetFactory.createExpandableComposite(toolkit, scrldfrm,
"Zusatzadressen"); // $NON-NLS-1$
Messages.Patientenblatt2_additionalAdresses);
compAdditionalAddresses.addExpansionListener(new SectionExpansionHandler());
additionalAddresses = new ListDisplay<ZusatzAdresse>(compAdditionalAddresses, SWT.NONE,
......
bundles/ch.elexis.core.ui.contacts/src/ch/elexis/core/ui/contacts/views/Patientenblatt2.java
View file @ 9be26af4
......@@ -496,8 +496,8 @@ public class Patientenblatt2 extends Composite implements IUnlockable {
}
ecZA = WidgetFactory.createExpandableComposite(tk, form,
Messages.Patientenblatt2_additionalAdresses); // $NON-NLS-1$
UserSettings.setExpandedState(ecZA, "Patientenblatt/Zusatzadressen"); //$NON-NLS-1$
Messages.Patientenblatt2_contactForAdditionalAddress); // $NON-NLS-1$
UserSettings.setExpandedState(ecZA, Messages.Patientenblatt2_contactForAdditionalAddress); //$NON-NLS-1$
ecZA.addExpansionListener(ecExpansionListener);
......@@ -588,7 +588,7 @@ public class Patientenblatt2 extends Composite implements IUnlockable {
// zusatz adressen
compAdditionalAddresses = WidgetFactory.createExpandableComposite(tk, form,
"Zusatzadressen"); // $NON-NLS-1$
Messages.Patientenblatt2_additionalAdresses); // $NON-NLS-1$
compAdditionalAddresses.addExpansionListener(ecExpansionListener);
additionalAddresses = new ListDisplay<ZusatzAdresse>(compAdditionalAddresses, SWT.NONE,
......@@ -790,7 +790,7 @@ public class Patientenblatt2 extends Composite implements IUnlockable {
+ StringTool.unNull(actPatient.getVorname()) + " (" //$NON-NLS-1$
+ actPatient.getPatCode() + ")"); //$NON-NLS-1$
inpAdresse.setText(actPatient.getPostAnschrift(false), false, false);
UserSettings.setExpandedState(ecZA, "Patientenblatt/Zusatzadressen"); //$NON-NLS-1$
UserSettings.setExpandedState(ecZA, "Patientenblatt/Zusatzadressen"); //$NON-NLS-1$
inpZusatzAdresse.clear();
for (BezugsKontakt za : actPatient.getBezugsKontakte()) {
inpZusatzAdresse.add(za);
......
bundles/ch.elexis.core.ui.laboratory/plugin.properties
View file @ 9be26af4
elexis.HL7LabImportRulesPreferencePage = HL7 Import
elexis.HL7LabImportRulesPreferencePage = HL7 Import
elexis.labEvaluationRulesPreferencePage = Resultats-Bewertung
elexis.labGroupPrefs = Lab Order Groups
elexis.labParameterPrefs = Laborparameter
elexis.labPrefs = Laboratory
elexis.labGroupPrefs = Lab Order Groups
elexis.labParameterPrefs = Laborparameter
elexis.labPrefs = Laboratory
bundles/ch.elexis.core.ui.laboratory/plugin_de.properties
View file @ 9be26af4
elexis.HL7LabImportRulesPreferencePage = HL7 Import
elexis.HL7LabImportRulesPreferencePage = HL7 Import
elexis.labEvaluationRulesPreferencePage = Resultats-Bewertung
elexis.labGroupPrefs = Laborverordnung-Gruppen
elexis.labParameterPrefs = Laborparameter
elexis.labPrefs = Labor
elexis.labGroupPrefs = Laborverordnung-Gruppen
elexis.labParameterPrefs = Laborparameter
elexis.labPrefs = Labor
bundles/ch.elexis.core.ui.laboratory/plugin_en.properties
View file @ 9be26af4
elexis.HL7LabImportRulesPreferencePage = HL7 Import
elexis.HL7LabImportRulesPreferencePage = HL7 Import
elexis.labEvaluationRulesPreferencePage = Result evaluation
elexis.labGroupPrefs = groups of laboratory items
elexis.labParameterPrefs = laboratory parameters
elexis.labPrefs = laboratory
elexis.labGroupPrefs = groups of laboratory items
elexis.labParameterPrefs = laboratory parameters
elexis.labPrefs = laboratory
bundles/ch.elexis.core.ui.laboratory/plugin_fr.properties
View file @ 9be26af4
elexis.HL7LabImportRulesPreferencePage = Importation HL7
elexis.labEvaluationRulesPreferencePage = Evaluation des r\u00E9sultats
elexis.labGroupPrefs = groupes de r\u00E9gulation du travail
elexis.labParameterPrefs = param\u00E8tres de laboratoire
......
bundles/ch.elexis.core.ui.laboratory/plugin_it.properties
View file @ 9be26af4
elexis.HL7LabImportRulesPreferencePage = Importazione HL7
elexis.labEvaluationRulesPreferencePage = valutazione dei risultati
elexis.labGroupPrefs = gruppi di regolamentazione del lavoro
elexis.labParameterPrefs = parametri di laboratorio
......
bundles/ch.elexis.core.ui.p2/plugin_de.properties
View file @ 9be26af4
......@@ -4,5 +4,4 @@ Install.command = Neue Software installieren
Update.command = Auf Updates \u00FCberpr\u00FCfen
installHistoryPage = Update Chronik
installedSoftwarePage = Installierte Software
bundles/ch.elexis.core.ui.p2/plugin_fr.properties
View file @ 9be26af4
......@@ -4,5 +4,4 @@ Install.command = Installer des additions pour Elexis
Update.command = Mettre Elexis \u00E0 jour
installHistoryPage = Mise \u00E0 jour Historique
installedSoftwarePage = logiciel install\u00E9
bundles/ch.elexis.core.ui.usage/plugin.properties
View file @ 9be26af4
pluginName = Model Model
providerName = www.example.org
bundles/ch.elexis.core.ui.usage/plugin_de.properties
View file @ 9be26af4
pluginName = Modellmodell
providerName = www.beispiel.de