Author: fdesbois Date: 2010-06-12 14:55:37 +0000 (Sat, 12 Jun 2010) New Revision: 511 Log: Ano #2331 : Add confirm message for finished sampleRow when user want to create a new contact Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java trunk/wao-ui/src/main/webapp/Boats.tml Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java 2010-06-12 14:43:58 UTC (rev 510) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Boats.java 2010-06-12 14:55:37 UTC (rev 511) @@ -739,6 +739,19 @@ return false; } + /** + * This method detect if the sampleRow from current elligibleBoat is finished. + * This condition is necessary for confirm message dialog, only this condition + * is needed to display the dialog message to be sure user is aware about + * this sampleRow state. + * + * @return true if the sampleRow from current elligibleBoat is finished + */ + public boolean isSampleRowFinished() { + boolean result = elligibleBoat.getSampleRow().isFinished(0); + return result; + } + public String getElligibleRowStyle() { boolean condition1 = elligibleBoat.getCompanyActive() == null && !elligibleBoat.getGlobalActive(); return condition1 || isElligibleBoatCompanyActiveFalse() ? "line-through" : ""; Modified: trunk/wao-ui/src/main/webapp/Boats.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Boats.tml 2010-06-12 14:43:58 UTC (rev 510) +++ trunk/wao-ui/src/main/webapp/Boats.tml 2010-06-12 14:55:37 UTC (rev 511) @@ -302,7 +302,9 @@ </span>  </span> <t:if t:test="canCreateNewContactFromElligibleBoat()"> - <a t:type="actionlink" t:id="addNewContactFromSampleRow" t:context="elligibleBoat.sampleRow.code"> + <a t:type="actionlink" t:id="addNewContactFromSampleRow" t:context="elligibleBoat.sampleRow.code" + t:mixins="nuiton/confirm" t:message="literal:Attention, cette ligne du plan est terminée, êtes-vous sûr de vouloir créer un nouveau contact ?" + t:condition="sampleRowFinished"> <img src="${asset:context:}/img/contact-22px.png" title="Créer un nouveau contact pour ce navire et cette ligne du plan"/> </a> <p:else>