Merge pull request #6 from lequal/dev

Merge dev to master
cnescatlab · Sep 10, 2019 · 2e953de · 2e953de
2 parents 1f7e31a + 8b5d0e7
commit 2e953de
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,14 +5,13 @@ install: true
 addons:
   sonarcloud:
     organization: "lequal"
-    
+
 jdk:
   - openjdk8
   - openjdk11
-
 script:
   - mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent package sonar:sonar
-  
+
 cache:
   directories:
     - '$HOME/.m2/repository'

diff --git a/pom.xml b/pom.xml
@@ -17,7 +17,7 @@
     <jdk.min.version>1.8</jdk.min.version>
     <pluginUrl>https://cnes.fr</pluginUrl>
     <pluginOrganizationName>CNES</pluginOrganizationName>
-    <jacoco.version>0.7.9</jacoco.version>
+    <jacoco.version>0.8.4</jacoco.version>
   </properties>
 
   <licenses>

diff --git a/src/main/resources/static/export.js b/src/main/resources/static/export.js
@@ -14,10 +14,36 @@
  * You should have received a copy of the GNU General Public License
  * along with cnesexport.  If not, see <http://www.gnu.org/licenses/>.
  */
+var isDisplayedExporting;
+window.registerExtension('cnesexport/export', function (options){
+    var jquery = document.createElement('script');
+    jquery.src = '/static/cnesexport/jquery.min.js';
+    if(window.jQuery==null)document.head.appendChild(jquery);
+    options.el.innerHTML = '<div id="cnesscanload" class="page-wrapper-simple"><div class="page-simple"><h1 class="maintenance-title text-center">cnes-export is loading, please wait...</h1></div></div>'
+    waitjQueryExport(options);
 
-window.registerExtension('cnesexport/export', function (options) {
+
+    // return a function, which is called when the page is being closed
+    return function () {
+        isDisplayedExporting = false;
+        // clear elements of this page
+        options.el.textContent = '';
+    };
+})
+
+function waitjQueryExport(options){
+  // check if jquery is loaded...
+  if(window.jQuery == null){
+    setTimeout(waitjQueryExport, 100, options);
+  }
+  else{
+    registerCnesExport(options)
+  }
+}
+
+function registerCnesExport(options){
     // let's create a flag telling if the page is still displayed
-    var isDisplayedExporting = true;
+    isDisplayedExporting = true;
 
     /**
      * Log information in the bottom text area
@@ -150,6 +176,7 @@ window.registerExtension('cnesexport/export', function (options) {
         // Add html template
         var template = document.createElement("div");
         template.setAttribute("id", "template");
+        options.el.innerHTML = "";
         options.el.appendChild(template);
         // retrieve template from html
         $('#template').load('../../static/cnesexport/templates/exportForm.html', function(){
@@ -193,4 +220,4 @@ window.registerExtension('cnesexport/export', function (options) {
         // clean elements of this page
         options.el.textContent = '';
     };
-});
+}
diff --git a/src/main/resources/static/jquery.min.js b/src/main/resources/static/jquery.min.js
diff --git a/src/main/resources/static/templates/exportForm.html b/src/main/resources/static/templates/exportForm.html
@@ -25,20 +25,20 @@ <h1 class="maintenance-title text-center">Export data as OpenXML</h1>
                     <select id="key"
                             name="key"
                             class="login-input" required></select>
-                    <em style="color:grey;">
+                    <br /><em style="color:grey;">
                         Tips: all quality profiles are available <a href="../../../profiles" target="_blank">here</a>.
                     </em>
                 </div>
                 <div class="big-spacer-bottom">
                     <div id="loading" class="text-center overflow-hidden" style="margin-bottom: 1em; display: none;">
                         <img src="../../static/cnesexport/images/loader.gif" alt="Working..."/>
                     </div>
-                    <div class="text-center overflow-hidden">
+                    <div class="overflow-hidden">
                         <input id="generation" name="generation" type="button" value="Export">
                     </div>
                 </div>
-                <textarea id="logging" name="logging" class="login-input" rows="15" style="background: black; color:white; resize: none;" readonly="">## Logging console ##</textarea>
+                <textarea id="logging" name="logging" class="login-input" rows="15" style="background: black; color:white; resize: none; width: 100%;" readonly="">## Logging console ##</textarea>
             </form>
         </div>
     </div>
-</div>
+</div>