Merge branch 'issue583_logaccount_formexport' into develop

media/js/office/export.js

@@ -74,6 +74,7 @@ $(document).ready(() => {
                                 const disciplineExtId = disciplineInfo.DisciplineExternalID;
 
                                 $.get(pathToSfeduAPIAdapter + '/forms', {
+                                    accountid: User.accountid,
                                     year: settings.year.toString() + "-" + (settings.year + 1).toString().substr(2, 2),
                                     semester: settings.semesterNum,
                                     plan: planExtId,

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

@@ -66,6 +66,7 @@ class Controller_Api_V0_FinalReport extends Controller_Handler_Api
 
         try {
             // Получаем год и номер семестра из query запроса
+            $accountid = $this->request->query('accountid');
             $year = $this->request->query('year');
             $num = $this->request->query('num');
             $plan = $this->request->query('plan');
@@ -103,7 +104,8 @@ class Controller_Api_V0_FinalReport extends Controller_Handler_Api
                 //$groupID = Model_Group::find($gradenum, $groupnum, $study_form, $faculty);
                 //TODO: поменять логи, не записывать id дисциплины
                 if (isset($disciplineID)) {
-                    Model_Logs::logFormExport($this->user->ID, $disciplineID, $groupid, $this->user["SemesterID"]);
+                    //Model_Logs::logFormExport($this->user->ID, $disciplineID, $groupid, $this->user["SemesterID"]);
+                    Model_Logs::logFormExport($accountid, $disciplineID, $groupid, $this->user["SemesterID"]);
                 } else {
                     // pass
                 }

~dev_rating/application/views/base.twig

@@ -87,7 +87,8 @@
 		});
 
         User = {
-            login: "{{ User.Login }}"
+            login: "{{ User.Login }}",
+			accountid: {{ User.ID }},
         };
     </script>