From 0ef12f67bbafcbd28aa92ee58d2a1d309d2a0eb5 Mon Sep 17 00:00:00 2001
From: Tom Vahlman <tom@dsv.su.se>
Date: Fri, 2 Mar 2012 11:12:38 +0100
Subject: [PATCH 1/3] Disabled action buttons accepted (Status.COMMITED)
project ideas in the supervisor GUI.
---
.../supervisor/panels/SupervisorProjectIdeaDialogPanel.java | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorProjectIdeaDialogPanel.java b/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorProjectIdeaDialogPanel.java
index bca9b02855..803205d020 100644
--- a/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorProjectIdeaDialogPanel.java
+++ b/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorProjectIdeaDialogPanel.java
@@ -58,10 +58,7 @@ public abstract class SupervisorProjectIdeaDialogPanel extends Panel {
link.add(new Label("linkLabel", matchModel.getObject().getProjectIdea().getTitle()));
add(link);
-
dialog.add(new WatsonInfoPanel("watsonPanel", matchModel.getObject().getProjectIdea()));
-// dialog.add(new SupervisorAcceptDeclinePanel("acceptDeclinePanel", matchModel.getObject()));
-
dialog.add(new SupervisorAcceptDeclinePanel2("acceptDeclinePanel", matchModel.getObject()){
private static final long serialVersionUID = 1L;
@@ -70,7 +67,7 @@ public abstract class SupervisorProjectIdeaDialogPanel extends Panel {
onUpdateUpdate(target);
dialog.close(target);
}
- });
+ }).setEnabled(!matchModel.getObject().getStatus().equals(Match.Status.CONFIRMED));
}
}
\ No newline at end of file
From 9b4b10fe1e525ac0db1b1da5e22cc5a16df92d4f Mon Sep 17 00:00:00 2001
From: Tom Vahlman <tom@dsv.su.se>
Date: Fri, 2 Mar 2012 11:13:35 +0100
Subject: [PATCH 2/3] Removed code that has been commented out.
---
.../supervisor/panels/SupervisorAcceptDeclinePanel2.java | 5 -----
.../supervisor/panels/SupervisorMatchedThesisPanel.java | 4 ----
2 files changed, 9 deletions(-)
diff --git a/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorAcceptDeclinePanel2.java b/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorAcceptDeclinePanel2.java
index f411b99e33..eec5722494 100644
--- a/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorAcceptDeclinePanel2.java
+++ b/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorAcceptDeclinePanel2.java
@@ -86,10 +86,5 @@ public abstract class SupervisorAcceptDeclinePanel2 extends Panel {
}
});
}
-
- // @Override
- // protected void onSubmit() {
- // matchDao.changeStatus(SciProSession.get().getUser(), matchModel.getObject(), Status.CONFIRMED);
- // }
}
}
diff --git a/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorMatchedThesisPanel.java b/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorMatchedThesisPanel.java
index 31148c9d5e..08e2d52265 100644
--- a/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorMatchedThesisPanel.java
+++ b/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorMatchedThesisPanel.java
@@ -145,15 +145,11 @@ public class SupervisorMatchedThesisPanel extends Panel {
protected void populateItem(final ListItem<Match.Status> item) {
Radio<Match.Status> radio = new Radio<Match.Status>("statusRadio", item.getModel());
item.add(radio);
-// Label levelName = new Label("statusName", item.getModelObject().toString());
-
if (item.getModelObject().equals(Match.Status.PUBLISHED)){
item.add(new Label("statusName", "Suggested"));
} else {
item.add(new Label("statusName", "Accepted"));
}
-
-// item.add(levelName);
}
};
radioGroup.add(new AjaxFormChoiceComponentUpdatingBehavior() {
From db387c76d2ce20a21dbf4a5ed5cff75f45091c00 Mon Sep 17 00:00:00 2001
From: Tom Vahlman <tom@dsv.su.se>
Date: Fri, 2 Mar 2012 11:14:45 +0100
Subject: [PATCH 3/3] Removed code that has been commented out.
---
.../supervisor/panels/SupervisorMatchedThesisPanel.html | 4 ----
1 file changed, 4 deletions(-)
diff --git a/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorMatchedThesisPanel.html b/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorMatchedThesisPanel.html
index a5be6db31b..e6bc5c33dd 100644
--- a/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorMatchedThesisPanel.html
+++ b/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorMatchedThesisPanel.html
@@ -11,10 +11,6 @@
<div class="span-22 last" wicket:id="radioGroup">
<div><label for="statusListView">Show: </label><span wicket:id="statusListView"><input type="radio" wicket:id="statusRadio"></input> <span
wicket:id="statusName"></span></span></div>
-<!-- <div wicket:id="statusListView"> -->
-<!-- <input type="radio" wicket:id="statusRadio"></input> <span -->
-<!-- wicket:id="statusName"></span> -->
-<!-- </div> -->
</div>
<div class="span-22 last append-bottom" wicket:id="dataViewContainer">
<table class="rounded-corner">