diff --git a/src/web/packages.php b/src/web/packages.php index 70b5f2e4..27a9e8b4 100755 --- a/src/web/packages.php +++ b/src/web/packages.php @@ -231,18 +231,61 @@ function DisplayAddSeriesForm($seriesids, $modality) { $enrollmentids[] = $row['enrollment_id']; $subjectids[] = $row['subject_id']; $studyids[] = $row['study_id']; + $projectids[] = $row['project_id']; if ($row[$modality . '_seriesid'] != "") $seriesids[] = $row[$modality . '_seriesid']; + + if (trim($row['series_desc']) == "") + $seriesdesc = $row['series_protocol']; + else + $seriesdesc = $row['series_desc']; + + $experimentmapping[$modality][$seriesdesc]['projectid'] = $row['project_id']; /* don't make this array unique because multiple mappings could exist for each protocol */ } + //PrintVariable($studyids, 'StudyID'); $enrollmentids = array_unique($enrollmentids); $subjectids = array_unique($subjectids); $studyids = array_unique($studyids); $seriesids = array_unique($seriesids); + $projectids = array_unique($projectids); + $seriesdescs = array_unique($seriesdesc); + //PrintVariable($studyids, 'StudyID'); $numenrollments = count($enrollmentids); $numsubjects = count($subjectids); $numstudies = count($studyids); $numseries = count($seriesids); + + /* get list of analysisids */ + $studyidstr = implode2(",", $studyids); + $sqlstring = "select * from analysis where study_id in (" . $studyidstr . ")"; + $result = MySQLiQuery($sqlstring, __FILE__, __LINE__); + $numseries = mysqli_num_rows($result); + while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) { + $analysisids[] = $row['analysis_id']; + $pipelineids[] = $row['pipeline_id']; + } + $analysisids = array_unique($analysisids); + $pipelineids = array_unique($pipelineids); + + PrintVariable($experimentmapping); + /* get list of experiments - need to map the experiment to the protocol/modality and project */ + foreach ($experimentmapping as $modalitykey => $modalityvalue) { + //PrintVariable($modalityvalue); + foreach ($modalityvalue as $seriesdesc => $value) { + $projectid = $value['projectid']; + + $sqlstring = "select experiment_id from experiment_mapping where project_id = $projectid and protocolname = '$seriesdesc' and modality = '$modalitykey'"; + PrintSQL($sqlstring); + $result = MySQLiQuery($sqlstring, __FILE__, __LINE__); + $numseries = mysqli_num_rows($result); + while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) { + $experimentids[] = $row['experiment_id']; + } + } + } + PrintVariable($experimentids); + $experimentids = array_unique($experimentids); } ?> @@ -251,62 +294,26 @@ function DisplayAddSeriesForm($seriesids, $modality) {
- - - - - - - - - - - - - - - -

The following objects will be added to the package

- - -
- - -
- - - -

Optional related objects

- -
- -
- -
- -
- + + +

The following objects will be added to the package

+ +
+ +
+ + +

Optional related objects

+ +
+ +
+ +
+ +
+ - - - - - - - - - - - - - - - - - - - -

Select Package

@@ -431,8 +438,13 @@ function DisplayAddDataDictionaryForm($datadictids) { /* -------------------------------------------- */ /* this function expects a list of enrollment IDs */ function DisplayFormSubjects($enrollmentids, $required) { + $numsubjects = count($enrollmentids); + if ($required) { + $checkboxstr = " checked disabled"; + } + ?> Subjects
of subjects will be added
@@ -444,6 +456,7 @@ function DisplayFormSubjects($enrollmentids, $required) {
+ @@ -463,6 +476,7 @@ function DisplayFormSubjects($enrollmentids, $required) { ?> + @@ -483,6 +497,13 @@ function DisplayFormSubjects($enrollmentids, $required) { /* ------- DisplayFormStudies ----------------- */ /* -------------------------------------------- */ function DisplayFormStudies($studyids, $required) { + + $numstudies = count($studyids); + + if ($required) { + $checkboxstr = " checked disabled"; + } + ?> Studies
of studies will be added
@@ -494,6 +515,7 @@ function DisplayFormStudies($studyids, $required) {
UID Sex Enrolled project
>
+ @@ -514,6 +536,7 @@ function DisplayFormStudies($studyids, $required) { ?> + @@ -534,7 +557,13 @@ function DisplayFormStudies($studyids, $required) { /* ------- DisplayFormSeries ------------------ */ /* -------------------------------------------- */ function DisplayFormSeries($seriesids, $modality, $required) { + $numseries = count($seriesids); + + if ($required) { + $checkboxstr = " checked disabled"; + } + ?> Series
of series will be added
@@ -545,6 +574,7 @@ function DisplayFormSeries($seriesids, $modality, $required) {
Study Date Visit
>
+ @@ -560,7 +590,7 @@ function DisplayFormSeries($seriesids, $modality, $required) { $sqlstring = "select * from $modality" . "_series a left join studies b on a.study_id = b.study_id left join enrollment c on b.enrollment_id = c.enrollment_id left join subjects d on c.subject_id = d.subject_id where a.$modality" . "series_id in (" . $seriesidstr . ")"; $result = MySQLiQuery($sqlstring, __FILE__, __LINE__); while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) { - //PrintVariable($row); + $seriesid = $row[$modality . 'series_id']; $uid = $row['uid']; $studynum = $row['study_num']; $studydesc = $row['study_desc']; @@ -571,6 +601,7 @@ function DisplayFormSeries($seriesids, $modality, $required) { ?> + @@ -586,6 +617,7 @@ function DisplayFormSeries($seriesids, $modality, $required) {
UID Study Series
>
+ + if ($required) { + $checkboxstr = " checked disabled"; + } + + if (count($experimentids) > 0) { + ?>
@@ -610,6 +647,7 @@ function DisplayFormExperiments($experimentids, $required) {
+ @@ -625,6 +663,7 @@ function DisplayFormExperiments($experimentids, $required) { ?> + @@ -635,7 +674,17 @@ function DisplayFormExperiments($experimentids, $required) {
Experiment Date
>
- +
+ + +
+
+ + if ($required) { + $checkboxstr = " checked disabled"; + } + + if (count($analysisids) > 0) { + ?> + +
- +
- View analyses + Select analyses
+ @@ -672,6 +739,7 @@ function DisplayFormAnalyses($analysisids, $required) { $analysisdate = $row['analysis_date']; ?> + @@ -682,7 +750,17 @@ function DisplayFormAnalyses($analysisids, $required) {
Analysis Date
>
- +
+ + +
+
+ + +
- +
@@ -706,6 +800,7 @@ function DisplayFormPipelines($pipelineids, $required) {
+ @@ -719,6 +814,7 @@ function DisplayFormPipelines($pipelineids, $required) { ?> + + +
- +
@@ -752,6 +864,7 @@ function DisplayFormMeasures($measureids, $required) {
Pipeline
>
+ @@ -771,6 +884,7 @@ function DisplayFormMeasures($measureids, $required) { $measureids[] = $measureid; ?> + @@ -782,6 +896,9 @@ function DisplayFormMeasures($measureids, $required) {
UID Measure Date
>
+ + +
@@ -839,6 +960,9 @@ function DisplayFormDrugs($drugids, $required) {
+ + +