Download as
Browse Code »

Commit 06f9fbc3f683bd03ac2a04c69f1fde9fee31ffde

Authored by Adabriand Furtado
1 parent 7a1e3356
Exists in master and in 1 other branch dynamic

Correções na tela de sinais ensinados e novos parâmetros de configuração.

Showing 6 changed files with 16 additions and 20 deletions   Show diff stats
settings_local.py.tmpl
  Diff comments   View file @06f9fbc
... ... @@ -4,6 +4,8 @@ SERVER_HOST = "localhost"
4 4 SERVER_PORT = 8003
5 5 AGREEMENT_NUMBER = 2
6 6 API_HOST = "http://localhost:5001"
  7 +UPLOAD_SIGN_HOST = "http://150.165.205.112:3000/addsinal"
  8 +HOMEPAGE_URL = "http://150.165.205.112"
7 9  
8 10 # Apache Configuration
9 11 APACHE_HOST = False
... ...
view/assets/js/submit-sign.js
  Diff comments   View file @06f9fbc
1 1 (function(submitSign, $, undefined) {
2 2  
3   - var submitUrl = 'http://150.165.205.112:3000/addsinal';
  3 + var submitUrl = '';
4 4  
5 5 function _isEmpty(str) {
6 6 return (!str || 0 === str.length);
... ... @@ -33,7 +33,8 @@
33 33 $('#input-sign-upload').show();
34 34 }
35 35  
36   - submitSign.setup = function() {
  36 + submitSign.setup = function(uploadSignHost) {
  37 + submitUrl = uploadSignHost;
37 38 $('#submit-sign-container form').fileupload(
38 39 {
39 40 url : submitUrl,
... ...
view/assets/js/teached-signs.js
  Diff comments   View file @06f9fbc
... ... @@ -3,7 +3,7 @@
3 3 var totalTasks = 0;
4 4 var doneTasks = 0;
5 5 var userId = -1;
6   - var pybossaUrl = '/';
  6 + var pybossaUrl = '/pybossa/';
7 7 var projectname = 'wikilibras';
8 8 var projectId = -1;
9 9  
... ... @@ -42,6 +42,7 @@
42 42  
43 43 function _createSigns(answers) {
44 44 _updateTeachedSignsMessage();
  45 + $("#signs-list-container").html("");
45 46 for (i = 0; i < answers.length; i++) {
46 47 _addSign(answers[i].info);
47 48 }
... ... @@ -73,7 +74,6 @@
73 74 }
74 75  
75 76 function _updateTeachedSignsContainer() {
76   - $("#signs-list-container").html("");
77 77 _getAnswers().done(function(answers) {
78 78 _createSigns(answers);
79 79 });
... ... @@ -91,18 +91,8 @@
91 91 doneTasks = response.done;
92 92 userId = response.user_id;
93 93 _updateTeachedSignsContainer();
94   -
95   - console.log(totalTasks);
96   - console.log(doneTasks);
97   - console.log(userId);
98 94 });
99 95 });
100 96 };
101 97  
102   - teachedSigns.addNewSignal = function(answer) {
103   - doneTasks = doneTasks + 1;
104   - _updateTeachedSignsMessage();
105   - _addSign(answer);
106   - }
107   -
108 98 }(window.teachedSigns = window.teachedSigns || {}, jQuery));
... ...
view/assets/js/wikilibras.js
  Diff comments   View file @06f9fbc
... ... @@ -4,6 +4,7 @@
4 4 var base_url = '';
5 5 var server_backend_url = '';
6 6 var api_url = '';
  7 + var upload_signs_url = '';
7 8 var current_task_id = -1;
8 9 var tmpParameterJSON = {};
9 10 var parsedParameterJSON = {};
... ... @@ -447,7 +448,6 @@
447 448  
448 449 function _saveAnswer(task, deferred, answer) {
449 450 pybossa.saveTask(task.id, answer).done(function() {
450   - teachedSigns.addNewSignal(answer);
451 451 setTimeout(function() {
452 452 $("#thanks-screen").hide();
453 453 deferred.resolve();
... ... @@ -466,7 +466,7 @@
466 466 function _loadMainComponents(task) {
467 467 dynengine.load();
468 468 dynworkflow.load();
469   - submitSign.setup();
  469 + submitSign.setup(upload_signs_url);
470 470 teachedSigns.setup();
471 471 }
472 472  
... ... @@ -483,15 +483,18 @@
483 483  
484 484 // Private methods
485 485 function _run(projectname) {
  486 + pybossa.setEndpoint("/pybossa");
486 487 pybossa.run(projectname);
487 488 }
488 489  
489 490 // Public methods
490   - wikilibras.run = function(serverhost, serverbackend, projectname, apihost) {
  491 + wikilibras.run = function(serverhost, serverbackend, projectname,
  492 + apihost, uploadsignshost) {
491 493 base_url = serverhost;
492 494 server_backend_url = serverbackend;
493 495 videos_url = base_url + "/videos/";
494 496 api_url = apihost;
  497 + upload_signs_url = uploadsignshost;
495 498 _run(projectname);
496 499 };
497 500  
... ...
view/template.html
  Diff comments   View file @06f9fbc
1 1 <link rel="stylesheet" href="{{ server }}/assets/css/main.css">
2 2 <span id="server-url" data-url="{{ server }}" class="hidden" hidden>server-url</span>
3 3  
4   -<a href="http://150.165.205.112" class="wl-logo"> <img
  4 +<a href="{{ homepage_url }}" class="wl-logo"> <img
5 5 src="{{ server }}/img/logo.svg">
6 6 </a>
7 7 <nav class="navbar navbar-default navbar-wl">
... ... @@ -344,5 +344,5 @@
344 344  
345 345 <script type="text/javascript">
346 346 wikilibras.run("{{ server }}", "{{ server_backend }}",
347   - "{{ app_shortname }}", "{{ api_host }}");
  347 + "{{ app_shortname }}", "{{ api_host }}", "{{ upload_sign_host }}");
348 348 </script>
349 349 \ No newline at end of file
... ...
wikilibras.py
  Diff comments   View file @06f9fbc
... ... @@ -33,7 +33,7 @@ class Wikilibras:
33 33  
34 34 def __update_project_info(self, project):
35 35 template = self.env.get_template('template.html')
36   - project.info['task_presenter'] = template.render(server=self.config['HOST_STATIC_FILES_ENDPOINT'], server_backend=self.config['HOST_ENDPOINT'], app_shortname=self.config['PYBOSSA_APP_SHORT_NAME'], api_host=self.config['API_HOST'])
  36 + project.info['task_presenter'] = template.render(server=self.config['HOST_STATIC_FILES_ENDPOINT'], server_backend=self.config['HOST_ENDPOINT'], app_shortname=self.config['PYBOSSA_APP_SHORT_NAME'], api_host=self.config['API_HOST'], homepage_url=self.config['HOMEPAGE_URL'], upload_sign_host=self.config['UPLOAD_SIGN_HOST'])
37 37 project.info['thumbnail'] = self.config['HOST_STATIC_FILES_ENDPOINT'] + "/img/thumbnail.png"
38 38 project.info['sched'] = "incremental"
39 39 project.allow_anonymous_contributors = False
... ...