- fehlerhafte Gruppen-Befehle für Korrekturen wurden korrigiert

- Berechnungsfehler der Zulassungsseite beseitigt
- zuordnung zwischen Korrekturen und Einsendungen berichtigt (für Seite des Einsendungsverlufs)
close #177
close #178
close #179

Author: tilluhlig

DB/DBMarking/Sql/procedures/GetCourseUserGroupMarkings.sql

@@ -42,21 +42,22 @@ select SQL_CACHE
     S.E_id as E_id2,
     S.ES_id as ES_id2
 from
-    Marking M
-        left join
-    Submission S ON ('",sub,"'<>'nosubmission' and M.S_id = S.S_id)
+    `Group` G
+        join
+    `Group` G2 ON (G.U_id_leader = '",userid,"'
+        and G.U_id_member = G2.U_id_member
+        and G.C_id = '",courseid,"'
+        and G2.ES_id = G.ES_id)
+        join
+    Submission S ON (S.ES_id = G2.ES_id and G2.U_id_leader = S.U_id)
+        join
+    Marking M ON (S.S_id = M.S_id)
         left join
     SelectedSubmission SS ON (S.S_id = SS.S_id_selected)
-        join
-    `Group` G ON (G.ES_id = S.ES_id)
         left join
     File F ON (F.F_id = M.F_id_file)
         left join 
-    File F2 ON (F2.F_id = S.F_id_file)
-where
-    G.C_id = '",courseid,"'
-        and G.U_id_leader = '",userid,"'
-        and G.U_id_member = S.U_id;");
+    File F2 ON (F2.F_id = S.F_id_file)");
 PREPARE stmt1 FROM @s;
 EXECUTE stmt1;
 DEALLOCATE PREPARE stmt1;

DB/DBMarking/Sql/procedures/GetUserGroupMarkings.sql

@@ -41,22 +41,23 @@ select SQL_CACHE
     S.S_hideFile as S_hideFile2,
     S.E_id as E_id2,
     S.ES_id as ES_id2
-from
-    Marking M
+from        
+    `Group` G
         join
-    Submission S ON ('",sub,"'<>'nosubmission' and M.S_id = S.S_id)
+    `Group` G2 ON (G.U_id_leader = '",userid,"'
+        and G.U_id_member = G2.U_id_member
+        and G.ES_id = '",esid,"'
+        and G2.ES_id = G.ES_id)
+        join
+    Submission S ON (S.ES_id = '",esid,"' and G2.U_id_leader = S.U_id)
+        join
+    Marking M ON (S.S_id = M.S_id)
         left join
     SelectedSubmission SS ON (S.S_id = SS.S_id_selected)
-        join
-    `Group` G ON (G.ES_id = S.ES_id)
         left join
     File F ON (F.F_id = M.F_id_file)
         left join 
-    File F2 ON (F2.F_id = S.F_id_file)
-where
-    M.ES_id = '",esid,"'
-        and G.U_id_leader = '",userid,"'
-        and G.U_id_member = S.U_id;");
+    File F2 ON (F2.F_id = S.F_id_file);");
 PREPARE stmt1 FROM @s;
 EXECUTE stmt1;
 DEALLOCATE PREPARE stmt1;

logic/LGetSite/LGetSite.php

@@ -1025,15 +1025,14 @@ public function uploadHistory($userid, $courseid, $sheetid, $uploaduserid)
                     if (isset($submission['exerciseId'])){
                         if (!empty($answer2)){
                             foreach ($answer2 as $key => $marking){
-                                if (isset($marking['submission']['id'])){
+                                if (isset($marking['submission']['id']) && $marking['submission']['id'] == $submission['id']){
                                     unset($marking['submission']);
                                     $submission['marking'] = $marking;
                                     unset($answer2[$key]);
                                     break;
                                 }
                             }
                         }
-                        
                         $submissions[$submission['exerciseId']][] = $submission;
                     }
                 }
@@ -1650,7 +1649,7 @@ function ($value, $exercise) {
             if (!isset($studentMarkings[$studentID][$exerciseType]))
                 $studentMarkings[$studentID][$exerciseType] = 0;
 
-            $studentMarkings[$studentID][$exerciseType] += isset($marking['points']) ? $marking['points'] : 0;
+            $studentMarkings[$leaderID][$exerciseType] += isset($marking['points']) ? $marking['points'] : 0;
 
             if (isset($allGroups[$sheetID][$leaderID])){
                 $group = $allGroups[$sheetID][$leaderID];