Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
clinicaltrials
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
david Chavalarias
clinicaltrials
Commits
4c949fc8
Commit
4c949fc8
authored
Mar 17, 2017
by
Romain Loth
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
make job info optional (were half-baked)
parent
a3e0fa72
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
10 deletions
+7
-10
main.py
services/main.py
+3
-6
comex_user_shared.js
static/js/comex_user_shared.js
+1
-1
profile.html
templates/profile.html
+1
-1
org_details.html
templates/questions/org_details.html
+1
-1
registration_super_short_form.html
templates/registration_super_short_form.html
+1
-1
No files found.
services/main.py
View file @
4c949fc8
...
...
@@ -881,11 +881,8 @@ def save_form(clean_records, update_flag=False, previous_user_info=None):
mlog
(
'DEBUG'
,
'save_form: declared values for org ='
,
declared_orgs
)
# B2) check our constraint (cf. also E.)
if
(
declared_orgs
[
'lab'
]
is
None
and
declared_orgs
[
'inst'
]
is
None
):
raise
ValueError
(
"At least 1 org (lab or institution) must be filled"
)
# B3) for each, read/fill the orgs table to get associated id(s) in DB
# B2) for each optional declared org,
# read/fill the orgs table to get associated id(s) in DB
orgids
=
[]
for
oclass
in
[
'lab'
,
'inst'
]:
...
...
@@ -896,7 +893,7 @@ def save_form(clean_records, update_flag=False, previous_user_info=None):
mlog
(
'DEBUG'
,
'save_form: found ids for orgs ='
,
orgids
)
# B
4
) save the org <=> org mappings TODO LATER (not a priority)
# B
3
) save the org <=> org mappings TODO LATER (not a priority)
# dbcrud.record_org_org_link(src_orgid, tgt_orgid, reg_db)
# C) create/update record into the primary user table
...
...
static/js/comex_user_shared.js
View file @
4c949fc8
...
...
@@ -51,7 +51,7 @@ var cmxClt = (function() {
[
"last_name"
,
true
,
"plsfill"
,
"t"
,
"basic_infos"
],
[
"country"
,
true
,
"plsfill"
,
"t"
,
"basic_infos"
],
[
"initials"
,
true
,
"pref"
,
"t"
,
null
],
[
"position"
,
true
,
"p
lsfill"
,
"t"
,
"org_infos"
],
[
"position"
,
true
,
"p
ref"
,
"t"
,
"org_infos"
],
[
"interests_text"
,
false
,
"pref"
,
"t"
,
"other_infos"
],
[
"gender"
,
false
,
"plsfill"
,
"m"
,
"other_infos"
],
[
"job_looking"
,
false
,
"pref"
,
"m"
,
"map_infos"
],
...
...
templates/profile.html
View file @
4c949fc8
...
...
@@ -348,7 +348,7 @@
role=
"tabpanel"
aria-expanded=
"false"
>
<div
class=
"question input-group"
>
<label
for=
"position"
class=
"smlabel input-group-addon"
>
*
Job Position
</label>
<label
for=
"position"
class=
"smlabel input-group-addon"
>
Job Position
</label>
<input
id=
"position"
name=
"position"
maxlength=
"30"
type=
"text"
class=
"form-control autocomp"
placeholder=
"titre"
onblur=
"cmxClt.makeBold(this)"
onfocus=
"cmxClt.makeNormal(this)"
...
...
templates/questions/org_details.html
View file @
4c949fc8
...
...
@@ -6,7 +6,7 @@
<!-- lab or team and details -->
<div
class=
"question"
>
<div
class=
"input-group"
>
<label
for=
"lab_label"
class=
"smlabel input-group-addon"
>
*
Lab / Team / Dept
</label>
<label
for=
"lab_label"
class=
"smlabel input-group-addon"
>
Lab / Team / Dept
</label>
<input
id=
"lab_label"
name=
"lab_label"
maxlength=
"250"
type=
"text"
class=
"form-control"
placeholder=
"More detailed affiliation, if relevant"
value=
"{{ current_user.info.labs[0].label if current_user.info.labs|length > 0 }}"
>
...
...
templates/registration_super_short_form.html
View file @
4c949fc8
...
...
@@ -160,7 +160,7 @@
<div
class=
"question"
>
<div
class=
"input-group"
>
<label
for=
"lab_label"
class=
"smlabel input-group-addon"
>
*
Lab / Team / Dept
</label>
<label
for=
"lab_label"
class=
"smlabel input-group-addon"
>
Lab / Team / Dept
</label>
<input
id=
"lab_label"
name=
"lab_label"
maxlength=
"120"
type=
"text"
class=
"form-control"
placeholder=
"Your lab"
placeholder=
"lab_label"
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment