From: drizea <danielrizea27@gmail.com>
Date: Sun, 24 Jun 2012 21:51:33 +0000 (+0300)
Subject: Checkout button renewal added
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=1793fe979753edd8d14680345aacd02021a9b5a5;p=working%2FEvergreen.git

Checkout button renewal added
---

diff --git a/Open-ILS/src/Android/res/layout/checkout_list_item.xml b/Open-ILS/src/Android/res/layout/checkout_list_item.xml
index 5c2845327c..1ad3164001 100644
--- a/Open-ILS/src/Android/res/layout/checkout_list_item.xml
+++ b/Open-ILS/src/Android/res/layout/checkout_list_item.xml
@@ -3,18 +3,21 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:gravity="left|center"
-   	android:paddingBottom="3px"
-	android:paddingTop="3px" 
-	android:paddingLeft="3px" 
+   	android:paddingBottom="3dip"
+	android:paddingTop="3dip" 
+	android:paddingLeft="3dip" 
     android:orientation="horizontal" >
 
 	<LinearLayout 
-	android:layout_width="wrap_content"
-    android:layout_height="fill_parent"
+	android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
     android:orientation="vertical"
     android:gravity="center_vertical" 
 	android:paddingLeft="4dip"
 	>
+	
+	
+	    
 		<TextView
 		android:id="@+id/checkout_record_title"
 		style="@style/TitleSearchStyleList"
@@ -37,7 +40,17 @@
 		android:id="@+id/checkout_due_date"
 		style="@style/PubSearchStyleList"
 		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"/>
-
+		android:layout_height="wrap_content"
+		android:text="due date"
+		/>
+		
 	</LinearLayout>
+		<Button 
+		 android:id="@+id/renew_button"
+		 android:layout_width="wrap_content"
+		 android:layout_height="wrap_content"
+		 android:text="@string/renew_button" 
+		 android:layout_gravity="right"  
+		    />
+
 </LinearLayout>
\ No newline at end of file
diff --git a/Open-ILS/src/Android/res/values/strings.xml b/Open-ILS/src/Android/res/values/strings.xml
index e60cab9168..38cd02e1fc 100644
--- a/Open-ILS/src/Android/res/values/strings.xml
+++ b/Open-ILS/src/Android/res/values/strings.xml
@@ -12,4 +12,6 @@
     <string name="title_fines">Fines</string>
     <string name="title_book_bags">Book bags</string>
     <string name="search_result_text"> Search result :</string>
+    <string name="renew_button">renew</string>
+    
 </resources>
