Skip to content

Commit

Permalink
3.5.7.0-Leisure
Browse files Browse the repository at this point in the history
Gridcoin Research 3.5.7.0/MSI=40.5
Leisure Upgrade

- Advanced | Foundation | Expense Reimbursement Request:  Added Username
maintenance page to set your username.  Added Expense Amount to Add,
View and List pages.  Fixed Expense Title width.  Corrected problem with

submitting new expenses (preventing the Expense View page from working).
- Fixed GRCRestarter block downloader percentage value (where it could
exceed 100%).
- Block Syncing: Fixed a long standing bug where the wallet randomly
stops asking for the best block.  Additionally, when out of sync it will
ask for missing blocks periodically.  Made wallet more aware of clusters
of orphans.
- Added 'execute restartclient' for windows for debugging.
- Modified getmininginfo and overview for Investors to say Staking
Interest (instead of Boinc Mining) and removed Boinc Projects Exhaused
for Investors.  Removed Unable To Mine message for Investors.
- Moved unecessary logging to fDebug10=true.  Added message to show the
condition when Process Block succeeds and Set Best Chain fails.
- Added execute askforoutstandingblocks for debugging.
  • Loading branch information
gridcoin committed Jul 21, 2016
1 parent 7167d32 commit 28c6849
Show file tree
Hide file tree
Showing 25 changed files with 762 additions and 117 deletions.
1 change: 0 additions & 1 deletion Makefile.Debug
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#############################################################################
# Makefile for building: gridcoinresearch
# Generated by qmake (2.01a) (Qt 4.8.4) on: Sun Jul 10 18:30:27 2016
# Project: gridcoinresearch.pro
# Template: app
#############################################################################
Expand Down
1 change: 0 additions & 1 deletion Makefile.Release
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#############################################################################
# Makefile for building: gridcoinresearch
# Generated by qmake (2.01a) (Qt 4.8.4) on: Sun Jul 10 18:30:28 2016
# Project: gridcoinresearch.pro
# Template: app
#############################################################################
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -139,23 +139,24 @@ Public Class GridcoinUpgrader
rtbNotes.Visible = False
Me.Height = rtbNotes.Top + txtStatus.Height - 25
Me.BackgroundImageLayout = ImageLayout.Tile


