Ilias 6.0 Universität Hannover

Modules/Exercise/classes/class.ilExAssignment.php

@@ -2566,6 +2566,18 @@ public function getCalculatedDeadlines()
 		}
 		return $calculated_deadlines;
 	}
+
+	public function isVersionable()
+	{
+		if($this->getType() == ilExAssignment::TYPE_TEXT)
+		{
+			$exc_settings = new ilSetting("excs");
+			if($exc_settings->get("enable_versioning")) {
+				return true;
+			}
+		}
+		return false;
+	}
 }
 
 ?>

Modules/Exercise/classes/class.ilExSubmission.php

@@ -14,8 +14,6 @@ class ilExSubmission
 	const TYPE_TEXT = "Text";
 	const TYPE_REPO_OBJECT = "RepoObject";	// Wikis
 
-
-
 	/**
 	 * @var ilObjUser
 	 */
@@ -201,7 +199,8 @@ public function getSelectedObject()
 	public function canSubmit()
 	{
 		return ($this->isOwner() &&
-			$this->state->isSubmissionAllowed());
+			$this->state->isSubmissionAllowed() ||
+			$this->isVersioned());
 	}
 
 	public function canView()
@@ -523,8 +522,13 @@ function getFiles(array $a_file_ids = null, $a_only_valid = false, $a_min_timest
 		if($a_min_timestamp)
 		{
 			$sql .= " AND ts > ".$ilDB->quote($a_min_timestamp, "timestamp");
-		}	
-
+		}
+
+		if($this->isVersioned())
+		{
+			$sql .= " ORDER BY returned_id DESC LIMIT 1";
+		}
+
 		$result = $ilDB->query($sql);
 
 		$delivered_files = array();
@@ -654,6 +658,30 @@ public static function findUserFiles($a_user_id, $a_filetitle)
 		}
 		return $res;
 	}
+
+	/**
+	 * Return the submission ids related to the specific user and assignment
+	 * @param $a_user_id
+	 * @param $a_filetitle
+	 * @return array
+	 */
+	public function getSubmissionsByUser() : array
+	{
+		$sql = "SELECT *".
+			" FROM exc_returned".
+			" WHERE user_id = ".$this->db->quote($this->user_id, "integer").
+			" AND ass_id = ".$this->db->quote($this->assignment->getId(), "integer");
+
+		$set = $this->db->query($sql);
+
+		$res = array();
+		while($row = $this->db->fetchAssoc($set))
+		{
+			$res[] = $row;
+		}
+
+		return $res;
+	}
 
 	function deleteAllFiles()
 	{						
@@ -1666,5 +1694,15 @@ static function getDirectoryNameFromUserData($a_user_id)
 
 		return $targetdir;
 	}
+
+	/**
+	 * Check if the submission has been versioned by tutor/admin
+	 * @return bool
+	 */
+	public function isVersioned() : bool
+	{
+		$revision = new ilExSubmissionRevision($this);
+		return $revision->isVersioned();
+	}
 }