\ 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 1985ae1502..973b3c2810 100644
--- a/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/AccountAccess.java
+++ b/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/AccountAccess.java
@@ -363,8 +363,10 @@ public class AccountAccess {
 
 		String seed = null;
 
+		System.out.println("Send request to " + httpAddress);
 		Object resp  = (Object) Utils.doRequest(conn, SERVICE_AUTH, METHOD_AUTH_INIT, new Object[]{userName});
-		seed = resp.toString();
+		if(resp != null)
+			seed = resp.toString();
 		
 		System.out.println("Seed " + seed);
 		
@@ -396,7 +398,9 @@ public class AccountAccess {
 		System.out.println("Compelx param " + complexParam);
 		
 		Object resp  =  Utils.doRequest(conn, SERVICE_AUTH, METHOD_AUTH_COMPLETE, new Object[]{complexParam});
-
+		if(resp == null)
+			return false;
+		
 			String queryResult = ((Map<String,String>) resp).get("textcode");
 			 
 			System.out.println("Result " + queryResult);
@@ -557,14 +561,22 @@ public class AccountAccess {
 	/* Method used to renew a circulation record based on target_copy_id
 	 * Returns many objects, don't think they are needed
 	 */
-	private void renewCirc(Integer target_copy){
+	public void renewCirc(Integer target_copy) throws MaxRenewalsException{
 		
 		HashMap<String,Integer> complexParam = new HashMap<String, Integer>();
 		complexParam.put("patron", this.userID);		
 		complexParam.put("copyid", target_copy);
 		complexParam.put("opac_renewal", 1);
 		
-		OSRFObject a_lot = (OSRFObject) Utils.doRequest(conn, SERVICE_CIRC, METHOD_RENEW_CIRC, new Object[]{complexParam});
+		Object a_lot = (Object) Utils.doRequest(conn, SERVICE_CIRC, METHOD_RENEW_CIRC, new Object[]{authToken,complexParam});
+		
+		Map<String,String> resp = (Map<String,String>)a_lot;
+		
+		if(resp.get("textcode") != null){
+			if(resp.get("textcode").equals("MAX_RENEWALS_REACHED"))
+				throw new MaxRenewalsException();
+		}
+		
 		
 	}
 
diff --git a/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/CircRecord.java b/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/CircRecord.java
index d36693a528..83be720a6f 100644
--- a/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/CircRecord.java
+++ b/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/CircRecord.java
@@ -97,14 +97,21 @@ public class CircRecord {
 		return title;
 	}
 	
-	public String getRenewals(){
-		
+	public Integer getRenewals(){
+
 		if(circ != null)
-			circ.getInt("renewal_remaining");
+			return circ.getInt("renewal_remaining");
 			
 		return null;
 	}
 	
+	public Integer getTargetCopy(){
+		if(circ != null)
+			return circ.getInt("target_copy");
+		
+		return null;
+	}
+	
 	private void parseDate(OSRFObject circ){
 		
 		final SimpleDateFormat sdf = new SimpleDateFormat(datePattern);
diff --git a/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/ItemsCheckOutListView.java b/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/ItemsCheckOutListView.java
index 053fb36803..bcdb9c0a5b 100644
--- a/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/ItemsCheckOutListView.java
+++ b/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/ItemsCheckOutListView.java
@@ -4,21 +4,20 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.evergreen.android.R;
-import org.evergreen.android.globals.GlobalConfigs;
-import org.evergreen.android.searchCatalog.RecordInfo;
-import org.opensrf.util.OSRFObject;
 
 import android.app.Activity;
+import android.app.ProgressDialog;
 import android.content.Context;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
-import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
+import android.widget.Toast;
 
 public class ItemsCheckOutListView extends Activity{
 
@@ -31,6 +30,10 @@ public class ItemsCheckOutListView extends Activity{
 	private CheckOutArrayAdapter listAdapter = null;
 
 	private ArrayList<CircRecord> circRecords = null;
+
+	private Context context;
+	
+	private ProgressDialog progressDialog;
 	
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
@@ -39,6 +42,7 @@ public class ItemsCheckOutListView extends Activity{
 		
 		setContentView(R.layout.checkout_list);
 		
+		context = this;
 		accountAccess = AccountAccess.getAccountAccess();
 		
 		lv = (ListView) findViewById(R.id.checkout_items_list);
@@ -49,12 +53,11 @@ public class ItemsCheckOutListView extends Activity{
 		lv.setAdapter(listAdapter);
 		
 
-
+		
 		listAdapter.notifyDataSetChanged();
 
 	}
 	
-	
 	  class CheckOutArrayAdapter extends ArrayAdapter<CircRecord> {
 	    	private static final String tag = "CheckoutArrayAdapter";
 	    	
@@ -62,6 +65,7 @@ public class ItemsCheckOutListView extends Activity{
 	    	private TextView recordAuthor;
 	    	private TextView recordDueDate;
 	    	private TextView recordRenewals;
+	    	private TextView renewButton;
 	    	
 	    	private List<CircRecord> records = new ArrayList<CircRecord>();
 
@@ -83,7 +87,7 @@ public class ItemsCheckOutListView extends Activity{
 	    		View row = convertView;
 	    		
 	    		// Get item
-	    		CircRecord record = getItem(position);
+	    		final CircRecord record = getItem(position);
 	    		
 	    		
 	    		if(record == null)
@@ -120,12 +124,72 @@ public class ItemsCheckOutListView extends Activity{
 		    
 		    		//Get remaining renewals
 		    		recordRenewals = (TextView) row.findViewById(R.id.checkout_renewals_remaining);
+		    		
+		    		renewButton = (TextView) row.findViewById(R.id.renew_button);
+		    		
+		    		renewButton.setText("renew : " + record.getRenewals());
+		    		
+		    		renewButton.setOnClickListener(new OnClickListener() {
+						
+						@Override
+						public void onClick(View v) {
+								
+								Thread renew = new Thread(new Runnable() {
+									
+									@Override
+									public void run() {
+										boolean refresh = true;
+										AccountAccess ac = AccountAccess.getAccountAccess();
+										
+										runOnUiThread(new Runnable() {	
+											@Override
+											public void run() {
+												progressDialog = new ProgressDialog(context);
+												progressDialog.show(context, "Renew item", "Please wait");
+											}
+										});
+										
+										try{
+											ac.renewCirc(record.getTargetCopy());
+										}catch(MaxRenewalsException e){
+											runOnUiThread(new Runnable() {
+												
+												@Override
+												public void run() {
+													progressDialog.dismiss();
+													Toast.makeText(context, "Max renewals reached", Toast.LENGTH_SHORT).show();
+												}
+											});
+											
+											refresh = false;
+										}
+										if(refresh){
+											circRecords = accountAccess.getItemsCheckedOut();
+											listAdapter.clear();
+											for(int i=0;i<circRecords.size();i++){
+												listAdapter.add(circRecords.get(i));
+											}
+											runOnUiThread(new Runnable() {
+												
+												@Override
+												public void run() {
+													progressDialog.dismiss();
+													listAdapter.notifyDataSetChanged();
+												}
+											});
+										}
+									}
+								});
+								
+								renew.start();
+						}
+					});
 		    		//set text
 		    		System.out.println("Row" + record.getTitle() + " " + record.getAuthor() + " " + record.getDueDate() + " " + record.getRenewals());
 		    		recordTitle.setText(record.getTitle());
 		    		recordAuthor.setText(record.getAuthor());
 		    		recordDueDate.setText(record.getDueDate());
-		    		recordRenewals.setText(record.getRenewals());
+		    		recordRenewals.setText(record.getRenewals()+"");
 	    		}
 	    		
 	    		return row;
diff --git a/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/MaxRenewalsException.java b/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/MaxRenewalsException.java
new file mode 100644
index 0000000000..5b2eaaafab
--- /dev/null
+++ b/Open-ILS/src/Android/src/org/evergreen/android/accountAccess/MaxRenewalsException.java
@@ -0,0 +1,10 @@
+package org.evergreen.android.accountAccess;
+
+public class MaxRenewalsException extends Exception{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+}
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 d6db656059..efc64c2c7d 100644
--- 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,16 +1,19 @@
 package org.evergreen.android.globals;
 
 import java.io.InputStream;
-import java.lang.reflect.Array;
 import java.util.ArrayList;
 import java.util.StringTokenizer;
 
 import org.evergreen.android.accountAccess.AccountAccess;
 import org.evergreen.android.searchCatalog.Organisation;
+import org.evergreen.android.views.ApplicationPreferences;
 import org.open_ils.idl.IDLParser;
 
+import android.app.AlertDialog;
 import android.content.Context;
+import android.content.Intent;
 import android.content.SharedPreferences;
+import android.net.ConnectivityManager;
 import android.preference.PreferenceManager;
 import android.util.Log;
 
@@ -59,6 +62,18 @@ public class GlobalConfigs {
 			SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
 			GlobalConfigs.httpAddress = preferences.getString("library_url", "");
 			
+			System.out.println("Check for network conenctivity");
+			try{
+				Utils.checkNetworkStatus((ConnectivityManager)context.getSystemService(Context.CONNECTIVITY_SERVICE), context);
+			}catch(NoNetworkAccessException e){
+				
+			}catch(NoAccessToHttpAddress e){
+
+				System.out.println("No access to network");
+				Intent preferencesAnctivity = new Intent(context, ApplicationPreferences.class);
+				context.startActivity(preferencesAnctivity);
+			}
+			
 			loadIDLFile();
 			getOrganisations();
 		
@@ -97,6 +112,7 @@ public class GlobalConfigs {
 		
 		String orgFile = null;
 		try{
+			//using https: address
 			orgFile = Utils.getNetPageContent(httpAddress+collectionsRequest);
 			System.out.println("Request org " + httpAddress + collectionsRequest );
 		}catch(Exception e){};
@@ -107,6 +123,9 @@ public class GlobalConfigs {
 			organisations = new ArrayList<Organisation>();
 			
 			System.out.println("Page content " + orgFile);
+			//in case of wrong file
+			if(orgFile.indexOf("=") == -1)
+				return;
 			
 			String orgArray = orgFile.substring( orgFile.indexOf("=")+1, orgFile.indexOf(";"));  
 			
diff --git a/Open-ILS/src/Android/src/org/evergreen/android/globals/Utils.java b/Open-ILS/src/Android/src/org/evergreen/android/globals/Utils.java
index 333dc345ca..13b41eb556 100644
--- a/Open-ILS/src/Android/src/org/evergreen/android/globals/Utils.java
+++ b/Open-ILS/src/Android/src/org/evergreen/android/globals/Utils.java
@@ -135,12 +135,12 @@ public class Utils {
 		        }
 		}
 
+		System.out.println("Network access " + networkAccessEnabled);
 		
 		if(networkAccessEnabled){
 			//check to see if httpAddress is avaialble using the network connection 
 			// 2 seconds timeout
 			httpAddressAccessReachable = checkIfNetAddressIsReachable(GlobalConfigs.httpAddress);
-		
 			if(httpAddressAccessReachable == false)
 				throw new NoAccessToHttpAddress();
 		}
@@ -161,11 +161,12 @@ public class Utils {
 
 		    HttpParams httpParameters = new BasicHttpParams();  
 
-		    //timeout to 3 seconds
-		    HttpConnectionParams.setConnectionTimeout(httpParameters, 3000);
+		    //timeout to 1 seconds
+		    HttpConnectionParams.setConnectionTimeout(httpParameters, 1000);
 		    HttpClient httpClient = new DefaultHttpClient(httpParameters);
 		    HttpResponse response = httpClient.execute(request);
 
+		    //System.out.println("Check network response" + response);
 		    int status = response.getStatusLine().getStatusCode();
 
 		    if (status == HttpStatus.SC_OK)