From 7978447e55a13d2d33ac14b2f68f6c93db623e5b Mon Sep 17 00:00:00 2001
From: xamgore <xamgore@ya.ru>
Date: Thu, 3 Sep 2015 03:05:00 +0300
Subject: [PATCH] Code style
---
.../teacher/discipline/edit/structure.twig | 180 ++++++++++--------
1 file changed, 96 insertions(+), 84 deletions(-)
diff --git a/~dev_rating/application/views/teacher/discipline/edit/structure.twig b/~dev_rating/application/views/teacher/discipline/edit/structure.twig
index 1ead518a0..aedef3da4 100644
--- a/~dev_rating/application/views/teacher/discipline/edit/structure.twig
+++ b/~dev_rating/application/views/teacher/discipline/edit/structure.twig
@@ -3,92 +3,104 @@
{% set step_2 = 'active' %}
{% block discipline_media %}
- {% if Discipline.IsLocked != 1 %}
- {{ HTML.script('static/js/discipline/editStructure.js')|raw }}
- {% else %}
- {{ HTML.script('static/js/discipline/editStructureLocked.js')|raw }}
- {% endif %}
- {{ HTML.style('static/css/teacher/discipline/editStructure.css')|raw }}
+ {% if Discipline.IsLocked != 1 %}
+ {{ HTML.script('static/js/discipline/editStructure.js')|raw }}
+ {% else %}
+ {{ HTML.script('static/js/discipline/editStructureLocked.js')|raw }}
+ {% endif %}
+ {{ HTML.style('static/css/teacher/discipline/editStructure.css')|raw }}
{% endblock %}
{% block map_content %}
- <p class="notification" style="display: none;">{{ Rus[Discipline.Season] }} семестр {{ Discipline.Year }}/{{ Discipline.Year + 1 }} учебного года</p>
- <div class="rateIndicatorDIV">
- Количество баллов: <span class="rateIndicator">{{ Map.MaxRate }}</span>{% if Map.isSetBonus == true %} + 10 бонусных баллов{% endif %}
- </div>
- <div class="studyMap StructureTable">
- <div class="name">Виды контрольных мероприятий</div>
- <div class="currentControl">Текущий контроль</div>
- <div class="landmarkControl">Рубежный контроль</div>
- {% if Discipline.IsLocked != 1 %}
- <div class="actions">Действия</div>
- {% endif %}
- </div>
- <div class="moduleList StructureTable">
- {% for module in Map.Modules %}
- {% if module.Type == 'regular' %}
- <div class="moduleGroup" id="{{ module.ID }}">
- <div class="moduleHead">
- <div class="name">
- <input type="text" class="inputName moduleName" placeholder="Наименование модуля" value="{{ module.Name }}">
- </div>
- <div class="currentControl">{{ module.CurrentControl }}</div>
- <div class="landmarkControl">{{ module.LandmarkControl }}</div>
- {% if Discipline.IsLocked != 1 %}
- <div class="actions">
- <div class="deleteModule icon delete"> </div>
- <div class="downModule icon down"> </div>
- <div class="upModule icon up"> </div>
- </div>
- {% endif %}
- </div>
- <div class="submodules">
- {% for submodule in module.Submodules %}
- <div class="submodule" id="{{ submodule.SubmoduleID }}">
- <div class="name">
- <input type="text" class="inputName submoduleName" placeholder="Наименование мероприятия" value="{{ submodule.SubmoduleName }}">
- </div>
- <div class="currentControl"><input type="text" class="inputCredit inputCurrentControl" value="{% if submodule.SubmoduleType == 'CurrentControl' %}{{ submodule.MaxRate }}{% else %}0{% endif %}"></div>
- <div class="landmarkControl"><input type="text" class="inputCredit inputLandmarkControl" value="{% if submodule.SubmoduleType == 'LandmarkControl' %}{{ submodule.MaxRate }}{% else %}0{% endif %}"></div>
- {% if Discipline.IsLocked != 1 %}
- <div class="actions">
- <div class="deleteSubmodule icon delete"></div>
- <div class="downSubmodule icon down"></div>
- <div class="upSubmodule icon up"></div>
- </div>
- {% endif %}
- </div>
- {% endfor %}
- </div>
- {% if Discipline.IsLocked != 1 %}
- <button class="addSubmodule">Добавить мероприятие</button>
- {% endif %}
- </div>
- {% endif %}
- {% if module.Type == 'bonus' %}
- <div class="BonusModule">
- <div class="name">
- {{ module.Name }}
- </div>
- <div class="currentControl">0</div>
- <div class="landmarkControl">{{ module.Rate }}</div>
- </div>
- {% endif %}
- {% if module.Type == 'exam' %}
- <div class="ExamModule">
- <div class="name">
- {{ module.Name }}
- </div>
- <div class="currentControl">0</div>
- <div class="landmarkControl">{{ module.Rate }}</div>
- </div>
- {% endif %}
- {% else %}
- <div class="empty"><p class="notification">Модули отсутствуют</p></div>
- {% endfor %}
- </div>
- {% if Discipline.IsLocked != 1 %}
- <button class="addModule">Добавить модуль</button>
- {% endif %}
+ <p class="notification" style="display: none;">
+ {{ Rus[Discipline.Season] }} семестр {{ Discipline.Year }}/{{ Discipline.Year + 1 }} учебного года
+ </p>
+ <div class="rateIndicatorDIV">
+ Количество баллов: <span class="rateIndicator">{{ Map.MaxRate }}</span>{% if Map.isSetBonus %} + 10 бонусных баллов{% endif %}
+ </div>
+ <div class="studyMap StructureTable">
+ <div class="name">Виды контрольных мероприятий</div>
+ <div class="currentControl">Текущий контроль</div>
+ <div class="landmarkControl">Рубежный контроль</div>
+ {% if Discipline.IsLocked != 1 %}
+ <div class="actions">Действия</div>
+ {% endif %}
+ </div>
+ <div class="moduleList StructureTable">
+ {% for module in Map.Modules %}
+ {% if module.Type == 'regular' %}
+ <div class="moduleGroup" id="{{ module.ID }}">
+ <div class="moduleHead">
+ <div class="name">
+ <input type="text" class="inputName moduleName" placeholder="Наименование модуля" value="{{ module.Name }}">
+ </div>
+ <div class="currentControl">{{ module.CurrentControl }}</div>
+ <div class="landmarkControl">{{ module.LandmarkControl }}</div>
+ {% if Discipline.IsLocked != 1 %}
+ <div class="actions">
+ <div class="deleteModule icon delete"> </div>
+ <div class="downModule icon down"> </div>
+ <div class="upModule icon up"> </div>
+ </div>
+ {% endif %}
+ </div>
+ <div class="submodules">
+ {% for submodule in module.Submodules %}
+ <div class="submodule" id="{{ submodule.SubmoduleID }}">
+ <div class="name">
+ <input type="text" class="inputName submoduleName" placeholder="Наименование мероприятия"
+ value="{{ submodule.SubmoduleName }}">
+ </div>
+ <div class="currentControl">
+ <input type="text" class="inputCredit inputCurrentControl"
+ value="{{ submodule.SubmoduleType == 'CurrentControl' ? submodule.MaxRate|e : 0 }}">
+ </div>
+ <div class="landmarkControl">
+ <input type="text" class="inputCredit inputLandmarkControl"
+ value="{{ submodule.SubmoduleType == 'LandmarkControl' ? submodule.MaxRate|e : 0 }}">
+ </div>
+ {% if Discipline.IsLocked != 1 %}
+ <div class="actions">
+ <div class="deleteSubmodule icon delete"></div>
+ <div class="downSubmodule icon down"></div>
+ <div class="upSubmodule icon up"></div>
+ </div>
+ {% endif %}
+ </div>
+ {% endfor %}
+ </div>
+ {% if Discipline.IsLocked != 1 %}
+ <button class="addSubmodule">Добавить мероприятие</button>
+ {% endif %}
+ </div>
+ {% endif %}
+
+ {% if module.Type == 'bonus' %}
+ <div class="BonusModule">
+ <div class="name">
+ {{ module.Name }}
+ </div>
+ <div class="currentControl">0</div>
+ <div class="landmarkControl">{{ module.Rate }}</div>
+ </div>
+ {% endif %}
+
+ {% if module.Type == 'exam' %}
+ <div class="ExamModule">
+ <div class="name">
+ {{ module.Name }}
+ </div>
+ <div class="currentControl">0</div>
+ <div class="landmarkControl">{{ module.Rate }}</div>
+ </div>
+ {% endif %}
+ {% else %}
+ <div class="empty"><p class="notification">Модули отсутствуют</p></div>
+ {% endfor %}
+ </div>
+
+ {% if Discipline.IsLocked != 1 %}
+ <button class="addModule">Добавить модуль</button>
+ {% endif %}
{% endblock %}
--
GitLab