From cc71f7f64fdcd50fd4df670d13d2d25b91fb53f7 Mon Sep 17 00:00:00 2001 From: Owen Stephens Date: Mon, 4 Dec 2017 09:45:24 +0000 Subject: [PATCH 1/3] Remove qaResult option from backend --- main/src/com/google/refine/model/Recon.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/main/src/com/google/refine/model/Recon.java b/main/src/com/google/refine/model/Recon.java index 9b29f383b..ff7e04fc8 100644 --- a/main/src/com/google/refine/model/Recon.java +++ b/main/src/com/google/refine/model/Recon.java @@ -84,8 +84,7 @@ public class Recon implements HasFields, Jsonizable { static final public int Feature_nameMatch = 1; static final public int Feature_nameLevenshtein = 2; static final public int Feature_nameWordDistance = 3; - static final public int Feature_qaResult = 4; - static final public int Feature_max = 5; + static final public int Feature_max = 4; static final protected Map s_featureMap = new HashMap(); static { @@ -93,7 +92,6 @@ public class Recon implements HasFields, Jsonizable { s_featureMap.put("nameMatch", Feature_nameMatch); s_featureMap.put("nameLevenshtein", Feature_nameLevenshtein); s_featureMap.put("nameWordDistance", Feature_nameWordDistance); - s_featureMap.put("qaResult", Feature_qaResult); } final public long id; From 9a4cf5ca0ae04fe36bc9b8570a7664bf7afc048d Mon Sep 17 00:00:00 2001 From: Owen Stephens Date: Mon, 4 Dec 2017 09:45:50 +0000 Subject: [PATCH 2/3] Re-organise reconcile menu, removing qaResult --- .../views/data-table/menu-reconcile.js | 76 +++++++------------ 1 file changed, 28 insertions(+), 48 deletions(-) diff --git a/main/webapp/modules/core/scripts/views/data-table/menu-reconcile.js b/main/webapp/modules/core/scripts/views/data-table/menu-reconcile.js index 0db5be2e6..d67654747 100644 --- a/main/webapp/modules/core/scripts/views/data-table/menu-reconcile.js +++ b/main/webapp/modules/core/scripts/views/data-table/menu-reconcile.js @@ -214,6 +214,34 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) { } ); } + }, + { + id: "core/by-judgment-actions", + label: $.i18n._('core-views')["judg-actions"], + click: function() { + ui.browsingEngine.addFacet( + "list", + { + "name" : column.name + " "+$.i18n._('core-views')["judg-actions2"], + "columnName" : column.name, + "expression" : "cell.recon.judgmentAction" + } + ); + } + }, + { + id: "core/by-judgment-history-entries", + label: $.i18n._('core-views')["judg-hist"], + click: function() { + ui.browsingEngine.addFacet( + "list", + { + "name" : column.name + " "+$.i18n._('core-views')["hist-entries"], + "columnName" : column.name, + "expression" : "cell.recon.judgmentHistoryEntry" + } + ); + } }, {}, { @@ -319,54 +347,6 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) { } ] }, - { - id: "core/qa-facets", - label: $.i18n._('core-views')["qa-facets"], - submenu: [ - { - id: "core/by-qa-results", - label: $.i18n._('core-views')["qa-results"], - click: function() { - ui.browsingEngine.addFacet( - "list", - { - "name" : column.name + " "+$.i18n._('core-views')["qa-results2"], - "columnName" : column.name, - "expression" : "cell.recon.features.qaResult" - } - ); - } - }, - { - id: "core/by-judgment-actions", - label: $.i18n._('core-views')["judg-actions"], - click: function() { - ui.browsingEngine.addFacet( - "list", - { - "name" : column.name + " "+$.i18n._('core-views')["judg-actions2"], - "columnName" : column.name, - "expression" : "cell.recon.judgmentAction" - } - ); - } - }, - { - id: "core/by-judgment-history-entries", - label: $.i18n._('core-views')["judg-hist"], - click: function() { - ui.browsingEngine.addFacet( - "list", - { - "name" : column.name + " "+$.i18n._('core-views')["hist-entries"], - "columnName" : column.name, - "expression" : "cell.recon.judgmentHistoryEntry" - } - ); - } - } - ] - }, { id: "core/actions", label: $.i18n._('core-views')["actions"], From 06919f5f04a8525e92385230c063134fafaeefdc Mon Sep 17 00:00:00 2001 From: Owen Stephens Date: Mon, 4 Dec 2017 09:46:31 +0000 Subject: [PATCH 3/3] Update lang files for re-organisation of Reconcile facets menu --- main/webapp/modules/core/langs/translation-en.json | 10 ++++------ main/webapp/modules/core/langs/translation-es.json | 2 -- main/webapp/modules/core/langs/translation-fr.json | 2 -- main/webapp/modules/core/langs/translation-he.json | 2 -- main/webapp/modules/core/langs/translation-jp.json | 2 -- main/webapp/modules/core/langs/translation-ru.json | 2 -- main/webapp/modules/core/langs/translation-zh.json | 10 ++++------ 7 files changed, 8 insertions(+), 22 deletions(-) diff --git a/main/webapp/modules/core/langs/translation-en.json b/main/webapp/modules/core/langs/translation-en.json index 365724170..51575a221 100644 --- a/main/webapp/modules/core/langs/translation-en.json +++ b/main/webapp/modules/core/langs/translation-en.json @@ -478,12 +478,10 @@ "best-cand-word-sim": "best candidate's name word similarity", "best-type": "Best candidate's types", "qa-facets": "QA facets", - "qa-results": "QA results", - "qa-results2": "QA Results", - "judg-actions": "Judgment actions", - "judg-actions2": "Judgment Actions", - "judg-hist": "Judgment history entries", - "hist-entries": "History Entries", + "judg-actions": "Judgment action type", + "judg-actions2": "Judgment Action type", + "judg-hist": "Judgment action timestamp", + "hist-entries": "Judgment action timestamp", "actions": "Actions", "best-cand": "Match each cell to its best candidate", "best-cand2": "Match each cell to its best candidate in this column for all current filtered rows", diff --git a/main/webapp/modules/core/langs/translation-es.json b/main/webapp/modules/core/langs/translation-es.json index e4d5ac86f..86cdf73aa 100644 --- a/main/webapp/modules/core/langs/translation-es.json +++ b/main/webapp/modules/core/langs/translation-es.json @@ -454,8 +454,6 @@ "best-cand-word-sim": "Por semejanza del nombre del mejor candidato", "best-type": "Por elemento de consulta", "qa-facets": "Verificar Facetas", - "qa-results": "Verificar resultados", - "qa-results2": "Verificar Resultados", "judg-actions": "Acciones del parámetro", "judg-actions2": "acciones del parámetro", "judg-hist": "Entradas del parámetro", diff --git a/main/webapp/modules/core/langs/translation-fr.json b/main/webapp/modules/core/langs/translation-fr.json index 79a002c13..fcce19c56 100644 --- a/main/webapp/modules/core/langs/translation-fr.json +++ b/main/webapp/modules/core/langs/translation-fr.json @@ -436,7 +436,6 @@ "create-topic-cell": "Créer un nouveau sujet pour cette cellule", "move-to-left": "Déplacer la colonne à gauche", "keep-or": "conserver l’original", - "qa-facets": "Facettes AQ", "discard-judg2": "Rejeter les avis de réconciliation dans cette colonne pout toutes les lignes actuellement filtrées", "list-int": "Liste les longueurs en les séparant par des virgules, par exemple 5, 7, 15", "flag-rows": "Marquer les lignes", @@ -567,7 +566,6 @@ "flagged-rows": "Lignes marquées", "no-settings": "Aucun paramètre n'est disponible pour cette propriété.", "transp-cell-row": "Transposer les cellules de plusieurs colonnes en lignes", - "qa-results2": "Résultats AQ", "not-valid-number": "Nombre invalide.", "reconcile": "Réconcilier", "starred-rows": "Lignes étoilées", diff --git a/main/webapp/modules/core/langs/translation-he.json b/main/webapp/modules/core/langs/translation-he.json index 600103e7f..589dbc8b9 100644 --- a/main/webapp/modules/core/langs/translation-he.json +++ b/main/webapp/modules/core/langs/translation-he.json @@ -464,8 +464,6 @@ "best-cand-word-sim": "דמיון מילולי בשם המועמד הטוב ביותר", "best-type": "סוגי המועמד הטוב ביותר", "qa-facets": "שות היבטים/פנים", - "qa-results": "שו''ת תוצאות", - "qa-results2": "שו''ת תוצאות", "judg-actions": "פעולות שיקולים", "judg-actions2": "פעולות שיקולים", "judg-hist": "היסטוריית ערכי שיקולים", diff --git a/main/webapp/modules/core/langs/translation-jp.json b/main/webapp/modules/core/langs/translation-jp.json index 05e9ba5c0..eccdc0741 100644 --- a/main/webapp/modules/core/langs/translation-jp.json +++ b/main/webapp/modules/core/langs/translation-jp.json @@ -454,8 +454,6 @@ "best-cand-word-sim": "最良の候補name word similarity", "best-type": "最良の候補タイプ", "qa-facets": "QAファセット", - "qa-results": "QA結果", - "qa-results2": "QA結果", "judg-actions": "判断 actions", "judg-actions2": "判断 Actions", "judg-hist": "判断履歴エントリー", diff --git a/main/webapp/modules/core/langs/translation-ru.json b/main/webapp/modules/core/langs/translation-ru.json index 477c1fcc4..b0fefdbfd 100644 --- a/main/webapp/modules/core/langs/translation-ru.json +++ b/main/webapp/modules/core/langs/translation-ru.json @@ -501,8 +501,6 @@ "best-cand-word-sim": "сходство названия лучшего кандидата", "best-type": "Типы лучшего кандидата", "qa-facets": "QA фасеты", - "qa-results": "QA результаты", - "qa-results2": "QA Результаты", "judg-actions": "Действия над решениями сверки", "judg-actions2": "Действия над решениями сверки", "judg-hist": "Записи истории решений сверки", diff --git a/main/webapp/modules/core/langs/translation-zh.json b/main/webapp/modules/core/langs/translation-zh.json index 27c2eebc8..38ead9797 100644 --- a/main/webapp/modules/core/langs/translation-zh.json +++ b/main/webapp/modules/core/langs/translation-zh.json @@ -454,12 +454,10 @@ "best-cand-word-sim": "best candidate's name word similarity", "best-type": "Best candidate's types", "qa-facets": "QA facets", - "qa-results": "QA results", - "qa-results2": "QA Results", - "judg-actions": "Judgment actions", - "judg-actions2": "Judgment Actions", - "judg-hist": "Judgment history entries", - "hist-entries": "History Entries", + "judg-actions": "Judgment action type", + "judg-actions2": "Judgment Action type", + "judg-hist": "Judgment action timestamp", + "hist-entries": "Judgment action timestamps", "actions": "Actions", "best-cand": "Match each cell to its best candidate", "best-cand2": "Match each cell to its best candidate in this column for all current filtered rows",