From 58cfda3f3b79a76e0afb7e169ea7914bf788ecb9 Mon Sep 17 00:00:00 2001
From: Nabil Adouani <nabil.adouani@gmail.com>
Date: Wed, 17 Mar 2021 09:24:21 +0100
Subject: [PATCH] #1766 Rearrange the list of TTPs

---
 frontend/app/styles/procedure.css             |  6 +++---
 .../views/partials/case/case.procedures.html  | 20 ++++++++++++-------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/frontend/app/styles/procedure.css b/frontend/app/styles/procedure.css
index e74f2059cd..c5d141648d 100644
--- a/frontend/app/styles/procedure.css
+++ b/frontend/app/styles/procedure.css
@@ -1,5 +1,5 @@
 .ttp-item {
-    margin-bottom: 10px;
+    margin-bottom: 6px;
     border: 1px solid #f5f5f5;
 }
 
@@ -30,7 +30,7 @@
     background-color: #fcfcfc;
 }
 .ttp-item .ttp-header > div {
-    padding: 10px;
+    padding: 2px 10px;
     vertical-align: middle;
 }
 
@@ -76,7 +76,7 @@
 
 .ttp-item-header > div {
     font-weight: bold;
-    padding: 10px;
+    padding: 4px 10px;
 }
 
 .procedure-techniques-list {
diff --git a/frontend/app/views/partials/case/case.procedures.html b/frontend/app/views/partials/case/case.procedures.html
index 62c3ae1c64..bde6980410 100644
--- a/frontend/app/views/partials/case/case.procedures.html
+++ b/frontend/app/views/partials/case/case.procedures.html
@@ -41,7 +41,7 @@ <h4>
                     <i ng-show="$vm.filtering.context.sort.indexOf('-patternId') !== -1" class="fa fa-caret-down"></i>
                 </a>
             </div>
-            <div class="ttp-user">Created By</div>
+            <!-- <div class="ttp-user">Created By</div> -->
             <div class="ttp-date">
                 <a href class="text-default" ng-click="$vm.sortByField('occurDate')">
                     Occur Date
@@ -81,9 +81,9 @@ <h4>
                     </div>
                 </div>
 
-                <div class="ttp-user">
+                <!-- <div class="ttp-user">
                     <user user-id="proc._createdBy" icon-only="false" icon-size="m"></user>
-                </div>
+                </div> -->
                 <div class="ttp-date">
                     <a href ng-click="$vm.addFilterValue('occurDate', proc.occurDate)">
                         <span uib-tooltip="{{proc.occurDate | shortDate}}" tooltip-popup-delay="500" tooltip-placement="bottom">{{proc.occurDate | shortDate}}</span>
@@ -97,19 +97,25 @@ <h4>
             </div>
             <div class="ttp-body" ng-show="$vm.expanded[proc._id]">
                 <div class="row mb-xs">
-                    <div class="col-sm-4">
+                    <div class="col-sm-3">
+                        <label>Created At</label>
+                        <div>
+                            <user-info value="proc._createdBy" field="organisation"></user-info>/<user-info value="proc._createdBy" field="name"></user-info>
+                        </div>
+                    </div>
+                    <div class="col-sm-3">
                         <label>Created At</label>
                         <div>
                             <span uib-tooltip="{{proc._createdAt | shortDate}}" tooltip-popup-delay="500" tooltip-placement="bottom">{{proc._createdAt | shortDate}}</span>
                         </div>
                     </div>
-                    <div class="col-sm-4">
+                    <div class="col-sm-3">
                         <label>Updated At</label>
                         <div>
-                            <span uib-tooltip="{{proc._updatedAt | shortDate}}" tooltip-popup-delay="500" tooltip-placement="bottom">{{proc._updatedAt | shortDate}}</span>
+                            <span uib-tooltip="{{proc._updatedAt | shortDate}}" tooltip-popup-delay="500" tooltip-placement="bottom">{{(proc._updatedAt | shortDate) || '-'}}</span>
                         </div>
                     </div>
-                    <div class="col-sm-4">
+                    <div class="col-sm-3">
                         <label>Occured At</label>
                         <div>
                             <updatable-date on-update="$vm.updateField(proc, 'occurDate', true)" value="proc.occurDate" clearable="false"></updatable-date>