Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
cs427fa20team22
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
htmoss2
cs427fa20team22
Commits
d40b0b1b
Commit
d40b0b1b
authored
4 years ago
by
Matthew Williams
Browse files
Options
Downloads
Patches
Plain Diff
Fix semicolon and function call structure
parent
b1cddee6
No related branches found
No related tags found
1 merge request
!22
Merge UC92 into Master
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
iTrust/src/edu/ncsu/csc/itrust/action/ResetPasswordAction.java
+6
-6
6 additions, 6 deletions
...t/src/edu/ncsu/csc/itrust/action/ResetPasswordAction.java
iTrust/src/edu/ncsu/csc/itrust/dao/mysql/PatientDAO.java
+1
-1
1 addition, 1 deletion
iTrust/src/edu/ncsu/csc/itrust/dao/mysql/PatientDAO.java
with
7 additions
and
7 deletions
iTrust/src/edu/ncsu/csc/itrust/action/ResetPasswordAction.java
+
6
−
6
View file @
d40b0b1b
...
@@ -80,12 +80,12 @@ public class ResetPasswordAction {
...
@@ -80,12 +80,12 @@ public class ResetPasswordAction {
*/
*/
public
String
checkRole
(
long
mid
,
String
role
)
throws
ITrustException
{
public
String
checkRole
(
long
mid
,
String
role
)
throws
ITrustException
{
try
{
try
{
if
((
"patient"
.
equals
(
role
)
&&
patientDAO
.
getRole
(
mid
,
role
).
equals
(
"patient"
))
if
((
"patient"
.
equals
(
role
)
&&
patientDAO
.
getRole
(
mid
).
equals
(
"patient"
))
||
(
"hcp"
.
equals
(
role
)
&&
patientDAO
.
getRole
(
mid
,
role
).
equals
(
"hcp"
))
||
(
"hcp"
.
equals
(
role
)
&&
patientDAO
.
getRole
(
mid
).
equals
(
"hcp"
))
||
(
"uap"
.
equals
(
role
)
&&
patientDAO
.
getRole
(
mid
,
role
).
equals
(
"uap"
))
||
(
"uap"
.
equals
(
role
)
&&
patientDAO
.
getRole
(
mid
).
equals
(
"uap"
))
||
(
"pha"
.
equals
(
role
)
&&
patientDAO
.
getRole
(
mid
,
role
).
equals
(
"pha"
))
||
(
"pha"
.
equals
(
role
)
&&
patientDAO
.
getRole
(
mid
).
equals
(
"pha"
))
||
(
"er"
.
equals
(
role
)
&&
patientDAO
.
getRole
(
mid
,
role
).
equals
(
"er"
))
||
(
"er"
.
equals
(
role
)
&&
patientDAO
.
getRole
(
mid
).
equals
(
"er"
))
||
(
"lt"
.
equals
(
role
)
&&
patientDAO
.
getRole
(
mid
,
role
).
equals
(
"lt"
)))
||
(
"lt"
.
equals
(
role
)
&&
patientDAO
.
getRole
(
mid
).
equals
(
"lt"
)))
return
role
;
return
role
;
else
else
return
null
;
return
null
;
...
...
This diff is collapsed.
Click to expand it.
iTrust/src/edu/ncsu/csc/itrust/dao/mysql/PatientDAO.java
+
1
−
1
View file @
d40b0b1b
...
@@ -196,7 +196,7 @@ public class PatientDAO {
...
@@ -196,7 +196,7 @@ public class PatientDAO {
try
{
try
{
conn
=
factory
.
getConnection
();
conn
=
factory
.
getConnection
();
ps
=
conn
.
prepareStatement
(
"UPDATE users SET role=? WHERE MID=?"
);
ps
=
conn
.
prepareStatement
(
"UPDATE users SET role=? WHERE MID=?"
);
ps
.
setString
(
1
,
"patient"
)
ps
.
setString
(
1
,
"patient"
)
;
ps
.
setLong
(
2
,
mid
);
ps
.
setLong
(
2
,
mid
);
}
catch
(
SQLException
e
)
{
}
catch
(
SQLException
e
)
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment