#53 Update report header in observable details page

TheHive-Project · Dec 20, 2016 · 81ba663 · 81ba663
1 parent da31ea5
commit 81ba663
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 18 deletions.
diff --git a/ui/app/scripts/controllers/case/CaseObservablesItemCtrl.js b/ui/app/scripts/controllers/case/CaseObservablesItemCtrl.js
@@ -101,8 +101,10 @@
                 $scope.report = {
                     template: job.analyzerId,
                     content: job.report,
-                    status: job.status
-                }
+                    status: job.status,
+                    startDate: job.startDate,
+                    endDate: job.endDate
+                };
             }
 
             $scope.similarArtifacts = CaseArtifactSrv.api().similar({

diff --git a/ui/app/scripts/directives/report.js b/ui/app/scripts/directives/report.js
@@ -23,17 +23,17 @@
             }
             return {
                 restrict: 'E',
-                replace: true,
-                link: function (scope, element) {
-                    scope.element = element;
-                    scope.$watchGroup(['name', 'content', 'status'], updateReport);
-                },
+                replace: true,                
                 scope: {
                     'name': '=',
                     'artifact': '=',
                     'flavor': '@',
                     'status': '=',
                     'content': '='
+                },
+                link: function (scope, element) {
+                    scope.element = element;
+                    scope.$watchGroup(['name', 'content', 'status'], updateReport);
                 }
             };
         });

diff --git a/ui/app/views/partials/observables/details/artifact-details-analysers.html b/ui/app/views/partials/observables/details/artifact-details-analysers.html
@@ -41,22 +41,22 @@ <h3 class="pad10 text-primary">
     </tbody>
 </table>
 
-<div class="row vpad20">
+<div class="row">
     <div class="col-md-6 col-md-offset-3">
         <hr>
     </div>
 </div>
 
-<div class="row" style="border-bottom:1px dotted">
+<div class="row observable-report" ng-if="report">
     <div class="col-md-12">
-        <p>
-            <strong>Report</strong>
-        </p>
-    </div>
-</div>
-
-<div class="row observable-report vpad10" ng-if="report">
-    <div class="col-md-12">
-        <report artifact="artifact" content="report.content.full || report.content" default="jsonhuman" flavor="long" name="report.template" status="report.status"></report>
+        <h3 class="pad10 text-primary">
+            Report <small>for {{report.template}} analysis of {{(report.endDate || report.startDate) | showDate}}</small>
+        </h3>
+        <report artifact="artifact" 
+            content="report.content.full || report.content" 
+            default="jsonhuman" 
+            flavor="long" 
+            name="report.template" 
+            status="report.status"></report>
     </div>
 </div>