From: drizea <danielrizea27@gmail.com>
Date: Sun, 8 Jul 2012 16:42:03 +0000 (+0300)
Subject: availabillity function added, must add fragment for ui display
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=0e69115c81f3a1f100b2473dec18202539e6d5d8;p=working%2FEvergreen.git

availabillity function added, must add fragment for ui display
---

diff --git a/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/SearchCatalog.java b/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/SearchCatalog.java
index 3d613b4585..a7f7f15606 100644
--- a/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/SearchCatalog.java
+++ b/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/SearchCatalog.java
@@ -50,7 +50,7 @@ public class SearchCatalog {
 	*/
 	public static String METHOD_COPY_LOCATION_COUNTS = "open-ils.search.biblio.copy_location_counts.summary.retrieve";
 
-	
+	public static SearchCatalog searchCatalogSingleton = null;
 	/** The conn. */
 	public HttpConnection conn;
 	
@@ -60,25 +60,32 @@ public class SearchCatalog {
 	
 	//the org on witch the searches will be made
 	/** The selected organization. */
-	private Organisation selectedOrganization = null;
-	
-	private Context context;
-	
+	public Organisation selectedOrganization = null;
+
 	public Integer offset;
 	
 	public Integer visible;
 	
 	public Integer searchLimit = 10;
 	
+	
+	
+	public static SearchCatalog getInstance(){
+		
+		if(searchCatalogSingleton == null){
+			searchCatalogSingleton = new SearchCatalog();
+		}
+		
+		return searchCatalogSingleton;
+	}
 	/**
 	 * Instantiates a new search catalog.
 	 *
 	 * @param httpAddress the http address
 	 * @param locale the locale
 	 */
-	public SearchCatalog(Context context) {
+	private SearchCatalog() {
 		super();
-		this.context = context;
 		try{
 			// configure the connection
 			conn = new HttpConnection(GlobalConfigs.httpAddress+"/osrf-gateway-v1");
@@ -265,6 +272,13 @@ public class SearchCatalog {
 	}
 
 	
+	public Object getLocationCount(Integer recordID, Integer orgID, Integer orgDepth){
+		
+		List<?> list = (List<?>)Utils.doRequest(conn, SERVICE, METHOD_COPY_LOCATION_COUNTS, new Object[]{recordID, orgID, orgDepth});
+		
+		return list;
+	}
+	
 	/**
 	 * Select 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 42127c6877..677e9a2425 100644
--- a/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/SearchCatalogListView.java
+++ b/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/SearchCatalogListView.java
@@ -78,7 +78,7 @@ public class SearchCatalogListView extends Activity{
         globalConfigs = GlobalConfigs.getGlobalConfigs(this);
         
         context = this;
-        search = new SearchCatalog(this);
+        search = SearchCatalog.getInstance();
                 
         recordList= new ArrayList<RecordInfo>();
 
@@ -179,7 +179,8 @@ public class SearchCatalogListView extends Activity{
 	    			Intent intent = new Intent(getBaseContext(),TabsView.class);
 	    			//serialize object and pass it to next activity
 	    			intent.putExtra("recordInfo", info);
-	    			
+	    			intent.putExtra("orgID",search.selectedOrganization.id);
+	    			intent.putExtra("depth",(search.selectedOrganization.level-1));
 	    			startActivity(intent);
     			}
     		}
diff --git a/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/TabsView.java b/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/TabsView.java
index 37f06f162d..f3063ed570 100644
--- a/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/TabsView.java
+++ b/Open-ILS/src/Android/src/org/evergreen/android/searchCatalog/TabsView.java
@@ -17,6 +17,8 @@ public class TabsView extends BaseSampleActivity {
     private static final String[] CONTENT = new String[] { "Details", "Advanced"};
 
     
+    private SearchCatalog search;
+    
     private RecordInfo record;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -25,9 +27,15 @@ public class TabsView extends BaseSampleActivity {
 
         record = (RecordInfo) getIntent().getSerializableExtra("recordInfo");
 		
+        Integer orgID = getIntent().getIntExtra("orgID", -1);
+        Integer orgDepth = getIntent().getIntExtra("depth", -1);
         
         mAdapter = new SearchFragmentAdapter(getSupportFragmentManager());
 
+        search = SearchCatalog.getInstance();
+        search.getLocationCount(record.doc_id, orgID, orgDepth);
+        
+        
         
         //mAdapter.getItem(0).