Skip to content

Commit

Permalink
impl, minor issues
Browse files Browse the repository at this point in the history 
Issue #616
  • Loading branch information
@rsoika
rsoika committed Nov 7, 2024
1 parent 078626e commit e512fdc
Show file tree
Hide file tree
Showing 6 changed files with 122 additions and 107 deletions.
8 changes: 4 additions & 4 deletions docker/docker-compose-dev.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ services:
volumes:
- ./deployments:/opt/jboss/wildfly/standalone/deployments/

# imixsadmin:
# image: imixs/imixs-admin
# ports:
# - "8888:8080"
imixsadmin:
image: imixs/imixs-admin
ports:
- "8888:8080"


# imixsbackup:
Expand Down
84 changes: 46 additions & 38 deletions imixs-office-workflow-app/src/main/webapp/pages/admin/space.xhtml
View file
Original file line number Diff line number Diff line change
@@ -1,41 +1,34 @@
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:f="http://xmlns.jcp.org/jsf/core"
xmlns:h="http://xmlns.jcp.org/jsf/html"
xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
xmlns:pt="http://xmlns.jcp.org/jsf/passthrough"
xmlns:marty="http://xmlns.jcp.org/jsf/composite/marty"
xmlns:i="http://xmlns.jcp.org/jsf/composite/imixs"
<ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://xmlns.jcp.org/jsf/core"
xmlns:h="http://xmlns.jcp.org/jsf/html" xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets" xmlns:pt="http://xmlns.jcp.org/jsf/passthrough"
xmlns:marty="http://xmlns.jcp.org/jsf/composite/marty" xmlns:i="http://xmlns.jcp.org/jsf/composite/imixs"
template="/layout/template.xhtml">

<!-- The view accepts the params 'id' and 'parent' -->
<f:metadata>
<f:viewAction action="#{workflowController.onLoad()}" if="#{not empty param.id}" />
<f:viewAction action="#{spaceController.create(param.parent)}" if="#{empty param.id}" />
<f:viewAction action="#{spaceController.create(param.parent)}" if="#{empty param.id}" />
</f:metadata>

<ui:define name="content">
<f:view>
<h:form id="space_form_id">

<marty:userSearch />

<div class="imixs-form">
<div class="imixs-header">
<h1>
<h:outputText value="#{message['space.title']}: " />
<h:outputText
rendered="#{! empty workflowController.workitem.item['space.parent.name']}"
<h:outputText rendered="#{! empty workflowController.workitem.item['space.parent.name']}"
value="#{workflowController.workitem.item['space.parent.name']}" />
<h:outputText
rendered="#{! empty workflowController.workitem.item['space.parent.name']}"
<h:outputText rendered="#{! empty workflowController.workitem.item['space.parent.name']}"
value="." />
<h:outputText
value="#{workflowController.workitem.item['space.name']} " /><h:outputText
value=" - #{workflowController.workitem.item['$workflowstatus']}" />
</h1>
<h:outputText value="#{workflowController.workitem.item['space.name']} " />
<h:outputText value=" - #{workflowController.workitem.item['$workflowstatus']}" />
</h1>
</div>

<div class="imixs-body">
<div class="imixs-tabs">
<ul>
Expand All @@ -56,25 +49,33 @@
<dl class="columns-1">
<dt>
<h:outputLabel for="name_id" value="#{message.name}">
<h:message style="color: red" for="name_id"
showSummary="true" showDetail="false" />
<h:message style="color: red" for="name_id" showSummary="true"
showDetail="false" />
</h:outputLabel>
</dt>
<dd>
<h:outputText
rendered="#{! empty workflowController.workitem.item['space.parent.name']}"
value="#{workflowController.workitem.item['space.parent.name']}." />
<h:selectOneMenu style="width:20em;"
value="#{workflowController.workitem.item['$uniqueidref']}">
<f:selectItem itemLabel=" - " itemValue="[ROOT]"></f:selectItem>
<c:forEach items="#{teamController.spaces}" var="space">
<c:if
test="#{space.item['name'] ne workflowController.workitem.item['space.name']}">
<f:selectItem itemLabel="#{space.item['name']}"
itemValue="#{space.item['$UniqueID']}">
</f:selectItem>
</c:if>
</c:forEach>
</h:selectOneMenu>

