Merge 21.11.4 to develop

LabKey · Dec 29, 2021 · 8b408d4 · 8b408d4
2 parents 6cf793e + 5d7f7bd
commit 8b408d4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 17 deletions.
diff --git a/resources/olap/FCIC_PublicationCube.xml b/resources/olap/FCIC_PublicationCube.xml
@@ -12,18 +12,18 @@
             <Hierarchy hasAll="true" primaryKey="Key">
                 <Level name="Publication" visible="true" column="Key" type="Integer" uniqueMembers="true" levelType="Regular" hideMemberIf="Never"/>
             </Hierarchy>
-            <Hierarchy name="Therapeutic Area" hasAll="true" primaryKey="PublicationId">
-                <Table name="publicationTherapeuticArea" schema="lists"/>
-                <Level name="TherapeuticArea" visible="true" column="therapeuticArea" type="String" uniqueMembers="true" levelType="Regular" hideMemberIf="Never"/>
-            </Hierarchy>
             <Hierarchy name="Publication Type" hasAll="true" primaryKey="Key">
                 <Level name="PublicationType" visible="true" type="String" column="publicationType" uniqueMembers="true" levelType="Regular" hideMemberIf="Never"/>
+                <Annotations>
+                    <Annotation name="ExcludeAnd">true</Annotation>
+                </Annotations>
             </Hierarchy>
-            <Hierarchy name="Submission Status" hasAll="true" primaryKey="Key">
-                <Level name="SubmissionStatus" visible="true" type="String" column="submissionStatus" uniqueMembers="true" levelType="Regular" hideMemberIf="Never"/>
-            </Hierarchy>
-            <Hierarchy name="Featured" hasAll="true" primaryKey="Key">
-                <Level name="Featured" visible="true" type="Boolean" column="Featured" uniqueMembers="true" levelType="Regular" hideMemberIf="Never"/>
+            <Hierarchy name="Therapeutic Area" hasAll="true" primaryKey="PublicationId">
+                <Table name="publicationTherapeuticArea" schema="lists"/>
+                <Level name="TherapeuticArea" visible="true" column="therapeuticArea" type="String" uniqueMembers="true" levelType="Regular" hideMemberIf="Never"/>
+                <Annotations>
+                    <Annotation name="ExcludeAnd">true</Annotation>
+                </Annotations>
             </Hierarchy>
             <Hierarchy name="Study" hasAll="true" primaryKey="publicationId" schema="lists" primaryKeyTable="publicationStudy">
                 <Join leftKey="StudyId" rightKey="studyId">
@@ -34,12 +34,9 @@
             </Hierarchy>
             <Hierarchy name="Year" hasAll="true" primaryKey="Key">
                 <Level name="Year" visible="true" type="Integer" column="year" uniqueMembers="true" levelType="Regular" hideMemberIf="Never"/>
-            </Hierarchy>
-            <Hierarchy name="Journal" hasAll="true" primaryKey="Key">
-                <Level name="Journal" visible="true" type="String" column="journal" uniqueMembers="true" levelType="Regular" hideMemberIf="Never"/>
-            </Hierarchy>
-            <Hierarchy name="Status" hasAll="true" primaryKey="Key">
-                <Level name="Status" visible="true" type="String" column="status" uniqueMembers="true" levelType="Regular" hideMemberIf="Never"/>
+                <Annotations>
+                    <Annotation name="ExcludeAnd">true</Annotation>
+                </Annotations>
             </Hierarchy>
         </Dimension>
 

diff --git a/resources/olap/FCIC_StudyCube.xml b/resources/olap/FCIC_StudyCube.xml
@@ -3,7 +3,6 @@
    <Cube name="StudyCube" visible="true" defaultMeasure="RowCount" cache="true" enabled="true">
 
        <Annotations>
-           <!--<Annotation name="ContainerFilter">AllFolders</Annotation>-->
            <Annotation name="AllowMDX">FALSE</Annotation>
        </Annotations>
 
@@ -15,7 +14,6 @@
                 <Level name="Study" visible="true" column="studyId" type="String" uniqueMembers="true" levelType="Regular" hideMemberIf="Never"/>
             </Hierarchy>
             <Hierarchy name="Study Name" hasAll="true" primaryKeyTable="studyAccess" primaryKey="StudyId">
-                <!--<Level name="Container" visible="true" column="studyContainer" type="String" uniqueMembers="true" levelType="Regular"/>-->
                 <Level name="Study" visible="true" column="studyId" type="String" uniqueMembers="true" levelType="Regular" hideMemberIf="Never"/>
             </Hierarchy>
             <Hierarchy name="Fiscal Years Active" hasAll="true" primaryKey="StudyId">