From 057b077d066ae1ca110f9dda09d31626eb988905 Mon Sep 17 00:00:00 2001
From: Michele Locati <michele@locati.it>
Date: Thu, 18 Jan 2024 21:49:27 +0100
Subject: [PATCH] Restore chooseCalendar

---
 src/main/resources/concrete-cif-1.0.xsd       |  14 ++
 ...-atomik-documentation-calendar-PATCHED.xml | 128 ------------------
 ...2-themes-atomik-documentation-calendar.xml |   0
 3 files changed, 14 insertions(+), 128 deletions(-)
 delete mode 100644 src/test/resources/cifs-good/9.2.2-themes-atomik-documentation-calendar-PATCHED.xml
 rename src/test/resources/{cifs-bad => cifs-good}/9.2.2-themes-atomik-documentation-calendar.xml (100%)

diff --git a/src/main/resources/concrete-cif-1.0.xsd b/src/main/resources/concrete-cif-1.0.xsd
index 098bd83..7071a43 100644
--- a/src/main/resources/concrete-cif-1.0.xsd
+++ b/src/main/resources/concrete-cif-1.0.xsd
@@ -2744,6 +2744,7 @@
                 <xs:complexType>
                     <xs:all>
                         <xs:element name="caID" type="xs:integer" minOccurs="0" maxOccurs="1" />
+                        <xs:element name="chooseCalendar" type="chooseCalendarEnum" minOccurs="0" maxOccurs="1" />
                         <xs:element name="calendarAttributeKeyHandle" type="handle" minOccurs="0" maxOccurs="1" />
                         <xs:element name="filterByTopicAttributeKeyID" type="xs:integer" minOccurs="0" maxOccurs="1" />
                         <xs:element name="filterByTopicID" type="xs:integer" minOccurs="0" maxOccurs="1" />
@@ -3298,6 +3299,7 @@
                 <xs:complexType>
                     <xs:all>
                         <xs:element name="caID" type="xs:string" minOccurs="0" maxOccurs="1" />
+                        <xs:element name="chooseCalendar" type="chooseCalendarEnum" minOccurs="0" maxOccurs="1" />
                         <xs:element name="calendarAttributeKeyHandle" type="handle" minOccurs="0" maxOccurs="1" />
                         <xs:element name="totalToRetrieve" type="integer-greather-than-zero" minOccurs="0" maxOccurs="1" />
                         <xs:element name="totalPerPage" type="integer-greather-than-zero" minOccurs="0" maxOccurs="1" />
@@ -4926,4 +4928,16 @@
         <xs:restriction base="xs:string" />
     </xs:simpleType>
 
+    <!--
+    ### Calendar-related
+    -->
+
+    <xs:simpleType name="chooseCalendarEnum">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="" />
+            <xs:enumeration value="specific" />
+            <xs:enumeration value="site" />
+        </xs:restriction>
+    </xs:simpleType>
+
 </xs:schema>