<h:inputText style="width: 20em;" required="true"
value="#{workflowController.workitem.item['space.name']}"
id="name_id">
value="#{workflowController.workitem.item['space.name']}" id="name_id">
</h:inputText>
</dd>

<dt>
<h:outputLabel for="description_id"
value="#{message.description}">
<h:message style="color: red" for="description_id"
showDetail="false" showSummary="true" />
<h:outputLabel for="description_id" value="#{message.description}">
<h:message style="color: red" for="description_id" showDetail="false"
showSummary="true" />
</h:outputLabel>
</dt>

Expand All @@ -98,7 +99,10 @@

<!-- ******** space Manager ********* -->
<dl>
<dt><h:inputText value="#{workflowController.workitem.item['space.manager.label']}" /></dt>
<dt>
<h:inputText
value="#{workflowController.workitem.item['space.manager.label']}" />
</dt>
<dd>
<marty:userListInput
value="#{workflowController.workitem.itemList['space.manager']}"
Expand All @@ -109,7 +113,10 @@

<!-- ******** space Team ********* -->
<dl>
<dt><h:inputText value="#{workflowController.workitem.item['space.team.label']}" /></dt>
<dt>
<h:inputText
value="#{workflowController.workitem.item['space.team.label']}" />
</dt>
<dd>
<marty:userListInput
value="#{workflowController.workitem.itemList['space.team']}"
Expand All @@ -119,7 +126,10 @@

<!-- ******** space Assitenz ********* -->
<dl>
<dt><h:inputText value="#{workflowController.workitem.item['space.assist.label']}" /></dt>
<dt>
<h:inputText
value="#{workflowController.workitem.item['space.assist.label']}" />
</dt>
<dd>
<marty:userListInput
value="#{workflowController.workitem.itemList['space.assist']}"
Expand All @@ -135,16 +145,15 @@


<!-- ******** space custom ********* -->

<ui:fragment rendered="#{! empty resourceBundleHandler.get('space.sub_custom')}">
<div id="tab-2">
<div class="ui-state-highlight ui-corner-all"
style="margin-bottom: 10px; padding: .5em;">
<p>#{resourceBundleHandler.get('space.help_custom')}</p>
</div>
<ui:include src="/pages/admin/sub_space_custom.xhtml">
<ui:param name="workitem"
value="#{workflowController.workitem}" />
<ui:param name="workitem" value="#{workflowController.workitem}" />
</ui:include>
</div>
</ui:fragment>
Expand All @@ -167,5 +176,4 @@



</ui:composition>

</ui:composition>
89 changes: 35 additions & 54 deletions imixs-office-workflow-app/src/main/webapp/pages/admin/spaces.xhtml
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:f="http://xmlns.jcp.org/jsf/core"
xmlns:h="http://xmlns.jcp.org/jsf/html"
xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
xmlns:pt="http://xmlns.jcp.org/jsf/passthrough"
xmlns:marty="http://xmlns.jcp.org/jsf/composite/marty"
xmlns:i="http://xmlns.jcp.org/jsf/composite/imixs"
<ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://xmlns.jcp.org/jsf/core"
xmlns:h="http://xmlns.jcp.org/jsf/html" xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets" xmlns:pt="http://xmlns.jcp.org/jsf/passthrough"
xmlns:marty="http://xmlns.jcp.org/jsf/composite/marty" xmlns:i="http://xmlns.jcp.org/jsf/composite/imixs"
template="/layout/template.xhtml">


Expand All @@ -14,7 +10,7 @@
/*<![CDATA[*/

