Codecrew / Moya

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.

Authkoodin generointi ja piirto + restapi ja yksi bugikorjaus

Authkoodin generointi ja piirtäminen kortille sekä restapi käyttäjän hakemiseksi koodilla. Korjattu myös templaten asettaminen CardTemplateDataEditViewin initView():ssä silloin kun cardObjectDataId tai cardTextDataId on annettu parametrinä.

/MoyaWeb/rest/meta/v1/<type>/<id>/<path...>

…fields. Also fix Returning Policy to make SQL more performant.

BROKEN DDL generation (missing SERIAL fields now. Sorry. Eclipselink fought back!)

- Korjattu bugi korttidatan muokkauksesta

Card fixes

misc. card fixes, see commit messages

- Do not try to flush PDF if there are no contents in it (will throw exception), besides we don't use the result since we throw out ourselves
- We can log the error even when there is no mail address
- In case we hit an user with too much power on their card, revoke the old card (set it to disabled) and try to refresh with a better one
- Remove unneeded flush (what is this supposed to do?)

- biggestCard = card; card must be enabled in order to enter this if branch thus setEnabled is extraneous in this case

Master

Lisäominaisuuksia liittyen korttien printtaamiseen ja käyttäjien kuvien tarkasteluun.

This reverts commit 2c78c6fc.

Conflicts:
	code/MoyaDatabase/src/fi/codecrew/moya/model/User.java
	code/MoyaWeb/WebContent/useradmin/charts.xhtml
	code/MoyaWeb/WebContent/useradmin/list.xhtml
	code/MoyaWeb/src/fi/codecrew/moya/web/cdiview/user/ChartView.java

- viilailuja käyttäjien tarkastusnäkymään

…ecteja, mitkä renderlidään kortille.
- Tarkastusnäkymän Reject-napin korjaus. Tila muuttuu rejectoiduksi ja siitä voi lähettää sähköpostia käyttäjälle.
- Lisätty tarkastusnäkymälistaukseen käyttäjän puhelinnumero ja sähköpostiosoite

Conflicts:
	code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/BootstrapBean.java
	code/MoyaDatabase/src/META-INF/persistence.xml

Calculation of age fixed
Data for cardTemplate

Rest auth fix

kattonu: @tkfftk

Networkassociation

oh god

Reviewed-by: @tuomari