Remove assetSubjectsAnnotations

psmb · Sep 4, 2024 · 0f69d08 · 0f69d08
1 parent fd933fc
commit 0f69d08
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 43 deletions.
diff --git a/Packages/Application/Sfi.Umo/Classes/Controller/BackendController.php b/Packages/Application/Sfi.Umo/Classes/Controller/BackendController.php
@@ -23,12 +23,27 @@ function encodeURI($url)
     // http://php.net/manual/en/function.rawurlencode.php
     // https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/encodeURI
     $unescaped = array(
-        '%2D' => '-', '%5F' => '_', '%2E' => '.', '%21' => '!', '%7E' => '~',
-        '%2A' => '*', '%27' => "'", '%28' => '(', '%29' => ')'
+        '%2D' => '-',
+        '%5F' => '_',
+        '%2E' => '.',
+        '%21' => '!',
+        '%7E' => '~',
+        '%2A' => '*',
+        '%27' => "'",
+        '%28' => '(',
+        '%29' => ')'
     );
     $reserved = array(
-        '%3B' => ';', '%2C' => ',', '%2F' => '/', '%3F' => '?', '%3A' => ':',
-        '%40' => '@', '%26' => '&', '%3D' => '=', '%2B' => '+', '%24' => '$'
+        '%3B' => ';',
+        '%2C' => ',',
+        '%2F' => '/',
+        '%3F' => '?',
+        '%3A' => ':',
+        '%40' => '@',
+        '%26' => '&',
+        '%3D' => '=',
+        '%2B' => '+',
+        '%24' => '$'
     );
     $score = array(
         '%23' => '#'
@@ -108,9 +123,7 @@ class BackendController extends AbstractModuleController
     /**
      * @return void
      */
-    public function indexAction()
-    {
-    }
+    public function indexAction() {}
 
     protected $collectionByType = [
         'W' => 'assetRpd',
@@ -121,7 +134,7 @@ public function indexAction()
         'O' => 'assetDescriptions',
         'T' => 'assetsPlan',
         'C' => 'schedule',
-        'A' => 'assetsSubjectAnnotations'
+        // 'A' => 'assetsSubjectAnnotations'
     ];
 
     protected $titleByType = [

diff --git a/Packages/Sites/Sfi.Sfi/Configuration/NodeTypes.StudyProgram.yaml b/Packages/Sites/Sfi.Sfi/Configuration/NodeTypes.StudyProgram.yaml
@@ -35,12 +35,6 @@
       type: "Neos.Neos:ContentCollection"
     assetsPracticeAnnotationsZ:
       type: "Neos.Neos:ContentCollection"
-    assetsSubjectAnnotationsO:
-      type: "Neos.Neos:ContentCollection"
-    assetsSubjectAnnotationsOZ:
-      type: "Neos.Neos:ContentCollection"
-    assetsSubjectAnnotationsZ:
-      type: "Neos.Neos:ContentCollection"
     assetsMethodicalO:
       type: "Neos.Neos:ContentCollection"
     assetsMethodicalOZ:

diff --git a/Packages/Sites/Sfi.Sfi/Resources/Private/Fusion/NodeTypes/StudyProgram.fusion b/Packages/Sites/Sfi.Sfi/Resources/Private/Fusion/NodeTypes/StudyProgram.fusion
@@ -71,19 +71,6 @@ prototype(Sfi.Sfi:StudyProgram) {
 	assetsAdmissionRegulations = Neos.Neos:ContentCollection {
 		nodePath = 'assetsAdmissionRegulations'
 	}
-	assetsSubjectAnnotationsTitle = ${'<h3 class="H3">' + Translation.translate('studyProgram.assetsSubjectAnnotations', null, [], null, 'Sfi.Sfi') + '</h3>'}
-	assetsSubjectAnnotationsO = Neos.Neos:ContentCollection {
-		nodePath = 'assetsSubjectAnnotationsO'
-		@process.title = ${'<h4 class="H4">' + Translation.translate('studyProgram.ochnaja', null, [], null, 'Sfi.Sfi') + '</h4>' + value}
-	}
-	assetsSubjectAnnotationsOZ = Neos.Neos:ContentCollection {
-		nodePath = 'assetsSubjectAnnotationsOZ'
-		@process.title = ${'<h4 class="H4">' + Translation.translate('studyProgram.ochnoZaochnaja', null, [], null, 'Sfi.Sfi')+ '</h4>' + value}
-	}
-	assetsSubjectAnnotationsZ = Neos.Neos:ContentCollection {
-		nodePath = 'assetsSubjectAnnotationsZ'
-		@process.title = ${'<h4 class="H4">' + Translation.translate('studyProgram.zaochnaja', null, [], null, 'Sfi.Sfi')+ '</h4>' + value}
-	}
 	assetsPracticeAnnotationsTitle = ${'<h3 class="H3">' + Translation.translate('studyProgram.assetsPracticeAnnotations', null, [], null, 'Sfi.Sfi') + '</h3>'}
 	assetsPracticeAnnotationsO = Neos.Neos:ContentCollection {
 		nodePath = 'assetsPracticeAnnotationsO'
@@ -304,15 +291,6 @@ prototype(Sfi.Sfi:StudyProgramShortFormal) < prototype(Neos.Fusion:Template) {
 		title = 'Свидетельство о государственной аккредитации'
 		@context.node = ${q(node).children('assetAccreditation').get(0)}
 	}
-	assetsSubjectAnnotationsO = Neos.Neos:ContentCollection {
-		nodePath = 'assetsSubjectAnnotationsO'
-	}
-	assetsSubjectAnnotationsOZ = Neos.Neos:ContentCollection {
-		nodePath = 'assetsSubjectAnnotationsOZ'
-	}
-	assetsSubjectAnnotationsZ = Neos.Neos:ContentCollection {
-		nodePath = 'assetsSubjectAnnotationsZ'
-	}
 	assetsPracticeAnnotationsO = Neos.Neos:ContentCollection {
 		nodePath = 'assetsPracticeAnnotationsO'
 	}

diff --git a/Packages/Sites/Sfi.Sfi/Resources/Private/Templates/NodeTypes/StudyProgram.html b/Packages/Sites/Sfi.Sfi/Resources/Private/Templates/NodeTypes/StudyProgram.html
@@ -65,10 +65,6 @@ <h2 class="H2 marginTop-triple"><f:translate id="studyProgram.about" package="Sf
 			<a href="#tab-subjects" class="Sections-Anchor Sections-AccordionTitle"><f:translate id="studyProgram.disciplines" package="Sfi.Sfi"/></a>
 			<div class="Sections-Panel" id="tab-subjects">
 				{subjects -> f:format.raw()}
-				{assetsSubjectAnnotationsTitle -> f:format.raw()}
-				{assetsSubjectAnnotationsO -> f:format.raw()}
-				{assetsSubjectAnnotationsOZ -> f:format.raw()}
-				{assetsSubjectAnnotationsZ -> f:format.raw()}
 
 				{assetRpdTitle -> f:format.raw()}
 				{assetRpdO -> f:format.raw()}

diff --git a/Packages/Sites/Sfi.Sfi/Resources/Private/Translations/ru/Main.xlf b/Packages/Sites/Sfi.Sfi/Resources/Private/Translations/ru/Main.xlf
@@ -329,9 +329,6 @@
             <trans-unit id="studyProgram.assetsPracticeAnnotations">
                 <source>Практики</source>
             </trans-unit>
-            <trans-unit id="studyProgram.assetsSubjectAnnotations">
-                <source>Аннотации к рабочим программам дисциплин</source>
-            </trans-unit>
             <trans-unit id="studyProgram.assetsPlan">
                 <source>Учебный план</source>
             </trans-unit>