Skip to content

Commit

Permalink
refactoring
Browse files Browse the repository at this point in the history 
Issue #477
  • Loading branch information
@rsoika
rsoika committed Dec 10, 2021
1 parent 1967975 commit 7291714
Show file tree
Hide file tree
Showing 10 changed files with 311 additions and 552 deletions.
11 changes: 3 additions & 8 deletions imixs-office-workflow-app/src/main/resources/bundle/app_de.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,6 @@ sub_appointment_followup=Termin
sub_appointment_time=Termin
sub_appointment_time_followup=Termin
sub_reisekostenabrechnung=
minutes_header=
minutes_body=
minutes_sub_minute=Aufgabe
sub_orderitems=
sub_shortdescription=
sub_orderitems_read=
Expand All @@ -88,11 +85,9 @@ sub_wiki_read=
qs_header=
qs_body=


minutes_sub_minute_basic=
minutes_sub_minute_read=
minutes_sub_minute_todo=
minutes_sub_minute_todo_usergroup=
minutes_status_decision=Beschluss
minutes_status_task=Aufgabe
minutes_status_completed=Erledigt


gdpr_sub_system=System
Expand Down
12 changes: 3 additions & 9 deletions imixs-office-workflow-app/src/main/resources/bundle/app_en.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,6 @@ sub_appointment_followup=Appointment
sub_appointment_time=Appointment
sub_appointment_time_followup=Appointment
sub_reisekostenabrechnung=
minutes_header=
minutes_body=
minutes_sub_minute=Task
sub_orderitems=
sub_shortdescription=
sub_orderitems_read=
Expand All @@ -88,12 +85,9 @@ sub_wiki_read=
qs_header=
qs_body=


minutes_sub_minute_basic=
minutes_sub_minute_read=
minutes_sub_minute_todo=
minutes_sub_minute_todo_usergroup=

minutes_status_decision=Decision
minutes_status_task=Task
minutes_status_completed=Completed

gdpr_sub_system=System
gdpr_sub_system_kmu=System
Expand Down
10 changes: 8 additions & 2 deletions imixs-office-workflow-app/src/main/webapp/layout/css/office-theme.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1523,9 +1523,15 @@ dl dd .imixs-datetime-picker select {
margin-left: 45px;
}

