indented orgtree display in spinner

diff --git a/Open-ILS/src/Android/bin/EvergreenApp.apk b/Open-ILS/src/Android/bin/EvergreenApp.apk
index 5b44202..77f3c73 100644 (file)
Binary files a/Open-ILS/src/Android/bin/EvergreenApp.apk and b/Open-ILS/src/Android/bin/EvergreenApp.apk differ

diff --git a/Open-ILS/src/Android/bin/classes.dex b/Open-ILS/src/Android/bin/classes.dex
index ea7cfd4..44577d2 100644 (file)
Binary files a/Open-ILS/src/Android/bin/classes.dex and b/Open-ILS/src/Android/bin/classes.dex differ

diff --git a/Open-ILS/src/Android/bin/classes/org/evergreen/android/globals/GlobalConfigs.class b/Open-ILS/src/Android/bin/classes/org/evergreen/android/globals/GlobalConfigs.class
index 4bf66f3..a5c9166 100644 (file)
Binary files a/Open-ILS/src/Android/bin/classes/org/evergreen/android/globals/GlobalConfigs.class and b/Open-ILS/src/Android/bin/classes/org/evergreen/android/globals/GlobalConfigs.class differ

diff --git a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/Organisation.class b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/Organisation.class
index da093c9..191edab 100644 (file)
Binary files a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/Organisation.class and b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/Organisation.class differ

diff --git a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$1.class b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$1.class
index aa91e96..10eb85e 100644 (file)
Binary files a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$1.class and b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$1.class differ

diff --git a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$2$1$1.class b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$2$1$1.class
index 34d8355..7ffeaf5 100644 (file)
Binary files a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$2$1$1.class and b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$2$1$1.class differ

diff --git a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$2$1.class b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$2$1.class
index 91b42c0..ffe3981 100644 (file)
Binary files a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$2$1.class and b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$2$1.class differ

diff --git a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$2.class b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$2.class
index bb07e89..5e414cf 100644 (file)
Binary files a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$2.class and b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$2.class differ

diff --git a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$3.class b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$3.class
index 8e0f6a8..59be769 100644 (file)
Binary files a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$3.class and b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$3.class differ

diff --git a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$SearchArrayAdapter.class b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$SearchArrayAdapter.class
index 573efb3..059da9d 100644 (file)
Binary files a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$SearchArrayAdapter.class and b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView$SearchArrayAdapter.class differ

diff --git a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView.class b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView.class
index 239ff5a..645b13f 100644 (file)
Binary files a/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView.class and b/Open-ILS/src/Android/bin/classes/org/evergreen/android/searchCatalog/SearchCatalogListView.class differ

diff --git a/Open-ILS/src/Android/bin/resources.ap_ b/Open-ILS/src/Android/bin/resources.ap_
index c076396..a70f583 100644 (file)
Binary files a/Open-ILS/src/Android/bin/resources.ap_ and b/Open-ILS/src/Android/bin/resources.ap_ differ

diff --git a/Open-ILS/src/Android/src/org/evergreen/android/globals/GlobalConfigs.java b/Open-ILS/src/Android/src/org/evergreen/android/globals/GlobalConfigs.java
index 91a7362..b5533d3 100644 (file)
--- a/Open-ILS/src/Android/src/org/evergreen/android/globals/GlobalConfigs.java
+++ b/Open-ILS/src/Android/src/org/evergreen/android/globals/GlobalConfigs.java
@@ -1,6 +1,7 @@
 package org.evergreen.android.globals;
 
 import java.io.InputStream;
+import java.lang.reflect.Array;
 import java.util.ArrayList;
 import java.util.StringTokenizer;
 
@@ -143,21 +144,21 @@ public class GlobalConfigs {
                                
                                //first is ID
                                String element = (String)tokenizer.nextElement();
-                               System.out.println("Element  " + element);
+                               System.out.println("Id  " + element);
                                try{
                                        org.id = Integer.parseInt(element);
                                }catch(Exception e){};
                                
                                //level
                                element = (String)tokenizer.nextElement();
-                               System.out.println("Element  " + element);
+                               System.out.println("Level   " + element);
                                try{
                                        org.level = Integer.parseInt(element);
                                }catch(Exception e){};
                                
                                //parent
                                element = (String)tokenizer.nextElement();
-                               System.out.println("Element  " + element);
+                               System.out.println("parent  " + element);
                                try{
                                        org.parent = Integer.parseInt(element);
                                }catch(Exception e){};
@@ -182,6 +183,46 @@ public class GlobalConfigs {
                                organisations.add(org);
                        }
                        
+                       ArrayList<Organisation> orgs = new ArrayList<Organisation>();
+                       
+                       for(int i=0;i<organisations.size();i++){
+
+                               StringBuilder padding = new StringBuilder();
+                               for(int j=0; j<organisations.get(i).level-1;j++)
+                                       padding.append("  ");
+                                       
+                               organisations.get(i).padding = padding.toString();
+                       }
+                       
+                       int size = organisations.size();
+                       int level = 0;
+                       while(orgs.size() < size){
+                               
+                               
+                               for(int i=0;i<organisations.size();i++){
+                                       Organisation org = organisations.get(i);
+                                       if(level == org.level){
+                                               boolean add = false;
+                                               for(int j=0;j<orgs.size();j++){
+                                                       
+                                                       if(orgs.get(j).id == org.parent){
+                                                               orgs.add(j+1,org);
+                                                               add = true;
+                                                               Log.d(TAG, "Added " + org.name + " " + org.level);
+                                                               break;
+                                                       }
+                                               }
+                                               
+                                               if(add == false){
+                                                       orgs.add(org);
+                                                       Log.d(TAG, "Added " + org.name + " " + org.level);
+                                               }
+                                       }
+                                               
+                               }
+                               level ++;
+                       }
+                       organisations = orgs;
                }
        }
 }

diff --git a/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/Organisation.java b/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/Organisation.java
index 1dd8047..6213c75 100644 (file)
--- a/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/Organisation.java
+++ b/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/Organisation.java
@@ -14,6 +14,9 @@ public class Organisation {
        
        public Integer canHaveVolumesBool = null;
        
+       //used for indent display
+       public String padding = "";
+       
        public Organisation(){
                
        }

diff --git a/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/SearchCatalogListView.java b/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/SearchCatalogListView.java
index 3c431ea..e8b56d7 100644 (file)
--- a/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/SearchCatalogListView.java
+++ b/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/SearchCatalogListView.java
@@ -123,6 +123,7 @@ public class SearchCatalogListView extends Activity{
                        RecordInfo info = (RecordInfo)lv.getItemAtPosition(position);
                        
                        if(info.dummy == true){
+                               //this is the more view item button 
                                progressDialog = new ProgressDialog(context);
                                
                                progressDialog.setMessage("Fetching data");
@@ -251,7 +252,7 @@ public class SearchCatalogListView extends Activity{
         int selectedPos = 0;
         ArrayList<String> list = new ArrayList<String>();
         for(int i=0;i<globalConfigs.organisations.size();i++){
-               list.add(globalConfigs.organisations.get(i).name);
+               list.add(globalConfigs.organisations.get(i).padding + globalConfigs.organisations.get(i).name);
                
                if(globalConfigs.organisations.get(i).level -1 == 0)
                        selectedPos = i;