From bleny@users.labs.libre-entreprise.org Mon Jun 15 01:51:13 2026
From: bleny@users.labs.libre-entreprise.org
To: wao-commits@list.forge.codelutin.com
Subject: [Suiviobsmer-commits] r718 - in trunk/wao-ui/src/main:
	java/fr/ifremer/wao/ui/pages webapp
Date: Thu, 28 Oct 2010 15:47:52 +0200
Message-ID: <20101028134752.AFEFA2FACE3@labs.libre-entreprise.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8873295799303479740=="

--===============8873295799303479740==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Author: bleny
Date: 2010-10-28 13:47:52 +0000 (Thu, 28 Oct 2010)
New Revision: 718

Log:
better presentation of global synthesis result

Modified:
   trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java
   trunk/wao-ui/src/main/webapp/Synthesis.tml

Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java
=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=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
--- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java	2010-10=
-28 09:51:54 UTC (rev 717)
+++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Synthesis.java	2010-10=
-28 13:47:52 UTC (rev 718)
@@ -24,6 +24,7 @@
=20
 package fr.ifremer.wao.ui.pages;
=20
+import fr.ifremer.wao.bean.GlobalIndicatorValue;
 import fr.ifremer.wao.bean.GlobalSynthesisResult;
 import fr.ifremer.wao.bean.SynthesisId;
 import fr.ifremer.wao.WaoException;
@@ -511,4 +512,18 @@
         return getDataReliability().get(user.getCompany());
     }
=20
+    /********************* GLOBAL SYNTHESIS ********************************=
***/
+
+    @Property
+    private GlobalIndicatorValue globalLevels[] =3D GlobalIndicatorValue.val=
ues();
+
+    /* variable used in template */
+    @Property
+    private GlobalIndicatorValue globalLevel;
+
+    public boolean highlightGlobalLevel() {
+        return globalLevel =3D=3D getGlobalSynthesisResult().getGlobalLevel(=
);
+    }
+
+
 }
\ No newline at end of file

Modified: trunk/wao-ui/src/main/webapp/Synthesis.tml
=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=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
--- trunk/wao-ui/src/main/webapp/Synthesis.tml	2010-10-28 09:51:54 UTC (rev 7=
17)
+++ trunk/wao-ui/src/main/webapp/Synthesis.tml	2010-10-28 13:47:52 UTC (rev 7=
18)
@@ -362,7 +362,25 @@
                 <t:indicatorLevels t:indicator=3D"activeIndicator" t:highlig=
htLevel=3D"activeIndicatorLevel" />
             </t:loop>
=20
-            Bilan de la synth=C3=A8se globale : ${globalSynthesisResult.glob=
alLevel}
+            <table class=3D"indicatorLevels">
+                <tbody>
+                    <tr>
+                        <t:loop t:source=3D"globalLevels" t:value=3D"globalL=
evel">
+                            <t:if test=3D"highlightGlobalLevel()">
+                                <td class=3D"highlight selected">
+                                    ${globalLevel}
+                                </td>
+                                <p:else>
+                                    <td>
+                                        ${globalLevel}
+                                    </td>
+                                </p:else>
+                            </t:if>
+                        </t:loop> =20
+                    </tr>
+                </tbody>
+            </table>
+
         </div>
     </t:block>
 </t:layout>


--===============8873295799303479740==--