Menu
▾
▴
[Acmcontester-developers] SF.net SVN: acmcontester: [163] WebEditor/src/edu/lnu/FireFly/WebEditor
|
From: <se...@us...> - 2008-05-24 13:10:06
|
Revision: 163
http://acmcontester.svn.sourceforge.net/acmcontester/?rev=163&view=rev
Author: sem62
Date: 2008-05-24 06:10:11 -0700 (Sat, 24 May 2008)
Log Message:
-----------
Added dialog for showing user answer status.
Modified Paths:
--------------
WebEditor/src/edu/lnu/FireFly/WebEditor/AppletWithApiHandle.java
WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/Chapter/ChapterModel.java
WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/CompileQ/CompileQModel.java
WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ItemModel.java
WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/Lecture/LectureModel.java
WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/SimpleQuestion/SimpleQuestionModel.java
WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/SummaryPageModel/SummaryPageModel.java
WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/UnknownItemModel.java
WebEditor/src/edu/lnu/FireFly/WebEditor/UserAnswerStatus/ScoredUserAnswerStatus.java
Added Paths:
-----------
WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/GeneralUserAnswerStatusDlg.java
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/AppletWithApiHandle.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/AppletWithApiHandle.java 2008-05-23 17:44:49 UTC (rev 162)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/AppletWithApiHandle.java 2008-05-24 13:10:11 UTC (rev 163)
@@ -1,14 +1,21 @@
package edu.lnu.FireFly.WebEditor;
+import java.net.URL;
+
import javax.swing.JApplet;
import edu.lnu.FireFly.FFManifest.TreeItem;
+import edu.lnu.FireFly.FFManifest.item.Item;
+import edu.lnu.FireFly.FFManifest.resource.Resource;
import edu.lnu.FireFly.Rte.Cmi;
import edu.lnu.FireFly.Rte.CmiManager;
import edu.lnu.FireFly.Rte.ElementName;
import edu.lnu.FireFly.Rte.GlobalStateInformation;
import edu.lnu.FireFly.WebEditor.Data.AnswersStatusManager;
import edu.lnu.FireFly.WebEditor.Data.SummaryPageManager;
+import edu.lnu.FireFly.WebEditor.ItemModels.ItemModel;
+import edu.lnu.FireFly.WebEditor.ItemModels.ItemModels;
+import edu.lnu.FireFly.WebEditor.UserAnswerStatus.UserAnswerStatus;
/**
* It is an Applet, but it contain API handlers.
@@ -29,81 +36,144 @@
nextItemIdentifier = itemIdentifier;
}
- public String Initialize(String parameter) {
- System.out.print("Initialize(" + parameter + ");\n");
+ public synchronized String Initialize(String parameter) {
+ try {
+ System.out.print("Initialize(" + parameter + ");\n");
- GlobalStateInformation.setCurrentActivity(SummaryPageManager
- .getInstance().getManifest().findItemByIdentifier(
- nextItemIdentifier));
+ GlobalStateInformation.setCurrentActivity(SummaryPageManager
+ .getInstance().getManifest().findItemByIdentifier(
+ nextItemIdentifier));
+ } catch (Exception e) {
+ e.printStackTrace();
+ return "false";
+ }
return "true";
}
- public String Terminate(String parameter) {
- System.out.print("Terminate(" + parameter + ");\n");
+ public synchronized String Terminate(String parameter) {
+ try {
+ System.out.print("Terminate(" + parameter + ");\n");
- GlobalStateInformation.setCurrentActivity(null);
+ if (nextItemIdentifier.equals(GlobalStateInformation.getCurrentActivity().getIdentifier())){
+ showAnswerResult();
+ }
+ GlobalStateInformation.setCurrentActivity(null);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return "false";
+ }
return "true";
}
- public String GetValue(String parameter) {
- System.out.print("GetValue(" + parameter + ")");
+ private void showAnswerResult() {
+ TreeItem currentActivity = GlobalStateInformation
+ .getCurrentActivity();
+ String identifier = "";
+ if (currentActivity != null) {
+ identifier = currentActivity.getIdentifier();
+ TreeItem item = SummaryPageManager.getInstance()
+ .getManifest().findItemByIdentifier(identifier);
+ ItemModel model = ItemModels.getModelFromItem(item);
- Cmi cmi = getCmiModel();
+ UserAnswerStatus answerStatus = AnswersStatusManager
+ .getInstance().getAnswerStatus(item);
+ model.showAnswerStatus(answerStatus);
+ }
+ redirectTo(identifier);
+ }
+
+ private void redirectTo(String identifier) {
+ try {
+ TreeItem item = SummaryPageManager.getInstance().getManifest()
+ .findItemByIdentifier(identifier);
+
+ if (item.getClass() != Item.class) {
+ return;
+ }
+
+ Resource resource = WebEditor.instance.getManifest().resources
+ .findResourceByIdentifier(((Item) item).identifierref);
+ if (resource != null) {
+ getAppletContext().showDocument(
+ new URL(Settings.getInstance().getCourseLocation()
+ + resource.getFullHref()), "ContentFrame");
+ System.out.print("redirected\n");
+ }
+ } catch (Exception exc) {
+ exc.printStackTrace();
+ }
+ }
+
+ public synchronized String GetValue(String parameter) {
String result = "";
- if (parameter.toLowerCase().startsWith("cmi.")) {
- result = cmi.getValue(new ElementName(parameter.substring(4)));
+
+ try {
+ System.out.print("GetValue(" + parameter + ")");
+
+ Cmi cmi = getCmiModel();
+
+ if (parameter.toLowerCase().startsWith("cmi.")) {
+ result = cmi.getValue(new ElementName(parameter.substring(4)));
+ }
+
+ System.out.println(" returned " + result);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return "";
}
-
- System.out.println(" returned " + result);
return result;
}
private Cmi getCmiModel() {
-
TreeItem activity = GlobalStateInformation.getCurrentActivity();
Cmi cmi = CmiManager.getInstance().getModelForActivity(activity);
return cmi;
}
- public boolean SetValue(String parameter, String value) {
- System.out.print("SetValue(" + parameter + ", " + value + ");\n");
+ public synchronized String SetValue(String parameter, String value) {
+ try {
+ System.out.print("SetValue(" + parameter + ", " + value + ");\n");
- Cmi cmi = getCmiModel();
+ Cmi cmi = getCmiModel();
- if (parameter.toLowerCase().startsWith("cmi.")) {
- cmi.setValue(new ElementName(parameter.substring(4)), value);
+ if (parameter.toLowerCase().startsWith("cmi.")) {
+ cmi.setValue(new ElementName(parameter.substring(4)), value);
- if (parameter.startsWith("cmi.answers.")) {
- String itemIdentifier = GlobalStateInformation
- .getCurrentActivity().getIdentifier();
+ if (parameter.startsWith("cmi.answers.")) {
+ String itemIdentifier = GlobalStateInformation
+ .getCurrentActivity().getIdentifier();
- TreeItem item = SummaryPageManager.getInstance().getManifest()
- .findItemByIdentifier(itemIdentifier);
+ TreeItem item = SummaryPageManager.getInstance()
+ .getManifest().findItemByIdentifier(itemIdentifier);
- AnswersStatusManager.getInstance().cmiAnswersChanged(item);
+ AnswersStatusManager.getInstance().cmiAnswersChanged(item);
+ }
+
+ return "true";
+ } else {
+ return "false";
}
-
- return true;
- } else {
- return false;
+ } catch (Exception e) {
+ e.printStackTrace();
+ return "false";
}
}
- public String Commit(String parameter) {
+ public synchronized String Commit(String parameter) {
System.out.print("Commit(" + parameter + ");\n");
return "true";
}
- public int GetLastError() {
+ public synchronized int GetLastError() {
System.out.print("GetLastError();\n");
return 0;
}
- public String GetErrorString(String parameter) {
+ public synchronized String GetErrorString(String parameter) {
int code = Integer.parseInt(parameter);
String result = "";
@@ -113,7 +183,7 @@
return result;
}
- public String GetDiagnostic(String parameter) {
+ public synchronized String GetDiagnostic(String parameter) {
System.out.print("GetDiagnostic(" + parameter + ");\n");
return "";
}
Added: WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/GeneralUserAnswerStatusDlg.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/GeneralUserAnswerStatusDlg.java (rev 0)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/GeneralUserAnswerStatusDlg.java 2008-05-24 13:10:11 UTC (rev 163)
@@ -0,0 +1,222 @@
+package edu.lnu.FireFly.WebEditor.GUI.Dialogs;
+
+/**
+ *
+ * @author Yura
+ */
+public class GeneralUserAnswerStatusDlg extends javax.swing.JDialog {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+ /** A return status code - returned if Cancel button has been pressed */
+ public static final int RET_CANCEL = 0;
+ /** A return status code - returned if OK button has been pressed */
+ public static final int RET_OK = 1;
+
+ /** Creates new form NewOkCancelDialog */
+ public GeneralUserAnswerStatusDlg(java.awt.Frame parent, boolean modal) {
+ super(parent, modal);
+ initComponents();
+ }
+
+ /** @return the return status of this dialog - one of RET_OK or RET_CANCEL */
+ public int getReturnStatus() {
+ return returnStatus;
+ }
+
+ /** This method is called from within the constructor to
+ * initialize the form.
+ * WARNING: Do NOT modify this code. The content of this method is
+ * always regenerated by the Form Editor.
+ */
+ // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
+ private void initComponents() {
+
+ okButton = new javax.swing.JButton();
+ jPanel1 = new javax.swing.JPanel();
+ jLabel1 = new javax.swing.JLabel();
+ jLabel2 = new javax.swing.JLabel();
+ jLabel3 = new javax.swing.JLabel();
+ jLabel4 = new javax.swing.JLabel();
+ jLabel5 = new javax.swing.JLabel();
+ completionValueLabel = new javax.swing.JLabel();
+ succesValueLabel = new javax.swing.JLabel();
+ rawValueLabel = new javax.swing.JLabel();
+ maxValueLabel = new javax.swing.JLabel();
+ minValueLabel = new javax.swing.JLabel();
+
+ setTitle("Answer status");
+ setModal(true);
+ setResizable(false);
+
+ addWindowListener(new java.awt.event.WindowAdapter() {
+ public void windowClosing(java.awt.event.WindowEvent evt) {
+ closeDialog(evt);
+ }
+ });
+
+ okButton.setText("Ok");
+ okButton.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ okButtonActionPerformed(evt);
+ }
+ });
+
+ jPanel1.setBorder(javax.swing.BorderFactory.createTitledBorder("Checking results"));
+
+ jLabel1.setText("Min score :");
+
+ jLabel2.setText("Max score :");
+
+ jLabel3.setText("Raw score :");
+
+ jLabel4.setText("Completion status :");
+
+ jLabel5.setText("Success status :");
+
+ completionValueLabel.setText("6");
+
+ succesValueLabel.setText("successStatus");
+
+ rawValueLabel.setText("rawScore");
+
+ maxValueLabel.setText("maxScore");
+
+ minValueLabel.setText("minScore");
+
+ javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1);
+ jPanel1.setLayout(jPanel1Layout);
+ jPanel1Layout.setHorizontalGroup(
+ jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(jPanel1Layout.createSequentialGroup()
+ .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(jLabel4)
+ .addComponent(jLabel5)
+ .addComponent(jLabel3)
+ .addComponent(jLabel1)
+ .addComponent(jLabel2))
+ .addGap(12, 12, 12)
+ .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(succesValueLabel)
+ .addComponent(completionValueLabel)
+ .addComponent(rawValueLabel)
+ .addComponent(maxValueLabel)
+ .addComponent(minValueLabel))
+ .addContainerGap(16, Short.MAX_VALUE))
+ );
+ jPanel1Layout.setVerticalGroup(
+ jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(jPanel1Layout.createSequentialGroup()
+ .addContainerGap()
+ .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
+ .addGroup(jPanel1Layout.createSequentialGroup()
+ .addComponent(completionValueLabel)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(succesValueLabel))
+ .addGroup(jPanel1Layout.createSequentialGroup()
+ .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(jLabel1)
+ .addComponent(minValueLabel))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(jLabel2)
+ .addComponent(maxValueLabel))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(jLabel3)
+ .addComponent(rawValueLabel))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+ .addComponent(jLabel4)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(jLabel5)))
+ .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ );
+
+ javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
+ getContentPane().setLayout(layout);
+ layout.setHorizontalGroup(
+ layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(layout.createSequentialGroup()
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
+ .addGroup(layout.createSequentialGroup()
+ .addContainerGap()
+ .addComponent(jPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .addGroup(layout.createSequentialGroup()
+ .addComponent(okButton, javax.swing.GroupLayout.PREFERRED_SIZE, 67, javax.swing.GroupLayout.PREFERRED_SIZE)))
+ .addContainerGap())
+ );
+ layout.setVerticalGroup(
+ layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
+ .addContainerGap()
+ .addComponent(jPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(okButton)
+ .addContainerGap())
+ );
+
+ pack();
+ }
+
+ private void okButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_okButtonActionPerformed
+ doClose(RET_OK);
+ }
+
+ /** Closes the dialog */
+ private void closeDialog(java.awt.event.WindowEvent evt) {//GEN-FIRST:event_closeDialog
+ doClose(RET_CANCEL);
+ }
+
+ private void doClose(int retStatus) {
+ returnStatus = retStatus;
+ setVisible(false);
+ dispose();
+ }
+
+ public void show(double min, double max, double raw, String completion, String success){
+ minValueLabel.setText(String.valueOf(min));
+ maxValueLabel.setText(String.valueOf(max));
+ rawValueLabel.setText(String.valueOf(raw));
+
+ completionValueLabel.setText(completion);
+ succesValueLabel.setText(success);
+
+ setVisible(true);
+ }
+
+// /**
+// * @param args the command line arguments
+// */
+// public static void main(String args[]) {
+// java.awt.EventQueue.invokeLater(new Runnable() {
+// public void run() {
+// GeneralUserAnswerStatusDlg dialog = new GeneralUserAnswerStatusDlg(new javax.swing.JFrame(), true);
+// dialog.addWindowListener(new java.awt.event.WindowAdapter() {
+// public void windowClosing(java.awt.event.WindowEvent e) {
+// System.exit(0);
+// }
+// });
+//
+// dialog.show(0, 1, 0.5, "completed", "passed");
+// }
+// });
+// }
+
+ // Variables declaration - do not modify//GEN-BEGIN:variables
+ private javax.swing.JLabel jLabel1;
+ private javax.swing.JLabel minValueLabel;
+ private javax.swing.JLabel jLabel2;
+ private javax.swing.JLabel jLabel3;
+ private javax.swing.JLabel jLabel4;
+ private javax.swing.JLabel jLabel5;
+ private javax.swing.JLabel completionValueLabel;
+ private javax.swing.JLabel succesValueLabel;
+ private javax.swing.JLabel rawValueLabel;
+ private javax.swing.JLabel maxValueLabel;
+ private javax.swing.JPanel jPanel1;
+ private javax.swing.JButton okButton;
+ // End of variables declaration//GEN-END:variables
+
+ private int returnStatus = RET_CANCEL;
+}
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/Chapter/ChapterModel.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/Chapter/ChapterModel.java 2008-05-23 17:44:49 UTC (rev 162)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/Chapter/ChapterModel.java 2008-05-24 13:10:11 UTC (rev 163)
@@ -181,4 +181,10 @@
// do nothing.
// Chapter currently haven't resource file
}
+
+ @Override
+ public void showAnswerStatus(UserAnswerStatus answerStatus) {
+ // TODO Auto-generated method stub
+
+ }
}
\ No newline at end of file
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/CompileQ/CompileQModel.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/CompileQ/CompileQModel.java 2008-05-23 17:44:49 UTC (rev 162)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/CompileQ/CompileQModel.java 2008-05-24 13:10:11 UTC (rev 163)
@@ -116,4 +116,10 @@
// TODO Auto-generated method stub
return 0;
}
+
+ @Override
+ public void showAnswerStatus(UserAnswerStatus answerStatus) {
+ // TODO Auto-generated method stub
+
+ }
}
\ No newline at end of file
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ItemModel.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ItemModel.java 2008-05-23 17:44:49 UTC (rev 162)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ItemModel.java 2008-05-24 13:10:11 UTC (rev 163)
@@ -72,6 +72,8 @@
updateItemResource(anItem, true);
}
}
+
+ public abstract void showAnswerStatus(UserAnswerStatus answerStatus);
public abstract void addItem(TreeItem parent);
@@ -286,8 +288,7 @@
public abstract UserAnswerStatus createUserAnswerInstance(TreeItem anItem);
- public abstract double getAnswerRawScore(TreeItem anItem,
- String[] userAnswers);
+ public abstract double getAnswerRawScore(TreeItem anItem, String[] userAnswers);
public abstract double getAnswerMinScore(TreeItem item);
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/Lecture/LectureModel.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/Lecture/LectureModel.java 2008-05-23 17:44:49 UTC (rev 162)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/Lecture/LectureModel.java 2008-05-24 13:10:11 UTC (rev 163)
@@ -94,4 +94,10 @@
// TODO Auto-generated method stub
return 0;
}
+
+ @Override
+ public void showAnswerStatus(UserAnswerStatus answerStatus) {
+ // TODO Auto-generated method stub
+
+ }
}
\ No newline at end of file
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/SimpleQuestion/SimpleQuestionModel.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/SimpleQuestion/SimpleQuestionModel.java 2008-05-23 17:44:49 UTC (rev 162)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/SimpleQuestion/SimpleQuestionModel.java 2008-05-24 13:10:11 UTC (rev 163)
@@ -15,6 +15,72 @@
public class SimpleQuestionModel extends ResourcedItemModel {
@Override
+ public void showAnswerStatus(UserAnswerStatus answerStatus) {
+ ((ScoredUserAnswerStatus)answerStatus).showStatus();
+ }
+
+ public SimpleQuestionModel() {
+ modelName = "SimpleQuestionModel";
+ registerConfigDlg(new SimpleQuestionPropertiestsDlg());
+ }
+
+ @Override
+ public boolean canAddToItem(TreeItem parent) {
+ // TODO Auto-generated method stub
+ return true;
+ }
+
+ @Override
+ public boolean canConvertItem(TreeItem parent) {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ @Override
+ protected ItemData createItemDataInstance() {
+ return new SimpleQuestionData();
+ }
+
+ @Override
+ public UserAnswerStatus createUserAnswerInstance(TreeItem anItem) {
+ return new ScoredUserAnswerStatus(anItem);
+ }
+
+ @Override
+ public double getAnswerMaxScore(TreeItem item) {
+ double result = 0d;
+
+ SimpleQuestionData data = getData(item);
+
+ for (int i = 0; i < data.getAnswers().answers.size(); i++) {
+ double answerPoint = data.getAnswers().answers.get(i)
+ .getAnswerPoint();
+ if (answerPoint > 0) {
+ result += answerPoint;
+ }
+ }
+
+ return result;
+ }
+
+ @Override
+ public double getAnswerMinScore(TreeItem item) {
+ double result = 0d;
+
+ SimpleQuestionData data = getData(item);
+
+ for (int i = 0; i < data.getAnswers().answers.size(); i++) {
+ double answerPoint = data.getAnswers().answers.get(i)
+ .getAnswerPoint();
+ if (answerPoint < 0) {
+ result += answerPoint;
+ }
+ }
+
+ return result;
+ }
+
+ @Override
public double getAnswerRawScore(TreeItem anItem, String[] userAnswers) {
SimpleQuestionData data = getData(anItem);
@@ -36,9 +102,8 @@
return result;
}
- @Override
- public UserAnswerStatus createUserAnswerInstance(TreeItem anItem) {
- return new ScoredUserAnswerStatus(anItem);
+ public SimpleQuestionData getData(TreeItem item) {
+ return ((SimpleQuestionData) getItemData(item));
}
@Override
@@ -56,38 +121,17 @@
return true;
}
- public SimpleQuestionModel() {
- modelName = "SimpleQuestionModel";
- registerConfigDlg(new SimpleQuestionPropertiestsDlg());
- }
-
@Override
- public boolean canAddToItem(TreeItem parent) {
- // TODO Auto-generated method stub
- return true;
- }
-
- @Override
- public boolean canConvertItem(TreeItem parent) {
- // TODO Auto-generated method stub
+ public boolean getShowSummaryPageMenuVisible() {
return false;
}
- public SimpleQuestionData getData(TreeItem item) {
- return ((SimpleQuestionData) getItemData(item));
- }
-
@Override
public boolean isRemovable() {
return true;
}
@Override
- protected ItemData createItemDataInstance() {
- return new SimpleQuestionData();
- }
-
- @Override
protected void updateResourceFile(TreeItem anItem) {
Resource resource = WebEditor.instance.getManifest().resources
.findResourceByIdentifier(((Item) anItem).identifierref);
@@ -114,43 +158,4 @@
template.setProperty("answers", answers);
template.updateResource();
}
-
- @Override
- public boolean getShowSummaryPageMenuVisible() {
- return false;
- }
-
- @Override
- public double getAnswerMaxScore(TreeItem item) {
- double result = 0d;
-
- SimpleQuestionData data = getData(item);
-
- for (int i = 0; i < data.getAnswers().answers.size(); i++) {
- double answerPoint = data.getAnswers().answers.get(i)
- .getAnswerPoint();
- if (answerPoint > 0) {
- result += answerPoint;
- }
- }
-
- return result;
- }
-
- @Override
- public double getAnswerMinScore(TreeItem item) {
- double result = 0d;
-
- SimpleQuestionData data = getData(item);
-
- for (int i = 0; i < data.getAnswers().answers.size(); i++) {
- double answerPoint = data.getAnswers().answers.get(i)
- .getAnswerPoint();
- if (answerPoint < 0) {
- result += answerPoint;
- }
- }
-
- return result;
- }
}
\ No newline at end of file
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/SummaryPageModel/SummaryPageModel.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/SummaryPageModel/SummaryPageModel.java 2008-05-23 17:44:49 UTC (rev 162)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/SummaryPageModel/SummaryPageModel.java 2008-05-24 13:10:11 UTC (rev 163)
@@ -16,6 +16,12 @@
import edu.lnu.FireFly.WebEditor.UserAnswerStatus.UserAnswerStatus;
public class SummaryPageModel extends ResourcedItemModel {
+ @Override
+ public void showAnswerStatus(UserAnswerStatus answerStatus) {
+ // TODO Auto-generated method stub
+
+ }
+
public SummaryPageModel() {
modelName = "SummaryPageModel";
}
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/UnknownItemModel.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/UnknownItemModel.java 2008-05-23 17:44:49 UTC (rev 162)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/UnknownItemModel.java 2008-05-24 13:10:11 UTC (rev 163)
@@ -13,6 +13,10 @@
}
@Override
+ public void showAnswerStatus(UserAnswerStatus answerStatus) {
+ }
+
+ @Override
public UserAnswerStatus createUserAnswerInstance(TreeItem anItem) {
return new UnknownModelAnswerStatus(anItem);
}
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/UserAnswerStatus/ScoredUserAnswerStatus.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/UserAnswerStatus/ScoredUserAnswerStatus.java 2008-05-23 17:44:49 UTC (rev 162)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/UserAnswerStatus/ScoredUserAnswerStatus.java 2008-05-24 13:10:11 UTC (rev 163)
@@ -4,6 +4,7 @@
import edu.lnu.FireFly.FFManifest.item.Item;
import edu.lnu.FireFly.Rte.Cmi;
import edu.lnu.FireFly.Rte.ElementName;
+import edu.lnu.FireFly.WebEditor.GUI.Dialogs.GeneralUserAnswerStatusDlg;
import edu.lnu.FireFly.WebEditor.ItemModels.ItemModel;
import edu.lnu.FireFly.WebEditor.ItemModels.ItemModels;
@@ -14,6 +15,11 @@
public ScoredUserAnswerStatus(TreeItem anItem) {
super(anItem);
}
+
+ public void showStatus(){
+ GeneralUserAnswerStatusDlg dlg = new GeneralUserAnswerStatusDlg(null, true);
+ dlg.show(minScore, maxScore, rawScore, completion_status, success_status);
+ }
@Override
public void updateRteFields(Cmi cmi) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
