diff --git a/README.md b/README.md index 40e88e27..6ea96275 100644 --- a/README.md +++ b/README.md @@ -7,10 +7,20 @@ This pilot project will prototype a new process that automates data collection f ## Starting from scratch + clone from git into target machine + cd pace-admin cp .env.template .env + curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.2/install.sh | bash + Logout of terminal and log back in + nvm install 13.14.0 + nvm use 13.14.0 + + Follow steps here to install docker: https://docs.docker.com/compose/install/ + make install - make cleardb - make start_docker + sudo snap install docker + sudo make cleardb + sudo make start_docker make migrate make newdb diff --git a/client/src/components/CenterReviewPubFilter.vue b/client/src/components/CenterReviewPubFilter.vue index 1a5d8e5c..a399ef5f 100644 --- a/client/src/components/CenterReviewPubFilter.vue +++ b/client/src/components/CenterReviewPubFilter.vue @@ -18,7 +18,7 @@ - + />--> - - -
- - -
-
- - - - - Clear All - -
-
- -
-
- -
-
-
-
- -
-
-
-
-
- - -
-
- - - - - diff --git a/client/src/components/MainFilter.vue b/client/src/components/MainFilter.vue index 241135eb..9ed9047a 100644 --- a/client/src/components/MainFilter.vue +++ b/client/src/components/MainFilter.vue @@ -28,8 +28,6 @@
- -
@@ -97,7 +95,20 @@ export default { selectedCenterPubSort: sync('filter/selectedCenterPubSort'), selectedCenterAuthor: sync('filter/selectedCenterAuthor'), centerAuthorOptions: sync('filter/centerAuthorOptions'), - pubSearch: sync('filter/pubSearch') + selectedMemberYears: sync('filter/selectedMemberYears'), + selectedInstitutions: sync('filter/selectedInstitutions'), + institutionOptions: sync('filter/institutionOptions'), + selectedPubYears: sync('filter/selectedPubYears'), + selectedPersonConfidence: sync('filter/selectedPersonConfidence'), + pubSearch: sync('filter/pubSearch'), + preferredPersonTotal: sync('filter/preferredPersonTotal'), + preferredPersonConfidence: sync('filter/preferredPersonConfidence'), + yearPubStaticMin: sync('filter/yearPubStaticMin'), + yearPubStaticMax: sync('filter/yearPubStaticMax'), + yearMemberStaticMin: sync('filter/yearMemberStaticMin'), + yearMemberStaticMax: sync('filter/yearMemberStaticMax'), + changedPubYears: sync('filter/changedPubYears'), + changedMemberYears: sync('filter/changedMemberYears') }, async created () { this.fetchData() @@ -123,6 +134,22 @@ export default { // console.log(`Current type review is: ${JSON.stringify(typeReview, null, 2)}`) return typeReview.value }) + }, + resetFilters () { + this.selectedPersonPubSort = this.preferredPersonPubSort + this.selectedCenterPubSort = this.selectedCenterPubSort + this.selectedPersonSort = this.preferredPersonSort + this.selectedPersonTotal = this.preferredPersonTotal + this.selectedPersonConfidence = this.preferredPersonConfidence + this.selectedPubYears = { + min: this.yearPubStaticMin, + max: this.yearPubStaticMax + } + this.selectedInstitutions = _.clone(this.institutionOptions) + this.selectedMemberYears = { + min: this.yearMemberStaticMin, + max: this.yearMemberStaticMax + } } } } diff --git a/client/src/components/PeopleAuthorReviewFilter.vue b/client/src/components/PeopleAuthorSortFilter.vue similarity index 53% rename from client/src/components/PeopleAuthorReviewFilter.vue rename to client/src/components/PeopleAuthorSortFilter.vue index 6302f97b..7cea2d68 100644 --- a/client/src/components/PeopleAuthorReviewFilter.vue +++ b/client/src/components/PeopleAuthorSortFilter.vue @@ -1,15 +1,6 @@