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

Show Upload Options on Table when no slides #249

Merged
merged 7 commits into from
Mar 25, 2020
Merged

Show Upload Options on Table when no slides #249

merged 7 commits into from
Mar 25, 2020

Conversation

AbdulRashidReshamwala
Copy link
Contributor

@AbdulRashidReshamwala AbdulRashidReshamwala commented Mar 25, 2020

Due to line 286 in apps/table.html both the upload and reload buttons as well as the upload modal was removed
Before
Screenshot from 2020-03-25 20-52-40
After
Screenshot from 2020-03-25 20-51-52
Screenshot from 2020-03-25 20-58-55

fixes #248

@birm birm mentioned this pull request Mar 25, 2020
@birm birm changed the base branch from master to develop March 25, 2020 15:32
@birm birm requested review from birm and nanli-emory March 25, 2020 15:33
Copy link
Member

@birm birm left a comment

Choose a reason for hiding this comment

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

Good catch; that's what I get for testing without clearing my slides each time.

@birm
Copy link
Member

birm commented Mar 25, 2020

For future reference, it's easier to review PRs when you use a different topic branch for each change.

@birm birm changed the title Fix issue where the user could not see upload options if there was no data in the table Show Upload Options on Table when no slides Mar 25, 2020
@birm birm added the bugfix label Mar 25, 2020
@AbdulRashidReshamwala
Copy link
Contributor Author

@viditvarshney take a look at attached screenshots earlier when there was no data the modal and the buttons to upload were being overwritten with "No Data Found x..x"

@viditvarshney
Copy link
Contributor

no, i am asking of this particular commit which has a message of "fix upload issues"

@birm birm removed the request for review from nanli-emory March 25, 2020 16:37
Copy link
Member

@birm birm left a comment

Choose a reason for hiding this comment

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

Actually, can we put the upload and reload buttons above the table?

@viditvarshney
Copy link
Contributor

viditvarshney commented Mar 25, 2020

@birm , sir when the files are uploaded then the upload and reload buttons are automatically above the table
76673615-b5707000-65cc-11ea-983d-87f6944bc95c

@birm
Copy link
Member

birm commented Mar 25, 2020

So, what has happened is that when no slides are present, the "no data" message would overwrite the table. That also meant that the upload/reload buttons were removed from the DOM. I missed this since I usually test from the test_seed data which adds a slide by default.
@AbdulRashidReshamwala has fixed this, by moving it below the table. I just want them to move it back above :)

@AbdulRashidReshamwala
Copy link
Contributor Author

I have made the required changes.

@viditvarshney
Copy link
Contributor

viditvarshney commented Mar 25, 2020 via email

@birm birm merged commit 376e253 into camicroscope:develop Mar 25, 2020
@AbdulRashidReshamwala AbdulRashidReshamwala deleted the developer branch March 26, 2020 14:44
birm added a commit that referenced this pull request Mar 26, 2020
* fixed missing id in app/signup/signup.html

* added missing id attribute to in put field in apps/signup/signup.html

* fixed missing id attribute of email input field  in apps/signup/signup.html

* fixed issue where upload and reload pages would not show if there was no data

* fix upload issues

* Moved buttons above the table

Co-authored-by: Ryan Birmingham <birm@rbirm.us>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants