Menu
▾
▴
[Acmcontester-developers] SF.net SVN: acmcontester: [79] WebEditor/src
|
From: <se...@us...> - 2008-05-03 08:54:02
|
Revision: 79
http://acmcontester.svn.sourceforge.net/acmcontester/?rev=79&view=rev
Author: sem62
Date: 2008-05-03 01:54:06 -0700 (Sat, 03 May 2008)
Log Message:
-----------
Summary page working properly. Need do some modification into SummaryPage.js
Modified Paths:
--------------
WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ItemModel.java
WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/SummaryPageModel/SummaryPageModel.java
WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/Template.java
WebEditor/src/template/SummaryPageModel.html
WebEditor/src/template/global/SummaryPage.js
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ItemModel.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ItemModel.java 2008-05-02 23:09:45 UTC (rev 78)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ItemModel.java 2008-05-03 08:54:06 UTC (rev 79)
@@ -7,6 +7,7 @@
import java.util.HashMap;
import java.util.UUID;
+import edu.lnu.FireFly.FFManifest.Organization;
import edu.lnu.FireFly.FFManifest.TreeItem;
import edu.lnu.FireFly.FFManifest.item.Item;
import edu.lnu.FireFly.FFManifest.resource.Resource;
@@ -148,4 +149,16 @@
public abstract boolean getShowOnSummaryPageMenuVisible();
public abstract boolean getShowSummaryPageMenuVisible();
+
+ public final String getIdentifier(TreeItem anItem) {
+ if (anItem.getClass() == Item.class){
+ return ((Item)anItem).identifier;
+ }
+
+ if (anItem.getClass() == Organization.class){
+ return ((Organization)anItem).identifier;
+ }
+
+ return null;
+ }
}
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/SummaryPageModel/SummaryPageModel.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/SummaryPageModel/SummaryPageModel.java 2008-05-02 23:09:45 UTC (rev 78)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/SummaryPageModel/SummaryPageModel.java 2008-05-03 08:54:06 UTC (rev 79)
@@ -44,17 +44,18 @@
}
@Override
- public boolean updateItemResource(TreeItem anItem, boolean updateSummaryPages) {
+ public boolean updateItemResource(TreeItem anItem,
+ boolean updateSummaryPages) {
Resource resource = WebEditor.instance.getManifest().resources
.findResourceByIdentifier(((Item) anItem).identifierref);
Template template = new Template(resource.getFullHref(), this);
String content = "<script type=\"text/javascript\">"
- + getSummaryPageContent(anItem.getParent())
- + "</script>";
+ + getSummaryPageContent(anItem.getParent()) + "</script>";
template.setProperty("content", content);
+ template.setProperty("title", anItem.getTitle());
template.updateResource();
@@ -72,11 +73,14 @@
private String getSummaryPageContent(TreeItem parent) {
int childsCount = parent.getChildCount();
- String res = "openBlock(\"" + parent.getTitle() + "\");\n";
+ ItemModel model = ItemModels.getModelFromItem(parent);
+ String res = "openBlock(\"" + parent.getTitle() + "\", \""
+ + model.getModelName() + "\", \""
+ + model.getIdentifier(parent) + "\");\n";
for (int i = 0; i < childsCount; i++) {
TreeItem item = parent.getChild(i);
- ItemModel model = ItemModels.getModelFromItem(item);
+ model = ItemModels.getModelFromItem(item);
if (model.getShowOnSummaryPage(item)) {
res += getSummaryPageContentItem(item);
@@ -97,7 +101,8 @@
if (model.getClass() == SimpleQuestionModel.class
|| model.getClass() == LectureModel.class) {
- return "add(\"" + anItem.getTitle() + "\", \"" + model.getModelName() + "\", \""
+ return "add(\"" + anItem.getTitle() + "\", \""
+ + model.getModelName() + "\", \""
+ ((Item) anItem).identifier + "\");\n";
}
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/Template.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/Template.java 2008-05-02 23:09:45 UTC (rev 78)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/Template.java 2008-05-03 08:54:06 UTC (rev 79)
@@ -20,8 +20,9 @@
public void setProperty(String name, String value) {
propertiests.put(name, value);
}
-
- protected String insertPropertyIntoResource(String res, String name, String value){
+
+ protected String insertPropertyIntoResource(String res, String name,
+ String value) {
try {
String startTag = ("<!--" + name + " start-->").toLowerCase();
String endTag = ("<!--" + name + " end-->").toLowerCase();
@@ -50,14 +51,27 @@
}
public boolean updateResource() {
+ boolean copied = WebEditorServiceClient.copyFromTemplate(model
+ .getClass().getSimpleName()
+ + ".html", fileName);
+
+ if (!copied){
+ return false;
+ }
+
String res = WebEditorServiceClient.getFileContent(fileName);
-
+
Iterator<String> iter = propertiests.keySet().iterator();
- while (iter.hasNext()){
+ while (iter.hasNext()) {
String name = iter.next();
res = insertPropertyIntoResource(res, name, propertiests.get(name));
+
+ if (res == null){
+ System.out.print("Property \"" + name + "\" isn't present.\n");
+ return false;
+ }
}
-
+
WebEditorServiceClient.setFileContent(fileName, res);
return true;
Modified: WebEditor/src/template/SummaryPageModel.html
===================================================================
--- WebEditor/src/template/SummaryPageModel.html 2008-05-02 23:09:45 UTC (rev 78)
+++ WebEditor/src/template/SummaryPageModel.html 2008-05-03 08:54:06 UTC (rev 79)
@@ -35,6 +35,9 @@
<body onload="Initialize();" onunload="Terminate();">
<div id="page_content">
+ <Center><h1><!--title start-->
+ <!--title end--></Center></h1>
+
<table align='center' cellpadding='0' cellspacing='1' width='85%' class='tbl-border'>
<tr>
<td align='center' width='35' class='tbl2' style='white-space:nowrap'><b>#</b></td>
Modified: WebEditor/src/template/global/SummaryPage.js
===================================================================
--- WebEditor/src/template/global/SummaryPage.js 2008-05-02 23:09:45 UTC (rev 78)
+++ WebEditor/src/template/global/SummaryPage.js 2008-05-03 08:54:06 UTC (rev 79)
@@ -21,7 +21,9 @@
document.write(td + percents);
}
-function openBlock(title){
+function openBlock(title, model, id){
+ title = "<b>" + title + "</b>";
+ add(title, model, id);
deep++;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
