work/timetrack
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed functionality

Browse Source
This commit is contained in:
Jörg Henke
2021-02-26 18:59:54 +01:00
committed by Jotty
parent a2d01b41e3
commit addf181933
12 changed files with 220 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/webapp/pages/done/add.xhtml
View File

@@ -45,7 +45,7 @@
<h:outputText value="Projekt" />
<h:outputText value="Modul" />
<h:outputText value="Tätigkeit" />
<h:outputText value="euCanShare WP" />
<h:outputText value="Abrechnung" />
<b:selectOneMenu id="project" value="#{doneModel.bean.project}">
<f:selectItem itemValue="" itemLabel="--- bitte wählen ---" />
<f:selectItems value="#{doneModel.projects}" var="i" itemValue="#{i}" itemLabel="#{i.name}" />
@@ -59,10 +59,8 @@
<f:selectItems value="#{doneModel.activities}" var="i" itemValue="#{i}" itemLabel="#{i.name}" />
</b:selectOneMenu>
<b:selectOneMenu id="wp" value="#{doneModel.bean.wp}">
<f:selectItem itemValue="" itemLabel="---" />
<f:selectItem itemValue="WP2" itemLabel="WP2 - Opal/Mica/..., REST" />
<f:selectItem itemValue="WP4" itemLabel="WP4 - Square²" />
<f:selectItem itemValue="WP5" itemLabel="WP5 - SHIP-Datenbereitstellung" />
<f:selectItem itemValue="" itemLabel="--- bitte wählen ---" />
<f:selectItems value="#{doneModel.wps}" var="i" itemValue="#{i}" itemLabel="#{i.name}" />
</b:selectOneMenu>
</b:panelGrid>
<b:buttonGroup>

8
src/main/webapp/pages/done/edit.xhtml
View File

@@ -45,7 +45,7 @@
<h:outputText value="Projekt (#{doneModel.bean.projectName})" />
<h:outputText value="Modul (#{doneModel.bean.moduleName})" />
<h:outputText value="Tätigkeit (#{doneModel.bean.jobName})" />
<h:outputText value="euCanSHare WP" />
<h:outputText value="Abrechnung (#{doneModel.bean.wpName})" />
<b:selectOneMenu id="project" value="#{doneModel.bean.project}">
<f:selectItem itemValue="" itemLabel="--- bitte wählen ---" />
<f:selectItems value="#{doneModel.projects}" var="i" itemValue="#{i}" itemLabel="#{i.name}" />
@@ -59,10 +59,8 @@
<f:selectItems value="#{doneModel.activities}" var="i" itemValue="#{i}" itemLabel="#{i.name}" />
</b:selectOneMenu>
<b:selectOneMenu id="wp" value="#{doneModel.bean.wp}">
<f:selectItem itemValue="" itemLabel="---" />
<f:selectItem itemValue="WP2" itemLabel="WP2 - Opal/Mica/..., REST" />
<f:selectItem itemValue="WP4" itemLabel="WP4 - Square²" />
<f:selectItem itemValue="WP5" itemLabel="WP5 - SHIP-Datenbereitstellung" />
<f:selectItem itemValue="" itemLabel="--- bitte wählen ---" />
<f:selectItems value="#{doneModel.wps}" var="i" itemValue="#{i}" itemLabel="#{i.name}" />
</b:selectOneMenu>
</b:panelGrid>
<b:buttonGroup>

23
src/main/webapp/pages/done/init.xhtml
View File

@@ -79,7 +79,7 @@
</b:dataTableColumn>
<b:dataTableColumn label="" value="#{col.moduleName}" contentStyle="font-size: 120%" orderable="false" />
<b:dataTableColumn label="" value="#{col.jobName}" contentStyle="font-size: 120%" orderable="false" />
<b:dataTableColumn label="" value="#{col.duration} = #{col.durationHours} h" contentStyle="font-size: 120%" orderable="false" />
<b:dataTableColumn label="" value="#{col.durationHours} h" contentStyle="font-size: 120%" orderable="false" />
</b:dataTable>
</b:tab>
<b:tab title="Anhang">
@@ -92,6 +92,27 @@
defaultDate="#{doneModel.dayIso8601}" defaultView="agendaDay" hidden="xs" scrollTime="08:00:00"
slotDuration="00:15:00" span="half" allDaySlot="false" lang="de" />
</b:tab>
<b:tab title="Projekt">
<ui:repeat value="#{doneModel.projects}" var="col">
<b:badge value="#{col.name}" class="prompt" />
</ui:repeat>
</b:tab>
<b:tab title="Modul">
<ui:repeat value="#{doneModel.modules}" var="col">
<b:badge value="#{col.name}" class="prompt" />
</ui:repeat>
</b:tab>
<b:tab title="Tätigkeit">
<ui:repeat value="#{doneModel.activities}" var="col">
<b:badge value="#{col.name}" class="prompt" />
</ui:repeat>
</b:tab>
<b:tab title="Abrechnung">
<b:dataTable value="#{doneModel.wps}" var="col" border="false" info="false">
<b:dataTableColumn label="Schlüssel" value="#{col.key}" />
<b:dataTableColumn label="Name" value="#{col.name}" />
</b:dataTable>
</b:tab>
</b:tabView>
</b:form>
</b:panel>

10
src/main/webapp/resources/css/style.css
View File

@@ -7,7 +7,7 @@
.page {
height: 100%;
width: 100%;
background-image: linear-gradient(to bottom, #fff 0%, #ccc 20%)
background-image: linear-gradient(to bottom, #ffffff 10%, #afffff 40%)
!important;
}
@@ -68,6 +68,14 @@
text-align: right;
}
.prompt {
margin: 4px;
padding: 4px !important;
padding-bottom: 2px !important;
font-size: medium !important;
background-color: #005782 !important;
}
.version {
font-size: small;
color: silver;