Merge pull request #109 from griidc/feature/PELAGOS-3413-add-file-inf…

…ormation-to-review Added file name, size and hash to review.
griidc · Dec 10, 2018 · d67f158 · d67f158
2 parents fdc4034 + 65b5340
commit d67f158
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 1 deletion.
diff --git a/src/Pelagos/Bundle/AppBundle/Controller/UI/DatasetReviewController.php b/src/Pelagos/Bundle/AppBundle/Controller/UI/DatasetReviewController.php
@@ -8,6 +8,7 @@
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
 
 use Symfony\Component\Form\Form;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\Extension\Core\Type\TextareaType;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -270,7 +271,7 @@ protected function makeSubmissionForm($udi, Dataset $dataset = null, DatasetSubm
                 ),
             )
         );
-
+        
         // Overwrite the spatial extent field which is normally a hidden type.
         $form->add('spatialExtent', TextareaType::class, array(
             'label' => 'Spatial Extent GML',
@@ -281,6 +282,31 @@ protected function makeSubmissionForm($udi, Dataset $dataset = null, DatasetSubm
             ),
         ));
 
+        // Add file name, hash and filesize.
+        $form->add('datasetFileName', TextType::class, array(
+            'label' => 'Dataset File Name',
+            'required' => false,
+            'attr' => array(
+                'readonly' => 'true'
+            ),
+        ));
+
+        $form->add('datasetFileSize', TextType::class, array(
+            'label' => 'Dataset Filesize',
+            'required' => false,
+            'attr' => array(
+                'readonly' => 'true'
+            ),
+        ));
+
+        $form->add('datasetFileSha256Hash', TextType::class, array(
+            'label' => 'Dataset SHA256 hash',
+            'required' => false,
+            'attr' => array(
+                'readonly' => 'true'
+            ),
+        ));
+
         $showForceImport = false;
         $showForceDownload = false;
         if ($datasetSubmission instanceof DatasetSubmission) {

diff --git a/src/Pelagos/Bundle/AppBundle/Resources/views/DatasetReview/distribution-info.html.twig b/src/Pelagos/Bundle/AppBundle/Resources/views/DatasetReview/distribution-info.html.twig
@@ -32,3 +32,27 @@
         </tr>
     </table>
 </fieldset>
+
+<fieldset>
+    <legend>File Information</legend>
+    <table class="tab-table">
+        <tr>
+            <td>
+                {{ form_label(form.datasetFileName) }}
+                {{ form.datasetFileName.vars.value }}
+            </td>
+        </tr>
+        <tr>
+            <td>
+                {{ form_label(form.datasetFileSize) }}
+                {{ form.datasetFileSize.vars.value | formatBytes }}
+            </td>
+        </tr>
+        <tr>
+            <td>
+                {{ form_label(form.datasetFileSha256Hash) }}
+                {{ form.datasetFileSha256Hash.vars.value }}
+            </td>
+        </tr>
+    </table>
+</fieldset>