From gitlab@mg.gitlab.com Fri Dec 1 18:20:06 2023 From: "Tony CHEMIT (@tchemit)" To: observe-commits@list.forge.codelutin.com Subject: [Observe-commits] [Git][ultreiaio/ird-observe][develop] 2 commits: introduce ColumnRendererConsumer and ColumnRendererParameters API (add gson adapter) - See #2811 Date: Fri, 01 Dec 2023 17:20:03 +0000 Message-ID: <656a15c35788d_2c9ae8472548@gitlab-sidekiq-low-urgency-cpu-bound-v2-5f97d8754-6dgmr.mail> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3728604556602891638==" --===============3728604556602891638== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: fa6a51cc by Tony Chemit at 2023-12-01T18:19:29+01:00 introduce ColumnRendererConsumer and ColumnRendererParameters API (add gson a= dapter) - See #2811 - - - - - 515c32c1 by Tony Chemit at 2023-12-01T18:19:29+01:00 Add DataMatrix gson adapter (to reduce format) - See #2811 - - - - - 5 changed files: - client/datasource/actions/src/main/i18n/templates/reportHtmlExport_en_GB.ftl - client/datasource/actions/src/main/i18n/templates/reportHtmlExport_es_ES.ftl - client/datasource/actions/src/main/i18n/templates/reportHtmlExport_fr_FR.ftl - + toolkit/api-report/src/main/java/fr/ird/observe/report/json/ReportColumnR= enderersParametersAdapter.java - + toolkit/api/src/main/java/fr/ird/observe/spi/json/java4all/DataMatrixAdap= ter.java Changes: =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D client/datasource/actions/src/main/i18n/templates/reportHtmlExport_en_GB.ftl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D @@ -273,6 +273,23 @@ }, 50); } =20 + function deserializeJson(json) { + let height =3D json.height; + let width =3D json.width; + let data =3D json.rows; + let result =3D new Array(height); + for (let row =3D 0; row < height; row++) { + let cells =3D data[row].split('||'); + let realRow =3D new Array(width); + result[row]=3DrealRow; + for (let column =3D 0; column < width; column++) { + let rowElement =3D cells[column]; + realRow[column] =3D rowElement =3D=3D=3D'$'?null:rowElem= ent; + } + } + return result; + } + <#list .data_model.columnRendererFunctions as key> ${key} =20 @@ -348,6 +365,7 @@ ${key} =20