extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-07 08:34:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Timesheet: Display changes for totals

Browse Source 
- Totals in row now bold
- Duration in header set to h:m format
- adjust vertical position of duration to be more in line with the rest
This commit is contained in:
nathan 2023-05-08 10:04:52 -06:00
parent b26ff9988d
commit 560ed79a5e
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
timesheet/inc/class.timesheet_ui.inc.php
View File

@ -837,7 +837,7 @@ class timesheet_ui extends timesheet_bo
} }
$row['ts_start'] = $row['ts_unitprice'] = ''; $row['ts_start'] = $row['ts_unitprice'] = '';
if (!$this->quantity_sum) $row['ts_quantity'] = ''; if (!$this->quantity_sum) $row['ts_quantity'] = '';
$row['class'] = 'th rowNoEdit rowNoDelete rowNoUndelete'; $row['class'] = 'th rowNoEdit rowNoDelete rowNoUndelete rowSum';
$row['titleClass'] = 'timesheet_titleSum'; $row['titleClass'] = 'timesheet_titleSum';
continue; continue;
} }

16
timesheet/templates/default/app.css
View File

@ -5,16 +5,22 @@
*/ */
/* Allow project list selection in nm header to be large */ /* Allow project list selection in nm header to be large */
#timesheet-index #timesheet-index_pm_id .ui-autocomplete.ui-menu #timesheet-index #timesheet-index_pm_id .ui-autocomplete.ui-menu {
{
max-height: 80%; max-height: 80%;
} }
.timesheet_titleSum,.timesheet_titleDetails { font-weight: bold; }
.rowSum [id*='ts_quantity'], .rowSum [id*='ts_duration'], .timesheet_titleSum, .timesheet_titleDetails {
font-weight: bold;
}
table.egwGridView_grid tbody td[align=right] {
padding-top: 0px;
}
/* Let category & total columns line up vertically with the 2-element headers (Duration, Total, etc) */ /* Let category & total columns line up vertically with the 2-element headers (Duration, Total, etc) */
#timesheet-index .innerContainer > span { #timesheet-index .innerContainer > span {
margin-bottom: 5px; margin-bottom: 5px;
display: inline-block; display: inline-block;
} }
#timesheet-edit.et2_container { #timesheet-edit.et2_container {

2
timesheet/templates/default/index.xet
View File

@ -54,7 +54,7 @@
<nextmatch-sortheader label="Category" id="cat_id"/> <nextmatch-sortheader label="Category" id="cat_id"/>
<et2-vbox> <et2-vbox>
<nextmatch-sortheader label="Duration" id="ts_duration"/> <nextmatch-sortheader label="Duration" id="ts_duration"/>
<et2-date-duration id="duration" readonly="true" ></et2-date-duration> <et2-date-duration id="duration" readonly="true" displayFormat="hm"></et2-date-duration>
</et2-vbox> </et2-vbox>
<et2-vbox> <et2-vbox>
<nextmatch-sortheader label="Quantity" id="ts_quantity"/> <nextmatch-sortheader label="Quantity" id="ts_quantity"/>