.minute-info .minute-summary input {
.minute-info .minute-summary input {
font-size: 1.2em;
width: 100%;
width: 100%;
}

.minute-summary-status {
line-height: 2em;
font-size:1.2em;
color:#999;
}

.minute-icon {
Expand Down
59 changes: 36 additions & 23 deletions imixs-office-workflow-app/src/main/webapp/pages/workitems/forms/minutes/body.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@


<h:panelGroup layout="block" styleClass="imixs-form-section"
rendered="#{!readonly}" id="menuitemlist"
binding="#{minutelistContainer}">
id="menuitemlist" binding="#{minutelistContainer}">
<ui:repeat var="minuteitem" value="#{childItemController.childItems}">

<!-- Minute Block -->
Expand All @@ -25,28 +24,27 @@

<h:panelGroup styleClass="minute-summary">
<h:inputText title="#{message['form.minutes.help_subject']}"
required="false" value="#{minuteitem.item['_subject']}" />
required="false" value="#{minuteitem.item['minute.subject']}" />
</h:panelGroup>
<div class="imixs-form-section">
<dl>
<dt>#{message['form.minutes.description']}</dt>
<dt>
<h:selectOneRadio value="#{minuteitem.item['minute.type']}">
<f:selectItem itemLabel="#{app.minutes_status_decision}"
itemValue="decision" />
<f:selectItem itemLabel="#{app.minutes_status_task}"
itemValue="task" />
<f:selectItem itemLabel="#{app.minutes_status_completed}"
itemValue="completed" />
</h:selectOneRadio>
</dt>
<dd>
<h:inputTextarea id="tinymce-minute-editor"
class="imixs-editor-basic"
value="#{minuteitem.item['_description']}" />
</dd>
</dl>

<dl>
<dd>
<h:selectOneRadio value="#{minuteitem.item['minute.type']}">

<f:selectItem itemLabel="Beschluss" itemValue="decision"/>
<f:selectItem itemLabel="Aufgabe" itemValue="task"/>
<f:selectItem itemLabel="Erledigt" itemValue="completed"/>
</h:selectOneRadio>
value="#{minuteitem.item['minute.description']}" />
</dd>
</dl>

</div>

<!-- close minute -->
Expand All @@ -60,11 +58,12 @@
</h:panelGroup>

<!-- Read Mode -->

<h:panelGroup
rendered="#{minuteitem.item['numpos'] ne minuteController.selectedMinute}">
<h:panelGroup styleClass="minute-summary">
<h2>
<h:commandLink value="#{minuteitem.item['_subject']}"
<h:commandLink value="#{minuteitem.item['minute.subject']}"
onclick="closeMinuteEditor();"
actionListener="#{minuteController.toggleMinute(minuteitem.item['numpos'])}">
<f:ajax render="#{minutelistContainer.clientId}"
Expand All @@ -73,16 +72,28 @@
<h:outputText style="margin-left:10px;font-size:0.7rem;"
value="[#{message.edit}]" />
</h:commandLink>

</h2>
</h:panelGroup>
<div class="imixs-form-section">
<dl>
<dt>#{message['form.minutes.description']}</dt>
<dt class="minute-summary-status">
<h:outputText
rendered="#{minuteitem.item['minute.type'] eq 'decision'}"
value="#{app.minutes_status_decision}" />
<h:outputText
rendered="#{minuteitem.item['minute.type'] eq 'task'}"
value="#{app.minutes_status_task}" />
<h:outputText
rendered="#{minuteitem.item['minute.type'] eq 'completed'}"
value="#{app.minutes_status_completed}" />
</dt>
<dd>
<h:outputText escape="false"
value="#{minuteitem.item['_description']}" />
value="#{minuteitem.item['minute.description']}" />
</dd>
</dl>

</div>
</h:panelGroup>
</div>
Expand All @@ -92,16 +103,18 @@


<!-- add new minute button -->
<h:commandButton value="#{message.add}" a:data-id="addposbutton_id"
actionListener="#{childItemController.add}">
<h:commandButton value="#{message.add}" a:data-id="addposbutton_id" onclick="closeMinuteEditor();"
actionListener="#{minuteController.add}">
<f:ajax render="#{minutelistContainer.clientId}" immediate="true"
onevent="updateMinuteItems"
execute="#{minutelistContainer.clientId}"></f:ajax>
</h:commandButton>

</h:panelGroup>





<script type="text/javascript">
/*<![CDATA[*/

Expand Down
63 changes: 63 additions & 0 deletions imixs-office-workflow-app/src/main/webapp/pages/workitems/forms/minutes/body_read.xhtml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
xmlns:f="http://xmlns.jcp.org/jsf/core"
xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
xmlns:h="http://xmlns.jcp.org/jsf/html"
xmlns:a="http://xmlns.jcp.org/jsf/passthrough">



<h:panelGroup layout="block" styleClass="imixs-form-section"
id="menuitemlist" binding="#{minutelistContainer}">
<ui:repeat var="minuteitem" value="#{childItemController.childItems}">

<!-- Minute Block -->
<h:panelGroup layout="block" styleClass="imixs-viewentry">
<div class="minute-number">
<h2>#{minuteitem.item['numpos']}.</h2>
</div>
<div class="minute-info">

<h:panelGroup
rendered="#{minuteitem.item['numpos'] ne minuteController.selectedMinute}">
<h:panelGroup styleClass="minute-summary">
<h2>
<h:outputText value="#{minuteitem.item['minute.subject']}" />

</h2>
</h:panelGroup>
<div class="imixs-form-section">
<dl>
<dt class="minute-summary-status">
<h:outputText
rendered="#{minuteitem.item['minute.type'] eq 'decision'}"
value="#{app.minutes_status_decision}" />
<h:outputText
rendered="#{minuteitem.item['minute.type'] eq 'task'}"
value="#{app.minutes_status_task}" />
<h:outputText
rendered="#{minuteitem.item['minute.type'] eq 'completed'}"
value="#{app.minutes_status_completed}" />
</dt>
<dd>
<h:outputText escape="false"
value="#{minuteitem.item['minute.description']}" />
</dd>
</dl>

</div>
</h:panelGroup>
</div>

</h:panelGroup>
</ui:repeat>


</h:panelGroup>






</ui:composition>
35 changes: 3 additions & 32 deletions imixs-office-workflow-app/src/main/webapp/pages/workitems/forms/minutes/header.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,7 @@
xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
xmlns:marty="http://xmlns.jcp.org/jsf/composite/marty"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
<!-- Init script -->
<script type="text/javascript">
/*<![CDATA[*/

$(document).ready(function() {

});

/*]]>*/
</script>


<div class="imixs-form-section">
<dl>
Expand All @@ -33,7 +24,6 @@
<dt>#{message['form.minutes.team']}:</dt>
<dd>
<marty:userListInput value="#{workitem.itemList['_Team']}"
editmode="#{(!workitem.item['minuteslocked']) and (empty workitem.item['$isauthor'] or workitem.item['$isauthor'])}"
render="#{teilnehmer.clientId}" />
</dd>

Expand All @@ -49,7 +39,6 @@
<h:selectManyCheckbox layout="pageDirection" enabledClass="imixs-normal"
value="#{workitem.itemListArray['_present']}">
<c:forEach var="user" items="#{profilelist}">

<f:selectItem itemLabel="#{user.item['txtuserName']}"
itemValue="#{user.item['txtname']}"></f:selectItem>
</c:forEach>
Expand All @@ -68,6 +57,8 @@
<f:convertDateTime pattern="#{message.datePatternShort}"
timeZone="#{message.timeZone}" />
</h:inputText>


</dd>
</dl>

Expand All @@ -82,26 +73,6 @@
</div>


<!-- ReadOnly Modus -->
<c:if test="#{workitem.item['minuteslocked']}">
<!-- jQuery code to disable all input elements in read modus -->
<script type="text/javascript">
/*<![CDATA[*/
$(".imixs-body :input").attr("disabled", true);

// hide owner links
$("a[id$=remove_owner_link_id]").hide();

// fix disabled checkboxes, need to be enabled befor submit...
// https://stackoverflow.com/questions/12769664/how-to-make-html-select-element-look-like-disabled-but-pass-values#12769785
$('#workitem_form').submit(function() {
$(".imixs-body input:checkbox").removeAttr('disabled');
});


/*]]>*/
</script>
</c:if>


</ui:composition>
Loading

0 comments on commit 7291714

Please sign in to comment.