diff --git a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/META-INF/custom_jsps/html/portlet/workflow_instances/workflow_logs.jspf b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/META-INF/custom_jsps/html/portlet/workflow_instances/workflow_logs.jspf index 40070299..92e16945 100644 --- a/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/META-INF/custom_jsps/html/portlet/workflow_instances/workflow_logs.jspf +++ b/liferay-plugins-sdk-6.2/webs/portos-kaleo-web/docroot/META-INF/custom_jsps/html/portlet/workflow_instances/workflow_logs.jspf @@ -1,316 +1,316 @@ -<%-- -/** - * Copyright (c) 2000-2013 Liferay, Inc. All rights reserved. - * - * This library is free software; you can redistribute it and/or modify it under - * the terms of the GNU Lesser General Public License as published by the Free - * Software Foundation; either version 2.1 of the License, or (at your option) - * any later version. - * - * This library is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more - * details. - */ ---%> - - -<%@page import="com.liferay.portal.kernel.json.JSONException"%> -<%@page import="com.liferay.portal.kernel.util.Validator"%> -<%@page import="com.liferay.portal.kernel.json.JSONFactoryUtil"%> -<%@page import="com.liferay.portal.kernel.json.JSONObject"%> -<%@page import="com.liferay.portal.kernel.portlet.LiferayWindowState"%> - - - -> - - - - - - - - - -<% - -//ADT: bug bo id=33 -Map historyWorkflowEsitiLogs = (Map)request.getAttribute("historyWorkflowEsitiLogs"); - -for (WorkflowLog workflowLog : workflowLogs) { - Role curRole = null; - User curUser = null; - String actorName = null; - - if (workflowLog.getRoleId() != 0) { - curRole = RoleLocalServiceUtil.getRole(workflowLog.getRoleId()); - actorName = curRole.getDescriptiveName(); - } - else if (workflowLog.getUserId() != 0) { - curUser = UserLocalServiceUtil.getUser(workflowLog.getUserId()); - actorName = curUser.getFullName(); - } - String kaleoNodeName = null; - String transitionName = null; - - try { - JSONObject jsonObject = JSONFactoryUtil.createJSONObject(workflowLog.getState()); - kaleoNodeName = jsonObject.getString("kaleoNodeName"); - transitionName = jsonObject.getString("transitionName"); - } catch (JSONException e) { - kaleoNodeName = workflowLog.getState(); - } - -%> - - - - - - - - - - - - - - - - - <%--
- - - - -
- -
-
--%> - -<% -} -%> - -
DataDescrizioneAttivitàCommento
- <%= dateFormatDateTime.format(workflowLog.getCreateDate()) %> - - - - -
- - - - - - - <% - //ADT: bug bo id=33 - String esito = (String)request.getAttribute("registra-esito-value"); - if (historyWorkflowEsitiLogs!=null&& historyWorkflowEsitiLogs.containsKey(workflowLog.getWorkflowLogId()) ){ - esito=historyWorkflowEsitiLogs.get(workflowLog.getWorkflowLogId()); - } - %> - - - - <% - String assegna = (String)request.getAttribute("assegna-value"); - %> - - - - - - - - - - - - - - -   - - - -
-
- -
- -
-
- -
- -
-
- - - -
- -
-
- - - <% - if (curRole == null) { - String assignerName = PortalUtil.getUserName(workflowLog.getAuditUserId(), StringPool.BLANK); - %> - -
- - - - - -
- - <% - } - else { - %> - -
- -
- - <% - } - %> - -
-
-
-
-
- <% - if(Validator.isNotNull(kaleoNodeName)){ - out.print(kaleoNodeName); - if(Validator.isNotNull(transitionName)){ - if("registra-esito".equalsIgnoreCase(transitionName)){ - //out.print(" ( " + (String)request.getAttribute("registra-esito-value") + " ) "); - //ADT BUG BO ID=33 - String esito = (String)request.getAttribute("registra-esito-value"); - if (historyWorkflowEsitiLogs!=null&& historyWorkflowEsitiLogs.containsKey(workflowLog.getWorkflowLogId()) ){ - esito=historyWorkflowEsitiLogs.get(workflowLog.getWorkflowLogId()); - } - out.print(" ( " + esito + " ) "); - - - } else if("assegna".equalsIgnoreCase(transitionName)){ - out.print(" ( " + (String)request.getAttribute("assegna-value") + " ) "); - } - - } - } - %> - - - -
-
-

<%= dateFormatDateTime.format(workflowLog.getCreateDate()) %>

-

- - <%= curUser.getFullName() %> - -

-
-
- <%= HtmlUtil.escape(workflowLog.getComment()) %> -
-
-
- -
- - - - \ No newline at end of file