From 9d92a164df8a53b456be3887c7e00337bad6aff8 Mon Sep 17 00:00:00 2001 From: drizea Date: Fri, 17 Aug 2012 20:05:05 +0300 Subject: [PATCH] fines padded 2 decimal places --- Open-ILS/src/Android/res/values/strings.xml | 3 +++ .../res/xml/application_preference_screen.xml | 4 ++++ .../android/accountAccess/AccountAccess.java | 21 +++++++++++++-------- .../android/accountAccess/fines/FinesActivity.java | 12 ++++++++---- .../android/accountAccess/fines/FinesRecord.java | 9 ++++++--- 5 files changed, 34 insertions(+), 15 deletions(-) diff --git a/Open-ILS/src/Android/res/values/strings.xml b/Open-ILS/src/Android/res/values/strings.xml index ac1d74cd22..f968b05233 100644 --- a/Open-ILS/src/Android/res/values/strings.xml +++ b/Open-ILS/src/Android/res/values/strings.xml @@ -155,4 +155,7 @@ Each day notifications Give a notification in every day before the actual start notification period and due date + + Notification settings + \ No newline at end of file diff --git a/Open-ILS/src/Android/res/xml/application_preference_screen.xml b/Open-ILS/src/Android/res/xml/application_preference_screen.xml index 18c489d28e..0f1ec814df 100644 --- a/Open-ILS/src/Android/res/xml/application_preference_screen.xml +++ b/Open-ILS/src/Android/res/xml/application_preference_screen.xml @@ -28,6 +28,9 @@ + + + \ No newline at end of file diff --git a/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/AccountAccess.java b/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/AccountAccess.java index e54df10b0d..98402aedfe 100644 --- a/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/AccountAccess.java +++ b/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/AccountAccess.java @@ -1311,16 +1311,21 @@ public class AccountAccess { Map map = (Map) Utils.doRequest(conn, SERVICE_ACTOR, METHOD_FLESH_PUBLIC_CONTAINER, authToken, cm, new Object[] { authToken, "biblio", bookbagID }); - - List items = (List) map.get("items"); - - for (int i = 0; i < items.size(); i++) { - - BookBagItem bookBagItem = new BookBagItem(items.get(i)); - - bag.items.add(bookBagItem); + + List items = new ArrayList(); + + try{ + items = (List) map.get("items"); + + for (int i = 0; i < items.size(); i++) { + + BookBagItem bookBagItem = new BookBagItem(items.get(i)); + + bag.items.add(bookBagItem); } + }catch(Exception e){}; + return items; } diff --git a/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/fines/FinesActivity.java b/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/fines/FinesActivity.java index 5b3f0e04f4..49c9f6582b 100644 --- a/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/fines/FinesActivity.java +++ b/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/fines/FinesActivity.java @@ -19,6 +19,7 @@ */ package org.evergreen.android.accountAccess.fines; +import java.text.DecimalFormat; import java.util.ArrayList; import java.util.List; @@ -73,6 +74,8 @@ public class FinesActivity extends Activity { private TextView headerTitle; private Context context; + + private DecimalFormat decimalFormater; @Override protected void onCreate(Bundle savedInstanceState) { @@ -105,6 +108,7 @@ public class FinesActivity extends Activity { }); // end header portion actions + decimalFormater = new DecimalFormat("#0.00"); lv = (ListView) findViewById(R.id.fines_overdue_materials_list); total_owned = (TextView) findViewById(R.id.fines_total_owned); @@ -170,9 +174,9 @@ public class FinesActivity extends Activity { listAdapter.notifyDataSetChanged(); - total_owned.setText(fines[0] + ""); - total_paid.setText(fines[1] + ""); - balance_owed.setText(fines[2] + ""); + total_owned.setText(decimalFormater.format(fines[0])); + total_paid.setText(decimalFormater.format(fines[1])); + balance_owed.setText(decimalFormater.format(fines[2])); progressDialog.dismiss(); } }); @@ -238,7 +242,7 @@ public class FinesActivity extends Activity { // set raw information fineTitle.setText(record.title); fineAuthor.setText(record.author); - fineBalanceOwed.setText(record.balance_owed); + fineBalanceOwed.setText(decimalFormater.format(record.balance_owed)); // status.setText(record.getHoldStatus()); fineStatus.setText(record.getStatus()); diff --git a/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/fines/FinesRecord.java b/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/fines/FinesRecord.java index 4c63fa0a1d..1e8de96a02 100644 --- a/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/fines/FinesRecord.java +++ b/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/fines/FinesRecord.java @@ -36,7 +36,7 @@ public class FinesRecord { public Date dateReturned; - public String balance_owed; + public Double balance_owed; private Date checkin_time; @@ -67,8 +67,11 @@ public class FinesRecord { } - balance_owed = mbts_transaction.getString("total_owed"); - + try{ + balance_owed =Double.parseDouble(mbts_transaction.getString("total_owed")); + }catch(Exception e){ + System.err.println("Error in total owed string to double conversion " + e.getMessage()); + } } // if returned or fines still acumulating -- 2.11.0