|
@@ -51,6 +51,7 @@ participantOverview.matchRegistration=
|
|
|
function(entry){
|
|
|
let fName='matchRegistration';
|
|
|
let sF='participantStudyId';
|
|
|
+ //this was set by crfData.setRegistration()
|
|
|
let studyRegMap=crfData.getRegistrationEntryMap(sF);//should be unique for registration
|
|
|
let nS=Object.keys(studyRegMap).length;
|
|
|
//this.print(fName+' study registration entries '+nS);
|
|
@@ -73,10 +74,13 @@ function(entry){
|
|
|
return null;
|
|
|
}
|
|
|
|
|
|
-
|
|
|
participantOverview.makeArray=
|
|
|
function(){
|
|
|
+
|
|
|
+
|
|
|
let fName='makeArray';
|
|
|
+
|
|
|
+
|
|
|
let entries=crfSetup.getEntryMap('crfEntries');
|
|
|
let n=Object.keys(entries).length;
|
|
|
this.print(fName+' entries '+n);
|
|
@@ -111,8 +115,15 @@ function(){
|
|
|
i++;
|
|
|
continue;
|
|
|
}
|
|
|
- //link crfEntry to registration row
|
|
|
let idLabel=crfSetup.getParticipantLabel(regEntry);
|
|
|
+ //check if this is a valid participant
|
|
|
+ if (!crfData.validRegistration(regEntry)){
|
|
|
+ regStatus=regEntry['registrationStatus'];
|
|
|
+ this.print(fName+" ["+idLabel+"]: illegal registration status ("+regStatus+")");
|
|
|
+ i++;
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ //link crfEntry to registration row
|
|
|
let form=entry['Form'];
|
|
|
this.addObjectToIdFormMap(entry,entryMap,idLabel,form);
|
|
|
}
|