Codecrew / Moya

Networkassoc horizon

kattonu @tkfftk

Conflicts:
	code/MoyaWeb/WebContent/info/incoming.xhtml
	code/MoyaWeb/WebContent/info/shop.xhtml
	code/MoyaWeb/src/fi/codecrew/moya/web/cdiview/reader/ReaderView.java
	code/MoyaWeb/src/fi/codecrew/moya/web/flow/IncomingView.java
	code/MoyaWeb/src/fi/codecrew/moya/web/flow/InfoView.java
	code/MoyaWeb/src/fi/codecrew/moya/web/flow/flowShopView.java

Networkassoc features

Vilkuillut @tkfftk

Metatukea eventusereille

Vilkuili läpi @tkfftk

Networkassoc dbfix

wtf happened here...

forceCrop()

Rest fix

Korjasin ongelman liittyen siihen ettei restistä tulevaan dataan tullut eventUseria matkaan kun luettiin lipputositteen viivakoodi.

PrimeFaces

MoyaWeb uses PrimeFaces 5.0, MoyaEventMgmtWeb and MoyaTerminalWeb still use 5.0-RC2. Update to 5.0.

the projects.

Merge branch 'master' of gitlab.codecrew.fi:codecrew/moya into devel

Fix event log id field name

EventLog is GenericEntity, thus it's id field is "id", but in database the field is "log_id". It has accidentally worked because the SW used to do `SELECT lastval()` after insert. Now with ReturningPolicy `RETURNING id` fails.

Billextrainfo

Palautetaan infokentät laskuihin. ( Näkyvät vain jos enabloitu tapahtuman asetuksista)

…and MoyaTerminalWeb did not. Set LF delimiters for them too.

Feature/meta rest and db

The META REST API:

Setting:
curl -XPOST -H 'Content-Type: application/json' --data-ascii '{"setting-a":1}' http://localhost:8080/MoyaWeb/rest/meta/printedcard/2247/module1-settings
curl -XPOST -H 'Content-Type: application/json' --data-ascii '{"type":"ladyfit", "size":"S"}' http://localhost:8080/MoyaWeb/rest/meta/printedcard/2247/shirt-preference

Getting:
curl http://localhost:8080/MoyaWeb/rest/meta/printedcard/2247/ => {"shirt-preference":{"type":...,"size":...}}
curl http://localhost:8080/MoyaWeb/rest/meta/printedcard/2247/shirt-preference => {"type":...,"size":...}
curl http://localhost:8080/MoyaWeb/rest/meta/printedcard/2247/foo/bar

ALSO:
- Fixed Changed Fields Optimistic Locking policy to NOT to try compare JSON fields on UPDATE (cannot compare json objects in PostgreSQL, tries to do UPDATE table SET meta='{"foo":1}' WHERE id = 23 AND meta = '{"foo":2}'; or so and explodes)
- Fixed Returning Policy to do INSERT ... RETURNING id;
- BROKER DDL GENERATION: does not currently do "id SERIAL" but "id INTEGER" because eclipselink assumes too much.