Rename Proposal to Project (#45)

This renames proposal to project across the repository. Signed-off-by: David Brown <dmlb2000@gmail.com>
pacifica · Mar 12, 2019 · 51ca03e · 51ca03e
1 parent 06ebf78
commit 51ca03e
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 23 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,10 +1,10 @@
 repos:
 -   repo: https://github.com/pre-commit/mirrors-autopep8
-    rev: v1.4
+    rev: v1.4.3
     hooks:
             -   id: autopep8
 -   repo: git://github.com/pre-commit/pre-commit-hooks
-    rev: v2.0.0
+    rev: v2.1.0
     hooks:
             -   id: fix-encoding-pragma
             -   id: trailing-whitespace

diff --git a/appveyor.yml b/appveyor.yml
@@ -125,7 +125,7 @@ test_script:
     coverage run --include='*/site-packages/pacifica/cli/*' -a -m pacifica.cli upload --dry-run --local-save retry.tar --local-compress BLAH;
     if ($LastExitCode -eq 0) { $host.SetShouldExit(-1); };
     echo "Done with failure testing";
-    coverage run --include='*/site-packages/pacifica/cli/*' -a -m pacifica.cli upload --dry-run --logon dmlb2001 --proposal-regex 'expired closed and end';
+    coverage run --include='*/site-packages/pacifica/cli/*' -a -m pacifica.cli upload --dry-run --logon dmlb2001 --project-regex 'expired closed and end';
     Invoke-WebRequest -Method POST -Headers @{ "content-type" = "application/json" } -Body '{ "network_id":"appveyor" }' http://localhost:8121/users?_id=10;
     Invoke-WebRequest -Method POST -Headers @{ "content-type" = "application/json" } -Body '{ "network_id":"someoneelse" }' http://localhost:8121/users?_id=11;
     coverage run --include='*/site-packages/pacifica/cli/*' -a -m pacifica.cli upload README.md;

diff --git a/docs/_static/uploader.json b/docs/_static/uploader.json
@@ -16,19 +16,19 @@
     "valueField": "_id"
   },
   {
-    "destinationTable": "Transactions.proposal",
+    "destinationTable": "Transactions.project",
     "displayFormat": "{_id} - {title}",
-    "displayTitle": "Proposal ID",
+    "displayTitle": "Project ID",
     "displayType": "select",
-    "metaID": "proposal",
+    "metaID": "project",
     "queryDependency": {
       "instrument_id": "instrument"
     },
     "queryFields": [
       "_id",
       "title"
     ],
-    "sourceTable": "proposals",
+    "sourceTable": "projects",
     "value": "",
     "valueField": "_id"
   },
@@ -56,7 +56,7 @@
     "key": "User of Record",
     "metaID": "user-of-record",
     "queryDependency": {
-      "proposal_id": "proposal"
+      "project_id": "project"
     },
     "queryFields": [
       "first_name",
@@ -70,16 +70,16 @@
   {
     "destinationTable": "NothingReally",
     "directoryOrder": 0,
-    "displayFormat": "Proposal ID {_id}",
+    "displayFormat": "Project ID {_id}",
     "displayType": "directoryTree",
-    "metaID": "directory-proposal",
+    "metaID": "directory-project",
     "queryDependency": {
-      "_id": "proposal"
+      "_id": "project"
     },
     "queryFields": [
       "_id"
     ],
-    "sourceTable": "proposals",
+    "sourceTable": "projects",
     "value": "",
     "valueField": "_id"
   }

diff --git a/docs/exampleusage.md b/docs/exampleusage.md
@@ -64,7 +64,7 @@ Instrument ID - Select an ID
 104 Transmogriscope - Nanoscale Transmogriscope
 Select ID (54): 54
 
-Proposal ID - Select an ID
+Project ID - Select an ID
 =====================================
 
 1234a - Pacifica Development (active no close)

diff --git a/travis/unit-tests.sh b/travis/unit-tests.sh
@@ -53,7 +53,7 @@ curl -X POST -H 'content-type: application/json' 'localhost:8121/users?_id=11' -
 $COV_RUN -a -m pacifica.cli upload --dry-run --instrument 54 || true
 $COV_RUN -a -m pacifica.cli upload --dry-run --instrument 9876 || true
 $COV_RUN -a -m pacifica.cli upload --dry-run --local-save retry.tar --local-compress BLAH || true
-$COV_RUN -a -m pacifica.cli upload --dry-run --logon dmlb2001 --proposal-regex 'expired closed and end'
+$COV_RUN -a -m pacifica.cli upload --dry-run --logon dmlb2001 --project-regex 'expired closed and end'
 
 ############################
 # Upload commands

diff --git a/travis/uploader.json b/travis/uploader.json
@@ -16,19 +16,19 @@
     "valueField": "_id"
   },
   {
-    "destinationTable": "Transactions.proposal",
+    "destinationTable": "Transactions.project",
     "displayFormat": "{_id} - {title}",
-    "displayTitle": "Proposal ID",
+    "displayTitle": "Project ID",
     "displayType": "select",
-    "metaID": "proposal",
+    "metaID": "project",
     "queryDependency": {
       "instrument_id": "instrument"
     },
     "queryFields": [
       "_id",
       "title"
     ],
-    "sourceTable": "proposals",
+    "sourceTable": "projects",
     "value": "",
     "valueField": "_id"
   },
@@ -56,7 +56,7 @@
     "key": "User of Record",
     "metaID": "user-of-record",
     "queryDependency": {
-      "proposal_id": "proposal"
+      "project_id": "project"
     },
     "queryFields": [
       "first_name",
@@ -70,16 +70,16 @@
   {
     "destinationTable": "NothingReally",
     "directoryOrder": 0,
-    "displayFormat": "Proposal ID {_id}",
+    "displayFormat": "Project ID {_id}",
     "displayType": "directoryTree",
-    "metaID": "directory-proposal",
+    "metaID": "directory-project",
     "queryDependency": {
-      "_id": "proposal"
+      "_id": "project"
     },
     "queryFields": [
       "_id"
     ],
-    "sourceTable": "proposals",
+    "sourceTable": "projects",
     "value": "",
     "valueField": "_id"
   }