Merge pull request #31 from africanmathsinitiative/master

Update Master

.github/workflows/CreateInstaller.yml

@@ -74,14 +74,24 @@ jobs:
         version: "${{ inputs.major_version }}.${{ inputs.minor_version }}.${{ inputs.build_no }}.${env:BUILD_NUMBER}"
 
     # Create the app package by building and packaging the Windows Application Packaging project
-    #Same output for 64bit and 32 bit 
-    - name: Create the app package
+    # 32 bit 
+    - name: Create the app package 32bit
       run: msbuild $env:Solution_Name /p:Configuration=$env:Configuration /p:AppxBundlePlatforms=$env:Appx_Bundle_Platforms /p:UapAppxPackageBuildMode=$env:Appx_Package_Build_Mode /p:AppxBundle=$env:Appx_Bundle /p:PackageCertificateKeyFile=GitHubActionsWorkflow.pfx /p:PackageCertificatePassword=${{ secrets.Pfx_Key }}
       env:
         Appx_Bundle: Always
-        Appx_Bundle_Platforms: x64|x86
+        Appx_Bundle_Platforms: x86
         Appx_Package_Build_Mode: StoreUpload
         Configuration: ${{ matrix.configuration }}      
+
+    # Create the app package by building and packaging the Windows Application Packaging project
+    # 64bit  
+    - name: Create the app package 64 bit
+      run: msbuild $env:Solution_Name /p:Configuration=$env:Configuration /p:Platform=x64 /p:UapAppxPackageBuildMode=$env:Appx_Package_Build_Mode /p:AppxBundle=$env:Appx_Bundle /p:PackageCertificateKeyFile=GitHubActionsWorkflow.pfx /p:PackageCertificatePassword=${{ secrets.Pfx_Key }}
+      env:
+        Appx_Bundle: Always
+        Appx_Bundle_Platforms: x64
+        Appx_Package_Build_Mode: StoreUpload
+        Configuration: ${{ matrix.configuration }}   
 
     # Create directory and copy over application to a 32bit folder
     # There is no difference in R instat other than the packaged R
@@ -133,11 +143,11 @@ jobs:
     # Create directory and copy over InstatData (64bit)
     - name: Make Library directory 64 bit
       run: |
-        MKDIR instat\bin\Release\static\Library\  
+        MKDIR instat\bin\x64\Release\static\Library\  
   
     - name: Copy R-Instat Data 64 bit
       run: |
-        ROBOCOPY InstatData\data\ instat\bin\Release\static\Library\ /E
+        ROBOCOPY InstatData\data\ instat\bin\x64\Release\static\Library\ /E
       continue-on-error: true
 
     # Create directory and copy over InstatData (32bit)
@@ -160,7 +170,7 @@ jobs:
 
     - name: Copy R 64 bit
       run: |
-        ROBOCOPY R-RInstat\64Bit\ instat\bin\Release\static\ /E
+        ROBOCOPY R-RInstat\64Bit\ instat\bin\x64\Release\static\ /E
       continue-on-error: true      
 
     - name: Copy R 32 bit
@@ -170,7 +180,7 @@ jobs:
 
     - name: Install R packages (64 bit)
       run: |
-        "instat\bin\Release\static\R\bin\Rscript.exe" "instat\static\InstatObject\R\InstallPackages.R"
+        "instat\bin\x64\Release\static\R\bin\Rscript.exe" "instat\static\InstatObject\R\InstallPackages.R"
       shell: cmd     
 
     - name: Building the installer 64bit - With R
@@ -187,7 +197,7 @@ jobs:
 
     - name: Remove 64 bit release files to free up space
       run: |
-        Remove-Item "instat\bin\Release\" -Recurse
+        Remove-Item "instat\bin\x64\Release\" -Recurse
             
     - name: Remove 64 innosetup to free up space
       run: |

docs/Download.html

@@ -76,13 +76,23 @@
   <section class="bg-primary" id="about">
       <div class="container">
           <div class="row">
-              <div class="col-lg-8 col-lg-offset-2 text-center">
+              <div class="col-lg-8 col-lg-offset-2 text-center">                 
                   <h2 class="section-heading">Download R-Instat</h2>
