Skip to content

Biobank integration #23

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

Open
wants to merge 105 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
105 commits
Select commit Hold shift + click to select a range
3654d69
first running ncer controller test
sherzinger Feb 17, 2020
022c554
refactored test
sherzinger Feb 17, 2020
e1a251c
fixed typeahead in webNcer
sherzinger Feb 19, 2020
3da5d61
removed ignite xml config from custom.conf
sherzinger Feb 19, 2020
0e94285
fixed assets in webNcer
sherzinger Feb 19, 2020
378d3dd
fixed event propagation for checkboxes
sherzinger Feb 19, 2020
3eca39c
fixes #155 rejecting NPE
sherzinger Feb 19, 2020
61e6400
fix #152 improved email templates
sherzinger Feb 19, 2020
933ef2e
Reworked SampleRequest states
sherzinger Feb 20, 2020
f75fd3e
fixed issue in email template
sherzinger Feb 20, 2020
0f71958
intellij falsely marked imports as unused
sherzinger Feb 20, 2020
b2ba51c
Adding biobank user to model
sherzinger Feb 20, 2020
5f5d71f
Improved wording of sample request states/actions
sherzinger Feb 21, 2020
210404f
added typeahead for BioBank user
sherzinger Feb 21, 2020
c274524
fixed email template issue
sherzinger Feb 21, 2020
3d4addb
modified action graph
sherzinger Feb 21, 2020
ca05f34
Improving several naming conventions within SampleRequest feature
sherzinger Feb 21, 2020
81485ef
added url download for irods
sherzinger Mar 10, 2020
fc2238d
Removed BatchOrderRequest code
sherzinger Mar 24, 2020
cdf6d17
removed addAdmin code
sherzinger Mar 24, 2020
2380a54
Merge remote-tracking branch 'remotes/origin/master' into sample-requ…
sherzinger May 26, 2020
30220a1
modified .gitignore
sherzinger May 26, 2020
4dc553d
Merge remote-tracking branch 'remotes/origin/master' into sample-requ…
sherzinger Jun 8, 2020
00c4947
removed legacy sample request code
sherzinger Jun 9, 2020
54b03e6
removed more legacy sample request code
sherzinger Jun 9, 2020
b2ab775
added service and controller for sample request
sherzinger Jun 9, 2020
9faf572
added rems request code
sherzinger Jun 9, 2020
ba08c9d
added another rems call
sherzinger Jun 10, 2020
3885829
added a test + minor changes
sherzinger Jun 10, 2020
245abd0
fixed DI wiring
sherzinger Jun 10, 2020
47aa234
added attachment submission
sherzinger Jun 10, 2020
f0551b1
adding more testing utils
sherzinger Jun 10, 2020
99f7ec1
slowly finishing the csv creation
sherzinger Jun 10, 2020
c5e956f
createCsv produces now a real CSV
sherzinger Jun 11, 2020
297b169
first real test
sherzinger Jun 11, 2020
1a8fa18
added dotenv plugin
sherzinger Jun 15, 2020
b9c201b
minor fix
sherzinger Jun 15, 2020
5d2b130
added action to get catalogue items + debugged it
sherzinger Jun 17, 2020
6423a26
added submit controller
sherzinger Jun 17, 2020
428c37a
added dataSetId
sherzinger Jun 17, 2020
71ff8e8
added invite member function
sherzinger Jun 17, 2020
dcd5e37
small refactor
sherzinger Jun 17, 2020
5fdcb76
added user lookup for rems invite
sherzinger Jun 18, 2020
e44d4ab
fixed auth
sherzinger Jun 18, 2020
c42d578
small test cleanup fix
sherzinger Jun 18, 2020
90c3a5f
fixed selectedID criteria conversion
sherzinger Jun 18, 2020
1d49518
simplify user retrieval
sherzinger Jun 18, 2020
babe45f
added SampleRequestSetting model/repo
sherzinger Jun 18, 2020
cc11e09
salvaged old BatchOrderRequest code
sherzinger Jun 18, 2020
cfd9296
small controller cleanup
sherzinger Jun 18, 2020
b859ff9
fixed js issues
sherzinger Jun 18, 2020
e9e2add
added menu item if dataset has SampleRequestSetting
sherzinger Jun 19, 2020
7677ddf
Added skeleton for Sample Request submission form
sherzinger Jun 24, 2020
75bd02d
retrieving everything but the a table infos
sherzinger Jun 24, 2020
752065f
small DI fux
sherzinger Jun 24, 2020
82cfc1a
dataSetId -> dataSet
sherzinger Jun 24, 2020
fdaedb4
added menu delete code
sherzinger Jun 24, 2020
3f0c828
Fixed view returned on delete
sherzinger Jun 24, 2020
b43c95f
fixing menu delete
sherzinger Jun 24, 2020
a632821
added remaining ActionView data
sherzinger Jun 24, 2020
a88eb47
removed HasBasicFormCreateView trait
sherzinger Jun 24, 2020
d677546
added custom form and connected some of the data flow to it
sherzinger Jun 26, 2020
519b2d5
wired catalalogueItem selection
sherzinger Jun 26, 2020
08ae3b9
fixing catalogueItemId selection
sherzinger Jun 29, 2020
46f2742
fixing attachment upload
sherzinger Jun 30, 2020
0598678
changed REMS flow due to API limitations
sherzinger Jul 1, 2020
57d58ab
minor fix (Int -> String)
sherzinger Jul 1, 2020
75f0538
ajax to get the new application url
sherzinger Jul 2, 2020
ea2999e
made form a bit nicer
sherzinger Jul 2, 2020
07a4c50
switch to Form submission
sherzinger Jul 2, 2020
fb0c655
fixed several issues
sherzinger Jul 3, 2020
d1568e9
fixed form submission
sherzinger Jul 3, 2020
3fb43b9
fixed filter again
sherzinger Jul 3, 2020
a1814c2
made form a bit nicer
sherzinger Jul 3, 2020
42b7fa7
secured new API
sherzinger Jul 10, 2020
2413615
added documentation
sherzinger Jul 28, 2020
4bb76bd
added documentation
sherzinger Jul 28, 2020
6f99687
Merge remote-tracking branch 'remotes/origin/master' into sample-requ…
sherzinger Jul 28, 2020
b0e4887
Merge remote-tracking branch 'origin/oidc' into sample-request-feature
sherzinger Sep 7, 2020
c0b76b2
Merge remote-tracking branch 'origin/oidc_v2' into biobank-integration
LBolzani Jun 9, 2021
509a668
Podium integration
LBolzani Jun 18, 2021
8b722d0
Merge branch 'oidc_v2' into biobank-integration
LBolzani Jun 21, 2021
6283de7
Podium integration
LBolzani Jun 28, 2021
197f9e3
Merge remote-tracking branch 'origin/oidc_v2' into biobank-integration
LBolzani Jun 28, 2021
0aa565a
Merge remote-tracking branch 'origin/oidc_v2' into biobank-integration
LBolzani Jun 29, 2021
b34238e
Podium integration - access token refresh/token implementation
LBolzani Jun 29, 2021
530c678
Update podium integration
LBolzani Jul 8, 2021
50597ef
Update podium integration
LBolzani Jul 9, 2021
a94271f
Merge remote-tracking branch 'origin/oidc_v2' into biobank-integration
LBolzani Jul 12, 2021
f09c544
Update submissionForm.scala.html checkbox selection/organisation sending
LBolzani Jul 15, 2021
ec676b9
Fix error undefined list
LBolzani Jul 16, 2021
76d9c56
Send to podium multiple organisation requests
LBolzani Jul 16, 2021
7b3c1f5
Add organizations identifier selection
LBolzani Jul 21, 2021
d959c0a
Manage Enum fieldType
LBolzani Jul 21, 2021
b393786
Update test
LBolzani Jul 26, 2021
615443a
Feature to sort field by name not only by count
LBolzani Jul 28, 2021
4fbc7bd
Merge branch 'sort_field_feature' into biobank-integration
LBolzani Jul 28, 2021
0074c70
Fix problems after merge from master/sort_field_feature branches
LBolzani Jul 28, 2021
9334946
Fix tests
LBolzani Jul 28, 2021
3cf3857
Fix tests error
LBolzani Jul 29, 2021
5c632f7
Fix bugs ada-issues/issues/180, ada-issues/issues/185
LBolzani Aug 6, 2021
1ce09c3
Merge remote-tracking branch 'origin/master' into sort_field_feature
LBolzani Aug 23, 2021
fe06de6
Merge branch 'sort_field_feature' into biobank-integration
LBolzani Aug 24, 2021
b8d4abb
Take off .env plugin
LBolzani Aug 24, 2021
c4ecc77
Update code according pull request #17
LBolzani Sep 2, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
logs
project/project
project/target
web/project
web-ncer/project
server/project
target
tmp
.history
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name := "ada-app"

