Improve GT views with more details

svenvc · Oct 3, 2023 · 55921e9 · 55921e9
1 parent 47c88a4
commit 55921e9
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 4 deletions.
diff --git a/repository/ZTimestamp-GT/ZSubTimezone.extension.st b/repository/ZTimestamp-GT/ZSubTimezone.extension.st
@@ -0,0 +1,14 @@
+Extension { #name : #ZSubTimezone }
+
+{ #category : #'*ZTimestamp-GT' }
+ZSubTimezone >> gtViewDetailsIn: composite [
+	<gtView>
+	^ composite columnedList
+		title: 'Details';
+		items: [ {('abbreviation' -> self abbreviation).
+			('offset' -> self offset).
+			('daylight saving' -> self isDaylightSaving) } ];
+		column: 'Key' text: #key;
+		column: 'Value' text: #value;
+		send: #value
+]
diff --git a/repository/ZTimestamp-GT/ZTimestamp.extension.st b/repository/ZTimestamp-GT/ZTimestamp.extension.st
@@ -6,6 +6,7 @@ ZTimestamp >> gtViewDetailsIn: composite [
 	^ composite columnedList
 		title: 'Details';
 		items: [ {('iso' -> self printString).
+			(ZTimezone current id asLowercase -> (ZTimestampFormat isoNanoTZ useCurrentTimezone; format: self)).
 			('year' -> self year).
 			('month' -> self monthIndex).
 			('month name' -> self monthName).

diff --git a/repository/ZTimestamp-GT/ZTimezone.extension.st b/repository/ZTimestamp-GT/ZTimezone.extension.st
@@ -73,14 +73,29 @@ ZTimezone class >> gtViewCachedTimezonesFor: aView [
 			tooltip: 'Search cached timezones by id'
 ]
 
+{ #category : #'*ZTimestamp-GT' }
+ZTimezone class >> gtViewCurrentTimezoneIn: composite [
+	<gtView>
+	<gtClassView>
+	^ composite columnedList
+		title: 'Default';
+		priority: 11;
+		items: [ {('image default' -> self current id)} ];
+		column: 'Key' text: #key;
+		column: 'Value' text: #value;
+		send: [ self current ]
+]
+
 { #category : #'*ZTimestamp-GT' }
 ZTimezone >> gtViewDetailsIn: composite [
 	<gtView>
 	^ composite columnedList
 		title: 'Details';
 		items: [ {('id' -> self id).
+			('now' -> (ZTimestampFormat isoNanoTZ timezone: self; format: ZTimestamp now)).
 			('current offset' -> (self offsetForTimestamp: ZTimestamp now)).
-			('current subzone' -> (self subzoneForTimestamp: ZTimestamp now)) } ];
+			('currently daylight saving' -> (self subzoneForTimestamp: ZTimestamp now) isDaylightSaving).
+			('current subzone' -> (self subzoneForTimestamp: ZTimestamp now) description ) } ];
 		column: 'Key' text: #key;
 		column: 'Value' text: #value;
 		send: #value
@@ -126,7 +141,10 @@ ZTimezone >> gtViewTransitionsIn: composite [
 	^ composite columnedList
 		title: 'Transitions';
 		items: [ self resolvedTransitions ];
-		column: 'Start' text: #key;
-		column: 'Subzone' text: #value;
-		send: #value
+		column: 'Start absolute' text: [ :association | association key ];
+		column: ('Start ' , self id) 
+			text: [ :association | ZTimestampFormat isoTZ timezone: self; format: association key ];
+		column: ('Start ' , ZCurrentTimezone value id) 
+			text: [ :association | ZTimestampFormat isoTZ useCurrentTimezone; format: association key ];
+		column: 'Subzone' text: [ :association | association value description ]
 ]