diff --git a/src/test/resources/cifs-good/9.2.2-themes-atomik-documentation-calendar-PATCHED.xml b/src/test/resources/cifs-good/9.2.2-themes-atomik-documentation-calendar-PATCHED.xml
deleted file mode 100644
index 90cd91f..0000000
--- a/src/test/resources/cifs-good/9.2.2-themes-atomik-documentation-calendar-PATCHED.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<concrete5-cif version="1.0">
-    <area name="Main">
-        <blocks>
-            <block type="core_theme_documentation_breadcrumb" name="">
-                <style>
-                    <backgroundColor/>
-                    <backgroundRepeat/>
-                    <backgroundSize/>
-                    <backgroundPosition/>
-                    <borderWidth/>
-                    <borderColor/>
-                    <borderStyle/>
-                    <borderRadius/>
-                    <baseFontSize/>
-                    <alignment/>
-                    <textColor/>
-                    <linkColor/>
-                    <paddingTop/>
-                    <paddingBottom/>
-                    <paddingLeft/>
-                    <paddingRight/>
-                    <marginTop/>
-                    <marginBottom/>
-                    <marginLeft/>
-                    <marginRight/>
-                    <rotate/>
-                    <boxShadowHorizontal/>
-                    <boxShadowVertical/>
-                    <boxShadowBlur/>
-                    <boxShadowSpread/>
-                    <boxShadowColor/>
-                    <customClass>mt-5</customClass>
-                    <customID/>
-                    <customElementAttribute/>
-                    <hideOnExtraSmallDevice/>
-                    <hideOnSmallDevice/>
-                    <hideOnMediumDevice/>
-                    <hideOnLargeDevice/>
-                </style>
-            </block>
-            <block type="content" name="">
-                <data table="btContentLocal">
-                    <record>
-                        <content><![CDATA[<h1>Calendar & Events</h1>
-
-<p class="lead">Turn your site into a collaborative calendar with the following block types.</p>
-<p>(Note: you will have to modify the existing block types within this documentation to point to your installed calendar and its events.</p>
-]]></content>
-                    </record>
-                </data>
-            </block>
-            <block type="content" name="">
-                <data table="btContentLocal">
-                    <record>
-                        <content><![CDATA[<h2 class="text-primary">Calendar</h2>
-]]></content>
-                    </record>
-                </data>
-            </block>
-            <block type="calendar" name="">
-                <data table="btCalendar">
-                    <record>
-                        <caID><![CDATA[0]]></caID>
-                        <calendarAttributeKeyHandle><![CDATA[]]></calendarAttributeKeyHandle>
-                        <filterByTopicAttributeKeyID><![CDATA[0]]></filterByTopicAttributeKeyID>
-                        <filterByTopicID><![CDATA[0]]></filterByTopicID>
-                        <viewTypes><![CDATA[["month","basicWeek","basicDay"]]]></viewTypes>
-                        <viewTypesOrder><![CDATA[["month_Month","basicWeek_Week","basicDay_Day"]]]></viewTypesOrder>
-                        <defaultView><![CDATA[month]]></defaultView>
-                        <navLinks><![CDATA[0]]></navLinks>
-                        <eventLimit><![CDATA[0]]></eventLimit>
-                        <lightboxProperties><![CDATA[[]]]></lightboxProperties>
-                    </record>
-                </data>
-            </block>
-            <block type="content" name="">
-                <data table="btContentLocal">
-                    <record>
-                        <content><![CDATA[<h2 class="text-primary">Event List</h2>
-]]></content>
-                    </record>
-                </data>
-            </block>
-            <block type="event_list" name="">
-                <data table="btEventList">
-                    <record>
-                        <caID><![CDATA[0]]></caID>
-                        <calendarAttributeKeyHandle><![CDATA[]]></calendarAttributeKeyHandle>
-                        <totalToRetrieve><![CDATA[9]]></totalToRetrieve>
-                        <totalPerPage><![CDATA[3]]></totalPerPage>
-                        <filterByTopicAttributeKeyID><![CDATA[0]]></filterByTopicAttributeKeyID>
-                        <filterByTopic>none</filterByTopic>
-                        <filterByTopicID><![CDATA[0]]></filterByTopicID>
-                        <filterByPageTopicAttributeKeyHandle><![CDATA[]]></filterByPageTopicAttributeKeyHandle>
-                        <filterByFeatured><![CDATA[0]]></filterByFeatured>
-                        <eventListTitle><![CDATA[Featured Events]]></eventListTitle>
-                        <linkToPage><![CDATA[0]]></linkToPage>
-                        <titleFormat><![CDATA[h5]]></titleFormat>
-                    </record>
-                </data>
-            </block>
-            <block type="content" name="">
-                <data table="btContentLocal">
-                    <record>
-                        <content><![CDATA[<h2 class="text-primary">Calendar Event</h2>
-]]></content>
-                    </record>
-                </data>
-            </block>
-            <block type="calendar_event" name="">
-                <data table="btCalendarEvent">
-                    <record>
-                        <mode><![CDATA[S]]></mode>
-                        <calendarEventAttributeKeyHandle><![CDATA[]]></calendarEventAttributeKeyHandle>
-                        <calendarID><![CDATA[0]]></calendarID>
-                        <eventID><![CDATA[0]]></eventID>
-                        <displayEventAttributes><![CDATA[[]]]></displayEventAttributes>
-                        <allowExport>1</allowExport>
-                        <enableLinkToPage><![CDATA[0]]></enableLinkToPage>
-                        <displayEventName>1</displayEventName>
-                        <displayEventDate>1</displayEventDate>
-                        <displayEventDescription>1</displayEventDescription>
-                    </record>
-                </data>
-            </block>
-        </blocks>
-    </area>
-</concrete5-cif>
diff --git a/src/test/resources/cifs-bad/9.2.2-themes-atomik-documentation-calendar.xml b/src/test/resources/cifs-good/9.2.2-themes-atomik-documentation-calendar.xml
similarity index 100%
rename from src/test/resources/cifs-bad/9.2.2-themes-atomik-documentation-calendar.xml
rename to src/test/resources/cifs-good/9.2.2-themes-atomik-documentation-calendar.xml