RefreshScreen()
ProgressBar1.Maximum = 100
TimerUE.Enabled = True
Dim sz As Long
sz = GetWebFileSize("snapshot.zip", "signed", True)
If sz < 20000000 Then sz = 477461000
If sz < 20000000 Then sz = 500461000 'If we dont receive the filesize...
'This is an asynchronous process:
DownloadBlocks("snapshot.zip", "signed/")
While Not mbFinished
System.Threading.Thread.Sleep(800)
Dim p As Double = 0
p = Math.Round(GetFilePercent("snapshot.zip", sz) * 100, 2)
If p > 99.99 Then p = 99.99
lblPercent.Text = Trim(p) + "%"
RefreshScreen()
End While
lblPercent.Text = "100.00%"
RefreshScreen()
TimerUE.Enabled = False
txtStatus.Text = "Unzipping Blocks File..."
RefreshScreen()
Expand All @@ -180,7 +181,7 @@ Public Class GridcoinUpgrader
Me.Show()
txtStatus.Text = "Waiting for Gridcoin Wallet to exit..."
Me.Update() : Me.Refresh()
BusyWaitLoop("gridcoinresearch*", 10, True)
BusyWaitLoop("gridcoinresearch*", 12, True)
StartGridcoin()
Environment.Exit(0)
End
Expand Down
8 changes: 4 additions & 4 deletions contrib/Installer/GridcoinInstaller/GridcoinResearch.vdproj
Original file line number Diff line number Diff line change
Expand Up @@ -1120,19 +1120,19 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:Gridcoin Research"
"ProductCode" = "8:{1B5B36AC-1133-4B90-9DDD-FB78D681EF74}"
"PackageCode" = "8:{0FEACEFB-73C9-48EB-A9A6-1B764B5D1225}"
"ProductCode" = "8:{E6621A89-4C37-45A1-AC3F-DD5E299C02C9}"
"PackageCode" = "8:{BC3D09B4-C005-4A03-AB29-585E10E7FEA5}"
"UpgradeCode" = "8:{9617E9EA-252F-43CE-B53E-B48C85F71192}"
"AspNetVersion" = "8:4.0.30319.0"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:FALSE"
"InstallAllUsers" = "11:TRUE"
"ProductVersion" = "8:40.4"
"ProductVersion" = "8:40.5"
"Manufacturer" = "8:GridcoinResearch"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:"
"Title" = "8:Gridcoin Research 40.4"
"Title" = "8:Gridcoin Research 40.5"
"Subject" = "8:"
"ARPCONTACT" = "8:The Gridcoin Developers"
"Keywords" = "8:Gridcoin Research"
Expand Down
10 changes: 10 additions & 0 deletions contrib/Installer/boinc/boinc/boincstake.vbproj
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,12 @@
<Compile Include="clsBoincProjectDownload.vb" />
<Compile Include="clsMailFunctions.vb" />
<Compile Include="clsQuorumHashingAlgorithm.cls" />
<Compile Include="frmUsername.Designer.vb">
<DependentUpon>frmUsername.vb</DependentUpon>
</Compile>
<Compile Include="frmUsername.vb">
<SubType>Form</SubType>
</Compile>
<Compile Include="frmDiagnostics.Designer.vb">
<DependentUpon>frmDiagnostics.vb</DependentUpon>
</Compile>
Expand Down Expand Up @@ -293,6 +299,10 @@
</Compile>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="frmUsername.resx">
<DependentUpon>frmUsername.vb</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="frmDiagnostics.resx">
<DependentUpon>frmDiagnostics.vb</DependentUpon>
</EmbeddedResource>
Expand Down
2 changes: 1 addition & 1 deletion contrib/Installer/boinc/boinc/frmAddExpense.Designer.vb

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 13 additions & 13 deletions contrib/Installer/boinc/boinc/frmAddExpense.vb
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,14 @@ Public Class frmAddExpense

Private Sub frmTicketAdd_Load(sender As System.Object, e As System.EventArgs) Handles MyBase.Load
mGRCData = New GRCSec.GridcoinData
sHandle = mGRCData.GetHandle(GetSessionGuid)

sHandle = KeyValue("TicketHandle")

Try
If Mode <> "View" Then
If sHandle = "" Or mGRCData.IsAuthenticated(GetSessionGuid) = False Then
If mfrmLogin Is Nothing Then
mfrmLogin = New frmLogin
End If
mfrmLogin.Show()
If sHandle = "" Then
MsgBox("Click <OK> to populate your GridCoin Username.", MsgBoxStyle.Critical)
Dim frmU As New frmUserName
frmU.Show()
Me.Dispose()
Exit Sub
End If
Expand All @@ -32,6 +30,10 @@ Public Class frmAddExpense
If Mode = "View" Then
'Depersist from GFS
Dim oExpense As SqlDataReader = mGRCData.GetBusinessObject("Expense", txtTicketId.Text, "ExpenseID")
If oExpense.HasRows = False Then
MsgBox("Sorry, this expense does not exist.", MsgBoxStyle.Critical)
Exit Sub
End If
txtDescription.Text = oExpense("Descript")
txtAmount.Text = Trim(oExpense("Amount"))
txtAttachment.Text = Trim("" & oExpense("AttachmentName"))
Expand Down Expand Up @@ -148,12 +150,10 @@ Public Class frmAddExpense
Exit Sub
End If
'if they are not logged on... throw an error ... 4-22-2016
If sHandle = "" Or mGRCData.IsAuthenticated(GetSessionGuid) = False Then
MsgBox("Please authenticate first. After logging in you may re-submit the form.", MsgBoxStyle.Critical, "Not Logged In")
If mfrmLogin Is Nothing Then
mfrmLogin = New frmLogin
End If
mfrmLogin.Show()
If sHandle = "" Then
MsgBox("Please create a user name first. After logging in you may re-submit the form.", MsgBoxStyle.Critical, "Not Logged In")
Dim frmU1 As New frmUserName
frmU1.Show()
Exit Sub
End If

