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

added billing

Browse Source
This commit is contained in:
Jörg Henke
2021-03-05 19:33:49 +01:00
parent 345e2fc740
commit 5ef055156b
23 changed files with 680 additions and 718 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,9 +58,9 @@
<f:selectItem itemValue="" itemLabel="--- bitte wählen ---" />
<f:selectItems value="#{doneModel.activities}" var="i" itemValue="#{i}" itemLabel="#{i.name}" />
</b:selectOneMenu>
<b:selectOneMenu id="wp" value="#{doneModel.bean.wp}">
<b:selectOneMenu id="billing" value="#{doneModel.bean.billing}">
<f:selectItem itemValue="" itemLabel="--- bitte wählen ---" />
<f:selectItems value="#{doneModel.wps}" var="i" itemValue="#{i}" itemLabel="#{i.name}" />
<f:selectItems value="#{doneModel.billings}" var="i" itemValue="#{i}" itemLabel="#{i.name}" />
</b:selectOneMenu>
</b:panelGrid>
<b:buttonGroup>
@ -72,7 +72,7 @@
$("[id='formular:projectInner']").attr("size", 25);
$("[id='formular:moduleInner']").attr("size", 25);
$("[id='formular:activityInner']").attr("size", 25);
$("[id='formular:wpInner']").attr("size", 25);
$("[id='formular:billingInner']").attr("size", 25);
});
</script>
</b:form>

2
src/main/webapp/pages/done/delete.xhtml
View File

@ -23,6 +23,8 @@
<h:outputText value="#{doneModel.bean.moduleName}" style="font-weight: bolder" />
<h:outputText value="Tätigkeit: " />
<h:outputText value="#{doneModel.bean.jobName}" style="font-weight: bolder" />
<h:outputText value="Abrechnung: " />
<h:outputText value="#{doneModel.bean.billingName}" style="font-weight: bolder" />
</b:panelGrid>
<b:form>
<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="Abrechnung (#{doneModel.bean.wpName})" />
<h:outputText value="Abrechnung (#{doneModel.bean.billingName})" />
<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}" />
@ -58,9 +58,9 @@
<f:selectItem itemValue="" itemLabel="--- bitte wählen ---" />
<f:selectItems value="#{doneModel.activities}" var="i" itemValue="#{i}" itemLabel="#{i.name}" />
</b:selectOneMenu>
<b:selectOneMenu id="wp" value="#{doneModel.bean.wp}">
<b:selectOneMenu id="billing" value="#{doneModel.bean.billing}">
<f:selectItem itemValue="" itemLabel="--- bitte wählen ---" />
<f:selectItems value="#{doneModel.wps}" var="i" itemValue="#{i}" itemLabel="#{i.name}" />
<f:selectItems value="#{doneModel.billings}" var="i" itemValue="#{i}" itemLabel="#{i.name}" />
</b:selectOneMenu>
</b:panelGrid>
<b:buttonGroup>
@ -72,7 +72,7 @@
$("[id='formular:projectInner']").attr("size", 25);
$("[id='formular:moduleInner']").attr("size", 25);
$("[id='formular:activityInner']").attr("size", 25);
$("[id='formular:wpInner']").attr("size", 25);
$("[id='formular:billingInner']").attr("size", 25);
});
</script>
</b:form>

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

@ -24,7 +24,7 @@
<b:commandButton action="#{doneControl.toDelete(b)}" value="Entfernen" look="danger" iconAwesome="trash" />
</b:dataTableColumn>
<b:dataTableColumn label="" value="#{b.timeSummary}" contentStyleClass="doneoverviewtext" style="width: 128px !important" orderable="false" />
<b:dataTableColumn label="" value="#{b.projectNameWithWP}" contentStyleClass="doneoverviewtextemph" style="width: 160px !important" orderable="false" />
<b:dataTableColumn label="" value="#{b.projectNameWithBilling}" contentStyleClass="doneoverviewtextemph" style="width: 160px !important" orderable="false" />
<b:dataTableColumn label="" value="#{b.timeDiff}" contentStyleClass="doneoverviewtextemph" style="width: 64px !important" orderable="false" />
<b:dataTableColumn label="" style="width: 100px !important" orderable="false">
<b:commandButton action="#{doneControl.toEdit(b)}" value="Editieren" look="warning" iconAwesome="pencil" />
@ -75,7 +75,7 @@
searching="false">
<b:dataTableColumn label="" value="#{col.projectName}" contentStyle="font-size: 120%" orderable="false" />
<b:dataTableColumn label="" orderable="false">
<b:badge value="#{col.wp}" styleClass="#{col.wp}" />
<b:badge value="#{col.billingShortcut}" styleClass="#{col.billingCsskey}" />
</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" />
@ -108,9 +108,12 @@
</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:dataTable value="#{doneModel.billings}" var="col" border="false" info="false">
<b:dataTableColumn label="Kürzel" value="#{col.shortcut}" />
<b:dataTableColumn label="Name" value="#{col.name}" />
<b:dataTableColumn label="Stil">
<b:badge value="#{col.csskey}" styleClass="#{col.csskey}" />
</b:dataTableColumn>
</b:dataTable>
</b:tab>
</b:tabView>

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

@ -47,17 +47,30 @@
.WP2 {
color: black !important;
background-color: #ffe169 !important;
background: radial-gradient(#ffff00, #ffe169) !important;
border: 1px solid darkgray;
padding-top: 8px !important;
}
.WP4 {
color: white !important;
background-color: #69c3ff !important;
color: black !important;
background: radial-gradient(#00ffff, #69c3ff) !important;
border: 1px solid darkgray;
padding-top: 8px !important;
}
.WP5 {
color: black !important;
background-color: #e396ff !important;
background: radial-gradient(#ff0000, #e396ff) !important;
border: 1px solid darkgray;
padding-top: 8px !important;
}
.TA3 {
color: black !important;
background: radial-gradient(#99ff99, #ccffcc) !important;
border: 1px solid darkgray;
padding-top: 8px !important;
}
.left {