FIX: final form export with correct groupid #431

db/postgresql/issue431_export_nodiscipline.sql

+CREATE OR REPLACE FUNCTION public.logformexport(paccountid integer, pdisciplineid character varying, pgroupid integer, psemesterid integer, perror integer)
+ RETURNS integer
+ LANGUAGE plpgsql
+AS $function$
+DECLARE vDisciplineID integer;
+begin
+--   select disciplinesForGroup."ID" into vDisciplineID from
+--     (select D."ID" as "ID",
+--             D."SubjectName" as "SubjectName",
+--             subjects.externalid as "DisciplineExternalID"
+--      from public.getdisciplinesforgroup(pgroupid, psemesterid) as D
+--        join disciplines on disciplines.id = D."ID"
+--        join subjects on disciplines.subjectid = subjects.id) as disciplinesForGroup
+--   WHERE disciplinesForGroup."DisciplineExternalID" = pdisciplineid;
+
+  INSERT INTO logs_form_export (discipline_id, group_id, account_id, semester_id, error) VALUES (pdisciplineid, pgroupid, paccountid, psemesterid, perror);
+  RETURN 0;
+END
+$function$;

media/js/office/export.js

@@ -79,6 +79,7 @@ $(document).ready(() => {
                                     plan: planExtId,
                                     discipline: disciplineExtId,
                                     groupnum: groupInfo.groupNum,
+                                    groupid: groupInfo.groupID,
                                     gradenum: groupInfo.gradeID,
                                     study_form: groupInfo.formID,
                                     faculty: settings.facultyID

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

@@ -72,6 +72,7 @@ class Controller_Api_V0_FinalReport extends Controller_Handler_Api
             $discipline = $this->request->query('discipline');
             $groupnum = $this->request->query('groupnum');
             $gradenum = $this->request->query('gradenum');
+            $groupid = $this->request->query('groupid');
             $faculty = $this->request->query('faculty');
             $study_form = $this->request->query('study_form');
             $emulate = $this->request->query('emulate');
@@ -82,7 +83,7 @@ class Controller_Api_V0_FinalReport extends Controller_Handler_Api
             } elseif (!isset($discipline)) {
                 $finalReport = Model_FinalReport::getBySemesterYearNumPlan($year, $num, $plan);
             } else {
-                $finalReport = Model_FinalReport::getBySemesterYearNumDisciplineGroup($year, $num, $discipline, $groupnum, $gradenum, $faculty, $study_form);
+                $finalReport = Model_FinalReport::getBySemesterYearNumDisciplineGroup($year, $num, $discipline, $groupnum, $groupid, $gradenum, $faculty, $study_form);
             }
 
             $response = [];
@@ -98,8 +99,8 @@ class Controller_Api_V0_FinalReport extends Controller_Handler_Api
             }
 
             if (!isset($emulate) and isset($groupnum)) {
-                $groupID = Model_Group::find($gradenum, $groupnum, $study_form, $faculty);
-                Model_Logs::logFormExport($this->user->ID, $discipline, $groupID, $this->user["SemesterID"]);
+                //$groupID = Model_Group::find($gradenum, $groupnum, $study_form, $faculty);
+                Model_Logs::logFormExport($this->user->ID, $discipline, $groupid, $this->user["SemesterID"]);
             }
 
             // TODO: удалить лишние учебные планы от академиков правильным способом!

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

@@ -34,15 +34,15 @@ class Model_FinalReport extends Model implements ArrayAccess, Iterator
         return new Model_FinalReport($info->as_array());
     }
 
-    public static function getBySemesterYearNumDisciplineGroup($year, $num, $discipline, $groupnum, $gradenum, $faculty, $study_form) {
-        $group = Model_Group::find($gradenum, $groupnum, $study_form, $faculty);
+    public static function getBySemesterYearNumDisciplineGroup($year, $num, $discipline, $groupnum, $groupid, $gradenum, $faculty, $study_form) {
+        //$group = Model_Group::find($gradenum, $groupnum, $study_form, $faculty);
 
         $sql = 'SELECT * FROM FinalReport_GetBySemesterYearDisciplineGroup(:year, :num, :discipline, :group)';
         $info = DB::query(Database::SELECT, $sql)
             ->param(':year', $year)
             ->param(':num', $num)
             ->param(':discipline', $discipline)
-            ->param(':group', $group)
+            ->param(':group', $groupid)
             ->execute();
 
         return new Model_FinalReport($info->as_array());