From 738813a90a72fdfaaa6afdc466a1de4942ebc5a4 Mon Sep 17 00:00:00 2001
From: fred-fri <fred-fri@dsv.su.se>
Date: Fri, 25 May 2012 10:41:51 +0900
Subject: [PATCH] added turnitinpasswordfield
---
resources/db_update_scripts/current.sql | 2 ++
.../pages/settings/AdminFinalSeminarSettingsPage.html | 6 +++++-
.../pages/settings/AdminFinalSeminarSettingsPage.java | 2 ++
.../dsv/scipro/data/dataobjects/GeneralSystemSettings.java | 7 +++++--
4 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/resources/db_update_scripts/current.sql b/resources/db_update_scripts/current.sql
index e69de29bb2..290ff457a3 100644
--- a/resources/db_update_scripts/current.sql
+++ b/resources/db_update_scripts/current.sql
@@ -0,0 +1,2 @@
+ALTER TABLE general_system_settings
+ADD `turnItInPassword` varchar(255) NOT NULL;
\ No newline at end of file
diff --git a/src/main/java/se/su/dsv/scipro/admin/pages/settings/AdminFinalSeminarSettingsPage.html b/src/main/java/se/su/dsv/scipro/admin/pages/settings/AdminFinalSeminarSettingsPage.html
index 7984a7ba06..8986cf3736 100644
--- a/src/main/java/se/su/dsv/scipro/admin/pages/settings/AdminFinalSeminarSettingsPage.html
+++ b/src/main/java/se/su/dsv/scipro/admin/pages/settings/AdminFinalSeminarSettingsPage.html
@@ -22,8 +22,12 @@
<td><label for="4">Turnitin username (should be an instructor with quick submit activated):</label></td>
<td><input name="4" wicket:id="turnItInUsername" type="text" /></td>
</tr>
+ <tr>
+ <td><label for="4">Turnitin username password:</label></td>
+ <td><input name="4" wicket:id="turnItInPassword" type="text" /></td>
+ </tr>
<tr>
- <td><label for="5">Forname for Turnitin user:</label></td>
+ <td><label for="5">First name for Turnitin user:</label></td>
<td><input name="5" wicket:id="turnItInForname" type="text" /></td>
</tr>
<tr>
diff --git a/src/main/java/se/su/dsv/scipro/admin/pages/settings/AdminFinalSeminarSettingsPage.java b/src/main/java/se/su/dsv/scipro/admin/pages/settings/AdminFinalSeminarSettingsPage.java
index 2013d2f89f..edad971057 100644
--- a/src/main/java/se/su/dsv/scipro/admin/pages/settings/AdminFinalSeminarSettingsPage.java
+++ b/src/main/java/se/su/dsv/scipro/admin/pages/settings/AdminFinalSeminarSettingsPage.java
@@ -36,6 +36,7 @@ public class AdminFinalSeminarSettingsPage extends AbstractAdminSettingsPage {
TextField<Integer> registerAsActive = new RequiredTextField<Integer>("daysBeforeFinalSeminarCanRegisterAsActiveParticipant");
TextField<Integer> registerAsOpponent = new RequiredTextField<Integer>("daysBeforeFinalSeminarCanRegisterAsOpponent");
TextField<String> turnitinUsername = new RequiredTextField<String>("turnItInUsername");
+ TextField<String> turnitinPassword = new RequiredTextField<String>("turnItInPassword");
TextField<String> turnitinForname = new RequiredTextField<String>("turnItInForname");
TextField<String> turnitinSurname = new RequiredTextField<String>("turnItInSurname");
CheckBox pdfCheckBox = new CheckBox("finalSeminarThesisMustBeAPDF");
@@ -43,6 +44,7 @@ public class AdminFinalSeminarSettingsPage extends AbstractAdminSettingsPage {
add(registerAsOpponent);
add(activeParticipation);
add(turnitinUsername);
+ add(turnitinPassword);
add(turnitinForname);
add(turnitinSurname);
add(pdfCheckBox);
diff --git a/src/main/java/se/su/dsv/scipro/data/dataobjects/GeneralSystemSettings.java b/src/main/java/se/su/dsv/scipro/data/dataobjects/GeneralSystemSettings.java
index 75949be7d8..a8e431ee4b 100644
--- a/src/main/java/se/su/dsv/scipro/data/dataobjects/GeneralSystemSettings.java
+++ b/src/main/java/se/su/dsv/scipro/data/dataobjects/GeneralSystemSettings.java
@@ -40,8 +40,11 @@ public class GeneralSystemSettings extends DomainObject{
private int daysBeforeFinalSeminarCanRegisterAsOpponent = 3;
@Basic(optional=false)
- private String turnItInUsername = "joha-asc";
-
+ private String turnItInUsername = "joha-asc";
+
+ @Basic(optional=false)
+ private String turnItInPassword = "password";
+
@Basic(optional=false)
private String turnItInForname = "Johan";