fix #3326 (#3328)

* fix #3326

* fix test_sample_template.py

* fix tests

qiita_pet/handlers/study_handlers/sample_template.py

@@ -358,7 +358,7 @@ def sample_template_overview_handler_get_request(study_id, user):
     # Specific information if it exists or not:
     data_types = []
     st_fp_id = None
-    old_files = []
+    st_files = []
     num_samples = 0
     num_cols = 0
     columns = []
@@ -369,11 +369,9 @@ def sample_template_overview_handler_get_request(study_id, user):
         # the list of old filepaths
         st = SampleTemplate(study_id)
         all_st_files = st.get_filepaths()
-        # The current sample template file is the first one in the list
-        # (pop(0)) and we are interested only in the id ([0])
-        st_fp_id = all_st_files.pop(0)[0]
+        st_fp_id = all_st_files[0][0]
         # For the old filepaths we are only interested in their basename
-        old_files = [basename(fp) for _, fp in all_st_files]
+        st_files = [basename(fp) for _, fp in all_st_files]
         # The number of samples - this is a space efficient way of counting
         # the number of samples. Doing len(list(st.keys())) creates a list
         # that we are not using
@@ -393,7 +391,7 @@ def sample_template_overview_handler_get_request(study_id, user):
             'user_can_edit': Study(study_id).can_edit(user),
             'job': job,
             'download_id': st_fp_id,
-            'old_files': old_files,
+            'st_files': st_files,
             'num_samples': num_samples,
             'num_columns': num_cols,
             'columns': columns,

qiita_pet/handlers/study_handlers/tests/test_sample_template.py

@@ -281,7 +281,7 @@ def test_sample_template_overview_handler_get_request(self):
                'user_can_edit': True,
                'job': None,
                'download_id': 23,
-               'old_files': ['1_19700101-000000.txt'],
+               'st_files': ['1_19700101-000000.txt'],
                'num_samples': 27,
                'num_columns': 31,
                'columns': sorted(
@@ -297,6 +297,9 @@ def test_sample_template_overview_handler_get_request(self):
                            'host_subject_id', 'description', 'latitude',
                            'longitude', 'scientific_name', 'env_package']),
                'sample_restrictions': ''}
+        # the first element is the current fp and the name is based on the
+        # last update so just removing to easy test
+        obs['st_files'].pop(0)
         self.assertEqual(obs, exp)
 
         # Test sample template doesn't exist
@@ -312,7 +315,7 @@ def test_sample_template_overview_handler_get_request(self):
                'user_can_edit': True,
                'job': None,
                'download_id': None,
-               'old_files': [],
+               'st_files': [],
                'num_samples': 0,
                'num_columns': 0,
                'columns': [],
@@ -494,7 +497,7 @@ def test_get(self):
                'user_can_edit': True,
                'job': None,
                'download_id': 23,
-               'old_files': ['1_19700101-000000.txt'],
+               'st_files': ['1_19700101-000000.txt'],
                'num_samples': 27,
                'num_columns': 31,
                'columns': sorted(
@@ -510,6 +513,9 @@ def test_get(self):
                            'host_subject_id', 'description', 'latitude',
                            'longitude', 'scientific_name', 'env_package']),
                'sample_restrictions': ''}
+        # the first element is the current fp and the name is based on the
+        # last update so just removing to easy test
+        obs['st_files'].pop(0)
         self.assertDictEqual(obs, exp)
 
 

qiita_pet/static/js/sampleTemplateVue.js

@@ -44,6 +44,7 @@ Vue.component('sample-template-page', {
               '<div class="row">' +
                 '<div class="col-md-12">' +
                   '<h3>Sample Information<span id="title-h3"></span></h3>' +
+                  '<h6>Last update: <span id="current-sample-info"></span></h6>' +
                 '</div>' +
               '</div>' +
               // Processing div
@@ -376,6 +377,7 @@ Vue.component('sample-template-page', {
 
       // Add the buttons next to the title
       // Download Sample Information button
+      $('#current-sample-info').append(vm.current_file.split('_')[1].split('.')[0]);
       $('#title-h3').append(' ');
       $btn = $('<a>').addClass('btn btn-default').attr('href', vm.portal + '/download/' + vm.downloadId).appendTo('#title-h3');
       $('<span>').addClass('glyphicon glyphicon-download-alt').appendTo($btn);
@@ -575,7 +577,8 @@ Vue.component('sample-template-page', {
         vm.userCanEdit = data['user_can_edit'];
         vm.job = data['job'];
         vm.downloadId = data['download_id'];
-        vm.oldFiles = data['old_files'];
+        vm.current_file = data['st_files'][0];
+        vm.oldFiles = data['st_files'].slice(1);
         vm.numSamples = data['num_samples'];
         vm.numColumns = data['num_columns'];
         vm.columns = data['columns'];

qiita_pet/templates/study_ajax/prep_summary.html

@@ -423,6 +423,9 @@
 <!-- Prep template title and buttons -->
 <div class="row">
   <div class="col-md-12">
+    {% if other_filepaths is not None %}
+      <h6>Last update: {{ other_filepaths[0].split('_')[-1] }}</h6>
+    {% end %}
     <h4>
       {% if deprecated %}
         <span class="label label-danger">This Preparation Information has been DEPRECATED</span>
@@ -558,7 +561,7 @@ <h5>
         {% end %}
         <div id="other-filepaths" class="collapse">
           <small>
-            {% raw '<br/>'.join(other_filepaths) %}
+            {% raw '<br/>'.join(other_filepaths[1:]) %}
           </small>
         </div>
         <div id="prep-artifact-summary-div" class="tab-pane fade in active">