Author: bleny Date: 2014-05-13 11:45:36 +0200 (Tue, 13 May 2014) New Revision: 1932 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1932 Log: refs #4490 replace multiple links to create contact from boat by radio form Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.jsp Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.jsp 2014-05-13 09:05:52 UTC (rev 1931) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.jsp 2014-05-13 09:45:36 UTC (rev 1932) @@ -24,6 +24,8 @@ <script> $(document).ready(function () { + // le formulaire concernant l'interlocuteur + var $boatInfosForm = $('#boat-infos-form'); var $saveBoatInfosButton = $('#save-boat-infos'); var $unlockBoatInfosFormButton = $('#unlock-boat-infos-form'); @@ -44,6 +46,9 @@ $unlockBoatInfosFormButton.attr('disabled', 'disabled'); }); + + // le calcul des sollicitations + var $boatContactsCountForm = $('#boat-contacts-count-form'); var $boatContactsCountsTable = $('#boat-contacts-counts-table'); @@ -74,6 +79,13 @@ $('#get-boat-contacts-count').click(getBoatContactsCount); $boatContactsCountForm.enterKey(getBoatContactsCount); + + // création d'un contact depuis une ligne éligible + + $('input[name="sampleRowId"]').change(function () { + $('#createContactFromBoatButton').removeAttr('disabled'); + }); + }); </script> @@ -158,22 +170,28 @@ </s:if> <s:else> <s:text name="wao.ui.boats.associatedLine"/> - <ul> - <s:iterator value="boatDetails.elligibleForSampleRows"> - <li> - <s:property value="code"/> - <s:if test="boatDetails.newContactCreatable && authenticatedWaoUser.authorizedToCreateContact"> - <s:url action="create-contact" id="createContactUrl"> - <s:param name="boatId" value="boatDetails.boatInfos.boat.topiaId"/> - <s:param name="sampleRowId" value="topiaId"/> - </s:url> - <s:a href="%{createContactUrl}"> - <s:text name="wao.ui.contacts.createFromBoat"/> - </s:a> - </s:if> - </li> - </s:iterator> - </ul> + <s:if test="boatDetails.newContactCreatable && authenticatedWaoUser.authorizedToCreateContact"> + <s:form action="create-contact"> + + <s:hidden name="boatId" value="%{boatDetails.boatInfos.boat.topiaId}"/> + + <s:radio name="sampleRowId" list="boatDetails.elligibleForSampleRows" listKey="topiaId" listValue="code" /> + + <s:submit id="createContactFromBoatButton" type="button" cssClass="btn btn-success" disabled="true"> + <i class="icon-plus"></i> + <s:text name="wao.ui.contacts.createFromBoat"/> + </s:submit> + </s:form> + </s:if> + <s:else> + <ul> + <s:iterator value="boatDetails.elligibleForSampleRows"> + <li> + <s:property value="code"/> + </li> + </s:iterator> + </ul> + </s:else> </s:else> <s:if test="authenticatedWaoUser.authorizedToCreateContact"> <div class="alert alert-info">