Merge branch 'master' into gh-pages

# Conflicts:
#	CollectMeasures/build/asset-manifest.json
#	CollectMeasures/build/favicon.ico
#	CollectMeasures/build/index.html
#	CollectMeasures/build/manifest.json
#	CollectMeasures/build/service-worker.js
#	CollectMeasures/package-lock.json
#	CollectMeasures/public/favicon.ico
#	CollectMeasures/public/index.html
#	CollectMeasures/public/manifest.json

CollectMeasures/build/precache-manifest.3040b65ef3a5eee2cfab4ab1ad0c56c8.js

@@ -0,0 +1,38 @@
+self.__precacheManifest = [
+  {
+    "revision": "514286746d71cb158812",
+    "url": "./static/css/main.4d727303.chunk.css"
+  },
+  {
+    "revision": "514286746d71cb158812",
+    "url": "./static/js/main.51428674.chunk.js"
+  },
+  {
+    "revision": "8c97409f0ee389fe75da",
+    "url": "./static/js/runtime~main.8c97409f.js"
+  },
+  {
+    "revision": "77e4c58cec31b472bbbd",
+    "url": "./static/css/2.57a49592.chunk.css"
+  },
+  {
+    "revision": "77e4c58cec31b472bbbd",
+    "url": "./static/js/2.77e4c58c.chunk.js"
+  },
+  {
+    "revision": "ecaddb09844ad461ecac777995545eed",
+    "url": "./static/media/dxicons.ecaddb09.woff2"
+  },
+  {
+    "revision": "b51d1bb8df912c9a72f25db27706b9e8",
+    "url": "./static/media/dxicons.b51d1bb8.ttf"
+  },
+  {
+    "revision": "b4f8a75314de92e91d6e29ff27abe9cd",
+    "url": "./static/media/dxicons.b4f8a753.woff"
+  },
+  {
+    "revision": "3bc254aa44fa73b986f8d90184107de6",
+    "url": "./index.html"
+  }
+];

CollectMeasures/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "getting-started-tutorial",
+  "name": "collect-measures",
   "version": "0.1.0",
   "homepage": ".",
   "dependencies": {

CollectMeasures/src/types-and-constants.ts

@@ -1,6 +1,6 @@
 export const pluginParameters = {
   name: 'Collect Measures',
-  version: '0.1',
+  version: '0.2',
   initialDimensions: {
     width: 280,
     height: 385
@@ -10,9 +10,7 @@ export const pluginParameters = {
 export const collectMeasuresDatasetParams = {
   name: 'Collected Measures',
   title: 'Collected Measures',
-  parentCollectionName: 'Samples',
-  parentCollectionTitle: 'Samples',
-  childCollectionName: 'Measures',
-  childCollectionTitle: 'Measures',
+  collectionName: 'Measures',
+  collectionTitle: 'Measures',
 }
 

CollectMeasures/src/utilities.tsx

@@ -39,8 +39,8 @@ export function choicesMenu(iPrompt: string, iPlaceHolder: string, iHint: string
  * First make sure there is a "Collected Measures" dataset. If not, create one.
  * Gather the names of the attributes at the parent level in the chosen dataset.
  * Make sure these attribute names are present at the child level of the "Collected Measures" dataset.
- * If the parent level of the chosen dataset has multiple cases, make sure there is a parent collection
- * in the "Collected Measures" dataset with the attribute "Sample".
+ * If the parent level of the chosen dataset has multiple cases, make sure there is an attribute "Sample"
+ * in the "Collected Measures" dataset.
  * @return {Promise<boolean>}
  */
 export async function guaranteeMeasuresDataset(entityInfo: EntityInfo): Promise<void> {
@@ -55,15 +55,10 @@ export async function guaranteeMeasuresDataset(entityInfo: EntityInfo): Promise<
         title: params.title,
         collections: [
           {
-            name: params.childCollectionName,
-            title: params.childCollectionTitle,
-            attrs: []
-          },
-          {
-            name: params.parentCollectionName,
-            title: params.parentCollectionTitle,
+            name: params.collectionName,
+            title: params.collectionTitle,
             attrs: [
-              {name: 'Sample', title: 'Sample'},
+              {name: 'Sample', description: 'Sample number'}
             ]
           }]
       }
@@ -97,7 +92,7 @@ export async function createAttributesInCollectedMeasuresDataset(theStore: Store
   if (attrsToAdd.length > 0) {
     const createAttrsResult: any = await codapInterface.sendRequest({
         action: 'create',
-        resource: `dataContext[${theParams.name}].collection[${theParams.childCollectionName}].attribute`,
+        resource: `dataContext[${theParams.name}].collection[${theParams.collectionName}].attribute`,
         values: attrsToAdd.map((iName: string) => {
           return {name: iName}
         })
@@ -116,7 +111,7 @@ export async function createAttributesInCollectedMeasuresDataset(theStore: Store
   })
   if (getCasesResult && getCasesResult.success) {
     const measuresCollectedSoFar = await numberOfCasesInCollection(
-        theParams.name, theParams.parentCollectionName),
+        theParams.name, theParams.collectionName),
       items = getCasesResult.values.map((iCase: any) => {
         const anItem = iCase.values
         anItem.Sample = measuresCollectedSoFar + 1

Common/js/build-include.js

@@ -1,3 +1,3 @@
 window.codapPluginConfig = {
-  buildNumber: "0064"
+  buildNumber: "0065"
 }