Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Sign in
Toggle navigation
elexis-3-core
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Container Registry
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Jobs
Commits
Open sidebar
elexis
elexis-3-core
Commits
37c126ae
Commit
37c126ae
authored
Nov 26, 2019
by
Thomas Huster
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[14358] reworked eigenartikel ui fixed set and display selling price
parent
4b3ca122
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
72 additions
and
16 deletions
+72
-16
bundles/ch.elexis.core.ui.eigenartikel/src/ch/elexis/core/ui/eigenartikel/EigenartikelComposite.java
...ch/elexis/core/ui/eigenartikel/EigenartikelComposite.java
+11
-12
bundles/ch.elexis.core.ui.eigenartikel/src/ch/elexis/core/ui/eigenartikel/EigenartikelDetailDisplay.java
...lexis/core/ui/eigenartikel/EigenartikelDetailDisplay.java
+1
-1
bundles/ch.elexis.core.ui.eigenartikel/src/ch/elexis/core/ui/eigenartikel/EigenartikelProductComposite.java
...is/core/ui/eigenartikel/EigenartikelProductComposite.java
+2
-2
bundles/ch.elexis.core.ui.eigenartikel/src/ch/elexis/core/ui/eigenartikel/Money2StringConverter.java
...ch/elexis/core/ui/eigenartikel/Money2StringConverter.java
+26
-0
bundles/ch.elexis.core.ui.eigenartikel/src/ch/elexis/core/ui/eigenartikel/String2MoneyConverter.java
...ch/elexis/core/ui/eigenartikel/String2MoneyConverter.java
+31
-0
bundles/ch.elexis.core.ui/src/ch/elexis/core/ui/views/artikel/ArtikelSelektor.java
.../src/ch/elexis/core/ui/views/artikel/ArtikelSelektor.java
+1
-1
No files found.
bundles/ch.elexis.core.ui.eigenartikel/src/ch/elexis/core/ui/eigenartikel/EigenartikelComposite.java
View file @
37c126ae
...
...
@@ -34,6 +34,7 @@ import ch.elexis.core.ui.databinding.SavingUpdateValueStrategy;
import
ch.elexis.core.ui.icons.Images
;
import
ch.elexis.core.ui.locks.IUnlockable
;
import
ch.elexis.core.ui.views.controls.StockDetailComposite
;
import
ch.rgw.tools.Money
;
public
class
EigenartikelComposite
extends
Composite
implements
IUnlockable
{
...
...
@@ -78,14 +79,7 @@ public class EigenartikelComposite extends Composite implements IUnlockable {
}
public
void
setEigenartikel
(
IArticle
eigenartikel
){
IArticle
current
=
this
.
drugPackageEigenartikel
.
getValue
();
if
(
current
!=
null
)
{
if
(
current
.
equals
(
eigenartikel
))
{
this
.
drugPackageEigenartikel
.
setValue
(
eigenartikel
);
}
}
else
{
this
.
drugPackageEigenartikel
.
setValue
(
eigenartikel
);
}
this
.
drugPackageEigenartikel
.
setValue
(
eigenartikel
);
}
private
void
createArticlePart
(){
...
...
@@ -273,13 +267,18 @@ public class EigenartikelComposite extends Composite implements IUnlockable {
// //
ISWTObservableValue
observeTextTxtpubPriceObserveWidget
=
WidgetProperties
.
text
(
SWT
.
Modify
).
observe
(
txtpubPrice
);
IObservableValue
<
String
>
drugPackageEigenartikelVKPreisObserveDetailValue
=
PojoProperties
.
value
(
IArticle
.
class
,
"sellingPrice"
,
String
.
class
)
IObservableValue
<
Money
>
drugPackageEigenartikelVKPreisObserveDetailValue
=
PojoProperties
.
value
(
IArticle
.
class
,
"sellingPrice"
,
Money
.
class
)
.
observeDetail
(
drugPackageEigenartikel
);
SavingUpdateValueStrategy
target2ModelStrategy
=
new
SavingUpdateValueStrategy
(
CoreModelServiceHolder
.
get
(),
drugPackageEigenartikel
);
target2ModelStrategy
.
setConverter
(
new
String2MoneyConverter
());
UpdateValueStrategy
model2TargetStrategy
=
new
UpdateValueStrategy
<>();
model2TargetStrategy
.
setConverter
(
new
Money2StringConverter
());
bindingContext
.
bindValue
(
observeTextTxtpubPriceObserveWidget
,
drugPackageEigenartikelVKPreisObserveDetailValue
,
new
SavingUpdateValueStrategy
(
CoreModelServiceHolder
.
get
(),
drugPackageEigenartikel
)
,
null
);
target2ModelStrategy
,
model2TargetStrategy
);
// //
ISWTObservableValue
observeTextTxtMeasurementUnitObserveWidget
=
WidgetProperties
.
text
(
SWT
.
Modify
).
observe
(
txtMeasurementUnit
);
...
...
bundles/ch.elexis.core.ui.eigenartikel/src/ch/elexis/core/ui/eigenartikel/EigenartikelDetailDisplay.java
View file @
37c126ae
...
...
@@ -177,7 +177,7 @@ public class EigenartikelDetailDisplay implements IDetailDisplay {
container
.
setLayout
(
layout
);
compProduct
=
new
Composite
(
container
,
SWT
.
None
);
//
compProduct.setLayout(new GridLayout(1, false));
compProduct
.
setLayout
(
new
GridLayout
(
1
,
false
));
ToolBar
toolBar
=
new
ToolBar
(
compProduct
,
SWT
.
BORDER
|
SWT
.
FLAT
|
SWT
.
RIGHT
);
toolBar
.
setLayoutData
(
new
GridData
(
SWT
.
FILL
,
SWT
.
CENTER
,
true
,
false
,
1
,
1
));
...
...
bundles/ch.elexis.core.ui.eigenartikel/src/ch/elexis/core/ui/eigenartikel/EigenartikelProductComposite.java
View file @
37c126ae
...
...
@@ -82,7 +82,7 @@ public class EigenartikelProductComposite extends Composite implements IUnlockab
Combo
comboProductType
=
comboViewerProductType
.
getCombo
();
GridData
gd_comboProductType
=
new
GridData
(
SWT
.
LEFT
,
SWT
.
CENTER
,
false
,
false
,
1
,
1
);
gd_comboProductType
.
widthHint
=
15
0
;
gd_comboProductType
.
widthHint
=
30
0
;
comboProductType
.
setLayoutData
(
gd_comboProductType
);
comboViewerProductType
.
setContentProvider
(
ArrayContentProvider
.
getInstance
());
comboViewerProductType
.
setLabelProvider
(
new
LabelProvider
()
{
...
...
@@ -107,7 +107,7 @@ public class EigenartikelProductComposite extends Composite implements IUnlockab
txtAtcCode
=
new
Text
(
compAtcCode
,
SWT
.
BORDER
);
GridData
gd_txtAtcCode
=
new
GridData
(
SWT
.
LEFT
,
SWT
.
CENTER
,
false
,
false
,
1
,
1
);
gd_txtAtcCode
.
widthHint
=
8
0
;
gd_txtAtcCode
.
widthHint
=
30
0
;
txtAtcCode
.
setLayoutData
(
gd_txtAtcCode
);
txtAtcCode
.
setTextLimit
(
8
);
new
Label
(
compAtcCode
,
SWT
.
NONE
);
...
...
bundles/ch.elexis.core.ui.eigenartikel/src/ch/elexis/core/ui/eigenartikel/Money2StringConverter.java
0 → 100644
View file @
37c126ae
package
ch
.
elexis
.
core
.
ui
.
eigenartikel
;
import
org.eclipse.core.databinding.conversion.IConverter
;
import
ch.rgw.tools.Money
;
public
class
Money2StringConverter
implements
IConverter
<
Money
,
String
>
{
@Override
public
Object
getFromType
(){
return
Money
.
class
;
}
@Override
public
Object
getToType
(){
return
String
.
class
;
}
@Override
public
String
convert
(
Money
fromObject
){
if
(
fromObject
!=
null
)
{
return
fromObject
.
getCentsAsString
();
}
return
null
;
}
}
bundles/ch.elexis.core.ui.eigenartikel/src/ch/elexis/core/ui/eigenartikel/String2MoneyConverter.java
0 → 100644
View file @
37c126ae
package
ch
.
elexis
.
core
.
ui
.
eigenartikel
;
import
org.eclipse.core.databinding.conversion.IConverter
;
import
ch.rgw.tools.Money
;
public
class
String2MoneyConverter
implements
IConverter
<
String
,
Money
>
{
@Override
public
Object
getFromType
(){
return
String
.
class
;
}
@Override
public
Object
getToType
(){
return
Money
.
class
;
}
@Override
public
Money
convert
(
String
fromObject
){
if
(
fromObject
!=
null
)
{
try
{
return
new
Money
(
Integer
.
parseInt
(
fromObject
));
}
catch
(
NumberFormatException
e
)
{
System
.
out
.
println
(
e
.
getMessage
());
}
}
return
null
;
}
}
bundles/ch.elexis.core.ui/src/ch/elexis/core/ui/views/artikel/ArtikelSelektor.java
View file @
37c126ae
...
...
@@ -64,7 +64,7 @@ public class ArtikelSelektor extends ViewPart implements ISaveablePart2 {
if
(
description
.
isPresent
())
{
CTabItem
ci
=
new
CTabItem
(
ctab
,
SWT
.
NONE
);
ci
.
setText
(
description
.
get
().
getCodeSystemName
());
ci
.
setData
(
description
);
//$NON-NLS-1$
ci
.
setData
(
description
.
get
()
);
//$NON-NLS-1$
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment