#42 - allow re-upload before importing

Author: vabarbosa

public/js/seams.js

@@ -212,6 +212,7 @@ seamsApp.controller('seamsController', ['$scope', '$route', '$routeParams', '$lo
 	    $scope.$root.importClicked = function() {
 	      console.log("IMPORT");
 	      $('#importbutton').attr('disabled',true);
+	      $('#backbutton').attr('disabled',true);
 	      $('.import-spinner').css('display','inline-block');
 	      var fields = [ ];
 	      for(var i in $scope.$root.currentUpload.fields) {

views/templates/import.html

@@ -38,6 +38,7 @@ <h1 class="type_heading"><mark class="type_mark">Create the Search Index</mark><
       <div class="button_group">
         <div  class="type_copy" id="facetstatus">Select a field to facet before importing</div>
         <button id="importbutton" type="submit" class="button_primary" ng-click="importClicked()"> Import </button>
+        <button id="backbutton" type="button" class="button_secondary" ng-click="goToNextPage('upload')">Back</button>
         <!-- <span class="glyphicon glyphicon-refresh glyphicon-spinner import-spinner"></span> -->
         <div  class="type_copy" id="importstatus"></div>
       </div>

views/templates/upload.html

@@ -5,15 +5,7 @@ <h1 class="type_heading"><mark class="type_mark">Upload Data</mark></h1>
 
 <section class="layout_section theme_dark">
 
-  <div ng-show="currentStatus == 'imported'" class="alert alert-success">
-    <p class="type_copy">Your data was uploaded and imported successfully.</p>
-  </div>
-
-  <div ng-show="currentStatus == 'uploaded'" class="alert alert-success">
-    <p class="type_copy">Your data was uploaded successfully.</p>
-  </div>
-
-  <div ng-show="!currentStatus || currentStatus == 'new'">
+  <div ng-show="!currentStatus || currentStatus == 'new' || reUpload">
     <!--
     <form id="uploadform" action="/upload" method="post" enctype="multipart/form-data">
       <fieldset class="form_field">
@@ -58,8 +50,19 @@ <h1 class="type_heading"><mark class="type_mark">Upload Data</mark></h1>
     </div>
   </div>
 
+  <div ng-show="currentStatus == 'imported'" class="alert alert-success">
+    <p class="type_copy">Your data was uploaded and imported successfully.</p>
+  </div>
+
+  <div ng-show="currentStatus == 'uploaded'" class="alert alert-success">
+    <p class="type_copy">Your{{ reUpload ? ' previous ' : ' ' }}data was uploaded successfully.</p>
+  </div>
+
   <div class="button_group" ng-show="currentStatus && currentStatus != 'new'">
     <button type="button" class="button_primary" ng-click="goToNextPage('import')"> Continue </button>
+    <button ng-show="currentStatus == 'uploaded' && !reUpload" class="button_secondary"
+      type="button" ng-click="reUpload = true;">
+      Re-upload </button>
   </div>
 
 </section>