Skip to content

Commit

Permalink
EK | Code cleanup r8
Browse files Browse the repository at this point in the history
  • Loading branch information
@ekigamba
ekigamba committed Oct 9, 2017
1 parent eace07c commit 3bda0f5
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
14 changes: 7 additions & 7 deletions opensrp-path/src/main/java/org/smartregister/path/activity/PathJsonFormActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ private void stockDateEnteredInIssuedForm(String key, String value) {
}
if (!StringUtils.isBlank(vialsValue)) {
newBalance = str.getBalanceFromNameAndDate(vaccineName, encounterDate.getTime()) - Integer.parseInt(vialsValue) - Integer.parseInt(wastedVials);
pathJsonFormFragment.getLabelViewFromTag(getString(R.string.balance), "New balance: " + newBalance);
pathJsonFormFragment.getLabelViewFromTag(getString(R.string.balance), getString(R.string.new_balance) + newBalance);
}

int vialsUsed = 0;
Expand Down Expand Up @@ -217,7 +217,7 @@ private void stockVialsEnteredInIssuedForm(String key, String value) {

if (value != null && !StringUtils.isBlank(value)) {
newBalance = existingBalance - Integer.parseInt(value) - Integer.parseInt(wastedVials);
pathJsonFormFragment.getLabelViewFromTag(getString(R.string.balance), "New balance: " + newBalance);
pathJsonFormFragment.getLabelViewFromTag(getString(R.string.balance), getString(R.string.new_balance) + newBalance);
} else {
pathJsonFormFragment.getLabelViewFromTag(getString(R.string.balance), "");
}
Expand Down Expand Up @@ -297,7 +297,7 @@ private void stockWastedVialsEnteredInIssuedForm(String key, String value) {
if (vialsValue != null && !StringUtils.isBlank(vialsValue)) {

newBalance = existingBalance - Integer.parseInt(vialsValue) - Integer.parseInt(wastedVials);
pathJsonFormFragment.getLabelViewFromTag(getString(R.string.balance), "New balance: " + newBalance);
pathJsonFormFragment.getLabelViewFromTag(getString(R.string.balance), getString(R.string.new_balance) + newBalance);
} else {
pathJsonFormFragment.getLabelViewFromTag(getString(R.string.balance), "");
}
Expand Down Expand Up @@ -354,7 +354,7 @@ private void stockDateEnteredInReceivedForm(String key, String value) {

if (vialsValue != null && !vialsValue.equalsIgnoreCase("")) {
displayBalance = currentBalance + Integer.parseInt(vialsValue);
pathJsonFormFragment.getLabelViewFromTag(getString(R.string.balance), "New balance: " + displayBalance);
pathJsonFormFragment.getLabelViewFromTag(getString(R.string.balance), getString(R.string.new_balance) + displayBalance);

} else {
pathJsonFormFragment.getLabelViewFromTag(getString(R.string.balance), "");
Expand Down Expand Up @@ -400,7 +400,7 @@ private void stockVialsEnteredInReceivedForm(String key, String value) {

if (StringUtils.isNotBlank(value)) {
displayBalance = currentBalance + Integer.parseInt(value);
pathJsonFormFragment.getLabelViewFromTag(getString(R.string.balance), "New balance: " + displayBalance);
pathJsonFormFragment.getLabelViewFromTag(getString(R.string.balance), getString(R.string.new_balance) + displayBalance);
} else {
pathJsonFormFragment.getLabelViewFromTag(getString(R.string.balance), "");
}
Expand Down Expand Up @@ -450,7 +450,7 @@ private void stockDateEnteredInAdjustmentForm(String key, String value) {

if (vialsValue != null && !vialsValue.equalsIgnoreCase("")) {
displayBalance = currentBalance + Integer.parseInt(vialsValue);
pathJsonFormFragment.getLabelViewFromTag(getString(R.string.balance), "New balance: " + displayBalance);
pathJsonFormFragment.getLabelViewFromTag(getString(R.string.balance), getString(R.string.new_balance) + displayBalance);

} else {
pathJsonFormFragment.getLabelViewFromTag(getString(R.string.balance), "");
Expand Down Expand Up @@ -494,7 +494,7 @@ private void stockVialsEnteredInAdjustmentForm(String key, String value) {

if (StringUtils.isNotBlank(value) && !value.equalsIgnoreCase("-")) {
displayBalance = currentBalance + Integer.parseInt(value);
pathJsonFormFragment.getLabelViewFromTag(getString(R.string.balance), "New balance: " + displayBalance);
pathJsonFormFragment.getLabelViewFromTag(getString(R.string.balance), getString(R.string.new_balance) + displayBalance);

} else {
pathJsonFormFragment.getLabelViewFromTag(getString(R.string.balance), "");
Expand Down
1 change: 1 addition & 0 deletions opensrp-path/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,4 +226,5 @@
<string name="vials_adjustment_key">Vials_Adjustment</string>
<string name="vials_issued_key">Vials_Issued</string>
<string name="balance">Balance</string>
<string name="new_balance">New Balance: </string>
</resources>

0 comments on commit 3bda0f5

Please sign in to comment.