Changeset 665 for geisa/web/initGeisa_script.jsp

Timestamp:

11/07/12 15:03:40 (12 years ago)

Author:

npipsl

Message:

download file _ ajout d'un nom de fichier

File:

• geisa/web/initGeisa_script.jsp (modified) (6 diffs)

geisa/web/initGeisa_script.jsp

@@ -1435 +1435 @@
                 transitionLower=transitionLower.replace(/\+/g,"plus");
 
-                this.nomFichier="GEISA2011";
+
+                //construction du nom du fichier  (exemple  GEISA2011-0_100)
+                this.nomFichier=this.selectDatabase.getValue()+"-"+$("#rangeLower").val()+"_"+$("#rangeUpper").val();
                 //envoie de la requête au controller
                 //en cas de succes appel de la fonction "handleGeisa"
@@ -1666 +1668 @@
                  //numéro unique pour le nom du répertoire
                 //this.nb = jQuery.parseJSON( result ).nb;
-                this.NomRepFileOut = jQuery.parseJSON( result ).NomRepFileOut;
+                //this.NomRepFileOut = jQuery.parseJSON( result ).NomRepFileOut;
+                this.NomRepFileOut = jQuery.parseJSON( result ).NomRepFileOut+"image/";
 
                 //chemin de l'image
@@ -1675 +1678 @@
                 //Pour tracer le bon nombre de graphe et de bouton download
                 var i=1;
-                var content = '';
+                //bouton  Download All
+                var content = "<a href=project?methodName=downloadFile&fileName=" +this.NomRepFileOut + 'GEISA.tar><button class="dataProtocolDownloadButton">Download All</button></a>';
+                //tracer chaque graphe avec son bouton  download associé
                 for (i=1; i<this.nbGraph+1; i++) {
                     //content = content + '<img src=' + this.pathImg + "graph" + this.nb +"-"+i+ ".png"+ ' /><a href="project?methodName=downloadFile&fileName='  + "graph" + this.nb+"-"+i + ".png"+ '"><button class="dataProtocolDownloadButton">Download</button></a>';
-                    content = content + '<img src=' + this.pathImg + this.nomFichier +"-"+i+ ".png"+ ' /><a href="project?methodName=downloadFile&fileName=' +this.NomRepFileOut + this.nomFichier+"-"+i + ".png"+ '"><button class="dataProtocolDownloadButton">Download</button></a>';
-
-                }
+                    content = content +'<img src=' + this.pathImg + this.nomFichier +"-"+i+ ".png"+ ' /><a href="project?methodName=downloadFile&fileName=' +this.NomRepFileOut + this.nomFichier+"-"+i + ".png&fileNameToDisplay="+this.nomFichier+ '"><button class="dataProtocolDownloadButton">Download</button></a>';
+               }
 
                 this.displayWindow(content);
@@ -2371 +2375 @@
                                     text:'Close',
                                     height:'30px',
-                                    width:'47px',
+                                    width:'53px',
                                     title :'to close the window',
                                     click: function() { $(this).dialog("close"); },
@@ -2377 +2381 @@
                                 "min" :{
                                     id:'Min',
-                                    text:'Min',
+                                    text:'-',
                                     height:'30px',
-                                    width:'47px',
+                                    width:'30px',
                                     title :'to reduce the window',
                                     click: function() { $(this).dialog({ height: 18, width:350  }); },
@@ -2385 +2389 @@
                                 "max" :{
                                     id:'Max',
-                                    text:'Max',
+                                    text:'+',
                                     height:'30px',
-                                    width:'47px',
+                                    width:'30px',
                                     title :'to enlarge the window ',
                                     click: function() { $(this).dialog({ height: 628, width:700  }); },