From 560ed79a5e2ad72522cbef32a80d57aa5663b8d1 Mon Sep 17 00:00:00 2001
From: nathan <nathangray.bsc+github@gmail.com>
Date: Mon, 8 May 2023 10:04:52 -0600
Subject: [PATCH] Timesheet: Display changes for totals

- 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
---
 timesheet/inc/class.timesheet_ui.inc.php |  2 +-
 timesheet/templates/default/app.css      | 16 +++++++++++-----
 timesheet/templates/default/index.xet    |  2 +-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/timesheet/inc/class.timesheet_ui.inc.php b/timesheet/inc/class.timesheet_ui.inc.php
index 428a60bf92..fb4c691ceb 100644
--- a/timesheet/inc/class.timesheet_ui.inc.php
+++ b/timesheet/inc/class.timesheet_ui.inc.php
@@ -837,7 +837,7 @@ class timesheet_ui extends timesheet_bo
 				}
 				$row['ts_start'] = $row['ts_unitprice'] = '';
 				if (!$this->quantity_sum) $row['ts_quantity'] = '';
-				$row['class'] = 'th rowNoEdit rowNoDelete rowNoUndelete';
+				$row['class'] = 'th rowNoEdit rowNoDelete rowNoUndelete rowSum';
 				$row['titleClass'] = 'timesheet_titleSum';
 				continue;
 			}
diff --git a/timesheet/templates/default/app.css b/timesheet/templates/default/app.css
index 0de107088d..1458c5c94f 100644
--- a/timesheet/templates/default/app.css
+++ b/timesheet/templates/default/app.css
@@ -5,16 +5,22 @@
  */
 
 /* 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%;
 }
-.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) */
 #timesheet-index .innerContainer > span {
-    margin-bottom: 5px;
-    display: inline-block;
+	margin-bottom: 5px;
+	display: inline-block;
 }
 
 #timesheet-edit.et2_container {
diff --git a/timesheet/templates/default/index.xet b/timesheet/templates/default/index.xet
index d3ea4bdd83..1f3be64c9c 100644
--- a/timesheet/templates/default/index.xet
+++ b/timesheet/templates/default/index.xet
@@ -54,7 +54,7 @@
 					<nextmatch-sortheader label="Category" id="cat_id"/>
 					<et2-vbox>
 						<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>
 						<nextmatch-sortheader label="Quantity" id="ts_quantity"/>