I hope these are needed

code/MoyaWeb/WebContent/admin/incoming/printCard.xhtml

@@ -15,7 +15,9 @@
 			<h:form>
 			<h:form>
 				<p:poll interval="1" listener="#{incomingView.polledRead}" onerror="location.reload();" /> 
 				<p:poll interval="1" listener="#{incomingView.polledRead}" onerror="location.reload();" /> 
 			</h:form>
 			</h:form>
-			<h1>#{i18n['incomingflow.userdetails']} (RFID-lukija: #{incomingView.readerId})</h1>
+			<h:form>
+			<h1>#{i18n['incomingflow.userdetails']} (RFID-lukija: #{incomingView.readerId})</h1><h:commandButton action="#{incomingView.changeReader}" value="#{i18n['incomingflow.changereader']}"  />
+			</h:form>
 			<h:panelGrid id="cropper" columns="3">
 			<h:panelGrid id="cropper" columns="3">
 				<h:panelGroup>
 				<h:panelGroup>
 					<user:edit id="usereditor"  commitaction="#{incomingView.saveUser()}" commitvalue="#{i18n['user.save']}" camAlwaysOn="true" />
 					<user:edit id="usereditor"  commitaction="#{incomingView.saveUser()}" commitvalue="#{i18n['user.save']}" camAlwaysOn="true" />
@@ -43,7 +45,7 @@
 			<h:outputText rendered="#{empty incomingView.groupMemberships}" value="#{i18n['placegroupview.noMemberships']}" />
 			<h:outputText rendered="#{empty incomingView.groupMemberships}" value="#{i18n['placegroupview.noMemberships']}" />
 			<h:form rendered="#{!empty incomingView.groupMemberships}" id="placelistform">	
 			<h:form rendered="#{!empty incomingView.groupMemberships}" id="placelistform">	
 
 
-				<p:dataTable value="#{incomingView.groupMemberships}" var="member">
+				<p:dataTable value="#{incomingView.groupMemberships}" var="member" rowStyleClass="#{member.enteredEvent != null ? 'success':''}">
 
 
 					<p:column>
 					<p:column>
 						<f:facet name="header">
 						<f:facet name="header">

code/MoyaWeb/WebContent/resources/templates/blipview/css/style.css

@@ -285,4 +285,10 @@ label {
 
 
 #header_right {
 #header_right {
 	text-align: right;
 	text-align: right;
+}
+
+
+
+.success {
+	color: #006600;
 }
 }
\ No newline at end of file

code/MoyaWeb/WebContent/resources/templates/custom_components.css

@@ -111,4 +111,8 @@
 
 
 .paid {
 .paid {
 	color: #006600;
 	color: #006600;
+}
+
+.success {
+	color: #006600;
 }
 }
\ No newline at end of file

code/MoyaWeb/src/fi/codecrew/moya/resources/i18n.properties

@@ -157,7 +157,7 @@ global.save                 = Save
 
 
 httpsession.creationTime = Created
 httpsession.creationTime = Created
 
 
-incomingflow.giveplace   = Merkitse annetuksi
+incomingflow.giveplace    = Merkitse annetuksi
 
 
 lanEventPrivateProperty.defaultValue          = Default value
 lanEventPrivateProperty.defaultValue          = Default value
 lanEventPrivateProperty.editProperty          = Edit property
 lanEventPrivateProperty.editProperty          = Edit property

code/MoyaWeb/src/fi/codecrew/moya/resources/i18n_en.properties

@@ -408,12 +408,13 @@ imagefile.file        = Imagefile
 importuser.file     = File
 importuser.file     = File
 importuser.template = Template
 importuser.template = Template
 
 
