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

updated my branch #509

Merged
merged 59 commits into from
Dec 2, 2024
Merged

updated my branch #509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
23f5a73
changes
Vitalis95 Oct 18, 2024
303f489
changes
Vitalis95 Oct 21, 2024
2946b01
changes
Vitalis95 Oct 22, 2024
a5e0907
changes to the code
Vitalis95 Oct 22, 2024
52b52af
changes to the code
Vitalis95 Oct 23, 2024
82a1c90
changes
Vitalis95 Oct 24, 2024
42ac1aa
Merge pull request #293 from IDEMSInternational/master
Vitalis95 Oct 29, 2024
64cabbc
Merge pull request #294 from IDEMSInternational/master
Vitalis95 Oct 29, 2024
9659fff
Merge pull request #295 from IDEMSInternational/master
Vitalis95 Oct 30, 2024
45ea01d
changes
Vitalis95 Nov 5, 2024
f84cd04
Merge pull request #297 from IDEMSInternational/master
Vitalis95 Nov 11, 2024
dab3418
Merge pull request #298 from IDEMSInternational/master
Vitalis95 Nov 11, 2024
161f4e5
changes to the code
Vitalis95 Nov 11, 2024
a6781b7
Added a drop down and implemented the file option to the Help menu Icon
derekagorhom Nov 11, 2024
0d70381
Set No loaded data text correctly after auto saving
N-thony Nov 12, 2024
a0c8ec9
Update summary_functions.R
lilyclements Nov 12, 2024
2965d1f
Changes in the Summary dialogs
derekagorhom Nov 12, 2024
e61f901
Merge pull request #299 from lilyclements/amending_variable_names_for…
Vitalis95 Nov 12, 2024
e3cf805
Code changes
derekagorhom Nov 12, 2024
09fad50
minor code change
N-thony Nov 13, 2024
f9ae18b
Code changes
derekagorhom Nov 13, 2024
76523ad
Created a dropdown for the Dataview button
derekagorhom Nov 13, 2024
ea55158
changes to the code
Vitalis95 Nov 13, 2024
1eb8799
changes
Vitalis95 Nov 13, 2024
24efb05
changes made
Vitalis95 Nov 13, 2024
f61dc68
Merge pull request #9246 from N-thony/ifx_no_data_loaded
Patowhiz Nov 14, 2024
301b507
Merge pull request #9245 from derekagorhom/ToolBar_DesignChanges
N-thony Nov 14, 2024
5014510
Merge branch 'master' into Changes_Column_Summaries
derekagorhom Nov 14, 2024
9e1d534
Changes in the calculations.R
derekagorhom Nov 14, 2024
1131867
Merge pull request #9250 from derekagorhom/Changes_Column_Summaries
N-thony Nov 14, 2024
144e1f2
Fixing sort for descending
lilyclements Nov 14, 2024
98833d7
changes
Vitalis95 Nov 14, 2024
fb71452
Merge pull request #300 from IDEMSInternational/master
Vitalis95 Nov 14, 2024
0a1ad32
changes to the code
Vitalis95 Nov 14, 2024
a8d5cc0
Merge pull request #9258 from Vitalis95/summary_tablesdialog
Patowhiz Nov 15, 2024
7c48740
Added gtextras package name
conlooptechnologies Nov 15, 2024
5077a34
Refactored the code
conlooptechnologies Nov 15, 2024
fc272e9
Merge pull request #9261 from Patowhiz/tables_gtextras
N-thony Nov 15, 2024
a332b18
Merge pull request #9257 from lilyclements/sort_dataframe
N-thony Nov 15, 2024
4c6ade9
Fixed bug in Labels dialogue
derekagorhom Nov 15, 2024
d6b907f
Merge pull request #9262 from derekagorhom/Changes_Column_Summaries
N-thony Nov 15, 2024
d71a1c4
changes to the code
Vitalis95 Nov 18, 2024
153fec3
changes to the code
Vitalis95 Nov 19, 2024
f2af4e8
changes
Vitalis95 Nov 25, 2024
2e1d170
changes to the code
Vitalis95 Nov 25, 2024
43a1733
rename with improvements
Fidel365 Nov 26, 2024
4eb101f
Merge pull request #301 from IDEMSInternational/master
Vitalis95 Nov 26, 2024
1a39a29
changes
Vitalis95 Nov 26, 2024
7404912
Merge branch 'IDEMSInternational:master' into namedialog
Fidel365 Nov 26, 2024
3ee9b3d
changes to the code
Vitalis95 Nov 26, 2024
2f222a5
Update release-build.yml
ChrisMarsh82 Nov 26, 2024
0d1280d
Merge pull request #9277 from Vitalis95/changing_labels
N-thony Nov 27, 2024
420906c
Merge branch 'master' into 2_3Varsummaries
Vitalis95 Nov 27, 2024
6d8f1cd
changes to the code
Vitalis95 Nov 27, 2024
26eb99a
code improvements
Fidel365 Nov 27, 2024
2afce42
Merge branch 'namedialog' of https://github.com/Fidel365/R-Instat int…
Fidel365 Nov 27, 2024
fb25373
Merge pull request #9278 from Fidel365/namedialog
N-thony Nov 28, 2024
39f452c
changes
Vitalis95 Nov 28, 2024
9391ca3
Merge pull request #9197 from Vitalis95/2_3Varsummaries
N-thony Nov 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/release-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ jobs:
- name: Checkout Instat Data
uses: actions/checkout@v3
with:
repository: ' africanmathsinitiative/R-Instat-Data'
repository: ' IDEMSInternational/R-Instat-Data'
fetch-depth: 0
path: 'InstatData'

