diff --git a/view/assets/css/articulation.css b/view/assets/css/articulation.css index 091644b..2eab074 100644 --- a/view/assets/css/articulation.css +++ b/view/assets/css/articulation.css @@ -62,7 +62,7 @@ margin-right: 0 } -.grid .grid-selectors .grid-row .ball-selector .point-a-selector { +.grid .grid-selectors .grid-row .ball-selector .point-selector { margin-left: -.5px; margin-top: -7.5px } diff --git a/view/assets/css/main.css b/view/assets/css/main.css index 94acbfe..76033e9 100644 --- a/view/assets/css/main.css +++ b/view/assets/css/main.css @@ -410,8 +410,9 @@ ul.rig.columns-4 li { } /* Hand Configuration */ -#moviment-type { - display: none; +.rectilinear-point-label { + font-weight: bold; + color: #000000; } /* Render Screen */ @@ -463,4 +464,7 @@ ul.rig.columns-4 li { #completed-all-task-msg { display: none; -} \ No newline at end of file +} + + + diff --git a/view/assets/js/articulation.js b/view/assets/js/articulation.js index 9f501a4..bf01a81 100644 --- a/view/assets/js/articulation.js +++ b/view/assets/js/articulation.js @@ -1,19 +1,27 @@ (function(articulation, $, undefined) { var server_host = ''; - var selectedY = ''; - function _updateASelector(container, ballSelector) { + function _updateASelector(container, ballSelector, step) { + var pointSelector = parseInt(step) == 2 ? "A" : "B"; $(container + ' .ball-selector.active').each(function() { - $(this).removeClass('active'), $(this).find('.point-a-selector').remove(); - }), ballSelector.addClass('active'), ballSelector.append('
'); + $(this).removeClass('active'), $(this).find('.point-selector').remove(); + }), ballSelector.addClass('active'), ballSelector.append('
'); + } + + function _getSelectedY(hand, subConfig, step) { + step = parseInt(step) - 1; + var previousStepId = '.selection-panel-body[mainConfig=' + hand + '][subConfig=' + + subConfig + '][step=' + step + '] .module-x-y'; + return $(previousStepId).attr("data-y"); } - function _setupModuleZ(hand) { + function _setupModuleZ(hand, subConfig, step, selectedY) { if (typeof selectedY == 'undefined' || selectedY == '') return; - var base_id = '.selection-panel-body[mainConfig=' + hand + '][subConfig=articulacao][step=2]'; + var base_id = '.selection-panel-body[mainConfig=' + hand + '][subConfig=' + + subConfig + '][step=' + step + ']'; var articulation_z = base_id + ' .module-z'; $(articulation_z + ' .ball-selector').hide(); $(articulation_z + ' .row-number-' + selectedY + ' .ball-selector').show(); @@ -21,12 +29,13 @@ var z = $(articulation_z).attr('data-z'); if (typeof z != 'undefined') { var ball_selector = $(articulation_z + ' .row-number-' + selectedY + ' .ball-' + z); - _updateASelector(articulation_z, ball_selector); + _updateASelector(articulation_z, ball_selector, step); } } - function _setupBallSelectorXY(hand) { - var base_id = '.selection-panel-body[mainConfig=' + hand + '][subConfig=articulacao][step=1]'; + function _setupBallSelectorXY(hand, subConfig, step) { + var base_id = '.selection-panel-body[mainConfig=' + hand + + '][subConfig=' + subConfig + '][step=' + step + ']'; var articulation_x_y = base_id + ' .module-x-y'; $(articulation_x_y + ' .ball-selector').off('click').on('click', function(a) { var b = $(a.target); @@ -38,17 +47,20 @@ d = $(articulation_x_y), f = b.attr('data-x'), g = c.attr('data-y'); - d.attr('data-x', f), d.attr('data-y', g), _updateASelector(articulation_x_y, b); - selectedY = g; - _setupModuleZ(hand); + d.attr('data-x', f), d.attr('data-y', g); + + var nextStep = parseInt(step) + 1; + _updateASelector(articulation_x_y, b, nextStep); + _setupModuleZ(hand, subConfig, nextStep, g); - wikilibras.updateTempParameterJSON(hand, 'articulacao', '1', f + ';' + g); + wikilibras.updateTempParameterJSON(hand, subConfig, step, f + ';' + g); dynworkflow.userSelectedAnOption(); }); } - function _setupBallSelectorZ(hand) { - var base_id = '.selection-panel-body[mainConfig=' + hand + '][subConfig=articulacao][step=2]'; + function _setupBallSelectorZ(hand, subConfig, step) { + var base_id = '.selection-panel-body[mainConfig=' + hand + + '][subConfig=' + subConfig + '][step=' + step + ']'; var articulation_z = base_id + ' .module-z'; $(articulation_z + ' .ball-selector').off('click').on('click', function(a) { var b = $(a.target); @@ -59,18 +71,13 @@ var c = b.parent('.grid-row'), e = $(articulation_z), h = b.attr('data-z'); - b.attr('data-z') && e.attr('data-z', h), _updateASelector(articulation_z, b); + b.attr('data-z') && e.attr('data-z', h), _updateASelector(articulation_z, b, step); - wikilibras.updateTempParameterJSON(hand, 'articulacao', '2', h); + wikilibras.updateTempParameterJSON(hand, subConfig, step, h); dynworkflow.userSelectedAnOption(); }); } - function _updateParameterJSON(hand) { - var value = _readValue(hand); - wikilibras.updateParameterJSON('articulacao', value); - } - function _calculateArticulationPointIndex(hand, xValue, yValue, zValue) { var x = xValue; var y = yValue; @@ -91,15 +98,17 @@ return _calculateArticulationPointIndex(hand, xValue, yValue, zValue); }; - articulation.setupModuleXY = function(serverhost, hand) { + articulation.setupModuleXY = function(serverhost, hand, subConfig, step) { server_host = serverhost; - _setupBallSelectorXY(hand); + _setupBallSelectorXY(hand, subConfig, step); }; - articulation.setupModuleZ = function(serverhost, hand) { + articulation.setupModuleZ = function(serverhost, hand, subConfig, step) { server_host = serverhost; - _setupBallSelectorZ(hand); - _setupModuleZ(hand); + _setupBallSelectorZ(hand, subConfig, step); + + var selectedY = _getSelectedY(hand, subConfig, step); + _setupModuleZ(hand, subConfig, step, selectedY); }; }(window.articulation = window.articulation || {}, jQuery)); diff --git a/view/assets/js/configuration.js b/view/assets/js/configuration.js index 70e257a..350c25b 100644 --- a/view/assets/js/configuration.js +++ b/view/assets/js/configuration.js @@ -1,27 +1,40 @@ (function(configuration, $, undefined) { - configuration.setupFingersGroup = function(hand) { - var baseId = '.selection-panel-body[mainConfig=' + hand + '][subConfig=configuracao][step=1]'; + configuration.setupFingersGroup = function(hand, subConfig, step) { + var baseId = '.selection-panel-body[mainConfig=' + hand + '][subConfig=' + + subConfig + '][step=' + step + ']'; $(baseId + ' .selection-panel-option' ).off('click').on('click', function() { wikilibras.selectAnOption(baseId, this); + _setupFingersToShow(hand, subConfig, step); + dynworkflow.userSelectedAnOption(); }); }; + + function _setupFingersToShow(hand, subConfig, step) { + var stepOneBaseId = '.selection-panel-body[mainConfig=' + hand + '][subConfig=' + + subConfig + '][step=' + step + ']'; + var nextStep = parseInt(step) + 1; + var stepTwoBaseId = '.selection-panel-body[mainConfig=' + hand + '][subConfig=' + + subConfig + '][step=' + nextStep + ']'; + + var finger_group = $(stepOneBaseId + ' .selection-panel-option[select=true]').attr('value'); + finger_group = typeof finger_group == 'undefined' ? '0' : finger_group; + $(stepTwoBaseId + ' .finger-group').hide(); + $(stepTwoBaseId + ' .finger-group[group=' + finger_group + ']').show(); + } - configuration.setupFingersPosition = function(hand) { - var stepTwoBaseId = '.selection-panel-body[mainConfig=' + hand + '][subConfig=configuracao][step=2]'; + configuration.setupFingersPosition = function(hand, subConfig, step) { + var stepTwoBaseId = '.selection-panel-body[mainConfig=' + hand + '][subConfig=' + + subConfig + '][step=' + step + ']'; $(stepTwoBaseId + ' .selection-panel-option').off('click').on( 'click', function() { wikilibras.selectAnOption(stepTwoBaseId, this); dynworkflow.userSelectedAnOption(); - }); - - var stepOneBaseId = '.selection-panel-body[mainConfig=' + hand + '][subConfig=configuracao][step=1]'; - var finger_group = $(stepOneBaseId + ' .selection-panel-option[select=true]').attr('value'); - finger_group = typeof finger_group == 'undefined' ? '0' : finger_group; - $(stepTwoBaseId + ' .finger-group').hide(); - $(stepTwoBaseId + ' .finger-group[group=' + finger_group + ']').show(); + }); + var previousStep = parseInt(step) - 1; + _setupFingersToShow(hand, subConfig, previousStep); }; }(window.configuration = window.configuration || {}, jQuery)); diff --git a/view/assets/js/dynamic-loading-engine.js b/view/assets/js/dynamic-loading-engine.js index 9a4697c..b0e66ed 100644 --- a/view/assets/js/dynamic-loading-engine.js +++ b/view/assets/js/dynamic-loading-engine.js @@ -10,6 +10,22 @@ return hand === 'right-hand'; }; + var replaceConfigurationTag = function(data, mainConfig) { + if (isRightHand(mainConfig)) { + return data.replace(/{{ configuracao }}/g, 'cmd'); + } else { + return data.replace(/{{ configuracao }}/g, 'cme'); + } + } + + var replaceOrientationTag = function(data, mainConfig) { + if (isRightHand(mainConfig)) { + return data.replace(/{{ orientacao }}/g, 'ord'); + } else { + return data.replace(/{{ orientacao }}/g, 'ore'); + } + } + if (matchSubConfig) { // case defined // There is no specific(right or left hand dependent) assets for: articulacao, duracao, expressao, movimento, transicao // Specific configurations: configuracao, orientacao @@ -19,19 +35,17 @@ // possible subconfigs that need changing switch (subConfig) { case 'configuracao': - if (isRightHand(currentMainConfig)) { - goodData = data.replace(/{{ configuracao }}/g, 'cmd'); - } else { - goodData = data.replace(/{{ configuracao }}/g, 'cme'); - } + goodData = replaceConfigurationTag(data, currentMainConfig); + break; + case 'configuracao-retilineo': + goodData = replaceConfigurationTag(data, currentMainConfig); break; case 'orientacao': - if (isRightHand(currentMainConfig)) { - goodData = data.replace(/{{ orientacao }}/g, 'ord'); - } else { - goodData = data.replace(/{{ orientacao }}/g, 'ore'); - } + goodData = replaceOrientationTag(data, currentMainConfig); break; + case 'orientacao-retilineo': + goodData = replaceOrientationTag(data, currentMainConfig); + break; default: console.log('No subConfig found'); } diff --git a/view/assets/js/dynamic-selection-workflow.js b/view/assets/js/dynamic-selection-workflow.js index c47ae0a..47a0262 100644 --- a/view/assets/js/dynamic-selection-workflow.js +++ b/view/assets/js/dynamic-selection-workflow.js @@ -201,8 +201,7 @@ $(timelineBaseId + ' .icon_container[json_name]').attr("active", "false"); for (var name in currentSubconfigParent) { - //$(timelineBaseId + ' .icon_container[json_name=' + name + ']').show(); - $(timelineBaseId + ' .icon_container[json_name]').attr("active", "true"); + $(timelineBaseId + ' .icon_container[json_name=' + name + ']').attr("active", "true"); } if (preprocessedMainConfig == 'hand') { diff --git a/view/assets/js/orientation.js b/view/assets/js/orientation.js index fc57365..9af260f 100644 --- a/view/assets/js/orientation.js +++ b/view/assets/js/orientation.js @@ -1,7 +1,8 @@ (function(orientation, $, undefined) { - orientation.setup = function(hand) { - var baseId = '.selection-panel-body[mainConfig=' + hand + '][subConfig=orientacao][step=1]'; + orientation.setup = function(hand, subConfig, step) { + var baseId = '.selection-panel-body[mainConfig=' + hand + '][subConfig=' + + subConfig + '][step=' + step + ']'; $(baseId + ' .selection-panel-option').off('click').on( 'click', function() { wikilibras.selectAnOption(baseId, this); diff --git a/view/assets/js/tmpJSONParser.js b/view/assets/js/tmpJSONParser.js index 8c82aff..9af79c3 100644 --- a/view/assets/js/tmpJSONParser.js +++ b/view/assets/js/tmpJSONParser.js @@ -35,30 +35,76 @@ movement_parameter_json['facial'][attr] = _parseParameterValue(parameterValue); } } + + function _parseHand(hand) { + var parsedHand = hand == 'right-hand' ? 'mao_direita' : hand; + parsedHand = hand == 'left-hand' ? 'mao_esquerda' : parsedHand; + return parsedHand; + } + + // Default parser + function _defaultMovementParser(tmpJSON, movementName, hand) { + var attrs = dynworkflow.getMovementParameters(movementName); + var parsedHand = _parseHand(hand); + + for (var i in attrs) { + var attr = attrs[i]; + var parameterValue = ''; + if (attr == 'configuracao') { + parameterValue = tmpJSON[hand][attr][1]; + } else if (attr == 'articulacao') { + parameterValue = articulation.processValue(hand, + tmpJSON[hand][attr]); + } else { + parameterValue = tmpJSON[hand][attr][0]; + } + movement_parameter_json[parsedHand][movementName][attr] = + _parseParameterValue(parameterValue); + } + } + + function _retilinearMovementParser(tmpJSON, movementName, hand) { + var attrs = dynworkflow.getMovementParameters(movementName); + var parsedHand = _parseHand(hand); + + for (var i in attrs) { + var attr = attrs[i]; + var initParameterValue = ''; + var endParameterValue = ''; + if (attr == 'configuracao-retilineo') { + initParameterValue = tmpJSON[hand][attr][1]; + endParameterValue = tmpJSON[hand][attr][3]; + } else if (attr == 'articulacao-retilineo') { + initSlice = tmpJSON[hand][attr].slice(0, 2); + endSlice = tmpJSON[hand][attr].slice(2, 4); + initParameterValue = articulation.processValue(hand, initSlice); + endParameterValue = articulation.processValue(hand, endSlice); + } else { + initParameterValue = tmpJSON[hand][attr][0]; + endParameterValue = tmpJSON[hand][attr][1]; + } + attr = attr.replace("-retilineo", ""); + var initAttr = attr + "_inicial"; + var endAttr = attr + "_final"; + movement_parameter_json[parsedHand][movementName][initAttr] = + _parseParameterValue(initParameterValue); + movement_parameter_json[parsedHand][movementName][endAttr] = + _parseParameterValue(endParameterValue); + } + } function _parseTempMovementParameterJSON(tmpJSON, hand) { var movimentConfig = tmpJSON[hand]['movimento']; if (typeof movimentConfig == 'undefined') return; var movementName = movimentConfig[0]; - var attrs = dynworkflow.getMovementParameters(movementName); - var parsedHand = hand == 'right-hand' ? 'mao_direita' : hand; - parsedHand = hand == 'left-hand' ? 'mao_esquerda' : parsedHand; + var parsedHand = _parseHand(hand); movement_parameter_json[parsedHand][movementName] = {}; - - for (var i in attrs) { - var attr = attrs[i]; - var parameterValue = ''; - if (attr == 'configuracao') { - parameterValue = tmpJSON[hand][attr][1]; - } else if (attr == 'articulacao') { - parameterValue = articulation.processValue(hand, - tmpJSON[hand][attr]); - } else { - parameterValue = tmpJSON[hand][attr][0]; - } - movement_parameter_json[parsedHand][movementName][attr] = - _parseParameterValue(parameterValue); + + if (movementName == 'retilineo') { + _retilinearMovementParser(tmpJSON, movementName, hand); + } else { + _defaultMovementParser(tmpJSON, movementName, hand); } } diff --git a/view/conf/selection-workflow-json b/view/conf/selection-workflow-json index 4709b9e..9a3f939 100644 --- a/view/conf/selection-workflow-json +++ b/view/conf/selection-workflow-json @@ -19,6 +19,11 @@ "velocidade" : ["passo-1"], "lado_oposto" : ["passo-1"], "sentido_inverso" : ["passo-1"] + }, + "retilineo" : { + "articulacao-retilineo": ["passo-1", "passo-2", "passo-3", "passo-4"], + "configuracao-retilineo": ["passo-1", "passo-2", "passo-3", "passo-4"], + "orientacao-retilineo": ["passo-1", "passo-2"] } } } diff --git a/view/hand/articulacao-retilineo/passo-1.html b/view/hand/articulacao-retilineo/passo-1.html new file mode 100644 index 0000000..7fd337b --- /dev/null +++ b/view/hand/articulacao-retilineo/passo-1.html @@ -0,0 +1,76 @@ +
+
+ Ponto inicial (A): onde começa o sinal? +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ diff --git a/view/hand/articulacao-retilineo/passo-2.html b/view/hand/articulacao-retilineo/passo-2.html new file mode 100644 index 0000000..8006ef7 --- /dev/null +++ b/view/hand/articulacao-retilineo/passo-2.html @@ -0,0 +1,38 @@ +
+
+ Ponto inicial (A): escolha a distância entre a mão e o corpo +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ diff --git a/view/hand/articulacao-retilineo/passo-3.html b/view/hand/articulacao-retilineo/passo-3.html new file mode 100644 index 0000000..06b1ab3 --- /dev/null +++ b/view/hand/articulacao-retilineo/passo-3.html @@ -0,0 +1,76 @@ +
+
+ Ponto final (B): onde termina o sinal? +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ diff --git a/view/hand/articulacao-retilineo/passo-4.html b/view/hand/articulacao-retilineo/passo-4.html new file mode 100644 index 0000000..5d91817 --- /dev/null +++ b/view/hand/articulacao-retilineo/passo-4.html @@ -0,0 +1,38 @@ +
+
+ Ponto final (B): escolha a distância entre a mão e o corpo +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ diff --git a/view/hand/articulacao/passo-1.html b/view/hand/articulacao/passo-1.html index edcb1a4..4f5b7d9 100644 --- a/view/hand/articulacao/passo-1.html +++ b/view/hand/articulacao/passo-1.html @@ -71,5 +71,5 @@ diff --git a/view/hand/articulacao/passo-2.html b/view/hand/articulacao/passo-2.html index e60bd74..eaa315b 100644 --- a/view/hand/articulacao/passo-2.html +++ b/view/hand/articulacao/passo-2.html @@ -33,5 +33,5 @@ diff --git a/view/hand/configuracao-retilineo/passo-1.html b/view/hand/configuracao-retilineo/passo-1.html new file mode 100644 index 0000000..ba2a36c --- /dev/null +++ b/view/hand/configuracao-retilineo/passo-1.html @@ -0,0 +1,30 @@ +
+
+ Ponto inicial (A): escolha a posição inicial mais parecida dos dedos +
+
+ +
+
+ diff --git a/view/hand/configuracao-retilineo/passo-2.html b/view/hand/configuracao-retilineo/passo-2.html new file mode 100644 index 0000000..48ac35c --- /dev/null +++ b/view/hand/configuracao-retilineo/passo-2.html @@ -0,0 +1,214 @@ +
+
+ Ponto inicial (A): escolha a posição inicial dos dedos +
+
+
+
    +
  • 1.
    • +
  • 2.
    • +
  • 3.
    • +
  • 4.
    • +
  • 5.
    • +
  • 6.
    • +
  • 7.
    • +
  • 8.
    • +
  • 9.
    • +
  • 10.
    • +
  • 11.
    • +
  • 12.
    • +
  • 13.
    • +
  • 14.
    • +
  • 15.
    • +
  • 16.
    • +
  • 17.
    • +
  • 18.
    • +
  • 19.
    • +
+
+
+
    +
  • 1.
    • +
  • 2.
    • +
  • 3.
    • +
  • 4.
    • +
  • 5.
    • +
  • 6.
    • +
  • 7.
    • +
  • 8.
    • +
+
+
+
    +
  • 1.
    • +
  • 2.
    • +
  • 3.
    • +
  • 4.
    • +
  • 5.
    • +
  • 6.
    • +
  • 7.
    • +
  • 8.
    • +
  • 9.
    • +
+
+
+
    +
  • 1.
    • +
  • 2.
    • +
  • 3.
    • +
  • 4.
    • +
  • 5.
    • +
  • 6.
    • +
  • 7.
    • +
  • 8.
    • +
  • 9.
    • +
  • 10.
    • +
  • 11.
    • +
+
+
+
    +
  • 1.
    • +
  • 2.
    • +
  • 3.
    • +
  • 4.
    • +
+
+
+
    +
  • 1.
    • +
  • 2.
    • +
  • 3.
    • +
  • 4.
    • +
  • 5.
    • +
  • 6.
    • +
  • 7.
    • +
  • 8.
    • +
  • 9.
    • +
+
+
+
+ diff --git a/view/hand/configuracao-retilineo/passo-3.html b/view/hand/configuracao-retilineo/passo-3.html new file mode 100644 index 0000000..96da69c --- /dev/null +++ b/view/hand/configuracao-retilineo/passo-3.html @@ -0,0 +1,30 @@ +
+
+ Ponto final (B): escolha a posição final mais parecida dos dedos +
+
+ +
+
+ diff --git a/view/hand/configuracao-retilineo/passo-4.html b/view/hand/configuracao-retilineo/passo-4.html new file mode 100644 index 0000000..5726508 --- /dev/null +++ b/view/hand/configuracao-retilineo/passo-4.html @@ -0,0 +1,214 @@ +
+
+ Ponto inicial (B): escolha a posição final dos dedos +
+
+
+
    +
  • 1.
    • +
  • 2.
    • +
  • 3.
    • +
  • 4.
    • +
  • 5.
    • +
  • 6.
    • +
  • 7.
    • +
  • 8.
    • +
  • 9.
    • +
  • 10.
    • +
  • 11.
    • +
  • 12.
    • +
  • 13.
    • +
  • 14.
    • +
  • 15.
    • +
  • 16.
    • +
  • 17.
    • +
  • 18.
    • +
  • 19.
    • +
+
+
+
    +
  • 1.
    • +
  • 2.
    • +
  • 3.
    • +
  • 4.
    • +
  • 5.
    • +
  • 6.
    • +
  • 7.
    • +
  • 8.
    • +
+
+
+
    +
  • 1.
    • +
  • 2.
    • +
  • 3.
    • +
  • 4.
    • +
  • 5.
    • +
  • 6.
    • +
  • 7.
    • +
  • 8.
    • +
  • 9.
    • +
+
+
+
    +
  • 1.
    • +
  • 2.
    • +
  • 3.
    • +
  • 4.
    • +
  • 5.
    • +
  • 6.
    • +
  • 7.
    • +
  • 8.
    • +
  • 9.
    • +
  • 10.
    • +
  • 11.
    • +
+
+
+
    +
  • 1.
    • +
  • 2.
    • +
  • 3.
    • +
  • 4.
    • +
+
+
+
    +
  • 1.
    • +
  • 2.
    • +
  • 3.
    • +
  • 4.
    • +
  • 5.
    • +
  • 6.
    • +
  • 7.
    • +
  • 8.
    • +
  • 9.
    • +
+
+
+
+ diff --git a/view/hand/configuracao/passo-1.html b/view/hand/configuracao/passo-1.html index c1fb390..225703f 100644 --- a/view/hand/configuracao/passo-1.html +++ b/view/hand/configuracao/passo-1.html @@ -26,5 +26,5 @@ diff --git a/view/hand/configuracao/passo-2.html b/view/hand/configuracao/passo-2.html index 5a72143..ee1c6ed 100644 --- a/view/hand/configuracao/passo-2.html +++ b/view/hand/configuracao/passo-2.html @@ -210,5 +210,5 @@ diff --git a/view/hand/movimento/passo-1.html b/view/hand/movimento/passo-1.html index 7ac5034..7b94377 100644 --- a/view/hand/movimento/passo-1.html +++ b/view/hand/movimento/passo-1.html @@ -1,13 +1,18 @@ -
-
- Escolha o movimento mais parecido -
-
- -
+ +
diff --git a/view/hand/orientacao-retilineo/passo-2.html b/view/hand/orientacao-retilineo/passo-2.html new file mode 100644 index 0000000..b8a4777 --- /dev/null +++ b/view/hand/orientacao-retilineo/passo-2.html @@ -0,0 +1,36 @@ +
+
+ Ponto Final (B): palma da mão +
+
+ +
+
+ diff --git a/view/hand/orientacao/passo-1.html b/view/hand/orientacao/passo-1.html index ef57cdf..f31860f 100644 --- a/view/hand/orientacao/passo-1.html +++ b/view/hand/orientacao/passo-1.html @@ -32,5 +32,5 @@ diff --git a/view/hand/timeline.html b/view/hand/timeline.html index 5dfb2c1..b96b7e4 100644 --- a/view/hand/timeline.html +++ b/view/hand/timeline.html @@ -1,27 +1,40 @@
-
- -
- -
-
- -
-
- -
-
- -
-
- -
-
- -
- -
+
+ +
+
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+
+
+ +
diff --git a/view/img/pa/B-Seletor.png b/view/img/pa/B-Seletor.png new file mode 100644 index 0000000..9b03e94 Binary files /dev/null and b/view/img/pa/B-Seletor.png differ diff --git a/view/right-hand-pontual-template.html b/view/right-hand-pontual-template.html deleted file mode 100644 index 8b13789..0000000 --- a/view/right-hand-pontual-template.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/view/right-hand/movements.html b/view/right-hand/movements.html deleted file mode 100644 index ae16dde..0000000 --- a/view/right-hand/movements.html +++ /dev/null @@ -1,31 +0,0 @@ -
-
- Escolha o movimento mais parecido -
-
- -
-
diff --git a/view/right-hand/pontual/passo-1.html b/view/right-hand/pontual/passo-1.html deleted file mode 100644 index 58e0d6c..0000000 --- a/view/right-hand/pontual/passo-1.html +++ /dev/null @@ -1,115 +0,0 @@ -
- - -
diff --git a/view/right-hand/pontual/passo-2.html b/view/right-hand/pontual/passo-2.html deleted file mode 100644 index af68760..0000000 --- a/view/right-hand/pontual/passo-2.html +++ /dev/null @@ -1,242 +0,0 @@ -
- - -
diff --git a/view/right-hand/pontual/passo-3.html b/view/right-hand/pontual/passo-3.html deleted file mode 100644 index 2eafb02..0000000 --- a/view/right-hand/pontual/passo-3.html +++ /dev/null @@ -1,34 +0,0 @@ -
-
- Palma da mão -
-
- -
-
diff --git a/view/right-hand/pontual/timeline.html b/view/right-hand/pontual/timeline.html deleted file mode 100644 index f780d89..0000000 --- a/view/right-hand/pontual/timeline.html +++ /dev/null @@ -1,33 +0,0 @@ -
-
- -
- -
-
- -
-
- -
-
- -
-
- -
-
- -
- -
-
diff --git a/view/template-backup.html b/view/template-backup.html deleted file mode 100644 index 500f9db..0000000 --- a/view/template-backup.html +++ /dev/null @@ -1,202 +0,0 @@ - - -{% import 'hand-configuration.html' as handConfig with context %} {% -import 'facial-configuration.html' as facialConfig with context %} - -
-
-
-
- -
-
- Ajude a criar o sinal . -
-
-
OK
-
-
-
-
-
-
- Vídeo de referência "" -
-
- -
-
- -
-
- -
-
-
-
- Expressão -
-
- Mão direita -
-
- Mão esquerda -
-
-
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
-
- -
-
- -
-
- -
- -
- -
-
-
-
- - {{ facialConfig.selectionPanel() }} {{ - handConfig.selectionPanel('right-hand') }} {{ - handConfig.selectionPanel('left-hand') }} - -
-
- -
- - {{ facialConfig.subconfigPanel() }} {{ - handConfig.subconfigPanel('right-hand') }} {{ - handConfig.subconfigPanel('left-hand') }} - -
- -
-
-
-
-
-
-
GERAR - SINAL
-
-
-
-
-
-
Vídeo de referência
-
- -
-
-
-
-
- Sinal "" construído -
- -
- -
-
-
-
- Gerando o sinal "" -
-
- -
-
-
-
-
-
ENVIAR - SINAL
-
-
-
-
-
-

Obrigado,

-
você configurou o sinal com sucesso!
-
-
-

Parabéns,

-
você configurou todos os sinais - disponíveis!
-
-
- -
-
-
-
- - - - - - diff --git a/wikilibras.py b/wikilibras.py index d1a490c..a9cd621 100644 --- a/wikilibras.py +++ b/wikilibras.py @@ -31,12 +31,13 @@ class Wikilibras: task = dict(sign_name=sign, submission_date=pyutil.get_date_now()) pbclient.create_task(project.id, task) - def __update_project_info(self, project): + def __update_project_info(self, project): template = self.env.get_template('template.html') 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']) project.info['thumbnail'] = self.config['HOST_ENDPOINT'] + "/img/thumbnail.png" project.info['sched'] = "incremental" project.allow_anonymous_contributors = False + #project.published = True pbclient.update_project(project) def create_project(self): -- libgit2 0.21.2