From: kenstir <kenstir@gmail.com>
Date: Sun, 18 Oct 2015 02:11:06 +0000 (-0400)
Subject: In checked out items view, print overdue items in red.  Not sure I like it yet.
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=31a96486c53e9d01e5cc2403fd78c39558d041bd;p=working%2FEvergreen.git

In checked out items view, print overdue items in red.  Not sure I like it yet.
---

diff --git a/Open-ILS/src/Android/core/res/values/styles.xml b/Open-ILS/src/Android/core/res/values/styles.xml
index 27b3487688..b9d2d54e3b 100644
--- a/Open-ILS/src/Android/core/res/values/styles.xml
+++ b/Open-ILS/src/Android/core/res/values/styles.xml
@@ -17,6 +17,11 @@
         <item name="android:layout_height">wrap_content</item>
     </style>
 
+    <style name="alert">
+        <item name="android:textStyle">bold</item>
+        <item name="android:textColor">#FFAA2222</item>
+    </style>
+
     <style name="spacer">
         <item name="android:layout_width">fill_parent</item>
         <item name="android:layout_height">14dip</item>
diff --git a/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/checkout/CircRecord.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/checkout/CircRecord.java
index 8bc68d9540..b232ef570c 100644
--- a/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/checkout/CircRecord.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/checkout/CircRecord.java
@@ -134,4 +134,8 @@ public class CircRecord {
         return null;
     }
 
+    public boolean isOverdue() {
+        Date currentDate = new Date(System.currentTimeMillis());
+        return getDueDateObject().compareTo(currentDate) < 0;
+    }
 }
diff --git a/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/checkout/ItemsCheckOutListView.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/checkout/ItemsCheckOutListView.java
index 8c579f7b55..0f276563c9 100644
--- a/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/checkout/ItemsCheckOutListView.java
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/accountAccess/checkout/ItemsCheckOutListView.java
@@ -89,8 +89,6 @@ public class ItemsCheckOutListView extends ActionBarActivity {
         actionBar.setSubtitle(AccountAccess.userName);
         actionBar.setDisplayHomeAsUpEnabled(true);
 
-        currentDate = new Date(System.currentTimeMillis());
-
         context = this;
         itemsNo = (TextView) findViewById(R.id.checkout_items_number);
         overdueItems = (TextView) findViewById(R.id.checkout_items_overdue);
@@ -121,8 +119,10 @@ public class ItemsCheckOutListView extends ActionBarActivity {
 
                     @Override
                     public void run() {
-                        for (int i = 0; i < circRecords.size(); i++)
-                            listAdapter.add(circRecords.get(i));
+                        for (int i = 0; i < circRecords.size(); i++) {
+                            CircRecord circ = circRecords.get(i);
+                            listAdapter.add(circ);
+                        }
 
                         itemsNo.setText(" " + circRecords.size() + " ");
 
@@ -130,8 +130,9 @@ public class ItemsCheckOutListView extends ActionBarActivity {
                         int overdueNo = 0;
                         for (int i = 0; i < circRecords.size(); i++) {
                             CircRecord circ = circRecords.get(i);
-                            if (circ.getDueDateObject().compareTo(currentDate) < 0)
+                            if (circ.isOverdue()) {
                                 overdueNo++;
+                            }
                         }
                         overdueItems.setText(" " + overdueNo);
 
@@ -164,7 +165,6 @@ public class ItemsCheckOutListView extends ActionBarActivity {
         private TextView recordTitle;
         private TextView recordAuthor;
         private TextView recordDueDate;
-        private TextView recordRenewals;
         private TextView renewButton;
 
         private List<CircRecord> records = new ArrayList<CircRecord>();
@@ -191,15 +191,11 @@ public class ItemsCheckOutListView extends ActionBarActivity {
 
             // if it is the right type of view
             if (row == null) {
-
-                Log.d(tag, "Starting XML Row Inflation ... ");
                 LayoutInflater inflater = (LayoutInflater) this
                         .getContext().getSystemService(
                                 Context.LAYOUT_INFLATER_SERVICE);
                 row = inflater.inflate(R.layout.checkout_list_item, parent,
                         false);
-                Log.d(tag, "Successfully completed XML Row Inflation!");
-
             }
 
             // Get reference to TextView - title
@@ -314,6 +310,9 @@ public class ItemsCheckOutListView extends ActionBarActivity {
             recordTitle.setText(record.getTitle());
             recordAuthor.setText(record.getAuthor());
             recordDueDate.setText(getString(R.string.due) + ": " + record.getDueDate());
+            if (record.isOverdue()) {
+                recordDueDate.setTextAppearance(getApplicationContext(), R.style.alert);
+            }
             Log.d(TAG, "title:  " + record.getTitle());
             Log.d(TAG, "author: " + record.getAuthor());
             Log.d(TAG, "due:    " + record.getDueDate());