Expand Down
21 changes: 4 additions & 17 deletions instat/UserTables/sdgTableOptions.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,25 +76,12 @@ Public Class sdgTableOptions
' Themes

Private Sub SetupTheme(clsOperator As ROperator)
clsThemeRFunction = New RFunction

' Uncheck then the check radio button to forces the panel to raise its ControlValueChanged event
rdoSelectTheme.Checked = False
rdoSelectTheme.Checked = True

If Not clsOperator.ContainsParameter("theme_format") Then
Exit Sub
End If

clsThemeRFunction = clsOperator.GetParameter("theme_format").clsArgumentCodeStructure

If clsThemeRFunction.strRCommand = "tab_options" Then
rdoManualTheme.Checked = True
If clsOperator.ContainsParameter("theme_format") Then
clsThemeRFunction = clsOperator.GetParameter("theme_format").clsArgumentCodeStructure
Else
rdoSelectTheme.Checked = True
ucrCboSelectThemes.SetName(clsThemeRFunction.strRCommand)
clsThemeRFunction = New RFunction
clsThemeRFunction.SetPackageName("gtExtras")
End If

End Sub

Private Sub ucrPnlThemes_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlThemesPanel.ControlValueChanged
Expand Down
3 changes: 1 addition & 2 deletions instat/dlgClimaticSummary.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,8 +194,7 @@ Public Class dlgClimaticSummary

'TODO: what defaults do we want?
clsSummariesList.SetRCommand("c")
clsSummariesList.AddParameter("summary_count_non_missing", Chr(34) & "summary_count_non_missing" & Chr(34), bIncludeArgumentName:=False, iPosition:=1)
clsSummariesList.AddParameter("summary_count", Chr(34) & "summary_count" & Chr(34), bIncludeArgumentName:=False, iPosition:=3)
clsSummariesList.AddParameter("summary_count", Chr(34) & "summary_count" & Chr(34), bIncludeArgumentName:=False, iPosition:=1)
clsSummariesList.AddParameter("summary_sum", Chr(34) & "summary_sum" & Chr(34), bIncludeArgumentName:=False, iPosition:=11)

clsDefaultFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$calculate_summary")
Expand Down
2 changes: 1 addition & 1 deletion instat/dlgColumnStats.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ Public Class dlgColumnStats
clsConcFunction.SetRCommand("c")

clsSummariesList.SetRCommand("c")
clsSummariesList.AddParameter("summary_count_non_missing", Chr(34) & "summary_count_non_missing" & Chr(34), bIncludeArgumentName:=False, iPosition:=1)
clsSummariesList.AddParameter("summary_count", Chr(34) & "summary_count" & Chr(34), bIncludeArgumentName:=False, iPosition:=1)
clsSummariesList.AddParameter("summary_sum", Chr(34) & "summary_sum" & Chr(34), bIncludeArgumentName:=False, iPosition:=11)

clsDefaultFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$calculate_summary")
Expand Down
102 changes: 51 additions & 51 deletions instat/dlgDescribeTwoVariable.Designer.vb
View file
Open in desktop

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

Loading
Loading