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.

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

Partially Fixes Duplicates Dialogue #7305

Conversation

derekagorhom
Copy link
Contributor

@derekagorhom derekagorhom commented Mar 15, 2022

Fixes (partially) issue #7299
Small changes in the duplicates Dialogue

Selected Variables has become the first button, and hence the default when you first use the dialogue. The Data Frame is then second. The Successive values remains the last button.
And the pull down has the first entry as Index.

@Ivanluv could you please test this to confirm

@lloyddewit
Copy link
Contributor

lloyddewit commented Mar 16, 2022

@derekagorhom thank you for this PR.
If a PR only partially fixes an issue then please write 'Fixes (partially) issue ...' (not 'partially fixes issue ...'), otherwise the issue will close automatically when this PR merges.
I fixed this in the comment above.
Thanks

Copy link
Collaborator

@rdstern rdstern left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good to have the change in order of the top buttons.
The top title and the menu item is still to change as is the order of count and index.

@derekagorhom
Copy link
Contributor Author

Hello @rdstern could you test this again?

@rdstern
Copy link
Collaborator

rdstern commented Mar 27, 2022

@derekagorhom almost. I am not clear why this task is so tricky.
It now seems to work most of the time. Index is first and seems to be the default. But when I returned to the dialogue a second time, after selecting that option, then it had gone back to Count!

@derekagorhom
Copy link
Contributor Author

@shadrackkibet i have added a commit, could you check and confirm if the dialogue is working properly again
thanks

@shadrackkibet
Copy link
Collaborator

@derekagorhom now you have conflicts in your PR.

@derekagorhom
Copy link
Contributor Author

@shadrackkibet could you test it again

@shadrackkibet
Copy link
Collaborator

What about this conflicting file? instat/translations/rInstatTranslations.db

@derekagorhom
Copy link
Contributor Author

What about this conflicting file? instat/translations/rInstatTranslations.db

@Patowhiz could you have a look at this please

@lloyddewit
Copy link
Contributor

What about this conflicting file? instat/translations/rInstatTranslations.db

@Patowhiz could you have a look at this please

@derekagorhom The database file is binary so we can't resolve the conflict within this PR. To resolve this conflict, you could do one of the following:

  • Close this PR and make a new PR
  • Remove the database changes from this PR (by checking out the latest database file, from main, into this PR); get this PR approved/merged; and finally, make a new PR for just the database changes

The first option may be easiest for this PR.

@N-thony
Copy link
Collaborator

N-thony commented Apr 2, 2022

What about this conflicting file? instat/translations/rInstatTranslations.db

@Patowhiz could you have a look at this please

@derekagorhom The database file is binary so we can't resolve the conflict within this PR. To resolve this conflict, you could do one of the following:

  • Close this PR and make a new PR
  • Remove the database changes from this PR (by checking out the latest database file, from main, into this PR); get this PR approved/merged; and finally, make a new PR for just the database changes

The first option may be easiest for this PR.

@lloyddewit to avoid this it will be good to have someone doing that, I think as discussed with @Vitalis95 who is happy doing that, I suggest these changes to be done by @Vitalis95 in his PR #7324.

@lloyddewit
Copy link
Contributor

What about this conflicting file? instat/translations/rInstatTranslations.db

@Patowhiz could you have a look at this please

@derekagorhom The database file is binary so we can't resolve the conflict within this PR. To resolve this conflict, you could do one of the following:

  • Close this PR and make a new PR
  • Remove the database changes from this PR (by checking out the latest database file, from main, into this PR); get this PR approved/merged; and finally, make a new PR for just the database changes

The first option may be easiest for this PR.

@lloyddewit to avoid this it will be good to have someone doing that, I think as discussed with @Vitalis95 who is happy doing that, I suggest these changes to be done by @Vitalis95 in his PR #7324.

@N-thony yes, that sounds sensible
@Vitalis95 is this OK from your side?
@derekagorhom to remove the database changes from this PR, please see the info here, let me know if you have problems.
Thanks!

@Vitalis95
Copy link
Contributor

@lloyddewit it is Ok from my side.

@derekagorhom
Copy link
Contributor Author

What about this conflicting file? instat/translations/rInstatTranslations.db

@Patowhiz could you have a look at this please

@derekagorhom The database file is binary so we can't resolve the conflict within this PR. To resolve this conflict, you could do one of the following:

  • Close this PR and make a new PR
  • Remove the database changes from this PR (by checking out the latest database file, from main, into this PR); get this PR approved/merged; and finally, make a new PR for just the database changes

The first option may be easiest for this PR.

@lloyddewit to avoid this it will be good to have someone doing that, I think as discussed with @Vitalis95 who is happy doing that, I suggest these changes to be done by @Vitalis95 in his PR #7324.

@N-thony yes, that sounds sensible @Vitalis95 is this OK from your side? @derekagorhom to remove the database changes from this PR, please see the info here, let me know if you have problems. Thanks!

Hello Lloyd i tried what you ask me to do and now i can't push the changes to the PR.
error

so i am thinking the earlier suggestion is ok with me;
Close this PR and make a new PR

@derekagorhom
Copy link
Contributor Author

@lloyddewit and @N-thony would it be ok if i just closed this PR and make a new PR?

@Patowhiz
Copy link
Contributor

Patowhiz commented Apr 4, 2022

@derekagorhom did you manage to resolve the translations conflicts, I know we made several changes to that file. Please feel free to contact me directly on the same.

@derekagorhom derekagorhom deleted the Small_Changes_Duplicates_Dialogue branch April 4, 2022 15:15
@lloyddewit
Copy link
Contributor

@lloyddewit and @N-thony would it be ok if i just closed this PR and make a new PR?

@derekagorhom yes, a new PR sounds sensible. Not sure what went wrong here, sorry for any confusion.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants