redcolor

irmtim · Oct 3, 2020 · 2d4ccab · 2d4ccab
1 parent a13d85c
commit 2d4ccab
Show file tree

Hide file tree

Showing 30 changed files with 11,026 additions and 16 deletions.
diff --git a/Db/Views/Create views on typicon.online.sql b/Db/Views/Create views on typicon.online.sql
@@ -0,0 +1,138 @@
+Create view u0351320_typicondb.View_MenologyRuleGrid AS
+SELECT 
+        `dr`.`Id` AS `Id`,
+        `dr`.`TypiconVersionId` AS `TypiconVersionId`,
+        GROUP_CONCAT(`dni`.`Text`
+            ORDER BY `drw`.`Order` ASC
+            SEPARATOR ' ') AS `Name`,
+        `sni`.`Text` AS `TemplateName`,
+        `dr`.`IsAddition` AS `IsAddition`,
+        (CASE
+            WHEN
+                ((`dr`.`Date_Month` = 0)
+                    AND (`dr`.`Date_Day` = 0))
+            THEN
+                ''
+            ELSE CONCAT(LPAD(`dr`.`Date_Month`, 2, 0),
+                    '-',
+                    LPAD(`dr`.`Date_Day`, 2, 0))
+        END) AS `Date`,
+        (CASE
+            WHEN
+                ((`dr`.`LeapDate_Month` = 0)
+                    AND (`dr`.`LeapDate_Day` = 0))
+            THEN
+                ''
+            ELSE CONCAT(LPAD(`dr`.`LeapDate_Month`, 2, 0),
+                    '-',
+                    LPAD(`dr`.`LeapDate_Day`, 2, 0))
+        END) AS `LeapDate`,
+        (`dr`.`ModRuleDefinition` = '') AS `HasModRuleDefinition`,
+        (`dr`.`RuleDefinition` = '') AS `HasRuleDefinition`
+    FROM
+        (((((`u0351320_typicondb`.`dayrule` `dr`
+        JOIN `u0351320_typicondb`.`dayruleworship` `drw` ON ((`dr`.`Id` = `drw`.`DayRuleId`)))
+        JOIN `u0351320_typicondb`.`dayworship` `dw` ON ((`dw`.`Id` = `drw`.`DayWorshipId`)))
+        JOIN `u0351320_typicondb`.`dayworshipnameitems` `dni` ON ((`dw`.`Id` = `dni`.`NameId`)))
+        JOIN `u0351320_typicondb`.`sign` `s` ON ((`dr`.`TemplateId` = `s`.`Id`)))
+        JOIN `u0351320_typicondb`.`signnameitems` `sni` ON ((`s`.`Id` = `sni`.`NameId`)))
+    WHERE
+        ((`dr`.`Discriminator` = 'MenologyRule')
+            AND (`dni`.`Language` = 'cs-ru')
+            AND (`sni`.`Language` = 'cs-ru'))
+    GROUP BY `dr`.`Id`;
+
+Create view u0351320_typicondb.View_triodionrulegrid AS
+SELECT 
+        `dr`.`Id` AS `Id`,
+        `dr`.`TypiconVersionId` AS `TypiconVersionId`,
+        GROUP_CONCAT(`dni`.`Text`
+            ORDER BY `drw`.`Order` ASC
+            SEPARATOR ' ') AS `Name`,
+        `sni`.`Text` AS `TemplateName`,
+        `dr`.`IsAddition` AS `IsAddition`,
+        `dr`.`DaysFromEaster` AS `DaysFromEaster`,
+        `dr`.`IsTransparent` AS `IsTransparent`,
+        (`dr`.`ModRuleDefinition` = '') AS `HasModRuleDefinition`,
+        (`dr`.`RuleDefinition` = '') AS `HasRuleDefinition`
+    FROM
+        (((((`u0351320_typicondb`.`dayrule` `dr`
+        JOIN `dayruleworship` `drw` ON ((`dr`.`Id` = `drw`.`DayRuleId`)))
+        JOIN `dayworship` `dw` ON ((`dw`.`Id` = `drw`.`DayWorshipId`)))
+        JOIN `dayworshipnameitems` `dni` ON ((`dw`.`Id` = `dni`.`NameId`)))
+        JOIN `sign` `s` ON ((`dr`.`TemplateId` = `s`.`Id`)))
+        JOIN `signnameitems` `sni` ON ((`s`.`Id` = `sni`.`NameId`)))
+    WHERE
+        ((`dr`.`Discriminator` = 'TriodionRule')
+            AND (`dni`.`Language` = 'cs-ru')
+            AND (`sni`.`Language` = 'cs-ru'))
+    GROUP BY `dr`.`Id`;
+
+CREATE VIEW `view_menologydaygrid` AS
+SELECT 
+        `dw`.`Id` AS `Id`,
+        (CASE
+            WHEN
+                ((`dr`.`Date_Month` = 0)
+                    AND (`dr`.`Date_Day` = 0))
+            THEN
+                ''
+            ELSE CONCAT(LPAD(`dr`.`Date_Month`, 2, 0),
+                    '-',
+                    LPAD(`dr`.`Date_Day`, 2, 0))
+        END) AS `Date`,
+        (CASE
+            WHEN
+                ((`dr`.`LeapDate_Month` = 0)
+                    AND (`dr`.`LeapDate_Day` = 0))
+            THEN
+                ''
+            ELSE CONCAT(LPAD(`dr`.`LeapDate_Month`, 2, 0),
+                    '-',
+                    LPAD(`dr`.`LeapDate_Day`, 2, 0))
+        END) AS `LeapDate`,
+        `dni`.`Text` AS `Name`,
+        `dsni`.`Text` AS `ShortName`,
+        `dw`.`IsCelebrating` AS `IsCelebrating`
+    FROM
+        (((`day` `dr`
+        JOIN `dayworship` `dw` ON ((`dw`.`ParentId` = `dr`.`Id`)))
+        JOIN `dayworshipnameitems` `dni` ON ((`dw`.`Id` = `dni`.`NameId`)))
+        LEFT JOIN `dayworshipshortnameitems` `dsni` ON ((`dw`.`Id` = `dsni`.`NameId`)))
+    WHERE
+        ((`dr`.`Discriminator` = 'MenologyDay')
+            AND (`dni`.`Language` = 'cs-ru'));
+
+CREATE VIEW `view_triodiondaygrid` AS
+    SELECT 
+        `dw`.`Id` AS `Id`,
+        `dr`.`DaysFromEaster` AS `DaysFromEaster`,
+        `dni`.`Text` AS `Name`,
+        `dsni`.`Text` AS `ShortName`,
+        `dw`.`IsCelebrating` AS `IsCelebrating`
+    FROM
+        (((`day` `dr`
+        JOIN `dayworship` `dw` ON ((`dw`.`ParentId` = `dr`.`Id`)))
+        JOIN `dayworshipnameitems` `dni` ON ((`dw`.`Id` = `dni`.`NameId`)))
+        LEFT JOIN `dayworshipshortnameitems` `dsni` ON ((`dw`.`Id` = `dsni`.`NameId`)))
+    WHERE
+        ((`dr`.`Discriminator` = 'TriodionDay')
+            AND (`dni`.`Language` = 'cs-ru'));
+
+CREATE VIEW `view_signgrid` AS   
+SELECT s.Id,
+		s.TypiconVersionId,
+		sign_name.Text AS "Name",
+        parent_name.Text AS "TemplateName",
+        s.IsAddition,
+        print.Number,
+        s.Priority
+FROM Sign AS s 
+INNER JOIN SignNameItems AS sign_name ON s.Id = sign_name.NameId
+LEFT JOIN Sign AS parent ON parent.Id = s.TemplateId
+LEFT JOIN SignNameItems AS parent_name ON parent.Id = parent_name.NameId
+LEFT JOIN PrintDayTemplate AS print ON s.PrintTemplateId = print.Id
+WHERE sign_name.Language = "cs-ru"
+    AND (parent_name.Language IS NULL OR parent_name.Language = "cs-ru")
+
+
diff --git a/Db/Views/View_MenologyDayGrid.sql b/Db/Views/View_MenologyDayGrid.sql
@@ -0,0 +1,25 @@
+CREATE VIEW View_MenologyDayGrid AS
+SELECT dr.Id, 
+		CASE 
+			WHEN (dr.Date_Month = 0 AND dr.Date_Day = 0)
+				THEN "" 
+            ELSE CONCAT(LPAD(dr.Date_Month, 2, 0), 
+				"-", 
+				LPAD(dr.Date_Day, 2, 0) ) 
+		END AS "Date",
+		CASE 
+			WHEN (dr.LeapDate_Month = 0 AND dr.LeapDate_Day = 0)
+				THEN "" 
+            ELSE CONCAT(LPAD(dr.LeapDate_Month, 2, 0), 
+				"-", 
+				LPAD(dr.LeapDate_Day, 2, 0) ) 
+		END AS "LeapDate",
+		dni.Text AS "Name",
+        dsni.Text AS "ShortName",
+        dw.IsCelebrating
+FROM typicondb.Day AS dr 
+INNER JOIN typicondb.DayWorship AS dw ON dw.ParentId = dr.Id
+INNER JOIN typicondb.DayWorshipNameItems AS dni ON dw.Id = dni.NameId 
+left JOIN typicondb.DayWorshipShortNameItems AS dsni ON dw.Id = dsni.NameId
+WHERE dr.Discriminator = "MenologyDay"
+	AND dni.Language = "cs-ru"
diff --git a/Db/Views/View_MenologyRuleGrid.sql b/Db/Views/View_MenologyRuleGrid.sql
@@ -0,0 +1,47 @@
+CREATE 
+    ALGORITHM = UNDEFINED 
+    DEFINER = `root`@`localhost` 
+    SQL SECURITY DEFINER
+VIEW `view_menologyrulegrid` AS
+    SELECT 
+        `dr`.`Id` AS `Id`,
+        `dr`.`TypiconVersionId` AS `TypiconVersionId`,
+        GROUP_CONCAT(`dni`.`Text`
+            ORDER BY `drw`.`Order` ASC
+            SEPARATOR ' ') AS `Name`,
+        `sni`.`Text` AS `TemplateName`,
+        `dr`.`IsAddition` AS `IsAddition`,
+        (CASE
+            WHEN
+                ((`dr`.`Date_Month` = 0)
+                    AND (`dr`.`Date_Day` = 0))
+            THEN
+                ''
+            ELSE CONCAT(LPAD(`dr`.`Date_Month`, 2, 0),
+                    '-',
+                    LPAD(`dr`.`Date_Day`, 2, 0))
+        END) AS `Date`,
+        (CASE
+            WHEN
+                ((`dr`.`LeapDate_Month` = 0)
+                    AND (`dr`.`LeapDate_Day` = 0))
+            THEN
+                ''
+            ELSE CONCAT(LPAD(`dr`.`LeapDate_Month`, 2, 0),
+                    '-',
+                    LPAD(`dr`.`LeapDate_Day`, 2, 0))
+        END) AS `LeapDate`,
+        (`dr`.`ModRuleDefinition` = '') AS `HasModRuleDefinition`,
+        (`dr`.`RuleDefinition` = '') AS `HasRuleDefinition`
+    FROM
+        (((((`dayrule` `dr`
+        JOIN `dayruleworship` `drw` ON ((`dr`.`Id` = `drw`.`DayRuleId`)))
+        JOIN `dayworship` `dw` ON ((`dw`.`Id` = `drw`.`DayWorshipId`)))
+        JOIN `dayworshipnameitems` `dni` ON ((`dw`.`Id` = `dni`.`NameId`)))
+        JOIN `sign` `s` ON ((`dr`.`TemplateId` = `s`.`Id`)))
+        JOIN `signnameitems` `sni` ON ((`s`.`Id` = `sni`.`NameId`)))
+    WHERE
+        ((`dr`.`Discriminator` = 'MenologyRule')
+            AND (`dni`.`Language` = 'cs-ru')
+            AND (`sni`.`Language` = 'cs-ru'))
+    GROUP BY `dr`.`Id`
diff --git a/Db/Views/View_SignGrid.sql b/Db/Views/View_SignGrid.sql
@@ -0,0 +1,23 @@
+CREATE 
+    ALGORITHM = UNDEFINED 
+    DEFINER = `root`@`localhost` 
+    SQL SECURITY DEFINER
+VIEW `typicondb`.`view_signgrid` AS
+    SELECT 
+        `s`.`Id` AS `Id`,
+        `s`.`TypiconVersionId` AS `TypiconVersionId`,
+        `sign_name`.`Text` AS `Name`,
+        `parent_name`.`Text` AS `TemplateName`,
+        `s`.`IsAddition` AS `IsAddition`,
+        `print`.`Number` AS `Number`,
+        `s`.`Priority` AS `Priority`
+    FROM
+        ((((`typicondb`.`sign` `s`
+        JOIN `typicondb`.`signnameitems` `sign_name` ON ((`s`.`Id` = `sign_name`.`NameId`)))
+        LEFT JOIN `typicondb`.`sign` `parent` ON ((`parent`.`Id` = `s`.`TemplateId`)))
+        LEFT JOIN `typicondb`.`signnameitems` `parent_name` ON ((`parent`.`Id` = `parent_name`.`NameId`)))
+        LEFT JOIN `typicondb`.`printdaytemplate` `print` ON ((`s`.`PrintTemplateId` = `print`.`Id`)))
+    WHERE
+        ((`sign_name`.`Language` = 'cs-ru')
+            AND (ISNULL(`parent_name`.`Language`)
+            OR (`parent_name`.`Language` = 'cs-ru')))
diff --git a/Db/Views/View_TriodionDayGrid.sql b/Db/Views/View_TriodionDayGrid.sql
@@ -0,0 +1,12 @@
+CREATE VIEW View_TriodionDayGrid AS
+SELECT dr.Id, 
+		`dr`.`DaysFromEaster` AS `DaysFromEaster`,
+		dni.Text AS "Name",
+        dsni.Text AS "ShortName",
+        dw.IsCelebrating
+FROM typicondb.Day AS dr 
+INNER JOIN typicondb.DayWorship AS dw ON dw.ParentId = dr.Id
+INNER JOIN typicondb.DayWorshipNameItems AS dni ON dw.Id = dni.NameId 
+left JOIN typicondb.DayWorshipShortNameItems AS dsni ON dw.Id = dsni.NameId
+WHERE dr.Discriminator = "TriodionDay"
+	AND dni.Language = "cs-ru"
diff --git a/Db/Views/View_TriodionRuleGrid.sql b/Db/Views/View_TriodionRuleGrid.sql
@@ -0,0 +1,24 @@
+Create View typicondb.View_TriodionRuleGrid as 
+SELECT 
+        `dr`.`Id` AS `Id`,
+        `dr`.`TypiconVersionId` AS `TypiconVersionId`,
+        GROUP_CONCAT(`dni`.`Text`
+            ORDER BY `drw`.`Order` ASC
+            SEPARATOR ' ') AS `Name`,
+        `sni`.`Text` AS `TemplateName`,
+        `dr`.`IsAddition` AS `IsAddition`,
+        `dr`.`DaysFromEaster`,
+        (`dr`.`ModRuleDefinition` = '') AS `HasModRuleDefinition`,
+        (`dr`.`RuleDefinition` = '') AS `HasRuleDefinition`
+    FROM
+        (((((`dayrule` `dr`
+        JOIN `dayruleworship` `drw` ON ((`dr`.`Id` = `drw`.`DayRuleId`)))
+        JOIN `dayworship` `dw` ON ((`dw`.`Id` = `drw`.`DayWorshipId`)))
+        JOIN `dayworshipnameitems` `dni` ON ((`dw`.`Id` = `dni`.`NameId`)))
+        JOIN `sign` `s` ON ((`dr`.`TemplateId` = `s`.`Id`)))
+        JOIN `signnameitems` `sni` ON ((`s`.`Id` = `sni`.`NameId`)))
+    WHERE
+        ((`dr`.`Discriminator` = 'TriodionRule')
+            AND (`dni`.`Language` = 'cs-ru')
+            AND (`sni`.`Language` = 'cs-ru'))
+    GROUP BY `dr`.`Id`
diff --git a/XML/Rules/RulesSchema.xsd b/XML/Rules/RulesSchema.xsd
@@ -71,6 +71,7 @@
 		<xs:sequence maxOccurs="unbounded">
 			<xs:element name="switch" type="switchType" minOccurs="0" maxOccurs="unbounded"/>
 			<xs:element name="worship" type="worshipType" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="variableworship" type="variableworshipType" minOccurs="0" maxOccurs="unbounded"/>
 			<xs:element name="notice" type="noticeType" minOccurs="0" maxOccurs="unbounded"/>
 			<xs:element name="if" type="ifType" minOccurs="0" maxOccurs="unbounded"/>
 			<xs:element name="kekragaria" type="kekragariaType" minOccurs="0"/>
@@ -329,6 +330,9 @@
 			</xs:simpleType>
 		</xs:attribute>
 	</xs:complexType>
+	<xs:complexType name="variableworshipType">
+		<xs:attribute name="name" type="xs:string" use="required"/>
+	</xs:complexType>
 	<xs:complexType name="kanonasruleType">
 		<xs:complexContent>
 			<xs:extension base="executableType">