Skip to content
GitLab
Explore
Sign in
Commits on Source (102)
bd7f811c
[9242] fixed Leistungsblock modification methods
Dec 18, 2017
a8ea536c
[9252] Test follow up result import
Dec 18, 2017
0da6c4ae
[9254] make Leistungsblock getIndexOf NPE safe
Dec 18, 2017
b3acab17
[9098] First refactoring for trema
Dec 18, 2017
0c805b35
[9098] Messages.java replace (Step 1)
Dec 19, 2017
e0f343a2
[9252] log ignore labresult overwrite decision
Dec 19, 2017
32d948c8
[9245] Allgemeine Fehler nach Update, fast view #213
Dec 19, 2017
bf255bab
[9260] Do not show elexis_3_category
Dec 19, 2017
e3a57d83
[9098] Skip failing HL7 unit tests for the moment
Dec 19, 2017
a18a272b
[9489] FastView Darstellung beim Perspektiven Reset (#215)
Dec 20, 2017
5c93582d
Merge branch 'b4208' of github.com:elexis/elexis-3-core into f9098
Dec 20, 2017
d921c87e
Merge branch 'b4208' of github.com:elexis/elexis-3-core into f9098
Dec 20, 2017
198024a2
[9098] Move more message to core.l10n
Dec 20, 2017
9c6b47bf
[9098] Move core.ui messages to core.l10n
Dec 21, 2017
6631b0d0
[9098] Interfaces like Status and Findings use also core.l10n
Dec 21, 2017
2bbc4bcd
Merge branch 'b4208' of github.com:elexis/elexis-3-core into f9098
Dec 21, 2017
fe0d5749
[9098] Moved each language into separate fragment
Dec 22, 2017
89e4c6aa
[9252] Fix HLZ files for unittest in pomless
Dec 22, 2017
68aaf1a8
Merge branch 'b4208' of github.com:elexis/elexis-3-core into f9098
Dec 22, 2017
8a44841d
[9098] Fix running ch.rgw.utility.tests
Dec 22, 2017
1ce9ee86
[9098] Added/corrected projects for Eclipse IDE
Dec 22, 2017
94e9a47c
[9098] to-[csv|properties[ to i18n_gen_info.rb
Dec 22, 2017
33600a08
[9098] Updated translations, fixed umlauts, removed texts.trm
Dec 22, 2017
3c158c10
[9098] Reworked to/from_csv functionality
Dec 30, 2017
ad9215c5
Merge remote-tracking branch 'origin/b4208' into f9098
Dec 30, 2017
f6bdfdda
[9098] Corrected plugin<lang> properties
Dec 30, 2017
8a52bd63
[4208] Fix generating version.properties and p2.inf
Dec 30, 2017
b614bf9f
[9634] charge first article of eigenartikel products on dbl click
Jan 05, 2018
b862be89
[9692] Use https instead of http for Elexis Opensource P2 sites
Jan 05, 2018
425b1673
[9098] Fix reading ids from plugin.xml. Corrected translation
Jan 05, 2018
14c0b567
[9098] Added plugin properties
Jan 05, 2018
2ef8d85e
[9098] update build.properties to include de/fr/it
Jan 05, 2018
d4e1198d
[9098] Fixed problems scan/gen l10n.<lang> properties
Jan 06, 2018
f2673168
[9098] Fixed MaritalStatus. Missing/unused NLS messages
Jan 06, 2018
87c70fb1
[9098] Fixed generating l10n.<lang> messsages.properties
Jan 07, 2018
c8e1d31c
[9098] missing properties and messages
Jan 07, 2018
3ef07940
[9098] Added all keys from Messages for l10n.<lang>, too
Jan 07, 2018
f1cd02b2
Merge remote-tracking branch 'origin/b4208' into f9098
Jan 11, 2018
d70b645e
Show SQL statement causing exception (#228)
Jan 13, 2018
30fe10c5
[9098] Sort properties alphabetically and remove duplicates
Jan 13, 2018
4aae5978
[9800] Fix selecting contact
Jan 13, 2018
04dc46be
Merge remote-tracking branch 'origin/b4208' into f9098
Jan 13, 2018
436d180a
[9800] Added documentation for non obvious l10n behaviour
Jan 14, 2018
9c88f389
[9098] Correct \ n and \! in properties
Jan 18, 2018
4dbc3d8e
[9098] Update l10n readme and script
Jan 18, 2018
ca10e693
[9098] Raise an error if first parameter is not a directory
Jan 19, 2018
33218008
Merge branch 'b4208' of github.com:elexis/elexis-3-core into f9098
Jan 27, 2018
598df3c6
[9098] Convert properties from 8859-1 to UTF on error
Feb 14, 2018
f30c64a4
Merge remote-tracking branch 'origin/b4208' into f9098
Mar 01, 2018
5f6b8de7
Merge remote-tracking branch 'origin/master' into f9098
Mar 09, 2018
34b27c6e
[9098] We do not need a pom for l10n
Mar 09, 2018
4e8ace01
Merge branch 'master' of github.com:elexis/elexis-3-core into f9098
Mar 16, 2018
09ff08d0
[11094] Ignore .polyglot.build.properties when calculating git timestamps
Mar 16, 2018
06293402
[9098] No longer use fragments for languages
Mar 22, 2018
31eb0cf3
Merge branch 'master' of github.com:elexis/elexis-3-core into f9098
Mar 22, 2018
35f3ec12
[9098] No longer use fragments for languages
Mar 22, 2018
80215d6c
[9098] Prepare for merge to master
Mar 26, 2018
1d12ea2c
[9098] Add missing messages/properties for Priority, ProcessStatus and Visibility
Mar 26, 2018
607dd169
Merge branch 'master' of github.com:elexis/elexis-3-core into f9098
Mar 27, 2018
0542a03f
[9098] Updated i18n script and doc
Jun 07, 2018
aad0c4a4
[9664] Adapt for new branch 3.6
Jun 21, 2018
8379dba4
Update elexis.setup
Jun 22, 2018
20ae4151
[11543] Remove 3.2 db migration code
Jun 26, 2018
67848904
Translation suite #1 (#253)
Jun 26, 2018
42cdc78b
Translation suite #2 (#256)
Jun 26, 2018
dc32b785
[9664] Fix git.target.branch in pom.xml
Jun 28, 2018
6846ed2e
[11559] added p2.inf with uninstallBundle touchpoint instruction
Jun 29, 2018
0b9b5114
[11559] added p2 instruction import
Jun 29, 2018
67612d10
[11559] changed p2 instruction to configure
Jun 29, 2018
8172d068
[11559] changed p2 instruction to pseudo iu
Jun 29, 2018
6355bf74
[11559] added artifact to uninstall p2 instruction
Jun 29, 2018
e9c446fc
[11559] refactored uninstall p2 instruction
Jun 29, 2018
5d41878f
[11559] added uninstall import to p2 instruction
Jun 29, 2018
de22adca
[10845] Only unlock Fall if it is locked
Jul 02, 2018
8f93fcd1
Small change in the patient detail view. Hardcoded Zusatzadressen changed into...
Jul 02, 2018
f03e3a1a
Little confusion between Zusatzadresse and Bezugskontakt in french version
Jul 02, 2018
07fc2f7d
[9098] Readded tooltip/description/label for plugin[_*].properties
Jul 02, 2018
a37fec4a
Change in messages_de.properties
Jul 02, 2018
3ca87874
Translation suite #3
Jul 02, 2018
6e06e4dc
[11561] Fixed Address- and RelationshipType for Zusatzaddress
Jul 02, 2018
ab714b0f
[11561] Fix typo in unit-test for travis-ci
Jul 02, 2018
15148b3d
[11561] Readded NON-NLS for UserSettings.setExpandedState
Jul 02, 2018
47a980c5
[11559] remove not working p2.inf, added empty jersey-min bundle
Jul 02, 2018
40321077
[11559] ignore optional dependencies resolving target platform
Jul 02, 2018
d93dc1cd
[11559] dependency to console.application not optional for test
Jul 02, 2018
0ca87e82
[11559] dependency to console.application not optional for test
Jul 02, 2018
550ac71d
[9508] New reminders are by default only displayed when patient is selected
Jul 04, 2018
4e7578ee
[11592] Fix ArrayOutOfBoundsException for HL7_v22_ORU_R01
Jul 09, 2018
dd239585
[11575] fixed adding phone number to HL7 message
Jul 13, 2018
ca52d5ab
[11575] reworked tel number handling of HL7Writer
Jul 13, 2018
e8487a34
Merge branch '3.6' of github.com:elexis/elexis-3-core into f9098
Jul 14, 2018
5f80cd16
More strings capitalized and some corrections
Jul 14, 2018
84267f58
Translation #4
Jul 14, 2018
82e80231
Translation #5
Jul 14, 2018
41a324f9
[11630] Fix regression Fremde -> Alle
Jul 14, 2018
019ce2a1
Translation #6
Jul 14, 2018
2ddd90c6
Translation #7
Jul 14, 2018
275e6988
[11630] Correct display of show patient selection only reminders
Jul 17, 2018
62a6e76b
[14325] Fix Fall.Kostentraeger variable
Jul 19, 2018
9b75fcb3
[14325] Requested change in FallKostentraegerResolver
Jul 19, 2018
Show whitespace changes
Inline
Side-by-side
.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=
"E
lexis (
${
s
co
p
e.
project.stream.name})
"
/>
value=
"E
${co
r
e.
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
\u
00E9er 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-201
6
, G. Weirich and Elexis
* Copyright (c) 2006-201
8
, 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_en.properties
View file @
9be26af4
pluginName
=
Elexis findings
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
();
}
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$
...
...
Prev
1
2
3
4
5
Next