Merge branch 'issue606_global_woes' into develop

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

@@ -83,12 +83,13 @@ class Controller_Api_V0_GlobalDiscipline extends Controller_Handler_Api
         return (int)$discipline->ID;
     }
 
-    private function processGroup($groupData, $year, $semesterID)
+    private function processGroup($groupData, $year, $semesterID, $controlType)
     {
         $facultyID = Model_Faculties::getIdByExternalID($groupData->faculty);
 
         $disciplineID = null;
         try {
+                $groupData->type = $controlType;
                 $disciplineData = $this->normalizeDisciplinesData($groupData, $facultyID);
                 $disciplineID = $this->processDiscipline($disciplineData, $semesterID, $facultyID);
             } catch (Exception $e) {
@@ -186,9 +187,10 @@ class Controller_Api_V0_GlobalDiscipline extends Controller_Handler_Api
             $year = (int)$data->year;
             $semesterID = (int)Model_Semesters::find($year, (int)$data->semester)->ID;
             // $facultyID = Model_Faculties::getIdByExternalID($data->faculty);
+            $controlType = $data->controlType;
 
             foreach ($data->groups as $groupData) {
-                $res[] = $this->processGroup($groupData, $year, $semesterID);
+                $res[] = $this->processGroup($groupData, $year, $semesterID, $controlType);
             }
         } catch (Exception $e) {
             $this->badRequestError($e->getMessage());