Added Feature Request

+ add Variable: %DATE
c3rebro · May 27, 2022 · 876c00a · 876c00a
1 parent 3655237
commit 876c00a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/RFiDGear/ViewModel/TaskSetupViewModels/CommonTaskViewModel.cs b/RFiDGear/ViewModel/TaskSetupViewModels/CommonTaskViewModel.cs
@@ -876,7 +876,13 @@ private void OnNewWriteReportCommand(ReportReaderWriter _reportReaderWriter)
 								hasVariable = true;
 							}
 
-                            if (temporaryContent.Contains("%FREEMEM"))
+							if (temporaryContent.Contains("%DATE"))
+							{
+								temporaryContent = temporaryContent.Replace("%DATE", DateTime.Now.ToString("dd/MM/yyyy") ?? "");
+								hasVariable = true;
+							}
+
+							if (temporaryContent.Contains("%FREEMEM"))
                             {
 								temporaryContent = temporaryContent.Replace("%FREEMEM", GenericChip.FreeMemory.ToString() ?? "");
 								hasVariable = true;

diff --git a/RFiDGearBundleSetup/Bundle.wxs b/RFiDGearBundleSetup/Bundle.wxs
@@ -20,7 +20,7 @@
 	<?define ISLOG_RegistrySearch_Value = "C:\Program Files (x86)\Common Files\ISLOG\LibLogicalAccess\1.87.3.0214\liblogicalaccess.com.dll" ?>
 	<?endif ?>
 
-	<Bundle Name="$(var.RFiDGear.ProjectName)" Version="$(var.VersionNumber)" Manufacturer="Messgeraetetechnik Hansen" UpgradeCode="$(var.UpgradeCode)" Copyright="Messgeraetetechnik Hansen 2018" IconSourceFile="$(var.RFiDGear.ProjectDir)Resources\logo.ico" AboutUrl="http://rfidgear.hyperstack.de">
+	<Bundle Name="$(var.RFiDGear.ProjectName)" Version="$(var.VersionNumber)" Manufacturer="Messgeraetetechnik Hansen" UpgradeCode="$(var.UpgradeCode)" Copyright="Messgeraetetechnik Hansen 2022" IconSourceFile="$(var.RFiDGear.ProjectDir)Resources\logo.ico" AboutUrl="http://rfidgear.hyperstack.de">
 		<BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.RtfLicense">
 			<bal:WixStandardBootstrapperApplication LicenseFile="$(var.RFiDGear.ProjectDir)Resources\gpl_v3_license.rtf" LogoFile="setuplogo.ico" ThemeFile="rtftheme.xml"/>
 		</BootstrapperApplicationRef>