-
Notifications
You must be signed in to change notification settings - Fork 56
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
SIS Import Data Modal #193
Conversation
However, the modal does not show up. This is a WIP
The initial version of the SIS import data modal is completed: it shows up by default upon entering the advising page, and soon we will add the feature to make it not show up automatically when there is data to render.
using just the toggle function is fine for now i think |
(or something like this). Click the | ||
button below to be taken to the Consent | ||
Page on SIS.</h3> | ||
</div>); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Instead, I would write something like: "In order to connect with your advisors through Semester.ly, you must agree to Semester.ly importing your data from SIS." And then have the "Import SIS" button.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Will revise
static/js/redux/ui/semesterly.jsx
Outdated
@@ -159,7 +159,6 @@ class Semesterly extends React.Component { | |||
<IntegrationModalContainer /> | |||
<TutModalContainer /> | |||
<PeerModalContainer /> | |||
<SaveCalendarModalContainer /> | |||
<FinalExamsModalContainer /> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this intentional?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This was accidental, will add it back.
<span>SIS Import Data Modal</span> | ||
</ReactTooltip> | ||
</div> | ||
); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this is okay for now but add a TODO comment to remove this and instead add an "Import Data" button. Then, create an Issue to track this TODO. Maybe this issue can be called "Replace star with an Import Data button that triggers the Import Data modal"
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Will change button
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I noticed that Semesterly makes use of Fontawesome.com icons if you want to look into that, although I think just a button that says "import data" would be fine
Changed SIS import data modal text Added the save calendar modal back to semesterly.jsx Changed the button that is used to pull up the modal from a star to actual text
@@ -30,6 +32,7 @@ class TopBarAdvising extends React.Component { | |||
this.comments_collapsed = 'neutral'; | |||
this.toggleComments = this.toggleComments.bind(this); | |||
this.renderUserForPrint = this.renderUserForPrint.bind(this); | |||
this.props.triggerSISImportDataModal() |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Wouldn't this make it always pop up?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Okay, I saw your comment that it's like this for now. Maybe add a # TODO then
Hopefully this will fix the merge conflict
modal. These TODOs will be tracked with issues
Import data button CSS fixes
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Pull most recent cs310 branch and also check for lint errors (npm run lint).
Merge in cs310 (but yep, fix lint errors!) |
Lint errors! |
…esterly into SIS-data-modal
…into SIS-data-modal
The modal also doesn't appear when I go to /advising |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
See above comments
I commented out the auto-pop-up part, and I left a TODO, linked to an issue (#219) about it |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lgtm
No description provided.