Author: [email protected]
Date: Mon Aug 8 10:22:24 2011
New Revision: 1276
Log:
Modified:
sandbox/ivol/ntlm/src/main/java/org/amdatu/auth/ntlm/service/SurveyServiceImpl.java
sandbox/ivol/ntlm/src/main/java/org/amdatu/auth/ntlm/service/WebResourceProvider.java
sandbox/ivol/ntlm/src/main/resources/jsp/enquete.jsp
Modified:
sandbox/ivol/ntlm/src/main/java/org/amdatu/auth/ntlm/service/SurveyServiceImpl.java
==============================================================================
---
sandbox/ivol/ntlm/src/main/java/org/amdatu/auth/ntlm/service/SurveyServiceImpl.java
(original)
+++
sandbox/ivol/ntlm/src/main/java/org/amdatu/auth/ntlm/service/SurveyServiceImpl.java
Mon Aug 8 10:22:24 2011
@@ -1,6 +1,9 @@
package org.amdatu.auth.ntlm.service;
+import java.util.Map;
+
import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.Consumes;
import javax.ws.rs.GET;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
@@ -29,9 +32,22 @@
}
@POST
- @Produces({MediaType.TEXT_PLAIN})
+ @Consumes("application/x-www-form-urlencoded")
public void addSurvey(@Context final HttpServletRequest request) {
// TODO: verify that this user did not yet submit this survey
+ try {
+ Map parameters = request.getParameterMap();
+ String surveyId = ((String[]) parameters.get("surveyId"))[0];
+ Survey survey = m_surveyStore.loadSurvey(surveyId);
+ for (Object key : parameters.keySet()) {
+ String value = ((String[]) parameters.get(key))[0];
+
+ // Now persist the answers
+ }
+ }
+ catch (Exception e) {
+ throw new WebApplicationException(e,
Response.Status.INTERNAL_SERVER_ERROR);
+ }
}
@GET
Modified:
sandbox/ivol/ntlm/src/main/java/org/amdatu/auth/ntlm/service/WebResourceProvider.java
==============================================================================
---
sandbox/ivol/ntlm/src/main/java/org/amdatu/auth/ntlm/service/WebResourceProvider.java
(original)
+++
sandbox/ivol/ntlm/src/main/java/org/amdatu/auth/ntlm/service/WebResourceProvider.java
Mon Aug 8 10:22:24 2011
@@ -15,6 +15,8 @@
*/
package org.amdatu.auth.ntlm.service;
+import java.io.File;
+import java.net.MalformedURLException;
import java.net.URL;
import org.amdatu.auth.ntlm.osgi.Activator;
@@ -33,6 +35,17 @@
public URL getResource(final String name) {
final String pathPrefix = Activator.ALIAS + "/";
if (name != null && name.startsWith(pathPrefix)) {
+ if (name.contains("/resources/")) {
+ String jspName = name.substring(name.lastIndexOf("/") + 1);
+ File jspFile = new
File("D:\\Amdatu-svn\\sandbox\\ivol\\ntlm\\src\\main\\resources\\jsp\\" +
jspName);
+ try {
+ return jspFile.toURL();
+ }
+ catch (MalformedURLException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
return
m_bundleContext.getBundle().getResource(name.substring(pathPrefix.length()));
}
return null;
Modified: sandbox/ivol/ntlm/src/main/resources/jsp/enquete.jsp
==============================================================================
--- sandbox/ivol/ntlm/src/main/resources/jsp/enquete.jsp (original)
+++ sandbox/ivol/ntlm/src/main/resources/jsp/enquete.jsp Mon Aug 8
10:22:24 2011
@@ -55,26 +55,11 @@
<div class="rightbox">
<p>
- <form action="rest/enquete">
- <ul>
- <li><b>Vraag 1.</b><br/>
- Vind jij dat een 13e maand onderdeel zou moeten zijn van de GX
arbeidsvoorwaarden?<br/>
- <input type="radio" name="vraag1" value="1"/>Ja
- <input type="radio" name="vraag1" value="0"/>Nee
- </li>
-
- <li><b>Vraag 2.</b><br/>
- Vind jij dat salarisverhogingen absoluut of relatief berekend
moeten worden?<br/>
- <input type="radio" name="vraag2" value="1"/>Ja
- <input type="radio" name="vraag2" value="0"/>Nee
- </li>
-
- <li><b>Vraag 3.</b><br/>
- Wat vind je van deze open vraag?<br/>
- <textarea name="vraag3" rows="3"></textarea>
- </li>
- </ul>
- <input type="submit" value="Versturen" />
+ <form action="/rest/survey" method="POST">
+ <div id="survey"></div>
+ <input type="hidden" name="surveyId" value="1"/>
+
+ <input type="submit"
value="Versturen" />
</form>
</p>
</div>
@@ -105,7 +90,7 @@
async:true,
success: function(response) {
if (response == "1") {
- alert("Deze enquete heb je reeds ingevuld");
+ //alert("Deze enquete heb je reeds ingevuld");
} else {
}
@@ -123,14 +108,41 @@
success: function(data, textStatus, jqXHR) {
var survey = jQuery.parseJSON(jqXHR.responseText).survey;
var questions = survey.question;
+ var html = "<ul>";
for (i=0; i<questions.length;i++) {
- alert(questions[i].id);
+ var id = questions[i].id;
+ var des = questions[i].description;
+ var type = questions[i].type;
+ var values = questions[i].value;
+ html += questionToHtml(id, des, type, values);
}
+ html += "</ul>";
+ document.getElementById("survey").innerHTML = html;
}
}
);
}
+ function questionToHtml(id, des, type, values) {
+ var html = "<li>";
+ html += des + <br/>;
+ if (type == "radio") {
+ for (j=0; j<values.length; j++) {
+ html += "<br/><input type='radio' name='" + id + "' value='" +
values[j] + "'>" + values[j];
+ }
+ } else if (type == "check") {
+ for (j=0; j<values.length; j++) {
+ html += "<br/><input type='checkbox' name='" + id + "' value='" +
values[j] + "'>" + values[j];
+ }
+ } else {
+ html += "<br/><textarea rows='3' cols='60' name='" + id +
"'></textarea>";
+ }
+
+ html += "</li>";
+ return html;
+ }
+
+
getUsername();
hasSubmittedSurveyBefore();
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
