From: Harris Wong Date: Thu, 14 Oct 2010 17:25:22 +0000 (-0000) Subject: http://atutor.ca/atutor/mantis/view.php?id=4580 X-Git-Tag: v1.1~10 X-Git-Url: https://iam.tj/gitweb/gitweb.cgi?p=acontent.git;a=commitdiff_plain;h=a5cb6f3b3dc6d91f8d8f50362beef2f61b9f35d7 http://atutor.ca/atutor/mantis/view.php?id=4580 - modified the dicussionTools and weblinks xsd to validate. - added cc_profile specific metadata into test templates --- diff --git a/docs/home/ims/domainProfile_5/imswl_v1p0_localised.xsd b/docs/home/ims/domainProfile_5/imswl_v1p0_localised.xsd index 5f97a95..7485215 100644 --- a/docs/home/ims/domainProfile_5/imswl_v1p0_localised.xsd +++ b/docs/home/ims/domainProfile_5/imswl_v1p0_localised.xsd @@ -1,23 +1,201 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + XSD Data File Information + ------------------------- + Author: Colin Smythe + Date: 31st August, 2010 + Version: 1.0 + Status: Final + Description: This is the IMS GLC Web Links Data Model for the Common Cartridge. + + History: Version 1.0 - the first release of this data model. + + License: IPR, License and Distribution Notices + + This machine readable file is derived from IMS Global Learning Consortium (GLC) specification IMS [spec name] Version [x.x] + found at http://www.imsglobal.org/[xxx] and the original IMS GLC schema binding or code base + http://www.imsglobal.org/[binding document]. + + Recipients of this document are requested to submit, with their comments, notification of any + relevant patent claims or other intellectual property rights of which they may be aware that might be + infringed by the schema binding contained in this document. + + IMS GLC takes no position regarding the validity or scope of any intellectual property or other + rights that might be claimed to pertain to the implementation or use of the technology described in this + document or the extent to which any license under such rights might or might not be available; neither + does it represent that it has made any effort to identify any such rights. Information on IMS GLCs + procedures with respect to rights in IMS GLC specifications can be found at the IMS GLC Intellectual Property + Rights web page: http://www.imsglobal.org/ipr/imsipr_policyFinal.pdf. + + Copyright © IMS Global Learning Consortium 1999-2010. All Rights Reserved. + + License Notice for Users + + Users of products or services that include this document are hereby granted a worldwide, royalty-free, + non-exclusive license to use this document. + + Distribution Notice for Developers + + Developers of products or services that are not original incorporators of this document and + have not changed this document, that is, are distributing a software product that incorporates this + document as is from a third-party source other than IMS, are hereby granted permission to copy, + display and distribute the contents of this document in any medium for any purpose without fee or + royalty provided that you include this IPR, License and Distribution notice in its entirety on ALL + copies, or portions thereof. + + Developers of products or services that are original incorporators of this document and wish + to provide distribution of this document as is or with modifications and developers of products and + services that are not original incorporators of this document and have changed this document, are + required to register with the IMS GLC community on the IMS GLC website as described in the following two + paragraphs:- + + * If you wish to distribute this document as is, with no modifications, you are hereby granted + permission to copy, display and distribute the contents of this document in any medium for any + purpose without fee or royalty provided that you include this IPR, License and Distribution notice in + its entirety on ALL copies, or portions thereof, that you make and you complete a valid license + registration with IMS and receive an email from IMS granting the license. To register, follow the + instructions on the IMS website: http://www.imsglobal.org/specificationdownload.cfm. Once + registered you are granted permission to transfer unlimited distribution rights of this document for the + purposes of third-party or other distribution of your product or service that incorporates this + document as long as this IPR, License and Distribution notice remains in place in its entirety; + + * If you wish to create and distribute a derived work from this document, you are hereby + granted permission to copy, display and distribute the contents of the derived work in any medium for + any purpose without fee or royalty provided that you include this IPR, License and Distribution + notice in its entirety on ALL copies, or portions thereof, that you make and you complete a valid + profile registration with IMS GLC and receive an email from IMS GLC granting the license. To register, follow + the instructions on the IMS GLC website: http://www.imsglobal.org/profile/. Once registered you are + granted permission to transfer unlimited distribution rights of the derived work for the purposes of + third-party or other distribution of your product or service that incorporates the derived work as long + as this IPR, License and Distribution notice remains in place in its entirety. + + The limited permissions granted above are perpetual and will not be revoked by IMS GLC or its + successors or assigns. + + THIS SPECIFICATION IS BEING OFFERED WITHOUT ANY WARRANTY WHATSOEVER, AND IN PARTICULAR, ANY WARRANTY OF NONINFRINGEMENT IS + EXPRESSLY DISCLAIMED. ANY USE OF THIS SPECIFICATION SHALL BE MADE ENTIRELY AT THE IMPLEMENTERS OWN RISK, AND NEITHER THE CONSORTIUM + NOR ANY OF ITS MEMBERS OR SUBMITTERS, SHALL HAVE ANY LIABILITY WHATSOEVER TO ANY IMPLEMENTER OR THIRD PARTY FOR ANY DAMAGES OF + ANY NATURE WHATSOEVER, DIRECTLY OR INDIRECTLY, ARISING FROM THE USE OF THIS SPECIFICATION. + + Source UML File Information + --------------------------- + The source file information must be supplied as an XMI file (without diagram layout information). + The supported UML authoring tools are: + (a) Poseidon – v6 (and later) + + Source XSLT File Information + ---------------------------- + XSL Generator: UMLtoXSDTransformv0p9.xsl + XSLT Processor: Xalan + Release: 1.0 Beta 3 + Date: 31st May, 2009 + + IMS GLC Auto-generation Binding Tool-kit (I-BAT) + ------------------------------------------------ + This file was auto-generated using the IMS GLC Binding Auto-generation Tool-kit (I-BAT). While every + attempt has been made to ensure that this tool auto-generates the files correctly, users should be aware + that this is an experimental tool. Permission is given to make use of this tool. IMS GLC makes no + claim on the materials created by third party users of this tool. Details on how to use this tool + are contained in the IMS GLC "I-BAT" Documentation available at the IMS GLC web-site. + + Tool Copyright: 2005-2010 (c) IMS Global Learning Consortium Inc. All Rights Reserved. + + + + + + + + + + + + + Any namespaced element from any namespace may be included within an "any" element. + The namespace for the imported element must be defined in the instance, and the schema must be imported. + The extension has a definition of "strict" i.e. they must have their own namespace. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + The WebLink complexType for the associated object. + + + + + + + + + + + + + The URL for the web link. + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/home/ims/domainProfile_6/imsdt_v1p0_localised.xsd b/docs/home/ims/domainProfile_6/imsdt_v1p0_localised.xsd index 5364cef..991e5da 100644 --- a/docs/home/ims/domainProfile_6/imsdt_v1p0_localised.xsd +++ b/docs/home/ims/domainProfile_6/imsdt_v1p0_localised.xsd @@ -1,43 +1,221 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + XSD Data File Information + ------------------------- + Author: Colin Smythe + Date: 31st August, 2010 + Version: 1.0 + Status: Final + Description: This is the IMS GLC Discussion Topics Data Model for the Common Cartridge. + + History: Version 1.0 - the first release of this data model. + + License: IPR, License and Distribution Notices + + This machine readable file is derived from IMS Global Learning Consortium (GLC) specification IMS [spec name] Version [x.x] + found at http://www.imsglobal.org/[xxx] and the original IMS GLC schema binding or code base + http://www.imsglobal.org/[binding document]. + + Recipients of this document are requested to submit, with their comments, notification of any + relevant patent claims or other intellectual property rights of which they may be aware that might be + infringed by the schema binding contained in this document. + + IMS GLC takes no position regarding the validity or scope of any intellectual property or other + rights that might be claimed to pertain to the implementation or use of the technology described in this + document or the extent to which any license under such rights might or might not be available; neither + does it represent that it has made any effort to identify any such rights. Information on IMS GLCs + procedures with respect to rights in IMS GLC specifications can be found at the IMS GLC Intellectual Property + Rights web page: http://www.imsglobal.org/ipr/imsipr_policyFinal.pdf. + + Copyright © IMS Global Learning Consortium 1999-2010. All Rights Reserved. + + License Notice for Users + + Users of products or services that include this document are hereby granted a worldwide, royalty-free, + non-exclusive license to use this document. + + Distribution Notice for Developers + + Developers of products or services that are not original incorporators of this document and + have not changed this document, that is, are distributing a software product that incorporates this + document as is from a third-party source other than IMS, are hereby granted permission to copy, + display and distribute the contents of this document in any medium for any purpose without fee or + royalty provided that you include this IPR, License and Distribution notice in its entirety on ALL + copies, or portions thereof. + + Developers of products or services that are original incorporators of this document and wish + to provide distribution of this document as is or with modifications and developers of products and + services that are not original incorporators of this document and have changed this document, are + required to register with the IMS GLC community on the IMS GLC website as described in the following two + paragraphs:- + + * If you wish to distribute this document as is, with no modifications, you are hereby granted + permission to copy, display and distribute the contents of this document in any medium for any + purpose without fee or royalty provided that you include this IPR, License and Distribution notice in + its entirety on ALL copies, or portions thereof, that you make and you complete a valid license + registration with IMS and receive an email from IMS granting the license. To register, follow the + instructions on the IMS website: http://www.imsglobal.org/specificationdownload.cfm. Once + registered you are granted permission to transfer unlimited distribution rights of this document for the + purposes of third-party or other distribution of your product or service that incorporates this + document as long as this IPR, License and Distribution notice remains in place in its entirety; + + * If you wish to create and distribute a derived work from this document, you are hereby + granted permission to copy, display and distribute the contents of the derived work in any medium for + any purpose without fee or royalty provided that you include this IPR, License and Distribution + notice in its entirety on ALL copies, or portions thereof, that you make and you complete a valid + profile registration with IMS GLC and receive an email from IMS GLC granting the license. To register, follow + the instructions on the IMS GLC website: http://www.imsglobal.org/profile/. Once registered you are + granted permission to transfer unlimited distribution rights of the derived work for the purposes of + third-party or other distribution of your product or service that incorporates the derived work as long + as this IPR, License and Distribution notice remains in place in its entirety. + + The limited permissions granted above are perpetual and will not be revoked by IMS GLC or its + successors or assigns. + + THIS SPECIFICATION IS BEING OFFERED WITHOUT ANY WARRANTY WHATSOEVER, AND IN PARTICULAR, ANY WARRANTY OF NONINFRINGEMENT IS + EXPRESSLY DISCLAIMED. ANY USE OF THIS SPECIFICATION SHALL BE MADE ENTIRELY AT THE IMPLEMENTERS OWN RISK, AND NEITHER THE CONSORTIUM + NOR ANY OF ITS MEMBERS OR SUBMITTERS, SHALL HAVE ANY LIABILITY WHATSOEVER TO ANY IMPLEMENTER OR THIRD PARTY FOR ANY DAMAGES OF + ANY NATURE WHATSOEVER, DIRECTLY OR INDIRECTLY, ARISING FROM THE USE OF THIS SPECIFICATION. + + Source UML File Information + --------------------------- + The source file information must be supplied as an XMI file (without diagram layout information). + The supported UML authoring tools are: + (a) Poseidon – v6 (and later) + + Source XSLT File Information + ---------------------------- + XSL Generator: UMLtoXSDTransformv0p9.xsl + XSLT Processor: Xalan + Release: 1.0 Beta 3 + Date: 31st May, 2009 + + IMS GLC Auto-generation Binding Tool-kit (I-BAT) + ------------------------------------------------ + This file was auto-generated using the IMS GLC Binding Auto-generation Tool-kit (I-BAT). While every + attempt has been made to ensure that this tool auto-generates the files correctly, users should be aware + that this is an experimental tool. Permission is given to make use of this tool. IMS GLC makes no + claim on the materials created by third party users of this tool. Details on how to use this tool + are contained in the IMS GLC "I-BAT" Documentation available at the IMS GLC web-site. + + Tool Copyright: 2005-2010 (c) IMS Global Learning Consortium Inc. All Rights Reserved. + + + + + + + + + + + + + Any namespaced element from any namespace may be included within an "any" element. + The namespace for the imported element must be defined in the instance, and the schema must be imported. + The extension has a definition of "strict" i.e. they must have their own namespace. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + The Topic complexType for the discussion topic object. + + + + + + + + + + + + + + + + + + + + The Text for the discussion topic. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/home/ims/imsdt_v1p0_localised.xsd b/docs/home/ims/imsdt_v1p0_localised.xsd deleted file mode 100644 index 4fd9bfd..0000000 --- a/docs/home/ims/imsdt_v1p0_localised.xsd +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/docs/home/ims/imswl_v1p0_localised.xsd b/docs/home/ims/imswl_v1p0_localised.xsd deleted file mode 100644 index 88f14ba..0000000 --- a/docs/home/ims/imswl_v1p0_localised.xsd +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs/home/ims/main.xsd b/docs/home/ims/main.xsd index bf8511c..e74cbc9 100644 --- a/docs/home/ims/main.xsd +++ b/docs/home/ims/main.xsd @@ -21,7 +21,7 @@ - - + + diff --git a/docs/home/imscc/include/ims_template.inc.php b/docs/home/imscc/include/ims_template.inc.php index 8d7851c..24e5d38 100644 --- a/docs/home/imscc/include/ims_template.inc.php +++ b/docs/home/imscc/include/ims_template.inc.php @@ -502,32 +502,28 @@ function print_resources_forum() { //file Descrittore con la descrzione del forum $fileDesDT_D = ' - + {TitleDiscussionTopic} {DescriptionDiscussionTopic} - '; + '; //file Descrittore senza la descrizione del forum $fileDesDT = ' - + {TitleDiscussionTopic} - '; + '; $f['title'] = htmlspecialchars($f['title']); $f['description'] = htmlspecialchars($f['description']); diff --git a/docs/include/classes/QTI/QTIParser.class.php b/docs/include/classes/QTI/QTIParser.class.php index 2a09a37..9116b3f 100644 --- a/docs/include/classes/QTI/QTIParser.class.php +++ b/docs/include/classes/QTI/QTIParser.class.php @@ -326,8 +326,15 @@ class QTIParser { * This function returns the question type of this XML. * @access public * @param the item_num - * @return 1-8, in the order of m/c, t/f, open eneded, likert, s match, order, m/a, g match - false for not found. + * @return 1: m/c + * 2: t/f + * 3: open ended question + * 4: likert + * 5: s match + * 6: order + * 7: m/a + * 8: g match + * false for not found. */ function getQuestionType($item_num){ switch ($this->field_entry[$item_num]['qmd_questiontype']){ diff --git a/docs/include/classes/Weblinks/Weblinks.tmpl.php b/docs/include/classes/Weblinks/Weblinks.tmpl.php index b11dae3..b721d88 100644 --- a/docs/include/classes/Weblinks/Weblinks.tmpl.php +++ b/docs/include/classes/Weblinks/Weblinks.tmpl.php @@ -1,7 +1,7 @@ ' ?> - + <?php echo $this->title; ?> - + diff --git a/docs/include/classes/testQuestions.class.php b/docs/include/classes/testQuestions.class.php index 1c370b1..6d8a7ad 100644 --- a/docs/include/classes/testQuestions.class.php +++ b/docs/include/classes/testQuestions.class.php @@ -367,6 +367,8 @@ function test_qti_export($tid, $test_title='', $zipfile = null){ //TODO: wrap around xml now $savant->assign('xml_content', $xml); $savant->assign('title', htmlspecialchars($row['title'], ENT_QUOTES, 'UTF-8')); + $savant->assign('num_takes', $row['num_takes']); + $savant->assign('use_cc', $use_cc); $xml = $savant->fetch('tests/test_questions/wrapper.tmpl.php'); $xml_filename = 'tests_'.$tid.'.xml'; @@ -554,6 +556,7 @@ function TestQuestionCounter($increment = FALSE) { /*final public */function exportQTI($row, $encoding, $version) { $this->savant->assign('encoding', $encoding); + $this->savant->assign('weight', $row['weight']); //Convert all row values to html entities foreach ($row as $k=>$v){ $row[$k] = htmlspecialchars($v, ENT_QUOTES, 'UTF-8'); //not using htmlentities cause it changes some languages falsely. diff --git a/docs/themes/default/tests/test_questions/likert_qti_1p2.tmpl.php b/docs/themes/default/tests/test_questions/likert_qti_1p2.tmpl.php index 3b5ef7d..bb9d160 100644 --- a/docs/themes/default/tests/test_questions/likert_qti_1p2.tmpl.php +++ b/docs/themes/default/tests/test_questions/likert_qti_1p2.tmpl.php @@ -6,12 +6,14 @@ qmd_itemtype Logical Identifier - - qmd_questiontype Multiple-choice + + cc_profile + cc.mutliple_choice.v0p1 + diff --git a/docs/themes/default/tests/test_questions/long_qti_1p2.tmpl.php b/docs/themes/default/tests/test_questions/long_qti_1p2.tmpl.php index 8ce37cc..1e3a32a 100644 --- a/docs/themes/default/tests/test_questions/long_qti_1p2.tmpl.php +++ b/docs/themes/default/tests/test_questions/long_qti_1p2.tmpl.php @@ -6,12 +6,18 @@ qmd_itemtype String - - qmd_questiontype FIB-string + + cc_profile + cc.fib.v0p1 + + + cc_weighting + weight; ?> + diff --git a/docs/themes/default/tests/test_questions/matching_qti_1p2.tmpl.php b/docs/themes/default/tests/test_questions/matching_qti_1p2.tmpl.php index 7aad2c5..a8754d3 100644 --- a/docs/themes/default/tests/test_questions/matching_qti_1p2.tmpl.php +++ b/docs/themes/default/tests/test_questions/matching_qti_1p2.tmpl.php @@ -1,21 +1,32 @@ - Matching qmd_itemtype Logical Groups + + qmd_questiontype + Drag-and-drop + + + cc_profile + cc.pattern_match.v0p1 + + + cc_weighting + weight; ?> + - + row['question']; ?> num_choices; $i++): ?> - + row['choice_'.$i]; ?> @@ -30,15 +41,14 @@ - + - - + num_choices; $i++): ?> row['answer_'.$i] > -1): ?> @@ -46,7 +56,7 @@ Optionrow['answer_'.$i]; ?> - row['weight']))?$this->row['weight']:1; ?> + row['weight']))?$this->row['weight']:1; ?> diff --git a/docs/themes/default/tests/test_questions/multianswer_qti_1p2.tmpl.php b/docs/themes/default/tests/test_questions/multianswer_qti_1p2.tmpl.php index 32c1a4f..fc0ddfa 100644 --- a/docs/themes/default/tests/test_questions/multianswer_qti_1p2.tmpl.php +++ b/docs/themes/default/tests/test_questions/multianswer_qti_1p2.tmpl.php @@ -6,12 +6,18 @@ qmd_itemtype Logical Identifier - - - - qmd_questiontype - Multiple-response - + + qmd_questiontype + Multiple-response + + + cc_profile + cc.mutliple_response.v0p1 + + + cc_weighting + weight; ?> + @@ -36,7 +42,7 @@ - + num_choices; $i++): ?> row['answer_'.$i]): ?> @@ -44,7 +50,7 @@ Choice - row['weight']))?$this->row['weight']:1; ?> + row['weight']))?$this->row['weight']:1; ?> diff --git a/docs/themes/default/tests/test_questions/multichoice_qti_1p2.tmpl.php b/docs/themes/default/tests/test_questions/multichoice_qti_1p2.tmpl.php index 4c4c473..dae99bd 100644 --- a/docs/themes/default/tests/test_questions/multichoice_qti_1p2.tmpl.php +++ b/docs/themes/default/tests/test_questions/multichoice_qti_1p2.tmpl.php @@ -6,12 +6,18 @@ qmd_itemtype Logical Identifier - - qmd_questiontype Multiple-choice + + cc_profile + cc.mutliple_choice.v0p1 + + + cc_weighting + weight; ?> + @@ -36,7 +42,7 @@ - + num_choices; $i++): ?> row['answer_'.$i]): ?> diff --git a/docs/themes/default/tests/test_questions/ordering_qti_1p2.tmpl.php b/docs/themes/default/tests/test_questions/ordering_qti_1p2.tmpl.php index 4eb43c8..5ec693e 100644 --- a/docs/themes/default/tests/test_questions/ordering_qti_1p2.tmpl.php +++ b/docs/themes/default/tests/test_questions/ordering_qti_1p2.tmpl.php @@ -30,14 +30,14 @@ - + num_choices; $i++): ?> Choice - row['weight']))?$this->row['weight']/$this->num_choices:1; ?> + row['weight']))?$this->row['weight']/$this->num_choices:1; ?> diff --git a/docs/themes/default/tests/test_questions/truefalse_qti_1p2.tmpl.php b/docs/themes/default/tests/test_questions/truefalse_qti_1p2.tmpl.php index 329f87b..a827210 100644 --- a/docs/themes/default/tests/test_questions/truefalse_qti_1p2.tmpl.php +++ b/docs/themes/default/tests/test_questions/truefalse_qti_1p2.tmpl.php @@ -6,12 +6,18 @@ qmd_itemtype Logical Identifier - - - + qmd_questiontype True/false + + cc_profile + cc.true_false.v0p1 + + + cc_weighting + weight; ?> + @@ -41,7 +47,7 @@ - + diff --git a/docs/themes/default/tests/test_questions/wrapper.tmpl.php b/docs/themes/default/tests/test_questions/wrapper.tmpl.php index 50228b5..668875b 100644 --- a/docs/themes/default/tests/test_questions/wrapper.tmpl.php +++ b/docs/themes/default/tests/test_questions/wrapper.tmpl.php @@ -1,15 +1,63 @@ <xml version="1.0" encoding="encoding; ?>"> - + use_cc): + $this->num_takes = intval($this->num_takes); + $this->num_takes = ($this->num_takes==0)?'unlimited':$this->num_takes; + ?> + + + cc_profile + cc.exam.v0p1 + + + qmd_assessmenttype + Examination + + + qmd_scoretype + Percentage + + + qmd_feedbackpermitted + No + + + qmd_hintspermitted + Yes + + + qmd_solutionspermitted + Yes + + + qmd_timelimit + 120 + + + cc_allow_late_submission + No + + + cc_maxattempts + num_takes; ?> + + + +
- xml_content; ?> -
-