Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
BudgetMaster
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Robert Goldmann
BudgetMaster
Commits
ab3eaaf8
Commit
ab3eaaf8
authored
6 years ago
by
Robert Goldmann
Browse files
Options
Downloads
Patches
Plain Diff
Fixed wrong format of amount strings
parent
aca28625
No related branches found
No related tags found
No related merge requests found
Pipeline
#328
passed
6 years ago
Stage: build
Stage: test
Changes
1
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/main/java/de/deadlocker8/budgetmaster/services/HelpersService.java
+6
-3
6 additions, 3 deletions
.../de/deadlocker8/budgetmaster/services/HelpersService.java
with
6 additions
and
3 deletions
src/main/java/de/deadlocker8/budgetmaster/services/HelpersService.java
+
6
−
3
View file @
ab3eaaf8
...
@@ -19,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
...
@@ -19,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
java.io.UnsupportedEncodingException
;
import
java.io.UnsupportedEncodingException
;
import
java.math.RoundingMode
;
import
java.net.URLEncoder
;
import
java.net.URLEncoder
;
import
java.text.NumberFormat
;
import
java.text.NumberFormat
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
...
@@ -59,20 +60,22 @@ public class HelpersService
...
@@ -59,20 +60,22 @@ public class HelpersService
public
String
getCurrencyString
(
double
amount
)
public
String
getCurrencyString
(
double
amount
)
{
{
return
getAmountString
(
amount
)
+
" "
+
settingsRepository
.
findOne
(
0
).
getCurrency
();
return
getAmountString
(
amount
,
true
)
+
" "
+
settingsRepository
.
findOne
(
0
).
getCurrency
();
}
}
public
String
getAmountString
(
int
amount
)
public
String
getAmountString
(
int
amount
)
{
{
return
getAmountString
(
Math
.
abs
(
amount
)
/
100.0
);
return
getAmountString
(
Math
.
abs
(
amount
)
/
100.0
,
false
);
}
}
public
String
getAmountString
(
double
amount
)
public
String
getAmountString
(
double
amount
,
boolean
useGrouping
)
{
{
Settings
settings
=
settingsRepository
.
findOne
(
0
);
Settings
settings
=
settingsRepository
.
findOne
(
0
);
NumberFormat
format
=
NumberFormat
.
getNumberInstance
(
settings
.
getLanguage
().
getLocale
());
NumberFormat
format
=
NumberFormat
.
getNumberInstance
(
settings
.
getLanguage
().
getLocale
());
format
.
setMaximumFractionDigits
(
2
);
format
.
setMaximumFractionDigits
(
2
);
format
.
setMinimumFractionDigits
(
2
);
format
.
setMinimumFractionDigits
(
2
);
format
.
setRoundingMode
(
RoundingMode
.
HALF_UP
);
format
.
setGroupingUsed
(
useGrouping
);
return
String
.
valueOf
(
format
.
format
(
amount
));
return
String
.
valueOf
(
format
.
format
(
amount
));
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment