|
From: <se...@us...> - 2008-05-02 16:15:54
|
Revision: 73
http://acmcontester.svn.sourceforge.net/acmcontester/?rev=73&view=rev
Author: sem62
Date: 2008-05-02 09:15:52 -0700 (Fri, 02 May 2008)
Log Message:
-----------
Summary page mechanism working now.
Need design summary page (SummaryPage.js).
Modified Paths:
--------------
WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ResourcedItemModel.java
WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/SimpleQuestion/SimpleQuestionData.java
WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/SummaryPageModel/SummaryPageModel.java
WebEditor/src/template/SummaryPageModel.html
WebEditor/src/template/global/SummaryPage.js
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ResourcedItemModel.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ResourcedItemModel.java 2008-05-02 11:23:52 UTC (rev 72)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ResourcedItemModel.java 2008-05-02 16:15:52 UTC (rev 73)
@@ -29,6 +29,7 @@
return;
}
+ synchronizeItemWithResource(item);
updateItemResource(item, true);
ConfigureItem(item);
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/SimpleQuestion/SimpleQuestionData.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/SimpleQuestion/SimpleQuestionData.java 2008-05-02 11:23:52 UTC (rev 72)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/SimpleQuestion/SimpleQuestionData.java 2008-05-02 16:15:52 UTC (rev 73)
@@ -4,8 +4,8 @@
public class SimpleQuestionData extends ItemData {
private SimpleQuestionAnswersDataModel answers = new SimpleQuestionAnswersDataModel();
- private String caption;
- private String question;
+ private String caption = "";
+ private String question = "";
public SimpleQuestionAnswersDataModel getAnswers() {
return answers;
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/SummaryPageModel/SummaryPageModel.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/SummaryPageModel/SummaryPageModel.java 2008-05-02 11:23:52 UTC (rev 72)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/SummaryPageModel/SummaryPageModel.java 2008-05-02 16:15:52 UTC (rev 73)
@@ -50,7 +50,9 @@
Template template = new Template(resource.getFullHref(), this);
- String content = getSummaryPageContent(anItem.getParent());
+ String content = "<script type=\"text/javascript\">"
+ + getSummaryPageContent(anItem.getParent())
+ + "</script>";
template.setProperty("content", content);
@@ -95,7 +97,7 @@
if (model.getClass() == SimpleQuestionModel.class
|| model.getClass() == LectureModel.class) {
- return "add(\"" + model.getModelName() + "\", \""
+ return "add(\"" + anItem.getTitle() + "\", \"" + model.getModelName() + "\", \""
+ ((Item) anItem).identifier + "\");\n";
}
Modified: WebEditor/src/template/SummaryPageModel.html
===================================================================
--- WebEditor/src/template/SummaryPageModel.html 2008-05-02 11:23:52 UTC (rev 72)
+++ WebEditor/src/template/SummaryPageModel.html 2008-05-02 16:15:52 UTC (rev 73)
@@ -8,10 +8,8 @@
<body onload="Initialize();" onunload="Terminate();">
<div id="page_content">
- <script type="text/javascript">
<!--content start-->
<!--content end-->
- </script>
</div>
</body>
</html>
\ No newline at end of file
Modified: WebEditor/src/template/global/SummaryPage.js
===================================================================
--- WebEditor/src/template/global/SummaryPage.js 2008-05-02 11:23:52 UTC (rev 72)
+++ WebEditor/src/template/global/SummaryPage.js 2008-05-02 16:15:52 UTC (rev 73)
@@ -0,0 +1,33 @@
+function out(s){
+ document.write(s);
+}
+
+function openBlock(title){
+ out("Opened block with title = "+title+"<br>\n");
+}
+
+function closeBlock(title){
+ out("Closed block with title = "+title+"<br>\n");
+}
+
+
+function add(title, modelName, id){
+ out(title + ". item id = " + id + "(" + modelName + ")<br>\n");
+ out("score is: ");
+ out(getScore(id));
+ out("<br>\n");
+}
+
+function getObjectiveIndex(id){
+ var count = GetValue("cmi.objectives._count");
+ for (i = 0; i < count; i++)
+ if (GetValue("cmi.objectives." + i + ".id") == id)
+ return i;
+ return -1;
+}
+
+function getScore(objectiveID){
+ var index = getObjectiveIndex(objectiveID);
+ var res = GetValue("cmi.objectives." + index + ".score.scaled");
+ return res != null ? res : 0;
+}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|