diff --git a/app/resources/locales/en_US/default.po b/app/resources/locales/en_US/default.po
index 126ee41ff..ad62d121e 100644
--- a/app/resources/locales/en_US/default.po
+++ b/app/resources/locales/en_US/default.po
@@ -659,6 +659,18 @@ msgstr "Filter"
msgid "match.op.go"
msgstr "Go"
+msgid "match.op.highlight"
+msgstr "Highlight:"
+
+msgid "match.op.highlight.both"
+msgstr "both"
+
+msgid "match.op.highlight.differences"
+msgstr "differences"
+
+msgid "match.op.highlight.matches"
+msgstr "matches"
+
msgid "match.op.last"
msgstr "Last"
diff --git a/app/templates/Matchgrids/reconcile.php b/app/templates/Matchgrids/reconcile.php
index d4dcbb1c5..589cb984e 100644
--- a/app/templates/Matchgrids/reconcile.php
+++ b/app/templates/Matchgrids/reconcile.php
@@ -75,8 +75,17 @@
// Test for content and equality between the row's attribute values and
// set the third "match?" column to true (1) if non-empty equality found
$canAttr[$i][2] = !empty($canAttr[$i][1][0]) && count(ArrayUtil::array_iunique($canAttr[$i][1])) === 1 ? 1 : 0;
-
}
+
+ // Move request_time and resolution_time to the bottom
+ $tempArr = [];
+ foreach ($canAttr as $key => $val) {
+ if($val[0] == 'request_time' || $val[0] == 'resolution_time') {
+ $tempArr[] = $val;
+ unset($canAttr[$key]);
+ }
+ }
+ $canAttr = array_merge($canAttr, $tempArr);
?>
@@ -84,9 +93,23 @@
= __('match.op.reconcile.requests'); ?>
-
+
-
+
|
@@ -135,12 +158,29 @@
-
- >
+
+
| = $canAttr[$i][0] ?> |
$val): ?>
-
+
= $this->Html->link(
$val,
['controller' => 'matchgrid-records',
@@ -156,4 +196,14 @@
|
-
\ No newline at end of file
+
+
+
\ No newline at end of file
diff --git a/app/webroot/css/co-base.css b/app/webroot/css/co-base.css
index 075d43907..342ebc117 100644
--- a/app/webroot/css/co-base.css
+++ b/app/webroot/css/co-base.css
@@ -724,9 +724,33 @@ body.logged-in #top-menu {
#reconcile-table tr:nth-child(2n+1) td {
background-color: var(--cmg-color-white);
}
-#reconcile-table tr.match td {
+#reconcile-table.view-mode-match tr.match td,
+#reconcile-table.view-mode-both tr.match td {
background-color: var(--cmg-color-green-003);
}
+#reconcile-table.view-mode-diff tr.diff td,
+#reconcile-table.view-mode-both tr.diff td {
+ background-color: var(--cmg-color-yellow-003);
+}
+#reconcile-table tr.defined-attr th {
+ background-color: var(--cmg-color-lightgray-001);
+ border-left: 4px solid var(--cmg-color-lightgray-007);
+}
+#reconcile-table tr.defined-attr td:last-child {
+ border-right: 2px solid var(--cmg-color-lightgray-007);
+}
+#reconcile-table tr.matr-sorid th,
+#reconcile-table tr.matr-sorid td {
+ border-bottom: 2px solid var(--cmg-color-lightgray-007);
+}
+#reconcile-table tr.matr-request_time th,
+#reconcile-table tr.matr-request_time td {
+ border-top: 2px solid var(--cmg-color-lightgray-007);
+}
+/* view-controls */
+.view-controls-title {
+ margin-right: 1em;
+}
/* MATCHGRID MANAGEMENT */
#matchgrid-management {
padding: 0;
diff --git a/app/webroot/css/co-color.css b/app/webroot/css/co-color.css
index b5243f0a6..a9479ad62 100644
--- a/app/webroot/css/co-color.css
+++ b/app/webroot/css/co-color.css
@@ -63,7 +63,7 @@
--cmg-color-yellow-001: #f5f5bb; /* yellow warning */
--cmg-color-yellow-002: #fbec88; /* infobox informational area */
- --cmg-color-yellow-003: #ffd; /* forms: focused input */
+ --cmg-color-yellow-003: #ffd; /* forms: focused input; diffing fields for reconciliation */
--cmg-color-red-001: #fcc; /* red warning */
--cmg-color-red-002: #c00; /* forms: error icons */