actionlogijuttuja

code/LanBortalDatabase/src/fi/insomnia/bortal/model/ActionLogMessageResponse.java

@@ -35,4 +35,36 @@ public class ActionLogMessageResponse extends GenericEntity {
     @Column(name = "state_change", nullable = true)
     @Enumerated(EnumType.STRING)
     private ActionLogMessageState stateChange;
+
+    public Date getTime() {
+        return time;
+    }
+
+    public void setTime(Date time) {
+        this.time = time;
+    }
+
+    public User getUser() {
+        return user;
+    }
+
+    public void setUser(User user) {
+        this.user = user;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public ActionLogMessageState getStateChange() {
+        return stateChange;
+    }
+
+    public void setStateChange(ActionLogMessageState stateChange) {
+        this.stateChange = stateChange;
+    }
 }

code/LanBortalWeb/WebContent/actionlog/messagelist.xhtml

@@ -77,7 +77,8 @@
 							<h:outputText value="#{message.message}" />
 						</h:column>
 						<h:column>
-							<h:link rendered="#{!empty message.state}"  >
+							<h:link rendered="#{!empty message.state}" outcome="taskview" >
+								<f:param name="id" value="#{message.id}" />
 								Näytä tehtävä
 							</h:link>
 						</h:column>

code/LanBortalWeb/WebContent/actionlog/taskview.xhtml

@@ -14,34 +14,46 @@
 		</f:metadata>
 		<ui:define name="content">
 			<h:outputStylesheet library="style" name="insomnia2/css/actionlog.css"></h:outputStylesheet>
-			<h1>Task: insert id<!-- #{i18n['actionlog.messagelist.header']} --></h1>
+			<h1>Task id: #{taskModificationView.message.id}<!-- #{i18n['actionlog.messagelist.header']} --></h1>
 			<!-- <p>Mo #{i18n['actionlog.messagelist.description']} </p> -->
-			<table>
-			<tr>
-				<td><h:outputText class="taskHeader" value="Submit time/date: " /></td>
-				<td><h:outputText value="#{taskModification.message.time}" /></td>
-			</tr>
-			<tr>
-				<td><h:outputText class="taskHeader" value="Submitter: " /></td>
-				<td><h:outputText value="infopoika69" /></td>
-			</tr>
-			<tr>
-				<td><h:outputText class="taskHeader" value="Target crew: " /></td>
-				<td><h:outputText value="net" /></td>
-			</tr>
-			<tr>
-				<td><h:outputText class="taskHeader" value="State: " /></td>
-				<td><h:outputText value="odottaa nappaamista" /></td>
-			</tr>
-			<tr>
-				<td><h:outputText class="taskHeader" value="Message: " /></td>
-				<td><h:outputText value="verkko ei toimi." /></td>
-			</tr>
-			</table>
+			<div>
+				<table>
+				<tr>
+					<td><h:outputText class="taskHeader" value="#{i18n['actionlog.time']}: " /></td>
+					<td><h:outputText value="#{taskModificationView.message.time}" >
+						<f:convertDateTime type="both" pattern="dd.MM.yyyy HH:mm" />
+					</h:outputText></td>
+				</tr>
+				<tr>
+					<td><h:outputText class="taskHeader" value="#{i18n['actionlog.user']}: " /></td>
+					<td><h:outputText value="#{taskModificationView.message.user.nick}" /></td>
+				</tr>
+				<tr>
+					<td><h:outputText class="taskHeader" value="#{i18n['actionlog.crew']}: " /></td>
+					<td><h:outputText value="#{taskModificationView.message.crew.name}" /></td>
+				</tr>
+				<tr>
+					<td><h:outputText class="taskHeader" value="#{i18n['actionlog.state']}: " /></td>
+					<td><h:outputText value="#{taskModificationView.message.state}" /></td>
+				</tr>
+				<tr>
+					<td><h:outputText class="taskHeader" value="#{i18n['actionlog.message']}: " /></td>
+					<td><h:outputText value="#{taskModificationView.message.message}" /></td>
+				</tr>
+				</table>
+			</div>
 			<div class="clearfix"></div>
-			
-			<div id="actionlog">
-				
+			<hr style="width:90%;" />
+			<div>
+				<h3>Lisää viesti</h3>
+				<h:outputText value="Viestisi: " />
+				<h:inputText size="100"  />
+				<h:outputText value="Tila: " />
+				<h:selectOneMenu id="stateMenu" title="asdas">
+					<f:selectItem id="s1" itemLabel="No change" itemValue="1" />
+					<f:selectItem id="s2" itemLabel="Done" itemValue="2" />
+				</h:selectOneMenu>
+				<h:commandButton class="sendbutton2" value="#{i18n['actionlog.create.submitbutton']}" />
 			</div>
 		</ui:define>
 	</ui:composition>

code/LanBortalWeb/WebContent/resources/style/insomnia2/css/actionlog.css

@@ -83,4 +83,9 @@
 	color: #7DAC0C;
 	font-size: 120%;
 	font-weight: bold;
+}
+
+.sendbutton2 {
+	border: 1px solid #aaa;
+	margin-left: 10px;
 }
\ No newline at end of file

code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n_fi.properties

@@ -795,5 +795,6 @@ actionlog.time=Aika
 actionlog.user=Tekij
 actionlog.crew=Crew
 actionlog.message=Tapahtuma
+actionlog.state=Tila
 
 >>>>>>> 0c03330e786bda2bb906720f174db192b180fced

code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/actionlog/TaskModificationView.java

@@ -24,6 +24,10 @@ public class TaskModificationView extends GenericCDIView {
 		}
 	}
 	
+	public ActionLogMessage getMessage(){
+		return message;
+	}
+	
 	public Integer getId() {
 		return id;
 	}