Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improved the column right-click menu and the Edit Cell dialog #8367

Merged
merged 19 commits into from Jul 6, 2023
Merged

Improved the column right-click menu and the Edit Cell dialog #8367

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
3c6e23f
Design changes in the new Edit Cell Dialogue
derekagorhom Jun 5, 2023
5f62db6
Minor Code changes
derekagorhom Jun 5, 2023
2e41dd0
Design changes
derekagorhom Jun 5, 2023
eb29f45
Design Changes
derekagorhom Jun 6, 2023
292b951
Minor Design Changes
derekagorhom Jun 6, 2023
20781a6
Changes
derekagorhom Jun 6, 2023
9b15273
Design Changes
derekagorhom Jun 6, 2023
ebf01d0
Design changes and adding Data option to edit dialog
derekagorhom Jun 12, 2023
690a4b7
Additional Changes
derekagorhom Jun 15, 2023
383c838
Layout Changes
derekagorhom Jun 15, 2023
eeb1694
Code Changes
derekagorhom Jun 15, 2023
2761f1d
Added Logical control to the dialog
derekagorhom Jun 16, 2023
4bc89ce
Code changes
derekagorhom Jun 20, 2023
454b638
code changes on ucrdataview with regards to ucrselector not picking t…
derekagorhom Jun 21, 2023
3c1e8d9
Code Changes
derekagorhom Jun 22, 2023
3d3ca68
Minor Changes
derekagorhom Jun 22, 2023
b6f3401
Minor code improvement
N-thony Jul 4, 2023
a658544
Merge pull request #50 from N-thony/insert_row
derekagorhom Jul 5, 2023
79a2852
Code Improvements
derekagorhom Jul 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
97 changes: 57 additions & 40 deletions instat/dlgEdit.Designer.vb
View file
Open in desktop

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

20 changes: 16 additions & 4 deletions instat/dlgEdit.vb
View file
Open in desktop
Expand Up @@ -52,17 +52,17 @@ Public Class dlgEdit
ucrSelectValues.SetParameterIsString()

ucrReceiverName.SetParameter(New RParameter("column_name", 1))
ucrReceiverName.Selector = ucrSelectValues
ucrReceiverName.SetParameterIsString()

ucrNewName.SetParameter(New RParameter("new_value", 2))
ucrNewName.SetValidationTypeAsList()


ucrInputRows.SetFactorReceiver(ucrReceiverName)
ucrInputRows.SetParameter(New RParameter("new_value", 3))
ucrInputRows.strQuotes = ""

ucrDate.SetParameter(New RParameter("new_value", 3))
ucrDate.SetParameterIsRDate()

ucrInputRows.SetLinkedDisplayControl(lblNewValue)
End Sub
Expand All @@ -72,7 +72,7 @@ Public Class dlgEdit
ucrSelectValues.Reset()

clsReplaceValue.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$replace_value_in_data")
clsReplaceValue.AddParameter("data_name", Chr(34) & ucrSelectValues.strCurrentDataFrame & Chr(34), iPosition:=0)
clsReplaceValue.AddParameter("data_name", Chr(34) & ucrSelectValues.strCurrDataFrame & Chr(34), iPosition:=0)
clsReplaceValue.AddParameter("col_name", Chr(34) & strSelectedColumn & Chr(34), iPosition:=1)
clsReplaceValue.AddParameter("rows", Chr(34) & strRowIndex & Chr(34), iPosition:=2)
ucrBase.clsRsyntax.SetBaseRFunction(clsReplaceValue)
Expand All @@ -83,6 +83,12 @@ Public Class dlgEdit
ucrSelectValues.SetRCode(clsReplaceValue, bReset)
ucrNewName.SetRCode(clsReplaceValue, bReset)
ucrInputRows.SetRCode(clsReplaceValue, bReset)

ucrDate.SetRCode(clsReplaceValue, bReset)
If bReset Then
'Default start date to 1 Jan.
ucrDate.DateValue = New Date(Date.Now.Year, "1", "1")
End If
End Sub

Private Sub TestOKEnabled()
Expand All @@ -103,7 +109,7 @@ Public Class dlgEdit
bUseSelectedColumn = False
End Sub

Private Sub ucrCoreControls_ControlContentsChanged() Handles ucrNewName.ControlContentsChanged, ucrReceiverName.ControlContentsChanged, ucrRowNumber.ControlContentsChanged, ucrInputRows.ControlContentsChanged, ucrReceiverRow.ControlContentsChanged
Private Sub ucrCoreControls_ControlContentsChanged() Handles ucrNewName.ControlContentsChanged, ucrReceiverName.ControlContentsChanged, ucrRowNumber.ControlContentsChanged, ucrInputRows.ControlContentsChanged, ucrReceiverRow.ControlContentsChanged, ucrDate.ControlContentsChanged
TestOKEnabled()
End Sub

Expand All @@ -115,8 +121,11 @@ Public Class dlgEdit
End Sub

Private Sub ucrReceiverName_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverName.ControlValueChanged, ucrInputRows.ControlValueChanged

If Not ucrReceiverName.IsEmpty Then
ucrNewName.Visible = ucrInputRows.IsEmpty
ucrDate.Visible = False

End If
End Sub

Expand All @@ -132,4 +141,7 @@ Public Class dlgEdit
End If
End Sub

Private Sub ucrCoreControls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrRowNumber.ControlContentsChanged, ucrReceiverRow.ControlContentsChanged, ucrReceiverName.ControlContentsChanged, ucrNewName.ControlContentsChanged, ucrInputRows.ControlContentsChanged, ucrDate.ControlContentsChanged

End Sub
End Class