Skip to content

Max Mecklin / Moya

Go to a project
Commit a925af00 by Antti Tönkyrä
Options

Merge branch 'tkfftk/moya-master' 

Conflicts:
	code/MoyaWeb/src/fi/codecrew/moya/resources/i18n.properties
2 parents ffb63f69 84fcc6ec
Inline Side-by-side
Showing with 66 additions and 50 deletions
code/MoyaDatabase/src/fi/codecrew/moya/model/Bill.java
......@@ -463,3 +463,10 @@ public class Bill extends GenericEntity {
code/MoyaWeb/WebContent/admin/adduser/login.xhtml
......@@ -10,7 +10,7 @@
<f:event type="preRenderView" listener="#{authView.executeAdduserViewLogin}" />
</f:metadata>
<ui:define name="topbar">
<h:link styleClass="userbackbutton" outcome="/admin/adduser/start">
<h:link styleClass="userbackbutton" outcome="/admin/adduser/index">
<div>#{i18n['adduser.back']}</div>
</h:link>
</ui:define>
......
code/MoyaWeb/WebContent/admin/adduser/newuser.xhtml
......@@ -9,7 +9,7 @@
<f:event type="preRenderView" listener="#{userView.initCreateView}" />
</f:metadata>
<ui:define name="topbar">
<h:link styleClass="userbackbutton" outcome="/admin/adduser/start">
<h:link styleClass="userbackbutton" outcome="/admin/adduser/index">
<div>#{i18n['adduser.back']}</div>
</h:link>
</ui:define>
......
code/MoyaWeb/WebContent/admin/adduser/update.xhtml
......@@ -12,7 +12,7 @@
</f:metadata>
<ui:define name="topbar">
<h:link styleClass="userbackbutton" outcome="/admin/adduser/start">
<h:link styleClass="userbackbutton" outcome="/admin/adduser/index">
<div>#{i18n['adduser.back']}</div>
</h:link>
</ui:define>
......@@ -44,7 +44,7 @@
</h:form>
</div>
<div style="">
<h:link style="margin: 0 auto; font-size: 3em;" outcome="/admin/adduser/start" value="Valmis"/>
<h:link style="margin: 0 auto; font-size: 3em;" outcome="/admin/adduser/index" value="Valmis"/>
</div>
<script>
......
code/MoyaWeb/WebContent/admin/incoming/printCard.xhtml
......@@ -15,7 +15,9 @@
<h:form>
<p:poll interval="1" listener="#{incomingView.polledRead}" onerror="location.reload();" />
</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:panelGroup>
<user:edit id="usereditor" commitaction="#{incomingView.saveUser()}" commitvalue="#{i18n['user.save']}" camAlwaysOn="true" />
......@@ -41,9 +43,9 @@
</h:panelGrid>
<h:outputText rendered="#{empty incomingView.groupMemberships}" value="#{i18n['placegroupview.noMemberships']}" />
<h:form rendered="#{!empty incomingViewgroupMemberships}" 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>
<f:facet name="header">
......
code/MoyaWeb/WebContent/resources/templates/blipview/css/style.css
......@@ -285,4 +285,10 @@ label {
#header_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 {
color: #006600;
}
.success {
color: #006600;
}
\ No newline at end of file
code/MoyaWeb/src/fi/codecrew/moya/resources/i18n.properties
......@@ -156,8 +156,7 @@ global.notauthorized = You don't have enough rights to enter this site.
global.save = Save
httpsession.creationTime = Created
incomingflow.giveplace = Merkitse annetuksi
incomingflow.giveplace = Merkitse annetuksi
lanEventPrivateProperty.defaultValue = Default value
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.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.computerplace = Computer places
......@@ -750,7 +751,7 @@ product.shopInstant = Create automatic cashpayment
product.sort = Sort nr
product.totalPrice = Total
product.unitName = Unit name
product.vat = VAT-%
product.vat = VAT-% (0.0 - 0.99)
productFlag.CREATE_NEW_PLACE_WHEN_BOUGHT = Create new place bought
productFlag.PREPAID_CREDIT = Prepaid credit
......
code/MoyaWeb/src/fi/codecrew/moya/resources/i18n_fi.properties
......@@ -417,12 +417,13 @@ imagefile.file = Kuvatiedosto
importuser.file = Tiedosto
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
......@@ -734,7 +735,7 @@ product.shopInstant = Luo k\u00E4teismaksu tuotteille
product.sort = J\u00E4rjestys luku
product.totalPrice = Summa
product.unitName = Tuoteyksikk\u00F6
product.vat = ALV-%
product.vat = ALV-% (0.0 - 0.99)
productFlag.CREATE_NEW_PLACE_WHEN_BOUGHT = Luo uusi paikka ostettaessa
productFlag.PREPAID_CREDIT = Prepaid credit
......
code/MoyaWeb/src/fi/codecrew/moya/web/flow/IncomingView.java
......@@ -227,7 +227,7 @@ public class IncomingView extends GenericCDIView {
public ListDataModel<GroupMembership> getGroupMemberships() {
memberlist = new ListDataModel<GroupMembership>(
placegroupBean.getMembershipsAndCreations(user));
placegroupBean.getMembershipsAndCreations(userview.getUser()));
return memberlist;
}
......@@ -249,4 +249,12 @@ public class IncomingView extends GenericCDIView {
return null;
}
public void changeReader() {
namecontainer.setReaderId(null);
super.navihandler.redirectNavigation("index.jsf");
}
}
muutSoftat/AndroidBarcode/res/values-v11/styles.xml deleted 100644 → 0
<resources>
<!--
Base application theme for API 11+. This theme completely replaces
AppBaseTheme from res/values/styles.xml on API 11+ devices.
-->
<style name="AppBaseTheme" parent="android:Theme.Holo.Light">
<!-- API 11 theme customizations can go here. -->
</style>
</resources>
muutSoftat/AndroidBarcode/res/values-v14/styles.xml deleted 100644 → 0
<resources>
<!--
Base application theme for API 14+. This theme completely replaces
AppBaseTheme from BOTH res/values/styles.xml and
res/values-v11/styles.xml on API 14+ devices.
-->
<style name="AppBaseTheme" parent="android:Theme.Holo.Light.DarkActionBar">
<!-- API 14 theme customizations can go here. -->
</style>
</resources>
muutSoftat/AndroidBarcode/res/values/strings.xml
......@@ -10,6 +10,6 @@
<string name="seenInMoya">(as seen in Moya)</string>
<string name="shared_pref_readername">readername</string>
<string name="change">Change</string>
<string name="success">Success</string>
<string name="success">Success!</string>
</resources>
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.methods.HttpGet;
import org.apache.http.impl.client.DefaultHttpClient;
import android.annotation.SuppressLint;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.os.StrictMode;
import android.view.Menu;
import android.view.View;
import android.widget.Button;
......@@ -18,10 +19,16 @@ import android.widget.EditText;
import android.widget.TextView;
public class MainActivity extends Activity {
private static String URL = "http://demo.codecrew.fi/MoyaWeb/shop/rfidListener.jsf";
private static String URL = "http://lantrek.moya.fi/MoyaWeb/shop/rfidListener.jsf";
@SuppressLint("NewApi")
@Override
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);
setContentView(R.layout.activity_main);
......@@ -116,11 +123,13 @@ public class MainActivity extends Activity {
}
} catch (Exception e) {
e.printStackTrace();
throw new RuntimeException(e);
}
return false;
}
}
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!