-                  <p><strong>In response to the recent <a href=https://r4stats.com/articles/software-reviews/r-instat/ style="color:blue;" target="_blank">review of R-Instat</a> by Bob Muenchen we have released a new version of R-Instat, version 0.7.5, which includes some new features and initial improvements from the review. Many thanks to Bob for reviewing R-Instat.</strong></p>
+                  <p><strong>In response to the recent <a href="https://r4stats.com/articles/software-reviews/r-instat/" style="color:blue;" target="_blank">review of R-Instat</a>
+                  by Bob Muenchen we continue to develop new versions of R-Instat. Many thanks to Bob for reviewing R-Instat.</strong></p>
                   <hr class="light">
-                  <p><a href=https://downloads.r-instat.org/R-Instat_0.7.6_Installer_32.exe style="color:blue;" target="_blank">R-Instat 0.7.6 Installer 32 Bit (.exe 802MB)</a></p>
+                  <h3>Latest stable release 0.7.6</h3>
+                  <p><a href="https://downloads.r-instat.org/R-Instat_0.7.6_Installer_32.exe" style="color:blue;" target="_blank">32 Bit Installer (.exe 802MB)</a></p>
+                  <p><a href="https://downloads.r-instat.org/R-Instat_0.7.6_Installer_64.exe" style="color:blue;" target="_blank">64 Bit Installer (.exe 802MB)</a></p>
+                  <p></p>
                   <p>If you know that you have a 64 bit computer, we suggest you download the 64 Bit version</p>
-                  <a href=https://downloads.r-instat.org/R-Instat_0.7.6_Installer_64.exe style="color:blue;" target="_blank">R-Instat 0.7.6 Installer 64 Bit (.exe 802MB)</a>
+                  <hr class="light">
+                  <h3>Other releases (beta)</h3>
+                  <h4>0.7.8</h4>
+                  <p>
+                    <a href="https://downloads.r-instat.org/R-Instat_0_7_8_Installer_32.exe" style="color:blue;" target="_blank">32 Bit (.exe 780MB)</a> |
+                    <a href="https://downloads.r-instat.org/R-Instat_0_7_8_Installer_64.exe" style="color:blue;" target="_blank">64 Bit (.exe 912MB)</a>
+                  </p>
                   <p>R-Instat is currently a Windows only application. However, it can be accessed on Mac or Linux through use of a Virtual Windows Machine.</p>
 
                   <h2 class="section-heading">Installation & Documentation</h2>

inno_install_script_64bit.iss

@@ -28,8 +28,8 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{
 Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; OnlyBelowVersion: 0
 
 [Files]
-Source: "instat\bin\Release\instat.exe"; DestDir: "{app}"; Flags: ignoreversion
-Source: "instat\bin\Release\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "instat\bin\x64\Release\instat.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: "instat\bin\x64\Release\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Icons]

instat/dlgName.vb

@@ -546,4 +546,16 @@ Public Class dlgName
     Private Sub ucrCoreControls_ControlContentsChanged() Handles ucrInputNewName.ControlContentsChanged, ucrReceiverName.ControlContentsChanged, ucrPnlOptions.ControlContentsChanged
         TestOKEnabled()
     End Sub
+
+    Private Sub grdCurrentWorkSheet_CellEditTextChanging(sender As Object, e As CellEditTextChangingEventArgs) Handles grdCurrentWorkSheet.CellEditTextChanging
+        If grdCurrentWorkSheet.ColumnCount > 0 Then
+            Dim iCol As Integer = e.Cell.Column
+            Dim parsedValue As Boolean
+            Dim strNewData As String = ValidateRVariable(e.Text, iCol)
+            If Not strNewData.ToLower.Equals("t") AndAlso Not strNewData.ToLower.Equals("f") AndAlso Not IsNumeric(strNewData) AndAlso Not Boolean.TryParse(strNewData, parsedValue) Then
+                RenameColumns(strNewData, e.Cell.Row, iCol)
+                ValidateNamesFromDictionary(iCol)
+            End If
+        End If
+    End Sub
 End Class