organization in ThisBuild := "org.adada"
scalaVersion in ThisBuild := "2.11.12"
version in ThisBuild := "0.9.0-SNAPSHOT"
version in ThisBuild := "0.9.1-SNAPSHOT"
isSnapshot in ThisBuild := true

lazy val server = (project in file("server"))
Expand Down
2 changes: 2 additions & 0 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,5 @@ addSbtPlugin("com.typesafe.sbt" % "sbt-mocha" % "1.0.0")
addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.8.2")
addSbtPlugin("net.ground5hark.sbt" % "sbt-css-compress" % "0.1.3")
addSbtPlugin("net.ground5hark.sbt" % "sbt-closure" % "0.1.3")


1 change: 1 addition & 0 deletions server/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ resolvers ++= Seq(
)

val playVersion = "2.5.9"

libraryDependencies ++= Seq(
"com.typesafe.play" %% "play" % playVersion,
"com.typesafe.play" %% "play-json" % playVersion,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ case class DistributionWidgetSpec(
relativeValues: Boolean = false,
numericBinCount: Option[Int] = None, // TODO: rename to binCount
useDateMonthBins: Boolean = false,
orderByField: Option[Boolean] = None,
displayOptions: MultiChartDisplayOptions = MultiChartDisplayOptions()
) extends WidgetSpec {
override val fieldNames = Seq(groupFieldName, Some(fieldName)).flatten
Expand Down
11 changes: 0 additions & 11 deletions web-ncer/app/controllers/QueryStringBinders.scala

This file was deleted.

Loading