Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Develop #49

Merged
merged 4 commits into from
Nov 14, 2019
Merged

Develop #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ba4eff1
add optional build variables for git repo versions
birm Nov 13, 2019
9802953
Update Dockerfile
birm Nov 13, 2019
985a8d0
Merge pull request #48 from birm/develop
ebremer Nov 14, 2019
4ede0ac
fix links on list of images
ebremer Nov 14, 2019
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
6 changes: 4 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,10 @@ RUN rm /quip/config-update/tac_lite.settings.yml
COPY content/* /quip/content/
# download caMicroscope
WORKDIR /quip/web
RUN git clone https://github.com/camicroscope/caMicroscope.git --branch=v3.5.9
RUN git clone https://github.com/SBU-BMI/FeatureMap --branch=2.0.3
ARG viewer
RUN if [ -z ${viewer} ]; then git clone https://github.com/camicroscope/caMicroscope.git --branch=v3.5.10; else git clone https://github.com/camicroscope/caMicroscope.git --branch=$viewer; fi
ARG featureMap
RUN if [ -z ${featureMap} ]; then git clone https://github.com/SBU-BMI/FeatureMap --branch=2.0.3; else git clone https://github.com/SBU-BMI/FeatureMap --branch=$featureMap; fi
RUN rm /etc/httpd/conf.d/ssl.conf
RUN chmod 755 /root/run.sh
RUN yum update -y && yum clean all
Expand Down
6 changes: 0 additions & 6 deletions config/facets.facet.collection.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,6 @@ processor_configs:
sort: 20
settings:
sort: DESC
count_widget_order:
processor_id: count_widget_order
weights:
sort: 30
settings:
sort: DESC
display_value_widget_order:
processor_id: display_value_widget_order
weights:
Expand Down
130 changes: 65 additions & 65 deletions config/views.view.listofimages.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,18 +162,18 @@ display:
options:
view_mode: teaser
fields:
field_collection_1:
id: field_collection_1
table: node__field_collection
field: field_collection
nid_3:
id: nid_3
table: node_field_data
field: nid
relationship: none
group_type: group
admin_label: ''
label: CollectionID
label: ID
exclude: true
alter:
alter_text: true
text: '{{ field_collection_1__target_id }}'
alter_text: false
text: ''
make_link: false
path: ''
absolute: false
Expand Down Expand Up @@ -210,11 +210,12 @@ display:
hide_empty: false
empty_zero: false
hide_alter_empty: true
click_sort_column: target_id
type: entity_reference_label
click_sort_column: value
type: number_integer
settings:
link: false
group_column: target_id
thousand_separator: ''
prefix_suffix: true
group_column: value
group_columns: { }
group_rows: true
delta_limit: 0
Expand All @@ -224,19 +225,21 @@ display:
multi_type: separator
separator: ', '
field_api_classes: false
entity_type: node
entity_field: nid
plugin_id: field
field_collection:
id: field_collection
field_collection_1:
id: field_collection_1
table: node__field_collection
field: field_collection
relationship: none
group_type: group
admin_label: Collection
label: Collection
exclude: false
admin_label: ''
label: CollectionID
exclude: true
alter:
alter_text: false
text: ''
alter_text: true
text: '{{ field_collection_1__target_id }}'
make_link: false
path: ''
absolute: false
Expand Down Expand Up @@ -288,14 +291,14 @@ display:
separator: ', '
field_api_classes: false
plugin_id: field
studyid:
id: studyid
table: node__studyid
field: studyid
field_collection:
id: field_collection
table: node__field_collection
field: field_collection
relationship: none
group_type: group
admin_label: ''
label: 'Study ID'
admin_label: Collection
label: Collection
exclude: false
alter:
alter_text: false
Expand Down Expand Up @@ -336,11 +339,11 @@ display:
hide_empty: false
empty_zero: false
hide_alter_empty: true
click_sort_column: value
type: string
click_sort_column: target_id
type: entity_reference_label
settings:
link_to_entity: false
group_column: value
link: false
group_column: target_id
group_columns: { }
group_rows: true
delta_limit: 0
Expand All @@ -351,14 +354,14 @@ display:
separator: ', '
field_api_classes: false
plugin_id: field
clinicaltrialsubjectid:
id: clinicaltrialsubjectid
table: node__clinicaltrialsubjectid
field: clinicaltrialsubjectid
studyid:
id: studyid
table: node__studyid
field: studyid
relationship: none
group_type: group
admin_label: ''
label: 'Subject ID'
label: 'Study ID'
exclude: false
alter:
alter_text: false
Expand Down Expand Up @@ -414,14 +417,14 @@ display:
separator: ', '
field_api_classes: false
plugin_id: field
imageid:
id: imageid
table: node__imageid
field: imageid
clinicaltrialsubjectid:
id: clinicaltrialsubjectid
table: node__clinicaltrialsubjectid
field: clinicaltrialsubjectid
relationship: none
group_type: group
admin_label: ''
label: 'Image ID'
label: 'Subject ID'
exclude: false
alter:
alter_text: false
Expand Down Expand Up @@ -465,7 +468,7 @@ display:
click_sort_column: value
type: string
settings:
link_to_entity: true
link_to_entity: false
group_column: value
group_columns: { }
group_rows: true
Expand All @@ -477,21 +480,21 @@ display:
separator: ', '
field_api_classes: false
plugin_id: field
nid:
id: nid
table: node_field_data
field: nid
imageid:
id: imageid
table: node__imageid
field: imageid
relationship: none
group_type: group
admin_label: ''
label: View
label: 'Image ID'
exclude: false
alter:
alter_text: true
text: caMic
alter_text: false
text: ''
make_link: true
path: '/caMicroscope/apps/viewer/viewer.html?slideId={{nid}}&mode=pathdb'
absolute: true
path: '/caMicroscope/apps/viewer/viewer.html?slideId={{nid_3}}&mode=pathdb'
absolute: false
external: false
replace_spaces: false
path_case: none
Expand Down Expand Up @@ -526,10 +529,9 @@ display:
empty_zero: false
hide_alter_empty: true
click_sort_column: value
type: number_integer
type: string
settings:
thousand_separator: ''
prefix_suffix: true
link_to_entity: false
group_column: value
group_columns: { }
group_rows: true
Expand All @@ -540,23 +542,21 @@ display:
multi_type: separator
separator: ', '
field_api_classes: false
entity_type: node
entity_field: nid
plugin_id: field
nid_1:
id: nid_1
nid:
id: nid
table: node_field_data
field: nid
relationship: none
group_type: group
admin_label: ''
label: Map
exclude: true
label: ''
exclude: false
alter:
alter_text: true
text: 'Add Map'
text: Meta
make_link: true
path: '/node/add/map?edit[field_wsi][widget][0][target_id]={{nid_1}}'
path: '/node/{{nid}}'
absolute: true
external: false
replace_spaces: false
Expand All @@ -583,7 +583,7 @@ display:
element_class: ''
element_label_type: ''
element_label_class: ''
element_label_colon: true
element_label_colon: false
element_wrapper_type: ''
element_wrapper_class: ''
element_default_classes: true
Expand All @@ -594,8 +594,8 @@ display:
click_sort_column: value
type: number_integer
settings:
thousand_separator: ''
prefix_suffix: true
thousand_separator: .
prefix_suffix: false
group_column: value
group_columns: { }
group_rows: true
Expand All @@ -616,13 +616,13 @@ display:
relationship: none
group_type: group
admin_label: ''
label: Maps
label: ''
exclude: false
alter:
alter_text: true
text: Maps
make_link: true
path: '/maps/{{ nid_1 }}'
path: '/maps/{{ nid_2 }}'
absolute: false
external: false
replace_spaces: false
Expand All @@ -649,7 +649,7 @@ display:
element_class: ''
element_label_type: ''
element_label_class: ''
element_label_colon: true
element_label_colon: false
element_wrapper_type: ''
element_wrapper_class: ''
element_default_classes: true
Expand Down