Skip to content

Commit

Permalink
#336 update to table and report columns
Browse files Browse the repository at this point in the history
  • Loading branch information
@PiJoCoder
PiJoCoder committed Apr 23, 2024
1 parent 0e64ef7 commit 38226df
Show file tree
Hide file tree
Showing 5 changed files with 269 additions and 79 deletions.
162 changes: 127 additions & 35 deletions NexusReports/Missing_MSIs_or_MSPs_C.rdl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,10 @@
<DataSourceName>DataSource_Private</DataSourceName>
<CommandText>SELECT
ProductName,
Version,
PackageName,
ExpectedInstallerCacheFile
ExpectedInstallerCacheFile,
FileIsPresentInCacheButLikelyCorrupt,
ProductVersion,
PackageName
FROM dbo.tbl_setup_missing_msi_msp_packages</CommandText>
<rd:UseGenericDesigner>true</rd:UseGenericDesigner>
</Query>
Expand All @@ -30,8 +31,8 @@ FROM dbo.tbl_setup_missing_msi_msp_packages</CommandText>
<DataField>ProductName</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
<Field Name="Version">
<DataField>Version</DataField>
<Field Name="FileIsPresentInCacheButLikelyCorrupt">
<DataField>FileIsPresentInCacheButLikelyCorrupt</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
<Field Name="PackageName">
Expand All @@ -42,6 +43,10 @@ FROM dbo.tbl_setup_missing_msi_msp_packages</CommandText>
<DataField>ExpectedInstallerCacheFile</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
<Field Name="ProductVersion">
<DataField>ProductVersion</DataField>
<rd:TypeName>System.String</rd:TypeName>
</Field>
</Fields>
</DataSet>
</DataSets>
Expand Down Expand Up @@ -87,13 +92,16 @@ FROM dbo.tbl_setup_missing_msi_msp_packages</CommandText>
<Width>3.13542in</Width>
</TablixColumn>
<TablixColumn>
<Width>1.23958in</Width>
<Width>3.33333in</Width>
</TablixColumn>
<TablixColumn>
<Width>2.79167in</Width>
<Width>3.27083in</Width>
</TablixColumn>
<TablixColumn>
<Width>1.23958in</Width>
</TablixColumn>
<TablixColumn>
<Width>3.90625in</Width>
<Width>2.79167in</Width>
</TablixColumn>
</TablixColumns>
<TablixRows>
Expand Down Expand Up @@ -144,14 +152,14 @@ FROM dbo.tbl_setup_missing_msi_msp_packages</CommandText>
</TablixCell>
<TablixCell>
<CellContents>
<Textbox Name="textbox3">
<Textbox Name="Textbox6">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>Version</Value>
<Value>Expected Installer Cache File</Value>
<Style>
<FontFamily />
<FontSize>11pt</FontSize>
Expand All @@ -163,7 +171,7 @@ FROM dbo.tbl_setup_missing_msi_msp_packages</CommandText>
<Style />
</Paragraph>
</Paragraphs>
<rd:DefaultName>textbox3</rd:DefaultName>
<rd:DefaultName>Textbox6</rd:DefaultName>
<Style>
<Border>
<Style>None</Style>
Expand All @@ -175,7 +183,6 @@ FROM dbo.tbl_setup_missing_msi_msp_packages</CommandText>
<Style>Solid</Style>
</BottomBorder>
<BackgroundColor>MediumSlateBlue</BackgroundColor>
<FontFamily />
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
Expand All @@ -186,14 +193,14 @@ FROM dbo.tbl_setup_missing_msi_msp_packages</CommandText>
</TablixCell>
<TablixCell>
<CellContents>
<Textbox Name="textbox4">
<Textbox Name="Textbox8">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>Package Name</Value>
<Value>File Is Present In Cache But Likely Corrupt</Value>
<Style>
<FontFamily />
<FontSize>11pt</FontSize>
Expand All @@ -205,7 +212,48 @@ FROM dbo.tbl_setup_missing_msi_msp_packages</CommandText>
<Style />
</Paragraph>
</Paragraphs>
<rd:DefaultName>textbox4</rd:DefaultName>
<rd:DefaultName>Textbox8</rd:DefaultName>
<Style>
<Border>
<Style>None</Style>
</Border>
<TopBorder>
<Style>Solid</Style>
</TopBorder>
<BottomBorder>
<Style>Solid</Style>
</BottomBorder>
<BackgroundColor>MediumSlateBlue</BackgroundColor>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
</CellContents>
</TablixCell>
<TablixCell>
<CellContents>
<Textbox Name="textbox3">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>ProductVersion</Value>
<Style>
<FontFamily />
<FontSize>11pt</FontSize>
<FontWeight>Bold</FontWeight>
<Color>White</Color>
</Style>
</TextRun>
</TextRuns>
<Style />
</Paragraph>
</Paragraphs>
<rd:DefaultName>textbox3</rd:DefaultName>
<Style>
<Border>
<Style>None</Style>
Expand All @@ -228,14 +276,14 @@ FROM dbo.tbl_setup_missing_msi_msp_packages</CommandText>
</TablixCell>
<TablixCell>
<CellContents>
<Textbox Name="textbox5">
<Textbox Name="textbox4">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>Expected Installer Cache File</Value>
<Value>Package Name</Value>
<Style>
<FontFamily />
<FontSize>11pt</FontSize>
Expand All @@ -247,7 +295,7 @@ FROM dbo.tbl_setup_missing_msi_msp_packages</CommandText>
<Style />
</Paragraph>
</Paragraphs>
<rd:DefaultName>textbox5</rd:DefaultName>
<rd:DefaultName>textbox4</rd:DefaultName>
<Style>
<Border>
<Style>None</Style>
Expand Down Expand Up @@ -295,7 +343,7 @@ FROM dbo.tbl_setup_missing_msi_msp_packages</CommandText>
<rd:DefaultName>ProductName</rd:DefaultName>
<Style>
<Border>
<Color>LightGrey</Color>
<Style>None</Style>
</Border>
<BottomBorder>
<Style>Solid</Style>
Expand All @@ -307,18 +355,19 @@ FROM dbo.tbl_setup_missing_msi_msp_packages</CommandText>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
<rd:Selected>true</rd:Selected>
</CellContents>
</TablixCell>
<TablixCell>
<CellContents>
<Textbox Name="Version">
<Textbox Name="ExpectedInstallerCacheFile1">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>=Fields!Version.Value</Value>
<Value>=Fields!ExpectedInstallerCacheFile.Value</Value>
<Style>
<FontFamily />
<Color>#333333</Color>
Expand All @@ -328,33 +377,33 @@ FROM dbo.tbl_setup_missing_msi_msp_packages</CommandText>
<Style />
</Paragraph>
</Paragraphs>
<rd:DefaultName>Version</rd:DefaultName>
<rd:DefaultName>ExpectedInstallerCacheFile1</rd:DefaultName>
<Style>
<Border>
<Color>LightGrey</Color>
<Style>None</Style>
</Border>
<BottomBorder>
<Style>Solid</Style>
</BottomBorder>
<FontFamily />
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
<rd:Selected>true</rd:Selected>
</CellContents>
</TablixCell>
<TablixCell>
<CellContents>
<Textbox Name="PackageName">
<Textbox Name="FileIsPresentInCacheButLikelyCorrupt">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>=Fields!PackageName.Value</Value>
<Value>=Fields!FileIsPresentInCacheButLikelyCorrupt.Value</Value>
<Style>
<FontFamily />
<Color>#333333</Color>
Expand All @@ -364,10 +413,46 @@ FROM dbo.tbl_setup_missing_msi_msp_packages</CommandText>
<Style />
</Paragraph>
</Paragraphs>
<rd:DefaultName>PackageName</rd:DefaultName>
<rd:DefaultName>FileIsPresentInCacheButLikelyCorrupt</rd:DefaultName>
<Style>
<Border>
<Color>LightGrey</Color>
<Style>None</Style>
</Border>
<BottomBorder>
<Style>Solid</Style>
</BottomBorder>
<PaddingLeft>2pt</PaddingLeft>
<PaddingRight>2pt</PaddingRight>
<PaddingTop>2pt</PaddingTop>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
<rd:Selected>true</rd:Selected>
</CellContents>
</TablixCell>
<TablixCell>
<CellContents>
<Textbox Name="ProductVersion">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>=Fields!ProductVersion.Value</Value>
<Style>
<FontFamily />
<Color>#333333</Color>
</Style>
</TextRun>
</TextRuns>
<Style />
</Paragraph>
</Paragraphs>
<rd:DefaultName>ProductVersion</rd:DefaultName>
<Style>
<Border>
<Style>None</Style>
</Border>
<BottomBorder>
<Style>Solid</Style>
Expand All @@ -379,18 +464,19 @@ FROM dbo.tbl_setup_missing_msi_msp_packages</CommandText>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
<rd:Selected>true</rd:Selected>
</CellContents>
</TablixCell>
<TablixCell>
<CellContents>
<Textbox Name="ExpectedInstallerCacheFile">
<Textbox Name="PackageName">
<CanGrow>true</CanGrow>
<KeepTogether>true</KeepTogether>
<Paragraphs>
<Paragraph>
<TextRuns>
<TextRun>
<Value>=Fields!ExpectedInstallerCacheFile.Value</Value>
<Value>=Fields!PackageName.Value</Value>
<Style>
<FontFamily />
<Color>#333333</Color>
Expand All @@ -400,10 +486,10 @@ FROM dbo.tbl_setup_missing_msi_msp_packages</CommandText>
<Style />
</Paragraph>
</Paragraphs>
<rd:DefaultName>ExpectedInstallerCacheFile</rd:DefaultName>
<rd:DefaultName>PackageName</rd:DefaultName>
<Style>
<Border>
<Color>LightGrey</Color>
<Style>None</Style>
</Border>
<BottomBorder>
<Style>Solid</Style>
Expand All @@ -415,6 +501,7 @@ FROM dbo.tbl_setup_missing_msi_msp_packages</CommandText>
<PaddingBottom>2pt</PaddingBottom>
</Style>
</Textbox>
<rd:Selected>true</rd:Selected>
</CellContents>
</TablixCell>
</TablixCells>
Expand All @@ -427,6 +514,7 @@ FROM dbo.tbl_setup_missing_msi_msp_packages</CommandText>
<TablixMember />
<TablixMember />
<TablixMember />
<TablixMember />
</TablixMembers>
</TablixColumnHierarchy>
<TablixRowHierarchy>
Expand All @@ -452,15 +540,19 @@ FROM dbo.tbl_setup_missing_msi_msp_packages</CommandText>
<DataSetName>DataSet1</DataSetName>
<Top>0.73208in</Top>
<Height>0.73208in</Height>
<Width>11.07292in</Width>
<Width>13.77084in</Width>
<ZIndex>1</ZIndex>
<Style />
</Tablix>
</ReportItems>
<Height>2.86in</Height>
<Style />
<Style>
<Border>
<Style>None</Style>
</Border>
</Style>
</Body>
<Width>11.71875in</Width>
<Width>14.17709in</Width>
<Page>
<LeftMargin>1in</LeftMargin>
<RightMargin>1in</RightMargin>
Expand Down
7 changes: 4 additions & 3 deletions RowsetImportEngine/TextRowsets.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4349,12 +4349,13 @@
</KnownColumns>
</Rowset>

<Rowset name="tbl_setup_missing_msi_msp_packages" enabled="true" identifier="-- missing installer msi or msp packages --" type="RowsetImportEngine.TextRowset">
<Rowset name="tbl_setup_missing_msi_msp_packages" enabled="true" identifier="-- missing or corrupt installer msi or msp packages --" type="RowsetImportEngine.TextRowset">
<KnownColumns>
<Column name="ProductName" type="RowsetImportEngine.NVarCharColumn" length="65" />
<Column name="Version" type="RowsetImportEngine.VarCharColumn" length="14" />
<Column name="ExpectedInstallerCacheFile" type="RowsetImportEngine.NVarCharColumn" length="52" />
<Column name="FileIsPresentInCacheButLikelyCorrupt" type="RowsetImportEngine.NVarCharColumn" length="52" />
<Column name="ProductVersion" type="RowsetImportEngine.VarCharColumn" length="14" />
<Column name="PackageName" type="RowsetImportEngine.NVarCharColumn" length="32" />
<Column name="ExpectedInstallerCacheFile" type="RowsetImportEngine.NVarCharColumn" length="70" />
</KnownColumns>
</Rowset>
</KnownRowsets>
Expand Down
Loading

0 comments on commit 38226df

Please sign in to comment.