Author: bleny Date: 2014-04-04 12:30:25 +0200 (Fri, 04 Apr 2014) New Revision: 1835 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1835 Log: refs 4490 add boatinfos form in boat details jsp Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerBoatsService.java trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boats.jsp trunk/wao-web/src/main/webapp/wao.css Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerBoatsService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerBoatsService.java 2014-04-04 07:37:55 UTC (rev 1834) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsMerBoatsService.java 2014-04-04 10:30:25 UTC (rev 1835) @@ -157,10 +157,13 @@ Company company = getCompanyDao().findByTopiaId(companyId); boatInfos = dao.create(BoatInfos.PROPERTY_BOAT, boat, BoatInfos.PROPERTY_COMPANY, company); + commit(); } Contact mostRecentContact = getContactDao().findMostRecentContactOrNull(obsProgram, boatId, companyId); + long count = getContactDao().newQueryBuilder().addTopiaIdEquals(Contact.PROPERTY_BOAT, boatId).count(); + BoatDetails boatDetails = new BoatDetails(boatInfos, mostRecentContact); return boatDetails; Modified: trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties =================================================================== --- trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-04-04 07:37:55 UTC (rev 1834) +++ trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-04-04 10:30:25 UTC (rev 1835) @@ -143,6 +143,15 @@ wao.ui.field.Boat.portOfRegistry=Port of registry wao.ui.field.Boat.shipOwner=Shipowner wao.ui.field.BoatDistrict.code=District code +wao.ui.field.BoatInfos.comment=Comment +wao.ui.field.BoatInfos.contactAddress1=Address +wao.ui.field.BoatInfos.contactAddress2=Address 2 +wao.ui.field.BoatInfos.contactCity=City +wao.ui.field.BoatInfos.contactEmail=Email +wao.ui.field.BoatInfos.contactFirstName=First name +wao.ui.field.BoatInfos.contactLastName=Last name +wao.ui.field.BoatInfos.contactPhoneNumber=Phone +wao.ui.field.BoatInfos.contactPostalCode=Postal code wao.ui.field.BoatInfos.dup=Capacity of the ship in specialized staff wao.ui.field.Company.active=Active wao.ui.field.Company.address1=Address Modified: trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties =================================================================== --- trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-04-04 07:37:55 UTC (rev 1834) +++ trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-04-04 10:30:25 UTC (rev 1835) @@ -143,6 +143,15 @@ wao.ui.field.Boat.portOfRegistry=Port d'attache wao.ui.field.Boat.shipOwner=Armateur wao.ui.field.BoatDistrict.code=Code du quartier maritime +wao.ui.field.BoatInfos.comment=Commentaire +wao.ui.field.BoatInfos.contactAddress1=Adresse +wao.ui.field.BoatInfos.contactAddress2=Complément d'adresse +wao.ui.field.BoatInfos.contactCity=Ville +wao.ui.field.BoatInfos.contactEmail=Mél +wao.ui.field.BoatInfos.contactFirstName=Prénom +wao.ui.field.BoatInfos.contactLastName=Nom +wao.ui.field.BoatInfos.contactPhoneNumber=Tél +wao.ui.field.BoatInfos.contactPostalCode=Code postal wao.ui.field.BoatInfos.dup=Capacité d'accueil du navire en personnels spécialisés wao.ui.field.Company.active=Active wao.ui.field.Company.address1=Adresse 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-04-04 07:37:55 UTC (rev 1834) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.jsp 2014-04-04 10:30:25 UTC (rev 1835) @@ -80,6 +80,23 @@ </table> </s:if> +<s:form cssClass="form-horizontal"> + + <s:hidden name="boatInfosId" value="%{boatDetails.boatInfos.topiaId}" /> + + <s:textfield name="boatInfos.contactFirstName" value="%{boatDetails.boatInfos.contactFirstName}" label="%{getText('wao.ui.field.BoatInfos.contactFirstName')}" readOnly="true" /> + <s:textfield name="boatInfos.contactLastName" value="%{boatDetails.boatInfos.contactLastName}" label="%{getText('wao.ui.field.BoatInfos.contactLastName')}" readOnly="true" /> + <s:textfield type="email" name="boatInfos.contactEmail" value="%{boatDetails.boatInfos.contactEmail}" label="%{getText('wao.ui.field.BoatInfos.contactEmail')}" readOnly="true" /> + <s:textfield type="phone" name="boatInfos.contactPhoneNumber" value="%{boatDetails.boatInfos.contactPhoneNumber}" label="%{getText('wao.ui.field.BoatInfos.contactPhoneNumber')}" readOnly="true" /> + <s:textfield type="number" name="boatInfos.dup" value="%{boatDetails.boatInfos.dup}" label="%{getText('wao.ui.field.BoatInfos.dup')}" readOnly="true" /> + <s:textfield name="boatInfos.contactAddress1" value="%{boatDetails.boatInfos.contactAddress1}" label="%{getText('wao.ui.field.BoatInfos.contactAddress1')}" readOnly="true" /> + <s:textfield name="boatInfos.contactAddress2" value="%{boatDetails.boatInfos.contactAddress2}" label="%{getText('wao.ui.field.BoatInfos.contactAddress2')}" readOnly="true" /> + <s:textfield name="boatInfos.contactPostalCode" value="%{boatDetails.boatInfos.contactPostalCode}" label="%{getText('wao.ui.field.BoatInfos.contactPostalCode')}" readOnly="true" /> + <s:textfield name="boatInfos.contactCity" value="%{boatDetails.boatInfos.contactCity}" label="%{getText('wao.ui.field.BoatInfos.contactCity')}" readOnly="true" /> + <s:textfield name="boatInfos.comment" value="%{boatDetails.boatInfos.comment}" label="%{getText('wao.ui.field.BoatInfos.comment')}" readOnly="true" /> + +</s:form> + <s:text name="wao.ui.boats.associatedLine"/> <ul> <s:iterator value="boatDetails.boatInfos.boat.elligibleBoat"> Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boats.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boats.jsp 2014-04-04 07:37:55 UTC (rev 1834) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boats.jsp 2014-04-04 10:30:25 UTC (rev 1835) @@ -43,7 +43,7 @@ $('tr.boat-row').removeClass('highlight'); $('#').addClass('highlight'); } - WAO.get(url, {}, successCallback); + WAO.get(url, { fragment: true }, successCallback); }); $('#reset-filters').click(function () { @@ -175,13 +175,12 @@ </thead> <tbody> <s:iterator value="boats" var="boat"> - <tr class="boat-row<s:if test="!active"> inactive</s:if>"> - <td id="<s:property value="topiaId"/>"> + <tr id="<s:property value="topiaId"/>" class="boat-row"> + <td> <s:if test="authenticatedWaoUser.authorizedToViewBoatDetails"> <s:url action="boat-details" id="boatDetailsUrl"> <s:param name="companyId" value="authenticatedWaoUser.waoUser.company.topiaId" /> <s:param name="boatId" value="topiaId" /> - <s:param name="fragment" value="true" /> </s:url> <s:a href="%{boatDetailsUrl}" cssClass="boat-details-action"> <s:property value="%{'' + immatriculation}"/> @@ -191,7 +190,9 @@ <s:property value="%{'' + immatriculation}"/> </s:else> </td> - <td><s:property value="name"/></td> + <td<s:if test="!active"> class="inactive"</s:if>> + <s:property value="name"/> + </td> <td><s:property value="boatLength"/></td> <td><s:property value="%{'' + buildYear}"/></td> <td><s:property value="district.districtCode"/></td> Modified: trunk/wao-web/src/main/webapp/wao.css =================================================================== --- trunk/wao-web/src/main/webapp/wao.css 2014-04-04 07:37:55 UTC (rev 1834) +++ trunk/wao-web/src/main/webapp/wao.css 2014-04-04 10:30:25 UTC (rev 1835) @@ -51,7 +51,7 @@ } /* pour représente qu'une entité (société, utilisateur) est inactive */ -.inactive { +.inactive, .inactive span[data-toggle="tooltip"] { text-decoration: line-through; }