GitLab

at 2018-03-10T18:44:25Z

Update struts (namespace io) (still some pb on output, but who cares?

         result.setInputProvider(inputProvider);

         result.setUseWells(useWells);

         result.setTripType(TripType.getTripType(useSamplesOnly, canCreateVirtualActivity));

-        result.setCanCreateVessel(canCreateVessel);

-        result.setCreateVirtualVessel(createVirtualVessel);

         result.setCanCreateVirtualActivity(canCreateVirtualActivity);

         result.setUseSamplesOnly(useSamplesOnly);

+        result.setCanCreateVessel(canCreateVessel);

+        result.setCreateVirtualVessel(createVirtualVessel);

         return result;

     }

         result.setTripType(analyzeConfiguration.getTripType());

         result.setCanCreateVessel(analyzeConfiguration.isCanCreateVessel());

         result.setCreateVirtualVessel(analyzeConfiguration.isCanCreateVessel());

+        result.setTripType(analyzeConfiguration.getTripType());

+        result.setCanCreateVirtualActivity(analyzeConfiguration.isCanCreateVirtualActivity());

+        result.setUseSamplesOnly(analyzeConfiguration.isUseSamplesOnly());

         return result;

     }

 Pilote d'acquisition de données : ${configuration.inputProvider.label}

 Source de données               : ${configuration.inputFile.name}

 Utilisation des plans de cuves  : ${configuration.useWells?string}

-Type de marées                  : ${configuration.tripType.label}

+<#if configuration.useSamplesOnly>

+Base échantillon seulement

+<#else>

+Autoriser à créer des activités : ${configuration.canCreateVirtualActivity?string}

+</#if>

 Autoriser à créer des bateaux   : ${configuration.canCreateVessel?string}

 <#if configuration.canCreateVessel>

 Créer des bateaux virtuels      : ${configuration.createVirtualVessel?string}

 Input Pilot:                 ${configuration.inputProvider.label}

 Input file:                  ${configuration.inputFile.name}

 Use wells:                   ${configuration.useWells?string}

-Trip type:                   ${configuration.tripType.label}

+<#if configuration.useSamplesOnly>

+Database 'Samples only'

+<#else>

+Authorize to create virtual activities: ${configuration.canCreateVirtualActivity?string}

+</#if>

 Authorise to create vessels: ${configuration.canCreateVessel?string}

 <#if configuration.canCreateVessel>

 Create virtual vessels:      ${configuration.createVirtualVessel?string}

 Pilote d'acquisition de données : ${configuration.inputProvider.label}

 Source de données               : ${configuration.inputFile.name}

 Utilisation des plans de cuves  : ${configuration.useWells?string}

-Type de marées                  : ${configuration.tripType.label}

+<#--Type de marées                  : ${configuration.tripType.label}-->

+<#if configuration.useSamplesOnly>

+Base échantillon seulement

+<#else>

+Autoriser à créer des activités : ${configuration.canCreateVirtualActivity?string}

+</#if>

 Autoriser à créer des bateaux   : ${configuration.canCreateVessel?string}

 <#if configuration.canCreateVessel>

 Créer des bateaux virtuels      : ${configuration.createVirtualVessel?string}

 Input Pilot:                 ${configuration.inputProvider.label}

 Input file:                  ${configuration.inputFile.name}

 Use wells:                   ${configuration.useWells?string}

-Trip type:                   ${configuration.tripType.label}

+<#if configuration.useSamplesOnly>

+Database 'Samples only'

+<#else>

+Authorize to create virtual activities: ${configuration.canCreateVirtualActivity?string}

+</#if>

+

 Authorise to create vessels: ${configuration.canCreateVessel?string}

 <#if configuration.canCreateVessel>

 Create virtual vessels:      ${configuration.createVirtualVessel?string}

   <constant name="struts.xworkTextProvider" value="i18nTextProvider"/>

   <constant name="struts.ognl.allowStaticMethodAccess" value="true"/>

+  <constant name="struts.enable.DynamicMethodInvocation" value="true"/>

   <constant name="struts.action.extension" value=",,"/>

   <constant name="struts.locale" value="fr_FR"/>

   <constant name="struts.i18n.reload" value="false"/>

