Merge branch 'release/1.5.0'

Author: spikeheap

js/core/config.js

@@ -15,7 +15,7 @@ var config = {
   subjectIdZeroPadding: 4,
   subjectIdRegex: /^HEP-([0-9]+)$/,
   demographicDataset: 'Database_Enrollment',
-  searchFields: ['ParticipantId', 'NHSNumber', 'MRNNumber', 'FirstName', 'LastName']
+  searchFields: ['ParticipantId', 'NHSNumber', 'MRNNumber', 'MedWarNum', 'FirstName', 'LastName']
   // subjectNameFields: ['FirstName', 'LastName'],
   // headlineSubjectInfoFields: ['ParticipantId', 'NHSNumber', 'MRNNumber', 'DOB']
 };

js/participantFilter/participantFilter.controller.js

@@ -28,6 +28,7 @@ function ParticipantFilterController($modal, $q, $scope, config, CohortService,
   self.isParticipantSelected = isParticipantSelected;
   self.keyFieldsPercentageComplete = keyFieldsPercentageComplete;
 
+  self.searchFields = config.searchFields.slice();
   self.openAddParticipantModal = openAddParticipantModal;
 
   self.updateParticipantGroupFilter = updateParticipantGroupFilter;
@@ -66,7 +67,14 @@ function ParticipantFilterController($modal, $q, $scope, config, CohortService,
 
   function selectParticipant(participant) {
     self.selectedParticipant = participant;
-    self.onParticipantSelect({participantId: participant[config.subjectNoun]});
+    var subjectKey = config.subjectNoun;
+
+    // lower-case the first character, because LabKey's expecting it that way
+    subjectKey = subjectKey[0].toLowerCase() + subjectKey.substr(1);
+
+    var payload = {};
+    payload[subjectKey] = participant[config.subjectNoun];
+    self.onParticipantSelect(payload);
   }
 
   function isParticipantSelected(participant){
@@ -76,7 +84,7 @@ function ParticipantFilterController($modal, $q, $scope, config, CohortService,
   function filterParticipants(){
     self.filteredParticipants = self.allParticipants.filter(function(candidateParticipant) {
       return self.selectedCohorts[candidateParticipant.Cohort]
-          && _.contains(self.groupFilterParticipantIDs, candidateParticipant.ParticipantId);
+          && _.includes(self.groupFilterParticipantIDs, candidateParticipant.ParticipantId);
     });
   }
 

js/participantFilter/participantFilter.directive.html

@@ -41,7 +41,7 @@ <h4>
         <div class="form-inline">
           <div class="form-group has-feedback">
             <label for="labking-participant-search">Search</label>
-            <input type="search" class="form-control" id="labking-participant-search" placeholder="NHS #, MRN or name" autofocus ng-model="vm.participantSearchText">
+            <input type="search" class="form-control" id="labking-participant-search" placeholder="{{vm.searchFields.join(', ')}}" autofocus ng-model="vm.participantSearchText">
             <a ng-show="vm.participantSearchText" ng-click="vm.clearSearch()" class="text-muted">
               <span class="fa fa-remove form-control-feedback"></span>
             </a>

js/participantFilter/participantRecord.directive.html

@@ -32,8 +32,10 @@ <h3 class="nav-header">Dataset:</h3>
             ng-class="{active: vm.selectedDataSet == dataSet}"
             ng-repeat="dataSet in vm.selectedCategory">
           <a aria-controls="home" role="tab"
-            ng-bind="dataSet.Label"
-            ng-click="vm.selectDataSet(dataSet)"></a>
+            ng-click="vm.selectDataSet(dataSet)">
+            {{dataSet.Label}}
+            <span class="badge">{{vm.getRecordCount(dataSet.Name)}}</span>
+          </a>
       </li>
     </ul>
 

js/participantFilter/participantRecord.directive.js

@@ -25,6 +25,7 @@ function ParticipantRecord(config, ParticipantService, DatasetMetadataService) {
         self.getParticipantName = getParticipantName;
         self.selectCategory = selectCategory;
         self.selectDataSet = selectDataSet;
+        self.getRecordCount = getRecordCount;
 
         DatasetMetadataService.getMetaData().then(function(metadata) {
 
@@ -55,6 +56,19 @@ function ParticipantRecord(config, ParticipantService, DatasetMetadataService) {
           selectDataSet(self.selectedCategory[0]);
         }
 
+        /**
+         * Gets the number of rows in a dataset for the currently selected user.
+         * @param  {String} datasetName The name of the dataset. NOT the dataset object.
+         * @return {Number}             The count of rows in the dataset with the passed name, for the currently selected participant.
+         */
+        function getRecordCount (datasetName) {
+          if(self.participant !== undefined && self.participant.dataSets[datasetName] !== undefined){
+            return self.participant.dataSets[datasetName].rows.length;
+          }else{
+            return 0;
+          }
+        }
+
         function selectDataSet(dataSet) {
           self.selectedDataSet = dataSet;
         }

js/participantGroups/participantGroups.service.js

@@ -5,7 +5,7 @@ exports.service = ParticipantGroupsService;
 
 
 /** @ngInject **/
-function ParticipantGroupsService($q, logger) {
+function ParticipantGroupsService($q, logger, config) {
   var LabKeyAPI = require('../lib/LabKeyAPI'),
     _ = require('lodash');
 
@@ -63,7 +63,7 @@ function ParticipantGroupsService($q, logger) {
       var categoryLabel = participantGroupMapping['GroupId/CategoryId/Label'];
       var groupId = participantGroupMapping.GroupId;
       var groupLabel = participantGroupMapping['GroupId/Label'];
-      var participantId = participantGroupMapping.ParticipantId;
+      var participantId = participantGroupMapping[config.subjectNoun];
 
       // Create participant group category if it doesn't exist
       if(participantGroupCategories[categoryId] === undefined){

package.json

@@ -1,6 +1,6 @@
 {
   "name": "labking",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "description": "A LabKey module to allow creation and editing of Study module datasets in a subject-centric way",
   "main": "js/labking.module.js",
   "scripts": {
@@ -61,7 +61,7 @@
   },
   "homepage": "https://github.com/spikeheap/labkey-labking",
   "devDependencies": {
-    "babel-eslint": "^3.1.23",
+    "babel-eslint": "4.1.7",
     "babelify": "^5.0.4",
     "bower": "^1.4.1",
     "browserify": "^9.0.3",