Issue contact (#86)

* terminatedTable * add contactOutcome & update snapshop * bump version * rollback version * fix pr review * delete import * fix size column * test: update snapshots * bump version --------- Co-authored-by: Simon Demazière <[email protected]>
InseeFr · Dec 4, 2023 · 5420d06 · 5420d06
1 parent bd48c5d
commit 5420d06
Show file tree

Hide file tree

Showing 7 changed files with 858 additions and 199 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sonor",
-  "version": "0.5.19",
+  "version": "0.5.20",
   "private": true,
   "dependencies": {
     "@testing-library/jest-dom": "^4.2.4",

diff --git a/src/components/Terminated/Terminated.css b/src/components/Terminated/Terminated.css
@@ -1,21 +1,23 @@
-
 /* Column sizes */
 
-#TerminatedTableContainer .ColCampaign{
-  width: 28%;
+#TerminatedTableContainer .ColCampaign {
+  width: 21%;
 }
-#TerminatedTableContainer .ColId{
+#TerminatedTableContainer .ColId {
   width: 16%;
 }
-#TerminatedTableContainer .ColInterviewer{
-  width: 22%;
+#TerminatedTableContainer .ColInterviewer {
+  width: 21%;
 }
-#TerminatedTableContainer .ColFinalizationDate{
+#TerminatedTableContainer .ColFinalizationDate {
   width: 14%;
 }
-#TerminatedTableContainer .ColReading{
+#TerminatedTableContainer .ColContactOutcome {
   width: 10%;
 }
-#TerminatedTableContainer .ColAction{
+#TerminatedTableContainer .ColReading {
+  width: 8%;
+}
+#TerminatedTableContainer .ColAction {
   width: 10%;
-}
+}
diff --git a/src/components/Terminated/TerminatedTable.jsx b/src/components/Terminated/TerminatedTable.jsx
@@ -102,9 +102,8 @@ class TerminatedTable extends React.Component {
           {data.id}
         </td>
         <td className="ColInterviewer">{`${data.interviewer.interviewerLastName} ${data.interviewer.interviewerFirstName}`}</td>
-        <td className="ColFinalizationDate">{`${Utils.convertToDateString(
-          data.finalizationDate
-        )}`}</td>
+        <td className="ColFinalizationDate">{`${Utils.convertToDateString(data.finalizationDate)}`}</td>
+        <td className="ColContactOutcome">{D[data.contactOutcome]}</td>
         <td className="ColReading">{data.reading ? D.yes : D.no}</td>
         <td className="ColAction">
           <OverlayTrigger
@@ -253,7 +252,13 @@ class TerminatedTable extends React.Component {
                 </th>
                 <th
                   rowSpan="2"
-                  onClick={handleSortFunct("reading")}
+                  className="Clickable ColContactOutcome"
+                >
+                  {D.contact}
+                </th>
+                <th
+                  rowSpan="2"
+                  onClick={handleSortFunct('reading')}
                   className="Clickable ColReading"
                 >
                   <SortIcon val="reading" sort={sort} />