-  <constant name="struts.configuration.xml.reload" value="false"/>

+  <constant name="struts.configuration.xml.reload" value="true"/>

   <!--suppress Struts2ModelInspection -->

   <constant name="struts.ui.theme" value="css_xhtml"/>

   <constant name="struts.multipart.maxSize" value="314572800"/>

       <!-- to check if user is loggued -->

       <interceptor name="checkUserLoggued" class="fr.ird.t3.web.interceptors.CheckLogguedInterceptor">

-        <param name="loginAction">user/loginEnter</param>

+        <param name="loginAction">user/login!input</param>

         <param name="redirectAction">/home</param>

       </interceptor>

     </s:text>

   </p>

-  <s:form method="post" validate="true" namespace="/io">

+  <s:form method="post" validate="true" namespace="/io" action="prepareImportData">

     <s:if test="needReplace">

       <strong>

         <s:text name="t3.label.message.trips.to.replace">

       </strong>

       <s:checkbox name="replaceTrip" key="t3.question.confirm.to.replace.trip" value="%{false}"/>

     </s:if>

-    <s:submit action="prepareImportData" key="t3.action.importData.doImport" align="right"/>

+    <s:submit key="t3.action.importData.doImport" align="right"/>

   </s:form>

 </s:if>

 <s:else>

 <title><s:text name="t3.label.data.configureImportData"/></title>

 <h2><s:text name="t3.label.data.configureImportData"/></h2>

-<s:form method="post" validate="true" enctype="multipart/form-data" namespace="/io">

+<s:form method="post" validate="true" enctype="multipart/form-data" namespace="/io" action="configureImportData">

   <s:hidden key="treatmentDirectoryPath" label=''/>

   <s:select key="inputProviderId" list="inputProviders" label='%{getText("t3.common.inputProvider")}' listKey="id"

             listValue="label" requiredLabel="true"/>

   <s:if test="loadedSource==null">

     <s:hidden name="useWells" value="%{useWells}"/>

     <s:file name="sourceToLoad" requiredLabel="true" label='%{getText("t3.common.sourceToUpload")} (*)'/>

-    <s:submit action="configureImportData!doAddSource" key="t3.action.importData.addSource" align="right"/>

+    <s:submit method="doAddSource" key="t3.action.importData.addSource" align="right"/>

     <br/>

     <div class="cleanBoth">

     <s:checkbox key="canCreateVirtualActivity" label='%{getText("t3.common.canCreateVirtualActivity")}'/>

     <s:checkbox key="canCreateVessel" label='%{getText("t3.common.canCreateVessel")}'/>

     <s:checkbox key="createVirtualVessel" label='%{getText("t3.common.createVirtualVessel")}'/>

-    <s:submit action="configureImportData!doDeleteSource" key="t3.action.importData.deleteSource" align="right"/>

-    <s:submit action="configureImportData!doPrepareAnalyze" key="t3.action.importData.analyze" align="right"/>

+    <s:submit method="doDeleteSource" key="t3.action.importData.deleteSource" align="right"/>

+    <s:submit method="doPrepareAnalyze" key="t3.action.importData.analyze" align="right"/>

   </s:else>

 </s:form>
 <%@ taglib prefix="sj" uri="/struts-jquery-tags" %>

 <title><s:text name="t3.label.data.importData"/></title>

-

-<h2><s:text name="t3.label.data.importData"/> - <s:text

-  name="t3.label.result"/></h2>

-

+<h2><s:text name="t3.label.data.importData"/> - <s:text name="t3.label.result"/></h2>

 <jsp:include page="importDataConfigResume.jsp"/>

 <s:if test="nbImportedTrips == 0">

 <s:url id="loadUrl" action='getUserOuputDatabase' namespace='/json'/>

-<script type="text/javascript" charset="UTF-8"

-        src="<s:url value='/js/monthpicker.js' />"></script>

+<script type="text/javascript" charset="UTF-8" src="<s:url value='/js/monthpicker.js' />"></script>

 <style type="text/css">

   .ui-datepicker-calendar {

     display: none;

   }

 </style>

 <script type="text/javascript">

