Author: [email protected]
Date: Tue Aug 16 11:56:04 2011
New Revision: 1324
Log:
Modified:
sandbox/ivol/ntlm/src/main/java/org/amdatu/auth/ntlm/domain/Question.java
sandbox/ivol/ntlm/src/main/java/org/amdatu/auth/ntlm/service/SurveyStoreImpl.java
sandbox/ivol/ntlm/src/main/resources/jsp/survey.jsp
sandbox/ivol/ntlm/src/main/resources/static/css/cr.css
Modified:
sandbox/ivol/ntlm/src/main/java/org/amdatu/auth/ntlm/domain/Question.java
==============================================================================
--- sandbox/ivol/ntlm/src/main/java/org/amdatu/auth/ntlm/domain/Question.java
(original)
+++ sandbox/ivol/ntlm/src/main/java/org/amdatu/auth/ntlm/domain/Question.java
Tue Aug 16 11:56:04 2011
@@ -115,6 +115,6 @@
public int compareTo(Question question) {
String questionid = ((Question) question).getId();
- return questionid.compareTo(m_id);
+ return m_id.compareTo(questionid);
}
}
Modified:
sandbox/ivol/ntlm/src/main/java/org/amdatu/auth/ntlm/service/SurveyStoreImpl.java
==============================================================================
---
sandbox/ivol/ntlm/src/main/java/org/amdatu/auth/ntlm/service/SurveyStoreImpl.java
(original)
+++
sandbox/ivol/ntlm/src/main/java/org/amdatu/auth/ntlm/service/SurveyStoreImpl.java
Tue Aug 16 11:56:04 2011
@@ -205,16 +205,17 @@
q1.addValue("Nee");
Question q2 = new Question();
- q2.setDescription("Wat zou de OR wat jou betreft moeten aankaarten?");
+ q2.setDescription("Welk onderwerp zou wat jou betreft op de OR agenda
moeten staan?");
q2.setType("open");
Question q3 = new Question();
- q3.setDescription("Van welke onderwerpen onder vind je dat de OR zich
zou moeten bemoeien?");
+ q3.setDescription("Met welke onderwerpen zou de OR zich actief moeten
bemoeien?");
q3.setType("check");
- q3.addValue("MTO");
- q3.addValue("Arbeidsvoorwaarden");
- q3.addValue("13e maand");
+ q3.addValue("Parkeerplaatsen");
+ q3.addValue("Algemene Arbeidsvoorwaarden");
+ q3.addValue("Een 13e maand!");
q3.addValue("Klimaatbeheersing");
+ q3.addValue("MVO (Maatschappelijk Verantwoord Ondernemen)");
Question q4 = new Question();
q4.setDescription("Vind je dat salarisverhogingen relatief of absoluut
zouden moeten zijn?");
@@ -222,11 +223,33 @@
q4.addValue("relatief");
q4.addValue("absoluut");
q4.addValue("geen (uitgesproken) mening");
+
+ Question q5 = new Question();
+ q5.setDescription("Wat vindt je van van deze open vraag?");
+ q5.setType("open");
+
+ Question q6 = new Question();
+ q6.setDescription("Wat vindt je van de beoordelingen aan het eind van
het jaar?");
+ q6.setType("radio");
+ q6.addValue("Die zuigen");
+ q6.addValue("Fantastisch, geweldig, helemaal goed!");
+ q6.addValue("Ondoorzichtig");
+ q6.addValue("Beoordeling? Veroordeling zul je bedoelen!");
+
+ Question q7 = new Question();
+ q7.setDescription("Heeft de OR toegevoegde waarde binnen GX?");
+ q7.setType("radio");
+ q7.addValue("Ja!");
+ q7.addValue("Nee!");
+ q7.addValue("OR? Wa's dah?");
String surveyId = "1";
m_pm.setValue(SurveyColumnFamilyProvider.CF_SURVEY, surveyId,
SC_QUESTIONS, "Q1", q1.toJSON());
m_pm.setValue(SurveyColumnFamilyProvider.CF_SURVEY, surveyId,
SC_QUESTIONS, "Q2", q2.toJSON());
m_pm.setValue(SurveyColumnFamilyProvider.CF_SURVEY, surveyId,
SC_QUESTIONS, "Q3", q3.toJSON());
m_pm.setValue(SurveyColumnFamilyProvider.CF_SURVEY, surveyId,
SC_QUESTIONS, "Q4", q4.toJSON());
+ m_pm.setValue(SurveyColumnFamilyProvider.CF_SURVEY, surveyId,
SC_QUESTIONS, "Q5", q5.toJSON());
+ m_pm.setValue(SurveyColumnFamilyProvider.CF_SURVEY, surveyId,
SC_QUESTIONS, "Q6", q6.toJSON());
+ m_pm.setValue(SurveyColumnFamilyProvider.CF_SURVEY, surveyId,
SC_QUESTIONS, "Q7", q7.toJSON());
}
}
Modified: sandbox/ivol/ntlm/src/main/resources/jsp/survey.jsp
==============================================================================
--- sandbox/ivol/ntlm/src/main/resources/jsp/survey.jsp (original)
+++ sandbox/ivol/ntlm/src/main/resources/jsp/survey.jsp Tue Aug 16 11:56:04 2011
@@ -19,7 +19,7 @@
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"; %>
<c:set var="contextPath" value="${pageContext.request.contextPath}"/>
-<c:set var="staticPath" value="${contextPath}/oauth-consumerregistry/static"/>
+<c:set var="staticPath" value="${contextPath}/ntlm/static"/>
<c:set var="surveyUrl" value="${baseUrl}/rest/survey"/>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
@@ -52,6 +52,7 @@
</div>
<div class="rightbox">
+ <h3>Online enquete Ondernemingsraad - September 2011</h3>
<p>
<form id="form" action="/rest/survey" method="POST">
<div id="survey"></div>
@@ -129,7 +130,7 @@
function questionToHtml(id, des, type, values) {
var html = "<li>";
- html += des + "<br/>";
+ html += des;
if (type == "radio") {
for (j=0; j<values.length; j++) {
html += "<br/><input type='radio' name='" + id + "' value='" +
values[j] + "'>" + values[j];
@@ -142,7 +143,7 @@
html += "<br/><textarea rows='3' cols='60' name='" + id +
"'></textarea>";
}
- html += "</li>";
+ html += "</li><br/>";
return html;
}
Modified: sandbox/ivol/ntlm/src/main/resources/static/css/cr.css
==============================================================================
--- sandbox/ivol/ntlm/src/main/resources/static/css/cr.css (original)
+++ sandbox/ivol/ntlm/src/main/resources/static/css/cr.css Tue Aug 16
11:56:04 2011
@@ -40,7 +40,7 @@
div.leftbox {
width:22%;
- height:750px;
+ height:1000px;
float:left;
margin-left:10px;
background: #282828;
@@ -74,7 +74,7 @@
div.rightbox {
width: 75%;
- height:750px;
+ height:1000px;
float:left;
margin-left:15px;
background: #282828;
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
