Skip to content

Commit

Permalink
Merge pull request 'fix: improve display of tables and other areas' (#18
Browse files Browse the repository at this point in the history 
) from improve_display into master

Reviewed-on: https://gitea.intranda.com/goobi-workflow/goobi-plugin-dashboard-extended/pulls/18
  • Loading branch information
Dominick Leppich committed Mar 13, 2024
2 parents 3bd20b0 + a767cf9 commit 5a29221
Show file tree
Hide file tree
Showing 7 changed files with 82 additions and 135 deletions.
2 changes: 1 addition & 1 deletion plugin/GUI/META-INF/resources/uii/plugin_dashboard_extended.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
msgs: msgs
}
})

/*window.mountNagios(
nagiosEle,
{
Expand Down
12 changes: 5 additions & 7 deletions plugin/GUI/META-INF/resources/uii/plugin_dashboard_include_assignedSteps.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@
<h:form
id="currentTasks"
prependId="false">
<div class="gw-table" style="#{DashboardForm.plugin.tasksHelper.assignedSteps.size() gt 4 ? 'overflow-y:auto; max-height:225px;':''}'">
<div class="gw-table gw-table__vscroll" >
<div class="gw-table__wrapper">
<table
role="grid"
id="currentTasksTable"
class="table table-bordered table-hover">

<!-- COLUMNHEADER -->
<thead>
<tr role="row">
Expand All @@ -42,7 +42,7 @@
</tr>
</thead>
<!-- // COLUMNHEADER -->

<!-- TABLE BODY -->
<tbody>
<ui:repeat
Expand Down Expand Up @@ -88,17 +88,15 @@
</ui:repeat>
</tbody>
<!-- // TABLE BODY -->

</table>
</div>
</div>
</h:form>

</intranda:box>
</div>
</ui:fragment>
</composite:implementation>

</ui:composition>


53 changes: 28 additions & 25 deletions plugin/GUI/META-INF/resources/uii/plugin_dashboard_include_processTemplates.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
rendered="#{DashboardForm.plugin.processHelper.showProcessTemplates and (LoginForm.hasRole('Workflow_Processes') or LoginForm.hasRole('Workflow_ProcessTemplates'))}">

<h:form id="processTemplateForm" styleClass="mb-3">

<intranda:box
boxType="primary"
boxPadding="false"
Expand All @@ -54,7 +54,7 @@
<!-- COLUMNHEADER -->
<thead>
<tr role="row">

<!-- Process title -->
<th
scope="col"
Expand All @@ -78,7 +78,6 @@
<th
scope="col"
role="columnheader"
style="width:80px"
aria-sort="#{NavigationForm.uiStatus.sorting == fortschrittDesc ? 'descending' : NavigationForm.uiStatus.sorting== fortschrittAsc ? 'ascending' :'none'}">
<button
class="column-header-sort"
Expand All @@ -93,12 +92,11 @@
<f:ajax render="@form" />
</button>
</th>

<!-- project -->
<th
scope="col"
role="columnheader"
style="max-width:110px"
aria-sort="#{NavigationForm.uiStatus.sorting == projektDesc ? 'descending' : NavigationForm.uiStatus.sorting == projektAsc ? 'ascending' :'none'}">
<button
class="column-header-sort"
Expand All @@ -115,14 +113,13 @@
<f:ajax render="@form" />
</button>
</th>

<!-- Actions -->
<intranda:columnheader
value="#{msgs.auswahl}"
sortable="false"
style="width:120px"
addClass="gw-table-fixed__actions" />

</tr>
</thead>
<!-- // COLUMNHEADER -->
Expand All @@ -146,10 +143,12 @@
rendered="#{item.fortschritt3 gt 0}"
data-toggle="tooltip"
styleClass="progress-bar #{(LoginForm.myBenutzer.uiMode=='low_vision'?('easy-read-progressbar-status-done'):('progress-bar-success'))}"
style="width: #{item.fortschritt3}%;line-height:15px;"
pt:role="figure"
pt:aria-label="#{item.fortschritt3}% #{msgs.statusAbgeschlossen}">
<h:outputText value="&#160;" />
<f:passThroughAttribute
name="style"
value ="--progress: #{item.fortschritt3}%" />
<f:passThroughAttribute
name="data-bs-trigger"
value="hover" />
Expand All @@ -174,10 +173,12 @@
rendered="#{item.fortschritt2 gt 0}"
data-toggle="tooltip"
styleClass="progress-bar #{(LoginForm.myBenutzer.uiMode=='low_vision'?('easy-read-progressbar-status-open'):('progress-bar-warning'))}"
style="width: #{item.fortschritt2}%;line-height:15px;"
pt:role="figure"
pt:aria-label="#{item.fortschritt2}% #{msgs.statusOffen} / #{msgs.statusInBearbeitung}">
<h:outputText value="&#160;" />
<f:passThroughAttribute
name="style"
value ="--progress: #{item.fortschritt2}%" />
<f:passThroughAttribute
name="data-bs-trigger"
value="hover" />
Expand All @@ -202,10 +203,12 @@
rendered="#{item.fortschrittError gt 0}"
data-toggle="tooltip"
styleClass="progress-bar #{(LoginForm.myBenutzer.uiMode=='low_vision'?('easy-read-progressbar-status-error'):('progress-bar-danger progressbar-status-error'))} "
style="width: #{item.fortschrittError}%;line-height:15px;"
pt:role="figure"
pt:aria-label="#{item.fortschrittError}% #{msgs.statusError}">
<h:outputText value="&#160;" />
<f:passThroughAttribute
name="style"
value ="--progress: #{item.fortschrittError}%" />
<f:passThroughAttribute
name="data-bs-trigger"
value="hover" />
Expand All @@ -230,10 +233,12 @@
rendered="#{item.fortschritt1 gt 0}"
data-toggle="tooltip"
styleClass="progress-bar #{(LoginForm.myBenutzer.uiMode=='low_vision'?('easy-read-progressbar-status-locked'):('progress-bar-danger'))} "
style="width: #{item.fortschritt1}%;line-height:15px;"
pt:role="figure"
pt:aria-label="#{item.fortschritt1}% #{msgs.statusGesperrt}">
<h:outputText value="&#160;" />
<f:passThroughAttribute
name="style"
value ="--progress: #{item.fortschritt1}%" />
<f:passThroughAttribute
name="data-bs-trigger"
value="hover" />
Expand All @@ -256,15 +261,15 @@
</div>
</td>
<!-- // STATUS -->

<!-- PROJECT -->
<td>
<h:outputText value="#{item.projekt.titel}" />
</td>

<!-- BUTTONS -->
<td>

<!-- CREATE PROCESS - ONE PROJECT -->
<button
class="btn fa fa-file-o #{!ProzesskopieForm.isUserInProcessProject(item) or item.getProjekt().projectIsArchived?'disabled':''} #{item.containsUnreachableSteps?'btn-hot':'btn-primary-400'} button-schaltknopf"
Expand Down Expand Up @@ -345,8 +350,8 @@

</span>
</h:panelGroup>


<!-- MASS IMPORT - ONE PROJECT -->
<button
class="btn fa fa-files-o #{!ProzesskopieForm.isUserInProcessProject(item) or item.getProjekt().projectIsArchived?'disabled':''} #{item.containsUnreachableSteps?'btn-hot':'btn-primary-400'} button-schaltknopf"
Expand Down Expand Up @@ -428,11 +433,11 @@
</ul>
</div>
</span>
</h:panelGroup>
</h:panelGroup>




</td>
</tr>
</ui:repeat>
Expand All @@ -441,7 +446,7 @@

</table>
</div>

<!-- PAGINATOR -->
<div class="box__actions" jsf:rendered="#{DashboardForm.plugin.paginator.totalResults > LoginForm.myBenutzer.tabellengroesse}">
<div class="dataTables__paginate">
Expand All @@ -460,5 +465,3 @@
</composite:implementation>

</ui:composition>


110 changes: 32 additions & 78 deletions plugin/GUI/META-INF/resources/uii/plugin_dashboard_include_statisticsProcesses.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,86 +12,40 @@

<composite:implementation>

<script type="text/javascript">
function ext() {

// this.cfg.title='mein neues Diagramm';

this.cfg.grid = {
background: 'transparent',
drawGridlines: true,
gridLineWidth: 0.25,
gridLineColor: '#ccc',
drawBorder: true,
borderWidth: 0.25,
shadow: false,
};

this.cfg.axes.yaxis.label='#{msgs.prozesse}';
this.cfg.axes.xaxis.label='#{msgs.monate}';

this.cfg.seriesColors=['#368EE0', '#00749F', '#73C774', '#C7754C', '#17BDB8'];

this.cfg.seriesDefaults = {
shadow: false,
pointLabels: { show: true }
};

this.cfg.axesDefaults = {
labelRenderer: $.jqplot.CanvasAxisLabelRenderer,

};

this.cfg.axes = {
xaxis:{
renderer:$.jqplot.CategoryAxisRenderer,
tickRenderer: $.jqplot.CanvasAxisTickRenderer ,
tickOptions: {
angle: -50,
fontSize: '8pt',
fontFamily: 'Goobi',
textColor: '#000000',
}
},
yaxis:{
tickRenderer: $.jqplot.CanvasAxisTickRenderer ,
tickOptions: {
fontSize: '8pt',
fontFamily: 'Goobi',
textColor: '#000000',
formatString: "%d"
<h:outputScript>
function chartExtender() {
var options = $.extend(true, {}, this.cfg.config);
options = {
options: {
plugins: {
title: {
display: false,
text: "Processes per month"
},
min:0,
legend: {
display: false
}
}
};

}
</script>
<ui:fragment rendered="#{DashboardForm.plugin.processHelper.showStatistics and !DashboardForm.plugin.processHelper.isProcessPerMonthEmpty()}">
<style>
.jqplot-title {
font-size: 28px;
}
.jqplot-point-label {
font-size: 12px;
}

</style>

<div class="mb-3">
<intranda:box
boxType="primary"
boxPadding="true"
icon="fa-list"
title="#{msgs.dashboard_processesPerMonth}">
<div class="card">
<p:lineChart
model="#{DashboardForm.plugin.processHelper.processesPerMonth}"
style="width: 100%; height:300px;"/>
</div>
</intranda:box>
</div>

</ui:fragment>
};
$.extend(true, this.cfg.config, options);
};
</h:outputScript>
<ui:fragment rendered="#{DashboardForm.plugin.processHelper.showStatistics and !DashboardForm.plugin.processHelper.isProcessPerMonthEmpty()}">
<div class="mb-3">
<intranda:box
boxType="primary"
boxPadding="true"
icon="fa-list"
title="#{msgs.dashboard_processesPerMonth}">
<div class="card">
<p:lineChart
model="#{DashboardForm.plugin.processHelper.processesPerMonth}"
style="height:250px"/>
</div>
</intranda:box>
</div>

</ui:fragment>
</composite:implementation>
</ui:composition>
Loading

0 comments on commit 5a29221

Please sign in to comment.