Expand Down
10 changes: 5 additions & 5 deletions contrib/Installer/boinc/boinc/frmFoundation.Designer.vb

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 5 additions & 7 deletions contrib/Installer/boinc/boinc/frmFoundation.vb
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,7 @@ Public Class frmFoundation
dgv.ReadOnly = True

Dim vHeading() As String = Split(sHeading, ";")

PopulateHeadings(vHeading, dgv, True)
'4-22-2016

Dim iRow As Long = 0
Dim vPolls() As String = Split(sVoting, "<POLL>")

Expand All @@ -39,30 +36,30 @@ Public Class frmFoundation
For y As Integer = 0 To UBound(vPolls)
vPolls(y) = Replace(vPolls(y), "_", " ")
Dim sTitle As String = ExtractXML(vPolls(y), "<TITLE>", "</TITLE>")
sTitle = Replace(sTitle, "expensesubmission", "Expense Submission: ")

Dim sExpiration As String = ExtractXML(vPolls(y), "<EXPIRATION>")
Dim sShareType As String = ExtractXML(vPolls(y), "<SHARETYPE>")
Dim sQuestion As String = ExtractXML(vPolls(y), "<QUESTION>")
Dim sAnswers As String = ExtractXML(vPolls(y), "<ANSWERS>")
Dim sId As String = GetFoundationGuid(sTitle)
If Len(sId) > 0 Then
Dim lDateDiff As Long = DateDiff(DateInterval.Day, Now, GlobalCDate(sExpiration))
If Len(sTitle) > 0 And lDateDiff > -7 Then
If Len(sTitle) > 0 And lDateDiff > -7 And Not sTitle.Contains("00000") Then
'Array of answers
Dim sArrayOfAnswers As String = ExtractXML(vPolls(y), "<ARRAYANSWERS>")
Dim vAnswers() As String = Split(sArrayOfAnswers, "<RESERVED>")
For subY As Integer = 0 To vAnswers.Length - 1
Dim sAnswerName As String = ExtractXML(vAnswers(subY), "<ANSWERNAME>")
Dim sParticipants As String = ExtractXML(vAnswers(subY), "<PARTICIPANTS>")
Dim sShares As String = ExtractXML(vAnswers(subY), "<SHARES>")

Next
Dim sTotalParticipants As String = ExtractXML(vPolls(y), "<TOTALPARTICIPANTS>")
Dim sTotalShares As String = ExtractXML(vPolls(y), "<TOTALSHARES>")
Dim sBestAnswer As String = ExtractXML(vPolls(y), "<BESTANSWER>")
dgv.Rows.Add()
dgv.Rows(iRow).Cells(0).Value = iRow + 1
dgv.Rows(iRow).Cells(1).Value = sTitle
' If Len(sTitle) > 65 Then dgv.Rows(iRow).Cells(1).Value += "..."
dgv.Rows(iRow).Cells(2).Value = sExpiration
If lDateDiff < 0 Then dgv.Rows(iRow).Cells(2).Style.BackColor = Drawing.Color.Red
dgv.Rows(iRow).Cells(3).Value = sShareType
Expand All @@ -88,7 +85,7 @@ Public Class frmFoundation

Next
dgv.Columns(1).AutoSizeMode = DataGridViewAutoSizeColumnMode.None
dgv.Columns(1).Width = 350
dgv.Columns(1).Width = 425

Catch ex As Exception
Log(ex.Message)
Expand Down Expand Up @@ -171,6 +168,7 @@ Public Class frmFoundation
Catch ex As Exception
Log("guid " + ex.Message)
End Try

frmE.myGuid = sGuid
frmE.Show()
End If
Expand Down
95 changes: 95 additions & 0 deletions contrib/Installer/boinc/boinc/frmUsername.Designer.vb

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 28c6849

Please sign in to comment.