From 6759da0d74fe99c341e6c5e69d5aaddb65afd46a Mon Sep 17 00:00:00 2001 From: E-A B Date: Wed, 25 Jan 2023 14:53:34 +0100 Subject: [PATCH] sql and values --- .../model/impl/KaleoInstanceModelImpl.java | 4 +- .../impl/KaleoInstanceTokenModelImpl.java | 2 +- .../model/impl/KaleoLogModelImpl.java | 6 +- .../model/impl/KaleoNodeModelImpl.java | 2 +- .../KaleoTaskAssignmentInstanceModelImpl.java | 2 +- .../impl/KaleoTaskInstanceTokenModelImpl.java | 4 +- .../model/impl/KaleoTaskModelImpl.java | 2 +- .../impl/FormDefinitionLinkModelImpl.java | 2 +- .../kaleo/model/impl/FormLogModelImpl.java | 2 +- .../model/impl/FormTemplateLinkModelImpl.java | 2 +- .../docroot/html/init.jsp | 3 + .../docroot/html/mail_manager/edit.jsp | 25 +++++--- .../html/mail_manager/email_action.jsp | 12 +++- .../email_history_popup_button.jsp | 8 ++- .../docroot/html/mail_manager/view.jsp | 23 ++++++-- .../docroot/html/admin_maintenance/edit.jsp | 53 +++++++---------- .../admin_maintenance/maintenance_action.jsp | 22 +++++-- .../docroot/html/admin_maintenance/view.jsp | 57 +++++++++++++------ .../model/impl/KaleoInstanceModelImpl.java | 2 +- .../KaleoTaskAssignmentInstanceModelImpl.java | 2 +- 20 files changed, 147 insertions(+), 88 deletions(-) diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/model/impl/KaleoInstanceModelImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/model/impl/KaleoInstanceModelImpl.java index 8ec08320..8c473e7c 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/model/impl/KaleoInstanceModelImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/model/impl/KaleoInstanceModelImpl.java @@ -76,9 +76,9 @@ public class KaleoInstanceModelImpl extends BaseModelImpl { "classPK", Types.BIGINT }, { "completed", Types.BOOLEAN }, { "completionDate", Types.TIMESTAMP }, - { "workflowContext", Types.CLOB } + { "workflowContext", Types.VARCHAR } }; - public static final String TABLE_SQL_CREATE = "create table kaleoinstance (kaleoInstanceId LONG not null primary key,groupId LONG,companyId LONG,userId LONG,userName VARCHAR(200) null,createDate DATE null,modifiedDate DATE null,kaleoDefinitionId LONG,kaleoDefinitionName VARCHAR(200) null,kaleoDefinitionVersion INTEGER,rootKaleoInstanceTokenId LONG,className VARCHAR(200) null,classPK LONG,completed BOOLEAN,completionDate DATE null,workflowContext TEXT null)"; + public static final String TABLE_SQL_CREATE = "create table kaleoinstance (kaleoInstanceId LONG not null primary key,groupId LONG,companyId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,modifiedDate DATE null,kaleoDefinitionId LONG,kaleoDefinitionName VARCHAR(75) null,kaleoDefinitionVersion INTEGER,rootKaleoInstanceTokenId LONG,className VARCHAR(75) null,classPK LONG,completed BOOLEAN,completionDate DATE null,workflowContext VARCHAR(75) null)"; public static final String TABLE_SQL_DROP = "drop table kaleoinstance"; public static final String ORDER_BY_JPQL = " ORDER BY kaleoInstance.kaleoInstanceId ASC"; public static final String ORDER_BY_SQL = " ORDER BY kaleoinstance.kaleoInstanceId ASC"; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/model/impl/KaleoInstanceTokenModelImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/model/impl/KaleoInstanceTokenModelImpl.java index 694cd240..d3aed695 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/model/impl/KaleoInstanceTokenModelImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/model/impl/KaleoInstanceTokenModelImpl.java @@ -78,7 +78,7 @@ public class KaleoInstanceTokenModelImpl extends BaseModelImpl { "currentAssigneeClassName", Types.VARCHAR }, { "currentAssigneeClassPK", Types.BIGINT }, { "type_", Types.VARCHAR }, - { "comment_", Types.CLOB }, + { "comment_", Types.VARCHAR }, { "startDate", Types.TIMESTAMP }, { "endDate", Types.TIMESTAMP }, { "duration", Types.BIGINT }, - { "workflowContext", Types.CLOB } + { "workflowContext", Types.VARCHAR } }; - public static final String TABLE_SQL_CREATE = "create table kaleolog (kaleoLogId LONG not null primary key,groupId LONG,companyId LONG,userId LONG,userName VARCHAR(200) null,createDate DATE null,modifiedDate DATE null,kaleoClassName VARCHAR(200) null,kaleoClassPK LONG,kaleoDefinitionId LONG,kaleoInstanceId LONG,kaleoInstanceTokenId LONG,kaleoTaskInstanceTokenId LONG,kaleoNodeName VARCHAR(200) null,terminalKaleoNode BOOLEAN,kaleoActionId LONG,kaleoActionName VARCHAR(200) null,kaleoActionDescription STRING null,previousKaleoNodeId LONG,previousKaleoNodeName VARCHAR(200) null,previousAssigneeClassName VARCHAR(200) null,previousAssigneeClassPK LONG,currentAssigneeClassName VARCHAR(200) null,currentAssigneeClassPK LONG,type_ VARCHAR(75) null,comment_ TEXT null,startDate DATE null,endDate DATE null,duration LONG,workflowContext TEXT null)"; + public static final String TABLE_SQL_CREATE = "create table kaleolog (kaleoLogId LONG not null primary key,groupId LONG,companyId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,modifiedDate DATE null,kaleoClassName VARCHAR(75) null,kaleoClassPK LONG,kaleoDefinitionId LONG,kaleoInstanceId LONG,kaleoInstanceTokenId LONG,kaleoTaskInstanceTokenId LONG,kaleoNodeName VARCHAR(75) null,terminalKaleoNode BOOLEAN,kaleoActionId LONG,kaleoActionName VARCHAR(75) null,kaleoActionDescription VARCHAR(75) null,previousKaleoNodeId LONG,previousKaleoNodeName VARCHAR(75) null,previousAssigneeClassName VARCHAR(75) null,previousAssigneeClassPK LONG,currentAssigneeClassName VARCHAR(75) null,currentAssigneeClassPK LONG,type_ VARCHAR(75) null,comment_ VARCHAR(75) null,startDate DATE null,endDate DATE null,duration LONG,workflowContext VARCHAR(75) null)"; public static final String TABLE_SQL_DROP = "drop table kaleolog"; public static final String ORDER_BY_JPQL = " ORDER BY kaleoLog.kaleoLogId ASC"; public static final String ORDER_BY_SQL = " ORDER BY kaleolog.kaleoLogId ASC"; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/model/impl/KaleoNodeModelImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/model/impl/KaleoNodeModelImpl.java index 43ed4d78..db886f80 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/model/impl/KaleoNodeModelImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/model/impl/KaleoNodeModelImpl.java @@ -76,7 +76,7 @@ public class KaleoNodeModelImpl extends BaseModelImpl { "initial_", Types.BOOLEAN }, { "terminal", Types.BOOLEAN } }; - public static final String TABLE_SQL_CREATE = "create table kaleonode (kaleoNodeId LONG not null primary key,groupId LONG,companyId LONG,userId LONG,userName VARCHAR(200) null,createDate DATE null,modifiedDate DATE null,kaleoDefinitionId LONG,name VARCHAR(200) null,metadata STRING null,description STRING null,type_ VARCHAR(75) null,initial_ BOOLEAN,terminal BOOLEAN)"; + public static final String TABLE_SQL_CREATE = "create table kaleonode (kaleoNodeId LONG not null primary key,groupId LONG,companyId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,modifiedDate DATE null,kaleoDefinitionId LONG,name VARCHAR(75) null,metadata VARCHAR(75) null,description VARCHAR(75) null,type_ VARCHAR(75) null,initial_ BOOLEAN,terminal BOOLEAN)"; public static final String TABLE_SQL_DROP = "drop table kaleonode"; public static final String ORDER_BY_JPQL = " ORDER BY kaleoNode.kaleoNodeId ASC"; public static final String ORDER_BY_SQL = " ORDER BY kaleonode.kaleoNodeId ASC"; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/model/impl/KaleoTaskAssignmentInstanceModelImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/model/impl/KaleoTaskAssignmentInstanceModelImpl.java index 782f9dae..2445a932 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/model/impl/KaleoTaskAssignmentInstanceModelImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/controller/model/impl/KaleoTaskAssignmentInstanceModelImpl.java @@ -79,7 +79,7 @@ public class KaleoTaskAssignmentInstanceModelImpl extends BaseModelImpl { "name", Types.VARCHAR }, { "description", Types.VARCHAR } }; - public static final String TABLE_SQL_CREATE = "create table kaleotask (kaleoTaskId LONG not null primary key,groupId LONG,companyId LONG,userId LONG,userName VARCHAR(200) null,createDate DATE null,modifiedDate DATE null,kaleoDefinitionId LONG,kaleoNodeId LONG,name VARCHAR(200) null,description STRING null)"; + public static final String TABLE_SQL_CREATE = "create table kaleotask (kaleoTaskId LONG not null primary key,groupId LONG,companyId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,modifiedDate DATE null,kaleoDefinitionId LONG,kaleoNodeId LONG,name VARCHAR(75) null,description VARCHAR(75) null)"; public static final String TABLE_SQL_DROP = "drop table kaleotask"; public static final String ORDER_BY_JPQL = " ORDER BY kaleoTask.kaleoTaskId ASC"; public static final String ORDER_BY_SQL = " ORDER BY kaleotask.kaleoTaskId ASC"; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/model/impl/FormDefinitionLinkModelImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/model/impl/FormDefinitionLinkModelImpl.java index 4f74b919..c153c966 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/model/impl/FormDefinitionLinkModelImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/model/impl/FormDefinitionLinkModelImpl.java @@ -74,7 +74,7 @@ public class FormDefinitionLinkModelImpl extends BaseModelImpl { "transitionName", Types.VARCHAR }, { "formParameters", Types.CLOB } }; - public static final String TABLE_SQL_CREATE = "create table portos_Kaleo_FormLog (formLogId LONG not null primary key,groupId LONG,companyId LONG,userId LONG,userName VARCHAR(200) null,createDate DATE null,modifiedDate DATE null,workflowInstanceId LONG,workflowTaskId LONG,transitionName VARCHAR(200) null,formParameters TEXT null)"; + public static final String TABLE_SQL_CREATE = "create table portos_Kaleo_FormLog (formLogId LONG not null primary key,groupId LONG,companyId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,modifiedDate DATE null,workflowInstanceId LONG,workflowTaskId LONG,transitionName VARCHAR(75) null,formParameters TEXT null)"; public static final String TABLE_SQL_DROP = "drop table portos_Kaleo_FormLog"; public static final String ORDER_BY_JPQL = " ORDER BY formLog.createDate ASC"; public static final String ORDER_BY_SQL = " ORDER BY portos_Kaleo_FormLog.createDate ASC"; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/model/impl/FormTemplateLinkModelImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/model/impl/FormTemplateLinkModelImpl.java index 55d22b2f..8110fda2 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/model/impl/FormTemplateLinkModelImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/kaleo/model/impl/FormTemplateLinkModelImpl.java @@ -64,7 +64,7 @@ public class FormTemplateLinkModelImpl extends BaseModelImpl { "kaleoNodeId", Types.BIGINT }, { "transitionName", Types.VARCHAR } }; - public static final String TABLE_SQL_CREATE = "create table portos_Kaleo_FormTemplateLink (formTemplateLinkId LONG not null primary key,formDefinitionLinkId LONG,ddmTemplateId LONG,kaleoNodeId LONG,transitionName VARCHAR(200) null)"; + public static final String TABLE_SQL_CREATE = "create table portos_Kaleo_FormTemplateLink (formTemplateLinkId LONG not null primary key,formDefinitionLinkId LONG,ddmTemplateId LONG,kaleoNodeId LONG,transitionName VARCHAR(75) null)"; public static final String TABLE_SQL_DROP = "drop table portos_Kaleo_FormTemplateLink"; public static final String ORDER_BY_JPQL = " ORDER BY formTemplateLink.formTemplateLinkId ASC"; public static final String ORDER_BY_SQL = " ORDER BY portos_Kaleo_FormTemplateLink.formTemplateLinkId ASC"; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/init.jsp b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/init.jsp index fdafd350..e36e8406 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/init.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/init.jsp @@ -21,6 +21,9 @@ <%@taglib uri="http://liferay.com/tld/util" prefix="liferay-util" %> <%@taglib uri="http://liferay.com/tld/ddm" prefix="liferay-ddm" %> <%@page import="it.tref.liferay.portos.mailmanager.shared.util.MailManagerConstants"%> + +<%@ page contentType="text/html; charset=UTF-8" %> + <%@page import="com.liferay.portal.kernel.util.GetterUtil"%> diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/mail_manager/edit.jsp b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/mail_manager/edit.jsp index 35d01c2c..53176a63 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/mail_manager/edit.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/mail_manager/edit.jsp @@ -17,17 +17,28 @@ List emailAttachments = EmailAttachmentLocalServiceUtil.findByE - - - - + + + - + + function initEditor() { @@ -48,7 +59,7 @@ List emailAttachments = EmailAttachmentLocalServiceUtil.findByE - diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/mail_manager/email_action.jsp b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/mail_manager/email_action.jsp index dda35504..ff13da14 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/mail_manager/email_action.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/mail_manager/email_action.jsp @@ -6,13 +6,21 @@ String redirect = searchContainer.getIteratorURL().toString(); ResultRow row = (ResultRow) request.getAttribute(WebKeys.SEARCH_CONTAINER_RESULT_ROW); Email entry = (Email) row.getObject(); %> - + + + - + + + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/mail_manager/email_history_popup_button.jsp b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/mail_manager/email_history_popup_button.jsp index 46334425..f442d185 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/mail_manager/email_history_popup_button.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/mail_manager/email_history_popup_button.jsp @@ -8,8 +8,12 @@ long classPK = ParamUtil.getLong(request, "classPK"); String templateName = ParamUtil.getString(request, "templateName"); %> - + + + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/mail_manager/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/mail_manager/view.jsp index ce666fda..ae7d9d57 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/mail_manager/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-mail-manager-portlet/docroot/html/mail_manager/view.jsp @@ -118,8 +118,13 @@ long companyId = company.getCompanyId(); - + @@ -153,9 +158,13 @@ long companyId = company.getCompanyId(); <%= TextFormatter.formatStorageSize(fileVersion.getSize(), locale) %> - + <% @@ -182,7 +191,9 @@ long companyId = company.getCompanyId(); - + + +
<%! diff --git a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/edit.jsp b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/edit.jsp index 813dc840..5dd271f1 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/edit.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/edit.jsp @@ -27,46 +27,37 @@ if (Validator.isNotNull(maintenanceScheduleId)) { - - <% - for (MaintenanceType maintenanceType : MaintenanceType.values()) { - %> + + + <% for(MaintenanceType maintenanceType : MaintenanceType.values()){ %> <%=maintenanceType.getDescription() %> - <% - } - %> + <%} %> - + + + - - <% - for (MaintenanceOnReboot maintenanceOnReboot : MaintenanceOnReboot.values()) { - %> - - <%= maintenanceOnReboot.getDescription() %> - - <% - } - %> + + + <% for(MaintenanceOnReboot maintenanceOnReboot : MaintenanceOnReboot.values()){ %> + <%=maintenanceOnReboot.getDescription() %> + <%} %> - - <% - for (MaintenanceStatus maintenanceStatus : MaintenanceStatus.values()) { - %> - - <%= maintenanceStatus.getDescription() %> - - <% - } - %> + + + <% for(MaintenanceStatus maintenanceStatus : MaintenanceStatus.values()){ %> + <%=maintenanceStatus.getDescription() %> + <%} %> - - + + + + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/maintenance_action.jsp b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/maintenance_action.jsp index 2860512b..bbb2fd7b 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/maintenance_action.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/maintenance_action.jsp @@ -5,19 +5,29 @@ String redirect = searchContainer.getIteratorURL().toString(); ResultRow row = (ResultRow) request.getAttribute(WebKeys.SEARCH_CONTAINER_RESULT_ROW); MaintenanceSchedule entry = (MaintenanceSchedule) row.getObject(); %> - + + + + - + - + + + - + + + + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/view.jsp index afb21996..6808d8fb 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-maintenance-portlet/docroot/html/admin_maintenance/view.jsp @@ -1,44 +1,65 @@ -<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ include file="/html/admin_maintenance/init.jsp" %> <% PortletURL iteratorURL = liferayPortletResponse.createRenderURL(); %> + <% request.setAttribute("liferay-ui:search:searchContainer", searchContainer); %> + - - + + + + + + orderable="<%= true %>" orderableProperty="maintenanceScheduleId" /> + + orderable="<%= true %>" orderableProperty="createDate" /> + + orderable="<%= true %>" orderableProperty="modifiedDate" /> + + + + - + + + <%= MaintenanceOnReboot.parse(maintenanceSchedule.getOnreboot()).getDescription() %> - - <%=MaintenanceStatus.parse(maintenanceSchedule.getStatus()).getDescription()%> - + + <%=MaintenanceStatus.parse(maintenanceSchedule.getStatus()).getDescription()%> + + - + + - - + + - + + + + - + + + \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/model/impl/KaleoInstanceModelImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/model/impl/KaleoInstanceModelImpl.java index af208a56..d31bb8f6 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/model/impl/KaleoInstanceModelImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/model/impl/KaleoInstanceModelImpl.java @@ -78,7 +78,7 @@ public class KaleoInstanceModelImpl extends BaseModelImpl { "completionDate", Types.TIMESTAMP }, { "workflowContext", Types.VARCHAR } }; - public static final String TABLE_SQL_CREATE = "create table kaleoinstance (kaleoInstanceId LONG not null primary key,groupId LONG,companyId LONG,userId LONG,userName VARCHAR(200) null,createDate DATE null,modifiedDate DATE null,kaleoDefinitionId LONG,kaleoDefinitionName VARCHAR(200) null,kaleoDefinitionVersion INTEGER,rootKaleoInstanceTokenId LONG,className VARCHAR(200) null,classPK LONG,completed BOOLEAN,completionDate DATE null,workflowContext VARCHAR(200) null)"; + public static final String TABLE_SQL_CREATE = "create table kaleoinstance (kaleoInstanceId LONG not null primary key,groupId LONG,companyId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,modifiedDate DATE null,kaleoDefinitionId LONG,kaleoDefinitionName VARCHAR(75) null,kaleoDefinitionVersion INTEGER,rootKaleoInstanceTokenId LONG,className VARCHAR(75) null,classPK LONG,completed BOOLEAN,completionDate DATE null,workflowContext VARCHAR(75) null)"; public static final String TABLE_SQL_DROP = "drop table kaleoinstance"; public static final String ORDER_BY_JPQL = " ORDER BY kaleoInstance.kaleoInstanceId ASC"; public static final String ORDER_BY_SQL = " ORDER BY kaleoinstance.kaleoInstanceId ASC"; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/model/impl/KaleoTaskAssignmentInstanceModelImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/model/impl/KaleoTaskAssignmentInstanceModelImpl.java index dd704fc4..2fa60e6c 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/model/impl/KaleoTaskAssignmentInstanceModelImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-report-engine-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/report/model/impl/KaleoTaskAssignmentInstanceModelImpl.java @@ -79,7 +79,7 @@ public class KaleoTaskAssignmentInstanceModelImpl extends BaseModelImpl