Merge branch 'issue591_warn_global1c' into develop

~dev_rating/application/classes/Controller/Api/V0/StudyPlan.php

@@ -88,10 +88,10 @@ class Controller_Api_V0_StudyPlan extends Controller_Handler_Api
                 // global = 0 или 1
                 if ($disciplineData->global) {
                     $discipline->setInactive();
-                    $discipline->setGlobal();
+                    $discipline->setGlobalStub();
                 } else {
-                    if ($discipline->isGlobal()) {
-                        $discipline->setNotGlobal();
+                    if ($discipline->isGlobalStub()) {
+                        $discipline->setNotStub();
                         $discipline->setActive();
                     }
                 }

~dev_rating/application/classes/Controller/Office/Bill.php

@@ -100,7 +100,7 @@ class Controller_Office_Bill extends Controller_Environment_Office
         self::concatNames($students);
 
         // TODO: refactor after new groups implemented
-        $disciplines = Model_Group::with($groupID)->getDisciplines($lazy = false, $semesterID, $showglobal = true);
+        $disciplines = Model_Group::with($groupID)->getDisciplines($lazy = false, $semesterID, $showglobal = true, $showstubs = false);
         $disciplines = Arr::groupByUniqueKey('ID', $disciplines);
         $discWithCompounds = self::processCompounds($disciplines);
 

~dev_rating/application/classes/Model/Discipline.php

@@ -359,6 +359,24 @@ class Model_Discipline extends Model_Container
         return $res;
     }
 
+    public function setGlobalStub() {
+        $sql = 'SELECT * FROM Discipline_setStub(:discipline) as "Num"';
+        $res =  DB::query(Database::SELECT, $sql)
+            ->parameters([
+                ':discipline' => $this->ID
+            ])->execute()->get("Num");
+        return $res;
+    }
+
+    public function setNotStub() {
+        $sql = 'SELECT * FROM Discipline_setNotStub(:discipline) as "Num"';
+        $res =  DB::query(Database::SELECT, $sql)
+            ->parameters([
+                ':discipline' => $this->ID
+            ])->execute()->get("Num");
+        return $res;
+    }
+
     public function setActive() {
         $sql = 'SELECT * FROM Discipline_setActive(:discipline) as "Num"';
         $res =  DB::query(Database::SELECT, $sql)

~dev_rating/application/classes/Model/Group.php

@@ -45,13 +45,14 @@ class Model_Group extends Model
     }
 
     /** @return Model_Discipline[] */
-    public function getDisciplines($lazy = true, $semesterID = null, $showglobal = false) {
+    public function getDisciplines($lazy = true, $semesterID = null, $showglobal = false, $showstubs = false) {
         $semesterID = $semesterID ?: User::instance()->SemesterID;
-        $sql = 'SELECT * FROM GetDisciplinesForGroup(:id, :semesterID, :showglobal)';
+        $sql = 'SELECT * FROM GetDisciplinesForGroup(:id, :semesterID, :showglobal, :showstubs)';
         $query = DB::query(Database::SELECT, $sql)
             ->param(':id', $this->ID)
             ->param(':semesterID', $semesterID)
             ->param(':showglobal', $showglobal)
+            ->param(':showstubs', $showstubs)
             ->execute();
 
         $list = [];

~dev_rating/application/views/office/disciplines/index.twig

@@ -30,7 +30,7 @@
                 <td style="width: 70px;">№</td>
                 <td>Название</td>
                 <td style="width: 250px;">Автор</td>
-                {%  if InMainList %}
+                {% if InMainList %}
                     <td style="width: 100px;">вкл./выкл.</td>
                 {% endif %}
                 <td style="width: 250px;">Рабочий план</td>
@@ -40,27 +40,43 @@
             {% for discipline in Disciplines %}
                 <tr>
                     <td style="text-align: center;">{{ discipline.ID }}</td>
-                    {%  if discipline.GlobalName %}
-                        <td style="white-space: normal;"><a href="{{ URL.site("discipline/") }}/{{ discipline.ID }}/structure">{{ discipline.GlobalName }}</a></td>
-                    {%  else %}
-                        <td style="white-space: normal;"><a href="{{ URL.site("discipline/") }}/{{ discipline.ID }}/structure">{{ discipline.SubjectName }}</a></td>
+                    {% if discipline.GlobalName %}
+                        <td style="white-space: normal;"><a
+                                    href="{{ URL.site("discipline/") }}/{{ discipline.ID }}/structure">{{ discipline.GlobalName }}</a>
+                        </td>
+                    {% else %}
+                        <td style="white-space: normal;"><a
+                                    href="{{ URL.site("discipline/") }}/{{ discipline.ID }}/structure">{{ discipline.SubjectName }}</a>
+                        </td>
                     {% endif %}
-                    <td><a href="{{ URL.site("office/teachers/profile/") }}/{{ Teachers[discipline.ID].ID }}">{{ Text.abbreviateName(Teachers[discipline.ID]) }}</a></td>
-                    {%  if InMainList %}
+                    <td>
+                        <a href="{{ URL.site("office/teachers/profile/") }}/{{ Teachers[discipline.ID].ID }}">{{ Text.abbreviateName(Teachers[discipline.ID]) }}</a>
+                    </td>
+                    {% if InMainList %}
                         <td>
-                            {% if discipline.IsInactive %}
-                            <a id="discipline_switch_{{ discipline.ID }}" class="disciplineInactiveSwitch disciplineInactive" href="#">
-                                выключена
-                            </a>
+                            {% if discipline.IsGlobalStub %}
+                                <a class="discipline_stub_{{ discipline.ID }}"
+                                   class="disciplineInactiveSwitch disciplineInactive" href="#"
+                                   title="Такие дисциплины предназначены только для выгрузки ведомостей в 1С. Преподавателям и студентам они недоступны">
+                                    межф. 1С
+                                </a>
                             {% else %}
-                            <a id="discipline_switch_{{ discipline.ID }}" class="disciplineInactiveSwitch disciplineActive" href="#">
-                                включена
-                            </a>
+                                {% if discipline.IsInactive %}
+                                    <a id="discipline_switch_{{ discipline.ID }}"
+                                       class="disciplineInactiveSwitch disciplineInactive" href="#">
+                                        выключена
+                                    </a>
+                                {% else %}
+                                    <a id="discipline_switch_{{ discipline.ID }}"
+                                       class="disciplineInactiveSwitch disciplineActive" href="#">
+                                        включена
+                                    </a>
+                                {% endif %}
                             {% endif %}
                         </td>
                         <td>
                             {% if discipline.PlanExternalID %}
-                            {{ discipline.PlanExternalID }}
+                                {{ discipline.PlanExternalID }}
                             {% else %}
                                 Межфакультетская дисциплина
                             {% endif %}