From a6ef29d546897109d23a48f54fe4e9480122501f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bernardo=20Mart=C3=ADnez=20Garrido?= Date: Mon, 20 Jul 2015 11:23:57 +0200 Subject: [PATCH 1/3] Added score option. --- .../mera/match/templates/macro/mera_options.html | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/cwr_webclient/view/mera/match/templates/macro/mera_options.html b/cwr_webclient/view/mera/match/templates/macro/mera_options.html index db1082d..6e740d1 100644 --- a/cwr_webclient/view/mera/match/templates/macro/mera_options.html +++ b/cwr_webclient/view/mera/match/templates/macro/mera_options.html @@ -8,6 +8,20 @@

+

General

+ +
+ + +
+ + +
+
+

Blocking

From 2903e5d9ed7a63e9061ac215a6e2a033956511d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bernardo=20Mart=C3=ADnez=20Garrido?= Date: Mon, 20 Jul 2015 11:56:09 +0200 Subject: [PATCH 2/3] Added support for match feedback --- cwr_webclient/app.py | 4 +++- cwr_webclient/service/cwr_service.py | 17 ++++++++++++++++- .../cwr/file/templates/cwr_file_listing.html | 8 ++++++++ cwr_webclient/view/mera/match/routes.py | 11 +++++++++++ 4 files changed, 38 insertions(+), 2 deletions(-) diff --git a/cwr_webclient/app.py b/cwr_webclient/app.py index 0bf4721..e4467fe 100644 --- a/cwr_webclient/app.py +++ b/cwr_webclient/app.py @@ -70,13 +70,15 @@ def _load_services(app, config): match_begin = admin_ws + 'match/begin/' match_reject = admin_ws + 'match/reject/' match_accept = admin_ws + 'match/confirm/' + match_feedback = admin_ws + 'match/feedback/' service_admin = WSCWRService(process_cwr, files, remove_cwr, match_begin, match_reject, - match_accept) + match_accept, + match_feedback) app.config['CWR_ADMIN_SERVICE'] = service_admin app.config['PAGINATION_SERVICE'] = DefaultPaginationService( diff --git a/cwr_webclient/service/cwr_service.py b/cwr_webclient/service/cwr_service.py index 43779a1..a72811e 100644 --- a/cwr_webclient/service/cwr_service.py +++ b/cwr_webclient/service/cwr_service.py @@ -35,7 +35,7 @@ def get_file(self, file_id): class WSCWRService(CWRService): def __init__(self, url, url_files, url_file_delete, url_match_begin, - url_match_reject, url_match_confirm): + url_match_reject, url_match_confirm, url_match_feedback): super(WSCWRService, self).__init__() self._url = url self._url_files = url_files @@ -43,6 +43,7 @@ def __init__(self, url, url_files, url_file_delete, url_match_begin, self._url_match_begin = url_match_begin self._url_match_reject = url_match_reject self._url_match_confirm = url_match_confirm + self._url_match_feedback = url_match_feedback def process(self, file_data): data = {} @@ -79,6 +80,20 @@ def begin_match(self, file_id, config): except (ConnectionError, ValueError): _logger.info('Error asking for match') + def send_feedback(self, file_id): + headers = {'Accept': 'application/json', + 'Content-Type': 'application/json'} + + data = {} + data['file_id'] = file_id + + data = json.dumps(data) + + try: + requests.post(self._url_match_feedback, data=data, headers=headers) + except (ConnectionError, ValueError): + _logger.info('Error sending feedback') + def reject_match(self, file_id, pos): headers = {'Accept': 'application/json', 'Content-Type': 'application/json'} diff --git a/cwr_webclient/view/cwr/file/templates/cwr_file_listing.html b/cwr_webclient/view/cwr/file/templates/cwr_file_listing.html index 347a17e..011daed 100644 --- a/cwr_webclient/view/cwr/file/templates/cwr_file_listing.html +++ b/cwr_webclient/view/cwr/file/templates/cwr_file_listing.html @@ -23,6 +23,7 @@

Users

Contents Matching + Feedback Delete @@ -81,6 +82,13 @@

Users

{% endif %} {% endif %} {% endif %} + {% if file.match_status == 'done' %} + + Send + + {% else %} + Needs match + {% endif %} ', methods=['GET']) +def feedback(file_id): + _logger.info('Sending feedback for id %s' % file_id) + + match_service = current_app.config['CWR_ADMIN_SERVICE'] + + match_service.send_feedback(file_id) + + return redirect(url_for('cwr_file.list')) + + @mera_match_blueprint.route('/reject/', methods=['GET']) def reject_match(file_id, pos): From 503023707281e9c72ddedba7dee0fd4b732b3254 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bernardo=20Mart=C3=ADnez=20Garrido?= Date: Mon, 20 Jul 2015 12:00:14 +0200 Subject: [PATCH 3/3] Corrected tests. --- tests/service/test_cwr.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/service/test_cwr.py b/tests/service/test_cwr.py index 33a15ba..9e6dc1c 100644 --- a/tests/service/test_cwr.py +++ b/tests/service/test_cwr.py @@ -16,6 +16,7 @@ def setUp(self): 'http://127.0.0.1:1', 'http://127.0.0.1:1', 'http://127.0.0.1:1', + 'http://127.0.0.1:1', 'http://127.0.0.1:1') def test_process(self):