-incomingflow.barcode     = Barcode
-incomingflow.giveplace   = Mark given
-incomingflow.multisearch = Multisearch
-incomingflow.search      = Search
-incomingflow.ungiveplace = Mark not given
-incomingflow.userdetails = User details
+incomingflow.barcode      = Barcode
+incomingflow.changereader = Change Reader
+incomingflow.giveplace    = Mark given
+incomingflow.multisearch  = Multisearch
+incomingflow.search       = Search
+incomingflow.ungiveplace  = Mark not given
+incomingflow.userdetails  = User details
 
 
 infoview.back          = Back
 infoview.back          = Back
 infoview.computerplace = Computer places
 infoview.computerplace = Computer places

code/MoyaWeb/src/fi/codecrew/moya/resources/i18n_fi.properties

@@ -417,12 +417,13 @@ imagefile.file        = Kuvatiedosto
 importuser.file     = Tiedosto
 importuser.file     = Tiedosto
 importuser.template = Malli
 importuser.template = Malli
 
 
-incomingflow.barcode     = Viivakoodi
-incomingflow.giveplace   = Merkitse annetuksi
-incomingflow.multisearch = Monihaku
-incomingflow.search      = Etsi
-incomingflow.ungiveplace = Ei olekkaan annettu
-incomingflow.userdetails = K\u00E4ytt\u00E4j\u00E4n tiedot
+incomingflow.barcode      = Viivakoodi
+incomingflow.changereader = Vaihda lukijaa
+incomingflow.giveplace    = Merkitse annetuksi
+incomingflow.multisearch  = Monihaku
+incomingflow.search       = Etsi
+incomingflow.ungiveplace  = Ei olekkaan annettu
+incomingflow.userdetails  = K\u00E4ytt\u00E4j\u00E4n tiedot
 
 
 index.title = Etusivu
 index.title = Etusivu
 
 

code/MoyaWeb/src/fi/codecrew/moya/web/flow/IncomingView.java

@@ -249,4 +249,12 @@ public class IncomingView extends GenericCDIView {
 		return null;
 		return null;
 	}
 	}
 
 
+
+	public void changeReader() {
+		namecontainer.setReaderId(null);
+		super.navihandler.redirectNavigation("index.jsf");
+	}
+	
+	
+
 }
 }

muutSoftat/AndroidBarcode/src/fi/codecrew/androidbarcode/MainActivity.java

@@ -5,12 +5,13 @@ import org.apache.http.HttpResponse;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.impl.client.DefaultHttpClient;
 import org.apache.http.impl.client.DefaultHttpClient;
-
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Context;
 import android.content.Intent;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.os.Bundle;
+import android.os.StrictMode;
 import android.view.Menu;
 import android.view.Menu;
 import android.view.View;
 import android.view.View;
 import android.widget.Button;
 import android.widget.Button;
@@ -20,8 +21,14 @@ import android.widget.TextView;
 public class MainActivity extends Activity {
 public class MainActivity extends Activity {
 	private static String URL = "http://lantrek.moya.fi/MoyaWeb/shop/rfidListener.jsf";
 	private static String URL = "http://lantrek.moya.fi/MoyaWeb/shop/rfidListener.jsf";
 
 
+	@SuppressLint("NewApi")
 	@Override
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 	protected void onCreate(Bundle savedInstanceState) {
+		if (android.os.Build.VERSION.SDK_INT > 9) {
+		    StrictMode.ThreadPolicy policy = new StrictMode.ThreadPolicy.Builder().permitAll().build();
+			StrictMode.setThreadPolicy(policy);
+		}
+		
 		super.onCreate(savedInstanceState);
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.activity_main);
 		setContentView(R.layout.activity_main);
 
 
@@ -116,11 +123,13 @@ public class MainActivity extends Activity {
 		    }
 		    }
 		} catch (Exception e) {
 		} catch (Exception e) {
 		    e.printStackTrace();
 		    e.printStackTrace();
+		    throw new RuntimeException(e);
 		}
 		}
 		
 		
 		return false;
 		return false;
 	}
 	}
 
 
+	
 }
 }