Merge pull request #903 from Rodhlann/372-BULK-IMPORT-FILENAME

Update bulk import filename display

src/main/java/org/ecocean/servlet/importer/StandardImport.java

@@ -294,6 +294,7 @@ public void doImport(String filename, File dataFile, HttpServletRequest request,
 
                 creator = AccessControl.getUser(request, myShepherd);
                 itask = new ImportTask(creator);
+                // This is where the url parameters are stored in the ImportTask
                 itask.setPassedParameters(request);
                 itask.setStatus("started");
                 if (request.getParameter("taskID") != null) {
@@ -457,7 +458,7 @@ public void doImport(String filename, File dataFile, HttpServletRequest request,
         out.println("<div class=\"col-sm-12 col-md-6 col-lg-6 col-xl-6\">"); // half page bootstrap column
         out.println("<h2>Import Overview</h2>");
         out.println("<ul>");
-        out.println("<li>Excel File Name: " + filename + "</li>");
+        out.println("<li>Excel File Name: " + request.getParameter("originalFilename") + "</li>");
         out.println("<li>Excel File Successfully Found = " + dataFound + "</li>");
         out.println("<li>Excel Sheets in File = " + numSheets + "</li>");
         out.println("<li>Excel Rows = " + physicalNumberOfRows + "</li>");

src/main/webapp/import.jsp

@@ -417,7 +417,8 @@ try{
 	    out.println("<p id=\"refreshPara\" class=\"caption\">Refreshing results in <span id=\"countdown\"></span> seconds.</p><script>$('#refreshPara').hide();</script>");
 	    
 	    if(itask.getParameters()!=null){
-	    	out.println("<br>Filename: "+itask.getParameters().getJSONObject("_passedParameters").getJSONArray("filename").toString());
+	    	String filenameParam = itask.getParameters().getJSONObject("_passedParameters").has("originalFilename") ? "originalFilename" : "filename";
+	    	out.println("<br>Filename: "+itask.getParameters().getJSONObject("_passedParameters").getJSONArray(filenameParam).toString());
 	    }	
 	    out.println("<br><table id=\"import-table-details\" xdata-page-size=\"6\" xdata-height=\"650\" data-toggle=\"table\" data-pagination=\"false\" ><thead><tr>");
 	    String[] headers = new String[]{"Encounter", "Date", "Occurrence", "Individual", "#Images","Match Results by Class"};

src/main/webapp/import/spreadsheet.jsp

@@ -37,21 +37,26 @@ if (!org.ecocean.servlet.ReCAPTCHA.sessionIsHuman(request)) {
 %>
 
 <style type="text/css">
-	.hiddenFilename {
+	#hiddenFilename {
 		display: none;
 	}
+	#originalFilename {
+		display: none
+	}
 </style>
 
 <div id="hiddenFilename"></div>
-
+<div id="originalFilename"></div>
 
 <script>
 function uploadFinished() {
 	console.log("uploadFinished! Callback executing");
 	document.getElementById('updone').innerHTML = '<i>upload finished, redirecting...</i>';
 	var filename = document.getElementById('hiddenFilename').innerHTML;
+	var originalFilename = document.getElementById('originalFilename').innerHTML;
+
 	// forward user to the review page
-	window.location.replace('standard-upload?filename='+filename+"&isUserUpload=true");
+	window.location.replace('standard-upload?filename=' + filename + '&originalFilename=' + originalFilename + '&isUserUpload=true');
 	//window.location.replace('upload?filename='+filename+"&isUserUpload=true");
 }
 </script>

src/main/webapp/import/uploadFooter.jsp

@@ -42,8 +42,9 @@ String commitStr = request.getParameter("commit");
 boolean committing = (commitStr!=null);
 
 String filename = request.getParameter("filename");
-String uuid=Util.generateUUID();
-String uploadAction = "standard-upload?filename="+filename+"&commit=true&isUserUpload=true&taskID="+uuid;
+String originalFilename = request.getParameter("originalFilename");
+String uuid = Util.generateUUID();
+String uploadAction = "standard-upload?filename=" + filename + "&originalFilename=" + originalFilename + "&commit=true&isUserUpload=true&taskID=" + uuid;
 
 // This file is for window-dressing at the bottom of the (java-servlet) uploader at WebImport.java
 

src/main/webapp/imports.jsp

@@ -242,7 +242,10 @@ try{
 	        jobj.put("indivCount", indivCount);
 	        jobj.put("status", status);
 		    if(task.getParameters()!=null){
-		    	jobj.put("filename", task.getParameters().getJSONObject("_passedParameters").getJSONArray("filename").toString());
+				JSONObject passedParams = task.getParameters().optJSONObject("_passedParameters");
+				String filenameParam = "originalFilename";
+				if(!passedParams.has(filenameParam)) filenameParam = "filename";
+				jobj.put("filename", passedParams.optString(filenameParam, ""));
 		    }	
 	        
 	        jsonobj.put(jobj);

src/main/webapp/javascript/localUploader.js

@@ -233,7 +233,11 @@ function filesChanged(f) {
 function filesChangedSetFilename(f) {
     console.log("filesChangedSetFilename")
     filesChanged(f);
-    let filename = f.files[0].name.replace(/[^a-zA-Z0-9\. ]/g, "")
+    let originalFilename = f.files[0].name;
+    // Add original filename to hidden element on page before string processing
+    document.getElementById("originalFilename").innerHTML = originalFilename;    
+    let filename = originalFilename.replace(/[^a-zA-Z0-9\. ]/g, "")
+    // Add updated filename to hidden element on page after string processing
     document.getElementById("hiddenFilename").innerHTML = filename;    
 }