From 90e677fc42cbec8281fd8bedf3d762e09f116892 Mon Sep 17 00:00:00 2001
From: Rob Lewis <rob.f.lewis@gmail.com>
Date: Fri, 30 Oct 2015 12:16:09 -0400
Subject: [PATCH] Some styling changes to lesion table

---
 .../components/lesionTable/lesionTable.html   |  3 +-
 .../components/lesionTable/lesionTable.js     |  2 +-
 .../components/lesionTable/lesionTable.styl   | 35 ++++++++++++++++++-
 .../lesionTableRow/lesionTableRow.html        |  6 ++--
 .../lesionTableTimepointCell.html             |  2 +-
 5 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/Packages/lesiontracker/components/lesionTable/lesionTable.html b/Packages/lesiontracker/components/lesionTable/lesionTable.html
index 68cca4b56..a7f65b70b 100644
--- a/Packages/lesiontracker/components/lesionTable/lesionTable.html
+++ b/Packages/lesiontracker/components/lesionTable/lesionTable.html
@@ -4,14 +4,15 @@
             <thead>
                 <tr>
                     <th id="thNumber">Lesion #</th>
-                    <th id="thTarget">Target</th>
                     <th id="thLocation">Location</th>
+                    <th id="thTarget">Target</th>
                     <!--Each time point name as a column-->
                     {{ #each tabTimepoints }}
                         {{ #each timepoints }}
                              {{ >lesionTableTimepointHeader }}
                         {{ /each }}
                     {{ /each }}
+                    <th id="thSpacer"> </th>
                 </tr>
             </thead>
             <tbody>
diff --git a/Packages/lesiontracker/components/lesionTable/lesionTable.js b/Packages/lesiontracker/components/lesionTable/lesionTable.js
index 15160d1b8..69f9d5a9a 100644
--- a/Packages/lesiontracker/components/lesionTable/lesionTable.js
+++ b/Packages/lesiontracker/components/lesionTable/lesionTable.js
@@ -32,7 +32,7 @@ Template.lesionTable.onRendered(function() {
         var timepointID = contentId.toString() + i.toString();
         var timepointName = "Baseline";
         if (i > 0) {
-            timepointName = "Follow Up "+i;
+            timepointName = "Current"; //"Follow Up "+i;
         }
         var timepointObject = {timepointID: timepointID, timepointName: timepointName};
         timepointsArray.push(timepointObject);
diff --git a/Packages/lesiontracker/components/lesionTable/lesionTable.styl b/Packages/lesiontracker/components/lesionTable/lesionTable.styl
index bc3007437..90a086bb4 100644
--- a/Packages/lesiontracker/components/lesionTable/lesionTable.styl
+++ b/Packages/lesiontracker/components/lesionTable/lesionTable.styl
@@ -24,7 +24,7 @@ table.lesionTable > tbody > tr > td {
     padding: 4px;
     margin: 0;
     height: 25px;
-    line-height: 15px;
+    line-height: 10px;
 }
 
 table.lesionTable tbody tr:hover{
@@ -37,6 +37,39 @@ table.lesionTable tbody tr{
     line-height: 14px;
 }
 
+th#thNumber {
+    width: 4%;
+}
+
+th#thTarget {
+    width: 4%;
+}
+
+th#thLocation {
+    width: 15%;
+    text-align: left;
+}
+
+th#thSpacer {
+    width: 50%;
+}
+
+td.location {
+    text-align: left;
+}
+
+td.lesionNumber {
+    text-align: center;
+}
+
+td.target {
+    text-align: center;
+}
+
+td.lesionTableTimepointCell {
+    width: 4%;
+    text-align: center;
+}
 
 .btnRemove{
     border: none;
diff --git a/Packages/lesiontracker/components/lesionTableRow/lesionTableRow.html b/Packages/lesiontracker/components/lesionTableRow/lesionTableRow.html
index 73923ee78..4df9362f3 100644
--- a/Packages/lesiontracker/components/lesionTableRow/lesionTableRow.html
+++ b/Packages/lesiontracker/components/lesionTableRow/lesionTableRow.html
@@ -1,8 +1,8 @@
 <template name="lesionTableRow">
     <tr>
-        <th class='lesionNumber'>{{lesionData.lesionNumber}}</th>
-        <th class='target'>{{#if lesionData.isTarget}} Y {{else}} N {{/if}}</th>
-        <th class='location'>{{lesionData.location}}</th>
+        <td class='lesionNumber'>{{lesionData.lesionNumber}}</td>
+        <td class='location'>{{lesionData.location}}</td>
+        <td class='target'>{{#if lesionData.isTarget}} Y {{else}} N {{/if}}</td>
         <!--Each time point as a column-->
         {{# each timepoints }}
             {{> lesionTableTimepointCell }}
diff --git a/Packages/lesiontracker/components/lesionTableTimepointCell/lesionTableTimepointCell.html b/Packages/lesiontracker/components/lesionTableTimepointCell/lesionTableTimepointCell.html
index 13e5c084d..9577ce091 100644
--- a/Packages/lesiontracker/components/lesionTableTimepointCell/lesionTableTimepointCell.html
+++ b/Packages/lesiontracker/components/lesionTableTimepointCell/lesionTableTimepointCell.html
@@ -1,3 +1,3 @@
 <template name="lesionTableTimepointCell">
-    <td>{{longestDiameter}}</td>
+    <td class="lesionTableTimepointCell">{{longestDiameter}}</td>
 </template>
\ No newline at end of file