Research consent form #1164
Merged
Research consent form #1164
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nygrenh
requested changes
Jul 17, 2023
| #[generated_doc] | ||
| #[instrument(skip(pool))] | ||
| pub async fn post_user_consents( | ||
| user_id: web::Path<Uuid>, |
| pub deleted_at: Option<DateTime<Utc>>, | ||
| } | ||
|
|
||
| pub async fn insert( |
| #[generated_doc] | ||
| #[instrument(skip(pool))] | ||
| pub async fn get_research_consent_by_user_id( | ||
| user_id: web::Path<Uuid>, |
| @@ -0,0 +1,162 @@ | |||
| /* eslint-disable i18next/no-literal-string */ | |||
There was a problem hiding this comment.
Don't disable for the whole file
| @@ -25,8 +28,10 @@ const Login: React.FC<React.PropsWithChildren<unknown>> = () => { | |||
| const [notification, setNotification] = useState<string | null>(null) | |||
| const [email, setEmail] = useState("") | |||
| const [password, setPassword] = useState("") | |||
| const [userId, setUserId] = useState("") | |||
There was a problem hiding this comment.
Suggested change
| const [userId, setUserId] = useState("") | |
| const [userId, setUserId] = useState<string | null>(null) |
nygrenh
requested changes
Jul 20, 2023
| if (consent === undefined && optionSelected) { | ||
| setOptionSelected(false) | ||
| } | ||
| const consentQuery = useQuery({ |
| router.push(returnTo) | ||
| }, [router, uncheckedReturnTo]) | ||
|
|
||
| const getUserConsent = useQuery({ |
|
|
||
| return ( | ||
| <div> | ||
| {/* eslint-disable-next-line i18next/no-literal-string */} |
| > | ||
| <div>{t("research-consent-title")}:</div> | ||
| <Button | ||
| id={"changeReseachConstent"} |
There was a problem hiding this comment.
| @@ -99,6 +99,7 @@ | |||
| "to-complete-this-chapter": "Suorittaaksesi tämän luvun", | |||
| "translate": "Käännä", | |||
| "university-of-helsinki": "Helsingin yliopisto", | |||
| "user-settings": "Käyttäjäasetukset", | |||
| await page.fill(`label:has-text("Password")`, "student-without-research-consent") | ||
| await page.locator("id=login-button").click() | ||
| await expect(page.locator("text=Organizations")).toBeVisible() | ||
| }) |
added 2 commits
July 20, 2023 22:13
github-actions
bot
added
the
dependencies
|
New dependencies detected. Learn more about Socket for GitHub ↗︎
|
nygrenh
approved these changes
Jul 24, 2023
Maijjay
force-pushed
the
research-consent-form
branch
from
932e391
to
8ae30ef
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.