diff --git a/canoprof_to_hdoc/xsl/programmation.xsl b/canoprof_to_hdoc/xsl/programmation.xsl index 371d7532672daa59914383c6084ec02a316687bc..de74d456bbd8040ba1dc0e4b8b619d66a4bea6b0 100644 --- a/canoprof_to_hdoc/xsl/programmation.xsl +++ b/canoprof_to_hdoc/xsl/programmation.xsl @@ -16,7 +16,7 @@ - RNGSchema="http://hdoc.crzt.fr/schemas/xhtml/hdoc1-xhtml.rng" type="xml" + RNGSchema="../../schemas/xhtml/hdoc1-xhtml.rng" type="xml" <xsl:value-of select="cp:programM/sp:title"/> @@ -74,9 +74,7 @@ - - - + @@ -221,13 +219,13 @@ - +

- - + +
@@ -239,7 +237,6 @@
-
@@ -249,7 +246,6 @@
-
@@ -259,7 +255,6 @@
-
@@ -269,7 +264,6 @@
-
@@ -279,7 +273,6 @@
-
@@ -289,7 +282,6 @@
-
@@ -299,13 +291,27 @@
-
+ + +
+
+ +
+
+ + + +
+
+ +
+
diff --git a/canoprof_to_opale/input/Multiparagraphe_bloc.scar b/canoprof_to_opale/input/Multiparagraphe_bloc.scar deleted file mode 100644 index 7c2258c4f04f85555ac7a5d50ba932967451132f..0000000000000000000000000000000000000000 Binary files a/canoprof_to_opale/input/Multiparagraphe_bloc.scar and /dev/null differ diff --git a/canoprof_to_opale/output/.gitkeep b/canoprof_to_opale/output/.gitkeep deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/canoprof_to_opale/sample/Activite_section.scar b/canoprof_to_opale/sample/Activite_section.scar new file mode 100644 index 0000000000000000000000000000000000000000..932c6fd05a33aa90f1c2eac2bf8d4b581e01c996 Binary files /dev/null and b/canoprof_to_opale/sample/Activite_section.scar differ diff --git a/canoprof_to_opale/sample/Activite_section_objectif.scar b/canoprof_to_opale/sample/Activite_section_objectif.scar new file mode 100644 index 0000000000000000000000000000000000000000..a1e80da9057a73b7fde0eb1e911784a44252d5d6 Binary files /dev/null and b/canoprof_to_opale/sample/Activite_section_objectif.scar differ diff --git a/canoprof_to_opale/sample/Rappel_Methode.scar b/canoprof_to_opale/sample/Rappel_Methode.scar new file mode 100644 index 0000000000000000000000000000000000000000..85fc89174bf6d6353b38860f82c5a2318b13c073 Binary files /dev/null and b/canoprof_to_opale/sample/Rappel_Methode.scar differ diff --git a/hdoc_to_epub/file/stylesheet.css b/hdoc_to_epub/file/stylesheet.css index ff2470ed7a9671b3d8170b3f17eaae4a1b51562c..48a63521582360e194875f4ae1194586c9c83878 100644 --- a/hdoc_to_epub/file/stylesheet.css +++ b/hdoc_to_epub/file/stylesheet.css @@ -110,3 +110,34 @@ td{ .bold{ font-weight: bold; } + +.imgContainer1{ + text-indent:0; + text-align:center; + margin-right:auto; + margin-left:auto; + width:99%; + page-break-before:auto; + page-break-inside:avoid; + page-break-after:auto; +} + +.imgContainer2{ + margin-left:0; + margin-right:0; + text-align:center; + text-indent:0; + height:100%; + width:100%; +} + +p .imgContainer3{ + display:inline-block; + text-indent:0; + width:100%; +} + +img{ + max-width:99%; + max-height:75%; +} diff --git a/hdoc_to_epub/hdoc_to_epub.ant b/hdoc_to_epub/hdoc_to_epub.ant index f3d1a94c121323408388dd0033017bd12dce4b3c..8f62ab982b00de9bc35ee824df2418394ea53b8f 100644 --- a/hdoc_to_epub/hdoc_to_epub.ant +++ b/hdoc_to_epub/hdoc_to_epub.ant @@ -97,7 +97,7 @@ - + @@ -151,7 +151,7 @@ - + diff --git a/hdoc_to_epub/xsl/chapitre.xsl b/hdoc_to_epub/xsl/chapitre.xsl index 8764d07afdd58492bab6bb7b166436dde6a104a3..b99ef8c1ef7dafa8ea666b149dbf7e98dac7068d 100644 --- a/hdoc_to_epub/xsl/chapitre.xsl +++ b/hdoc_to_epub/xsl/chapitre.xsl @@ -184,10 +184,23 @@ - - ../images/ - - + + + +
+
+ + ../images/ + + + +
+
diff --git a/hdoc_to_mongo/README.md b/hdoc_to_mongo/README.md index ef73c72a03c8a53c4b24af12cfc58c3c1801fd95..13bdde2f99e4bb6a866e49822681bd202d1f282e 100644 --- a/hdoc_to_mongo/README.md +++ b/hdoc_to_mongo/README.md @@ -12,13 +12,16 @@ Kapilraj Thangeswaran This module is able to extract data from a file in Hdoc format and insert them into MongoDB. ## Dependencies +In order to work properly this module needs - In order to make this module work you have to download and install Node.js from the [Node.js download page](https://nodejs.org/en/). - If needed, download and install MongoDB from the [MongoDB download page](https://www.mongodb.com/download-center#community). ## Instructions 1. Install dependencies -2. Edit "config.json" file from "mongo" folder (for more details, please check "Mongo configuration") -3. Execute run.bat or run.sh +2. Add all your hdoc documents in an "input" folder +3. Add or edit "config.xml" file in "input" folder (for more details, please check "Input configuration") +4. Edit "config.json" file from "mongo" folder (for more details, please check "Mongo configuration") +5. Execute run.bat or run.sh ## Web This module provides a Web application to access MongoDB and execute simples requests. @@ -26,9 +29,22 @@ This module provides a Web application to access MongoDB and execute simples req 2. Edit "config.json" file from "web" folder (for more details, please check "MongoDB configuration") 3. Open "index.html" in "web" folder +## Input configuration +You can add or edit "config.xml" in "input" folder in order to provide more information about your documents. +Supported information +- link +``` + + + + https://stph.scenari-community.org/nf17/co/nf17.html + + +``` + ## MongoDB configuration ### In "mongo" folder -Use "config.json" in the "mongo" folder to specify : +Use "config.json" in the "mongo" folder to specify - url : mongodb's url - database : the database you are using - collection : the collection you are using @@ -43,7 +59,7 @@ Use "config.json" in the "mongo" folder to specify : ``` ### In "web" folder -Use "config.json" in the "web" folder to specify : +Use "config.json" in the "web" folder to specify - url : mongodb's url including the database - collection : the collection you are using ``` @@ -61,4 +77,4 @@ Use "config.json" in the "web" folder to specify : ## User stories - En tant qu’utilisateur rédigeant des documents sous opale, je veux récupérer les exercices corrigés d’un sujet donné dans le but de les réutiliser. - En tant qu’utilisateur rédigeant des documents sous opale, je veux récupérer les cours d’un auteur précis dans le but d’utiliser ses cours comme références. -- En tant qu’utilisateur universitaire, je souhaite mettre à disposition mes exercices sur internet de manière structuré dans le but de permettre à d’autre utilisateurs universitaires de les trouver, par thème, auteur ou contenu et de les réutiliser. +- En tant qu’utilisateur universitaire, je souhaite mettre à disposition mes exercices sur internet de manière structuré dans le but de permettre à d’autre utilisateurs universitaires de les trouver, par thème, auteur ou contenu et de les réutiliser. \ No newline at end of file diff --git a/hdoc_to_mongo/hdoc_to_mongo.ant b/hdoc_to_mongo/hdoc_to_mongo.ant index fab24533e7d6ac4f0f6dfbf5cf8d29b0b6ff442a..e108f377e135abf45664cbf0247fad4e0979a73d 100644 --- a/hdoc_to_mongo/hdoc_to_mongo.ant +++ b/hdoc_to_mongo/hdoc_to_mongo.ant @@ -48,7 +48,10 @@ Convert ${inputPath}/${file} - + + + + diff --git a/hdoc_to_mongo/samples/alg1_2016-12-12.scar.hdoc b/hdoc_to_mongo/samples/alg1_2016-12-12.scar.hdoc new file mode 100644 index 0000000000000000000000000000000000000000..78af29a799e58246614c2a7d26c23d2ad647c365 Binary files /dev/null and b/hdoc_to_mongo/samples/alg1_2016-12-12.scar.hdoc differ diff --git a/hdoc_to_mongo/samples/config.xml b/hdoc_to_mongo/samples/config.xml new file mode 100644 index 0000000000000000000000000000000000000000..d6955a48adfdb28ddb96ed72a975d785a2cee9d0 --- /dev/null +++ b/hdoc_to_mongo/samples/config.xml @@ -0,0 +1,6 @@ + + + + https://stph.scenari-community.org/nf17/co/nf17.html + + \ No newline at end of file diff --git a/hdoc_to_mongo/samples/lapp1_2016-12-12.scar.hdoc b/hdoc_to_mongo/samples/lapp1_2016-12-12.scar.hdoc new file mode 100644 index 0000000000000000000000000000000000000000..f52cf78908ce9be846d7475d5e3cf66460cf5aab Binary files /dev/null and b/hdoc_to_mongo/samples/lapp1_2016-12-12.scar.hdoc differ diff --git a/hdoc_to_mongo/samples/mod1_2016-12-12.scar.hdoc b/hdoc_to_mongo/samples/mod1_2016-12-12.scar.hdoc new file mode 100644 index 0000000000000000000000000000000000000000..acb2d57c2f9c24369573a6e33c01b8e1323d4572 Binary files /dev/null and b/hdoc_to_mongo/samples/mod1_2016-12-12.scar.hdoc differ diff --git a/hdoc_to_mongo/samples/mod2_2016-12-12.scar.hdoc b/hdoc_to_mongo/samples/mod2_2016-12-12.scar.hdoc new file mode 100644 index 0000000000000000000000000000000000000000..70a8493c59c7ae515a3d8db2e5b5628c533076c7 Binary files /dev/null and b/hdoc_to_mongo/samples/mod2_2016-12-12.scar.hdoc differ diff --git a/hdoc_to_mongo/xsl/main.xsl b/hdoc_to_mongo/xsl/main.xsl index 4db6b46186e8befe4f4dfda45509c9df3f382a36..d5aa7a73abc89ab9c459917eaf72997d1cfb13b0 100644 --- a/hdoc_to_mongo/xsl/main.xsl +++ b/hdoc_to_mongo/xsl/main.xsl @@ -10,11 +10,19 @@ + + + + { + + + + "title" : , "authors" : , "keywords" : , diff --git a/hdoc_to_mongo/xsl/subroutines/config.xsl b/hdoc_to_mongo/xsl/subroutines/config.xsl new file mode 100644 index 0000000000000000000000000000000000000000..7ef38bdfea4e41b353c4af3905fae552361981a0 --- /dev/null +++ b/hdoc_to_mongo/xsl/subroutines/config.xsl @@ -0,0 +1,12 @@ + + + + + + + "link" : , + + + \ No newline at end of file diff --git a/hdoc_to_opale/xsl/transformation2.xsl b/hdoc_to_opale/xsl/transformation2.xsl index 1fe94d67469679a81eec52ef24b994e4d906b8d4..6c6fa80c5b322003e9c9399db3b136b227e3d5eb 100644 --- a/hdoc_to_opale/xsl/transformation2.xsl +++ b/hdoc_to_opale/xsl/transformation2.xsl @@ -382,6 +382,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/opale_to_mongo/README.md b/opale_to_mongo/README.md index fba6400f059644c9e8c12266f8abf362db1a2570..31b9d363d0e2065e9a27a4846332d761b716bfab 100644 --- a/opale_to_mongo/README.md +++ b/opale_to_mongo/README.md @@ -13,6 +13,54 @@ This module is able to extract data from a file in Opale format and insert them ## Dependencies In order to work properly this module needs +- In order to make this module work you have to download and install Node.js from the [Node.js download page](https://nodejs.org/en/). +- If needed, download and install MongoDB from the [MongoDB download page](https://www.mongodb.com/download-center#community). +- [`opale_to_hdoc`](https://gitlab.utc.fr/crozatst/hdoc/tree/master/opale_to_hdoc) (Opale to Hdoc conversion) +- [`hdoc_to_mongo`](https://gitlab.utc.fr/crozatst/hdoc/tree/master/hdoc_to_mongo) (Hdoc to Mongo conversion) -1. [`opale_to_hdoc`](https://gitlab.utc.fr/crozatst/hdoc/tree/master/opale_to_hdoc) (Opale to Hdoc conversion) -2. [`hdoc_to_mongo`](https://gitlab.utc.fr/crozatst/hdoc/tree/master/hdoc_to_mongo) (Hdoc to Mongo conversion) \ No newline at end of file +## Instructions +1. Install dependencies +2. Add all your hdoc documents in an "input" folder +3. Add or edit "config.xml" file in "input" folder (for more details, please check "Input configuration") +4. Edit "config.json" file from "mongo" folder in "hdoc_to_mongo" module (for more details, please check "Mongo configuration") +5. Execute run.bat or run.sh + +## Input configuration +You can add or edit "config.xml" in "input" folder to provide more information about your documents. + +Supported information +- link +``` + + + + https://stph.scenari-community.org/nf17/co/nf17.html + + +``` + +## MongoDB configuration +### In "mongo" folder from "hdoc_to_mongo" module +Use "config.json" in the "mongo" folder to specify +- url : mongodb's url +- database : the database you are using +- collection : the collection you are using +- request : the request you want to perform (for allowed requests, please check "Supported requests") +``` +{ + "url" : "mongodb://localhost:27017/", + "database" : "database", + "collection" : "collection", + "request" : "insert" +} +``` + +## Supported requests +- insert +- update (using the title as filter) +- remove (using the title as filter) + +## User stories +- En tant qu’utilisateur rédigeant des documents sous opale, je veux récupérer les exercices corrigés d’un sujet donné dans le but de les réutiliser. +- En tant qu’utilisateur rédigeant des documents sous opale, je veux récupérer les cours d’un auteur précis dans le but d’utiliser ses cours comme références. +- En tant qu’utilisateur universitaire, je souhaite mettre à disposition mes exercices sur internet de manière structuré dans le but de permettre à d’autre utilisateurs universitaires de les trouver, par thème, auteur ou contenu et de les réutiliser. \ No newline at end of file diff --git a/opale_to_mongo/opale_to_mongo.ant b/opale_to_mongo/opale_to_mongo.ant index c09958dc2abeab7d8b7d90bad0a910754727a354..094bbbd7ba314008f838efd1a64e36e19966b2ee 100644 --- a/opale_to_mongo/opale_to_mongo.ant +++ b/opale_to_mongo/opale_to_mongo.ant @@ -23,6 +23,7 @@ + diff --git a/opale_to_mongo/samples/alg1_2016-12-12.scar b/opale_to_mongo/samples/alg1_2016-12-12.scar new file mode 100644 index 0000000000000000000000000000000000000000..2365b69a6d1363c98b53c5489f06f17c3338d43c Binary files /dev/null and b/opale_to_mongo/samples/alg1_2016-12-12.scar differ diff --git a/opale_to_mongo/samples/config.xml b/opale_to_mongo/samples/config.xml new file mode 100644 index 0000000000000000000000000000000000000000..d6955a48adfdb28ddb96ed72a975d785a2cee9d0 --- /dev/null +++ b/opale_to_mongo/samples/config.xml @@ -0,0 +1,6 @@ + + + + https://stph.scenari-community.org/nf17/co/nf17.html + + \ No newline at end of file diff --git a/opale_to_mongo/samples/lapp1_2016-12-12.scar b/opale_to_mongo/samples/lapp1_2016-12-12.scar new file mode 100644 index 0000000000000000000000000000000000000000..7112ecdf61a48c5664045b78e65c3262a9e1c80a Binary files /dev/null and b/opale_to_mongo/samples/lapp1_2016-12-12.scar differ diff --git a/opale_to_mongo/samples/mod1_2016-12-12.scar b/opale_to_mongo/samples/mod1_2016-12-12.scar new file mode 100644 index 0000000000000000000000000000000000000000..06add896a81acee8e29e12c9fb222ee4892a23ce Binary files /dev/null and b/opale_to_mongo/samples/mod1_2016-12-12.scar differ diff --git a/opale_to_mongo/samples/mod2_2016-12-12.scar b/opale_to_mongo/samples/mod2_2016-12-12.scar new file mode 100644 index 0000000000000000000000000000000000000000..772d4f50ab93718fc4be68b02a96bb430b438deb Binary files /dev/null and b/opale_to_mongo/samples/mod2_2016-12-12.scar differ diff --git a/schemas/xhtml/type.rng b/schemas/xhtml/type.rng index ca5ed41e50a0c42e848b0bbec98aad8c28361e1f..b056a3d92635235943fcb86d09d64238bf1a623d 100644 --- a/schemas/xhtml/type.rng +++ b/schemas/xhtml/type.rng @@ -46,6 +46,8 @@ remark warning advice + remind + method question singlechoicequestion