Issue#22 and Issue#23 Fixed formatters to display default values

Paul Joiner · Paul Joiner · commit 541fa44fcec4 · 2022-05-06T14:09:26.000-05:00
diff --git a/notebooks/01_Introduction.ipynb b/notebooks/01_Introduction.ipynb
diff --git a/src/DwC-A_dotnet.Interactive/DwC-A_dotnet.Interactive.csproj b/src/DwC-A_dotnet.Interactive/DwC-A_dotnet.Interactive.csproj
@@ -11,21 +11,22 @@
     <PackageTags>DwC-A darwin-core Biodiversity</PackageTags>
     <Authors>Paul Joiner</Authors>
     <Company>Paul Joiner</Company>
-    <Version>0.1.20-Pre</Version>
+    <Version>0.1.12-Pre</Version>
     <Description>.NET Interactive Extensions for Darwin Core Archive file reader</Description>
-    <AssemblyVersion>0.1.20.0</AssemblyVersion>
-    <FileVersion>0.1.20.0</FileVersion>
+    <AssemblyVersion>0.1.12.0</AssemblyVersion>
+    <FileVersion>0.1.12.0</FileVersion>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageReadmeFile>README.md</PackageReadmeFile>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="DwC-A_dotnet" Version="0.6.1">
+    <PackageReference Include="DwC-A_dotnet" Version="0.6.2">
       <Aliases>Core</Aliases>
     </PackageReference>
     <PackageReference Include="DwC-A_dotnet.Mapping" Version="0.6.3" />
-    <PackageReference Include="System.CommandLine" Version="2.0.0-beta2.22071.1" />
+    <PackageReference Include="System.CommandLine" Version="2.0.0-beta3.22114.1" />
     <PackageReference Include="microsoft.dotnet.interactive" Version="1.0.0-beta.22070.1" />
+    <PackageReference Include="System.CommandLine.NamingConventionBinder" Version="2.0.0-beta3.22114.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/DwC-A_dotnet.Interactive/Formatters/FileReaderMetaData.cs b/src/DwC-A_dotnet.Interactive/Formatters/FileReaderMetaData.cs
@@ -27,13 +27,13 @@ public static void Register(IFileReader fileReader, TextWriter writer)
             foreach (var field in fileReader.FileMetaData.Fields)
             {
                 var name = span(Terms.ShortName(field.Term));
-                if(fileReader.FileMetaData.Id.IndexSpecified && fileReader.FileMetaData.Id.Index == field.Index)
+                if(field.IndexSpecified && fileReader.FileMetaData.Id.Index == field.Index)
                 {
                     name = span(name, sup(b("*")));
                 }
                 var row = tr(new[]
                 {
-                    td(field.Index),
+                    td(field.IndexSpecified ? field.Index.ToString() : ""),
                     td(name),
                     td(a[href:field.Term](field.Term)),
                     td(field.Vocabulary),
diff --git a/src/DwC-A_dotnet.Interactive/Formatters/RowFormatter.cs b/src/DwC-A_dotnet.Interactive/Formatters/RowFormatter.cs
@@ -27,9 +27,9 @@ public static void Register(IEnumerable<IRow> rows, TextWriter writer)
             foreach(var row in rows)
             {
                 var cells = new List<dynamic>();
-                foreach(var field in row.Fields)
+                foreach(var metaData in fieldMetaData)
                 {
-                    cells.Add(td(field));
+                    cells.Add(td(row[metaData.Term]));
                 }
                 rowList.Add(tr(cells));
             }
diff --git a/src/UnitTests/UnitTests.csproj b/src/UnitTests/UnitTests.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>

Original file line number	Diff line number	Diff line change
`@@ -27,13 +27,13 @@ public static void Register(IFileReader fileReader, TextWriter writer)`
`27`	`27`	`foreach (var field in fileReader.FileMetaData.Fields)`
`28`	`28`	`{`
`29`	`29`	`var name = span(Terms.ShortName(field.Term));`
`30`		`- if(fileReader.FileMetaData.Id.IndexSpecified && fileReader.FileMetaData.Id.Index == field.Index)`
	`30`	`+ if(field.IndexSpecified && fileReader.FileMetaData.Id.Index == field.Index)`
`31`	`31`	`{`
`32`	`32`	`name = span(name, sup(b("*")));`
`33`	`33`	`}`
`34`	`34`	`var row = tr(new[]`
`35`	`35`	`{`
`36`		`- td(field.Index),`
	`36`	`+ td(field.IndexSpecified ? field.Index.ToString() : ""),`
`37`	`37`	`td(name),`
`38`	`38`	`td(a[href:field.Term](field.Term)),`
`39`	`39`	`td(field.Vocabulary),`
Original file line number	Diff line number	Diff line change
`@@ -27,9 +27,9 @@ public static void Register(IEnumerable<IRow> rows, TextWriter writer)`
`27`	`27`	`foreach(var row in rows)`
`28`	`28`	`{`
`29`	`29`	`var cells = new List<dynamic>();`
`30`		`- foreach(var field in row.Fields)`
	`30`	`+ foreach(var metaData in fieldMetaData)`
`31`	`31`	`{`
`32`		`- cells.Add(td(field));`
	`32`	`+ cells.Add(td(row[metaData.Term]));`
`33`	`33`	`}`
`34`	`34`	`rowList.Add(tr(cells));`
`35`	`35`	`}`