From 8ef680fe8c77a4b5e53fa3faf30dab86a84ff49f Mon Sep 17 00:00:00 2001 From: Jan Grzegorzewski Date: Tue, 25 Aug 2020 11:09:17 +0200 Subject: [PATCH 001/207] started on refactoring and redesign --- frontend/src/App.vue | 2 +- .../{ => navigation}/Navigation.vue | 40 +------------------ .../navigation/NavigationSecondary.vue | 13 ++++++ 3 files changed, 15 insertions(+), 40 deletions(-) rename frontend/src/components/{ => navigation}/Navigation.vue (71%) create mode 100644 frontend/src/components/navigation/NavigationSecondary.vue diff --git a/frontend/src/App.vue b/frontend/src/App.vue index 9a382789..31429383 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -19,7 +19,7 @@ + + \ No newline at end of file From bcc65ab89d985daef1c201f4204053580241ac25 Mon Sep 17 00:00:00 2001 From: Matthias Koenig Date: Tue, 25 Aug 2020 12:05:32 +0200 Subject: [PATCH 002/207] updated TODOs --- TODO.md | 1 - 1 file changed, 1 deletion(-) diff --git a/TODO.md b/TODO.md index 8e4ecdbc..dc0ed293 100644 --- a/TODO.md +++ b/TODO.md @@ -9,6 +9,5 @@ --- - [ ] cache info nodes in store -- [ ] implement additional validation rules - [ ] filter by access or license - [ ] make scatters available From 410429fb063dd52b0f1d71f27145d146d3b72a09 Mon Sep 17 00:00:00 2001 From: Matthias Koenig Date: Tue, 25 Aug 2020 12:57:12 +0200 Subject: [PATCH 003/207] updated smaller things --- TODO.md | 13 ---------- backend/pkdb_app/documents.py | 24 +++++++------------ backend/pkdb_app/studies/models.py | 16 +++++++------ backend/pkdb_app/studies/views.py | 8 +------ .../src/components/navigation/Navigation.vue | 4 ++-- 5 files changed, 21 insertions(+), 44 deletions(-) delete mode 100644 TODO.md diff --git a/TODO.md b/TODO.md deleted file mode 100644 index dc0ed293..00000000 --- a/TODO.md +++ /dev/null @@ -1,13 +0,0 @@ -# TODO -- [ ] show info nodes characteristica details -- [ ] show detail views for study, group, individual, reference (fix 404 on detail buttons), remove reference button -- [ ] Fix API url -- [ ] Fix Layout of main component (refactor in smaller components) -- [ ] Better REST documentation -- [ ] better name for zip file, e.g. pkdb_data_2020-08-23.zip -- [ ] fix data issues (missing titles), descriptions of info nodes - ---- -- [ ] cache info nodes in store -- [ ] filter by access or license -- [ ] make scatters available diff --git a/backend/pkdb_app/documents.py b/backend/pkdb_app/documents.py index 519f10ee..0a1f6afe 100644 --- a/backend/pkdb_app/documents.py +++ b/backend/pkdb_app/documents.py @@ -14,7 +14,6 @@ 'number_of_shards': 1, 'number_of_replicas': 1, 'max_ngram_diff': 15 - } edge_ngram_filter = token_filter( @@ -56,6 +55,7 @@ def string_field(attr, **kwargs): **kwargs ) + def basic_object(attr, **kwargs): return ObjectField( attr=attr, @@ -66,6 +66,7 @@ def basic_object(attr, **kwargs): **kwargs ) + def info_node(attr, **kwargs): return fields.ObjectField( attr=attr, @@ -76,6 +77,7 @@ def info_node(attr, **kwargs): **kwargs ) + study_field = fields.ObjectField( attr="study", properties={ @@ -84,6 +86,7 @@ def info_node(attr, **kwargs): } ) + def text_field(attr): return fields.TextField( attr=attr, @@ -146,27 +149,22 @@ def get_value_from_instance(self, instance, field_value_to_ignore=None): return self._get_inner_field_data(objs, field_value_to_ignore) - class AccessView(DocumentViewSet): + """Permissions on views.""" def get_queryset(self): group = user_group(self.request.user) if hasattr(self, "initial_data"): - id_queries = [Q('term', pk=pk) for pk in self.initial_data] if len(id_queries) > 0: - self.search=self.search.query(reduce(operator.ior,id_queries)) + self.search = self.search.query(reduce(operator.ior, id_queries)) else: - #create search that returns empty query + # empty query return self.search.query('match', access__raw="NOTHING") - - _hash = self.request.query_params.get("hash",[]) + _hash = self.request.query_params.get("hash", []) if _hash: - - ids = list(get_object_or_404(Query,hash=_hash).ids) - - #ids = list(IdMulti.objects.filter(query=_hash).values_list("value", flat=True)) + ids = list(get_object_or_404(Query, hash=_hash).ids) _qs_kwargs = {'values': ids} self.search = self.search.query( @@ -176,13 +174,9 @@ def get_queryset(self): if group == "basic": return self.search.query(Q('term', access__raw=PUBLIC) | Q('term', allowed_users__raw=self.request.user.username)) - elif group == "anonymous": return self.search.query(Q('term', access__raw=PUBLIC)) - elif group in ["admin", "reviewer"]: return self.search.query() - else: raise AssertionError("wrong group name") - diff --git a/backend/pkdb_app/studies/models.py b/backend/pkdb_app/studies/models.py index 24167315..9c7d6495 100644 --- a/backend/pkdb_app/studies/models.py +++ b/backend/pkdb_app/studies/models.py @@ -295,9 +295,15 @@ def delete(self, *args, **kwargs): super().delete(*args, **kwargs) +# FIXME: rename to something what it is (FilterQuery, IdCollection ?) +class Query(models.Model): + """ + DOCUMENT ME + """ + # FIXME: delete me again please !!!! (currently just filling up the database until problems) + # -> on_create: if > 1000 entries; delete first 500 resourses sorted by pk (first entries) -class Query(models.Model): class Recourses(models.TextChoices): """ Recourse Types""" Studies = 'studies', _('studies') @@ -306,11 +312,7 @@ class Recourses(models.TextChoices): Interventions = 'interventions', _('interventions') Outputs = 'outputs', _('outputs') - - resource = models.CharField(choices=Recourses.choices, max_length=CHAR_MAX_LENGTH) + resource = models.CharField(choices=Recourses.choices, max_length=CHAR_MAX_LENGTH) + # the hash is not a hash, but just a pseudo-random number (FIXME: rename to uuid) hash = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False) ids = ArrayField(models.IntegerField(), null=True, blank=True) - -#class IdMulti(models.Model): -# query = models.ForeignKey(Query, related_name="ids",on_delete=models.CASCADE, null=False) -# value = models.IntegerField(primary_key=False) \ No newline at end of file diff --git a/backend/pkdb_app/studies/views.py b/backend/pkdb_app/studies/views.py index ea7bd4fb..df656f7b 100644 --- a/backend/pkdb_app/studies/views.py +++ b/backend/pkdb_app/studies/views.py @@ -552,12 +552,9 @@ def get(self, request, *args, **kw): - - - - time_pkdata = time.time() + # calculation of hash resources = {} queries = [] for resource, ids in pkdata.ids.items(): @@ -594,7 +591,6 @@ def get(self, request, *args, **kw): resp['Content-Disposition'] = "attachment; filename=%s" % "pkdata.zip" return resp - response = Response(resources, status=status.HTTP_200_OK) time_response = time.time() @@ -605,6 +601,4 @@ def get(self, request, *args, **kw): print("total:", time_response - time_start_request) print("-" * 80) - - return response diff --git a/frontend/src/components/navigation/Navigation.vue b/frontend/src/components/navigation/Navigation.vue index 522a146c..49894ae3 100644 --- a/frontend/src/components/navigation/Navigation.vue +++ b/frontend/src/components/navigation/Navigation.vue @@ -11,8 +11,8 @@ {{ faIcon('home') }} - {{ faIcon('data') }} - {{ faIcon('search') }} + {{ faIcon('data') }} RESULTS + {{ faIcon('search') }} SEARCH {{ faIcon('curation') }} From feefcfee405870eb5f591b0034c00f806a30a42a Mon Sep 17 00:00:00 2001 From: Jan Grzegorzewski Date: Tue, 25 Aug 2020 22:54:29 +0200 Subject: [PATCH 004/207] redesign naviagtion --- frontend/src/components/main.vue | 13 ++ .../src/components/navigation/Account.vue | 40 +++++++ .../components/navigation/DropDownMenu.vue | 91 ++++++++++++++ .../src/components/navigation/Navigation.vue | 113 ++++++++---------- 4 files changed, 194 insertions(+), 63 deletions(-) create mode 100644 frontend/src/components/main.vue create mode 100644 frontend/src/components/navigation/Account.vue create mode 100644 frontend/src/components/navigation/DropDownMenu.vue diff --git a/frontend/src/components/main.vue b/frontend/src/components/main.vue new file mode 100644 index 00000000..4d28997d --- /dev/null +++ b/frontend/src/components/main.vue @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/frontend/src/components/navigation/Account.vue b/frontend/src/components/navigation/Account.vue new file mode 100644 index 00000000..e22f8176 --- /dev/null +++ b/frontend/src/components/navigation/Account.vue @@ -0,0 +1,40 @@ + + + + + \ No newline at end of file diff --git a/frontend/src/components/navigation/DropDownMenu.vue b/frontend/src/components/navigation/DropDownMenu.vue new file mode 100644 index 00000000..3c8317e5 --- /dev/null +++ b/frontend/src/components/navigation/DropDownMenu.vue @@ -0,0 +1,91 @@ + + + + + \ No newline at end of file diff --git a/frontend/src/components/navigation/Navigation.vue b/frontend/src/components/navigation/Navigation.vue index 522a146c..d8f630f2 100644 --- a/frontend/src/components/navigation/Navigation.vue +++ b/frontend/src/components/navigation/Navigation.vue @@ -1,82 +1,69 @@ \ No newline at end of file From 3152254dec971e17bfb31ebc0cda89c37ffd02e0 Mon Sep 17 00:00:00 2001 From: Jan Grzegorzewski Date: Tue, 25 Aug 2020 23:42:40 +0200 Subject: [PATCH 005/207] added dynamic navigation naming --- .../src/components/navigation/Navigation.vue | 9 ++++++++- frontend/src/store.js | 20 +++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/frontend/src/components/navigation/Navigation.vue b/frontend/src/components/navigation/Navigation.vue index 1539f15d..1db6c541 100644 --- a/frontend/src/components/navigation/Navigation.vue +++ b/frontend/src/components/navigation/Navigation.vue @@ -12,7 +12,7 @@ {{ faIcon('data') }} - Data + {{ tables_label }} {{ faIcon('search') }} Search @@ -54,6 +54,13 @@ }, username(){ return this.$store.state.username + }, + tables_label(){ + if(this.$store.getters.isInitial){ + return "Data" + }else{ + return "Results" + } } } } diff --git a/frontend/src/store.js b/frontend/src/store.js index d0bdf954..aad85e7e 100644 --- a/frontend/src/store.js +++ b/frontend/src/store.js @@ -124,6 +124,26 @@ export default new Vuex.Store({ username: localStorage.getItem('username'), token: localStorage.getItem('token'), }, + getters:{ + isInitial(state){ + if(JSON.stringify(state.queries) !== JSON.stringify(initial_queries)){ + return false + } + if(JSON.stringify(state.subjects_boolean) !== JSON.stringify(initial_subjects_boolean)){ + return false + } + if(JSON.stringify(state.subjects_queries) !== JSON.stringify(initial_subjects_queries)){ + return false + } + if(JSON.stringify(state.queries_users) !== JSON.stringify(initial_queries_users)){ + return false + } + if(JSON.stringify(state.queries_output_types) !== JSON.stringify(initial_output_types)){ + return false + } + return true + } + }, mutations: { resetQuery(state){ Object.assign(state.queries, initial_queries) From 73e7bafb110ae84a9addf859a312f739a0fc06bc Mon Sep 17 00:00:00 2001 From: Jan Grzegorzewski Date: Tue, 25 Aug 2020 23:44:02 +0200 Subject: [PATCH 006/207] title dynamic --- frontend/src/components/navigation/Navigation.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/components/navigation/Navigation.vue b/frontend/src/components/navigation/Navigation.vue index 1db6c541..3a9b180c 100644 --- a/frontend/src/components/navigation/Navigation.vue +++ b/frontend/src/components/navigation/Navigation.vue @@ -10,7 +10,7 @@ - + {{ faIcon('data') }} {{ tables_label }} From b177d4c237ec85e344b926a3c68cd208b505364b Mon Sep 17 00:00:00 2001 From: Jan Grzegorzewski Date: Tue, 25 Aug 2020 23:50:55 +0200 Subject: [PATCH 007/207] nothing new --- frontend/src/components/navigation/Navigation.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/components/navigation/Navigation.vue b/frontend/src/components/navigation/Navigation.vue index 3a9b180c..50e81415 100644 --- a/frontend/src/components/navigation/Navigation.vue +++ b/frontend/src/components/navigation/Navigation.vue @@ -10,7 +10,7 @@ - + {{ faIcon('data') }} {{ tables_label }} From d6dc345480af13b83be21e1a55e443f4e72f27f3 Mon Sep 17 00:00:00 2001 From: Jan Grzegorzewski Date: Wed, 26 Aug 2020 14:04:25 +0200 Subject: [PATCH 008/207] wokring on frontend --- frontend/src/components/Results.vue | 18 +++ .../components/detail/CharacteristicaCard.vue | 1 - .../components/navigation/DropDownMenu.vue | 25 +-- .../src/components/navigation/Navigation.vue | 4 +- .../navigation/NavigationSecondary.vue | 13 -- .../src/components/tables/StudiesTable.vue | 101 +++++++------ frontend/src/components/tables/TableTabs.vue | 142 ++++++++++++++++++ frontend/src/router.js | 8 +- 8 files changed, 235 insertions(+), 77 deletions(-) create mode 100644 frontend/src/components/Results.vue delete mode 100644 frontend/src/components/navigation/NavigationSecondary.vue create mode 100644 frontend/src/components/tables/TableTabs.vue diff --git a/frontend/src/components/Results.vue b/frontend/src/components/Results.vue new file mode 100644 index 00000000..394146cb --- /dev/null +++ b/frontend/src/components/Results.vue @@ -0,0 +1,18 @@ + + + + + diff --git a/frontend/src/components/detail/CharacteristicaCard.vue b/frontend/src/components/detail/CharacteristicaCard.vue index e95641c8..46ef8e03 100644 --- a/frontend/src/components/detail/CharacteristicaCard.vue +++ b/frontend/src/components/detail/CharacteristicaCard.vue @@ -137,7 +137,6 @@ number = Number.toExponential(num) } */ - console.log(number); return number }, }, diff --git a/frontend/src/components/navigation/DropDownMenu.vue b/frontend/src/components/navigation/DropDownMenu.vue index 3c8317e5..79421dd6 100644 --- a/frontend/src/components/navigation/DropDownMenu.vue +++ b/frontend/src/components/navigation/DropDownMenu.vue @@ -12,16 +12,17 @@ - + - {{ faIcon('curation') }} - + {{ faIcon('curation') }} + + Curation - + {{ faIcon('api') }} @@ -31,13 +32,6 @@ - - @@ -47,12 +41,6 @@ - - {{ faIcon('account') }} @@ -79,6 +67,9 @@ export default { dialog: false, }), computed:{ + api_url() { + return this.$store.state.endpoints.api; + }, username(){ return this.$store.state.username } diff --git a/frontend/src/components/navigation/Navigation.vue b/frontend/src/components/navigation/Navigation.vue index 50e81415..58a6610f 100644 --- a/frontend/src/components/navigation/Navigation.vue +++ b/frontend/src/components/navigation/Navigation.vue @@ -10,12 +10,12 @@ - + {{ faIcon('data') }} {{ tables_label }} - {{ faIcon('search') }} Search + {{ faIcon('search') }} Search diff --git a/frontend/src/components/navigation/NavigationSecondary.vue b/frontend/src/components/navigation/NavigationSecondary.vue deleted file mode 100644 index 42024bc5..00000000 --- a/frontend/src/components/navigation/NavigationSecondary.vue +++ /dev/null @@ -1,13 +0,0 @@ - - - - - \ No newline at end of file diff --git a/frontend/src/components/tables/StudiesTable.vue b/frontend/src/components/tables/StudiesTable.vue index 641542cb..fc813957 100644 --- a/frontend/src/components/tables/StudiesTable.vue +++ b/frontend/src/components/tables/StudiesTable.vue @@ -1,37 +1,42 @@ - \ No newline at end of file + + \ No newline at end of file diff --git a/frontend/src/components/tables/TableTabs.vue b/frontend/src/components/tables/TableTabs.vue new file mode 100644 index 00000000..0adfc29b --- /dev/null +++ b/frontend/src/components/tables/TableTabs.vue @@ -0,0 +1,142 @@ + + + + + + + \ No newline at end of file diff --git a/frontend/src/router.js b/frontend/src/router.js index d343429c..4a5e6aa5 100644 --- a/frontend/src/router.js +++ b/frontend/src/router.js @@ -2,7 +2,8 @@ import Vue from 'vue'; import Router from 'vue-router'; import Home from './components/Home'; -import Data from './components/Data' +import Data from './components/Data'; +import Results from './components/Results' import Search from './components/Search'; import Page404 from './components/Page404'; import Curation from './components/Curation'; @@ -33,6 +34,11 @@ export default new Router({ name: 'Data', component: Data }, + { + path: '/results', + name: 'Results', + component: Results + }, { path: '/curation', name: 'Curation', From 88f89380960c4f6eab77f0c86bed5154b7328397 Mon Sep 17 00:00:00 2001 From: Jan Grzegorzewski Date: Wed, 26 Aug 2020 14:23:53 +0200 Subject: [PATCH 009/207] tables design --- .../src/components/tables/StudiesTable.vue | 24 +++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/frontend/src/components/tables/StudiesTable.vue b/frontend/src/components/tables/StudiesTable.vue index fc813957..ca3beb4f 100644 --- a/frontend/src/components/tables/StudiesTable.vue +++ b/frontend/src/components/tables/StudiesTable.vue @@ -1,14 +1,12 @@ @@ -97,8 +92,23 @@ Xref, }, mixins: [searchTableMixin], + mounted() { + this.$nextTick(() => { + window.addEventListener('resize', this.onResize); + }) + }, + + beforeDestroy() { + window.removeEventListener('resize', this.onResize); + }, + methods: { + onResize() { + this.windowHeight = window.innerHeight-250 + } + }, data () { return { + windowHeight: window.innerHeight-250, otype: "studies", otype_single: "study", headers: [ From ef24a617cc6d15db1c3f107ecc1720b009ff3e1f Mon Sep 17 00:00:00 2001 From: Jan Grzegorzewski Date: Wed, 26 Aug 2020 16:35:32 +0200 Subject: [PATCH 010/207] redesign --- frontend/src/App.vue | 2 +- frontend/src/components/main.vue | 13 ------------- frontend/src/components/tables/GroupsTable.vue | 3 +++ .../src/components/tables/IndividualsTable.vue | 3 +++ .../src/components/tables/InfoNodeTable.vue | 3 +++ .../components/tables/InterventionsTable.vue | 3 +++ frontend/src/components/tables/OutputsTable.vue | 3 +++ .../src/components/tables/ReferencesTable.vue | 3 +++ frontend/src/components/tables/StudiesTable.vue | 17 +---------------- .../src/components/tables/TimecoursesTable.vue | 3 +++ frontend/src/components/tables/mixins.js | 15 ++++++++++++++- 11 files changed, 37 insertions(+), 31 deletions(-) delete mode 100644 frontend/src/components/main.vue diff --git a/frontend/src/App.vue b/frontend/src/App.vue index 31429383..3e91ff4b 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -58,7 +58,7 @@ padding: 0px; text-align: left; } - + html { overflow-y: auto !important; } .search-navbar { position: fixed; top: 48px; diff --git a/frontend/src/components/main.vue b/frontend/src/components/main.vue deleted file mode 100644 index 4d28997d..00000000 --- a/frontend/src/components/main.vue +++ /dev/null @@ -1,13 +0,0 @@ - - - - - \ No newline at end of file diff --git a/frontend/src/components/tables/GroupsTable.vue b/frontend/src/components/tables/GroupsTable.vue index d7dee722..2433ab2d 100644 --- a/frontend/src/components/tables/GroupsTable.vue +++ b/frontend/src/components/tables/GroupsTable.vue @@ -2,6 +2,9 @@ { - window.addEventListener('resize', this.onResize); - }) - }, - beforeDestroy() { - window.removeEventListener('resize', this.onResize); - }, - methods: { - onResize() { - this.windowHeight = window.innerHeight-250 - } - }, data () { return { - windowHeight: window.innerHeight-250, otype: "studies", otype_single: "study", headers: [ diff --git a/frontend/src/components/tables/TimecoursesTable.vue b/frontend/src/components/tables/TimecoursesTable.vue index c45cd546..40fd9325 100644 --- a/frontend/src/components/tables/TimecoursesTable.vue +++ b/frontend/src/components/tables/TimecoursesTable.vue @@ -2,6 +2,9 @@ { + window.addEventListener('resize', this.onResize); + }) this.getData() }, + + beforeDestroy() { + window.removeEventListener('resize', this.onResize); + }, watch: { + pagination: { handler() { this.getData() @@ -127,6 +137,9 @@ let searchTableMixin = { } }, methods: { + onResize() { + this.windowHeight = window.innerHeight-230 + }, faIcon(key) { return lookupIcon(key) }, From 722639dc4adb554b917402aaf91a4b433cefbb74 Mon Sep 17 00:00:00 2001 From: Jan Grzegorzewski Date: Wed, 26 Aug 2020 16:55:29 +0200 Subject: [PATCH 011/207] working on froentend search --- frontend/src/components/Results.vue | 13 +++- .../components/search/SearchNavigation.vue | 63 +++++++++++++++++++ frontend/src/components/tables/TableTabs.vue | 1 + 3 files changed, 75 insertions(+), 2 deletions(-) create mode 100644 frontend/src/components/search/SearchNavigation.vue diff --git a/frontend/src/components/Results.vue b/frontend/src/components/Results.vue index 394146cb..2fbb1d16 100644 --- a/frontend/src/components/Results.vue +++ b/frontend/src/components/Results.vue @@ -1,13 +1,22 @@ + + \ No newline at end of file diff --git a/frontend/src/components/tables/TableTabs.vue b/frontend/src/components/tables/TableTabs.vue index 0adfc29b..8b34d3ec 100644 --- a/frontend/src/components/tables/TableTabs.vue +++ b/frontend/src/components/tables/TableTabs.vue @@ -1,5 +1,6 @@ diff --git a/frontend/src/components/Overview.vue b/frontend/src/components/Overview.vue deleted file mode 100644 index ec034963..00000000 --- a/frontend/src/components/Overview.vue +++ /dev/null @@ -1,87 +0,0 @@ - - - - - \ No newline at end of file diff --git a/frontend/src/components/FooterBar.vue b/frontend/src/components/deprecated/FooterBar.vue similarity index 100% rename from frontend/src/components/FooterBar.vue rename to frontend/src/components/deprecated/FooterBar.vue diff --git a/frontend/src/components/ListView.vue b/frontend/src/components/deprecated/ListView.vue similarity index 92% rename from frontend/src/components/ListView.vue rename to frontend/src/components/deprecated/ListView.vue index 85b918ed..a966bcb1 100644 --- a/frontend/src/components/ListView.vue +++ b/frontend/src/components/deprecated/ListView.vue @@ -15,7 +15,7 @@ \ No newline at end of file diff --git a/frontend/src/components/search/StudySearchForm.vue b/frontend/src/components/search/StudySearchForm.vue index d473973e..3559599f 100644 --- a/frontend/src/components/search/StudySearchForm.vue +++ b/frontend/src/components/search/StudySearchForm.vue @@ -5,8 +5,8 @@ - - + + diff --git a/frontend/src/components/search/SubjectSearchForm.vue b/frontend/src/components/search/SubjectSearchForm.vue index 98b92048..6c11151a 100644 --- a/frontend/src/components/search/SubjectSearchForm.vue +++ b/frontend/src/components/search/SubjectSearchForm.vue @@ -3,12 +3,10 @@ - - - + + + - - diff --git a/frontend/src/components/tables/TableTabs.vue b/frontend/src/components/tables/TableTabs.vue index f7802030..0adaaed3 100644 --- a/frontend/src/components/tables/TableTabs.vue +++ b/frontend/src/components/tables/TableTabs.vue @@ -13,6 +13,7 @@ :key="item.tab" :href="'#'+ item.tab" > + {{ item.tab }} ({{results[item.tab].count}}) {{ faIcon(item.tab) }} @@ -26,19 +27,20 @@ :key="item.tab" :value="item.tab" > - + - - - - From 2d2c9194d90ac06f392ce1ea7cbc268b6d495371 Mon Sep 17 00:00:00 2001 From: Jan Grzegorzewski Date: Wed, 9 Sep 2020 19:58:52 +0200 Subject: [PATCH 074/207] info nodes contain name now --- backend/pkdb_app/documents.py | 1 + 1 file changed, 1 insertion(+) diff --git a/backend/pkdb_app/documents.py b/backend/pkdb_app/documents.py index 0a1f6afe..d8ccd648 100644 --- a/backend/pkdb_app/documents.py +++ b/backend/pkdb_app/documents.py @@ -72,6 +72,7 @@ def info_node(attr, **kwargs): attr=attr, properties={ 'sid': string_field('sid'), + 'name': string_field('name'), 'label': string_field('label'), }, **kwargs From 38a4639b580694c6abaedd61c0f5e124d0c57d4f Mon Sep 17 00:00:00 2001 From: Matthias Koenig Date: Wed, 9 Sep 2020 22:42:41 +0200 Subject: [PATCH 075/207] fix units display --- frontend/src/components/detail/CharacteristicaCard.vue | 7 +++++-- frontend/src/components/tables/TableTabs.vue | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/frontend/src/components/detail/CharacteristicaCard.vue b/frontend/src/components/detail/CharacteristicaCard.vue index f45aea95..0eb9fc62 100644 --- a/frontend/src/components/detail/CharacteristicaCard.vue +++ b/frontend/src/components/detail/CharacteristicaCard.vue @@ -1,12 +1,14 @@ @@ -140,12 +150,14 @@ import SearchHelp from "../search/SearchHelp"; import StudyOverview from "../detail/StudyOverview"; import {searchTableMixin} from "../tables/mixins"; import {SearchMixin} from "../../search"; +import ConciseCheckBox from "./ConciseCheckBox"; export default { mixins: [searchTableMixin, SearchMixin], name: "SearchNavigation", components: { + ConciseCheckBox, CountBadge, StudyOverview, SearchHelp, @@ -264,4 +276,5 @@ export default { \ No newline at end of file diff --git a/frontend/src/search.js b/frontend/src/search.js index 50168697..80c3ad39 100644 --- a/frontend/src/search.js +++ b/frontend/src/search.js @@ -105,6 +105,9 @@ let SearchMixin = { url = url + "&" + "studies__licence__in=" + [...licence__in].join("__") } } + if(!this.$store.state.concise){ + url = url + "&" + "concise=false" + } return url }, }, diff --git a/frontend/src/store.js b/frontend/src/store.js index 0ff4fd51..8bd36114 100644 --- a/frontend/src/store.js +++ b/frontend/src/store.js @@ -36,7 +36,9 @@ const vuexLocalStorage = new VuexPersist({ }); // Initial search values +const initial_concise = true const initial_queries = { + //studies studies__sid__in: [], @@ -97,6 +99,7 @@ export default new Vuex.Store({ data_info_type: "study", // search queries + concise: initial_concise, queries: initial_queries, licence_boolean:initial_licence_boolean, subjects_boolean: initial_subjects_boolean, @@ -156,6 +159,7 @@ export default new Vuex.Store({ }, mutations: { resetQuery(state){ + Object.assign(state.concise, initial_concise) Object.assign(state.queries, initial_queries) Object.assign(state.subjects_boolean, initial_subjects_boolean) Object.assign(state.subjects_queries, initial_subjects_queries) From 34b96767d5cfb94219b77b8e17bbc23fe9ab8d4b Mon Sep 17 00:00:00 2001 From: Jan Grzegorzewski Date: Wed, 16 Sep 2020 15:42:09 +0200 Subject: [PATCH 097/207] study links not concise data --- frontend/src/components/Data.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/frontend/src/components/Data.vue b/frontend/src/components/Data.vue index 4cf4877b..3b09be4f 100644 --- a/frontend/src/components/Data.vue +++ b/frontend/src/components/Data.vue @@ -78,7 +78,11 @@ export default { "key": "studies__sid__in", "value": [study_info]} this.update_store(study) - }, + + this.$store.dispatch('updateAction', { + "key": "concise", + "value": false}) + }, reset() { this.$store.commit('resetQuery'); }, From 87d6c8d3186240b07dd41a197192bb4fe043ac32 Mon Sep 17 00:00:00 2001 From: Jan Grzegorzewski Date: Wed, 16 Sep 2020 17:23:29 +0200 Subject: [PATCH 098/207] refactoring --- .../lib/buttons/ClearSearchButton.vue | 25 +++++ .../components/lib/buttons/DownloadButton.vue | 41 +++++++ .../lib/buttons/SearchHelpButton.vue | 32 ++++++ .../components/search/SearchNavigation.vue | 101 ++++-------------- frontend/src/storeInteraction.js | 54 ++++++++++ 5 files changed, 171 insertions(+), 82 deletions(-) create mode 100644 frontend/src/components/lib/buttons/ClearSearchButton.vue create mode 100644 frontend/src/components/lib/buttons/DownloadButton.vue create mode 100644 frontend/src/components/lib/buttons/SearchHelpButton.vue create mode 100644 frontend/src/storeInteraction.js diff --git a/frontend/src/components/lib/buttons/ClearSearchButton.vue b/frontend/src/components/lib/buttons/ClearSearchButton.vue new file mode 100644 index 00000000..e8be98c0 --- /dev/null +++ b/frontend/src/components/lib/buttons/ClearSearchButton.vue @@ -0,0 +1,25 @@ + + + + + \ No newline at end of file diff --git a/frontend/src/components/lib/buttons/DownloadButton.vue b/frontend/src/components/lib/buttons/DownloadButton.vue new file mode 100644 index 00000000..e3a0729d --- /dev/null +++ b/frontend/src/components/lib/buttons/DownloadButton.vue @@ -0,0 +1,41 @@ + + + + + \ No newline at end of file diff --git a/frontend/src/components/lib/buttons/SearchHelpButton.vue b/frontend/src/components/lib/buttons/SearchHelpButton.vue new file mode 100644 index 00000000..e97847fb --- /dev/null +++ b/frontend/src/components/lib/buttons/SearchHelpButton.vue @@ -0,0 +1,32 @@ + + + + + \ No newline at end of file diff --git a/frontend/src/components/search/SearchNavigation.vue b/frontend/src/components/search/SearchNavigation.vue index 319db7e5..2274930e 100644 --- a/frontend/src/components/search/SearchNavigation.vue +++ b/frontend/src/components/search/SearchNavigation.vue @@ -14,46 +14,24 @@ {{ faIcon('search') }} - + + + + - + + - - {{ faIcon('download') }} + + + + + - - - fas fa fa-trash-alt - - - fas fa fa-question - Date: Wed, 16 Sep 2020 17:30:45 +0200 Subject: [PATCH 099/207] refactoring --- .../lib/buttons/HideSearchButton.vue | 27 +++++++++++ .../components/search/SearchNavigation.vue | 46 ++++++------------- 2 files changed, 41 insertions(+), 32 deletions(-) create mode 100644 frontend/src/components/lib/buttons/HideSearchButton.vue diff --git a/frontend/src/components/lib/buttons/HideSearchButton.vue b/frontend/src/components/lib/buttons/HideSearchButton.vue new file mode 100644 index 00000000..6c3f27b8 --- /dev/null +++ b/frontend/src/components/lib/buttons/HideSearchButton.vue @@ -0,0 +1,27 @@ + + + + + \ No newline at end of file diff --git a/frontend/src/components/search/SearchNavigation.vue b/frontend/src/components/search/SearchNavigation.vue index 2274930e..da1c821c 100644 --- a/frontend/src/components/search/SearchNavigation.vue +++ b/frontend/src/components/search/SearchNavigation.vue @@ -31,25 +31,11 @@ - - - - {{ faIcon("left_arrow") }} - + + - - - + @@ -64,20 +50,17 @@ {{faIcon("groups")}} - - Groups - - | - {{faIcon("individuals")}} - - Individuals - + + Groups + + | + {{faIcon("individuals")}} + + Individuals + - + {{faIcon("interventions")}} @@ -133,11 +116,13 @@ import ClearSearchButton from "../lib/buttons/ClearSearchButton"; import DownloadButton from "../lib/buttons/DownloadButton"; import SearchHelpButton from "../lib/buttons/SearchHelpButton"; import {StoreInteractionMixin} from "../../storeInteraction"; +import HideSearchButton from "../lib/buttons/HideSearchButton"; export default { mixins: [searchTableMixin, SearchMixin, StoreInteractionMixin], name: "SearchNavigation", components: { + HideSearchButton, SearchHelpButton, DownloadButton, ClearSearchButton, @@ -153,9 +138,6 @@ export default { OutputForm, }, methods: { - reset() { - this.$store.commit('resetQuery'); - }, update_subject_query(emitted_object) { this.subject_queries = emitted_object; }, From cb3d9e781214e6ff86443473aecab03383f3c9da Mon Sep 17 00:00:00 2001 From: Jan Grzegorzewski Date: Wed, 16 Sep 2020 21:23:30 +0200 Subject: [PATCH 100/207] refactoring --- frontend/src/components/Data.vue | 34 ++----------- .../src/components/search/ConciseCheckBox.vue | 16 ++---- .../components/search/SubjectSearchForm.vue | 39 ++------------- frontend/src/storeInteraction.js | 49 +++++++++++++++++++ 4 files changed, 58 insertions(+), 80 deletions(-) diff --git a/frontend/src/components/Data.vue b/frontend/src/components/Data.vue index 3b09be4f..21ff6d52 100644 --- a/frontend/src/components/Data.vue +++ b/frontend/src/components/Data.vue @@ -10,9 +10,11 @@ import TableTabs from './tables/TableTabs'; import SearchNavigation from './search/SearchNavigation' import axios from 'axios' +import {StoreInteractionMixin} from "../storeInteraction"; export default { name: "Data", + mixins: [StoreInteractionMixin], components: { SearchNavigation, TableTabs @@ -25,17 +27,7 @@ export default { sid(){ return this.$route.params.sid }, - hide_search: { - get() { - return this.$store.state.hide_search - }, - set(value) { - this.$store.dispatch('updateAction', { - key: "hide_search", - value: value, - }) - } - }, + }, created() { if(this.sid){ @@ -72,27 +64,7 @@ export default { }) .finally(() => this.loading = false); }, - updateSearch(study_info) { - let study = { - "query_type": "queries", - "key": "studies__sid__in", - "value": [study_info]} - this.update_store(study) - this.$store.dispatch('updateAction', { - "key": "concise", - "value": false}) - }, - reset() { - this.$store.commit('resetQuery'); - }, - update_store(q) { - this.$store.dispatch('updateQueryAction', { - query_type: q.query_type, - key: q.key, - value: q.value, - }) - } }} diff --git a/frontend/src/components/search/ConciseCheckBox.vue b/frontend/src/components/search/ConciseCheckBox.vue index cf7b290c..0a8b6340 100644 --- a/frontend/src/components/search/ConciseCheckBox.vue +++ b/frontend/src/components/search/ConciseCheckBox.vue @@ -10,21 +10,11 @@ > diff --git a/frontend/src/components/search/SubjectSearchForm.vue b/frontend/src/components/search/SubjectSearchForm.vue index 6c11151a..01ca50c9 100644 --- a/frontend/src/components/search/SubjectSearchForm.vue +++ b/frontend/src/components/search/SubjectSearchForm.vue @@ -13,49 +13,16 @@ \ No newline at end of file diff --git a/frontend/src/storeInteraction.js b/frontend/src/storeInteraction.js index f37aac10..564cbaa7 100644 --- a/frontend/src/storeInteraction.js +++ b/frontend/src/storeInteraction.js @@ -3,8 +3,57 @@ let StoreInteractionMixin = { reset() { this.$store.commit('resetQuery'); }, + updateSearch(study_info) { + let study = { + "query_type": "queries", + "key": "studies__sid__in", + "value": [study_info]} + this.update_store(study) + this.concise = false + }, + + update_store(q) { + this.$store.dispatch('updateQueryAction', { + query_type: q.query_type, + key: q.key, + value: q.value, + }) + } }, computed: { + individuals_query: { + get(){ + return this.$store.state.subjects_boolean.individuals_query + }, + set (value) { + this.$store.dispatch('updateQueryAction', { + query_type: "subjects_boolean", + key: "individuals_query", + value: value, }) + } + }, + groups_query: { + get(){ + return this.$store.state.subjects_boolean.groups_query + }, + set (value) { + this.$store.dispatch('updateQueryAction', { + query_type: "subjects_boolean", + key: "groups_query", + value: value, }) + }, + }, + concise: { + get(){ + return this.$store.state.concise + }, + set(value) { + this.$store.dispatch('updateAction', { + key: "concise", + value: value, + }) + } + }, display_detail: { get() { return this.$store.state.display_detail From d6771c34982b92e30daf035d521571f1934445a9 Mon Sep 17 00:00:00 2001 From: Jan Grzegorzewski Date: Wed, 16 Sep 2020 21:44:04 +0200 Subject: [PATCH 101/207] further refactoring --- frontend/src/components/Data.vue | 6 ++-- .../components/deprecated/ReferencesTable.vue | 2 +- frontend/src/components/deprecated/Search.vue | 3 +- .../components/detail/CharacteristicaCard.vue | 12 ++++---- .../src/components/detail/InfoNodeDetail.vue | 6 ++-- .../src/components/detail/StudyOverview.vue | 6 ++-- .../src/components/info_node/Annotation.vue | 9 +++--- frontend/src/components/info_node/Xref.vue | 9 ++---- frontend/src/components/lib/NodeElement.vue | 13 ++++----- .../src/components/lib/buttons/LinkButton.vue | 28 +++++++++---------- .../src/components/tables/GroupsTable.vue | 4 +-- .../components/tables/IndividualsTable.vue | 4 +-- .../components/tables/InterventionsTable.vue | 4 +-- .../src/components/tables/OutputsTable.vue | 4 +-- .../src/components/tables/ScatterTable.vue | 4 +-- .../src/components/tables/StudiesTable.vue | 12 ++------ .../components/tables/TimecoursesTable.vue | 4 +-- frontend/src/storeInteraction.js | 11 ++++++++ 18 files changed, 70 insertions(+), 71 deletions(-) diff --git a/frontend/src/components/Data.vue b/frontend/src/components/Data.vue index 21ff6d52..a1884f9f 100644 --- a/frontend/src/components/Data.vue +++ b/frontend/src/components/Data.vue @@ -50,9 +50,9 @@ export default { .then(response => { if(response.data.sid) { this.updateSearch(response.data) - this.$store.state.show_type = "study"; - this.$store.state.detail_info = response.data; - this.$store.state.display_detail = true; + this.show_type = "study"; + this.detail_info = response.data; + this.display_detail = true; }else{ this.$route.push('/404') } diff --git a/frontend/src/components/deprecated/ReferencesTable.vue b/frontend/src/components/deprecated/ReferencesTable.vue index 0e28c036..4b5747a0 100644 --- a/frontend/src/components/deprecated/ReferencesTable.vue +++ b/frontend/src/components/deprecated/ReferencesTable.vue @@ -14,7 +14,7 @@ :footer-props="footer_options" > diff --git a/frontend/src/components/info_node/Xref.vue b/frontend/src/components/info_node/Xref.vue index ab066151..9e0719d9 100644 --- a/frontend/src/components/info_node/Xref.vue +++ b/frontend/src/components/info_node/Xref.vue @@ -14,8 +14,11 @@ diff --git a/frontend/src/components/lib/NodeElement.vue b/frontend/src/components/lib/NodeElement.vue index ff5d5736..faab748d 100644 --- a/frontend/src/components/lib/NodeElement.vue +++ b/frontend/src/components/lib/NodeElement.vue @@ -9,9 +9,12 @@ diff --git a/frontend/src/components/lib/buttons/LinkButton.vue b/frontend/src/components/lib/buttons/LinkButton.vue index c36f5e20..8b41e09c 100644 --- a/frontend/src/components/lib/buttons/LinkButton.vue +++ b/frontend/src/components/lib/buttons/LinkButton.vue @@ -15,13 +15,15 @@ diff --git a/frontend/src/components/tables/GroupsTable.vue b/frontend/src/components/tables/GroupsTable.vue index cc5d96f9..24560421 100644 --- a/frontend/src/components/tables/GroupsTable.vue +++ b/frontend/src/components/tables/GroupsTable.vue @@ -16,9 +16,9 @@ :footer-props="footer_options" > \ No newline at end of file diff --git a/frontend/src/components/detail/CharacteristicaCardDeck.vue b/frontend/src/components/detail/CharacteristicaCardDeck.vue index 08a94e28..4ddf2347 100644 --- a/frontend/src/components/detail/CharacteristicaCardDeck.vue +++ b/frontend/src/components/detail/CharacteristicaCardDeck.vue @@ -1,6 +1,6 @@ @@ -27,6 +38,11 @@ type: Array, required: true }, + layout: { + type: Boolean, + default: true + }, + }, methods: { f_sort : function(a, b) { diff --git a/frontend/src/components/detail/FileImageView.vue b/frontend/src/components/detail/FileImageView.vue index 88eead22..02387985 100644 --- a/frontend/src/components/detail/FileImageView.vue +++ b/frontend/src/components/detail/FileImageView.vue @@ -1,5 +1,5 @@ \ No newline at end of file diff --git a/frontend/src/components/detail/StudyOverview.vue b/frontend/src/components/detail/StudyOverview.vue index c7d879b2..994bf585 100644 --- a/frontend/src/components/detail/StudyOverview.vue +++ b/frontend/src/components/detail/StudyOverview.vue @@ -1,114 +1,116 @@ \ No newline at end of file diff --git a/frontend/src/components/lib/Annotations.vue b/frontend/src/components/lib/Annotations.vue index 6c7007b0..ca54b259 100644 --- a/frontend/src/components/lib/Annotations.vue +++ b/frontend/src/components/lib/Annotations.vue @@ -1,9 +1,8 @@ + + \ No newline at end of file diff --git a/frontend/src/components/detail/GroupDetail.vue b/frontend/src/components/detail/GroupDetail.vue deleted file mode 100644 index e4ebf5b1..00000000 --- a/frontend/src/components/detail/GroupDetail.vue +++ /dev/null @@ -1,73 +0,0 @@ - - - - - \ No newline at end of file diff --git a/frontend/src/components/detail/InfoNodeDetail.vue b/frontend/src/components/detail/InfoNodeDetail.vue index 217f78e7..8f2323cd 100644 --- a/frontend/src/components/detail/InfoNodeDetail.vue +++ b/frontend/src/components/detail/InfoNodeDetail.vue @@ -1,33 +1,34 @@ diff --git a/frontend/src/components/detail/StudyOverview.vue b/frontend/src/components/detail/StudyOverview.vue index 994bf585..22fb73f1 100644 --- a/frontend/src/components/detail/StudyOverview.vue +++ b/frontend/src/components/detail/StudyOverview.vue @@ -1,22 +1,18 @@ + + \ No newline at end of file diff --git a/frontend/src/components/navigation/DetailDrawer.vue b/frontend/src/components/navigation/DetailDrawer.vue index 64640fe4..e91723f0 100644 --- a/frontend/src/components/navigation/DetailDrawer.vue +++ b/frontend/src/components/navigation/DetailDrawer.vue @@ -24,19 +24,7 @@ - - -
- - - - - - - - - -
+ @@ -45,55 +33,17 @@ import {IconsMixin} from "../../icons"; -import SearchHelp from "../search/SearchHelp"; -import InfoNodeDetail from "../detail/InfoNodeDetail"; -import StudyOverview from "../detail/StudyOverview"; -import GroupDetail from "../detail/GroupDetail"; -import IndividualDetail from "../detail/IndividualDetail"; -import InterventionDetail from "../detail/InterventionDetail"; +import DetailContent from "../detail/DetailContent"; +import {StoreInteractionMixin} from "../../storeInteraction"; export default { name: 'DetailDrawer', - components: {InterventionDetail, IndividualDetail, GroupDetail, SearchHelp, StudyOverview,InfoNodeDetail}, - mixins: [IconsMixin], + components: { + DetailContent}, + mixins: [IconsMixin, StoreInteractionMixin], data: () => ({ drawer:true }), - computed:{ - mini: { - get() { - return !this.$store.state.display_detail - }, - set(value) { - this.$store.dispatch('updateAction', { - key: "display_detail", - value: !value, - }) - } - }, - detail_info: { - get() { - return this.$store.state.detail_info - }, - set(value) { - this.$store.dispatch('updateAction', { - key: "detail_info", - value: value, - }) - } - }, - show_type: { - get() { - return this.$store.state.show_type - }, - set(value) { - this.$store.dispatch('updateAction', { - key: "show_type", - value: value, - }) - } - } - } } diff --git a/frontend/src/components/search/SearchHelp.vue b/frontend/src/components/search/SearchHelp.vue index d011e0c0..fe56c61d 100644 --- a/frontend/src/components/search/SearchHelp.vue +++ b/frontend/src/components/search/SearchHelp.vue @@ -1,21 +1,21 @@ From 276ceb58d39dbe91e0301e8b0ce5b316207d4032 Mon Sep 17 00:00:00 2001 From: Jan Grzegorzewski Date: Wed, 30 Sep 2020 13:00:10 +0200 Subject: [PATCH 189/207] better info nodes formating --- frontend/src/components/detail/InfoNodeDetail.vue | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/frontend/src/components/detail/InfoNodeDetail.vue b/frontend/src/components/detail/InfoNodeDetail.vue index 8f2323cd..dbd2a3cf 100644 --- a/frontend/src/components/detail/InfoNodeDetail.vue +++ b/frontend/src/components/detail/InfoNodeDetail.vue @@ -4,7 +4,7 @@
- {{ data.ntype.toUpperCase() }} + {{ data.ntype.toUpperCase() }} ({{ data.dtype.toUpperCase() }})
{{ data.label }} @@ -16,6 +16,8 @@ > {{ substance_class.toUpperCase() }} + + Parents: Date: Wed, 30 Sep 2020 13:07:19 +0200 Subject: [PATCH 190/207] removed derecated --- .../src/components/deprecated/FooterBar.vue | 20 -- frontend/src/components/deprecated/Group.vue | 34 --- frontend/src/components/deprecated/Groups.vue | 17 -- .../src/components/deprecated/Individual.vue | 32 --- .../deprecated/IndividualDetail.vue | 48 ---- .../src/components/deprecated/Individuals.vue | 1 - .../src/components/deprecated/InfoNode.vue | 40 ---- .../components/deprecated/Intervention.vue | 30 --- .../components/deprecated/Interventions.vue | 17 -- .../src/components/deprecated/ListView.vue | 33 --- .../MeasurementTypeSearchChoice.vue | 131 ----------- .../MeasurementTypeSearchSingle.vue | 125 ---------- frontend/src/components/deprecated/Output.vue | 30 --- .../src/components/deprecated/Outputs.vue | 18 -- .../src/components/deprecated/Reference.vue | 31 --- .../components/deprecated/ReferenceDialog.vue | 64 ------ .../src/components/deprecated/References.vue | 18 -- .../components/deprecated/ReferencesTable.vue | 71 ------ frontend/src/components/deprecated/Search.vue | 214 ------------------ .../src/components/deprecated/Studies.vue | 16 -- frontend/src/components/deprecated/Study.vue | 48 ---- .../src/components/deprecated/Timecourse.vue | 30 --- .../src/components/deprecated/Timecourses.vue | 17 -- .../src/components/detail/InfoNodeDetail.vue | 9 +- .../components/search/SearchNavigation.vue | 2 - 25 files changed, 7 insertions(+), 1089 deletions(-) delete mode 100644 frontend/src/components/deprecated/FooterBar.vue delete mode 100644 frontend/src/components/deprecated/Group.vue delete mode 100644 frontend/src/components/deprecated/Groups.vue delete mode 100644 frontend/src/components/deprecated/Individual.vue delete mode 100644 frontend/src/components/deprecated/IndividualDetail.vue delete mode 100644 frontend/src/components/deprecated/Individuals.vue delete mode 100644 frontend/src/components/deprecated/InfoNode.vue delete mode 100644 frontend/src/components/deprecated/Intervention.vue delete mode 100644 frontend/src/components/deprecated/Interventions.vue delete mode 100644 frontend/src/components/deprecated/ListView.vue delete mode 100644 frontend/src/components/deprecated/MeasurementTypeSearchChoice.vue delete mode 100644 frontend/src/components/deprecated/MeasurementTypeSearchSingle.vue delete mode 100644 frontend/src/components/deprecated/Output.vue delete mode 100644 frontend/src/components/deprecated/Outputs.vue delete mode 100644 frontend/src/components/deprecated/Reference.vue delete mode 100644 frontend/src/components/deprecated/ReferenceDialog.vue delete mode 100644 frontend/src/components/deprecated/References.vue delete mode 100644 frontend/src/components/deprecated/ReferencesTable.vue delete mode 100644 frontend/src/components/deprecated/Search.vue delete mode 100644 frontend/src/components/deprecated/Studies.vue delete mode 100644 frontend/src/components/deprecated/Study.vue delete mode 100644 frontend/src/components/deprecated/Timecourse.vue delete mode 100644 frontend/src/components/deprecated/Timecourses.vue diff --git a/frontend/src/components/deprecated/FooterBar.vue b/frontend/src/components/deprecated/FooterBar.vue deleted file mode 100644 index e988773b..00000000 --- a/frontend/src/components/deprecated/FooterBar.vue +++ /dev/null @@ -1,20 +0,0 @@ - - - - - \ No newline at end of file diff --git a/frontend/src/components/deprecated/Group.vue b/frontend/src/components/deprecated/Group.vue deleted file mode 100644 index af4e2cfc..00000000 --- a/frontend/src/components/deprecated/Group.vue +++ /dev/null @@ -1,34 +0,0 @@ - - - - \ No newline at end of file diff --git a/frontend/src/components/deprecated/Groups.vue b/frontend/src/components/deprecated/Groups.vue deleted file mode 100644 index e5f24643..00000000 --- a/frontend/src/components/deprecated/Groups.vue +++ /dev/null @@ -1,17 +0,0 @@ - - - - - diff --git a/frontend/src/components/deprecated/Individual.vue b/frontend/src/components/deprecated/Individual.vue deleted file mode 100644 index ec1e8d98..00000000 --- a/frontend/src/components/deprecated/Individual.vue +++ /dev/null @@ -1,32 +0,0 @@ - - - - \ No newline at end of file diff --git a/frontend/src/components/deprecated/IndividualDetail.vue b/frontend/src/components/deprecated/IndividualDetail.vue deleted file mode 100644 index a0ed5d1d..00000000 --- a/frontend/src/components/deprecated/IndividualDetail.vue +++ /dev/null @@ -1,48 +0,0 @@ - - - - - \ No newline at end of file diff --git a/frontend/src/components/deprecated/Individuals.vue b/frontend/src/components/deprecated/Individuals.vue deleted file mode 100644 index b27c7ff7..00000000 --- a/frontend/src/components/deprecated/Individuals.vue +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/frontend/src/components/deprecated/InfoNode.vue b/frontend/src/components/deprecated/InfoNode.vue deleted file mode 100644 index d26b13fd..00000000 --- a/frontend/src/components/deprecated/InfoNode.vue +++ /dev/null @@ -1,40 +0,0 @@ - - - - diff --git a/frontend/src/components/deprecated/Intervention.vue b/frontend/src/components/deprecated/Intervention.vue deleted file mode 100644 index 4cb06f74..00000000 --- a/frontend/src/components/deprecated/Intervention.vue +++ /dev/null @@ -1,30 +0,0 @@ - - - - \ No newline at end of file diff --git a/frontend/src/components/deprecated/Interventions.vue b/frontend/src/components/deprecated/Interventions.vue deleted file mode 100644 index e5797177..00000000 --- a/frontend/src/components/deprecated/Interventions.vue +++ /dev/null @@ -1,17 +0,0 @@ - - - - - \ No newline at end of file diff --git a/frontend/src/components/deprecated/ListView.vue b/frontend/src/components/deprecated/ListView.vue deleted file mode 100644 index a966bcb1..00000000 --- a/frontend/src/components/deprecated/ListView.vue +++ /dev/null @@ -1,33 +0,0 @@ - - - - - \ No newline at end of file diff --git a/frontend/src/components/deprecated/MeasurementTypeSearchChoice.vue b/frontend/src/components/deprecated/MeasurementTypeSearchChoice.vue deleted file mode 100644 index 3229238b..00000000 --- a/frontend/src/components/deprecated/MeasurementTypeSearchChoice.vue +++ /dev/null @@ -1,131 +0,0 @@ - - - - - \ No newline at end of file diff --git a/frontend/src/components/deprecated/MeasurementTypeSearchSingle.vue b/frontend/src/components/deprecated/MeasurementTypeSearchSingle.vue deleted file mode 100644 index 18b5c14a..00000000 --- a/frontend/src/components/deprecated/MeasurementTypeSearchSingle.vue +++ /dev/null @@ -1,125 +0,0 @@ - - - - \ No newline at end of file diff --git a/frontend/src/components/deprecated/Output.vue b/frontend/src/components/deprecated/Output.vue deleted file mode 100644 index 467b1d47..00000000 --- a/frontend/src/components/deprecated/Output.vue +++ /dev/null @@ -1,30 +0,0 @@ - - - - \ No newline at end of file diff --git a/frontend/src/components/deprecated/Outputs.vue b/frontend/src/components/deprecated/Outputs.vue deleted file mode 100644 index af51df99..00000000 --- a/frontend/src/components/deprecated/Outputs.vue +++ /dev/null @@ -1,18 +0,0 @@ - - - - - \ No newline at end of file diff --git a/frontend/src/components/deprecated/Reference.vue b/frontend/src/components/deprecated/Reference.vue deleted file mode 100644 index 8a2b7e9e..00000000 --- a/frontend/src/components/deprecated/Reference.vue +++ /dev/null @@ -1,31 +0,0 @@ - - - - \ No newline at end of file diff --git a/frontend/src/components/deprecated/ReferenceDialog.vue b/frontend/src/components/deprecated/ReferenceDialog.vue deleted file mode 100644 index 2dfe8f98..00000000 --- a/frontend/src/components/deprecated/ReferenceDialog.vue +++ /dev/null @@ -1,64 +0,0 @@ - - - - - \ No newline at end of file diff --git a/frontend/src/components/deprecated/References.vue b/frontend/src/components/deprecated/References.vue deleted file mode 100644 index ea891e4c..00000000 --- a/frontend/src/components/deprecated/References.vue +++ /dev/null @@ -1,18 +0,0 @@ - - - - - \ No newline at end of file diff --git a/frontend/src/components/deprecated/ReferencesTable.vue b/frontend/src/components/deprecated/ReferencesTable.vue deleted file mode 100644 index 4b5747a0..00000000 --- a/frontend/src/components/deprecated/ReferencesTable.vue +++ /dev/null @@ -1,71 +0,0 @@ - - - - - \ No newline at end of file diff --git a/frontend/src/components/deprecated/Search.vue b/frontend/src/components/deprecated/Search.vue deleted file mode 100644 index 2e097fdd..00000000 --- a/frontend/src/components/deprecated/Search.vue +++ /dev/null @@ -1,214 +0,0 @@ - - - - - diff --git a/frontend/src/components/deprecated/Studies.vue b/frontend/src/components/deprecated/Studies.vue deleted file mode 100644 index 0a6629e4..00000000 --- a/frontend/src/components/deprecated/Studies.vue +++ /dev/null @@ -1,16 +0,0 @@ - - - - - \ No newline at end of file diff --git a/frontend/src/components/deprecated/Study.vue b/frontend/src/components/deprecated/Study.vue deleted file mode 100644 index c01e2607..00000000 --- a/frontend/src/components/deprecated/Study.vue +++ /dev/null @@ -1,48 +0,0 @@ - - - - \ No newline at end of file diff --git a/frontend/src/components/deprecated/Timecourse.vue b/frontend/src/components/deprecated/Timecourse.vue deleted file mode 100644 index 01cfd129..00000000 --- a/frontend/src/components/deprecated/Timecourse.vue +++ /dev/null @@ -1,30 +0,0 @@ - - - - \ No newline at end of file diff --git a/frontend/src/components/deprecated/Timecourses.vue b/frontend/src/components/deprecated/Timecourses.vue deleted file mode 100644 index 42af5d6d..00000000 --- a/frontend/src/components/deprecated/Timecourses.vue +++ /dev/null @@ -1,17 +0,0 @@ - - - - - \ No newline at end of file diff --git a/frontend/src/components/detail/InfoNodeDetail.vue b/frontend/src/components/detail/InfoNodeDetail.vue index dbd2a3cf..f50f4277 100644 --- a/frontend/src/components/detail/InfoNodeDetail.vue +++ b/frontend/src/components/detail/InfoNodeDetail.vue @@ -7,7 +7,11 @@ {{ data.ntype.toUpperCase() }} ({{ data.dtype.toUpperCase() }}) - {{ data.label }} + + {{ faIcon(data.ntype) }} + {{ data.label }} + + Date: Wed, 30 Sep 2020 13:13:28 +0200 Subject: [PATCH 191/207] debug frontend --- frontend/src/components/lib/chips/ObjectChip.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/components/lib/chips/ObjectChip.vue b/frontend/src/components/lib/chips/ObjectChip.vue index d4cf03f9..a78051df 100644 --- a/frontend/src/components/lib/chips/ObjectChip.vue +++ b/frontend/src/components/lib/chips/ObjectChip.vue @@ -13,7 +13,7 @@ {{faIcon(otype)}}  {{ label }} - + {{ object.count }} Date: Wed, 30 Sep 2020 14:17:55 +0200 Subject: [PATCH 192/207] scatter icon repaired --- frontend/src/components/lib/Heading.vue | 7 ++++++- frontend/src/components/lib/chips/CountChip.vue | 2 +- frontend/src/components/tables/CountTable.vue | 2 +- frontend/src/components/tables/ScatterTable.vue | 2 +- frontend/src/components/tables/TableTabs.vue | 2 +- frontend/src/components/tables/TableToolbar.vue | 7 +++---- frontend/src/icons.js | 7 +++++-- frontend/src/main.js | 2 +- 8 files changed, 19 insertions(+), 12 deletions(-) diff --git a/frontend/src/components/lib/Heading.vue b/frontend/src/components/lib/Heading.vue index 18c1e7d9..2b34d500 100644 --- a/frontend/src/components/lib/Heading.vue +++ b/frontend/src/components/lib/Heading.vue @@ -1,6 +1,7 @@