From dd0f77f9f49bc3369e0419b20591b80204c03569 Mon Sep 17 00:00:00 2001
From: kenstir <kenstir@gmail.com>
Date: Fri, 6 Nov 2015 19:31:43 -0500
Subject: [PATCH] checkpoint: starting with ChooseConsortium and an asynctask
 to load the json

---
 .../views/ChooseConsortiumActivity.java            | 96 ++++++++++++++++++++++
 .../evergreen_ils/views/ChooseLibraryActivity.java | 80 ------------------
 2 files changed, 96 insertions(+), 80 deletions(-)
 create mode 100644 Open-ILS/src/Android/core/src/org/evergreen_ils/views/ChooseConsortiumActivity.java
 delete mode 100644 Open-ILS/src/Android/core/src/org/evergreen_ils/views/ChooseLibraryActivity.java

diff --git a/Open-ILS/src/Android/core/src/org/evergreen_ils/views/ChooseConsortiumActivity.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/views/ChooseConsortiumActivity.java
new file mode 100644
index 0000000000..0537c227ae
--- /dev/null
+++ b/Open-ILS/src/Android/core/src/org/evergreen_ils/views/ChooseConsortiumActivity.java
@@ -0,0 +1,96 @@
+package org.evergreen_ils.views;
+
+import android.os.Bundle;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.ActionBarActivity;
+import android.util.Log;
+import android.view.View;
+import android.widget.Button;
+import android.widget.Spinner;
+import org.evergreen_ils.R;
+import org.evergreen_ils.accountAccess.AccountAccess;
+import org.evergreen_ils.globals.Utils;
+import org.evergreen_ils.searchCatalog.Consortium;
+import org.opensrf.util.JSONException;
+import org.opensrf.util.JSONReader;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+import static org.evergreen_ils.globals.GlobalConfigs.getEvergreenConsortiums;
+
+/**
+ * Created by kenstir on 2015-11-05.
+ */
+public class ChooseConsortiumActivity extends ActionBarActivity {
+
+    private final String TAG = ChooseConsortiumActivity.class.getSimpleName();
+
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        // do not start SplashActivity here...it started us
+
+        setContentView(R.layout.activity_choose_library);
+
+        ActionBar actionBar = getSupportActionBar();
+        actionBar.setSubtitle(AccountAccess.userName);
+
+        // get consortiums, populate spinner
+        Spinner spinner = (Spinner) findViewById(R.id.choose_library_spinner);
+        Button button = (Button) findViewById(R.id.choose_library_button);
+        List<Consortium> consortiums = getEvergreenConsortiums();
+        Log.d(TAG, "do something useful here");
+    }
+
+    public void onButtonClick(View v) {
+        int id = v.getId();
+    }
+
+
+    public static ArrayList<Consortium> getEvergreenConsortiums() {
+
+        String json = null;
+        ArrayList<Consortium> consortiums = new ArrayList<Consortium>();
+
+        try {
+            Log.d(TAG, "fetching " + consortiumsJSONUrl);
+            json = Utils.getNetPageContent(consortiumsJSONUrl);
+        } catch (Exception e) {
+            Log.w(TAG, "failed fetching consortiums", e);
+        }
+
+        if (json != null) {
+            List l;
+            try {
+                l = new JSONReader(json).readArray();
+            } catch (JSONException e) {
+                Log.d(TAG, "failed parsing consortiums array", e);
+                return consortiums;
+            }
+
+            // Convert json list into array
+            for (int i=0; i<l.size(); ++i) {
+                List item = (List)l.get(i);
+                Consortium c = new Consortium();
+                c.name = "xyzzy";
+                consortiums.add(c);
+            }
+
+            Collections.sort(consortiums, new Comparator<Consortium>() {
+                @Override
+                public int compare(Consortium a, Consortium b) {
+                    return a.name.compareTo(b.name);
+                }
+            });
+
+            for (int i=0; i<consortiums.size(); ++i) {
+                Log.d(TAG, "c["+i+"]: "+consortiums.get(i).name);
+            }
+        }
+        return consortiums;
+    }
+
+}
diff --git a/Open-ILS/src/Android/core/src/org/evergreen_ils/views/ChooseLibraryActivity.java b/Open-ILS/src/Android/core/src/org/evergreen_ils/views/ChooseLibraryActivity.java
deleted file mode 100644
index b859cccbb1..0000000000
--- a/Open-ILS/src/Android/core/src/org/evergreen_ils/views/ChooseLibraryActivity.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package org.evergreen_ils.views;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.ActionBarActivity;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import org.evergreen_ils.R;
-import org.evergreen_ils.accountAccess.AccountAccess;
-import org.evergreen_ils.accountAccess.checkout.ItemsCheckOutListView;
-import org.evergreen_ils.accountAccess.fines.FinesActivity;
-import org.evergreen_ils.accountAccess.holds.HoldsListView;
-import org.evergreen_ils.globals.GlobalConfigs;
-import org.evergreen_ils.searchCatalog.SearchCatalogListView;
-import org.evergreen_ils.views.splashscreen.SplashActivity;
-
-/**
- * Created by kenstir on 12/28/13.
- */
-public class ChooseLibraryActivity extends ActionBarActivity {
-
-    private GlobalConfigs globalConfigs;
-
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        if (!SplashActivity.isAppInitialized()) {
-            SplashActivity.restartApp(this);
-            return;
-        }
-
-        setContentView(R.layout.activity_main);
-
-        ActionBar actionBar = getSupportActionBar();
-        actionBar.setSubtitle(AccountAccess.userName);
-
-        // singleton initialize necessary IDL and Org data
-        globalConfigs = GlobalConfigs.getGlobalConfigs(this);
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        MenuInflater inflater = getMenuInflater();
-        inflater.inflate(R.menu.menu_main, menu);
-        return super.onCreateOptionsMenu(menu);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        int id = item.getItemId();
-        if (id == R.id.action_search) {
-            startActivity(new Intent(getApplicationContext(), SearchCatalogListView.class));
-            return true;
-        }
-        return super.onOptionsItemSelected(item);
-    }
-
-    public void onButtonClick(View v) {
-        int id = v.getId();
-        if (id == R.id.account_btn_check_out) {
-            startActivity(new Intent(getApplicationContext(), ItemsCheckOutListView.class));
-
-        } else if (id == R.id.account_btn_holds) {
-            startActivity(new Intent(getApplicationContext(), HoldsListView.class));
-
-        } else if (id == R.id.account_btn_fines) {
-            startActivity(new Intent(getApplicationContext(), FinesActivity.class));
-
-            /*
-        } else if (id == R.id.account_btn_book_bags) {
-            startActivity(new Intent(getApplicationContext(), BookbagsListView.class));
-            */
-
-        } else if (id == R.id.main_btn_search) {
-            startActivity(new Intent(getApplicationContext(), SearchCatalogListView.class));
-        }
-    }
-}
-- 
2.11.0