// The following code is used to layout the tables with the jquery datatable plugin.
$(document).ready(function() {
$(document).ready(function () {
updateTableLayout();
});

Expand All @@ -26,20 +22,20 @@

function updateTableLayout() {

$('[id$=spacetable]').each(function() {
$('[id$=spacetable]').each(function () {
// with the following line we test if the jsf datatable realy contains data
// in cases with empty rows on default column is displayed.
if ($('tbody tr:nth-child(1) td', $(this)).length > 1)
$(this).dataTable({
"bRetrieve" : true,
"iDisplayLength" : #{propertyController.getProperty('admin.view.table.displaylength','30')},
"bRetrieve": true,
"iDisplayLength": #{ propertyController.getProperty('admin.view.table.displaylength', '30') },
"bLengthChange" : false,
"bSortable" : false,
"bJQueryUI" : true,
'aaSorting' : []
// no inital sorting
});
});
});

}
/*]]>*/
Expand All @@ -55,8 +51,7 @@
</div>

<div class="imixs-body">
<h:dataTable id="spacetable"
value="#{viewHandler.getData(spaceViewController)}" var="record"
<h:dataTable id="spacetable" value="#{viewHandler.getData(spaceViewController)}" var="record"
styleClass="imixsdatatable">


Expand All @@ -67,17 +62,18 @@
</h:panelGroup>
</f:facet>

<h:link outcome="/pages/admin/space"
styleClass="imixs-viewentry-main-link">
<h:panelGroup rendered="#{(record.item['$processid'] eq 100)}"
<h:link outcome="/pages/admin/space" styleClass="imixs-viewentry-main-link">
<h:panelGroup rendered="#{(record.item['$taskid'] eq 100)}"
styleClass="typcn typcn-tick imixs-state-success"
pt:title="#{record.item['$workflowstatus']}" />
<h:panelGroup rendered="#{(record.item['$processid'] eq 180)}"
<h:panelGroup rendered="#{(record.item['$taskid'] eq 180)}"
pt:title="#{record.item['$workflowstatus']}"
styleClass="typcn typcn-delete-outline imixs-state-warning" />
<h:panelGroup rendered="#{(record.item['$taskid'] eq 190)}"
pt:title="#{record.item['$workflowstatus']}"
styleClass="typcn typcn-delete-outline imixs-state-error" />
<h:outputText value="#{record.item['name']}" />
<h:outputText rendered="#{empty record.item['name']}"
value=" - no name - " />
<h:outputText rendered="#{empty record.item['name']}" value=" - no name - " />
<f:param name="id" value="#{record.item['$uniqueid']}" />
</h:link>
</h:column>
Expand All @@ -89,10 +85,8 @@
</h:panelGroup>
</f:facet>
<!-- hidden sort field -->
<h:outputText value="#{record.item['$lasteventdate']}"
style="display:none">
<f:convertDateTime timeZone="#{message.timeZone}" type="both"
pattern="yyyyMMdd" />
<h:outputText value="#{record.item['$lasteventdate']}" style="display:none">
<f:convertDateTime timeZone="#{message.timeZone}" type="both" pattern="yyyyMMdd" />
</h:outputText>
<h:outputText value="#{record.item['$lasteventdate']}">
<f:convertDateTime timeZone="#{message.timeZone}" type="both"
Expand All @@ -107,17 +101,13 @@

<h:column>
<f:facet name="header">Manager</f:facet>
<ui:repeat var="grp"
value="#{record.itemListArray['space.Manager']}">
<ui:param name="displayname"
value="#{userController.getUserName(grp)}"></ui:param>
<ui:repeat var="grp" value="#{record.itemListArray['space.Manager']}">
<ui:param name="displayname" value="#{userController.getUserName(grp)}"></ui:param>
<h:outputText value="#{userController.getUserName(grp)}"
title="#{grp} - #{userController.getEmail(grp)}" />
<ui:fragment rendered="#{(empty displayname) and (!empty grp)}">
<ui:param name="isrole"
value="#{userInputController.isRole(grp)}" />
<h:outputText value="#{grp}"
title="#{isrole?'Access Role':'Unknown User!'}"
<ui:param name="isrole" value="#{userInputController.isRole(grp)}" />
<h:outputText value="#{grp}" title="#{isrole?'Access Role':'Unknown User!'}"
class="#{isrole?'imixs-warning':'imixs-important'}" />
</ui:fragment>
<br />
Expand All @@ -127,15 +117,12 @@
<h:column>
<f:facet name="header">Team</f:facet>
<ui:repeat var="grp" value="#{record.itemListArray['space.Team']}">
<ui:param name="displayname"
value="#{userController.getUserName(grp)}"></ui:param>
<ui:param name="displayname" value="#{userController.getUserName(grp)}"></ui:param>
<h:outputText value="#{userController.getUserName(grp)}"
title="#{grp} - #{userController.getEmail(grp)}" />
<ui:fragment rendered="#{(empty displayname) and (!empty grp)}">
<ui:param name="isrole"
value="#{userInputController.isRole(grp)}" />
<h:outputText value="#{grp}"
title="#{isrole?'Access Role':'Unknown User!'}"
<ui:param name="isrole" value="#{userInputController.isRole(grp)}" />
<h:outputText value="#{grp}" title="#{isrole?'Access Role':'Unknown User!'}"
class="#{isrole?'imixs-warning':'imixs-important'}" />
</ui:fragment>
<br />
Expand All @@ -144,17 +131,13 @@

<h:column>
<f:facet name="header">Assist</f:facet>
<ui:repeat var="grp"
value="#{record.itemListArray['space.Assist']}">
<ui:param name="displayname"
value="#{userController.getUserName(grp)}" />
<ui:repeat var="grp" value="#{record.itemListArray['space.Assist']}">
<ui:param name="displayname" value="#{userController.getUserName(grp)}" />
<h:outputText value="#{userController.getUserName(grp)}"
title="#{grp} - #{userController.getEmail(grp)}" />
<ui:fragment rendered="#{(empty displayname) and (!empty grp)}">
<ui:param name="isrole"
value="#{userInputController.isRole(grp)}" />
<h:outputText value="#{grp}"
title="#{isrole?'Access Role':'Unknown User!'}"
<ui:param name="isrole" value="#{userInputController.isRole(grp)}" />
<h:outputText value="#{grp}" title="#{isrole?'Access Role':'Unknown User!'}"
class="#{isrole?'imixs-warning':'imixs-important'}" />
</ui:fragment>
<br />
Expand All @@ -163,20 +146,18 @@
<h:column>
<f:facet name="header">Status</f:facet>
<h:outputText value="#{record.item['$workflowstatus']}" />
</h:column>
</h:column>
<h:column>
<f:facet name="header">#{message.action}</f:facet>
<!-- Edit -->
<h:link outcome="/pages/admin/space"
styleClass="imixs-viewentry-main-link">
<h:link outcome="/pages/admin/space" styleClass="imixs-viewentry-main-link">
<span class="typcn typcn-pencil imixs-state-info"></span>
#{message.edit}
<f:param name="id" value="#{record.item['$uniqueid']}" />
</h:link>

<!-- Subspace -->
<h:link outcome="/pages/admin/space"
styleClass="imixs-viewentry-action-link"
<h:link outcome="/pages/admin/space" styleClass="imixs-viewentry-action-link"
title="#{message.add}">
<span class="typcn typcn-flow-children imixs-state-info"></span>#{message.add}
<f:param name="parent" value="#{record.item['$uniqueid']}" />
Expand All @@ -188,11 +169,11 @@
<div class="imixs-footer">
<h:button outcome="/pages/admin/organisation" value="#{message['organigram.title']}" />
<h:button outcome="/pages/admin/space?id=" value="#{message.add}" />
<h:commandButton action="home" value="#{message.close}" styleClass="imixs-close-action" />
<h:commandButton action="home" value="#{message.close}" styleClass="imixs-close-action" />
</div>
</div>
</h:form>
</f:view>
</ui:define>

</ui:composition>
</ui:composition>
Loading

0 comments on commit e512fdc

Please sign in to comment.