-  jQuery(document).ready(function () {

-    jQuery.struts2_jquery.myBindingOptions = {

-      datatype : "json",

-      type : 'checkbox',

-      name : "operationIds",

-      list : "operations",

-      buttonset : false,

-      jqueryaction : "buttonset",

-      reloadtopics : "reloadList",

-      id:$('input[name$="operationIds"]')[0].parentNode.id

-    };

-    $('[name="configuration.outputProviderId"]').change(function(event) {

-      var myOptions = jQuery.struts2_jquery.myBindingOptions;

-      myOptions.href = "<s:url action='getOutputProviderOperations' namespace='/json'><s:param name='outputProviderId'/></s:url>" + this.value;

-      var myDiv = $(jQuery.struts2_jquery.escId(myOptions.id));

-      $.unsubscribe('reloadList', myDiv);

-      jQuery.struts2_jquery_ui.bind(myDiv, myOptions);

-    });

-

-    $('[name="databaseId"]').change(function(event) {

-      var url = "${loadUrl}?" + $.param({ databaseId:this.value});

-      $.getJSON(url,

-                function(data) {

-                  var database = data.database;

-                  $('[name="configuration.url"]').attr('value', database.url ? database.url : '');

-                  $('[name="configuration.login"]').attr('value', database.login ? database.login : '');

-                  $('[name="configuration.password"]').attr('value', "");

+    jQuery(document).ready(function () {

+        jQuery.struts2_jquery.myBindingOptions = {

+            datatype: "json",

+            type: 'checkbox',

+            name: "operationIds",

+            list: "operations",

+            buttonset: false,

+            jqueryaction: "buttonset",

+            reloadtopics: "reloadList",

+            id: $('input[name$="operationIds"]')[0].parentNode.id

+        };

+        console.info("IDID: " + jQuery.struts2_jquery.myBindingOptions.id);

+        $('[name="configuration.outputProviderId"]').change(function (event) {

+            var myOptions = jQuery.struts2_jquery.myBindingOptions;

+            myOptions.href = "<s:url action='getOutputProviderOperations' namespace='/json'><s:param name='outputProviderId'/></s:url>" + this.value;

+            var myDiv = $(jQuery.struts2_jquery.escId(myOptions.id));

+            $.unsubscribe('reloadList', myDiv);

+            jQuery.struts2_jquery_ui.bind(myDiv, myOptions);

+        });

+

+        $('[name="databaseId"]').change(function (event) {

+            var url = "${loadUrl}?" + $.param({databaseId: this.value});

+            $.getJSON(url,

+                function (data) {

+                    var database = data.database;

+                    $('[name="configuration.url"]').attr('value', database.url ? database.url : '');

+                    $('[name="configuration.login"]').attr('value', database.login ? database.login : '');

+                    $('[name="configuration.password"]').attr('value', "");

                 }

-      );

+            );

+        });

     });

-  });

 </script>

-<s:form method="post" validate="true" namespace="/io">

+<s:form method="post" validate="true" namespace="/io" action="configureExport">

   <fieldset>

     <legend><s:text name="t3.label.export.config.pilot"/></legend>

               listValue="libelle"

               headerKey="" headerValue=""

               requiredLabel="true"/>

-

-    <sj:checkboxlist key="operationIds" buttonset="false"

+    <br/>

+    <sj:checkboxlist key="operationIds" buttonset="false" template="mycheckboxlist"

                      label='%{getText("t3.output.operations")}'

                      list="operations" requiredLabel="true"/>

+

   </fieldset>

   <fieldset>

     <legend><s:text name="t3.label.export.config.jdbc"/></legend>

-    <s:select key="databaseId" list="databases"

-              label='%{getText("t3.common.userOutputDatabase")}'

+    <s:select key="databaseId" list="databases" label='%{getText("t3.common.userOutputDatabase")}'

               headerKey="" headerValue=""/>

     <s:textfield name="configuration.url" requiredLabel="true" size="40"

               label='%{getText("t3.common.ocean")}' requiredLabel="true"/>

       <%-- selected fleet country --%>

-    <s:select key="configuration.fleetId" list="fleets"

-              label='%{getText("t3.common.fleetCountry")}' requiredLabel="true"/>

-

+    <s:select key="configuration.fleetId" list="fleets" label='%{getText("t3.common.fleetCountry")}'

+              requiredLabel="true"/>

       <%-- begin date --%>

     <sj:datepicker key="configuration.beginDate" requiredLabel="true"

                    label='%{getText("t3.common.beginDate")}'

                    appendText=" (mm-yyyy)"/>

   </fieldset>

-  <s:submit action="configureExport!execute"

-            key="t3.action.configuration.validateConfiguration"

-            align="right"/>

+  <s:submit method="execute" key="t3.action.configuration.validateConfiguration" align="right"/>

 </s:form>

 <script type="text/javascript">

-  jQuery(document).ready(function () {

+    jQuery(document).ready(function () {

-    $.prepareMonthPickers(

-      {

-        minDateAsMonth:'<s:property value="configuration.minDate"/>',

-        maxDateAsMonth:'<s:property value="configuration.maxDate"/>'

-      });

+        $.prepareMonthPickers(

+            {

+                minDateAsMonth: '<s:property value="configuration.minDate"/>',

+                maxDateAsMonth: '<s:property value="configuration.maxDate"/>'

+            });

-  });

+    });

 </script>

 <ul>

   <li>

-    <s:a action="selectUserInputDatabase!input" namespace="/user">

+    <s:a action="selectUserInputDatabase" method="input" namespace="/user">

       <s:text name="t3.menu.select.t3Database"/>

     </s:a>

   </li>

 <script type="text/javascript">

-  jQuery(document).ready(function () {

-

-    $('[name="databaseId"]').change(function(event) {

-      var url = "${loadUrl}?" + $.param({ databaseId:this.value});

-      $.getJSON(url,

-                function(data) {

-                  var database = data.database;

-                  $('[name="database.url"]').attr('value', database.url ? database.url : '');

-                  $('[name="database.login"]').attr('value', database.login ? database.login : '');

-                  $('[name="database.password"]').attr('value', "");

+    jQuery(document).ready(function () {

+

+        $('[name="databaseId"]').change(function (event) {

+            var url = "${loadUrl}?" + $.param({databaseId: this.value});

+            $.getJSON(url,

+                function (data) {

+                    var database = data.database;

+                    $('[name="database.url"]').attr('value', database.url ? database.url : '');

+                    $('[name="database.login"]').attr('value', database.login ? database.login : '');

+                    $('[name="database.password"]').attr('value', "");

                 }

-      );

+            );

+        });

     });

-  });

 </script>

 <title><s:text name="t3.label.user.selectT3Database"/></title>

 <h2><s:text name="t3.label.user.selectT3Database"/></h2>

-<s:form method="post" validate="true" namespace="/user">

-

+<s:form method="post" validate="true" namespace="/user" action="selectUserInputDatabase">

   <fieldset>

     <legend><s:text name="t3.label.t3.config.jdbc"/></legend>

-

-    <s:select key="databaseId" list="databases"

-            label='%{getText("t3.common.userT3Database")}'

-            headerKey="" headerValue=""/>

-    

-    <s:textfield name="database.url" requiredLabel="true" size="40"

-                 label='%{getText("t3.common.url")}'/>

-

-    <s:textfield name="database.login" requiredLabel="true" size="40"

-                 label='%{getText("t3.common.login")}'/>

-

-    <s:password name="database.password" requiredLabel="true" size="40"

-                label='%{getText("t3.common.password")}'

+    <s:select key="databaseId" list="databases" label='%{getText("t3.common.userT3Database")}' headerKey=""

+              headerValue=""/>

+    <s:textfield name="database.url" requiredLabel="true" size="40" label='%{getText("t3.common.url")}'/>

+    <s:textfield name="database.login" requiredLabel="true" size="40" label='%{getText("t3.common.login")}'/>

+    <s:password name="database.password" requiredLabel="true" size="40" label='%{getText("t3.common.password")}'

                 autocomplete='off'/>

   </fieldset>

   <br/>

-  <s:submit action="selectUserInputDatabase" method="execute"

-            key="t3.action.connectToDatabase" align="right"/>

+  <s:submit key="t3.action.connectToDatabase" align="right"/>

 </s:form>

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3

Commits:

13 changed files:

Changes: