ADD: Changing milestone by dean office

~dev_rating/application/bootstrap.php

@@ -357,7 +357,7 @@ Route::set('admin:common', 'admin(/<controller>(/<action>(/<param1>(:<param2>)))
 Route::set('dean_office:index', 'dean_office(/<controller>(/<action>(/<param1>(:<param2>))))')
         ->defaults(array(
             'directory' => 'DeanOffice',
-            'controller' => 'index',
+            'controller' => 'sheets',
             'action' => 'index'
         ));
 

~dev_rating/application/classes/Controller/DeanOffice/Credits.php

+<?php defined('SYSPATH') or die('No direct script access.');
+
+class Controller_DeanOffice_Credits extends Controller_UserEnvironment
+{
+    public function before()
+    {
+        Cookie::set('fD', 'true'); // Ставим кук fD, чтоб иметь возможность скачать файл
+        parent::before();
+    }
+
+    public function action_index()
+    {
+        $twig = Twig::factory('dean_office/credits');
+        $twig->User = $this->user;
+        $this->response->body($twig);
+    }
+
+    public function action_setMilestone()
+    {
+        $twig = Twig::factory('dean_office/credits');
+        $twig->User = $this->user;
+        $stage = (int)$this->request->param("param1");
+        if ($stage >= 0 && $stage <= 3)
+            Model_Discipline::setMilestoneForCredits(0, $this->user['FacultyID'], $stage);
+        $this->response->body($twig);
+    }
+}
\ No newline at end of file

~dev_rating/application/classes/Controller/DeanOffice/Index.php → ~dev_rating/application/classes/Controller/DeanOffice/Sheets.php

 <?php defined('SYSPATH') or die('No direct script access.');
 
-class Controller_DeanOffice_Index extends Controller_UserEnvironment {
+class Controller_DeanOffice_Sheets extends Controller_UserEnvironment {
 
     public function before() {
         Cookie::set('fD', 'true'); // Ставим кук fD, чтоб иметь возможность скачать файл
@@ -10,7 +10,7 @@ class Controller_DeanOffice_Index extends Controller_UserEnvironment {
 
     public function action_index()
     {
-        $twig = Twig::factory('dean_office/index');
+        $twig = Twig::factory('dean_office/sheets');
         $model = new Model_Map;
 
         $twig->GradesList = Model_Grades::toArray();

~dev_rating/application/views/dean_office/base.twig

+{% extends 'base' %}
+
+{% block title %}Деканат{% endblock %}
+{% block media %} {# head -> css, js #}
+    {{ HTML.style('media/less/dean_office/dean.css')|raw }}
+{% endblock %}
+
+{% block main_content_classes %}sidePadding{% endblock %}
+{% block main_top_title %}Деканат > Ведомости{% endblock %}
+{% block main_content %}
+
+    <div class="goodClearFix">
+        <div class="sidePanel">
+            {{ HTML.anchor('/dean_office/sheets', '<div>Ведомости</div>')|raw }}
+            {{ HTML.anchor('/dean_office/credits', '<div>Зачеты</div>')|raw }}
+            {{ HTML.anchor('/dean_office/exams', '<div>Экзамены</div>')|raw }}
+        </div>
+        <div class="deanContent">
+            {% block dean_content %}
+
+            {% endblock %}
+        </div>
+    </div>
+
+{% endblock %}
\ No newline at end of file

~dev_rating/application/views/dean_office/credits.twig

+{% extends 'dean_office/base' %}
+
+{% block title %}Деканат > Ведомости{% endblock %}
+{% block media %} {# head -> css, js #}
+    {{ parent() }}
+    {{ HTML.script('media/js/jquery.fileDownload.js')|raw }}
+    {{ HTML.style('media/css/discipline.css')|raw }}
+    {{ HTML.script('media/js/dean_office/dean_office.js')|raw }}
+{% endblock %}
+{% block main_top_title %}Деканат > Зачеты{% endblock %}
+{% block dean_content %}
+    <table width="100%" style="text-align: center;">
+        <tr>
+            <td>Этап 1:<br>Семестр</td>
+            <td>Этап 2:<br>Добор баллов #1</td>
+            <td>Этап 3:<br>Добор баллов #2</td>
+            <td>Этап 4:<br>Закрытие добора</td>
+        </tr>
+        <tr>
+            {% for i in range(0,3) %}
+            <td>
+                {{ HTML.anchor('/dean_office/credits/setMilestone/' ~ i, '<button class="defaultForm BlueButton HalfWidth" id="DownloadExamDocument">Сделать текущим</button>')|raw }}
+            </td>
+            {% endfor %}
+        </tr>
+    </table>
+{% endblock %}

~dev_rating/application/views/dean_office/index.twig → ~dev_rating/application/views/dean_office/sheets.twig

-{% extends 'base' %} 
+{% extends 'dean_office/base' %}
 
 {% block title %}Деканат > Ведомости{% endblock %}
 {% block media %} {# head -> css, js #}
+    {{ parent() }}
     {{ HTML.script('media/js/jquery.fileDownload.js')|raw }}
-
     {{ HTML.style('media/css/discipline.css')|raw }}
     {{ HTML.script('media/js/dean_office/dean_office.js')|raw }}
-
 {% endblock %}
-
 {% block main_top_title %}Деканат > Ведомости{% endblock %}
-{% block main_content %}
+{% block dean_content %}
 
     <div data-role="page" id="dean_office" style="text-align: center">
         <div class="LayerSection">

~dev_rating/application/views/teacher/exam.twig

@@ -11,7 +11,7 @@
 
 {% block main_top_title %}Сессия{% endblock %}
 {% block main_content %}
-	<h2 class="h2_titleSubject"> {{ if disciplineInfo.LocalizedExamType }} </h2>
+	<h2 class="h2_titleSubject"> {{ disciplineInfo.LocalizedExamType }} </h2>
 
     {{ HTML.anchor('rate/'~disciplineInfo.DisciplineID,
             "← Перейти к оцениванию", 

~dev_rating/media/less/common.css

@@ -189,6 +189,19 @@ input[type="checkbox"] {
 .clearFix .content {
   overflow: hidden;
 }
+.goodClearFix:after {
+  content: '.';
+  display: block;
+  height: 0;
+  clear: both;
+  visibility: hidden;
+}
+* html .goodClearFix {
+  height: 1%;
+}
+.goodClearFix {
+  display: block;
+}
 .Warning {
   position: absolute;
   padding: 6px 10px;

~dev_rating/media/less/common.less

@@ -147,6 +147,19 @@ input[type="checkbox"]  { /*для разных браузеров нужно з
   }
 }
 
+.goodClearFix:after {
+  content: '.';
+  display: block;
+  height: 0;
+  clear: both;
+  visibility: hidden;
+}
+* html .goodClearFix {
+  height: 1%;
+}
+.goodClearFix {
+  display: block;
+}
 .Warning {
   position: absolute;
   padding: 6px 10px;

~dev_rating/media/less/dean_office/dean.css

+.sidePanel {
+  float: left;
+}
+.sidePanel div {
+  width: 235px;
+  padding: 5px 0;
+  height: 30px;
+}
+.deanContent {
+  border-left: 1px solid #e4e4e4;
+  display: block;
+  overflow: hidden;
+  margin-left: 240px;
+}

~dev_rating/media/less/dean_office/dean.less

+@import (reference) "../common.less";
+
+.sidePanel
+{
+  float: left;
+
+  div
+  {
+    width: 235px;
+    padding: 5px 0;
+    height: 30px;
+  }
+}
+
+.deanContent
+{
+  border-left: 1px solid @ColorLightenGrey;
+  display: block;
+  overflow: hidden;
+  margin-left: 240px;
+}
\ No newline at end of file