fines padded 2 decimal places

diff --git a/Open-ILS/src/Android/res/values/strings.xml b/Open-ILS/src/Android/res/values/strings.xml
index ac1d74c..f968b05 100644 (file)
--- a/Open-ILS/src/Android/res/values/strings.xml
+++ b/Open-ILS/src/Android/res/values/strings.xml
@@ -155,4 +155,7 @@
      
      <string name="preference_notifications_each_day">Each day notifications</string>
      <string name="preference_notifications_each_day_summary">Give a notification in every day before the actual start notification period and due date</string>
+     
+     <string name="preference_notifications_title">Notification settings</string>
+     
 </resources>
\ 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 18c489d..0f1ec81 100644 (file)
--- 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 @@
 
         </PreferenceCategory>
   
+       <PreferenceCategory
+          android:title="@string/preference_notifications_title" >      
+                
          <PreferenceScreen
                 android:key="NotificationsPrefScreen"
                 android:title="@string/preference_notification_preference_screen_title"
@@ -55,4 +58,5 @@
                                    android:summary="@string/preference_notifications_each_day_summary"
                                    />
         </PreferenceScreen>
+        </PreferenceCategory>
 </PreferenceScreen> 
\ 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 e54df10..98402ae 100644 (file)
--- 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<String, ?> map = (Map<String, ?>) Utils.doRequest(conn,
                 SERVICE_ACTOR, METHOD_FLESH_PUBLIC_CONTAINER, authToken, cm,
                 new Object[] { authToken, "biblio", bookbagID });
-
-        List<OSRFObject> items = (List<OSRFObject>) map.get("items");
-
-        for (int i = 0; i < items.size(); i++) {
-
-            BookBagItem bookBagItem = new BookBagItem(items.get(i));
-
-            bag.items.add(bookBagItem);
+        
+        List<OSRFObject> items  = new ArrayList<OSRFObject>();
+        
+        try{
+            items = (List<OSRFObject>) 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 5b3f0e0..49c9f65 100644 (file)
--- 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 4c63fa0..1e8de96 100644 (file)
--- 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