diff --git a/questiontype.php b/questiontype.php index e1fb5bb..6746cd4 100644 --- a/questiontype.php +++ b/questiontype.php @@ -84,7 +84,7 @@ public function get_question_options($question) { $question->options->wirisquestion = $record->xml; $question->options->wirisoptions = $record->options; } else { - $OUTPUT->notification( get_string('failedtoloadwirisquizzesfromxml', 'qtype_wq') . ' ' . $question->id . '.'); + $OUTPUT->notification(get_string('failedtoloadwirisquizzesfromxml', 'qtype_wq') . ' ' . $question->id . '.'); return false; } } @@ -165,7 +165,7 @@ public function display_question_editing_page($mform, $question, $wizardnow) { $PAGE->requires->js('/question/type/wq/quizzes/service.php?name=quizzes.js&service=resource'); } - public function export_to_xml($question, qformat_xml $format, $extra=null) { + public function export_to_xml($question, qformat_xml $format, $extra = null) { global $DB; $xml = $DB->get_record('qtype_wq', array('question' => $question->id), 'xml')->xml; @@ -263,7 +263,7 @@ protected function wrsqz_hidden_initial_cas_value($data) { protected function decode_html_entities($xml) { $htmlentitiestable = get_html_translation_table(HTML_ENTITIES, ENT_QUOTES, 'UTF-8'); - $xmlentitiestable = get_html_translation_table(HTML_SPECIALCHARS , ENT_COMPAT, 'UTF-8'); + $xmlentitiestable = get_html_translation_table(HTML_SPECIALCHARS, ENT_COMPAT, 'UTF-8'); $entitiestable = array_diff($htmlentitiestable, $xmlentitiestable); $decodetable = array_flip($entitiestable); $xml = str_replace(array_keys($decodetable), array_values($decodetable), $xml); diff --git a/quizzes/lib/com/wiris/quizzes/impl/QuestionInstanceImpl.class.php b/quizzes/lib/com/wiris/quizzes/impl/QuestionInstanceImpl.class.php index b2fbfcb..f2dceb1 100644 --- a/quizzes/lib/com/wiris/quizzes/impl/QuestionInstanceImpl.class.php +++ b/quizzes/lib/com/wiris/quizzes/impl/QuestionInstanceImpl.class.php @@ -848,11 +848,12 @@ public function andChecks($checks) { $j = null; $correct = true; { - $_g1 = 0; $_g = $checks->length; - while($_g1 < $_g) { - $j1 = $_g1++; - $correct = $correct && _hx_array_get($checks, $j1)->value === 1.0; - unset($j1); + $_g = 0; + while($_g < $checks->length) { + $check = $checks[$_g]; + ++$_g; + $correct = $correct && $check->value > 0.999999; + unset($check); } } return $correct; diff --git a/quizzes/lib/graph.css b/quizzes/lib/graph.css index 84ea5a1..8ad8a1c 100644 --- a/quizzes/lib/graph.css +++ b/quizzes/lib/graph.css @@ -773,4 +773,39 @@ md-elevation-transition { padding-right: 10px !important; } +.wrsUI_app .wrsUI_label.wrsUI_labelHelperTextAction { + color: #2f4b59 !important; +} +.wrsUI_app .wrsUI_label.wrsUI_labelHelperText { + opacity: 0.8; + color: #2f4b59 !important; +} +.wrsUI_app .wrsUI_label.wrsUI_hyperlinkLabel.wrsUI_hyperlinkLabelHelperText { + color: #2f4b59 !important; +} +.wrsUI_app .wrsUI_iconBox.wrsUI_iconBoxHelperText { + box-shadow: none; + pointer-events: none; +} +.wrsUI_app .wrsUI_iconBox.wrsUI_iconBoxHelperText .wrsUI_aux_icon { + color: #2f4b59 !important; + height: 20px; + width: 20px; + font-size: 20px !important; +} +.wrsUI_app .wrsUI_button.wrsUI_buttonHelperText { + padding: 0; + height: 16px; + width: 16px; + border: 0 !important; + text-align: center !important; + min-width: 16px; +} +.wrsUI_app .wrsUI_button.wrsUI_buttonHelperText .wrsUI_aux_icon { + color: #2f4b59 !important; + height: 16px; + width: 16px; + font-size: 16px !important; +} + /*# sourceMappingURL=graph.css.map */ diff --git a/quizzes/lib/graph.css.map b/quizzes/lib/graph.css.map index 7bd46a9..8794cee 100644 --- a/quizzes/lib/graph.css.map +++ b/quizzes/lib/graph.css.map @@ -1 +1 @@ -{"version":3,"sourceRoot":"","sources":["../../.sass-tmp/component_graph.sass","../../.sass-tmp/component_right_drawer.sass","../../.sass-tmp/component_math_editor.sass","../../.sass-tmp/md-material-shadows.scss","../../.sass-tmp/component_dropdown_auxarrow.sass","../../.sass-tmp/mixins.sass","../../.sass-tmp/component_tool_bar.sass","../../.sass-tmp/wiris_colors.sass","../../.sass-tmp/component_toolbar.sass","../../.sass-tmp/component_labels_toolbar.sass"],"names":[],"mappings":"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","file":"graph.css"} \ No newline at end of file +{"version":3,"sourceRoot":"","sources":["../../.sass-tmp/component_graph.sass","../../.sass-tmp/component_right_drawer.sass","../../.sass-tmp/component_math_editor.sass","../../.sass-tmp/md-material-shadows.scss","../../.sass-tmp/component_dropdown_auxarrow.sass","../../.sass-tmp/mixins.sass","../../.sass-tmp/component_tool_bar.sass","../../.sass-tmp/wiris_colors.sass","../../.sass-tmp/component_toolbar.sass","../../.sass-tmp/component_labels_toolbar.sass","../../.sass-tmp/component_helper_text_panel.sass"],"names":[],"mappings":"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","file":"graph.css"} \ No newline at end of file diff --git a/quizzes/lib/icons/toolbar/29x29/mediatrixsegment.svg b/quizzes/lib/icons/toolbar/29x29/mediatrixsegment.svg new file mode 100644 index 0000000..e1963c9 --- /dev/null +++ b/quizzes/lib/icons/toolbar/29x29/mediatrixsegment.svg @@ -0,0 +1,110 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/quizzes/lib/icons/toolbar/29x29/midpointsegment.svg b/quizzes/lib/icons/toolbar/29x29/midpointsegment.svg new file mode 100644 index 0000000..e6b8391 --- /dev/null +++ b/quizzes/lib/icons/toolbar/29x29/midpointsegment.svg @@ -0,0 +1,111 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/quizzes/lib/icons/toolbar/29x29/parallel_line.svg b/quizzes/lib/icons/toolbar/29x29/parallel_line.svg new file mode 100644 index 0000000..8ad74fe --- /dev/null +++ b/quizzes/lib/icons/toolbar/29x29/parallel_line.svg @@ -0,0 +1,105 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/quizzes/lib/icons/toolbar/29x29/perpendicular_line.svg b/quizzes/lib/icons/toolbar/29x29/perpendicular_line.svg new file mode 100644 index 0000000..149e4ef --- /dev/null +++ b/quizzes/lib/icons/toolbar/29x29/perpendicular_line.svg @@ -0,0 +1,115 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/quizzes/lib/quizzes.js b/quizzes/lib/quizzes.js index fd9ec76..78e1a73 100644 --- a/quizzes/lib/quizzes.js +++ b/quizzes/lib/quizzes.js @@ -11168,10 +11168,11 @@ com.wiris.quizzes.impl.QuestionInstanceImpl.prototype = $extend(com.wiris.util.x ,andChecks: function(checks) { var j; var correct = true; - var _g1 = 0, _g = checks.length; - while(_g1 < _g) { - var j1 = _g1++; - correct = correct && checks[j1].value == 1.0; + var _g = 0; + while(_g < checks.length) { + var check = checks[_g]; + ++_g; + correct = correct && check.value > 0.999999; } return correct; } @@ -24980,31 +24981,17 @@ com.wiris.system.ui.JsComponent.isCSSLoaded = function() { return com.wiris.system.ui.JsComponent.cssLoaded; } com.wiris.system.ui.JsComponent.prototype = { - elementInserted: function() { - } - ,monitorInsertion: function() { - var self = this; - + monitorInsertion: function(target,elementInserted) { var observer = new MutationObserver(function(mutationsList, observer) { for (let mutation of mutationsList) { if (mutation.addedNodes != null) { for (let node of mutation.addedNodes) { - if (node == self.getElement() || com.wiris.system.JsDOMUtils.isDescendant(node, self.getElement())) { - haxe.Timer.delay(function() { - self.elementInserted(); - - if (observer != null) { - observer.disconnect(); - observer = null; - } - }, 1); - } + elementInserted(node, observer); } } } }); - - observer.observe(document.body, { childList : true, subtree: true });; + observer.observe(target,{ childList : true, subtree : true}); } ,getClassNameElement: function() { return this.getStyleElement(); @@ -25301,10 +25288,9 @@ com.wiris.system.ui.JsComponent.prototype = { this.captureJsEvents(); this.updateStyles(); if(this.component.hasClass(com.wiris.util.ui.component.Component.CLASS_APP)) { - var updating = false; var self = this; - com.wiris.system.JsDOMUtils.addEventListener(this.element,"DOMNodeInserted",function(e) { - if(com.wiris.system.JsDOMUtils.hasClass(e.target,"wrsUI_component")) self.element.wrsUI_updateGUI(); + this.monitorInsertion(this.element,function(insertedNode,observer) { + if(com.wiris.system.JsDOMUtils.hasClass(insertedNode,"wrsUI_component")) self.element.wrsUI_updateGUI(); }); this.element.setAttribute("data-useragent",navigator.userAgent); setTimeout(function() { @@ -26339,7 +26325,7 @@ com.wiris.system.JSONUtils.isString = function(objectInstance) { return typeof(objectInstance) == "string"; } com.wiris.system.JSONUtils.jsonToObject = function(json) { - return eval("(" + json + ")"); + return JSON.parse(json); } com.wiris.system.JSONUtils.serialize = function(objectInstance) { if(Reflect.isObject(objectInstance) && !com.wiris.system.JSONUtils.isString(objectInstance)) { @@ -32236,17 +32222,20 @@ com.wiris.system.ui.JsTabbedPanel = $hxClasses["com.wiris.system.ui.JsTabbedPane this.tabbedPanel = tabbedPanel; this.resourceLoader = resourceLoader; this.currentPanel = null; - this.monitorInsertion(); + var self = this; + this.monitorInsertion(js.Lib.document.body,function(insertedNode,observer) { + if(insertedNode == self.getElement() || com.wiris.system.JsDOMUtils.isDescendant(insertedNode,self.getElement())) haxe.Timer.delay(function() { + self.getElement().wrsUI_updateGUI(); + if(observer != null) observer.disconnect(); + },1); + }); this.panels = new Array(); }; com.wiris.system.ui.JsTabbedPanel.__name__ = ["com","wiris","system","ui","JsTabbedPanel"]; com.wiris.system.ui.JsTabbedPanel.__interfaces__ = [com.wiris.util.ui.interaction.ChangeListener]; com.wiris.system.ui.JsTabbedPanel.__super__ = com.wiris.system.ui.JsPanel; com.wiris.system.ui.JsTabbedPanel.prototype = $extend(com.wiris.system.ui.JsPanel.prototype,{ - elementInserted: function() { - this.getElement().wrsUI_updateGUI(); - } - ,update: function() { + update: function() { var _g = this; var selectedTab = this.tabbedPanel.getSelectedTab(); var navBar = this.tabbedPanel.hasClass(com.wiris.util.ui.component.NavigationBar.CLASS_NAVIGATION_BAR); diff --git a/quizzes/lib/strings_graph.lang.json b/quizzes/lib/strings_graph.lang.json index 7c0cc8e..cdbd27b 100644 --- a/quizzes/lib/strings_graph.lang.json +++ b/quizzes/lib/strings_graph.lang.json @@ -17,6 +17,10 @@ "tt_polygon": "${tt_polygon}", "tt_vector": "${tt_vector}", "tt_parallelogram": "${tt_parallelogram}", + "tt_midpointOfSegment": "${tt_midpointOfSegment}", + "tt_mediatrixOfSegment": "${tt_mediatrixOfSegment}", + "tt_parallelLine": "${tt_parallelLine}", + "tt_perpendicularLine": "${tt_perpendicularLine}", "tt_curves": "${tt_curves}", "tt_conicSections": "${tt_conicSections}", "tt_circleCenterAndPoint": "${tt_circleCenterAndPoint}", @@ -128,6 +132,9 @@ "gridColor": "${gridColor}", "subgridColor": "${subgridColor}", "magneticGrid": "${magneticGrid}", + "force": "${force}", + "snap": "${snap}", + "disabled":"${disabled}", "horizontal": "${horizontal}", "vertical": "${vertical}", @@ -200,6 +207,54 @@ "type_box_plot": "${statistics_element_type_box_plot}", "type_histogram": "${statistics_element_type_histogram}", - "equation": "${equation}" + "helper_text_start_move_point": "${helper_text_start_move_point}", + "helper_text_start_select": "${helper_text_start_select}", + "helper_text_start_move_label": "${helper_text_start_move_label}", + "helper_text_start_two_points_click_or_drag": "${helper_text_start_two_points_click_or_drag}", + "helper_text_start_new_angle": "${helper_text_start_new_angle}", + "helper_text_start_new_area": "${helper_text_start_new_area}", + "helper_text_start_new_length" : "${helper_text_start_new_length}", + "helper_text_start_new_polyline": "${helper_text_start_new_polyline}", + "helper_text_start_new_polygon": "${helper_text_start_new_polygon}", + "helper_text_start_new_interpolating_polynomial": "${helper_text_start_new_interpolating_polynomial}", + "helper_text_start_new_parallel_or_perpendicular": "${helper_text_start_new_parallel_or_perpendicular}", + "helper_text_start_draw_strokes": "${helper_text_start_draw_strokes}", + "line": "${line}", + "vector": "${vector}", + "ray": "${ray}", + "segment": "${segment}", + "final_helper_text": "${final_helper_text}", + "help_url": "${help_url}", + "close_helper_text": "${close_helper_text}", + + "newPoint": "${tt_point}", + "newLineThroughTwoPoints": "${tt_line}", + "newLineSegmentByPoints":"${tt_segment}", + "newRayFromPointThroughPoint": "${tt_ray}", + "newPolyline": "${tt_polyline}", + "newPolygon": "${tt_polygon}", + "newVectorByPoints": "${tt_vector}", + "newParallelogram": "${tt_parallelogram}", + "newLineParallelToLineThroughPoint": "${tt_parallelLine}", + "newLinePerpendicularToLineThroughPoint": "${tt_perpendicularLine}", + + "newCircleByCenterAndPoint": "${tt_circleCenterAndPoint}", + "newCircleByThreePoints": "${tt_circleThreePoints}", + "newArcByThreePoints": "${tt_arc}", + "newParabolaByFocusAndDirectrix": "${tt_parabola}", + "newEllipseByFociAndPoint": "${tt_ellipse}", + "newHyperbolaByFociAndPoint": "${tt_hyperbola}", + "newConicByFivePoints": "${tt_conic}", + "newInterpolatingPolynomialByPoints": "${tt_interpolatingPolynomial}", + "newArea": "${tt_area}", + "newAngle": "${tt_angle}", + "newLength": "${tt_length}", + "newFreeLabel": "${tt_labels}", + "newElementByLabel": "${tt_elementMML}", + "drawStrokes": "${tt_handwriting}", + + "equation": "${equation}", + "midpointOfLineSegment": "${tt_midpointOfSegment}", + "mediatrixOfLineSegment": "${tt_mediatrixOfSegment}" } } \ No newline at end of file diff --git a/quizzes/lib/util.css b/quizzes/lib/util.css index 0f8c9f4..c768cec 100644 --- a/quizzes/lib/util.css +++ b/quizzes/lib/util.css @@ -1421,10 +1421,10 @@ md-elevation-transition { } .wrsUI_app .wrsUI_drawingPanel.wrsUI_drawingPanelEmpty .wrsUI_aux_canvasContainer { - background: url("decoration/drawing_panel_empty.svg?v=4.11.0") center center no-repeat; + background: url("decoration/drawing_panel_empty.svg?v=4.11.2") center center no-repeat; } .wrsUI_app .wrsUI_drawingPanel.wrsUI_drawingPanelEmpty .wrsUI_aux_canvasContainer canvas { - background: url("decoration/drawing_panel_grid.png?v=4.11.0"); + background: url("decoration/drawing_panel_grid.png?v=4.11.2"); } .wrsUI_app .wrsUI_drawingPanel .wrsUI_aux_canvasContainer { position: absolute; diff --git a/quizzes/lib/version.txt b/quizzes/lib/version.txt index f8e2ed9..a6a4196 100644 --- a/quizzes/lib/version.txt +++ b/quizzes/lib/version.txt @@ -1 +1 @@ -4.11.0.76b680 \ No newline at end of file +4.11.2.53b815 \ No newline at end of file diff --git a/thirdpartylibs.xml b/thirdpartylibs.xml index 17ec803..f9be942 100644 --- a/thirdpartylibs.xml +++ b/thirdpartylibs.xml @@ -3,7 +3,7 @@ quizzes WirisQuizzes generic integration - 4.11.0 + 4.11.2 GPL 3.0+