diff --git a/Dokumentation_TestOverview.pdf b/Dokumentation_TestOverview.pdf
new file mode 100644
index 0000000..92d7afc
Binary files /dev/null and b/Dokumentation_TestOverview.pdf differ
diff --git a/LuceneObjectDefinition.xml b/LuceneObjectDefinition.xml
deleted file mode 100755
index a663736..0000000
--- a/LuceneObjectDefinition.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ObjectDefinition xmlns:xi="http://www.w3.org/2001/XInclude" type="xtov">
-	<Document type="default">
-		<xi:include href="../../../../../../../Services/Object/LuceneDataSource.xml" />
-		<xi:include href="../../../../../../../Services/Tagging/LuceneDataSource.xml" />
-		<xi:include href="../../../../../../../Services/MetaData/LuceneDataSource.xml" />
-	</Document>
-</ObjectDefinition>
diff --git a/README.md b/README.md
old mode 100644
new mode 100755
index 593d61a..504de98
--- a/README.md
+++ b/README.md
@@ -1,14 +1,78 @@
 # TestOverview
 
-The main goal is to make accumulating test results from multiple tests in arbitrary locations a lot more convenient. These test should be configurable in the test overview object; RBAC should be applied in the usual way, ie. a lecturer can only select his own tests/tests he or she has access to for inclusion in the overview. (The test overview should not be "hierarchical" object that has to "contain" the test it accumulates like a folder or category.)
+The main goal is to make accumulating results from multiple tests and exercises in arbitrary locations a lot more convenient. These test should be configurable in the test overview object; RBAC should be applied in the usual way, ie. a lecturer can only select his own tests/tests he or she has access to for inclusion in the overview. (The test overview should not be "hierarchical" object that has to "contain" the test it accumulates like a folder or category.)
 
-The overview itself should present a table matrix of users (rows), test (end) results (percentages; columns) and a final mean value column. The matrix fields should have different background colors for passed (green), not passed (red) and perhaps not finished (yellow) retaining white for no results (yet).
+The overview itself should present a table matrix of users (rows), test/exercise (end) results (percentages; columns) and a final mean value column. The matrix fields should have different background colors for passed (green), not passed (red). It remains white if no grade is given. TestOverview also presents a graphic view of the test and exercise results in form of column diagram. For exporting the results into another program TestOverview is able to generate a comma-separated values file which covers all results from added tests and exercises.
 
 ## Installation Instructions
 1. Clone this repository to <ILIAS_DIRECTORY>/Customizing/global/plugins/Services/Repository/RepositoryObject/TestOverview
+
+    1.1 Go to ilias root directory:
+
+   ```bash
+   1.2  mkdir -p Customizing/global/plugins/Services/Repository/RepositoryObject/
+   1.3  cd Customizing/global/plugins/Services/Repository/RepositoryObject/
+   1.4  git clone https://github.com/Ilias-fmi/TestOverview.git
+   ```
+   
 2. Login to ILIAS with an administrator account (e.g. root)
 3. Select **Plugins** from the **Administration** main menu drop down.
-4. Search the **TestOverview** plugin in the list of plugin and choose **Activate** from the **Actions** drop down.
+4. Search the **TestOverview** plugin in the list of plugin and choose **Update** and **Activate** from the **Actions** drop down.
+
+## Manual
+
+This manual shows the main functions of the plugin and explains how to use them.
+
+### Importing Test/Exercieses
+Go to the tab **Test Administration** and click on **Add tests to Overview**
+
+![Picture not available](https://raw.githubusercontent.com/Ilias-fmi/TestOverview/ReadMe_update-1/readMe/TestImport.png)
+
+Select your tests and click **Select**
+
+![Picture not available](https://github.com/Ilias-fmi/TestOverview/blob/ReadMe_update-1/readMe/TestImport2.png)
+
+The results are now visible in the subtab **TestOverview**. 
+
+![Picture not available](https://github.com/Ilias-fmi/TestOverview/blob/ReadMe_update-1/readMe/TO_table.png)
+### Test/Exercise Diagrams
+
+With TestOverview it's possible to create diagrams of the average results. For a test-diagram go to the subtab **Diagram** in the tab **TestOverview**.
+
+![Picture not available](https://github.com/Ilias-fmi/TestOverview/blob/ReadMe_update-1/readMe/TestDiagram_mit_pfeil.png)
+
+For an exercise-diagram you have to enter a granularity. If the granularity is too small the diagramm is set to 100 buckets as a maximum size. Click on **Make my Diagram** to render it.
+
+![Picture not available](https://github.com/Ilias-fmi/TestOverview/blob/ReadMe_update-1/readMe/exerciseDiagram.png)
+### Export
+
+The export window of TestOverview looks like this.
+![Picture not available](https://github.com/Ilias-fmi/TestOverview/blob/ReadMe_update-1/readMe/export.png)
+It provides two generic ways to export the results of added tests and exercises; *reduced* and *extended*.
+
+The first entries of the resulting comma-seperated values file contain in each case the **names of the students** (lastname, firstname), their **matriculation number** (this is a field especially for the usage at University of Stuttgart), the **groups** they are members in (in the course the TestOverview object lies in), their **email-address** and **gender**.
+
+The first case, the **Reduced Format** lets the user export the *final* test- and exercise results of all users that participated in the added tests and exercises.
+
+The second case, the **Extended Format** additionally exports the results for all **subquestions** from tests and **assignments** from exercises.
+
+### Permissions Management
+Course administators maybe need the right to **Create a new TestOverview Object**.  
+Repository>>Course>>Permissions->Create new Objects->TestOverview.   
+![Picture not available](https://github.com/Ilias-fmi/TestOverview/blob/ReadMe_Bene/readMe/AdminTestOverviewPermissons.png)
+To use the full range of functions, you need to make sure to manage the permissions for the users.
+People that should be able to see the course results should be granted **Write Permissions**.  
+The people that should only have insights in their own summarized results should be granted **Read Permissions**.
+
+This can be done in the TestOverview Object under Permissions>>Course Administrator/Member/Tutor
+
+![Picture not available](https://github.com/Ilias-fmi/TestOverview/blob/ReadMe_Bene/readMe/Permissions.png)
+
+### User Panel
+The user panel is for students to lookup their results. The window shows total and average results of tests and exercises and the total rank of the student. It also gives a list of every test and exercise and the related result. By marking the results with color it shows if the exercise/test is passed or failed (green = passed / red = failed). 
+
+
+![Picture not available](https://raw.githubusercontent.com/Ilias-fmi/TestOverview/ReadMe_Bene/readMe/studView.png)
 
 ### More Information
-[Ilias Feature Wiki Entry](http://www.ilias.de/docu/goto_docu_wiki_1357_Test_Overview.html)
\ No newline at end of file
+[Ilias Feature Wiki Entry](http://www.ilias.de/docu/goto_docu_wiki_1357_Test_Overview.html)
diff --git a/README.php b/README.php
new file mode 100755
index 0000000..80c0565
--- /dev/null
+++ b/README.php
@@ -0,0 +1,75 @@
+This directory holds all customized files for this ilias installation.
+
+On the top level two directories may be created: /Customizing/global for global 
+changes and /Customizing/clients for changes that should be applied to clients.
+The clients directory holds a subdirectory for each client:
+/Customizing/clients/<client_id>
+At the time being, only user agreements can be offered for clients! Customized skins and languages are only supported globally.
+
+
+1. User Agreements
+
+User agreement texts are stored within html files. They can be defined globally
+for all clients or on a client level.
+
+Global user agreements:
+/global/agreement/agreement_<lang_code>.html
+E.g. /global/agreement/agreement_fr.html
+
+Client specific user agreements:
+/clients/<client_id>/agreement/agreement_<lang_code>.html
+E.g. /clients/default/agreement/agreement_fr.html
+
+
+2. System Language Changes
+
+You may change terms used in the user interface of ILIAS. To do this, use the
+same format as is used in the language files in directory /lang. Store the
+values to be overwritten in files ending with ".lang.local" and put them into
+the /global/lang directory. Client specific changes are not supported yet.
+
+/global/lang/ilias_<lang_code>.lang.local
+E.g. /global/lang/ilias_en.lang.local
+
+
+3. Skins and Styles
+
+Skins are applied through changes of HTML template files that are stored in the 
+/skin directory. Currently they can be defined only globally.
+
+/global/skin/<skin_name>/tpl.xxx.html
+
+The skin directory must include a template.xml description file, example:
+
+<?xml version = "1.0" encoding = "UTF-8"?>
+<template xmlns = "http://www.w3.org" name = "MySkin">
+	<style 	name = "MyStyle"
+			id = "mystyle"
+			image_directory = "images"/>
+</template>
+
+The directory must include a .css file that corresponds to the style id, e.g.
+for style id "mystyle" a file "mystyle.css" with the style sheet information must be
+included.
+
+If you want to customize a HTML template file, you have to put it into the
+following directory:
+
+a) The original is located in templates/default/:
+/global/skin/<skin_name>/Services/<ServiceName>/tpl.xxx.html
+
+b) The original is locatod in Modules/<ModuleName>/templates/default/:
+/global/skin/<skin_name>/Modules/<ModuleName>/tpl.xxx.html
+
+c) The original is locatod in Services/<ServiceName>/templates/default/:
+/global/skin/<skin_name>/Services/<ServiceName>/tpl.xxx.html
+
+All images that are referred by the .css file must be present at their 
+defined location. If you copy the default css from 
+templates/default/delos.css. you have either to change the url in the css 
+for each image or you copy all necessary images to the directory 
+Customizing/global/skin/<skin_name>/images.
+
+You find additional information about how to create your own skin in the 
+Installatin and Maintenance documentation at
+http://www.ilias.de/docu/goto.php?target=pg_15917_367&client_id=docu
diff --git a/classes/API.md b/classes/API.md
new file mode 100644
index 0000000..cd3927b
--- /dev/null
+++ b/classes/API.md
@@ -0,0 +1,1498 @@
+# Flot Reference #
+
+**Table of Contents**
+
+[Introduction](#introduction)
+| [Data Format](#data-format)
+| [Plot Options](#plot-options)
+| [Customizing the legend](#customizing-the-legend)
+| [Customizing the axes](#customizing-the-axes)
+| [Multiple axes](#multiple-axes)
+| [Time series data](#time-series-data)
+| [Customizing the data series](#customizing-the-data-series)
+| [Customizing the grid](#customizing-the-grid)
+| [Specifying gradients](#specifying-gradients)
+| [Plot Methods](#plot-methods)
+| [Hooks](#hooks)
+| [Plugins](#plugins)
+| [Version number](#version-number)
+
+---
+
+## Introduction ##
+
+Consider a call to the plot function:
+
+```js
+var plot = $.plot(placeholder, data, options)
+```
+
+The placeholder is a jQuery object or DOM element or jQuery expression
+that the plot will be put into. This placeholder needs to have its
+width and height set as explained in the [README](README.md) (go read that now if
+you haven't, it's short). The plot will modify some properties of the
+placeholder so it's recommended you simply pass in a div that you
+don't use for anything else. Make sure you check any fancy styling
+you apply to the div, e.g. background images have been reported to be a
+problem on IE 7.
+
+The plot function can also be used as a jQuery chainable property.  This form
+naturally can't return the plot object directly, but you can still access it
+via the 'plot' data key, like this:
+
+```js
+var plot = $("#placeholder").plot(data, options).data("plot");
+```
+
+The format of the data is documented below, as is the available
+options. The plot object returned from the call has some methods you
+can call. These are documented separately below.
+
+Note that in general Flot gives no guarantees if you change any of the
+objects you pass in to the plot function or get out of it since
+they're not necessarily deep-copied.
+
+
+## Data Format ##
+
+The data is an array of data series:
+
+```js
+[ series1, series2, ... ]
+```
+
+A series can either be raw data or an object with properties. The raw
+data format is an array of points:
+
+```js
+[ [x1, y1], [x2, y2], ... ]
+```
+
+E.g.
+
+```js
+[ [1, 3], [2, 14.01], [3.5, 3.14] ]
+```
+
+Note that to simplify the internal logic in Flot both the x and y
+values must be numbers (even if specifying time series, see below for
+how to do this). This is a common problem because you might retrieve
+data from the database and serialize them directly to JSON without
+noticing the wrong type. If you're getting mysterious errors, double
+check that you're inputting numbers and not strings.
+
+If a null is specified as a point or if one of the coordinates is null
+or couldn't be converted to a number, the point is ignored when
+drawing. As a special case, a null value for lines is interpreted as a
+line segment end, i.e. the points before and after the null value are
+not connected.
+
+Lines and points take two coordinates. For filled lines and bars, you
+can specify a third coordinate which is the bottom of the filled
+area/bar (defaults to 0).
+
+The format of a single series object is as follows:
+
+```js
+{
+    color: color or number
+    data: rawdata
+    label: string
+    lines: specific lines options
+    bars: specific bars options
+    points: specific points options
+    xaxis: number
+    yaxis: number
+    clickable: boolean
+    hoverable: boolean
+    shadowSize: number
+    highlightColor: color or number
+}
+```
+
+You don't have to specify any of them except the data, the rest are
+options that will get default values. Typically you'd only specify
+label and data, like this:
+
+```js
+{
+    label: "y = 3",
+    data: [[0, 3], [10, 3]]
+}
+```
+
+The label is used for the legend, if you don't specify one, the series
+will not show up in the legend.
+
+If you don't specify color, the series will get a color from the
+auto-generated colors. The color is either a CSS color specification
+(like "rgb(255, 100, 123)") or an integer that specifies which of
+auto-generated colors to select, e.g. 0 will get color no. 0, etc.
+
+The latter is mostly useful if you let the user add and remove series,
+in which case you can hard-code the color index to prevent the colors
+from jumping around between the series.
+
+The "xaxis" and "yaxis" options specify which axis to use. The axes
+are numbered from 1 (default), so { yaxis: 2} means that the series
+should be plotted against the second y axis.
+
+"clickable" and "hoverable" can be set to false to disable
+interactivity for specific series if interactivity is turned on in
+the plot, see below.
+
+The rest of the options are all documented below as they are the same
+as the default options passed in via the options parameter in the plot
+command. When you specify them for a specific data series, they will
+override the default options for the plot for that data series.
+
+Here's a complete example of a simple data specification:
+
+```js
+[ { label: "Foo", data: [ [10, 1], [17, -14], [30, 5] ] },
+  { label: "Bar", data: [ [11, 13], [19, 11], [30, -7] ] }
+]
+```
+
+
+## Plot Options ##
+
+All options are completely optional. They are documented individually
+below, to change them you just specify them in an object, e.g.
+
+```js
+var options = {
+    series: {
+        lines: { show: true },
+        points: { show: true }
+    }
+};
+	
+$.plot(placeholder, data, options);
+```
+
+
+## Customizing the legend ##
+
+```js
+legend: {
+    show: boolean
+    labelFormatter: null or (fn: string, series object -> string)
+    labelBoxBorderColor: color
+    noColumns: number
+    position: "ne" or "nw" or "se" or "sw"
+    margin: number of pixels or [x margin, y margin]
+    backgroundColor: null or color
+    backgroundOpacity: number between 0 and 1
+    container: null or jQuery object/DOM element/jQuery expression
+    sorted: null/false, true, "ascending", "descending", "reverse", or a comparator
+}
+```
+
+The legend is generated as a table with the data series labels and
+small label boxes with the color of the series. If you want to format
+the labels in some way, e.g. make them to links, you can pass in a
+function for "labelFormatter". Here's an example that makes them
+clickable:
+
+```js
+labelFormatter: function(label, series) {
+    // series is the series object for the label
+    return '<a href="#' + label + '">' + label + '</a>';
+}
+```
+
+To prevent a series from showing up in the legend, simply have the function
+return null.
+
+"noColumns" is the number of columns to divide the legend table into.
+"position" specifies the overall placement of the legend within the
+plot (top-right, top-left, etc.) and margin the distance to the plot
+edge (this can be either a number or an array of two numbers like [x,
+y]). "backgroundColor" and "backgroundOpacity" specifies the
+background. The default is a partly transparent auto-detected
+background.
+
+If you want the legend to appear somewhere else in the DOM, you can
+specify "container" as a jQuery object/expression to put the legend
+table into. The "position" and "margin" etc. options will then be
+ignored. Note that Flot will overwrite the contents of the container.
+
+Legend entries appear in the same order as their series by default. If "sorted"
+is "reverse" then they appear in the opposite order from their series. To sort
+them alphabetically, you can specify true, "ascending" or "descending", where
+true and "ascending" are equivalent.
+
+You can also provide your own comparator function that accepts two
+objects with "label" and "color" properties, and returns zero if they
+are equal, a positive value if the first is greater than the second,
+and a negative value if the first is less than the second.
+
+```js
+sorted: function(a, b) {
+    // sort alphabetically in ascending order
+    return a.label == b.label ? 0 : (
+        a.label > b.label ? 1 : -1
+    )
+}
+```
+
+
+## Customizing the axes ##
+
+```js
+xaxis, yaxis: {
+    show: null or true/false
+    position: "bottom" or "top" or "left" or "right"
+    mode: null or "time" ("time" requires jquery.flot.time.js plugin)
+    timezone: null, "browser" or timezone (only makes sense for mode: "time")
+
+    color: null or color spec
+    tickColor: null or color spec
+    font: null or font spec object
+
+    min: null or number
+    max: null or number
+    autoscaleMargin: null or number
+    
+    transform: null or fn: number -> number
+    inverseTransform: null or fn: number -> number
+    
+    ticks: null or number or ticks array or (fn: axis -> ticks array)
+    tickSize: number or array
+    minTickSize: number or array
+    tickFormatter: (fn: number, object -> string) or string
+    tickDecimals: null or number
+
+    labelWidth: null or number
+    labelHeight: null or number
+    reserveSpace: null or true
+    
+    tickLength: null or number
+
+    alignTicksWithAxis: null or number
+}
+```
+
+All axes have the same kind of options. The following describes how to
+configure one axis, see below for what to do if you've got more than
+one x axis or y axis.
+
+If you don't set the "show" option (i.e. it is null), visibility is
+auto-detected, i.e. the axis will show up if there's data associated
+with it. You can override this by setting the "show" option to true or
+false.
+
+The "position" option specifies where the axis is placed, bottom or
+top for x axes, left or right for y axes. The "mode" option determines
+how the data is interpreted, the default of null means as decimal
+numbers. Use "time" for time series data; see the time series data
+section. The time plugin (jquery.flot.time.js) is required for time
+series support.
+
+The "color" option determines the color of the line and ticks for the axis, and
+defaults to the grid color with transparency. For more fine-grained control you
+can also set the color of the ticks separately with "tickColor".
+
+You can customize the font and color used to draw the axis tick labels with CSS
+or directly via the "font" option. When "font" is null - the default - each
+tick label is given the 'flot-tick-label' class. For compatibility with Flot
+0.7 and earlier the labels are also given the 'tickLabel' class, but this is
+deprecated and scheduled to be removed with the release of version 1.0.0.
+
+To enable more granular control over styles, labels are divided between a set
+of text containers, with each holding the labels for one axis. These containers
+are given the classes 'flot-[x|y]-axis', and 'flot-[x|y]#-axis', where '#' is
+the number of the axis when there are multiple axes.  For example, the x-axis
+labels for a simple plot with only a single x-axis might look like this:
+
+```html
+<div class='flot-x-axis flot-x1-axis'>
+    <div class='flot-tick-label'>January 2013</div>
+    ...
+</div>
+```
+
+For direct control over label styles you can also provide "font" as an object
+with this format:
+
+```js
+{
+    size: 11,
+    lineHeight: 13,
+    style: "italic",
+    weight: "bold",
+    family: "sans-serif",
+    variant: "small-caps",
+    color: "#545454"
+}
+```
+
+The size and lineHeight must be expressed in pixels; CSS units such as 'em'
+or 'smaller' are not allowed.
+
+The options "min"/"max" are the precise minimum/maximum value on the
+scale. If you don't specify either of them, a value will automatically
+be chosen based on the minimum/maximum data values. Note that Flot
+always examines all the data values you feed to it, even if a
+restriction on another axis may make some of them invisible (this
+makes interactive use more stable).
+
+The "autoscaleMargin" is a bit esoteric: it's the fraction of margin
+that the scaling algorithm will add to avoid that the outermost points
+ends up on the grid border. Note that this margin is only applied when
+a min or max value is not explicitly set. If a margin is specified,
+the plot will furthermore extend the axis end-point to the nearest
+whole tick. The default value is "null" for the x axes and 0.02 for y
+axes which seems appropriate for most cases.
+
+"transform" and "inverseTransform" are callbacks you can put in to
+change the way the data is drawn. You can design a function to
+compress or expand certain parts of the axis non-linearly, e.g.
+suppress weekends or compress far away points with a logarithm or some
+other means. When Flot draws the plot, each value is first put through
+the transform function. Here's an example, the x axis can be turned
+into a natural logarithm axis with the following code:
+
+```js
+xaxis: {
+    transform: function (v) { return Math.log(v); },
+    inverseTransform: function (v) { return Math.exp(v); }
+}
+```
+
+Similarly, for reversing the y axis so the values appear in inverse
+order:
+
+```js
+yaxis: {
+    transform: function (v) { return -v; },
+    inverseTransform: function (v) { return -v; }
+}
+```
+
+Note that for finding extrema, Flot assumes that the transform
+function does not reorder values (it should be monotone).
+
+The inverseTransform is simply the inverse of the transform function
+(so v == inverseTransform(transform(v)) for all relevant v). It is
+required for converting from canvas coordinates to data coordinates,
+e.g. for a mouse interaction where a certain pixel is clicked. If you
+don't use any interactive features of Flot, you may not need it.
+
+
+The rest of the options deal with the ticks.
+
+If you don't specify any ticks, a tick generator algorithm will make
+some for you. The algorithm has two passes. It first estimates how
+many ticks would be reasonable and uses this number to compute a nice
+round tick interval size. Then it generates the ticks.
+
+You can specify how many ticks the algorithm aims for by setting
+"ticks" to a number. The algorithm always tries to generate reasonably
+round tick values so even if you ask for three ticks, you might get
+five if that fits better with the rounding. If you don't want any
+ticks at all, set "ticks" to 0 or an empty array.
+
+Another option is to skip the rounding part and directly set the tick
+interval size with "tickSize". If you set it to 2, you'll get ticks at
+2, 4, 6, etc. Alternatively, you can specify that you just don't want
+ticks at a size less than a specific tick size with "minTickSize".
+Note that for time series, the format is an array like [2, "month"],
+see the next section.
+
+If you want to completely override the tick algorithm, you can specify
+an array for "ticks", either like this:
+
+```js
+ticks: [0, 1.2, 2.4]
+```
+
+Or like this where the labels are also customized:
+
+```js
+ticks: [[0, "zero"], [1.2, "one mark"], [2.4, "two marks"]]
+```
+
+You can mix the two if you like.
+  
+For extra flexibility you can specify a function as the "ticks"
+parameter. The function will be called with an object with the axis
+min and max and should return a ticks array. Here's a simplistic tick
+generator that spits out intervals of pi, suitable for use on the x
+axis for trigonometric functions:
+
+```js
+function piTickGenerator(axis) {
+    var res = [], i = Math.floor(axis.min / Math.PI);
+    do {
+        var v = i * Math.PI;
+        res.push([v, i + "\u03c0"]);
+        ++i;
+    } while (v < axis.max);
+    return res;
+}
+```
+
+You can control how the ticks look like with "tickDecimals", the
+number of decimals to display (default is auto-detected).
+
+Alternatively, for ultimate control over how ticks are formatted you can
+provide a function to "tickFormatter". The function is passed two
+parameters, the tick value and an axis object with information, and
+should return a string. The default formatter looks like this:
+
+```js
+function formatter(val, axis) {
+    return val.toFixed(axis.tickDecimals);
+}
+```
+
+The axis object has "min" and "max" with the range of the axis,
+"tickDecimals" with the number of decimals to round the value to and
+"tickSize" with the size of the interval between ticks as calculated
+by the automatic axis scaling algorithm (or specified by you). Here's
+an example of a custom formatter:
+
+```js
+function suffixFormatter(val, axis) {
+    if (val > 1000000)
+        return (val / 1000000).toFixed(axis.tickDecimals) + " MB";
+    else if (val > 1000)
+        return (val / 1000).toFixed(axis.tickDecimals) + " kB";
+    else
+        return val.toFixed(axis.tickDecimals) + " B";
+}
+```
+
+"labelWidth" and "labelHeight" specifies a fixed size of the tick
+labels in pixels. They're useful in case you need to align several
+plots. "reserveSpace" means that even if an axis isn't shown, Flot
+should reserve space for it - it is useful in combination with
+labelWidth and labelHeight for aligning multi-axis charts.
+
+"tickLength" is the length of the tick lines in pixels. By default, the
+innermost axes will have ticks that extend all across the plot, while
+any extra axes use small ticks. A value of null means use the default,
+while a number means small ticks of that length - set it to 0 to hide
+the lines completely.
+
+If you set "alignTicksWithAxis" to the number of another axis, e.g.
+alignTicksWithAxis: 1, Flot will ensure that the autogenerated ticks
+of this axis are aligned with the ticks of the other axis. This may
+improve the looks, e.g. if you have one y axis to the left and one to
+the right, because the grid lines will then match the ticks in both
+ends. The trade-off is that the forced ticks won't necessarily be at
+natural places.
+
+
+## Multiple axes ##
+
+If you need more than one x axis or y axis, you need to specify for
+each data series which axis they are to use, as described under the
+format of the data series, e.g. { data: [...], yaxis: 2 } specifies
+that a series should be plotted against the second y axis.
+
+To actually configure that axis, you can't use the xaxis/yaxis options
+directly - instead there are two arrays in the options:
+
+```js
+xaxes: []
+yaxes: []
+```
+
+Here's an example of configuring a single x axis and two y axes (we
+can leave options of the first y axis empty as the defaults are fine):
+
+```js
+{
+    xaxes: [ { position: "top" } ],
+    yaxes: [ { }, { position: "right", min: 20 } ]
+}
+```
+
+The arrays get their default values from the xaxis/yaxis settings, so
+say you want to have all y axes start at zero, you can simply specify
+yaxis: { min: 0 } instead of adding a min parameter to all the axes.
+
+Generally, the various interfaces in Flot dealing with data points
+either accept an xaxis/yaxis parameter to specify which axis number to
+use (starting from 1), or lets you specify the coordinate directly as
+x2/x3/... or x2axis/x3axis/... instead of "x" or "xaxis".
+
+
+## Time series data ##
+
+Please note that it is now required to include the time plugin,
+jquery.flot.time.js, for time series support.
+
+Time series are a bit more difficult than scalar data because
+calendars don't follow a simple base 10 system. For many cases, Flot
+abstracts most of this away, but it can still be a bit difficult to
+get the data into Flot. So we'll first discuss the data format.
+
+The time series support in Flot is based on Javascript timestamps,
+i.e. everywhere a time value is expected or handed over, a Javascript
+timestamp number is used. This is a number, not a Date object. A
+Javascript timestamp is the number of milliseconds since January 1,
+1970 00:00:00 UTC. This is almost the same as Unix timestamps, except it's
+in milliseconds, so remember to multiply by 1000!
+
+You can see a timestamp like this
+
+```js
+alert((new Date()).getTime())
+```
+
+There are different schools of thought when it comes to display of
+timestamps. Many will want the timestamps to be displayed according to
+a certain time zone, usually the time zone in which the data has been
+produced. Some want the localized experience, where the timestamps are
+displayed according to the local time of the visitor. Flot supports
+both. Optionally you can include a third-party library to get
+additional timezone support.
+
+Default behavior is that Flot always displays timestamps according to
+UTC. The reason being that the core Javascript Date object does not
+support other fixed time zones. Often your data is at another time
+zone, so it may take a little bit of tweaking to work around this
+limitation.
+
+The easiest way to think about it is to pretend that the data
+production time zone is UTC, even if it isn't. So if you have a
+datapoint at 2002-02-20 08:00, you can generate a timestamp for eight
+o'clock UTC even if it really happened eight o'clock UTC+0200.
+
+In PHP you can get an appropriate timestamp with:
+
+```php
+strtotime("2002-02-20 UTC") * 1000
+```
+
+In Python you can get it with something like:
+
+```python
+calendar.timegm(datetime_object.timetuple()) * 1000
+```
+In Ruby you can get it using the `#to_i` method on the
+[`Time`](http://apidock.com/ruby/Time/to_i) object. If you're using the
+`active_support` gem (default for Ruby on Rails applications) `#to_i` is also
+available on the `DateTime` and `ActiveSupport::TimeWithZone` objects. You
+simply need to multiply the result by 1000:
+
+```ruby
+Time.now.to_i * 1000     # => 1383582043000
+# ActiveSupport examples:
+DateTime.now.to_i * 1000 # => 1383582043000
+ActiveSupport::TimeZone.new('Asia/Shanghai').now.to_i * 1000
+# => 1383582043000
+```
+
+In .NET you can get it with something like:
+
+```aspx
+public static int GetJavascriptTimestamp(System.DateTime input)
+{
+    System.TimeSpan span = new System.TimeSpan(System.DateTime.Parse("1/1/1970").Ticks);
+    System.DateTime time = input.Subtract(span);
+    return (long)(time.Ticks / 10000);
+}
+```
+
+Javascript also has some support for parsing date strings, so it is
+possible to generate the timestamps manually client-side.
+
+If you've already got the real UTC timestamp, it's too late to use the
+pretend trick described above. But you can fix up the timestamps by
+adding the time zone offset, e.g. for UTC+0200 you would add 2 hours
+to the UTC timestamp you got. Then it'll look right on the plot. Most
+programming environments have some means of getting the timezone
+offset for a specific date (note that you need to get the offset for
+each individual timestamp to account for daylight savings).
+
+The alternative with core Javascript is to interpret the timestamps
+according to the time zone that the visitor is in, which means that
+the ticks will shift with the time zone and daylight savings of each
+visitor. This behavior is enabled by setting the axis option
+"timezone" to the value "browser".
+
+If you need more time zone functionality than this, there is still
+another option. If you include the "timezone-js" library
+<https://github.com/mde/timezone-js> in the page and set axis.timezone
+to a value recognized by said library, Flot will use timezone-js to
+interpret the timestamps according to that time zone.
+
+Once you've gotten the timestamps into the data and specified "time"
+as the axis mode, Flot will automatically generate relevant ticks and
+format them. As always, you can tweak the ticks via the "ticks" option
+- just remember that the values should be timestamps (numbers), not
+Date objects.
+
+Tick generation and formatting can also be controlled separately
+through the following axis options:
+
+```js
+minTickSize: array
+timeformat: null or format string
+monthNames: null or array of size 12 of strings
+dayNames: null or array of size 7 of strings
+twelveHourClock: boolean
+```
+
+Here "timeformat" is a format string to use. You might use it like
+this:
+
+```js
+xaxis: {
+    mode: "time",
+    timeformat: "%Y/%m/%d"
+}
+```
+
+This will result in tick labels like "2000/12/24". A subset of the
+standard strftime specifiers are supported (plus the nonstandard %q):
+
+```js
+%a: weekday name (customizable)
+%b: month name (customizable)
+%d: day of month, zero-padded (01-31)
+%e: day of month, space-padded ( 1-31)
+%H: hours, 24-hour time, zero-padded (00-23)
+%I: hours, 12-hour time, zero-padded (01-12)
+%m: month, zero-padded (01-12)
+%M: minutes, zero-padded (00-59)
+%q: quarter (1-4)
+%S: seconds, zero-padded (00-59)
+%y: year (two digits)
+%Y: year (four digits)
+%p: am/pm
+%P: AM/PM (uppercase version of %p)
+%w: weekday as number (0-6, 0 being Sunday)
+```
+
+Flot 0.8 switched from %h to the standard %H hours specifier. The %h specifier
+is still available, for backwards-compatibility, but is deprecated and
+scheduled to be removed permanently with the release of version 1.0.
+
+You can customize the month names with the "monthNames" option. For
+instance, for Danish you might specify:
+
+```js
+monthNames: ["jan", "feb", "mar", "apr", "maj", "jun", "jul", "aug", "sep", "okt", "nov", "dec"]
+```
+
+Similarly you can customize the weekday names with the "dayNames"
+option. An example in French:
+
+```js
+dayNames: ["dim", "lun", "mar", "mer", "jeu", "ven", "sam"]
+```
+
+If you set "twelveHourClock" to true, the autogenerated timestamps
+will use 12 hour AM/PM timestamps instead of 24 hour. This only
+applies if you have not set "timeformat". Use the "%I" and "%p" or
+"%P" options if you want to build your own format string with 12-hour
+times.
+
+If the Date object has a strftime property (and it is a function), it
+will be used instead of the built-in formatter. Thus you can include
+a strftime library such as http://hacks.bluesmoon.info/strftime/ for
+more powerful date/time formatting.
+
+If everything else fails, you can control the formatting by specifying
+a custom tick formatter function as usual. Here's a simple example
+which will format December 24 as 24/12:
+
+```js
+tickFormatter: function (val, axis) {
+    var d = new Date(val);
+    return d.getUTCDate() + "/" + (d.getUTCMonth() + 1);
+}
+```
+
+Note that for the time mode "tickSize" and "minTickSize" are a bit
+special in that they are arrays on the form "[value, unit]" where unit
+is one of "second", "minute", "hour", "day", "month" and "year". So
+you can specify
+
+```js
+minTickSize: [1, "month"]
+```
+
+to get a tick interval size of at least 1 month and correspondingly,
+if axis.tickSize is [2, "day"] in the tick formatter, the ticks have
+been produced with two days in-between.
+
+
+## Customizing the data series ##
+
+```js
+series: {
+    lines, points, bars: {
+        show: boolean
+        lineWidth: number
+        fill: boolean or number
+        fillColor: null or color/gradient
+    }
+
+    lines, bars: {
+        zero: boolean
+    }
+
+    points: {
+        radius: number
+        symbol: "circle" or function
+    }
+
+    bars: {
+        barWidth: number
+        align: "left", "right" or "center"
+        horizontal: boolean
+    }
+
+    lines: {
+        steps: boolean
+    }
+
+    shadowSize: number
+    highlightColor: color or number
+}
+
+colors: [ color1, color2, ... ]
+```
+
+The options inside "series: {}" are copied to each of the series. So
+you can specify that all series should have bars by putting it in the
+global options, or override it for individual series by specifying
+bars in a particular the series object in the array of data.
+  
+The most important options are "lines", "points" and "bars" that
+specify whether and how lines, points and bars should be shown for
+each data series. In case you don't specify anything at all, Flot will
+default to showing lines (you can turn this off with
+lines: { show: false }). You can specify the various types
+independently of each other, and Flot will happily draw each of them
+in turn (this is probably only useful for lines and points), e.g.
+
+```js
+var options = {
+    series: {
+        lines: { show: true, fill: true, fillColor: "rgba(255, 255, 255, 0.8)" },
+        points: { show: true, fill: false }
+    }
+};
+```
+
+"lineWidth" is the thickness of the line or outline in pixels. You can
+set it to 0 to prevent a line or outline from being drawn; this will
+also hide the shadow.
+
+"fill" is whether the shape should be filled. For lines, this produces
+area graphs. You can use "fillColor" to specify the color of the fill.
+If "fillColor" evaluates to false (default for everything except
+points which are filled with white), the fill color is auto-set to the
+color of the data series. You can adjust the opacity of the fill by
+setting fill to a number between 0 (fully transparent) and 1 (fully
+opaque).
+
+For bars, fillColor can be a gradient, see the gradient documentation
+below. "barWidth" is the width of the bars in units of the x axis (or
+the y axis if "horizontal" is true), contrary to most other measures
+that are specified in pixels. For instance, for time series the unit
+is milliseconds so 24 * 60 * 60 * 1000 produces bars with the width of
+a day. "align" specifies whether a bar should be left-aligned
+(default), right-aligned or centered on top of the value it represents. 
+When "horizontal" is on, the bars are drawn horizontally, i.e. from the 
+y axis instead of the x axis; note that the bar end points are still
+defined in the same way so you'll probably want to swap the
+coordinates if you've been plotting vertical bars first.
+
+Area and bar charts normally start from zero, regardless of the data's range.
+This is because they convey information through size, and starting from a
+different value would distort their meaning. In cases where the fill is purely
+for decorative purposes, however, "zero" allows you to override this behavior.
+It defaults to true for filled lines and bars; setting it to false tells the
+series to use the same automatic scaling as an un-filled line.
+
+For lines, "steps" specifies whether two adjacent data points are
+connected with a straight (possibly diagonal) line or with first a
+horizontal and then a vertical line. Note that this transforms the
+data by adding extra points.
+
+For points, you can specify the radius and the symbol. The only
+built-in symbol type is circles, for other types you can use a plugin
+or define them yourself by specifying a callback:
+
+```js
+function cross(ctx, x, y, radius, shadow) {
+    var size = radius * Math.sqrt(Math.PI) / 2;
+    ctx.moveTo(x - size, y - size);
+    ctx.lineTo(x + size, y + size);
+    ctx.moveTo(x - size, y + size);
+    ctx.lineTo(x + size, y - size);
+}
+```
+
+The parameters are the drawing context, x and y coordinates of the
+center of the point, a radius which corresponds to what the circle
+would have used and whether the call is to draw a shadow (due to
+limited canvas support, shadows are currently faked through extra
+draws). It's good practice to ensure that the area covered by the
+symbol is the same as for the circle with the given radius, this
+ensures that all symbols have approximately the same visual weight.
+
+"shadowSize" is the default size of shadows in pixels. Set it to 0 to
+remove shadows.
+
+"highlightColor" is the default color of the translucent overlay used
+to highlight the series when the mouse hovers over it.
+
+The "colors" array specifies a default color theme to get colors for
+the data series from. You can specify as many colors as you like, like
+this:
+
+```js
+colors: ["#d18b2c", "#dba255", "#919733"]
+```
+
+If there are more data series than colors, Flot will try to generate
+extra colors by lightening and darkening colors in the theme.
+
+
+## Customizing the grid ##
+
+```js
+grid: {
+    show: boolean
+    aboveData: boolean
+    color: color
+    backgroundColor: color/gradient or null
+    margin: number or margin object
+    labelMargin: number
+    axisMargin: number
+    markings: array of markings or (fn: axes -> array of markings)
+    borderWidth: number or object with "top", "right", "bottom" and "left" properties with different widths
+    borderColor: color or null or object with "top", "right", "bottom" and "left" properties with different colors
+    minBorderMargin: number or null
+    clickable: boolean
+    hoverable: boolean
+    autoHighlight: boolean
+    mouseActiveRadius: number
+}
+
+interaction: {
+    redrawOverlayInterval: number or -1
+}
+```
+
+The grid is the thing with the axes and a number of ticks. Many of the
+things in the grid are configured under the individual axes, but not
+all. "color" is the color of the grid itself whereas "backgroundColor"
+specifies the background color inside the grid area, here null means
+that the background is transparent. You can also set a gradient, see
+the gradient documentation below.
+
+You can turn off the whole grid including tick labels by setting
+"show" to false. "aboveData" determines whether the grid is drawn
+above the data or below (below is default).
+
+"margin" is the space in pixels between the canvas edge and the grid,
+which can be either a number or an object with individual margins for
+each side, in the form:
+
+```js
+margin: {
+    top: top margin in pixels
+    left: left margin in pixels
+    bottom: bottom margin in pixels
+    right: right margin in pixels
+}
+```
+
+"labelMargin" is the space in pixels between tick labels and axis
+line, and "axisMargin" is the space in pixels between axes when there
+are two next to each other.
+
+"borderWidth" is the width of the border around the plot. Set it to 0
+to disable the border. Set it to an object with "top", "right",
+"bottom" and "left" properties to use different widths. You can
+also set "borderColor" if you want the border to have a different color
+than the grid lines. Set it to an object with "top", "right", "bottom"
+and "left" properties to use different colors. "minBorderMargin" controls
+the default minimum margin around the border - it's used to make sure
+that points aren't accidentally clipped by the canvas edge so by default
+the value is computed from the point radius.
+
+"markings" is used to draw simple lines and rectangular areas in the
+background of the plot. You can either specify an array of ranges on
+the form { xaxis: { from, to }, yaxis: { from, to } } (with multiple
+axes, you can specify coordinates for other axes instead, e.g. as
+x2axis/x3axis/...) or with a function that returns such an array given
+the axes for the plot in an object as the first parameter.
+
+You can set the color of markings by specifying "color" in the ranges
+object. Here's an example array:
+
+```js
+markings: [ { xaxis: { from: 0, to: 2 }, yaxis: { from: 10, to: 10 }, color: "#bb0000" }, ... ]
+```
+
+If you leave out one of the values, that value is assumed to go to the
+border of the plot. So for example if you only specify { xaxis: {
+from: 0, to: 2 } } it means an area that extends from the top to the
+bottom of the plot in the x range 0-2.
+
+A line is drawn if from and to are the same, e.g.
+
+```js
+markings: [ { yaxis: { from: 1, to: 1 } }, ... ]
+```
+
+would draw a line parallel to the x axis at y = 1. You can control the
+line width with "lineWidth" in the range object.
+
+An example function that makes vertical stripes might look like this:
+
+```js
+markings: function (axes) {
+    var markings = [];
+    for (var x = Math.floor(axes.xaxis.min); x < axes.xaxis.max; x += 2)
+        markings.push({ xaxis: { from: x, to: x + 1 } });
+    return markings;
+}
+```
+
+If you set "clickable" to true, the plot will listen for click events
+on the plot area and fire a "plotclick" event on the placeholder with
+a position and a nearby data item object as parameters. The coordinates
+are available both in the unit of the axes (not in pixels) and in
+global screen coordinates.
+
+Likewise, if you set "hoverable" to true, the plot will listen for
+mouse move events on the plot area and fire a "plothover" event with
+the same parameters as the "plotclick" event. If "autoHighlight" is
+true (the default), nearby data items are highlighted automatically.
+If needed, you can disable highlighting and control it yourself with
+the highlight/unhighlight plot methods described elsewhere.
+
+You can use "plotclick" and "plothover" events like this:
+
+```js
+$.plot($("#placeholder"), [ d ], { grid: { clickable: true } });
+
+$("#placeholder").bind("plotclick", function (event, pos, item) {
+    alert("You clicked at " + pos.x + ", " + pos.y);
+    // axis coordinates for other axes, if present, are in pos.x2, pos.x3, ...
+    // if you need global screen coordinates, they are pos.pageX, pos.pageY
+
+    if (item) {
+        highlight(item.series, item.datapoint);
+        alert("You clicked a point!");
+    }
+});
+```
+
+The item object in this example is either null or a nearby object on the form:
+
+```js
+item: {
+    datapoint: the point, e.g. [0, 2]
+    dataIndex: the index of the point in the data array
+    series: the series object
+    seriesIndex: the index of the series
+    pageX, pageY: the global screen coordinates of the point
+}
+```
+
+For instance, if you have specified the data like this 
+
+```js
+$.plot($("#placeholder"), [ { label: "Foo", data: [[0, 10], [7, 3]] } ], ...);
+```
+
+and the mouse is near the point (7, 3), "datapoint" is [7, 3],
+"dataIndex" will be 1, "series" is a normalized series object with
+among other things the "Foo" label in series.label and the color in
+series.color, and "seriesIndex" is 0. Note that plugins and options
+that transform the data can shift the indexes from what you specified
+in the original data array.
+
+If you use the above events to update some other information and want
+to clear out that info in case the mouse goes away, you'll probably
+also need to listen to "mouseout" events on the placeholder div.
+
+"mouseActiveRadius" specifies how far the mouse can be from an item
+and still activate it. If there are two or more points within this
+radius, Flot chooses the closest item. For bars, the top-most bar
+(from the latest specified data series) is chosen.
+
+If you want to disable interactivity for a specific data series, you
+can set "hoverable" and "clickable" to false in the options for that
+series, like this:
+
+```js
+{ data: [...], label: "Foo", clickable: false }
+```
+
+"redrawOverlayInterval" specifies the maximum time to delay a redraw
+of interactive things (this works as a rate limiting device). The
+default is capped to 60 frames per second. You can set it to -1 to
+disable the rate limiting.
+
+
+## Specifying gradients ##
+
+A gradient is specified like this:
+
+```js
+{ colors: [ color1, color2, ... ] }
+```
+
+For instance, you might specify a background on the grid going from
+black to gray like this:
+
+```js
+grid: {
+    backgroundColor: { colors: ["#000", "#999"] }
+}
+```
+
+For the series you can specify the gradient as an object that
+specifies the scaling of the brightness and the opacity of the series
+color, e.g.
+
+```js
+{ colors: [{ opacity: 0.8 }, { brightness: 0.6, opacity: 0.8 } ] }
+```
+
+where the first color simply has its alpha scaled, whereas the second
+is also darkened. For instance, for bars the following makes the bars
+gradually disappear, without outline:
+
+```js
+bars: {
+    show: true,
+    lineWidth: 0,
+    fill: true,
+    fillColor: { colors: [ { opacity: 0.8 }, { opacity: 0.1 } ] }
+}
+```
+
+Flot currently only supports vertical gradients drawn from top to
+bottom because that's what works with IE.
+
+
+## Plot Methods ##
+
+The Plot object returned from the plot function has some methods you
+can call:
+
+ - highlight(series, datapoint)
+
+    Highlight a specific datapoint in the data series. You can either
+    specify the actual objects, e.g. if you got them from a
+    "plotclick" event, or you can specify the indices, e.g.
+    highlight(1, 3) to highlight the fourth point in the second series
+    (remember, zero-based indexing).
+
+ - unhighlight(series, datapoint) or unhighlight()
+
+    Remove the highlighting of the point, same parameters as
+    highlight.
+
+    If you call unhighlight with no parameters, e.g. as
+    plot.unhighlight(), all current highlights are removed.
+
+ - setData(data)
+
+    You can use this to reset the data used. Note that axis scaling,
+    ticks, legend etc. will not be recomputed (use setupGrid() to do
+    that). You'll probably want to call draw() afterwards.
+
+    You can use this function to speed up redrawing a small plot if
+    you know that the axes won't change. Put in the new data with
+    setData(newdata), call draw(), and you're good to go. Note that
+    for large datasets, almost all the time is consumed in draw()
+    plotting the data so in this case don't bother.
+
+ - setupGrid()
+
+    Recalculate and set axis scaling, ticks, legend etc.
+
+    Note that because of the drawing model of the canvas, this
+    function will immediately redraw (actually reinsert in the DOM)
+    the labels and the legend, but not the actual tick lines because
+    they're drawn on the canvas. You need to call draw() to get the
+    canvas redrawn.
+
+ - draw()
+
+    Redraws the plot canvas.
+
+ - triggerRedrawOverlay()
+
+    Schedules an update of an overlay canvas used for drawing
+    interactive things like a selection and point highlights. This
+    is mostly useful for writing plugins. The redraw doesn't happen
+    immediately, instead a timer is set to catch multiple successive
+    redraws (e.g. from a mousemove). You can get to the overlay by
+    setting up a drawOverlay hook.
+
+ - width()/height()
+
+    Gets the width and height of the plotting area inside the grid.
+    This is smaller than the canvas or placeholder dimensions as some
+    extra space is needed (e.g. for labels).
+
+ - offset()
+
+    Returns the offset of the plotting area inside the grid relative
+    to the document, useful for instance for calculating mouse
+    positions (event.pageX/Y minus this offset is the pixel position
+    inside the plot).
+
+ - pointOffset({ x: xpos, y: ypos })
+
+    Returns the calculated offset of the data point at (x, y) in data
+    space within the placeholder div. If you are working with multiple
+    axes, you can specify the x and y axis references, e.g. 
+
+    ```js
+      o = pointOffset({ x: xpos, y: ypos, xaxis: 2, yaxis: 3 })
+      // o.left and o.top now contains the offset within the div
+    ````
+
+ - resize()
+
+    Tells Flot to resize the drawing canvas to the size of the
+    placeholder. You need to run setupGrid() and draw() afterwards as
+    canvas resizing is a destructive operation. This is used
+    internally by the resize plugin.
+
+ - shutdown()
+
+    Cleans up any event handlers Flot has currently registered. This
+    is used internally.
+
+There are also some members that let you peek inside the internal
+workings of Flot which is useful in some cases. Note that if you change
+something in the objects returned, you're changing the objects used by
+Flot to keep track of its state, so be careful.
+
+  - getData()
+
+    Returns an array of the data series currently used in normalized
+    form with missing settings filled in according to the global
+    options. So for instance to find out what color Flot has assigned
+    to the data series, you could do this:
+
+    ```js
+    var series = plot.getData();
+    for (var i = 0; i < series.length; ++i)
+        alert(series[i].color);
+    ```
+
+    A notable other interesting field besides color is datapoints
+    which has a field "points" with the normalized data points in a
+    flat array (the field "pointsize" is the increment in the flat
+    array to get to the next point so for a dataset consisting only of
+    (x,y) pairs it would be 2).
+
+  - getAxes()
+
+    Gets an object with the axes. The axes are returned as the
+    attributes of the object, so for instance getAxes().xaxis is the
+    x axis.
+
+    Various things are stuffed inside an axis object, e.g. you could
+    use getAxes().xaxis.ticks to find out what the ticks are for the
+    xaxis. Two other useful attributes are p2c and c2p, functions for
+    transforming from data point space to the canvas plot space and
+    back. Both returns values that are offset with the plot offset.
+    Check the Flot source code for the complete set of attributes (or
+    output an axis with console.log() and inspect it).
+
+    With multiple axes, the extra axes are returned as x2axis, x3axis,
+    etc., e.g. getAxes().y2axis is the second y axis. You can check
+    y2axis.used to see whether the axis is associated with any data
+    points and y2axis.show to see if it is currently shown. 
+ 
+  - getPlaceholder()
+
+    Returns placeholder that the plot was put into. This can be useful
+    for plugins for adding DOM elements or firing events.
+
+  - getCanvas()
+
+    Returns the canvas used for drawing in case you need to hack on it
+    yourself. You'll probably need to get the plot offset too.
+  
+  - getPlotOffset()
+
+    Gets the offset that the grid has within the canvas as an object
+    with distances from the canvas edges as "left", "right", "top",
+    "bottom". I.e., if you draw a circle on the canvas with the center
+    placed at (left, top), its center will be at the top-most, left
+    corner of the grid.
+
+  - getOptions()
+
+    Gets the options for the plot, normalized, with default values
+    filled in. You get a reference to actual values used by Flot, so
+    if you modify the values in here, Flot will use the new values.
+    If you change something, you probably have to call draw() or
+    setupGrid() or triggerRedrawOverlay() to see the change.
+    
+
+## Hooks ##
+
+In addition to the public methods, the Plot object also has some hooks
+that can be used to modify the plotting process. You can install a
+callback function at various points in the process, the function then
+gets access to the internal data structures in Flot.
+
+Here's an overview of the phases Flot goes through:
+
+  1. Plugin initialization, parsing options
+  
+  2. Constructing the canvases used for drawing
+
+  3. Set data: parsing data specification, calculating colors,
+     copying raw data points into internal format,
+     normalizing them, finding max/min for axis auto-scaling
+
+  4. Grid setup: calculating axis spacing, ticks, inserting tick
+     labels, the legend
+
+  5. Draw: drawing the grid, drawing each of the series in turn
+
+  6. Setting up event handling for interactive features
+
+  7. Responding to events, if any
+
+  8. Shutdown: this mostly happens in case a plot is overwritten 
+
+Each hook is simply a function which is put in the appropriate array.
+You can add them through the "hooks" option, and they are also available
+after the plot is constructed as the "hooks" attribute on the returned
+plot object, e.g.
+
+```js
+  // define a simple draw hook
+  function hellohook(plot, canvascontext) { alert("hello!"); };
+
+  // pass it in, in an array since we might want to specify several
+  var plot = $.plot(placeholder, data, { hooks: { draw: [hellohook] } });
+
+  // we can now find it again in plot.hooks.draw[0] unless a plugin
+  // has added other hooks
+```
+
+The available hooks are described below. All hook callbacks get the
+plot object as first parameter. You can find some examples of defined
+hooks in the plugins bundled with Flot.
+
+ - processOptions  [phase 1]
+
+    ```function(plot, options)```
+   
+    Called after Flot has parsed and merged options. Useful in the
+    instance where customizations beyond simple merging of default
+    values is needed. A plugin might use it to detect that it has been
+    enabled and then turn on or off other options.
+
+ 
+ - processRawData  [phase 3]
+
+    ```function(plot, series, data, datapoints)```
+ 
+    Called before Flot copies and normalizes the raw data for the given
+    series. If the function fills in datapoints.points with normalized
+    points and sets datapoints.pointsize to the size of the points,
+    Flot will skip the copying/normalization step for this series.
+   
+    In any case, you might be interested in setting datapoints.format,
+    an array of objects for specifying how a point is normalized and
+    how it interferes with axis scaling. It accepts the following options:
+
+    ```js
+    {
+        x, y: boolean,
+        number: boolean,
+        required: boolean,
+        defaultValue: value,
+        autoscale: boolean
+    }
+    ```
+
+    "x" and "y" specify whether the value is plotted against the x or y axis,
+    and is currently used only to calculate axis min-max ranges. The default
+    format array, for example, looks like this:
+
+    ```js
+    [
+        { x: true, number: true, required: true },
+        { y: true, number: true, required: true }
+    ]
+    ```
+
+    This indicates that a point, i.e. [0, 25], consists of two values, with the
+    first being plotted on the x axis and the second on the y axis.
+
+    If "number" is true, then the value must be numeric, and is set to null if
+    it cannot be converted to a number.
+
+    "defaultValue" provides a fallback in case the original value is null. This
+    is for instance handy for bars, where one can omit the third coordinate
+    (the bottom of the bar), which then defaults to zero.
+
+    If "required" is true, then the value must exist (be non-null) for the
+    point as a whole to be valid. If no value is provided, then the entire
+    point is cleared out with nulls, turning it into a gap in the series.
+
+    "autoscale" determines whether the value is considered when calculating an
+    automatic min-max range for the axes that the value is plotted against.
+
+ - processDatapoints  [phase 3]
+
+    ```function(plot, series, datapoints)```
+
+    Called after normalization of the given series but before finding
+    min/max of the data points. This hook is useful for implementing data
+    transformations. "datapoints" contains the normalized data points in
+    a flat array as datapoints.points with the size of a single point
+    given in datapoints.pointsize. Here's a simple transform that
+    multiplies all y coordinates by 2:
+
+    ```js
+    function multiply(plot, series, datapoints) {
+        var points = datapoints.points, ps = datapoints.pointsize;
+        for (var i = 0; i < points.length; i += ps)
+            points[i + 1] *= 2;
+    }
+    ```
+
+    Note that you must leave datapoints in a good condition as Flot
+    doesn't check it or do any normalization on it afterwards.
+
+ - processOffset  [phase 4]
+
+    ```function(plot, offset)```
+
+    Called after Flot has initialized the plot's offset, but before it
+    draws any axes or plot elements. This hook is useful for customizing
+    the margins between the grid and the edge of the canvas. "offset" is
+    an object with attributes "top", "bottom", "left" and "right",
+    corresponding to the margins on the four sides of the plot.
+
+ - drawBackground [phase 5]
+
+    ```function(plot, canvascontext)```
+
+    Called before all other drawing operations. Used to draw backgrounds
+    or other custom elements before the plot or axes have been drawn.
+
+ - drawSeries  [phase 5]
+
+    ```function(plot, canvascontext, series)```
+
+    Hook for custom drawing of a single series. Called just before the
+    standard drawing routine has been called in the loop that draws
+    each series.
+
+ - draw  [phase 5]
+
+    ```function(plot, canvascontext)```
+
+    Hook for drawing on the canvas. Called after the grid is drawn
+    (unless it's disabled or grid.aboveData is set) and the series have
+    been plotted (in case any points, lines or bars have been turned
+    on). For examples of how to draw things, look at the source code.
+
+ - bindEvents  [phase 6]
+
+    ```function(plot, eventHolder)```
+
+    Called after Flot has setup its event handlers. Should set any
+    necessary event handlers on eventHolder, a jQuery object with the
+    canvas, e.g.
+
+    ```js
+    function (plot, eventHolder) {
+        eventHolder.mousedown(function (e) {
+            alert("You pressed the mouse at " + e.pageX + " " + e.pageY);
+        });
+    }
+    ```
+
+    Interesting events include click, mousemove, mouseup/down. You can
+    use all jQuery events. Usually, the event handlers will update the
+    state by drawing something (add a drawOverlay hook and call
+    triggerRedrawOverlay) or firing an externally visible event for
+    user code. See the crosshair plugin for an example.
+     
+    Currently, eventHolder actually contains both the static canvas
+    used for the plot itself and the overlay canvas used for
+    interactive features because some versions of IE get the stacking
+    order wrong. The hook only gets one event, though (either for the
+    overlay or for the static canvas).
+
+    Note that custom plot events generated by Flot are not generated on
+    eventHolder, but on the div placeholder supplied as the first
+    argument to the plot call. You can get that with
+    plot.getPlaceholder() - that's probably also the one you should use
+    if you need to fire a custom event.
+
+ - drawOverlay  [phase 7]
+
+    ```function (plot, canvascontext)```
+
+    The drawOverlay hook is used for interactive things that need a
+    canvas to draw on. The model currently used by Flot works the way
+    that an extra overlay canvas is positioned on top of the static
+    canvas. This overlay is cleared and then completely redrawn
+    whenever something interesting happens. This hook is called when
+    the overlay canvas is to be redrawn.
+
+    "canvascontext" is the 2D context of the overlay canvas. You can
+    use this to draw things. You'll most likely need some of the
+    metrics computed by Flot, e.g. plot.width()/plot.height(). See the
+    crosshair plugin for an example.
+
+ - shutdown  [phase 8]
+
+    ```function (plot, eventHolder)```
+
+    Run when plot.shutdown() is called, which usually only happens in
+    case a plot is overwritten by a new plot. If you're writing a
+    plugin that adds extra DOM elements or event handlers, you should
+    add a callback to clean up after you. Take a look at the section in
+    the [PLUGINS](PLUGINS.md) document for more info.
+
+   
+## Plugins ##
+
+Plugins extend the functionality of Flot. To use a plugin, simply
+include its Javascript file after Flot in the HTML page.
+
+If you're worried about download size/latency, you can concatenate all
+the plugins you use, and Flot itself for that matter, into one big file
+(make sure you get the order right), then optionally run it through a
+Javascript minifier such as YUI Compressor.
+
+Here's a brief explanation of how the plugin plumbings work:
+
+Each plugin registers itself in the global array $.plot.plugins. When
+you make a new plot object with $.plot, Flot goes through this array
+calling the "init" function of each plugin and merging default options
+from the "option" attribute of the plugin. The init function gets a
+reference to the plot object created and uses this to register hooks
+and add new public methods if needed.
+
+See the [PLUGINS](PLUGINS.md) document for details on how to write a plugin. As the
+above description hints, it's actually pretty easy.
+
+
+## Version number ##
+
+The version number of Flot is available in ```$.plot.version```.
diff --git a/classes/GUI/class.ilExerciseListTableGUI.php b/classes/GUI/class.ilExerciseListTableGUI.php
new file mode 100644
index 0000000..d57001d
--- /dev/null
+++ b/classes/GUI/class.ilExerciseListTableGUI.php
@@ -0,0 +1,147 @@
+<?php
+
+/* Copyright (c) 1998-2012 ILIAS open source, Extended GPL, see docs/LICENSE */
+
+/**
+ * 	@package	TestOverview repository plugin
+ * 	@category	Core
+ * 
+ * 	@author		Jan Ruthardt <janruthardt@web.de>
+ *  @author		Benedict Steuerlein <st111340@stud.uni-stuttgart.de>
+ *  @author		Martin Dinkel <hmdinkel@web.de>
+ *  
+ *  @ilCtrl_Calls ilExerciseListTableGUI: ilObjExerciseGUI
+ *	Creats the matrix of Exercises 
+ * 
+ * */
+require_once ilPlugin::getPluginObject(IL_COMP_SERVICE, 'Repository', 'robj', 'TestOverview')->getDirectory() . '/classes/GUI/class.ilMappedTableGUI.php';
+
+class ilExerciseListTableGUI extends ilMappedTableGUI {
+
+	protected $parent;
+
+	public function __construct(ilObjectGUI $a_parent_obj, $a_parent_cmd) {
+		global $ilCtrl, $lng;
+		/* Pre-configure table */
+
+		$this->setId(
+				sprintf(
+						'test_overview_test_list_%d', $a_parent_obj->object->getId()
+				)
+		);
+
+		$this->parent = $a_parent_obj;
+
+		parent::__construct($a_parent_obj, $a_parent_cmd);
+
+		$this->setDefaultOrderDirection('ASC');
+		$this->setDefaultOrderField('title');
+
+		$this->setTitle(
+				sprintf(
+						$this->lng->txt('rep_robj_xtov_exercise_list_gui'), $a_parent_obj->object->getTitle()
+				)
+		);
+
+		$this->setExternalSorting(true);
+		$this->setExternalSegmentation(true);
+
+
+		$plugin = ilPlugin::getPluginObject(IL_COMP_SERVICE, 'Repository', 'robj', 'TestOverview');
+		$this->setRowTemplate('tpl.simple_object_row.html', $plugin->getDirectory());
+
+		$this->addColumn($this->lng->txt(''), '', '1px', true);
+		$this->addColumn($this->lng->txt('rep_robj_xtov_test_list_hdr_test_title'), 'title');
+		$this->addColumn($this->lng->txt('rep_robj_xtov_exercise_list_hdr_exercise_info'), '');
+
+		$this->setDescription($this->lng->txt('rep_robj_xtov_exercise_list_description'));
+		$this->setFormAction($ilCtrl->getFormAction($this->getParentObject(), 'deleteExercises'));
+		$this->addCommandButton("initSelectExercise", $lng->txt("rep_robj_xtov_exc_add"));
+		$this->addMultiCommand("removeExercises", $lng->txt("rep_robj_xtov_remove_from_overview"));
+
+		$this->setShowRowsSelector(true);
+		$this->setSelectAllCheckbox('exercise_ids[]');
+
+		$this->initFilter();
+		$this->setFilterCommand('applyExerciseFilter');
+		$this->setResetCommand('resetExerciseFilter');
+	}
+
+	/**
+	 * 	Initialize the table filters.
+	 *
+	 * 	This method is called internally to initialize
+	 * 	the filters from present on the top of the table.
+	 */
+	public function initFilter() {
+		include_once 'Services/Form/classes/class.ilTextInputGUI.php';
+		$tname = new ilTextInputGUI($this->lng->txt('rep_robj_xtov_test_list_flt_tst_name'), 'flt_tst_name');
+		$tname->setSubmitFormOnEnter(true);
+		$this->addFilterItem($tname);
+
+
+		$tname->readFromSession();
+		$this->filter['flt_tst_name'] = $tname->getValue();
+	}
+
+	/**
+	 * 	Fill a table row.
+	 *
+	 * 	This method is called internally by ilias to
+	 * 	fill a table row according to the row template.
+	 *
+	 * 	@param stdClass $item
+	 */
+	protected function fillRow(stdClass $item) {
+		/* Configure template rendering. */
+		$this->tpl->setVariable('VAL_CHECKBOX', ilUtil::formCheckbox(false, 'exercise_ids[]', $item->obj_id));
+		$this->tpl->setVariable('OBJECT_TITLE', $item->title);
+		$this->tpl->setVariable('OBJECT_INFO', $this->getExercisePath($item));
+	}
+
+	/**
+	 *    Retrieve the tree path to an ilObjExercise.
+	 *
+	 *    The getExercisePath() method should be used to
+	 *    retrieve the full path to a exercise node in the
+	 *    ilias tree.
+	 *
+	 * @params    stdClass    $item
+	 * @param stdClass $item
+	 * @return string
+	 */
+	private function getExercisePath(stdClass $item) {
+		/**
+		 * @var $tree ilTree
+		 */
+		global $tree, $ilCtrl;
+
+		$path_str = '';
+		$ref_id = $this->getRefId($item->obj_id);
+		$path = $tree->getNodePath($ref_id);
+		while ($node = current($path)) {
+			$prepend = empty($path_str) ? '' : "{$path_str} > ";
+			$path_str = $prepend . $node['title'];
+			next($path);
+		}
+		require_once 'Modules/Exercise/classes/class.ilObjExerciseGUI.php';
+		$ilCtrl->setParameterByClass('ilobjexercisegui', 'ref_id', $ref_id);
+		$path_str = "<div><a href='" . $ilCtrl->getLinkTargetByClass('ilobjexercisegui', "infoScreen") . "'>" . $path_str . "</a></div>";
+
+		return $path_str;
+	}
+
+	public function getRefId($obj_id) {
+		global $ilDB;
+		$query = "SELECT ref_id FROM object_reference WHERE obj_id = %s ORDER BY ref_id ASC ";
+		$result = $ilDB->queryF($query, array('integer'), array($obj_id));
+
+
+		$record = $ilDB->fetchAssoc($result);
+
+		return $record['ref_id'];
+	}
+
+}
+
+?>
diff --git a/classes/GUI/class.ilExerciseOverviewTableGUI.php b/classes/GUI/class.ilExerciseOverviewTableGUI.php
new file mode 100644
index 0000000..cc19eb4
--- /dev/null
+++ b/classes/GUI/class.ilExerciseOverviewTableGUI.php
@@ -0,0 +1,651 @@
+<?php
+/* Copyright (c) 1998-2012 ILIAS open source, Extended GPL, see docs/LICENSE */
+
+/**
+ *  @package	TestOverview repository plugin
+ *	@category	Core
+ *	@author		Martin Dinkel <hmdinkel@web.de>
+ * 
+ *	Exercise Overview Gui
+ */
+class ilExerciseOverviewTableGUI extends ilMappedTableGUI {
+
+	private $accessIndex = array();
+
+	/**
+	 * 	 @var	array
+	 */
+	protected $filter = array();
+
+	/**
+	 * @var array
+	 */
+	protected $linked_tst_column_targets = array();
+
+	/**
+	 * 	Constructor logic.
+	 *
+	 * 	This table GUI constructor method initializes the
+	 * 	object and configures the table rendering.
+	 */
+	public function __construct(ilObjectGUI $a_parent_obj, $a_parent_cmd) {
+		/**
+		 * 	@var ilCtrl	$ilCtrl
+		 */
+		global $ilCtrl, $tpl, $ilAccess, $lng;
+		$lng->loadLanguageModule("administration");
+
+		/* Pre-configure table */
+		$this->setId(sprintf(
+						"test_overview_%d", $a_parent_obj->object->getId()));
+
+		$this->setDefaultOrderDirection('ASC');
+		$this->setDefaultOrderField('obj_id');
+
+		// ext ordering with db is ok, but ext limiting with db is not possible,
+		// since the rbac filtering is downstream to the db query
+		$this->setExternalSorting(true);
+		$this->setExternalSegmentation(false);
+
+		parent::__construct($a_parent_obj, $a_parent_cmd);
+
+		$this->setTitle("ExerciseOverview");
+
+		$overview = $this->getParentObject()->object;
+
+
+		$this->addColumn($this->lng->txt('rep_robj_xtov_test_overview_hdr_user'));
+
+		//get Object_reference mapper from Exercise Overview
+		require_once ilPlugin::getPluginObject(IL_COMP_SERVICE, 'Repository', 'robj', 'TestOverview')
+						->getDirectory() . '/classes/mapper/class.ilExerciseMapper.php';
+		$excMapper = new ilExerciseMapper();
+
+		$dataArray = $excMapper->getUniqueExerciseId($overview->getID());
+		for ($index = 0; $index < count($dataArray); $index++) {
+			$obj_id = $dataArray[$index];
+			$refId = $this->getRefId($obj_id);
+			$this->addColumn("<a href='ilias.php?baseClass=ilExerciseHandlerGUI&ref_id=$refId&cmd=showOverview'>" . $excMapper->getExerciseName($obj_id) . "</a>");
+		}
+		$this->lng->loadLanguageModule("trac");
+		$this->addColumn($this->lng->txt('stats_summation'));
+		$plugin = ilPlugin::getPluginObject(IL_COMP_SERVICE, 'Repository', 'robj', 'TestOverview');
+		$this->setRowTemplate('tpl.test_overview_row.html', $plugin->getDirectory());
+		$this->setDescription($this->lng->txt("rep_robj_xtov_test_overview_description"));
+
+		$cssFile = $plugin->getDirectory() . "/templates/css/testoverview.css";
+		$tpl->addCss($cssFile);
+
+		/* Configure table filter */
+		$this->initFilter();
+		$this->setFilterCommand("applyExerciseFilterRanking");
+		$this->setResetCommand("resetExerciseFilterRanking");
+
+		$this->setFormAction($ilCtrl->getFormAction($this->getParentObject(), 'subTabEoRanking'));
+	}
+
+	/**
+	 * 	Initialize the table filters.
+	 *
+	 * 	This method is called internally to initialize
+	 * 	the filters from present on the top of the table.
+	 */
+	public function initFilter() {
+
+		include_once 'Services/Form/classes/class.ilTextInputGUI.php';
+		include_once 'Services/Form/classes/class.ilSelectInputGUI.php';
+		include_once ilPlugin::getPluginObject(IL_COMP_SERVICE, 'Repository', 'robj', 'TestOverview')
+						->getDirectory() . "/classes/mapper/class.ilOverviewMapper.php";
+
+		/* Configure participant name filter (input[type=text]) */
+		$pname = new ilTextInputGUI($this->lng->txt('rep_robj_xtov_overview_flt_participant_name'), 'flt_participant_name');
+		$pname->setSubmitFormOnEnter(true);
+		$pgender = new ilSelectInputGUI("Gender", 'flt_participant_gender');
+
+		$genderArray = array("" => "-- Select --", "f" => "female", "m" => "male");
+		$pgender->setOptions($genderArray);
+
+		/* Configure participant group name filter (select) */
+		$mapper = new ilOverviewMapper();
+		$groups = $mapper->getGroupPairs($this->getParentObject()->object->getId());
+		$groups = array("" => "-- Select --") + $groups;
+
+		$gname = new ilSelectInputGUI($this->lng->txt("rep_robj_xtov_overview_flt_group_name"), 'flt_group_name');
+		$gname->setOptions($groups);
+
+
+		/* Configure filter form */
+		$this->addFilterItem($pname);
+
+		$this->addFilterItem($gname);
+
+		$this->addFilterItem($pgender);
+		$pgender->readFromSession();
+		$pname->readFromSession();
+
+		$gname->readFromSession();
+
+		$this->filter['flt_participant_gender'] = $pgender->getValue();
+		$this->filter['flt_participant_name'] = $pname->getValue();
+		$stringN = $pname->getValue();
+		$this->filter['flt_group_name'] = $gname->getValue();
+	}
+
+	/**
+	 *    Fill a table row.
+	 *
+	 *    This method is called internally by ilias to
+	 *    fill a table row according to the row template.
+	 *
+	 * @param array $row
+	 * @internal param \ilObjTestOverview $overview
+	 */
+	protected function fillRow($row) {
+		$overview = $this->getParentObject()->object;
+		$dataArray = $this->getMapper()->getUniqueExerciseId($overview->getID());
+		$results = array();
+		$rowID = $row['member_id'];
+		$flagIsNumeric = true;
+		for ($index = 0; $index < count($dataArray); $index++) {
+			$obj_id = $dataArray[$index];
+			$this->getMapper()->getExerciseName($obj_id);
+			$DbObject = $this->getMapper()->getArrayofObjects($overview->getID());
+			$mark = $this->getMapper()->getMark($row['member_id'], $obj_id, $DbObject);
+			$result = $mark;
+			$memID = $obj_id;
+
+			if (!is_numeric($result) == 1 && !empty($result)) {
+				$flagIsNumeric = false;
+			}
+
+			$results[] = $result;
+			$progress = '2';
+			$state = $this->isPassed($obj_id, $row['member_id']);
+			/*
+			 * Colors the results if they are graded 
+			 */
+			if ($state == "passed") {
+				$this->populateNoLinkCell($mark, "green-result");
+			} else if ($state == "failed") {
+				$this->populateNoLinkCell($mark, "red-result");
+			} else {
+				$this->populateNoLinkCell($mark, "no-prem-result");
+			}
+
+			$this->tpl->setCurrentBlock('cell');
+			$this->tpl->parseCurrentBlock();
+		}
+
+		if (count($results)) {
+			$average = array_sum($results);
+		} else {
+			$average = "";
+		}
+		if (!$flagIsNumeric) {
+			$average = $this->lng->txt('rep_robj_xtov_notAvaiable');
+		}
+
+		$this->tpl->setVariable("AVERAGE_CLASS", "");
+		$this->tpl->setVariable("AVERAGE_VALUE", $average);
+		$this->tpl->setVariable('TEST_PARTICIPANT', $row['member_fullname']);
+	}
+
+
+	private function populateNoLinkCell($resultValue, $cssClass) {
+		$this->tpl->setCurrentBlock('result_nolink');
+		$this->tpl->setVariable('RESULT_VALUE_NOLINK', $resultValue);
+		$this->tpl->setVariable('RESULT_CSSCLASS_NOLINK', $cssClass);
+		$this->tpl->parseCurrentBlock();
+	}
+
+	
+	public function buildCssClassByProgressMap() {
+		if (defined('ilLPStatus::LP_STATUS_NOT_ATTEMPTED_NUM')) {
+			return array(
+				ilLPStatus::LP_STATUS_NOT_ATTEMPTED_NUM => 'no-result',
+				ilLPStatus::LP_STATUS_IN_PROGRESS_NUM => 'orange-result',
+				ilLPStatus::LP_STATUS_COMPLETED_NUM => 'green-result',
+				ilLPStatus::LP_STATUS_FAILED_NUM => 'red-result'
+			);
+		}
+
+		return array(
+			LP_STATUS_NOT_ATTEMPTED_NUM => 'no-result',
+			LP_STATUS_IN_PROGRESS_NUM => 'orange-result',
+			LP_STATUS_COMPLETED_NUM => 'green-result',
+			LP_STATUS_FAILED_NUM => 'red-result'
+		);
+	}
+
+	/**
+	 *    Format the fetched data.
+	 *
+	 *    This method is used internally to retrieve ilObjUser
+	 *    objects from participant group ids (ilObjCourse || ilObjGroup).
+	 *
+	 * @params    array    $data    array of IDs
+	 *
+	 * @param array $data
+	 * @throws OutOfRangeException
+	 * @return array
+	 */
+	protected function formatData(array $data, $b = false) {
+		/* For each group object we fetched, we need
+		  to retrieve the members in order to have
+		  a list of Participant. */
+		$formatted = array(
+			'items' => array(),
+			'cnt' => 0);
+
+
+		$index = 0;
+		$count = $data['cnt'];
+
+		if (!$data['items']) {
+			$overview = $this->getParentObject()->object;
+			$uniqueUsers = $this->getMapper()->getUniqueUserId($overview->getID());
+
+			foreach ($uniqueUsers as $user) {
+				$formatted['items'][$user] = $user;
+			}
+		}
+		foreach ($data['items'] as $item) {
+
+
+			$container = ilObjectFactory::getInstanceByObjId($item->obj_id, false);
+
+			if ($container === false)
+				throw new OutOfRangeException;
+			elseif (!empty($this->filter['flt_group_name']) && $container->getId() != $this->filter['flt_group_name'])
+			/* Filter current group */
+				continue;
+
+			$participants = $this->getMembersObject($item);
+			/* Fetch member object by ID to avoid one-per-row
+			  SQL queries. */
+			foreach ($participants->getMembers() as $usrId) {
+				$formatted['items'][$usrId] = $usrId;
+			}
+		}
+		$formatted['items'] = $this->fetchUserInformation($formatted['items']);
+
+		if ($b == false) {
+			return $this->sortByAveragePoints($formatted);
+		} else {
+			return $this->sortByFullName($formatted);
+		}
+	}
+
+	/**
+	* This method fetchs User Information and is used to filter the UserIds
+	* 
+	* @global type $ilDB
+	* @global type $tpl
+	* @param type $usr_ids
+	* @return \ilObjUser
+	*/
+	public function fetchUserInformation($usr_ids) {
+		global $ilDB, $tpl;
+
+		$usr_id__IN__usrIds = $ilDB->in('usr_id', $usr_ids, false, 'integer');
+
+		$query = "
+			SELECT usr_id, title, firstname, lastname, gender FROM usr_data WHERE $usr_id__IN__usrIds
+		";
+
+		$res = $ilDB->query($query);
+
+		$users = array();
+
+		while ($row = $ilDB->fetchAssoc($res)) {
+			$user = new ilObjUser();
+			$user->setId($row['usr_id']);
+			$user->setUTitle($row['title']);
+			$user->setFirstname($row['firstname']);
+			$user->setLastname($row['lastname']);
+			$user->setFullname();
+			$user->setGender($row['gender']);
+
+			if (!empty($this->filter['flt_participant_name'])) {
+				$name = strtolower($user->getFullName());
+				$filter = strtolower($this->filter['flt_participant_name']);
+				/* Simulate MySQL LIKE operator */
+				if (false === strstr($name, $filter)) {
+					$ausgabe = strstr($name, $filter);
+					/* User should be skipped. (Does not match filter) */
+					continue;
+				}
+			}
+			if (!empty($this->filter['flt_participant_gender'])) {
+
+				$gender = $user->getGender();
+				$filterGender = $this->filter['flt_participant_gender'];
+
+
+				/* Simulate MySQL LIKE operator */
+				if (false === strstr($gender, $filterGender)) {
+					/* User should be skipped. (Does not match filter) */
+					continue;
+				}
+			}
+			$users[$row['usr_id']] = $user;
+		}
+		$test = count($users);
+		return $users;
+	}
+
+	/**
+	 *    Sort the array of users by their full name.
+	 *
+	 *    This method had to be implemented in order to sort
+	 *    the listed users by their full name. The overview
+	 *    settings allows selecting participant groups rather
+	 *    than users. This means the data fetched according
+	 *    to a test overview, is the participant group's data.
+	 *
+	 * @params    array    $data    Array with 'cnt' & 'items' indexes.
+	 *
+	 * @param array $data
+	 * @return array
+	 */
+	protected function sortByFullName(array $data) {
+		$azList = array();
+		$sorted = array(
+			'cnt' => $data['cnt'],
+			'items' => array());
+
+		/* Initialize partition array. */
+		for ($az = 'A'; $az <= 'Z'; $az++)
+			$azList[$az] = array();
+
+		/* Partition data. */
+		foreach ($data['items'] as $userObj) {
+			$name = $userObj->getFullName();
+			$name = strtoupper($name);
+			$azList[$name{0}][] = $userObj;
+		}
+
+		/* Group all results. */
+		foreach ($azList as $az => $userList) {
+			if (!empty($userList))
+				$sorted['items'] = array_merge($sorted['items'], $userList);
+		}
+
+		return $sorted;
+	}
+
+	/**
+	 *    Sort the array of users by their average points.
+	 *
+	 *    This method had to be implemented in order to sort
+	 *    the listed users by their average points. The overview
+	 *    settings allows selecting participant groups rather
+	 *    than users. This means the data fetched according
+	 *    to a test overview, is the participant group's data.
+	 *
+	 * @params    array    $data    Array with 'cnt' & 'items' indexes.
+	 *
+	 * @param array $data
+	 * @return array
+	 */
+	protected function sortByAveragePoints(array $data) {
+		global $ilDB, $tpl;
+		$overviewMapper = $this->getMapper();
+		// array which contains the user information
+		$rankList = array();
+		// array which contains the sum of points
+		$sumList = array();
+		$sorted = array(
+			'cnt' => $data['cnt'],
+			'items' => array());
+
+		/* Initialize partition array. */
+		for ($rank = '1'; $rank <= count($data['items']); $rank++) {
+			$rankList[$rank] = array();
+			$sumList[$rank] = array();
+		}
+
+		$studentIndex = 1;
+		/* Partition data. */
+		foreach ($data['items'] as $userObj) {
+
+			$stdID = $userObj->getId();
+			$overview = $this->getParentObject()->object;
+			$dataArray = $this->getMapper()->getUniqueExerciseId($overview->getID());
+			$results = array();
+
+			for ($index = 0; $index < count($dataArray); $index++) {
+				$obj_id = $dataArray[$index];
+				$this->getMapper()->getExerciseName($obj_id);
+				$DbObject = $this->getMapper()->getArrayofObjects($overview->getID());
+				$mark = $this->getMapper()->getMark($stdID, $obj_id, $DbObject);
+
+				$result = $mark;
+				$results[] = $result;
+			}
+			$sum = array_sum($results);
+			$rankList[$studentIndex][] = $userObj;
+			$sumList[$studentIndex][] = $sum;
+			$studentIndex++;
+		}
+		asort($sumList);
+		$arraySorted = array_keys($sumList);
+		/* Group all results. */
+		for ($i = '1'; $i <= count($rankList); $i++) {
+			$position = array_pop($arraySorted);
+			$userList = $rankList[$position];
+			if (!empty($userList)) {
+				$sorted['items'] = array_merge($sorted['items'], $userList);
+			}
+		}
+		return $sorted;
+	}
+
+	/**
+	 * Function to rank all students and save their result in the database
+	 * @throws ilException
+	 */
+	public function getStudentsRanked() {
+		if ($this->getExternalSegmentation() && $this->getExternalSorting()) {
+			$this->determineOffsetAndOrder();
+		} elseif (!$this->getExternalSegmentation() && $this->getExternalSorting()) {
+			$this->determineOffsetAndOrder(true);
+		} else {
+			throw new ilException('invalid table configuration: extSort=false / extSegm=true');
+		}
+
+		/* Configure query execution */
+		$params = array();
+		if ($this->getExternalSegmentation()) {
+			$params['limit'] = $this->getLimit();
+			$params['offset'] = $this->getOffset();
+		}
+		if ($this->getExternalSorting()) {
+			$params['order_field'] = $this->getOrderField();
+			$params['order_direction'] = $this->getOrderDirection();
+		}
+
+		$overview = $this->getParentObject()->object;
+		$filters = array("overview_id" => $overview->getId()) + $this->filter;
+
+		/* Execute query. */
+		$data = $this->getMapper()->getList($params, $filters);
+
+
+		if (!count($data) && $this->getOffset() > 0) {
+			/* Query again, offset was incorrect. */
+			$this->resetOffset();
+			$data = $this->getMapper()->getList($params, $filters);
+		}
+
+		/* Post-query logic. Implement custom sorting or display
+		  in formatData overload. */
+		$data = $this->formatData($data, FALSE);
+
+
+		$this->getMapper()->resetRanks($this->getParentObject()->object->getID());
+		foreach ($data['items'] as $userObj) {
+			$stdID = $userObj->getId();
+			$overview = $this->getParentObject()->object;
+			$dataArray = $this->getMapper()->getUniqueExerciseId($overview->getID());
+			$results = array();
+
+			for ($index = 0; $index < count($dataArray); $index++) {
+				$obj_id = $dataArray[$index];
+				$this->getMapper()->getExerciseName($obj_id);
+				$DbObject = $this->getMapper()->getArrayofObjects($overview->getID());
+				$mark = $this->getMapper()->getMark($stdID, $obj_id, $DbObject);
+				$result = $mark;
+				$results[] = $result;
+			}
+			$average = array_sum($results);
+			$ilMapper = $this->getMapper();
+			$ilMapper->setData2Rank($average, $stdID, $this->getParentObject()->object->getId());
+		}
+
+		$this->getMapper()->createDate($this->getParentObject()->object->getId());
+	}
+
+	/**
+	 * Fills the exercise names and the urls into the headrow
+	 * @global type $lng
+	 */
+	public function fillHeader() {
+		global $lng;
+
+		$allcolumnswithwidth = true;
+		foreach ((array) $this->column as $idx => $column) {
+			if (!strlen($column["width"])) {
+				$allcolumnswithwidth = false;
+			} else if ($column["width"] == "1") {
+				// IE does not like 1 but seems to work with 1%
+				$this->column[$idx]["width"] = "1%";
+			}
+		}
+		if ($allcolumnswithwidth) {
+			foreach ((array) $this->column as $column) {
+				$this->tpl->setCurrentBlock("tbl_colgroup_column");
+				$this->tpl->setVariable("COLGROUP_COLUMN_WIDTH", $column["width"]);
+				$this->tpl->parseCurrentBlock();
+			}
+		}
+		$ccnt = 0;
+		foreach ((array) $this->column as $column) {
+			$ccnt++;
+
+			//tooltip
+			if ($column["tooltip"] != "") {
+				include_once("./Services/integerUIComponent/Tooltip/classes/class.ilTooltipGUI.php");
+				ilTooltipGUI::addTooltip("thc_" . $this->getId() . "_" . $ccnt, $column["tooltip"]);
+			}
+			if ((!$this->enabled["sort"] || $column["sort_field"] == "" || $column["is_checkbox_action_column"]) && !$column['link']) {
+				$this->tpl->setCurrentBlock("tbl_header_no_link");
+				if ($column["width"] != "") {
+					$this->tpl->setVariable("TBL_COLUMN_WIDTH_NO_LINK", " width=\"" . $column["width"] . "\"");
+				}
+				if (!$column["is_checkbox_action_column"]) {
+					$this->tpl->setVariable("TBL_HEADER_CELL_NO_LINK", $column["text"]);
+				} else {
+					$this->tpl->setVariable("TBL_HEADER_CELL_NO_LINK", ilUtil::img(ilUtil::getImagePath("spacer.png"), $lng->txt("action")));
+				}
+				$this->tpl->setVariable("HEAD_CELL_NL_ID", "thc_" . $this->getId() . "_" . $ccnt);
+
+				if ($column["class"] != "") {
+					$this->tpl->setVariable("TBL_HEADER_CLASS", " " . $column["class"]);
+				}
+				$this->tpl->parseCurrentBlock();
+				$this->tpl->touchBlock("tbl_header_th");
+				continue;
+			}
+			if (($column["sort_field"] == $this->order_field) && ($this->order_direction != "")) {
+				$this->tpl->setCurrentBlock("tbl_order_image");
+				$this->tpl->setVariable("IMG_ORDER_DIR", ilUtil::getImagePath($this->order_direction . "_order.png"));
+				$this->tpl->setVariable("IMG_ORDER_ALT", $this->lng->txt("change_sort_direction"));
+				$this->tpl->parseCurrentBlock();
+			}
+
+			$this->tpl->setCurrentBlock("tbl_header_cell");
+			$this->tpl->setVariable("TBL_HEADER_CELL", $column["text"]);
+			$this->tpl->setVariable("HEAD_CELL_ID", "thc_" . $this->getId() . "_" . $ccnt);
+
+			// only set width if a value is given for that column
+			if ($column["width"] != "") {
+				$this->tpl->setVariable("TBL_COLUMN_WIDTH", " width=\"" . $column["width"] . "\"");
+			}
+
+			$lng_sort_column = $this->lng->txt("sort_by_this_column");
+			$this->tpl->setVariable("TBL_ORDER_ALT", $lng_sort_column);
+
+			$order_dir = "asc";
+
+			if ($column["sort_field"] == $this->order_field) {
+				$order_dir = $this->sort_order;
+
+				$lng_change_sort = $this->lng->txt("change_sort_direction");
+				$this->tpl->setVariable("TBL_ORDER_ALT", $lng_change_sort);
+			}
+
+			if ($column["class"] != "") {
+				$this->tpl->setVariable("TBL_HEADER_CLASS", " " . $column["class"]);
+			}
+			if ($column['link']) {
+				$this->setExternalLink($column['link']);
+			} else {
+				$this->setOrderLink($column["sort_field"], $order_dir);
+			}
+			$this->tpl->parseCurrentBlock();
+			$this->tpl->touchBlock("tbl_header_th");
+		}
+
+		$this->tpl->setCurrentBlock("tbl_header");
+		$this->tpl->parseCurrentBlock();
+	}
+
+	/**
+	 * overwrite this method for ungregging the object data structures
+	 * since ilias tables support arrays only
+	 * 
+	 * @param mixed $data
+	 * @return array
+	 */
+	protected function buildTableRowsArray($data) {
+		$rows = array();
+
+		foreach ($data as $member) {
+			if (!($member->getId() == null)) {
+				$rows[] = array(
+					'member_id' => $member->getId(),
+					'member_fullname' => $member->getFullName()
+				);
+			} else {
+				$rows[] = array(
+					'member_id' => '0',
+					'member_fullname' => $member->getFullName()
+				);
+			}
+		}
+
+		return $rows;
+	}
+
+
+	public function isPassed($objId, $usrId) {
+		global $ilDB;
+
+		$query = "SELECT exc_members.status FROM exc_members WHERE obj_id = %s AND usr_id = %s";
+		$result = $ilDB->queryF($query, array('integer', 'integer'), array($objId,$usrId));
+		$state = $ilDB->fetchObject($result);
+		return $state->status;
+	}
+
+	public function getRefId($ObjId) {
+		global $ilDB;
+		$query = "SELECT ref_id FROM object_reference WHERE obj_id = %s";
+		$result = $ilDB->queryF($query, array('integer'), array($ObjId));
+
+		$record = $ilDB->fetchAssoc($result);
+
+		return $record['ref_id'];
+	}
+
+}
diff --git a/classes/GUI/class.ilMappedTableGUI.php b/classes/GUI/class.ilMappedTableGUI.php
index 69e0ec2..2247f34 100755
--- a/classes/GUI/class.ilMappedTableGUI.php
+++ b/classes/GUI/class.ilMappedTableGUI.php
@@ -1,16 +1,16 @@
 <?php
+
 /* Copyright (c) 1998-2012 ILIAS open source, Extended GPL, see docs/LICENSE */
 
 /**
- *	@package	TestOverview repository plugin
- *	@category	GUI
- *	@author		Greg Saive <gsaive@databay.de>
+ * 	@package	TestOverview repository plugin
+ * 	@category	GUI
+ * 	@author		Greg Saive <gsaive@databay.de>
  */
-
 require_once 'Services/Table/classes/class.ilTable2GUI.php';
 
-abstract class ilMappedTableGUI extends ilTable2GUI
-{
+abstract class ilMappedTableGUI extends ilTable2GUI {
+
 	/**
 	 * @var ilDataMapper
 	 */
@@ -23,19 +23,17 @@ abstract class ilMappedTableGUI extends ilTable2GUI
 	 * @param ilDataMapper $mapper
 	 * @return ilMappedTableGUI
 	 */
-	public function setMapper( ilDataMapper $mapper )
-	{
+	public function setMapper(ilDataMapper $mapper) {
 		$this->mapper = $mapper;
 		return $this;
 	}
 
 	/**
-	 *	Get the registered mapper instance
+	 * 	Get the registered mapper instance
 	 *
-	 *	@return ilDataMapper
+	 * 	@return ilDataMapper
 	 */
-	public function getMapper()
-	{
+	public function getMapper() {
 		return $this->mapper;
 	}
 
@@ -51,11 +49,10 @@ public function getMapper()
 	 * @param array $data
 	 * @return array
 	 */
-	protected function formatData( array $data )
-	{
+	protected function formatData(array $data) {
 		return $data;
 	}
-	
+
 	/**
 	 * overwrite this method for ungregging the object data structures
 	 * since ilias tables support arrays only
@@ -63,11 +60,70 @@ protected function formatData( array $data )
 	 * @param mixed $data
 	 * @return array
 	 */
-	protected function buildTableRowsArray($data)
-	{
+	protected function buildTableRowsArray($data) {
 		return $data;
 	}
 
+	/**
+	 * This methode should be integrated into populate(). 
+	 * The method call in ilObjTestOverviewGUI needs to be change to populate()
+	 * 
+	 * This method is used to populate the TableGUIObject.
+	 * 
+	 *            
+	 * @param type $sorting
+	 * @return $this
+	 * @throws ilException
+	 */
+	public function populateE($sorting) {
+
+		if ($this->getExternalSegmentation() && $this->getExternalSorting()) {
+			$this->determineOffsetAndOrder();
+		} elseif (!$this->getExternalSegmentation() && $this->getExternalSorting()) {
+			$this->determineOffsetAndOrder(true);
+		} else {
+			throw new ilException('invalid table configuration: extSort=false / extSegm=true');
+		}
+
+		/* Configure query execution */
+		$params = array();
+		if ($this->getExternalSegmentation()) {
+			$params['limit'] = $this->getLimit();
+			$params['offset'] = $this->getOffset();
+		}
+
+		if ($this->getExternalSorting()) {
+			$params['order_field'] = $this->getOrderField();
+			$params['order_direction'] = $this->getOrderDirection();
+		}
+
+		$overview = $this->getParentObject()->object;
+		$filters = array("overview_id" => $overview->getId()) + $this->filter;
+
+		/* Execute query. */
+		$data = $this->getMapper()->getList($params, $filters);
+
+		if (!count($data['items']) && $this->getOffset() > 0) {
+			/* Query again, offset was incorrect. */
+			$this->resetOffset();
+			$data = $this->getMapper()->getList($params, $filters);
+		}
+
+		/* Post-query logic. Implement custom sorting or display
+		  in formatData overload. */
+
+		$countD = $data['cnt'];
+
+		$data = $this->formatData($data, $sorting);
+		$this->setData($this->buildTableRowsArray($data['items']));
+
+		if ($this->getExternalSegmentation()) {
+			$this->setMaxCount($data['cnt']);
+		}
+
+		return $this;
+	}
+
 	/**
 	 *    Populate the TableGUI using the Mapper.
 	 *
@@ -81,61 +137,52 @@ protected function buildTableRowsArray($data)
 	 * @throws ilException
 	 * @return ilMappedTableGUI
 	 */
-	public function populate()
-    {
-		if( $this->getExternalSegmentation() && $this->getExternalSorting() )
-		{
+	public function populate($orderByRank = false) {
+		if ($this->getExternalSegmentation() && $this->getExternalSorting()) {
 			$this->determineOffsetAndOrder();
-		}
-		elseif( !$this->getExternalSegmentation() && $this->getExternalSorting() )
-		{
+		} elseif (!$this->getExternalSegmentation() && $this->getExternalSorting()) {
 			$this->determineOffsetAndOrder(true);
-		}
-		else
-		{
+		} else {
 			throw new ilException('invalid table configuration: extSort=false / extSegm=true');
 		}
-		
+
 		/* Configure query execution */
 		$params = array();
-		if( $this->getExternalSegmentation() )
-		{
+		if ($this->getExternalSegmentation()) {
 			$params['limit'] = $this->getLimit();
 			$params['offset'] = $this->getOffset();
 		}
-		if( $this->getExternalSorting() )
-		{
+		if ($this->getExternalSorting()) {
 			$params['order_field'] = $this->getOrderField();
 			$params['order_direction'] = $this->getOrderDirection();
 		}
 
 		$overview = $this->getParentObject()->object;
-		$filters  = array("overview_id" => $overview->getId()) + $this->filter;
+		$filters = array("overview_id" => $overview->getId()) + $this->filter;
 
 		/* Execute query. */
-        $data = $this->getMapper()
-				     ->getList($params, $filters);
+		$data = $this->getMapper()
+				->getList($params, $filters);
 
-        if( !count($data['items']) && $this->getOffset() > 0) {
+		if (!count($data['items']) && $this->getOffset() > 0) {
 			/* Query again, offset was incorrect. */
-            $this->resetOffset();
-	        $data = $this->getMapper()
-					     ->getList($params, $filters);
-        }
+			$this->resetOffset();
+			$data = $this->getMapper()
+					->getList($params, $filters);
+		}
 
 		/* Post-query logic. Implement custom sorting or display
-		   in formatData overload. */
-		$data = $this->formatData($data);
+		  in formatData overload. */
+		$data = $this->formatData($data, $orderByRank);
+
+		$this->setData($this->buildTableRowsArray($data['items']));
 
-		$this->setData( $this->buildTableRowsArray($data['items']) );
-		
- 		if( $this->getExternalSegmentation() )
-		{
+		if ($this->getExternalSegmentation()) {
 			$this->setMaxCount($data['cnt']);
 		}
-		
-        return $this;
-    }
+
+		return $this;
+	}
 
 	/**
 	 *    Retrieve a group object.
@@ -150,13 +197,11 @@ public function populate()
 	 * @throws ilException
 	 * @return ilParticipants|ilGroupParticipants|ilCourseParticipants
 	 */
-	protected function getMembersObject( stdClass $container )
-	{
+	protected function getMembersObject(stdClass $container) {
 		global $ilObjDataCache;
-		
+
 		$type = $container->type;
-		if(!strlen($type))
-		{
+		if (!strlen($type)) {
 			$type = $ilObjDataCache->lookupType($container->obj_id);
 		}
 
@@ -164,15 +209,15 @@ protected function getMembersObject( stdClass $container )
 
 			case "grp":
 				include_once 'Modules/Group/classes/class.ilGroupParticipants.php';
-				return new ilGroupParticipants( $container->obj_id );
+				return new ilGroupParticipants($container->obj_id);
 
 			case "crs":
 				include_once 'Modules/Course/classes/class.ilCourseParticipants.php';
-				return new ilCourseParticipants( $container->obj_id );
+				return new ilCourseParticipants($container->obj_id);
 
 			default :
 				throw new ilException("Type not supported");
 		}
 	}
-}
 
+}
diff --git a/classes/GUI/class.ilMembershipListTableGUI.php b/classes/GUI/class.ilMembershipListTableGUI.php
index 2ffb734..698e9c5 100755
--- a/classes/GUI/class.ilMembershipListTableGUI.php
+++ b/classes/GUI/class.ilMembershipListTableGUI.php
@@ -1,51 +1,51 @@
 <?php
+
 /* Copyright (c) 1998-2012 ILIAS open source, Extended GPL, see docs/LICENSE */
 
 /**
- *	@package	TestOverview repository plugin
- *	@category	GUI
- *	@author		Greg Saive <gsaive@databay.de>
+ * 	@package	TestOverview repository plugin
+ * 	@category	GUI
+ * 	@author		Greg Saive <gsaive@databay.de>
  */
-
 /* Internal : */
 require_once ilPlugin::getPluginObject(IL_COMP_SERVICE, 'Repository', 'robj', 'TestOverview')
 				->getDirectory() . '/classes/GUI/class.ilMappedTableGUI.php';
 
-class ilMembershipListTableGUI
-	extends ilMappedTableGUI
-{
+class ilMembershipListTableGUI extends ilMappedTableGUI {
+
 	/**
-	 *	 @var	array
+	 * 	 @var	array
 	 */
 	public $filter = array();
+	private $parent;
+	private $objectParent;
 
 	/**
-	 *	Constructor logic.
+	 * 	Constructor logic.
 	 *
-	 *	This table GUI constructor method initializes the
-	 *	object and configures the table rendering.
+	 * 	This table GUI constructor method initializes the
+	 * 	object and configures the table rendering.
 	 */
-	public function __construct( ilObjectGUI $a_parent_obj, $a_parent_cmd )
-	{
+	public function __construct(ilObjectGUI $a_parent_obj, $a_parent_cmd) {
 		/**
-		 *	@var ilCtrl	$ilCtrl
+		 * 	@var ilCtrl	$ilCtrl
 		 */
 		global $ilCtrl;
 
 		/* Pre-configure table */
 		$this->setId(sprintf(
-			"test_overview_membership_list_%d", $a_parent_obj->object->getId()));
-
+						"test_overview_membership_list_%d", $a_parent_obj->object->getId()));
+		$this->parent = $a_parent_obj;
+		$this->objectParent = $this->parent->object->getParentId($this->parent->object->getRefId());
 		$this->setDefaultOrderDirection('ASC');
 		$this->setDefaultOrderField('title');
 		$this->setExternalSorting(true);
 		$this->setExternalSegmentation(true);
 
-        parent::__construct($a_parent_obj, $a_parent_cmd);
+		parent::__construct($a_parent_obj, $a_parent_cmd);
 
-		$this->setTitle( sprintf(
-			$this->lng->txt('rep_robj_xtov_membership_list_table_title'),
-			$a_parent_obj->object->getTitle()));
+		$this->setTitle(sprintf(
+						$this->lng->txt('rep_robj_xtov_membership_list_table_title'), $a_parent_obj->object->getTitle()));
 
 		$plugin = ilPlugin::getPluginObject(IL_COMP_SERVICE, 'Repository', 'robj', 'TestOverview');
 		$this->setRowTemplate('tpl.simple_object_row.html', $plugin->getDirectory());
@@ -54,38 +54,49 @@ public function __construct( ilObjectGUI $a_parent_obj, $a_parent_cmd )
 		$this->addColumn($this->lng->txt("rep_robj_xtov_membership_list_hdr_membership_title"), 'title');
 		$this->addColumn($this->lng->txt("rep_robj_xtov_membership_list_hdr_membership_info"), '');
 		$this->addColumn($this->lng->txt("rep_robj_xtov_item_chosen"), '');
-		
+
 		$this->setDescription($this->lng->txt("rep_robj_xtov_membership_list_description"));
-		$this->setFormAction($ilCtrl->getFormAction($this->getParentObject(), 'updateSettings') );
-		$this->addMultiCommand('addMemberships', $this->lng->txt('rep_robj_xtov_add_to_overview'));
-		$this->addMultiCommand('removeMemberships', $this->lng->txt('rep_robj_xtov_remove_from_overview'));
+		$this->setFormAction($ilCtrl->getFormAction($this->getParentObject(), 'updateSettings'));
+
+		if (strcmp($a_parent_cmd, "subTabTO2") == 0) {
+			$this->addMultiCommand('addMemberships', $this->lng->txt('rep_robj_xtov_add_to_overview'));
+			$this->addMultiCommand('removeMemberships', $this->lng->txt('rep_robj_xtov_remove_from_overview'));
+		}
+		if (strcmp($a_parent_cmd, "subTabEO2") == 0) {
+			$this->addMultiCommand('addMembershipsEx', $this->lng->txt('rep_robj_xtov_add_to_overview'));
+			$this->addMultiCommand('removeMembershipsEx', $this->lng->txt('rep_robj_xtov_remove_from_overview'));
+		}
 
 		$this->setShowRowsSelector(true);
 
 		/* Add 'Select All', configure filters */
 		$this->setSelectAllCheckbox('membership_ids[]');
 		$this->initFilter();
-		$this->setFilterCommand("applyGroupsFilter");
-		$this->setResetCommand("resetGroupsFilter");
+		if ($a_parent_cmd == "subTabTO2") {
+			$this->setFilterCommand("applyGroupsFilter");
+			$this->setResetCommand("resetGroupsFilter");
+		}
+		if ($a_parent_cmd == "subTabEO2") {
+			$this->setFilterCommand("applyGroupsFilterEx");
+			$this->setResetCommand("resetGroupsFilterEx");
+		}
 	}
 
 	/**
-	 *	Initialize the table filters.
+	 * 	Initialize the table filters.
 	 *
-	 *	This method is called internally to initialize
-	 *	the filters from present on the top of the table.
+	 * 	This method is called internally to initialize
+	 * 	the filters from present on the top of the table.
 	 */
-	public function initFilter()
-    {
-        include_once 'Services/Form/classes/class.ilTextInputGUI.php';
-        $gname = new ilTextInputGUI($this->lng->txt('rep_robj_xtov_membership_list_flt_grp_name'), 'flt_grp_name');
-        $gname->setSubmitFormOnEnter(true);
-
-        $this->addFilterItem($gname);
-        $gname->readFromSession();
-        $this->filter['flt_grp_name'] = $gname->getValue();
-    }
-
+	public function initFilter() {
+		include_once 'Services/Form/classes/class.ilTextInputGUI.php';
+		$gname = new ilTextInputGUI($this->lng->txt('rep_robj_xtov_membership_list_flt_grp_name'), 'flt_grp_name');
+		$gname->setSubmitFormOnEnter(true);
+
+		$this->addFilterItem($gname);
+		$gname->readFromSession();
+		$this->filter['flt_grp_name'] = $gname->getValue();
+	}
 
 	/**
 	 *    Fill a table row.
@@ -97,16 +108,24 @@ public function initFilter()
 	 * @internal param \ilObjTest $test
 	 *
 	 */
-    protected function fillRow($container)
-	{
-		$members = $this->getMembersObject($container)->getCountMembers();
-		$label   = $this->lng->txt('rep_robj_xtov_membership_count_members');
+	protected function fillRow($container) {
+		global $tree;
+
+		$refId = $container->ref_id;
+
+		$parentRef = $this->parent->object->getParentId($refId);
 
-		$this->tpl->setVariable('VAL_CHECKBOX', ilUtil::formCheckbox( false, 'membership_ids[]', $container->obj_id ));
-		$this->tpl->setVariable('OBJECT_TITLE', $container->title);
-		$this->tpl->setVariable('OBJECT_INFO', sprintf("%d %s", $members, $label));
-		$this->tpl->setVariable('OBJECT_IMG_PATH', $this->isAddedContainer($container) ? ilUtil::getImagePath('icon_ok.svg') : ilUtil::getImagePath('icon_not_ok.svg')); 
-    }
+		$members = $this->getMembersObject($container)->getCountMembers();
+		$label = $this->lng->txt('rep_robj_xtov_membership_count_members');
+		if ($this->objectParent == $parentRef) {
+			$this->tpl->setVariable('VAL_CHECKBOX', ilUtil::formCheckbox(false, 'membership_ids[]', $container->obj_id));
+			$this->tpl->setVariable('OBJECT_TITLE', $container->title);
+			$this->tpl->setVariable('OBJECT_INFO', sprintf("%d %s", $members, $label));
+			$this->tpl->setVariable('OBJECT_IMG_PATH', $this->isAddedContainer($container) ? ilUtil::getImagePath('icon_ok.svg') : ilUtil::getImagePath('icon_not_ok.svg'));
+		} else {
+			$this->tpl->setVariable('colapse', 'style="display:none;"');
+		}
+	}
 
 	/**
 	 *    Check wether a group is added to the current overview.
@@ -119,13 +138,12 @@ protected function fillRow($container)
 	 * @param stdClass $container
 	 * @return boolean
 	 */
-	private function isAddedContainer( stdClass $container )
-	{
+	private function isAddedContainer(stdClass $container) {
 		/**
 		 * @var $ilDB ilDB
 		 */
 		global $ilDB;
-		
+
 		// @todo: Move to application class!!!
 
 		$overviewId = $this->getParentObject()->object->getId();
@@ -140,4 +158,3 @@ private function isAddedContainer( stdClass $container )
 	}
 
 }
-
diff --git a/classes/GUI/class.ilTestListTableGUI.php b/classes/GUI/class.ilTestListTableGUI.php
index 6b4c94b..5a06d99 100755
--- a/classes/GUI/class.ilTestListTableGUI.php
+++ b/classes/GUI/class.ilTestListTableGUI.php
@@ -1,46 +1,44 @@
 <?php
+
 /* Copyright (c) 1998-2012 ILIAS open source, Extended GPL, see docs/LICENSE */
 
 /**
- *	@package	TestOverview repository plugin
- *	@category	GUI
- *	@author		Greg Saive <gsaive@databay.de>
+ * 	@package	TestOverview repository plugin
+ * 	@category	GUI
+ * 	@author		Greg Saive <gsaive@databay.de>
  */
-
 /* Internal : */
 require_once ilPlugin::getPluginObject(IL_COMP_SERVICE, 'Repository', 'robj', 'TestOverview')->getDirectory() . '/classes/GUI/class.ilMappedTableGUI.php';
 
-class ilTestListTableGUI extends ilMappedTableGUI
-{
+class ilTestListTableGUI extends ilMappedTableGUI {
+
 	/**
-	 *	 @var	array
+	 * 	 @var	array
 	 */
 	public $filter = array();
 
 	/**
-	 *	Constructor logic.
+	 * 	Constructor logic.
 	 *
-	 *	This table GUI constructor method initializes the
-	 *	object and configures the table rendering.
+	 * 	This table GUI constructor method initializes the
+	 * 	object and configures the table rendering.
 	 */
-	public function __construct(ilObjectGUI $a_parent_obj, $a_parent_cmd)
-	{
+	public function __construct(ilObjectGUI $a_parent_obj, $a_parent_cmd) {
 		/**
-		 *	@var ilCtrl $ilCtrl
+		 * 	@var ilCtrl $ilCtrl
 		 */
 		global $ilCtrl;
 
 		/* Pre-configure table */
 		$this->setId(
-			sprintf(
-				'test_overview_test_list_%d',
-				$a_parent_obj->object->getId()
-			)
+				sprintf(
+						'test_overview_test_list_%d', $a_parent_obj->object->getId()
+				)
 		);
 
 		$this->setDefaultOrderDirection('ASC');
 		$this->setDefaultOrderField('title');
-		
+
 		// ext ordering with db is ok, but ext limiting with db is not possible,
 		// since the rbac filtering is downstream to the db query
 		$this->setExternalSorting(true);
@@ -49,10 +47,9 @@ public function __construct(ilObjectGUI $a_parent_obj, $a_parent_cmd)
 		parent::__construct($a_parent_obj, $a_parent_cmd);
 
 		$this->setTitle(
-			sprintf(
-				$this->lng->txt('rep_robj_xtov_test_list_table_title'),
-				$a_parent_obj->object->getTitle()
-			)
+				sprintf(
+						$this->lng->txt('rep_robj_xtov_test_list_table_title'), $a_parent_obj->object->getTitle()
+				)
 		);
 
 		$plugin = ilPlugin::getPluginObject(IL_COMP_SERVICE, 'Repository', 'robj', 'TestOverview');
@@ -76,36 +73,36 @@ public function __construct(ilObjectGUI $a_parent_obj, $a_parent_cmd)
 	}
 
 	/**
-	 *	Initialize the table filters.
+	 * 	Initialize the table filters.
 	 *
-	 *	This method is called internally to initialize
-	 *	the filters from present on the top of the table.
+	 * 	This method is called internally to initialize
+	 * 	the filters from present on the top of the table.
 	 */
-	public function initFilter()
-    {
-        include_once 'Services/Form/classes/class.ilTextInputGUI.php';
-        $tname = new ilTextInputGUI($this->lng->txt('rep_robj_xtov_test_list_flt_tst_name'), 'flt_tst_name');
-        $tname->setSubmitFormOnEnter(true);
-        $this->addFilterItem($tname);
-        $tname->readFromSession();
-        $this->filter['flt_tst_name'] = $tname->getValue();
-    }
+	public function initFilter() {
+		include_once 'Services/Form/classes/class.ilTextInputGUI.php';
+		$tname = new ilTextInputGUI($this->lng->txt('rep_robj_xtov_test_list_flt_tst_name'), 'flt_tst_name');
+		$tname->setSubmitFormOnEnter(true);
+		$this->addFilterItem($tname);
+
+
+		$tname->readFromSession();
+		$this->filter['flt_tst_name'] = $tname->getValue();
+	}
 
 	/**
-	 *	Fill a table row.
+	 * 	Fill a table row.
 	 *
-	 *	This method is called internally by ilias to
-	 *	fill a table row according to the row template.
+	 * 	This method is called internally by ilias to
+	 * 	fill a table row according to the row template.
 	 *
-     *	@param stdClass $item
-     */
-    protected function fillRow($item)
-    {
+	 * 	@param stdClass $item
+	 */
+	protected function fillRow($item) {
 		/* Configure template rendering. */
 		$this->tpl->setVariable('VAL_CHECKBOX', ilUtil::formCheckbox(false, 'test_ids[]', $item->ref_id));
 		$this->tpl->setVariable('OBJECT_TITLE', $item->title);
 		$this->tpl->setVariable('OBJECT_INFO', $this->getTestPath($item));
-    }
+	}
 
 	/**
 	 *    Retrieve the tree path to an ilObjTest.
@@ -118,25 +115,24 @@ protected function fillRow($item)
 	 * @param stdClass $item
 	 * @return string
 	 */
-	private function getTestPath( stdClass $item )
-	{
+	private function getTestPath(stdClass $item) {
 		/**
 		 * @var $tree ilTree
 		 */
-		global $tree;
-		
+		global $tree, $ilCtrl;
+
 		$path_str = '';
 
 		$path = $tree->getNodePath($item->ref_id);
-		while ($node = current($path))
-		{
-			$prepend  = empty($path_str) ? '' : "{$path_str} > ";
+		while ($node = current($path)) {
+			$prepend = empty($path_str) ? '' : "{$path_str} > ";
 			$path_str = $prepend . $node['title'];
 			next($path);
 		}
+		$ilCtrl->setParameterByClass("ilobjtestgui", 'ref_id', $item->ref_id);
+		$path_str = "<div><a href='" . $ilCtrl->getLinkTargetByClass('ilobjtestgui', 'infoScreen') . "'>" . $path_str . "</a></div>";
 
 		return $path_str;
 	}
 
 }
-
diff --git a/classes/GUI/class.ilTestOverviewExportGUI.php b/classes/GUI/class.ilTestOverviewExportGUI.php
new file mode 100644
index 0000000..f1d3b53
--- /dev/null
+++ b/classes/GUI/class.ilTestOverviewExportGUI.php
@@ -0,0 +1,116 @@
+<?php
+
+/* Copyright (c) 1998-2012 ILIAS open source, Extended GPL, see docs/LICENSE */
+
+/**
+ * 	@package	TestOverview repository plugin
+ * 	@category	Core
+ * 	@author		Benedict Steuerlein <st111340@stud.uni-stuttgart.de>
+ *  
+ * The class creates a CSV file from the User Data that can be downloaded 
+ */
+
+/**
+ * @ilCtrl_isCalledBy ilTestOverviewExportGUI: ilObjTestOverviewGUI
+ */
+class ilTestOverviewExportGUI extends ilObjTestOverviewGUI {
+
+	/**
+	 * 	@var ilPropertyFormGUI
+	 */
+	protected $form;
+	protected $parent;
+	protected $id;
+
+
+	/**
+	 * Constructor
+	 */
+	public function __construct($a_parent_gui, $id, $a_main_object = null) {
+		parent::__construct($a_parent_gui, $a_main_object);
+		$this->parent = $a_parent_gui;
+		$this->id = $id;
+	}
+
+	function &executeCommand() {
+		global $ilCtrl;
+		$next_class = $ilCtrl->getNextClass($this);
+		$cmd = $ilCtrl->getCmd();
+		switch ($next_class) {
+			default :
+				switch ($cmd) {
+
+					default: $this->$cmd();
+						break;
+				}
+		}
+	}
+
+	/**
+	 * initialize the export form and render the template
+	 */
+	public function export() {
+
+
+		/* initialize Export form */
+		$this->initExportForm();
+
+		/* Populate template */
+		$this->tpl->setContent($this->form->getHTML());
+	}
+
+	/**
+	 * 
+	 * @global type $tpl
+	 * @global type $lng
+	 * @global type $ilCtrl
+	 * 
+	 * Command that is triggered when the 'Export'-button is pressed
+	 */
+	protected function triggerExport() {
+		$this->initExportForm();
+		if ($this->form->checkInput()) {
+
+			$export_type = $this->form->getInput("export_type");
+
+			require_once 'Customizing/global/plugins/Services/Repository/RepositoryObject/TestOverview/classes/class.ilTestOverviewExport.php';
+			$to_exp = new ilTestOverviewExport($this->parent, $this->id, $export_type);
+			$to_exp->buildExportFile();
+		}
+	}
+
+	/**
+	 * 
+	 * @global type $ilCtrl
+	 * @global type $tpl
+	 * @global type $lng
+	 * 
+	 * inintialize the export form
+	 */
+	public function initExportForm() {
+
+		global $ilCtrl, $tpl, $lng;
+		include_once("./Services/Form/classes/class.ilPropertyFormGUI.php");
+
+		$this->form = new ilPropertyFormGUI();
+		$this->form->setTitle("Export " . $this->txt("properties"));
+		$this->form->setFormAction($ilCtrl->getFormAction($this));
+
+		//radio group: Export type
+		$checkbox_overview = new ilRadioGroupInputGUI("Type", "export_type");
+		$overview_op = new ilCheckboxOption($this->txt("reduced"), "reduced", $this->txt("reduced_exp"));
+		$overview_op2 = new ilCheckboxOption($this->txt("extended"), "extended", $this->txt("extended_exp"));
+
+		$checkbox_overview->addOption($overview_op);
+		$checkbox_overview->addOption($overview_op2);
+		$checkbox_overview->setRequired(true);
+
+
+		$this->form->addItem($checkbox_overview);
+
+		$this->form->addCommandButton("triggerExport", "Export");
+	}
+
+}
+
+?>
\ No newline at end of file
diff --git a/classes/GUI/class.ilTestOverviewTableGUI.php b/classes/GUI/class.ilTestOverviewTableGUI.php
index b6965e1..950d4d9 100755
--- a/classes/GUI/class.ilTestOverviewTableGUI.php
+++ b/classes/GUI/class.ilTestOverviewTableGUI.php
@@ -1,24 +1,23 @@
 <?php
+
 /* Copyright (c) 1998-2012 ILIAS open source, Extended GPL, see docs/LICENSE */
 
 /**
- *	@package	TestOverview repository plugin
- *	@category	GUI
- *	@author		Greg Saive <gsaive@databay.de>
+ * 	@package	TestOverview repository plugin
+ * 	@category	GUI
+ * 	@author		Greg Saive <gsaive@databay.de>
+ *  @ilCtrl_Calls   ilTestOverviewTableGUI: ilTestEvaluationGUI
  */
-/* Dependencies : */
-
 require_once "Services/Tracking/classes/class.ilLPStatus.php";
 require_once ilPlugin::getPluginObject(IL_COMP_SERVICE, 'Repository', 'robj', 'TestOverview')
 				->getDirectory() . '/classes/GUI/class.ilMappedTableGUI.php';
 
-class ilTestOverviewTableGUI
-	extends ilMappedTableGUI
-{
+class ilTestOverviewTableGUI extends ilMappedTableGUI {
+
 	private $accessIndex = array();
-	
+
 	/**
-	 *	 @var	array
+	 * 	 @var	array
 	 */
 	protected $filter = array();
 
@@ -28,62 +27,69 @@ class ilTestOverviewTableGUI
 	protected $linked_tst_column_targets = array();
 
 	/**
-	 *	Constructor logic.
+	 * 	Constructor logic.
 	 *
-	 *	This table GUI constructor method initializes the
-	 *	object and configures the table rendering.
+	 * 	This table GUI constructor method initializes the
+	 * 	object and configures the table rendering.
 	 */
-	public function __construct( ilObjectGUI $a_parent_obj, $a_parent_cmd )
-	{
+	public function __construct(ilObjectGUI $a_parent_obj, $a_parent_cmd) {
 		/**
-		 *	@var ilCtrl	$ilCtrl
+		 * 	@var ilCtrl	$ilCtrl
 		 */
-		global $ilCtrl, $tpl, $ilAccess;
+		global $ilCtrl, $tpl, $ilAccess, $lng;
+		$lng->loadLanguageModule("administration");
 
 		/* Pre-configure table */
 		$this->setId(sprintf(
-			"test_overview_%d", $a_parent_obj->object->getId()));
+						"test_overview_%d", $a_parent_obj->object->getId()));
 
 		$this->setDefaultOrderDirection('ASC');
 		$this->setDefaultOrderField('obj_id');
-		
+
 		// ext ordering with db is ok, but ext limiting with db is not possible,
 		// since the rbac filtering is downstream to the db query
 		$this->setExternalSorting(true);
 		$this->setExternalSegmentation(false);
 
-        parent::__construct($a_parent_obj, $a_parent_cmd);
+		parent::__construct($a_parent_obj, $a_parent_cmd);
 
-		$this->setTitle( sprintf(
-			$this->lng->txt('rep_robj_xtov_test_overview_table_title'),
-			$a_parent_obj->object->getTitle()));
+		$this->setTitle(sprintf(
+						$this->lng->txt('rep_robj_xtov_test_overview_table_title'), $a_parent_obj->object->getTitle()));
 
 		$overview = $this->getParentObject()->object;
 
 		$this->addColumn($this->lng->txt('rep_robj_xtov_test_overview_hdr_user'));
-		
-		foreach( $overview->getUniqueTests() as $obj_id => $refs )
-		{
+
+		//get Object_reference mapper from Exercise Overview
+		require_once ilPlugin::getPluginObject(IL_COMP_SERVICE, 'Repository', 'robj', 'TestOverview')
+						->getDirectory() . '/classes/mapper/class.ilExerciseMapper.php';
+		$excMapper = new ilExerciseMapper();
+
+		foreach ($overview->getUniqueTests() as $obj_id => $refs) {
 			$this->accessIndex[$obj_id] = false;
 			$valid_ref_id = null;
-			foreach( $refs as $ref_id )
-			{
-				switch( true )
-				{
+			foreach ($refs as $ref_id) {
+				switch (true) {
 					case $ilAccess->checkAccess("tst_statistics", "", $ref_id):
 					case $ilAccess->checkAccess("write", "", $ref_id):
-						$valid_ref_id = $ref_id; 
+						$valid_ref_id = $ref_id;
 						$this->accessIndex[$obj_id] = $valid_ref_id;
 						break 2;
 				}
 			}
+
 			$ilCtrl->setParameterByClass("ilobjtestgui", 'ref_id', $valid_ref_id);
-			$this->addTestColumn( $overview->getTest($obj_id)->getTitle(), $ilCtrl->getLinkTargetByClass('ilobjtestgui', 'infoScreen'));
+			// Creates the link for the Statistic Link in TestOverview
+			$link = $ilCtrl->getLinkTargetByClass(
+					array('ilObjTestOverviewGUI', 'ilobjtestgui', 'iltestevaluationgui'), 'outEvaluation'
+			);
+			$link = ilUtil::appendUrlParameterString($link, "ref_id=$valid_ref_id");
+			$statisticLink = "<br> <a href='" . $link . "'> " . $lng->txt('language_statistics');
+			$ilCtrl->setParameterByClass("ilobjtestgui", 'obj_id', $valid_ref_id);
+			$this->addTestColumn($overview->getTest($obj_id)->getTitle() . $statisticLink, $ilCtrl->getLinkTargetByClass('ilobjtestgui', 'infoScreen'));
 			$ilCtrl->setParameterByClass("ilobjtestgui", 'ref_id', '');
 		}
-		
 		$this->addColumn($this->lng->txt('rep_robj_xtov_test_overview_hdr_avg'));
-
 		$plugin = ilPlugin::getPluginObject(IL_COMP_SERVICE, 'Repository', 'robj', 'TestOverview');
 		$this->setRowTemplate('tpl.test_overview_row.html', $plugin->getDirectory());
 		$this->setDescription($this->lng->txt("rep_robj_xtov_test_overview_description"));
@@ -95,26 +101,27 @@ public function __construct( ilObjectGUI $a_parent_obj, $a_parent_cmd )
 		$this->initFilter();
 		$this->setFilterCommand("applyOverviewFilter");
 		$this->setResetCommand("resetOverviewFilter");
-
-		$this->setFormAction($ilCtrl->getFormAction($this->getParentObject(), 'showContent') );
+		$this->setFormAction($ilCtrl->getFormAction($this->getParentObject(), 'showContent'));
 	}
 
 	/**
-	 *	Initialize the table filters.
+	 * 	Initialize the table filters.
 	 *
-	 *	This method is called internally to initialize
-	 *	the filters from present on the top of the table.
+	 * 	This method is called internally to initialize
+	 * 	the filters from present on the top of the table.
 	 */
-	public function initFilter()
-    {
-        include_once 'Services/Form/classes/class.ilTextInputGUI.php';
-        include_once 'Services/Form/classes/class.ilSelectInputGUI.php';
+	public function initFilter() {
+		include_once 'Services/Form/classes/class.ilTextInputGUI.php';
+		include_once 'Services/Form/classes/class.ilSelectInputGUI.php';
 		include_once ilPlugin::getPluginObject(IL_COMP_SERVICE, 'Repository', 'robj', 'TestOverview')
 						->getDirectory() . "/classes/mapper/class.ilOverviewMapper.php";
 
 		/* Configure participant name filter (input[type=text]) */
-        $pname = new ilTextInputGUI($this->lng->txt('rep_robj_xtov_overview_flt_participant_name'), 'flt_participant_name');
-        $pname->setSubmitFormOnEnter(true);
+		$pname = new ilTextInputGUI($this->lng->txt('rep_robj_xtov_overview_flt_participant_name'), 'flt_participant_name');
+		$pname->setSubmitFormOnEnter(true);
+		$pgender = new ilSelectInputGUI("Gender", 'flt_participant_gender');
+		$genderArray = array("" => "-- Select --", "f" => "female", "m" => "male");
+		$pgender->setOptions($genderArray);
 
 		/* Configure participant group name filter (select) */
 		$mapper = new ilOverviewMapper;
@@ -125,13 +132,16 @@ public function initFilter()
 		$gname->setOptions($groups);
 
 		/* Configure filter form */
-        $this->addFilterItem($pname);
-        $this->addFilterItem($gname);
-        $pname->readFromSession();
-        $gname->readFromSession();
-        $this->filter['flt_participant_name'] = $pname->getValue();
-        $this->filter['flt_group_name']		  = $gname->getValue();
-    }
+		$this->addFilterItem($pname);
+		$this->addFilterItem($gname);
+		$this->addFilterItem($pgender);
+		$pgender->readFromSession();
+		$pname->readFromSession();
+		$gname->readFromSession();
+		$this->filter['flt_participant_gender'] = $pgender->getValue();
+		$this->filter['flt_participant_name'] = $pname->getValue();
+		$this->filter['flt_group_name'] = $gname->getValue();
+	}
 
 	/**
 	 *    Fill a table row.
@@ -142,89 +152,66 @@ public function initFilter()
 	 * @param array $row
 	 * @internal param \ilObjTestOverview $overview
 	 */
-    protected function fillRow($row)
-    {
- 		$overview = $this->getParentObject()->object;
+	protected function fillRow($row) {
+		$overview = $this->getParentObject()->object;
 
 		$results = array();
 
-		foreach ($overview->getUniqueTests() as $obj_id => $refs)
-		{
+		foreach ($overview->getUniqueTests() as $obj_id => $refs) {
 			$test = $overview->getTest($obj_id);
-			$activeId  = $test->getActiveIdOfUser($row['member_id']);
+			$activeId = $test->getActiveIdOfUser($row['member_id']);
 
 			$result = $progress = null;
-						
-			if( $this->accessIndex[$obj_id] )
-			{
-				$result    = $test->getTestResult($activeId);
-
-				$lpStatus = new ilLPStatus( $test->getId() );
-				$progress = $lpStatus->_lookupStatus($test->getId(), $row['member_id']);
-
-				if ((bool) $progress)
-				{
-					$result		= sprintf("%.2f %%", (float) $result['pass']['percent'] * 100);
-					
-					$results[]  = $result;
-				}
-				else
-				{
-					$result = $this->lng->txt("rep_robj_xtov_overview_test_not_passed");
-					
-					$results[]  = 0;
-				}
-				
-				if( $activeId > 0 )
-				{
-					$resultLink = $this->buildMemberResultLinkTarget($this->accessIndex[$obj_id], $activeId);
 
+			if ($this->accessIndex[$obj_id]) {
+				$result = $test->getTestResult($activeId);
+				//$lpStatus = new ilLPStatus($test->getId());
+				require_once 'Services/Tracking/classes/status/class.ilLPStatusTestPassed.php';
+				$lp = new ilLPStatusTestPassed($test->getId());
+				$progress = $lp->determineStatus($test->getId(), $row['member_id']);
+
+				$result = sprintf("%.2f %%", (float) $result['pass']['percent'] * 100);
+				$results[] = $result;
+
+
+				if ($activeId > 0) {
+					$resultLink = $this->buildMemberResultLinkTarget($this->accessIndex[$obj_id], $activeId);
 					$this->populateLinkedCell($resultLink, $result, $this->getCSSByProgress($progress));
-				}
-				else
-				{
+				} else {
 					$this->populateNoLinkCell(
-						$result, $this->getCSSByProgress($progress)
+							$result, $this->getCSSByProgress($progress)
 					);
 				}
-			}
-			else
-			{
+			} else {
 				$this->populateNoLinkCell(
-					$this->lng->txt("rep_robj_xtov_overview_test_no_permission"), $this->getCSSByProgress($progress)
+						$this->lng->txt("rep_robj_xtov_overview_test_no_permission"), $this->getCSSByProgress($progress)
 				);
 			}
-			
+
 			$this->tpl->setCurrentBlock('cell');
 			$this->tpl->parseCurrentBlock();
 		}
 
-		if (count($results))
-		{
+		if (count($results)) {
 			$average = sprintf("%.2f", (array_sum($results) / count($results)));
-		}
-		else
-		{
+		} else {
 			$average = "";
 		}
-		
-		$this->tpl->setVariable( "AVERAGE_CLASS", "");
-		$this->tpl->setVariable( "AVERAGE_VALUE", $average . (is_numeric($average) ? "%" : ""));
-		
+
+		$this->tpl->setVariable("AVERAGE_CLASS", "");
+		$this->tpl->setVariable("AVERAGE_VALUE", $average . (is_numeric($average) ? "%" : ""));
 		$this->tpl->setVariable('TEST_PARTICIPANT', $row['member_fullname']);
-    }
-	
-	private function populateLinkedCell($resultLink, $resultValue, $cssClass)
-	{
+	}
+
+	private function populateLinkedCell($resultLink, $resultValue, $cssClass) {
 		$this->tpl->setCurrentBlock('result');
 		$this->tpl->setVariable('RESULT_LINK', $resultLink);
-		$this->tpl->setVariable('RESULT_VALUE', $resultValue);				
+		$this->tpl->setVariable('RESULT_VALUE', $resultValue);
 		$this->tpl->setVariable('RESULT_CSSCLASS', $cssClass);
 		$this->tpl->parseCurrentBlock();
 	}
-	
-	private function populateNoLinkCell($resultValue, $cssClass)
-	{
+
+	private function populateNoLinkCell($resultValue, $cssClass) {
 		$this->tpl->setCurrentBlock('result_nolink');
 		$this->tpl->setVariable('RESULT_VALUE_NOLINK', $resultValue);
 		$this->tpl->setVariable('RESULT_CSSCLASS_NOLINK', $cssClass);
@@ -243,87 +230,104 @@ private function populateNoLinkCell($resultValue, $cssClass)
 	 * @throws OutOfRangeException
 	 * @return array
 	 */
-	protected function formatData( array $data )
-	{
+	protected function formatData(array $data, $b = false) {
 		/* For each group object we fetched, we need
-		   to retrieve the members in order to have
-		   a list of Participant. */
+		  to retrieve the members in order to have
+		  a list of Participant. */
 		$formatted = array(
 			'items' => array(),
-			'cnt'	=> 0);
-		
-		if(!$data['items'])
-		{
+			'cnt' => 0);
+
+		if (!$data['items']) {
 			$formatted = $this->getMapper()->getUniqueTestParticipants(array_keys($this->accessIndex));
 			$formatted['items'] = $this->fetchUserInformation($formatted['items']);
-			return $this->sortByFullName($formatted);
+			if ($b == false) {
+				return $this->sortByFullName($formatted);
+			} else {
+				return $this->sortByAveragePoints($formatted);
+			}
 		}
-		
-		foreach ($data['items'] as $item)
-		{
+		/* Filter current group */
+		foreach ($data['items'] as $item) {
 			$container = ilObjectFactory::getInstanceByObjId($item->obj_id, false);
-
 			if ($container === false)
 				throw new OutOfRangeException;
-			elseif (! empty($this->filter['flt_group_name'])
-					&& $container->getId() != $this->filter['flt_group_name'])
-				/* Filter current group */
+			elseif (!empty($this->filter['flt_group_name']) && $container->getId() != $this->filter['flt_group_name'])
 				continue;
 
 			$participants = $this->getMembersObject($item);
 			/* Fetch member object by ID to avoid one-per-row
-			   SQL queries. */
-			foreach ($participants->getMembers() as $usrId)
-			{
+			  SQL queries. */
+			foreach ($participants->getMembers() as $usrId) {
 				$formatted['items'][$usrId] = $usrId;
 			}
 		}
-		
-		$formatted['items'] = $this->fetchUserInformation($formatted['items']);
 
-		return $this->sortByFullName($formatted);
+		$formatted['items'] = $this->fetchUserInformation($formatted['items']);
+		if ($b == false) {
+			return $this->sortByFullName($formatted);
+		} else {
+			return $this->sortByAveragePoints($formatted);
+		}
 	}
-	
-	private function fetchUserInformation($usr_ids)
-	{
-		global $ilDB;
-		
+
+	/**
+	 * This method fetchs User Information and is used to filter the UserIds
+	 * 
+	 * @global type $ilDB
+	 * @global type $tpl
+	 * @param type $usr_ids
+	 * @return \ilObjUser
+	 */
+	public function fetchUserInformation($usr_ids) {
+		global $ilDB, $tpl;
+
 		$usr_id__IN__usrIds = $ilDB->in('usr_id', $usr_ids, false, 'integer');
-		
+
 		$query = "
-			SELECT usr_id, title, firstname, lastname FROM usr_data WHERE $usr_id__IN__usrIds
-		";
-		
+			SELECT usr_id, title, firstname, lastname, gender FROM usr_data WHERE $usr_id__IN__usrIds";
+
 		$res = $ilDB->query($query);
-		
+
 		$users = array();
-		
-		while( $row = $ilDB->fetchAssoc($res) )
-		{
+
+		while ($row = $ilDB->fetchAssoc($res)) {
 			$user = new ilObjUser();
-			
+
 			$user->setId($row['usr_id']);
 			$user->setUTitle($row['title']);
 			$user->setFirstname($row['firstname']);
 			$user->setLastname($row['lastname']);
 			$user->setFullname();
+			$user->setGender($row['gender']);
 
-			if (! empty($this->filter['flt_participant_name']))
-			{
-				$name   = strtolower($user->getFullName());
+			if (!empty($this->filter['flt_participant_name'])) {
+				$name = strtolower($user->getFullName());
 				$filter = strtolower($this->filter['flt_participant_name']);
 
+
 				/* Simulate MySQL LIKE operator */
-				if (false === strstr($name, $filter))
-				{
+				if (false === strstr($name, $filter)) {
 					/* User should be skipped. (Does not match filter) */
 					continue;
 				}
 			}
-			
-			$users[ $row['usr_id'] ] = $user;
+			if (!empty($this->filter['flt_participant_gender'])) {
+
+				$gender = $user->getGender();
+				$filterGender = $this->filter['flt_participant_gender'];
+
+
+				/* Simulate MySQL LIKE operator */
+				if (false === strstr($gender, $filterGender)) {
+					/* User should be skipped. (Does not match filter) */
+					continue;
+				}
+			}
+
+			$users[$row['usr_id']] = $user;
 		}
-		
+
 		return $users;
 	}
 
@@ -340,17 +344,13 @@ private function fetchUserInformation($usr_ids)
 	 * @param $progress
 	 * @return string
 	 */
-
-	private function getCSSByProgress( $progress )
-	{
+	private function getCSSByProgress($progress) {
 		$map = $this->buildCssClassByProgressMap();
 
-		$progress = (string)$progress;
+		$progress = (string) $progress;
 
-		foreach($map as $lpNum => $cssClass)
-		{
-			if( $progress === (string)$lpNum ) // we need identical check !!
-			{
+		foreach ($map as $lpNum => $cssClass) {
+			if ($progress === (string) $lpNum) { // we need identical check !!
 				return $cssClass;
 			}
 		}
@@ -358,10 +358,8 @@ private function getCSSByProgress( $progress )
 		return 'no-perm-result';
 	}
 
-	public function buildCssClassByProgressMap()
-	{
-		if( defined('ilLPStatus::LP_STATUS_NOT_ATTEMPTED_NUM') )
-		{
+	public function buildCssClassByProgressMap() {
+		if (defined('ilLPStatus::LP_STATUS_NOT_ATTEMPTED_NUM')) {
 			return array(
 				ilLPStatus::LP_STATUS_NOT_ATTEMPTED_NUM => 'no-result',
 				ilLPStatus::LP_STATUS_IN_PROGRESS_NUM => 'orange-result',
@@ -392,11 +390,10 @@ public function buildCssClassByProgressMap()
 	 * @param array $data
 	 * @return array
 	 */
-	protected function sortByFullName( array $data )
-	{
+	protected function sortByFullName(array $data) {
 		$azList = array();
 		$sorted = array(
-			'cnt'   => $data['cnt'],
+			'cnt' => $data['cnt'],
 			'items' => array());
 
 		/* Initialize partition array. */
@@ -406,136 +403,259 @@ protected function sortByFullName( array $data )
 		/* Partition data. */
 		foreach ($data['items'] as $userObj) {
 			$name = $userObj->getFullName();
+			$name = strtoupper($name);
 			$azList[$name{0}][] = $userObj;
 		}
 
 		/* Group all results. */
 		foreach ($azList as $az => $userList) {
-			if (! empty($userList))
+			if (!empty($userList))
 				$sorted['items'] = array_merge($sorted['items'], $userList);
 		}
 
 		return $sorted;
 	}
 
+	/**
+	 *    Sort the array of users by their average points.
+	 *
+	 *    This method had to be implemented in order to sort
+	 *    the listed users by their average points. The overview
+	 *    settings allows selecting participant groups rather
+	 *    than users. This means the data fetched according
+	 *    to a test overview, is the participant group's data.
+	 *
+	 * @params    array    $data    Array with 'cnt' & 'items' indexes.
+	 *
+	 * @param array $data
+	 * @return array
+	 */
+	protected function sortByAveragePoints(array $data) {
+		global $ilDB, $tpl;
+		$overviewMapper = new ilOverviewMapper();
+		$overview = $this->getParentObject()->object;
+		$rankList = array();
+		$sorted = array(
+			'cnt' => $data['cnt'],
+			'items' => array());
+
+		/* Initialize partition array. */
+		for ($rank = '1'; $rank <= count($data['items']); $rank++) {
+			$rankList[$rank] = array();
+		}
+		//calculating average points
+		$studentIndex = 1;
+		foreach ($data['items'] as $userObj) {
+			$stdID = $userObj->getId();
+			$results = array();
+
+			foreach ($overview->getUniqueTests() as $obj_id => $refs) {
+				$test = $overview->getTest($obj_id);
+				$activeId = $test->getActiveIdOfUser($stdID);
+				$result = $progress = null;
+				$result = $test->getTestResult($activeId);
+				$lpStatus = new ilLPStatus($test->getId());
+				$progress = $lpStatus->_lookupStatus($test->getId(), $stdID);
+				if ((bool) $progress) {
+					$result = sprintf("%.2f %%", (float) $result['pass']['percent'] * 100);
+					$results[] = $result;
+				} else {
+					$results[] = 0;
+				}
+
+				if (count($results)) {
+					$average = (array_sum($results) / count($results));
+				} else {
+					$average = 0;
+				}
+			}
+			$rankList[$studentIndex][] = $userObj;
+			$sumList[$studentIndex][] = $average;
+			$studentIndex++;
+			asort($sumList);
+			$arraySorted = array_keys($sumList);
+		}
+		/* Group all results. */
+		for ($i = '1'; $i <= count($rankList); $i++) {
+			$position = array_pop($arraySorted);
+			$userList = $rankList[$position];
+			if (!empty($userList)) {
+				$sorted['items'] = array_merge($sorted['items'], $userList);
+			}
+		}
+		return $sorted;
+	}
+
+	/**
+	 * Function to rank all students and save their result in the database.
+	 * This data is used to show students their results in the User Results
+	 * Tab.
+	 */
+	public function getStudentsRanked() {
+		if ($this->getExternalSegmentation() && $this->getExternalSorting()) {
+			$this->determineOffsetAndOrder();
+		} elseif (!$this->getExternalSegmentation() && $this->getExternalSorting()) {
+			$this->determineOffsetAndOrder(true);
+		} else {
+			throw new ilException('invalid table configuration: extSort=false / extSegm=true');
+		}
+
+		/* Configure query execution */
+		$params = array();
+		if ($this->getExternalSegmentation()) {
+			$params['limit'] = $this->getLimit();
+			$params['offset'] = $this->getOffset();
+		}
+		if ($this->getExternalSorting()) {
+			$params['order_field'] = $this->getOrderField();
+			$params['order_direction'] = $this->getOrderDirection();
+		}
+
+		$overview = $this->getParentObject()->object;
+		$filters = array("overview_id" => $overview->getId()) + $this->filter;
+		/* Execute query. */
+		$data = $this->getMapper()->getList($params, $filters);
+
+		if (!count($data['items']) && $this->getOffset() > 0) {
+			/* Query again, offset was incorrect. */
+			$this->resetOffset();
+			$data = $this->getMapper()->getList($params, $filters);
+		}
+
+		/* Post-query logic. Implement custom sorting or display
+		  in formatData overload. */
+		$data = $this->formatData($data);
+
+
+		$this->getmapper()->resetRanks($this->getParentObject()->object->getID());
+		foreach ($data['items'] as $userObj) {
+			$stdID = $userObj->getId();
+			$overview = $this->getParentObject()->object;
+			$results = array();
+
+			foreach ($overview->getUniqueTests() as $obj_id => $refs) {
+				$test = $overview->getTest($obj_id);
+				$endingTime = (float) $test->getEndingTime();
+				$timestamp = time();
+				$datum = (float) date("YmdHis", $timestamp);
+				if ($datum - $endingTime > 0) {
+					$activeId = $test->getActiveIdOfUser($stdID);
+					$result = $progress = null;
+					$result = $test->getTestResult($activeId);
+					$lpStatus = new ilLPStatus($test->getId());
+					$progress = $lpStatus->_lookupStatus($test->getId(), $stdID);
+
+					$result = sprintf("%.2f %%", (float) $result['pass']['percent'] * 100);
+					$results[] = $result;
+
+
+					if (count($results)) {
+						$average = (array_sum($results) / count($results));
+					} else {
+						$average = 0;
+					}
+					$ilMapper = $this->getMapper();
+					$ilMapper->setData2Rank($average, $stdID, $this->getParentObject()->object->getId());
+				}
+			}
+		}
+		$this->getMapper()->createDate($this->getParentObject()->object->getId());
+	}
+
 	/**
 	 * @param string $a_text
 	 * @param string $link
 	 */
-	public function addTestColumn($a_text, $link)
-	{
+	public function addTestColumn($a_text, $link) {
 		$this->addColumn($a_text, '');
 		$this->column[count($this->column) - 1]['link'] = $link;
 	}
 
 	/**
-	 * 
+	 * Fills the test names and the urls into the headrow
+	 * @global type $lng
 	 */
-	public function fillHeader()
-	{
+	public function fillHeader() {
 		global $lng;
 
 		$allcolumnswithwidth = true;
-		foreach ((array) $this->column as $idx => $column)
-		{
-			if (!strlen($column["width"]))
-			{
+		foreach ((array) $this->column as $idx => $column) {
+			if (!strlen($column["width"])) {
 				$allcolumnswithwidth = false;
-			}
-			else if($column["width"] == "1")
-			{
+			} else if ($column["width"] == "1") {
 				// IE does not like 1 but seems to work with 1%
 				$this->column[$idx]["width"] = "1%";
 			}
 		}
-		if ($allcolumnswithwidth)
-		{
-			foreach ((array) $this->column as $column)
-			{
+		if ($allcolumnswithwidth) {
+			foreach ((array) $this->column as $column) {
 				$this->tpl->setCurrentBlock("tbl_colgroup_column");
 				$this->tpl->setVariable("COLGROUP_COLUMN_WIDTH", $column["width"]);
 				$this->tpl->parseCurrentBlock();
 			}
 		}
 		$ccnt = 0;
-		foreach ((array) $this->column as $column)
-		{
+		foreach ((array) $this->column as $column) {
 			$ccnt++;
 
 			//tooltip
-			if ($column["tooltip"] != "")
-			{
+			if ($column["tooltip"] != "") {
 				include_once("./Services/UIComponent/Tooltip/classes/class.ilTooltipGUI.php");
-				ilTooltipGUI::addTooltip("thc_".$this->getId()."_".$ccnt, $column["tooltip"]);
+				ilTooltipGUI::addTooltip("thc_" . $this->getId() . "_" . $ccnt, $column["tooltip"]);
 			}
-			if ((!$this->enabled["sort"] || $column["sort_field"] == "" || $column["is_checkbox_action_column"]) && !$column['link'])
-			{
+			if ((!$this->enabled["sort"] || $column["sort_field"] == "" || $column["is_checkbox_action_column"]) && !$column['link']) {
 				$this->tpl->setCurrentBlock("tbl_header_no_link");
-				if ($column["width"] != "")
-				{
-					$this->tpl->setVariable("TBL_COLUMN_WIDTH_NO_LINK"," width=\"".$column["width"]."\"");
+				if ($column["width"] != "") {
+					$this->tpl->setVariable("TBL_COLUMN_WIDTH_NO_LINK", " width=\"" . $column["width"] . "\"");
 				}
-				if (!$column["is_checkbox_action_column"])
-				{
-					$this->tpl->setVariable("TBL_HEADER_CELL_NO_LINK",
-						$column["text"]);
+				if (!$column["is_checkbox_action_column"]) {
+					$this->tpl->setVariable("TBL_HEADER_CELL_NO_LINK", $column["text"]);
+				} else {
+					$this->tpl->setVariable("TBL_HEADER_CELL_NO_LINK", ilUtil::img(ilUtil::getImagePath("spacer.png"), $lng->txt("action")));
 				}
-				else
-				{
-					$this->tpl->setVariable("TBL_HEADER_CELL_NO_LINK",
-						ilUtil::img(ilUtil::getImagePath("spacer.png"), $lng->txt("action")));
-				}
-				$this->tpl->setVariable("HEAD_CELL_NL_ID", "thc_".$this->getId()."_".$ccnt);
+				$this->tpl->setVariable("HEAD_CELL_NL_ID", "thc_" . $this->getId() . "_" . $ccnt);
 
-				if ($column["class"] != "")
-				{
-					$this->tpl->setVariable("TBL_HEADER_CLASS"," " . $column["class"]);
+				if ($column["class"] != "") {
+					$this->tpl->setVariable("TBL_HEADER_CLASS", " " . $column["class"]);
 				}
 				$this->tpl->parseCurrentBlock();
 				$this->tpl->touchBlock("tbl_header_th");
 				continue;
 			}
-			if (($column["sort_field"] == $this->order_field) && ($this->order_direction != ""))
-			{
+			if (($column["sort_field"] == $this->order_field) && ($this->order_direction != "")) {
 				$this->tpl->setCurrentBlock("tbl_order_image");
-				$this->tpl->setVariable("IMG_ORDER_DIR",ilUtil::getImagePath($this->order_direction."_order.png"));
+				$this->tpl->setVariable("IMG_ORDER_DIR", ilUtil::getImagePath($this->order_direction . "_order.png"));
 				$this->tpl->setVariable("IMG_ORDER_ALT", $this->lng->txt("change_sort_direction"));
 				$this->tpl->parseCurrentBlock();
 			}
 
 			$this->tpl->setCurrentBlock("tbl_header_cell");
 			$this->tpl->setVariable("TBL_HEADER_CELL", $column["text"]);
-			$this->tpl->setVariable("HEAD_CELL_ID", "thc_".$this->getId()."_".$ccnt);
+			$this->tpl->setVariable("HEAD_CELL_ID", "thc_" . $this->getId() . "_" . $ccnt);
 
 			// only set width if a value is given for that column
-			if ($column["width"] != "")
-			{
-				$this->tpl->setVariable("TBL_COLUMN_WIDTH"," width=\"".$column["width"]."\"");
+			if ($column["width"] != "") {
+				$this->tpl->setVariable("TBL_COLUMN_WIDTH", " width=\"" . $column["width"] . "\"");
 			}
 
 			$lng_sort_column = $this->lng->txt("sort_by_this_column");
-			$this->tpl->setVariable("TBL_ORDER_ALT",$lng_sort_column);
+			$this->tpl->setVariable("TBL_ORDER_ALT", $lng_sort_column);
 
 			$order_dir = "asc";
 
-			if ($column["sort_field"] == $this->order_field)
-			{
+			if ($column["sort_field"] == $this->order_field) {
 				$order_dir = $this->sort_order;
 
 				$lng_change_sort = $this->lng->txt("change_sort_direction");
-				$this->tpl->setVariable("TBL_ORDER_ALT",$lng_change_sort);
+				$this->tpl->setVariable("TBL_ORDER_ALT", $lng_change_sort);
 			}
 
-			if ($column["class"] != "")
-			{
-				$this->tpl->setVariable("TBL_HEADER_CLASS"," " . $column["class"]);
+			if ($column["class"] != "") {
+				$this->tpl->setVariable("TBL_HEADER_CLASS", " " . $column["class"]);
 			}
-			if($column['link'])
-			{
+			if ($column['link']) {
 				$this->setExternalLink($column['link']);
-			}
-			else
-			{
+			} else {
 				$this->setOrderLink($column["sort_field"], $order_dir);
 			}
 			$this->tpl->parseCurrentBlock();
@@ -549,11 +669,10 @@ public function fillHeader()
 	/**
 	 * @param string $link
 	 */
-	public function setExternalLink($link)
-	{
+	public function setExternalLink($link) {
 		$this->tpl->setVariable('TBL_ORDER_LINK', $link);
 	}
-	
+
 	/**
 	 * overwrite this method for ungregging the object data structures
 	 * since ilias tables support arrays only
@@ -561,33 +680,45 @@ public function setExternalLink($link)
 	 * @param mixed $data
 	 * @return array
 	 */
-	protected function buildTableRowsArray($data)
-	{
+	protected function buildTableRowsArray($data) {
 		$rows = array();
-		
-		foreach($data as $member)
-		{
-			$rows[] = array(
-				'member_id' => $member->getId(),
-				'member_fullname' => $member->getFullName()
-			);
+
+		foreach ($data as $member) {
+			if (!($member->getId() == null)) {
+				$rows[] = array(
+					'member_id' => $member->getId(),
+					'member_fullname' => $member->getFullName()
+				);
+			} else {
+				$rows[] = array(
+					'member_id' => '0',
+					'member_fullname' => $member->getFullName()
+				);
+			}
 		}
-		
+
 		return $rows;
 	}
-	
-	protected function buildMemberResultLinkTarget($refId, $activeId)
-	{
+
+	/**
+	 * Creates the link which refers to the evaluation of the test of a user.
+	 * 
+	 * @global type $ilCtrl
+	 * @param type $refId
+	 * @param type $activeId
+	 * @return type
+	 */
+	protected function buildMemberResultLinkTarget($refId, $activeId) {
 		global $ilCtrl;
 
 		$link = $ilCtrl->getLinkTargetByClass(
-			array('ilObjTestOverviewGUI', 'ilobjtestgui', 'iltestevaluationgui'), 'outParticipantsPassDetails'
+				array('ilObjTestOverviewGUI', 'ilobjtestgui', 'iltestevaluationgui'), 'outParticipantsPassDetails'
 		);
-		
+
 		$link = ilUtil::appendUrlParameterString($link, "ref_id=$refId");
 		$link = ilUtil::appendUrlParameterString($link, "active_id=$activeId");
-		
+
 		return $link;
 	}
-}
 
+}
diff --git a/classes/class.ilObjExerciseOverviewGUI.php b/classes/class.ilObjExerciseOverviewGUI.php
new file mode 100644
index 0000000..cf3cb7f
--- /dev/null
+++ b/classes/class.ilObjExerciseOverviewGUI.php
@@ -0,0 +1,44 @@
+<?php
+/* Copyright (c) 1998-2013 ILIAS open source, Extended GPL, see docs/LICENSE */
+require_once 'Services/Repository/classes/class.ilObjectPluginListGUI.php';
+require_once 'Customizing/global/plugins/Services/Repository/RepositoryObject/TestOverview/classes/GUI/class.ilTestOverviewTableGUI.php';
+
+class ilObjExerciseOverviewListGUI extends ilTestOverviewTableGUI {
+
+	public function __construct() {
+		
+	}
+
+	/**
+	 *  Gets the data from every student and their test results in a string seperated by "|"
+	 * 
+	 * @global type $ilDB
+	 * @return type
+	 */
+	public function data() {
+		global $ilDB;
+		require_once ilPlugin::getPluginObject(IL_COMP_SERVICE, 'Repository', 'robj', 'TestOverview')
+						->getDirectory() . '/classes/mapper/class.ilExerciseMapper.php';
+		$mapper = new ilExerciseMapper;
+		$data = $mapper->getArrayofObjects();
+
+		$tpl = new ilTemplate("tpl.test_exerciseview_row.html", true, true, "Customizing/global/plugins/Services/Repository/RepositoryObject/TestOverview");
+
+		foreach ($data as $set) {
+			$tpl->setCurrentBlock("tests");
+			$tpl->setVariable("TEST", $set->obj_id);
+			$tpl->parseCurrentBlock();
+
+			$tpl->setCurrentBlock("result");
+			$tpl->setVariable("TEXT", $set->user_id);
+			$tpl->setVariable("VALUE", $set->mark);
+			$tpl->parseCurrentBlock();
+		}
+
+		return $tpl->get();
+		return $mapper->getMarkforTest(6, 272);
+	}
+
+}
+
+?>
diff --git a/classes/class.ilObjTestOverview.php b/classes/class.ilObjTestOverview.php
index bc58a07..027bcb8 100755
--- a/classes/class.ilObjTestOverview.php
+++ b/classes/class.ilObjTestOverview.php
@@ -1,39 +1,38 @@
 <?php
+
 /* Copyright (c) 1998-2012 ILIAS open source, Extended GPL, see docs/LICENSE */
 
 /**
- *	@package	TestOverview repository plugin
- *	@category	Core
- *	@author		Greg Saive <gsaive@databay.de>
+ * 	@package	TestOverview repository plugin
+ * 	@category	Core
+ * 	@author		Greg Saive <gsaive@databay.de>
  */
-
 require_once 'Services/Repository/classes/class.ilObjectPlugin.php';
 require_once 'Modules/Test/classes/class.ilObjTest.php';
 require_once ilPlugin::getPluginObject(IL_COMP_SERVICE, 'Repository', 'robj', 'TestOverview')
 				->getDirectory() . '/classes/mapper/class.ilOverviewMapper.php';
 
-class ilObjTestOverview extends ilObjectPlugin
-{
+class ilObjTestOverview extends ilObjectPlugin {
+
 	private $test_objects = array();
 	private $test_obj_id_by_ref_id = null;
 	private $test_ref_ids_by_obj_id = null;
+	private $exercise_ref_ids_by_obj_id = null;
 
 	/**
-	 *	@var array
+	 * 	@var array
 	 */
 	private $groups;
 
 	/**
-	 *	@var ilOverviewMapper
+	 * 	@var ilOverviewMapper
 	 */
 	private $mapper;
 
-
 	/**
 	 * @param int $a_ref_id
 	 */
-	public function __construct($a_ref_id = 0)
-	{
+	public function __construct($a_ref_id = 0) {
 		parent::__construct($a_ref_id);
 
 		$this->groups = array();
@@ -41,48 +40,42 @@ public function __construct($a_ref_id = 0)
 	}
 
 	/**
- 	 *	Set the object type.
+	 * 	Set the object type.
 	 */
-	protected function initType()
-	{
+	protected function initType() {
 		$this->setType('xtov');
 	}
 
 	/**
-	 *	Retrieve the mapper instance
+	 * 	Retrieve the mapper instance
 	 *
-	 *	@return ilOverviewMapper
+	 * 	@return ilOverviewMapper
 	 */
-	public function getMapper()
-	{
+	public function getMapper() {
 		return $this->mapper;
 	}
 
 	/**
- 	 *	Create entry in database
+	 * 	Create entry in database
 	 */
-	public function doCreate()
-	{
+	public function doCreate() {
 		$this->getMapper()
-			 ->insert(
-				"rep_robj_xtov_overview",
-				array("obj_id" => $this->getId()));
+				->insert(
+						"rep_robj_xtov_overview", array("obj_id" => $this->getId()));
 		$this->createMetaData();
 	}
 
 	/**
-	 * 
+	 *
 	 */
-	public function doUpdate()
-	{
+	public function doUpdate() {
 		$this->updateMetaData();
 	}
 
 	/**
-	 *	Read data from db
+	 * 	Read data from db
 	 */
-	public function doRead()
-	{
+	public function doRead() {
 		/**
 		 * @var $ilDB ilDB
 		 */
@@ -96,17 +89,16 @@ public function doRead()
 			WHERE
 				obj_id = ' . $ilDB->quote($this->getId(), 'integer'));
 
-		while($row = $ilDB->fetchObject($res))
+		while ($row = $ilDB->fetchObject($res))
 			$this->obj_id = $row->obj_id;
 	}
 
 	/**
-	 *	Delete entry from database
+	 * 	Delete entry from database
 	 */
-	public function doDelete()
-	{
+	public function doDelete() {
 		/**
- 		 * @var $ilDB ilDB
+		 * @var $ilDB ilDB
 		 */
 		global $ilDB;
 
@@ -116,26 +108,25 @@ public function doDelete()
 	}
 
 	/**
-	 *	Clone an ilObjTestOverview object.
+	 * 	Clone an ilObjTestOverview object.
 	 *
-	 *	This method effectively clones all objects belonging
-	 *	to the overview. First the tests & groups are retrieved,
-	 *	then the overview_id=>obj_id pair is inserted in the
-	 *	correct relation table (either t2o or p2o, respectively as in
-	 *	test_2_overview & participants_2_overview)
+	 * 	This method effectively clones all objects belonging
+	 * 	to the overview. First the tests & groups are retrieved,
+	 * 	then the overview_id=>obj_id pair is inserted in the
+	 * 	correct relation table (either t2o or p2o, respectively as in
+	 * 	test_2_overview & participants_2_overview)
 	 *
-	 *	@params ilObjTestOverview	$new_obj
-	 *	@params	int					$a_target_id
-	 *	@params int					$a_copy_id
+	 * 	@params ilObjTestOverview	$new_obj
+	 * 	@params	int					$a_target_id
+	 * 	@params int					$a_copy_id
 	 */
-	protected function doCloneObject($new_obj, $a_target_id, $a_copy_id = null)
-	{
+	protected function doCloneObject($new_obj, $a_target_id, $a_copy_id) {
 		global $ilDB;
 
-		$tests  = $this->getTests(true);
+		$tests = $this->getTests(true);
 		$groups = $this->getParticipantGroups(true);
 
-		$tests  = array_keys($tests);
+		$tests = array_keys($tests);
 		$groups = array_keys($groups);
 
 		$tvals = "";
@@ -159,52 +150,43 @@ protected function doCloneObject($new_obj, $a_target_id, $a_copy_id = null)
 				%s";
 
 		/* Insert tests */
-		$ilDB->manipulate(sprintf($baseSQLTst,
-			"rep_robj_xtov_t2o",
-			"test",
-			$tvals));
+		$ilDB->manipulate(sprintf($baseSQLTst, "rep_robj_xtov_t2o", "test", $tvals));
 
 		/* Insert groups */
-		$ilDB->manipulate(sprintf($baseSQLFilter,
-			"rep_robj_xtov_p2o",
-			"grpcrs",
-			$gvals));
+		$ilDB->manipulate(sprintf($baseSQLFilter, "rep_robj_xtov_p2o", "grpcrs", $gvals));
 
 		$this->cloneMetaData($new_obj);
 	}
 
 	/**
-	 *	Add a test to the overview.
+	 * 	Add a test to the overview.
 	 *
-	 *	The addTest() method should be called
-	 *	to register a test in the currently
-	 *	edited overview.
+	 * 	The addTest() method should be called
+	 * 	to register a test in the currently
+	 * 	edited overview.
 	 *
-	 *	@params	int|ilObjTest	$test
+	 * 	@params	int|ilObjTest	$test
 	 */
-	public function	addTest( $test )
-	{
+	public function addTest($test) {
 		/**
-		 *	@var ilDB $ilDB
+		 * 	@var ilDB $ilDB
 		 */
 		global $ilDB;
 
 		$tesRefId = $test;
-		if ( $test instanceof ilObjTest ) {
+		if ($test instanceof ilObjTest) {
 			$tesRefId = $test->getRefId();
 		}
-		
+
 		/* Insert t2o entry (test 2 overview) */
 		$ilDB->replace(
-			'rep_robj_xtov_t2o',
-			array(
-				'obj_id_overview' => array('integer', $this->getId()),
-				'ref_id_test' => array('integer', $tesRefId)
-			),
-			array()
+				'rep_robj_xtov_t2o', array(
+			'obj_id_overview' => array('integer', $this->getId()),
+			'ref_id_test' => array('integer', $tesRefId)
+				), array()
 		);
 
-		if ( ! $test instanceof ilObjTest ) {
+		if (!$test instanceof ilObjTest) {
 			/* XXX fetch++ ... */
 			$test = ilObjectFactory::getInstanceByRefId($tesRefId);
 		}
@@ -213,22 +195,21 @@ public function	addTest( $test )
 	}
 
 	/**
-	 *	Remove a test from the overview.
+	 * 	Remove a test from the overview.
 	 *
-	 *	The rmTest() method should be called to unregister
-	 *	a test from an overview.
+	 * 	The rmTest() method should be called to unregister
+	 * 	a test from an overview.
 	 *
-	 *	@params	int|ilObjTest	$test
+	 * 	@params	int|ilObjTest	$test
 	 */
-	public function rmTest( $test )
-	{
+	public function rmTest($test) {
 		/**
-		 *	@var ilDB $ilDB
+		 * 	@var ilDB $ilDB
 		 */
 		global $ilDB;
 
 		$testRefId = $test;
-		if ( $test instanceof ilObjTest ) {
+		if ($test instanceof ilObjTest) {
 			$testRefId = $test->getRefId();
 		}
 
@@ -237,66 +218,58 @@ public function rmTest( $test )
 			DELETE FROM rep_robj_xtov_t2o
 			WHERE
 				obj_id_overview = %s
-				AND ref_id_test = %s",
-			array('integer', 'integer'),
-			array($this->getId(), $testRefId));
+				AND ref_id_test = %s", array('integer', 'integer'), array($this->getId(), $testRefId));
 
 		/* XXX update $this->tests */
 	}
 
 	/**
-	 *	Add a participant group to the overview.
+	 * 	Add a participant group to the overview.
 	 *
-	 *	The addGroup() method should be called to register
-	 *	a participant group in the overview.
+	 * 	The addGroup() method should be called to register
+	 * 	a participant group in the overview.
 	 *
-	 *	@params	ilObjCourse|ilObjGroup	$group
+	 * 	@params	ilObjCourse|ilObjGroup	$group
 	 */
-	public function	addGroup( $group )
-	{
+	public function addGroup($group) {
 		/**
-		 *	@var ilDB $ilDB
+		 * 	@var ilDB $ilDB
 		 */
 		global $ilDB;
 
 		$groupId = $group;
-		if ($groupId instanceof ilObjCourse
-			|| $groupId instanceof ilObjGroup) {
+		if ($groupId instanceof ilObjCourse || $groupId instanceof ilObjGroup) {
 
 			$groupId = $group->getId();
 		}
 
 		/* Insert p2o entry (test 2 overview) */
 		$ilDB->replace(
-			'rep_robj_xtov_p2o',
-			array(
-				'obj_id_overview' => array('integer', $this->getId()),
-				'obj_id_grpcrs' => array('integer', $groupId)
-			),
-			array()
+				'rep_robj_xtov_p2o', array(
+			'obj_id_overview' => array('integer', $this->getId()),
+			'obj_id_grpcrs' => array('integer', $groupId)
+				), array()
 		);
 
 		$this->groups[$groupId] = $group;
 	}
 
 	/**
-	 *	Remove a group from the overview.
+	 * 	Remove a group from the overview.
 	 *
-	 *	The rmGroup() method should be called to unregister
-	 *	a group from an overview.
+	 * 	The rmGroup() method should be called to unregister
+	 * 	a group from an overview.
 	 *
-	 *	@params	ilObjCourse|ilObjGroup	$group
+	 * 	@params	ilObjCourse|ilObjGroup	$group
 	 */
-	public function rmGroup( $group )
-	{
+	public function rmGroup($group) {
 		/**
-		 *	@var ilDB $ilDB
+		 * 	@var ilDB $ilDB
 		 */
 		global $ilDB;
 
 		$groupId = $group;
-		if ($group instanceof ilObjCourse
-			|| $group instanceof ilObjGroup) {
+		if ($group instanceof ilObjCourse || $group instanceof ilObjGroup) {
 
 			$groupId = $group->getId();
 		}
@@ -306,15 +279,12 @@ public function rmGroup( $group )
 			DELETE FROM rep_robj_xtov_p2o
 			WHERE
 				obj_id_overview = %s
-				AND obj_id_grpcrs = %s",
-			array('integer', 'integer'),
-			array($this->getId(), $groupId));
+				AND obj_id_grpcrs = %s", array('integer', 'integer'), array($this->getId(), $groupId));
 
 		/* XXX update $this->tests */
 	}
 
-	private function loadTestData()
-	{
+	private function loadTestData() {
 		global $ilDB;
 
 		$res = $ilDB->queryF("
@@ -331,29 +301,24 @@ private function loadTestData()
 					ON (test.obj_fi = object.obj_id)
 			WHERE
 				t2o.obj_id_overview = %s
-				AND ref.deleted IS NULL",
-			array('text', 'integer'),
-			array('tst', $this->getId()));
+				AND ref.deleted IS NULL", array('text', 'integer'), array('tst', $this->getId()));
 
 		/* Fetch objects into $this->tests. */
 
 		$this->test_obj_id_by_ref_id = array();
 		$this->test_ref_ids_by_obj_id = array();
 
-		while ($row = $ilDB->fetchAssoc( $res ))
-		{
-			if( !isset($this->test_ref_ids_by_obj_id[ $row['obj_id'] ]) )
-			{
-				$this->test_ref_ids_by_obj_id[ $row['obj_id'] ] = array();
+		while ($row = $ilDB->fetchAssoc($res)) {
+			if (!isset($this->test_ref_ids_by_obj_id[$row['obj_id']])) {
+				$this->test_ref_ids_by_obj_id[$row['obj_id']] = array();
 			}
 
 			$this->test_obj_id_by_ref_id[$row['ref_id']] = $row['obj_id'];
 			$this->test_ref_ids_by_obj_id[$row['obj_id']][] = $row['ref_id'];
 		}
 	}
-	
-	private function isTestDataLoaded()
-	{
+
+	private function isTestDataLoaded() {
 		return !is_null($this->test_obj_id_by_ref_id) && !is_null($this->test_ref_ids_by_obj_id);
 	}
 
@@ -368,17 +333,14 @@ private function isTestDataLoaded()
 	 * @param bool $fromDB
 	 * @return array
 	 */
-	public function getUniqueTests( $fromDB = false )
-	{
-		if ( $fromDB || !$this->isTestDataLoaded() )
-		{
+	public function getUniqueTests($fromDB = false) {
+		if ($fromDB || !$this->isTestDataLoaded()) {
 			$this->loadTestData();
 		}
 
 		return $this->test_ref_ids_by_obj_id;
 	}
 
-
 	/**
 	 *    Retrieve the list of tests.
 	 *
@@ -390,23 +352,19 @@ public function getUniqueTests( $fromDB = false )
 	 * @param bool $fromDB
 	 * @return array
 	 */
-	public function getTestReferences( $fromDB = false )
-	{
-		if ( $fromDB || !$this->isTestDataLoaded() )
-		{
+	public function getTestReferences($fromDB = false) {
+		if ($fromDB || !$this->isTestDataLoaded()) {
 			$this->loadTestData();
 		}
 
 		return $this->test_obj_id_by_ref_id;
 	}
-	
-	public function getTest($obj_id)
-	{
-		if( !isset($this->test_objects[$obj_id]) )
-		{
+
+	public function getTest($obj_id) {
+		if (!isset($this->test_objects[$obj_id])) {
 			$this->test_objects[$obj_id] = ilObjectFactory::getInstanceByObjId($obj_id);
 		}
-		
+
 		return $this->test_objects[$obj_id];
 	}
 
@@ -422,8 +380,7 @@ public function getTest($obj_id)
 	 * @param bool $fromDB
 	 * @return array
 	 */
-	public function getParticipantGroups( $fromDB = false )
-	{
+	public function getParticipantGroups($fromDB = false) {
 		if ($fromDB) {
 
 			global $ilDB;
@@ -436,18 +393,15 @@ public function getParticipantGroups( $fromDB = false )
 					JOIN object_data object
 						ON (object.obj_id = p2o.obj_id_grpcrs)
 				WHERE
-					p2o.obj_id_overview = %s",
-				array('integer'),
-				array($this->getId()));
+					p2o.obj_id_overview = %s", array('integer'), array($this->getId()));
 
 			/* Fetch objects into $this->tests. */
 			$this->groups = array();
-			while ($row = $ilDB->fetchAssoc( $res )) {
+			while ($row = $ilDB->fetchAssoc($res)) {
 
-				$object = ilObjectFactory::getInstanceByObjId( $row['obj_id'], false );
-				if( $object )
-				{
-					$this->groups[ $row['obj_id'] ] = $object;
+				$object = ilObjectFactory::getInstanceByObjId($row['obj_id'], false);
+				if ($object) {
+					$this->groups[$row['obj_id']] = $object;
 				}
 			}
 		}
@@ -455,4 +409,99 @@ public function getParticipantGroups( $fromDB = false )
 		return $this->groups;
 	}
 
+	/**
+	 *    Retrieve the list of exercises.
+	 *
+	 *    The getTests() method is used to retrieve
+	 *    the list of tests registered with the overview.
+	 *
+	 * @params    boolean    $fromDB        Wether to fetch from database.
+	 *
+	 * @param bool $fromDB
+	 * @return array
+	 */
+	public function getUniqueExercises($fromDB = false) {
+		if ($fromDB || !$this->isTestDataLoaded()) {
+			$this->loadExerciseData();
+		}
+
+		return $this->exercise_ref_ids_by_obj_id;
+	}
+
+	/**
+	 *  Load exercise data into array 
+	 * 
+	 * @global type $ilDB
+	 */
+	private function loadExerciseData() {
+		global $ilDB;
+
+		$res = $ilDB->queryF("
+			SELECT DISTINCT
+                            (obj_id), ref_id
+                        FROM
+                            rep_robj_xtov_e2o e2o
+                        JOIN object_reference ref 
+                            ON (ref.obj_id = e2o.obj_id_exercise)
+                        WHERE
+                            obj_id_overview = %s
+                            AND ref.deleted IS NULL", array('integer'), array($this->getId()));
+
+		/* Fetch objects into $this->tests. */
+
+		$this->exercise_ref_ids_by_obj_id = array();
+
+		while ($row = $ilDB->fetchAssoc($res)) {
+			if (!isset($this->exercise_ref_ids_by_obj_id [$row['obj_id']])) {
+				$this->exercise_ref_ids_by_obj_id [$row['obj_id']] = array();
+			}
+
+			//$this->test_obj_id_by_ref_id[$row['ref_id']] = $row['obj_id'];
+			$this->exercise_ref_ids_by_obj_id [$row['obj_id']][] = $row['ref_id'];
+		}
+	}
+
+	/*
+	 * Retrieve the ID from the parent object the TestOverview Object lies in
+	 */
+
+	public function getParentId($refID) {
+		global $ilDB;
+		$query = "SELECT 
+                        t1.parent, od.type
+                    FROM  
+                        tree t1
+                    JOIN
+                        object_reference ref ON ref.ref_id = t1.parent
+                    JOIN
+                        object_data od ON ref.obj_id = od.obj_id
+                    WHERE t1.child =  %s";
+		$result = $ilDB->queryF($query, array('integer'), array($refID));
+		$record = $ilDB->fetchObject($result);
+
+		if ($record->type == 'crs') {
+			return $record->parent;
+		}
+		if ($record->type == 'root') {
+			return null;
+		} else {
+			return $this->getParentId($record->parent);
+		}
+	}
+	
+	/**
+	 * Removes an entry in the rep_robj_xtov_e2o table
+	 * 
+	 * @global type $ilDB
+	 * @param type $exerciseID
+	 */
+	public function rmExercise($exerciseID) {
+		global $ilDB;
+
+		/* Remove e2o entry (exercise 2 overview) */
+		$ilDB->manipulateF("
+                    DELETE FROM rep_robj_xtov_e2o 
+                    WHERE obj_id_overview = %s AND obj_id_exercise = %s", array('integer', 'integer'), array($this->getId(), $exerciseID));
+	}
+
 }
diff --git a/classes/class.ilObjTestOverviewAccess.php b/classes/class.ilObjTestOverviewAccess.php
index 30cbc7f..67f7dba 100755
--- a/classes/class.ilObjTestOverviewAccess.php
+++ b/classes/class.ilObjTestOverviewAccess.php
@@ -1,17 +1,16 @@
 <?php
+
 /* Copyright (c) 1998-2012 ILIAS open source, Extended GPL, see docs/LICENSE */
 
 /**
- *	@package	TestOverview repository plugin
- *	@category	RBAC
- *	@author		Greg Saive <gsaive@databay.de>
+ * 	@package	TestOverview repository plugin
+ * 	@category	RBAC
+ * 	@author		Greg Saive <gsaive@databay.de>
  */
-
 require_once 'Services/Repository/classes/class.ilObjectPluginAccess.php';
 
-class ilObjTestOverviewAccess
-	extends ilObjectPluginAccess
-{
+class ilObjTestOverviewAccess extends ilObjectPluginAccess {
+
 	/**
 	 * @param string $a_cmd
 	 * @param string $a_permission
@@ -20,22 +19,22 @@ class ilObjTestOverviewAccess
 	 * @param string $a_user_id
 	 * @return bool
 	 */
-	public function _checkAccess($a_cmd, $a_permission, $a_ref_id, $a_obj_id, $a_user_id = '')
-	{
+	public function _checkAccess($a_cmd, $a_permission, $a_ref_id, $a_obj_id, $a_user_id = '') {
 		/**
- 		 * @var $ilUser ilObjUser
+		 * @var $ilUser ilObjUser
 		 */
 		global $ilUser;
 
-		if(!$a_user_id) {
+		if (!$a_user_id) {
 			$a_user_id = $ilUser->getId();
 		}
 
-		switch($a_permission) {
+		switch ($a_permission) {
 			case 'read':
 				return true;
 		}
 
 		return true;
 	}
+
 }
diff --git a/classes/class.ilObjTestOverviewGUI.php b/classes/class.ilObjTestOverviewGUI.php
index cf995d8..c350491 100755
--- a/classes/class.ilObjTestOverviewGUI.php
+++ b/classes/class.ilObjTestOverviewGUI.php
@@ -1,77 +1,74 @@
 <?php
-/* Copyright (c) 1998-2012 ILIAS open source, Extended GPL, see docs/LICENSE */
 
+/* Copyright (c) 1998-2012 ILIAS open source, Extended GPL, see docs/LICENSE */
 /**
- *	@package	TestOverview repository plugin
- *	@category	GUI
- *	@author		Greg Saive <gsaive@databay.de>
+ * 	@package	TestOverview repository plugin
+ * 	@category	GUI
+ * 	@author		Greg Saive <gsaive@databay.de>
+ *      @author         Jan Ruthardt <janruthardt@web.de>
  */
-
 require_once 'Services/Repository/classes/class.ilObjectPluginGUI.php';
 require_once 'Services/Form/classes/class.ilPropertyFormGUI.php';
 require_once 'Services/PersonalDesktop/interfaces/interface.ilDesktopItemHandling.php';
 
+require_once 'Services/Chart/classes/class.ilChartPie.php';
+require_once 'Services/Chart/classes/class.ilChartGrid.php';
+require_once 'Services/Chart/classes/class.ilChartLegend.php';
+require_once 'Services/Chart/classes/class.ilChartSpider.php';
+include_once 'Services/jQuery/classes/class.iljQueryUtil.php';
+
 /**
  * @ilCtrl_isCalledBy ilObjTestOverviewGUI: ilRepositoryGUI, ilAdministrationGUI, ilObjPluginDispatchGUI
  * @ilCtrl_Calls      ilObjTestOverviewGUI: ilPermissionGUI, ilInfoScreenGUI, ilObjectCopyGUI, ilRepositorySearchGUI, ilPublicUserProfileGUI, ilCommonActionDispatcherGUI
- * @ilCtrl_Calls      ilObjTestOverviewGUI: ilTestEvaluationGUI, ilMDEditorGUI
+ * @ilCtrl_Calls      ilObjTestOverviewGUI: ilTestEvaluationGUI, ilObjExerciseGUI, ilMDEditorGUI, ilTestOverviewExportGUI
  */
-class ilObjTestOverviewGUI
-	extends ilObjectPluginGUI
-	implements ilDesktopItemHandling
-{
+class ilObjTestOverviewGUI extends ilObjectPluginGUI implements ilDesktopItemHandling {
+
 	/**
-	 *	@var ilPropertyFormGUI
+	 * 
 	 */
-	protected $form;
+	public $exerciseDeleteChecks;
 
 	/**
-	 *	@return string
+	 * 	@return string
 	 */
-	public function getType()
-	{
+	public function getType() {
 		return 'xtov';
 	}
 
 	/**
-	 *	@return string
+	 * 	@return string
 	 */
-	public function getAfterCreationCmd()
-	{
+	public function getAfterCreationCmd() {
 		return 'showContent';
 	}
 
 	/**
-	 *	@return string
+	 * 	@return string
 	 */
-	public function getStandardCmd()
-	{
+	public function getStandardCmd() {
 		return 'showContent';
 	}
 
 	/**
-	 *	Plugin command execution runpoint.
+	 * 	Plugin command execution runpoint.
 	 *
-	 *	The performCommand() method is called internally
-	 *	by ilias to handle a specific request action.
-	 *	The $cmd given as argument is used to identify
-	 *	the command to be executed.
+	 * 	The performCommand() method is called internally
+	 * 	by ilias to handle a specific request action.
+	 * 	The $cmd given as argument is used to identify
+	 * 	the command to be executed.
 	 *
-	 *	@param string $cmd	The command (method) to execute.
+	 * 	@param string $cmd	The command (method) to execute.
 	 */
-	public function performCommand($cmd)
-	{
+	public function performCommand($cmd) {
 		/**
 		 * @var $ilTabs ilTabsGUI
 		 * @var $tpl    ilTemplate
 		 */
 		global $ilTabs, $tpl;
-
 		$tpl->setDescription($this->object->getDescription());
-
 		$next_class = $this->ctrl->getNextClass($this);
-		switch($next_class)
-		{
+		switch ($next_class) {
 			case 'ilmdeditorgui':
 				$this->checkPermission('write');
 				require_once 'Services/MetaData/classes/class.ilMDEditorGUI.php';
@@ -81,40 +78,78 @@ public function performCommand($cmd)
 				$this->ctrl->forwardCommand($md_gui);
 				return;
 				break;
-
 			case 'ilcommonactiondispatchergui':
 				require_once 'Services/Object/classes/class.ilCommonActionDispatcherGUI.php';
 				$gui = ilCommonActionDispatcherGUI::getInstanceFromAjaxCall();
 				$this->ctrl->forwardCommand($gui);
 				break;
-				
+			case 'iltestoverviewexportgui':
+				require_once 'Customizing/global/plugins/Services/Repository/RepositoryObject/TestOverview/classes/GUI/class.ilTestOverviewExportGUI.php';
+				$csvMapper = new ilTestOverviewExportGUI($this, $this->object->getId());
+				$ilTabs->setTabActive('export');
+				$this->ctrl->forwardCommand($csvMapper);
+				break;
 			default:
-				switch($cmd)
-				{
+				switch ($cmd) {
 					case 'updateSettings':
 					case 'updateMemberships':
 					case 'initSelectTests':
+					case 'initSelectExercise';
 					case 'selectTests':
 					case 'performAddTests':
+					case 'performAddExcercise':
 					case 'removeTests':
 					case 'addMemberships':
 					case 'removeMemberships':
+					case 'addMembershipsEx':
+					case 'removeMembershipsEx':
+					case 'exportRedirect':
+					case 'TestOverview':
+					case 'ExerciseOverview':
+					case 'excDiagramm':
 					case 'editSettings':
 						$this->checkPermission('write');
 						$this->$cmd();
 						break;
-		
 					case 'showContent':
 					case 'applyOverviewFilter':
 					case 'applyTestsFilter':
+					case 'uebersicht':
+					case 'subTabTO':
+					case 'testPieChart':
+					case 'subTabTO2':
+					case 'subTabEO':
+					case 'subTabEO1':
+					case 'subTabEO2':
+					case 'subTabEORanking':
+					case 'rights':
 					case 'applyGroupsFilter':
+					case 'applyGroupsFIlterEx':
 					case 'resetOverviewFilter':
 					case 'resetTestsFilter':
+					case 'applyGroupsFilterEx':
+					case 'resetGroupsFilterEx':
 					case 'resetGroupsFilter':
+					case 'resetGroupsFilterEx':
+					case 'applyExerciseFilter':
+					case 'resetExerciseFilter':
+					case 'applyExerciseFilterRanking':
+					case 'resetExerciseFilterRanking':
 					case 'addToDesk':
+					case 'removeExercises':
+					case 'triggerExport':
+					case 'allLocalTests':
+					case 'UserResults':
+					case 'updateStudentView':
+					case 'updateStudentViewEO':
+					case 'resetStudentView':
+					case 'resetStudentViewEO':
+					case 'showRanking':
+						$this->checkPermission('read');
+						$this->UserResults();
 					case 'removeFromDesk':
-						if(in_array($cmd, array('addToDesk', 'removeFromDesk')))
-						{
+
+						if (in_array($cmd, array('addToDesk', 'removeFromDesk'))) {
 							$cmd .= 'Object';
 						}
 						$this->checkPermission('read');
@@ -123,181 +158,570 @@ public function performCommand($cmd)
 				}
 				break;
 		}
-
 		$this->addHeaderAction();
 	}
 
 	/**
-	 *	Configure the plugin tabs
+	 * 	Configure the plugin tabs
 	 *
-	 *	The setTabs() is called automatically by ILIAS
-	 *	to render the given tabs to the GUI.
-	 *	This is overloaded to set & configure
-	 *	the plugin-specific tabs.
+	 * 	The setTabs() is called automatically by ILIAS
+	 * 	to render the given tabs to the GUI.
+	 * 	This is overloaded to set & configure
+	 * 	the plugin-specific tabs.
 	 */
-	protected function setTabs()
-	{
+	protected function setTabs() {
+
+
 		/**
 		 * @var $ilTabs   ilTabsGUI
 		 * @var $ilCtrl   ilCtrl
 		 * @var $ilAccess ilAccessHandler
 		 */
 		global $ilTabs, $ilCtrl, $ilAccess;
-
 		$this->addInfoTab();
 
-		/* Check for read access (showContent available) */
+		/* Check for write access (editSettings available) */
+		if ($ilAccess->checkAccess('write', '', $this->object->getRefId())) {
+			$ilTabs->addTab('properties', $this->txt('properties'), $ilCtrl->getLinkTarget($this, 'editSettings'));
+		}
+
+		/* Check for read access */
 		if ($ilAccess->checkAccess('read', '', $this->object->getRefId())) {
-			$ilTabs->addTab('content', $this->txt('content'), $ilCtrl->getLinkTarget($this, 'showContent'));
+			$ilTabs->addTab('UserResults', $this->txt('userResults'), $ilCtrl->getLinkTarget($this, 'UserResults'));
 		}
 
 		/* Check for write access (editSettings available) */
 		if ($ilAccess->checkAccess('write', '', $this->object->getRefId())) {
-			$ilTabs->addTab('properties', $this->txt('properties'), $ilCtrl->getLinkTarget($this, 'editSettings'));
+			$ilTabs->addTab('TestOverview', $this->txt('TestOverview'), $this->ctrl->getLinkTarget($this, 'TestOverview'));
+			$ilTabs->addTab('ExerciseOverview', $this->txt('ExerciseOverview'), $this->ctrl->getLinkTarget($this, 'subTabEO'));
 			$ilTabs->addTarget('meta_data', $this->ctrl->getLinkTargetByClass('ilmdeditorgui', ''), '', 'ilmdeditorgui');
 		}
+		// export
+		if ($ilAccess->checkAccess('write', '', $this->object->getRefId())) {
+			$ilTabs->addTarget('export', $this->ctrl->getLinkTargetByClass('iltestoverviewexportgui', 'export'), '', 'iltestoverviewexportgui');
+		}
 
 		$this->addPermissionTab();
 	}
 
 	/**
-	 *	Command for rendering a Test Overview.
+	 * 	Command for rendering a Test Overview.
 	 *
-	 *	This command displays a test overview entry
-	 *	and its data. This method is called by
-	 *	@see self::performCommand().
+	 * 	This command displays a test overview entry
+	 * 	and its data. This method is called by
+	 * 	@see self::performCommand().
 	 */
-	protected function showContent()
-	{
+	protected function showContent() {
 		/**
 		 * @var $tpl ilTemplate
 		 * @var $ilTabs ilTabsGUI
 		 */
-		global $tpl, $ilTabs;
-
+		global $tpl, $lng, $ilTabs, $ilToolbar, $ilCtrl;
+		$this->includePluginClasses(array(
+			"ilTestOverviewTableGUI",
+			"ilOverviewMapper"));
+		/* Darstellung der Tabs */
+		$this->subTabs("Test");
+		$ilTabs->activateSubTab('content');
+		$ilTabs->activateTab('TestOverview');
 		$this->includePluginClasses(array(
 			"ilTestOverviewTableGUI",
 			"ilOverviewMapper"));
-
-		$ilTabs->activateTab("content");
-
 		/* Configure content UI */
-		$table = new ilTestOverviewTableGUI( $this, 'showContent' );
-		$table->setMapper(new ilOverviewMapper)
-			  ->populate();
+		$ilMapper = new ilOverviewMapper;
+		$table = new ilTestOverviewTableGUI($this, 'showContent');
+		$table->setMapper($ilMapper)
+				->populate();
+		/* Populate template */
+		$tpl->setDescription($this->object->getDescription());
+		$data = array_slice($table->getData(), $table->getOffset(), $table->getLimit());
+		$tpl->setContent($table->getHTML());
+		$ilToolbar->addButton($this->txt('order_ranking'), $ilCtrl->getLinkTarget($this, 'showRanking'));
+		$ilToolbar->addButton($this->txt('update_rank'), $ilCtrl->getLinkTarget($this, 'updateStudentView'));
+		$ilToolbar->addButton($this->txt('delete_rank'), $ilCtrl->getLinkTarget($this, 'resetStudentView'));
+	}
+
+	/**
+	 * Command for rendering the TestOverview 
+	 * Table ordered by ranks.
+	 * 
+	 * @global type $tpl
+	 * @global type $lng
+	 * @global type $ilTabs
+	 * @global type $ilToolbar
+	 * @global type $ilCtrl
+	 */
+	protected function showRanking() {
+		/**
+		 * @var $tpl ilTemplate
+		 * @var $ilTabs ilTabsGUI
+		 */
+		global $tpl, $lng, $ilTabs, $ilToolbar, $ilCtrl;
+		$this->includePluginClasses(array(
+			"ilTestOverviewTableGUI",
+			"ilOverviewMapper"));
+		/* Display of the tabs */
+		$this->subTabs("Test");
+		$ilTabs->activateSubTab('content');
+		$ilTabs->activateTab('TestOverview');
+		$this->includePluginClasses(array(
+			"ilTestOverviewTableGUI",
+			"ilOverviewMapper"));
 
+		/* Get data to populate table */
+		$ilMapper = new ilOverviewMapper;
+		$table = new ilTestOverviewTableGUI($this, 'showRanking');
+		$table->setMapper($ilMapper)->populate(true);
 		/* Populate template */
 		$tpl->setDescription($this->object->getDescription());
-		$tpl->setContent( $table->getHTML() );
+		$data = array_slice($table->getData(), $table->getOffset(), $table->getLimit());
+		$tpl->setContent($table->getHTML());
+		$table->getData();
+		$ilToolbar->addButton($this->txt('orderName'), $ilCtrl->getLinkTarget($this, 'showContent'));
+		$ilToolbar->addButton($this->txt('update_rank'), $ilCtrl->getLinkTarget($this, 'updateStudentView'));
+		$ilToolbar->addButton($this->txt('delete_rank'), $ilCtrl->getLinkTarget($this, 'resetStudentView'));
+	}
+
+	/**
+	 * This method is called to update the ranking of the User Result Tab.
+	 * This method updates Test- and Exercise- Overview.  
+	 * 
+	 * @param type $view
+	 */
+	protected function updateStudentView() {
+		global $ilCtrl;
+		$this->includePluginClasses(array(
+			"ilTestOverviewTableGUI",
+			"ilOverviewMapper"));
+		$ilMapper = new ilOverviewMapper();
+		$table = new ilTestOverviewTableGUI($this, 'updateStudentView');
+		$table->setMapper($ilMapper);
+		$table->getStudentsRanked();
+		ilUtil::sendSuccess($this->txt('success_update'), true);
+		$ilCtrl->redirect($this, 'showContent');
 	}
 
 	/**
-	 *	Render the settings page.
+	 * Resets the TestOverview ranking. 
+	 * 
+	 * To reset the ExerciseOverview ranking use resetStudentViewEo() 
+	 * 
+	 * @global type $ilCtrl
+	 */
+	protected function resetStudentView() {
+		global $ilCtrl;
+		require_once ilPlugin::getPluginObject(IL_COMP_SERVICE, 'Repository', 'robj', 'TestOverview')
+						->getDirectory() . '/classes/mapper/class.ilOverviewMapper.php';
+		$ilMapper = new ilOverviewMapper();
+		$ilMapper->resetRanks($this->object->getId());
+		ilUtil::sendSuccess($this->txt('success_update'), true);
+
+		$ilCtrl->redirect($this, 'showContent');
+	}
+
+	/**
+	 * 	Render the settings page.
 	 *
-	 *	The renderSettings() method can be passed directly
-	 *	to $tpl->setContent() as it renders the whole
-	 *	settings page.
+	 * 	The renderSettings() method can be passed directly
+	 * 	to $tpl->setContent() as it renders the whole
+	 * 	settings page.
 	 *
-	 *	@return string
+	 * 	@return string
 	 */
-	protected function renderSettings()
-	{
-		return $this->form->getHTML()
-			 . "<hr />"
-			 . $this->getTestList()->getHTML()
-			 . "<hr />"
-			 . $this->getMembershipList()->getHTML();
+	protected function renderSettings() {
+
+		return $this->form->getHTML();
+
 	}
 
 	/**
-	 *	Command for editing the settings of a Test Overview.
+	 * 	Command for editing the settings of a Test Overview.
 	 *
-	 *	This command provides a HTML form to edit the settings
-	 *	of the currently loaded Test Overview.
+	 * 	This command provides a HTML form to edit the settings
+	 * 	of the currently loaded Test Overview.
 	 */
-	protected function editSettings()
-	{
+	protected function editSettings() {
 		/**
 		 * @var $tpl    ilTemplate
 		 * @var $ilTabs ilTabsGUI
 		 */
 		global $tpl, $ilTabs;
-
 		$ilTabs->activateTab('properties');
-
 		/* Initialize form and populate values */
 		$this->initSettingsForm();
 		$this->populateSettings();
+		/* Populate template */
+		$tpl->setContent($this->renderSettings());
+	}
+
+	/**
+	 * This method is called to render the User Results Tab.
+	 * 
+	 * @global type $tpl
+	 * @global type $tpl
+	 * @global type $ilTabs
+	 * @global type $ilDB
+	 * @global type $ilUser
+	 */
+	protected function UserResults() {
+		global $tpl;
+		require_once ilPlugin::getPluginObject(IL_COMP_SERVICE, 'Repository', 'robj', 'TestOverview')
+						->getDirectory() . '/classes/mapper/class.ilOverviewStudent.php';
+
+		global $tpl, $ilTabs, $ilDB, $ilUser;
+		$ilTabs->activateTab('UserResults');
+		$dataMapper = new studentMapper ();
+		$tpl->setContent($dataMapper->getResults($ilUser->getId(), $this->object->getId()));
+	}
 
+	/* TABS FOR TEST OVERVIEW */
+
+	protected function TestOverview() {
+		global $tpl, $ilTabs, $ilCtrl, $ilToolbar;
+		$this->showContent();
+	}
+
+	/**
+	 * This method is called to render the diagramm tab.
+	 * 
+	 * @global type $tpl
+	 * @global type $ilTabs
+	 * @global type $ilCtrl
+	 * @global type $lng
+	 * @global type $ilToolbar
+	 * @global type $ilDB
+	 */
+	protected function subTabTO() {
+		global $tpl, $ilTabs, $ilCtrl, $lng, $ilToolbar, $ilDB;
+
+		$this->subTabs("Test");
+		$ilTabs->activateTab('TestOverview');
+		$ilTabs->activateSubTab('subTabTO');
+
+		require_once 'Customizing/global/plugins/Services/Repository/RepositoryObject/TestOverview/classes/mapper/class.ilBinDiagrammMapper.php';
+		try {
+			$Obj = new BinDiagrammMapper($this, 'showContent');
+			$tpl->setContent($Obj->createAverageDia("BARS"));
+		} catch (Exception $ex) {
+			$tpl->setContent("Diagramm can not be Created");
+		}
+	}
+
+	/**
+	 * Renders the TestOverview Administration
+	 * 
+	 * @global type $tpl
+	 * @global type $ilTabs
+	 * @global type $ilCtrl
+	 * @global type $ilToolbar
+	 */
+	protected function subTabTO2() {
+
+		global $tpl, $ilTabs, $ilCtrl, $ilToolbar;
+
+		$this->subTabs("Test");
+		$ilTabs->activateTab('TestOverview');
+		$ilTabs->activateSubTab('subTabTO2');
+
+		$tpl->setContent($this->getTestList()->getHTML() . $this->getMembershipList()->getHTML());
+	}
+
+	/* TABS FOR EXERCISE OVERVIEW */
+
+	/**
+	 * Render the Exercise Diagramms
+	 */
+	protected function ExerciseOverview() {
+		global $tpl, $ilTabs, $ilCtrl, $ilToolbar;
+		$ilTabs->activateTab('ExerciseOverview');
+		$this->subTabs("Exercise");
+		$ilTabs->activateSubTab('subTabEO1');
+
+		require_once 'Services/Form/classes/class.ilTextInputGUI.php';
+		require_once ilPlugin::getPluginObject(IL_COMP_SERVICE, 'Repository', 'robj', 'TestOverview')
+						->getDirectory() . '/classes/mapper/class.ilBinDiagrammMapper.php';
+
+		$attachment2 = new ilTextInputGUI("SizeBucket", "sizeBucket");
+		$ilToolbar->setFormAction($ilCtrl->getLinkTarget($this, 'ExerciseOverview'), true);
+
+		$ilToolbar->addInputItem($attachment2);
+		$ilToolbar->addFormButton($this->txt("make_diagram"), "");
+
+		require_once ilPlugin::getPluginObject(IL_COMP_SERVICE, 'Repository', 'robj', 'TestOverview')
+						->getDirectory() . '/classes/mapper/class.ilExerciseMapper.php';
+		if ($_POST["sizeBucket"] != null && $_POST["sizeBucket"] != 0) {
+			$Obj = new exerciseCharts(30000, $this->object->getId(), $_POST["sizeBucket"]);
+			$tpl->setContent($Obj->getHTML());
+		} else {
+			$tpl->setContent($this->txt("max_diagram_value") . " &ne; 0");
+		}
+	}
+
+	/**
+	 * This methode is called to render the Exercise Overview Table.
+	 * 
+	 * @global type $tpl
+	 * @global type $ilTabs
+	 * @global type $ilCtrl
+	 * @global type $ilToolbar
+	 */
+	protected function subTabEO() {
+		global $tpl, $ilTabs, $ilCtrl, $ilToolbar;
+		$this->subTabs("Exercise");
+		$ilTabs->activateTab('ExerciseOverview');
+		$ilTabs->activateSubTab('subTabEO');
+		require_once ilPlugin::getPluginObject(IL_COMP_SERVICE, 'Repository', 'robj', 'TestOverview')
+						->getDirectory() . '/classes/GUI/class.ilMappedTableGUI.php';
+		require_once ilPlugin::getPluginObject(IL_COMP_SERVICE, 'Repository', 'robj', 'TestOverview')
+						->getDirectory() . '/classes/GUI/class.ilExerciseOverviewTableGUI.php';
+		require_once ilPlugin::getPluginObject(IL_COMP_SERVICE, 'Repository', 'robj', 'TestOverview')
+						->getDirectory() . '/classes/mapper/class.ilExerciseMapper.php';
+
+		$ilExerciseMapper = new ilExerciseMapper;
+		$table = new ilExerciseOverviewTableGUI($this, 'subTabEO');
+		$table->setMapper($ilExerciseMapper)->populateE(true);
 		/* Populate template */
-		$tpl->setContent( $this->renderSettings() );
+		$tpl->setDescription($this->object->getDescription());
+		$data = array_slice($table->getData(), $table->getOffset(), $table->getLimit());
+		$tpl->setContent($table->getHTML());
+		$ilToolbar->addButton($this->txt('order_ranking'), $ilCtrl->getLinkTarget($this, 'subTabEORanking'));
+		$ilToolbar->addButton($this->txt('update_rank'), $ilCtrl->getLinkTarget($this, 'updateStudentViewEO'));
+		$ilToolbar->addButton($this->txt('delete_rank'), $ilCtrl->getLinkTarget($this, 'resetStudentViewEO'));
 	}
 
 	/**
- 	 *	Command for saving the updated Test Overview settings.
+	 * This method redirects to the ExerciseOverview table
+	 * 
+	 * @global type $tpl
+	 * @global type $ilTabs
+	 * @global type $ilCtrl
+	 * @global type $ilToolbar
+	 */
+	protected function subTabEO1() {
+		global $tpl, $ilTabs, $ilCtrl, $ilToolbar;
+
+		$this->subTabs("Exercise");
+		$ilTabs->activateTab('ExerciseOverview');
+		$ilTabs->activateSubTab('subTabEO1');
+		$ilCtrl->redirect($this, 'ExerciseOverview');
+	}
+
+	/**
+	 * Renders the tab for Exercise Settings
+	 */
+	protected function subTabEO2() {
+		global $tpl, $ilTabs, $ilCtrl, $ilToolbar;
+
+		$this->subTabs("Exercise");
+		$ilTabs->activateTab('ExerciseOverview');
+		$ilTabs->activateSubTab('subTabEO2');
+
+		$tpl->setContent($this->getExerciseList()->getHtml() . $this->getMembershipListEx()->getHTML());
+	}
+
+	/**
+	 * Renders the Exercise Table ordered by the rank of the students
+	 * 
+	 * @global type $tpl
+	 * @global type $ilTabs
+	 * @global type $ilCtrl
+	 * @global type $ilToolbar
+	 */
+	protected function subTabEORanking() {
+		global $tpl, $ilTabs, $ilCtrl, $ilToolbar;
+		$this->subTabs("Exercise");
+		$ilTabs->activateTab('ExerciseOverview');
+		$ilTabs->activateSubTab('subTabEO');
+		//$tpl->setContent("ranking stuff");
+		require_once ilPlugin::getPluginObject(IL_COMP_SERVICE, 'Repository', 'robj', 'TestOverview')
+						->getDirectory() . '/classes/GUI/class.ilMappedTableGUI.php';
+		require_once ilPlugin::getPluginObject(IL_COMP_SERVICE, 'Repository', 'robj', 'TestOverview')
+						->getDirectory() . '/classes/GUI/class.ilExerciseOverviewTableGUI.php';
+		require_once ilPlugin::getPluginObject(IL_COMP_SERVICE, 'Repository', 'robj', 'TestOverview')
+						->getDirectory() . '/classes/mapper/class.ilExerciseMapper.php';
+
+		$ilExerciseMapper = new ilExerciseMapper;
+		$table = new ilExerciseOverviewTableGUI($this, 'subTabEO');
+		$table->setMapper($ilExerciseMapper)->populateE(false);
+		/* Populate template */
+		$tpl->setDescription($this->object->getDescription());
+		$data = array_slice($table->getData(), $table->getOffset(), $table->getLimit());
+		$tpl->setContent($table->getHTML());
+		$ilToolbar->addButton($this->txt('orderName'), $ilCtrl->getLinkTarget($this, 'subTabEO'));
+		$ilToolbar->addButton($this->txt('update_rank'), $ilCtrl->getLinkTarget($this, 'updateStudentViewEO'));
+		$ilToolbar->addButton($this->txt('delete_rank'), $ilCtrl->getLinkTarget($this, 'resetStudentViewEO'));
+	}
+
+	/**
+	 * Update UserResults. This method retrieve data from the table and saves it in the database.
+	 * 
+	 * @global type $ilCtrl
+	 */
+	protected function updateStudentViewEO() {
+		global $ilCtrl;
+		require_once ilPlugin::getPluginObject(IL_COMP_SERVICE, 'Repository', 'robj', 'TestOverview')
+						->getDirectory() . '/classes/GUI/class.ilMappedTableGUI.php';
+		require_once ilPlugin::getPluginObject(IL_COMP_SERVICE, 'Repository', 'robj', 'TestOverview')
+						->getDirectory() . '/classes/GUI/class.ilExerciseOverviewTableGUI.php';
+		require_once ilPlugin::getPluginObject(IL_COMP_SERVICE, 'Repository', 'robj', 'TestOverview')
+						->getDirectory() . '/classes/mapper/class.ilExerciseMapper.php';
+		$ilExerciseMapper = new ilExerciseMapper;
+		$table = new ilExerciseOverviewTableGUI($this, 'updateStudentViewEO');
+		$table->setMapper($ilExerciseMapper);
+		$table->getStudentsRanked();
+		ilUtil::sendSuccess($this->txt('success_update'), true);
+		$ilCtrl->redirect($this, 'subTabEO');
+	}
+
+	/**
+	 * Resets the ranking for exercises. 
+	 * 
+	 * To reset ranking for Tests use resetStudentView()
+	 * 
+	 * @global type $ilCtrl
+	 */
+	protected function resetStudentViewEO() {
+		global $ilCtrl;
+		require_once ilPlugin::getPluginObject(IL_COMP_SERVICE, 'Repository', 'robj', 'TestOverview')
+						->getDirectory() . '/classes/mapper/class.ilExerciseMapper.php';
+		$ilMapper = new ilExerciseMapper;
+		$ilMapper->resetRanks($this->object->getId());
+		ilUtil::sendSuccess($this->txt('success_update'), true);
+		$ilCtrl->redirect($this, 'subTabEO');
+	}
+
+	/**
+	 * Adds subtabs.
+	 * 
+	 * @global type $ilTabs
+	 * @global type $ilCtrl
+	 * @param type $type
+	 */
+	protected function subTabs($type) {
+		global $ilTabs, $ilCtrl;
+		switch ($type) {
+			case 'Exercise':
+				$ilTabs->addSubTab('subTabEO', $this->txt("exercise_overview"), $ilCtrl->getLinkTarget($this, 'subTabEO'));
+				$ilTabs->addSubTab('subTabEO1', $this->txt("diagram"), $ilCtrl->getLinkTarget($this, 'subTabEO1'));
+				$ilTabs->addSubTab('subTabEO2', $this->txt("exercise_administration"), $ilCtrl->getLinkTarget($this, 'subTabEO2'));
+				break;
+
+			case 'Test':
+				$ilTabs->addSubTab('content', $this->txt("test_overview"), $this->ctrl->getLinkTarget($this, 'showContent'));
+				$ilTabs->addSubTab('subTabTO', $this->txt("diagram"), $this->ctrl->getLinkTarget($this, 'subTabTO'));
+				$ilTabs->addSubTab('subTabTO2', $this->txt("test_administration"), $this->ctrl->getLinkTarget($this, 'subTabTO2'));
+				break;
+		}
+	}
+
+	/**
+	 * 	Command for saving the updated Test Overview settings.
 	 *
-	 *	This command saves the HTML form input into the Test Overview
-	 *	currently selected.
+	 * 	This command saves the HTML form input into the Test Overview
+	 * 	currently selected.
 	 */
-	protected function updateSettings()
-	{
+	protected function updateSettings() {
 		/**
 		 * @var $tpl    ilTemplate
 		 * @var $lng    ilLanguage
 		 * @var $ilCtrl ilCtrl
 		 */
 		global $tpl, $lng, $ilCtrl;
-
 		$this->initSettingsForm();
-
-		if ($this->form->checkInput())
-		{
+		if ($this->form->checkInput()) {
 			/* Form is sent and input validated,
-			   now save settings. */
+			  now save settings. */
 			$this->object->setTitle($this->form->getInput('title'));
 			$this->object->setDescription($this->form->getInput('desc'));
-
 			$this->object->update();
 			ilUtil::sendSuccess($lng->txt('msg_obj_modified'), true);
-
 			/* Back to editSettings */
 			$ilCtrl->redirect($this, 'editSettings');
 		}
-
 		/* Form is sent but there is an input error.
-		   Fill back the form and render again. */
+		  Fill back the form and render again. */
 		$this->form->setValuesByPost();
+		$tpl->setContent($this->renderSettings());
+	}
+
+	/**
+	 * Initializeses the XML for Exercise Selection 
+	 * Writes the information in a Session Parameter
+	 */
+	public function initSelectExercise() {
 
-		$tpl->setContent( $this->renderSettings() );
+		global $tree;
+		// empty session on init
+		$_SESSION['select_exercise'] = array();
+		// copy opend nodes from repository explorer
+		$_SESSION['select_exercise'] = is_array($_SESSION['repexpand']) ? $_SESSION['repexpand'] : array();
+		// open current position
+		$path = $tree->getPathId((int) $_GET['ref_id']);
+
+		foreach ((array) $path as $node_id) {
+			if (!in_array($node_id, $_SESSION['select_exercise'])) {
+				$_SESSION['select_exercise'][] = $node_id;
+			}
+		}
+		$this->selectExercises(); //(int)$_GET['select_exercise']);
+		return;
+	}
+
+	/**
+	 * Creates the exercise select GUI with the nodes representing all course-objects, folders, groups and exercises 
+	 *
+	 */
+	public function selectExercises() {
+
+		global $tpl, $lng, $ilCtrl, $ilTabs, $ilToolbar;
+		$ilTabs->activateTab('ExerciseOverview');
+		$ilToolbar->addButton($this->lng->txt('cancel'), $ilCtrl->getLinkTarget($this, 'subTabEO2'));
+		$tpl->addBlockfile('ADM_CONTENT', 'adm_content', 'tpl.paste_into_multiple_objects.html', 'Services/Object');
+		require_once ilPlugin::getPluginObject(IL_COMP_SERVICE, 'Repository', 'robj', 'TestOverview')
+						->getDirectory() . '/classes/class.ilTestOverviewExerciseSelectionExplorer.php';
+		$exp = new ilTestOverviewExerciseSelectionExplorer('select_exercise');
+		$exp->setExpandTarget($ilCtrl->getLinkTarget($this, 'initSelectExercise'));
+		$exp->setTargetGet('ref_id');
+		$exp->setPostVar('nodes[]');
+		$exp->highlightNode((int) $_GET['ref_id']);
+		$exp->setCheckedItems(
+				is_array($_POST['nodes']) ? (array) $_POST['nodes'] : array()
+		);
+		$tpl->setVariable('FORM_TARGET', '_top');
+		$tpl->setVariable('FORM_ACTION', $ilCtrl->getFormAction($this, 'performAddExercise'));
+		$exp->setExpand(
+				isset($_GET['select_exercise']) && (int) $_GET['select_exercise'] ?
+						(int) $_GET['select_exercise'] :
+						$this->tree->readRootId()
+		);
+
+		$exp->setDefaultHiddenObjects($this->object->getUniqueExercises(true));
+		$exp->setOutput(0);
+		$tpl->setVariable('OBJECT_TREE', $exp->getOutput());
+		$tpl->setVariable('CMD_SUBMIT', 'performAddExcercise');
+		$tpl->setVariable('TXT_SUBMIT', $lng->txt('select'));
 	}
 
-	public function initSelectTests()
-	{
+	public function initSelectTests() {
 		/**
 		 * @var $tree ilTree
 		 */
 		global $tree;
-
 		// empty session on init
 		$_SESSION['select_tovr_expanded'] = array();
-
-		// copy opend nodes from repository explorer		
+		// copy opend nodes from repository explorer
 		$_SESSION['select_tovr_expanded'] = is_array($_SESSION['repexpand']) ? $_SESSION['repexpand'] : array();
-
 		// open current position
-		$path = $tree->getPathId((int)$_GET['ref_id']);
-		foreach((array)$path as $node_id)
-		{
-			if(!in_array($node_id, $_SESSION['select_tovr_expanded']))
+		$path = $tree->getPathId((int) $_GET['ref_id']);
+		foreach ((array) $path as $node_id) {
+			if (!in_array($node_id, $_SESSION['select_tovr_expanded']))
 				$_SESSION['select_tovr_expanded'][] = $node_id;
 		}
-
 		$this->selectTests();
 		return;
 	}
 
-	public function selectTests()
-	{
+	public function selectTests() {
 		/**
 		 * @var $tpl    ilTemplate
 		 * @var $lng    ilLanguage
@@ -306,498 +730,683 @@ public function selectTests()
 		 * @var $ilToolbar ilToolbarGUI
 		 */
 		global $tpl, $lng, $ilCtrl, $ilTabs, $ilToolbar;
-
-		$ilTabs->activateTab('properties');
-		$ilToolbar->addButton($this->lng->txt('cancel'), $ilCtrl->getLinkTarget($this,'editSettings'));
+		$ilTabs->activateTab('TestOverview');
+		$ilToolbar->addButton($this->lng->txt('cancel'), $ilCtrl->getLinkTarget($this, 'subTabTO2'));
 		$tpl->addBlockfile('ADM_CONTENT', 'adm_content', 'tpl.paste_into_multiple_objects.html', 'Services/Object');
-
 		$this->includePluginClasses(array('ilTestOverviewTestSelectionExplorer'));
 		$exp = new ilTestOverviewTestSelectionExplorer('select_tovr_expanded');
 		$exp->setExpandTarget($ilCtrl->getLinkTarget($this, 'selectTests'));
 		$exp->setTargetGet('ref_id');
 		$exp->setPostVar('nodes[]');
-		$exp->highlightNode((int)$_GET['ref_id']);
+		$exp->highlightNode((int) $_GET['ref_id']);
 		$exp->setCheckedItems(
-			is_array($_POST['nodes']) ?  (array)$_POST['nodes'] : array()
+				is_array($_POST['nodes']) ? (array) $_POST['nodes'] : array()
 		);
-
 		$tpl->setVariable('FORM_TARGET', '_top');
 		$tpl->setVariable('FORM_ACTION', $ilCtrl->getFormAction($this, 'performAddTests'));
-
 		$exp->setExpand(
-			isset($_GET['select_tovr_expanded']) && (int)$_GET['select_tovr_expanded'] ?
-			(int) $_GET['select_tovr_expanded'] :
-			$this->tree->readRootId()
+				isset($_GET['select_tovr_expanded']) && (int) $_GET['select_tovr_expanded'] ?
+						(int) $_GET['select_tovr_expanded'] :
+						$this->tree->readRootId()
 		);
 		$exp->setDefaultHiddenObjects($this->object->getUniqueTests(true));
 		$exp->setOutput(0);
-
 		$tpl->setVariable('OBJECT_TREE', $exp->getOutput());
 		$tpl->setVariable('CMD_SUBMIT', 'performAddTests');
 		$tpl->setVariable('TXT_SUBMIT', $lng->txt('select'));
 	}
+	/**
+	 *
+	 * Add the chosen exercises into the table rep_robj_xtov_e2o
+	 *  
+	 * @global type $tpl
+	 * @global type $lng
+	 * @global type $ilCtrl
+	 * @global type $ilAccess
+	 *
+	 */
+	public function performAddExcercise() {
+
+		global $tpl, $lng, $ilCtrl, $ilAccess;
+
+		include_once ilPlugin::getPluginObject(IL_COMP_SERVICE, 'Repository', 'robj', 'TestOverview')
+						->getDirectory() . "/classes/mapper/class.ilExerciseImport.php";
+		$mapper = new ExerciseImport ();
+		$overviewId = $this->object->getId();
+
+		if (!isset($_POST['nodes']) || !is_array($_POST['nodes']) || !$_POST['nodes']) {
+			ilUtil::sendFailure($lng->txt('select_one'));
+			$this->selectExercises();
+			return;
+		}
+		$num_nodes = 0;
+		if ($_POST['nodes'] != null) {
+			foreach ($_POST['nodes'] as $ref_id) {
+				$mapper->createEntry($overviewId, $ref_id);
+				++$num_nodes;
+			}
+		}
+		if (!$num_nodes) {
+			ilUtil::sendFailure($lng->txt('select_one'));
+			$this->selectExercises();
+			return;
+		}
+		ilUtil::sendSuccess($this->txt('exercises_updated_success'), true);
+		$ilCtrl->redirect($this, 'subTabEO2');
+	}
 	
-	public function performAddTests()
-	{
+	/**
+	 * 
+	 * Add the chosen tests into the table rep_robj_xtov_t2o
+	 * 
+	 * @global type $lng
+	 * @global type $ilCtrl
+	 * @global type $ilAccess
+	 * 
+	 */
+	public function performAddTests() {
 		/**
 		 * @var $lng      ilLanguage
 		 * @var $ilCtrl   ilCtrl
 		 * @var $ilAccess ilAccessHandler
 		 */
 		global $lng, $ilCtrl, $ilAccess;
-		
-		if(!isset($_POST['nodes']) || !is_array($_POST['nodes']) || !$_POST['nodes'])
-		{
+
+		if (!isset($_POST['nodes']) || !is_array($_POST['nodes']) || !$_POST['nodes']) {
 			ilUtil::sendFailure($lng->txt('select_one'));
 			$this->selectTests();
 			return;
 		}
-
 		$num_nodes = 0;
-		foreach($_POST['nodes'] as $ref_id)
-		{
-			if($ilAccess->checkAccess('tst_statistics', '', $ref_id) || $ilAccess->checkAccess('write', '', $ref_id))
-			{
+		foreach ($_POST['nodes'] as $ref_id) {
+			if ($ilAccess->checkAccess('tst_statistics', '', $ref_id) || $ilAccess->checkAccess('write', '', $ref_id)) {
 				$this->object->addTest($ref_id);
 				++$num_nodes;
 			}
 		}
-
-		if(!$num_nodes)
-		{
+		if (!$num_nodes) {
 			ilUtil::sendFailure($lng->txt('select_one'));
 			$this->selectTests();
 			return;
 		}
-
 		ilUtil::sendSuccess($this->txt('tests_updated_success'), true);
-		$ilCtrl->redirect($this, 'editSettings');
-		
-		$this->editSettings();
-		return;
-	}
 
-	public function removeTests()
-	{
+		$ilCtrl->redirect($this, 'subTabTO2');
+	}
+	
+	/**
+	 * 
+	 * Removes the chosen test-entries in the rep_robj_xtov_t2o table 
+	 * 
+	 * @global type $tpl
+	 * @global type $lng
+	 * @global type $ilCtrl
+	 */
+	public function removeTests() {
 		/**
 		 * @var $tpl    ilTemplate
 		 * @var $lng    ilLanguage
 		 * @var $ilCtrl ilCtrl
 		 */
 		global $tpl, $lng, $ilCtrl;
-
 		$this->initSettingsForm();
 		$this->populateSettings();
-
-		if (isset($_POST['test_ids']))
-		{
-			foreach ($_POST['test_ids'] as $testId)
-			{
+		if (isset($_POST['test_ids'])) {
+			foreach ($_POST['test_ids'] as $testId) {
 				$this->object->rmTest($testId);
 			}
-
 			ilUtil::sendSuccess($lng->txt('rep_robj_xtov_tests_updated_success'), true);
-			$ilCtrl->redirect($this, 'editSettings');
+			$ilCtrl->redirect($this, 'subTabTO2');
 		}
-
 		ilUtil::sendFailure($lng->txt('rep_robj_xtov_min_one_check_test'), true);
-		$tpl->setContent($this->renderSettings());
+		//$tpl->setContent($this->renderSettings());
+		$ilCtrl->redirect($this, 'subTabTO2');
+	}
+	
+	/**
+	 * 
+	 * Removes the chosen exercise-entries in the rep_robj_xtov_e2o table 
+	 * 
+	 * @global type $tpl
+	 * @global type $lng
+	 * @global type $ilCtrl
+	 */
+	public function removeExercises() {
+		/**
+		 * @var $tpl    ilTemplate
+		 * @var $lng    ilLanguage
+		 * @var $ilCtrl ilCtrl
+		 */
+		global $tpl, $lng, $ilCtrl;
+		if (isset($_POST['exercise_ids'])) {
+			foreach ($_POST['exercise_ids'] as $exerciseID) {
+				$this->object->rmExercise($exerciseID);
+			}
+			ilUtil::sendSuccess($lng->txt('rep_robj_xtov_tests_updated_success'), true);
+			$ilCtrl->redirect($this, 'subTabEO2');
+		}
+		ilUtil::sendFailure($lng->txt('rep_robj_xtov_min_one_check_exercise'), true);
+		//$tpl->setContent($this->renderSettings());
+		$ilCtrl->redirect($this, 'subTabEO2');
 	}
 
 	/**
-	 *	Command for updating the participants groups added to the overview.
+	 * 	Command for updating the participants groups added to the overview.
 	 *
-	 *	This command is executed when the ilMembershipListTableGUI
-	 *	is submitted.
+	 * 	This command is executed when the ilMembershipListTableGUI
+	 * 	is submitted.
 	 */
-	protected function updateMemberships()
-	{
+	protected function updateMemberships() {
 		/**
 		 * @var $tpl    ilTemplate
 		 * @var $lng    ilLanguage
 		 * @var $ilCtrl ilCtrl
 		 */
 		global $tpl, $lng, $ilCtrl;
-
 		$this->initSettingsForm();
 		$this->populateSettings();
-
 		/* Get tests from DB to be able to notice deletions
-		   and additions. */
+		  and additions. */
 		$overviewGroups = $this->object->getParticipantGroups(true);
-
-		if (isset($_POST['membership_ids'])
-			|| ! empty($overviewGroups)) {
-
-			if (! isset($_POST['membership_ids']))
+		if (isset($_POST['membership_ids']) || !empty($overviewGroups)) {
+			if (!isset($_POST['membership_ids']))
 				$_POST['membership_ids'] = array();
-
 			/* Executing the registered test retrieval again with the same filters
-			   allows to determine which tests are really removed. */
+			  allows to determine which tests are really removed. */
 			include_once ilPlugin::getPluginObject(IL_COMP_SERVICE, 'Repository', 'robj', 'TestOverview')
-						->getDirectory() . "/classes/mapper/class.ilMembershipMapper.php";
+							->getDirectory() . "/classes/mapper/class.ilMembershipMapper.php";
 			$mapper = new ilMembershipMapper;
-			$displayedIds    = array();
+			$displayedIds = array();
 			$displayedGroups = $mapper->getList(array(), $this->getMembershipList()->filter);
 			foreach ($displayedGroups['items'] as $grp) {
 				$displayedIds[] = $grp->obj_id;
 			}
 			$displayedIds = array_intersect($displayedIds, array_keys($overviewGroups));
-
 			/* Check for deleted/added IDs and execute corresponding routine. */
 			$deletedIds = array_diff($displayedIds, $_POST['membership_ids']);
-			$addedIds   = array_diff($_POST['membership_ids'], array_keys($overviewGroups));
-
+			$addedIds = array_diff($_POST['membership_ids'], array_keys($overviewGroups));
 			foreach ($deletedIds as $groupId) {
 				$this->object
-					 ->rmGroup( $groupId );
+						->rmGroup($groupId);
 			}
-
 			foreach ($addedIds as $groupId) {
 				$this->object
-					 ->addGroup( $groupId );
+						->addGroup($groupId);
 			}
-
 			ilUtil::sendSuccess($lng->txt('rep_robj_xtov_memberships_updated_success'), true);
-			$ilCtrl->redirect($this, 'editSettings');
+			/* redirect umgeleitet für neues to */
+			$ilCtrl->redirect($this, 'subTabTO2');
 		}
-
 		ilUtil::sendFailure($lng->txt('rep_robj_xtov_min_one_check_membership'), true);
-		$tpl->setContent( $this->renderSettings() );
-
+		$ilCtrl->redirect($this, 'subTabTO2');
 	}
-
-	public function addMemberships()
-	{
+	/**
+	 * Adds the chosen group_id's into the rep_robj_xtov_p2o
+	 * 
+	 * @global type $tpl
+	 * @global type $lng
+	 * @global type $ilCtrl
+	 */
+	public function addMemberships() {
 		/**
 		 * @var $tpl    ilTemplate
 		 * @var $lng    ilLanguage
 		 * @var $ilCtrl ilCtrl
 		 */
 		global $tpl, $lng, $ilCtrl;
-
 		$this->initSettingsForm();
 		$this->populateSettings();
-
 		if (isset($_POST['membership_ids'])) {
 			/* Executing the registered test retrieval again with the same filters
-			   allows to determine which tests are really removed. */
+			  allows to determine which tests are really removed. */
 			include_once ilPlugin::getPluginObject(IL_COMP_SERVICE, 'Repository', 'robj', 'TestOverview')
-				->getDirectory() . "/classes/mapper/class.ilMembershipMapper.php";
-
+							->getDirectory() . "/classes/mapper/class.ilMembershipMapper.php";
 			foreach ($_POST['membership_ids'] as $groupId) {
 				$this->object
-					->addGroup( $groupId );
+						->addGroup($groupId);
 			}
-
 			ilUtil::sendSuccess($lng->txt('rep_robj_xtov_memberships_updated_success'), true);
-			$ilCtrl->redirect($this, 'editSettings');
+			$ilCtrl->redirect($this, 'subTabTO2');
 		}
-
 		ilUtil::sendFailure($lng->txt('rep_robj_xtov_min_one_check_membership'), true);
-		$tpl->setContent( $this->renderSettings() );
+		$ilCtrl->redirect($this, 'subTabTO2');
 	}
-
-	public function removeMemberships()
-	{
+	
+	/**
+	 * Removes the chosen group_id's from rep_robj_xtov_p2o
+	 * 
+	 * @global type $tpl
+	 * @global type $lng
+	 * @global type $ilCtrl
+	 */
+	public function removeMemberships() {
 		/**
 		 * @var $tpl    ilTemplate
 		 * @var $lng    ilLanguage
 		 * @var $ilCtrl ilCtrl
 		 */
 		global $tpl, $lng, $ilCtrl;
-
 		$this->initSettingsForm();
 		$this->populateSettings();
-
-		if (isset($_POST['membership_ids']))
-		{
+		if (isset($_POST['membership_ids'])) {
 			/* Executing the registered test retrieval again with the same filters
-			   allows to determine which tests are really removed. */
+			  allows to determine which tests are really removed. */
 			include_once ilPlugin::getPluginObject(IL_COMP_SERVICE, 'Repository', 'robj', 'TestOverview')
-				->getDirectory() . "/classes/mapper/class.ilMembershipMapper.php";
-
-			foreach ($_POST['membership_ids'] as $containerId)
-			{
+							->getDirectory() . "/classes/mapper/class.ilMembershipMapper.php";
+			foreach ($_POST['membership_ids'] as $containerId) {
 				$this->object->rmGroup($containerId);
 			}
-
 			ilUtil::sendSuccess($lng->txt('rep_robj_xtov_memberships_updated_success'), true);
-			$ilCtrl->redirect($this, 'editSettings');
+			$ilCtrl->redirect($this, 'subTabTO2');
 		}
-		
+
 		ilUtil::sendFailure($lng->txt('rep_robj_xtov_min_one_check_membership'));
-		$tpl->setContent( $this->renderSettings() );
+		//$tpl->setContent( $this->renderSettings() );
+		$ilCtrl->redirect($this, 'subTabTO2');
 	}
 
 	/**
-	 *	Retrieve the plugin's creations forms.
+	 * 	Retrieve the plugin's creations forms.
 	 *
-	 *	This method is called internally by ilias
-	 *	to retrieve the creation-, cloning- [and
-	 *	optionally the import-] forms.
+	 * 	This method is called internally by ilias
+	 * 	to retrieve the creation-, cloning- [and
+	 * 	optionally the import-] forms.
 	 *
-	 *	@param	string	$a_new_type	Key name of the plugin
-	 *	@return	array
+	 * 	@param	string	$a_new_type	Key name of the plugin
+	 * 	@return	array
 	 */
-	protected function initCreationForms($a_new_type)
-	{
+	protected function initCreationForms($a_new_type) {
 		$forms = array(
-			self::CFORM_NEW   => $this->initCreateForm($a_new_type),
+			self::CFORM_NEW => $this->initCreateForm($a_new_type),
 			self::CFORM_CLONE => $this->fillCloneTemplate(null, $a_new_type)
 		);
-
 		return $forms;
 	}
 
 	/**
-	 *	Retrieve the creation form.
+	 * 	Retrieve the creation form.
 	 *
-	 *	This method is only overloaded to provide the
-	 *	extension possibility.
+	 * 	This method is only overloaded to provide the
+	 * 	extension possibility.
 	 *
-	 *	@param	string	$a_new_type	Key name of the plugin
-	 *	@return ilFormGUI
+	 * 	@param	string	$a_new_type	Key name of the plugin
+	 * 	@return ilFormGUI
 	 */
-	public function  initCreateForm($a_new_type)
-	{
+	public function initCreateForm($a_new_type) {
 		$form = parent::initCreateForm($a_new_type);
-
 		return $form;
 	}
 
 	/**
-	 *	Configure the displayed form for Settings edition.
+	 * 	Configure the displayed form for Settings edition.
 	 *
-	 *	This method is called internally by @see
+	 * 	This method is called internally by @see
 	 */
-	protected function initSettingsForm()
-	{
+	protected function initSettingsForm() {
 		/**
 		 * @var $ilCtrl ilCtrl
 		 */
 		global $ilCtrl;
-
 		/* Configure global form attributes */
 		$this->form = new ilPropertyFormGUI();
 		$this->form->setTitle($this->txt('edit_properties'));
 		$this->form->setFormAction($ilCtrl->getFormAction($this, 'updateSettings'));
-
 		/* Configure form objects */
 		$ti = new ilTextInputGUI($this->txt('title'), 'title');
 		$ti->setRequired(true);
-
 		$ta = new ilTextAreaInputGUI($this->txt('description'), 'desc');
-
-		$this->form->addItem( $ti );
-		$this->form->addItem( $ta );
+		$this->form->addItem($ti);
+		$this->form->addItem($ta);
 		$this->form->addCommandButton('updateSettings', $this->txt('save'));
 	}
 
 	/**
-	 *	Populate the Test Overview settings.
+	 * 	Populate the Test Overview settings.
 	 *
-	 *	This method is called internally by
-	 *	@see self::editSettings() to fill the form
-	 *	by the current settings' values.
+	 * 	This method is called internally by
+	 * 	@see self::editSettings() to fill the form
+	 * 	by the current settings' values.
 	 */
-	protected function populateSettings()
-	{
+	protected function populateSettings() {
 		$values['title'] = $this->object->getTitle();
-		$values['desc']  = $this->object->getDescription();
+		$values['desc'] = $this->object->getDescription();
 		$this->form->setValuesByArray($values);
 	}
 
 	/**
-	 *	Apply a filter to the overview table.
+	 * 	Apply a filter to the overview table.
 	 *
-	 *	The applyOverviewFilter() method is used as a command
-	 *	to apply (re-populate) and save the filters.
+	 * 	The applyOverviewFilter() method is used as a command
+	 * 	to apply (re-populate) and save the filters.
 	 */
-	public function applyOverviewFilter()
-	{
+	public function applyOverviewFilter() {
 		$this->includePluginClasses(array(
 			"ilTestOverviewTableGUI"));
-
-		$table = new ilTestOverviewTableGUI( $this, 'showContent' );
+		$table = new ilTestOverviewTableGUI($this, 'showContent');
 		$table->resetOffset();
 		$table->writeFilterToSession();
-
 		$this->showContent();
 	}
 
 	/**
-	 *	Apply a filter to the tests list table.
+	 * 	Apply a filter to the tests list table.
 	 *
-	 *	The applyTestsFilter() method is used as a command
-	 *	to apply (re-populate) and save the filters.
+	 * 	The applyTestsFilter() method is used as a command
+	 * 	to apply (re-populate) and save the filters.
 	 */
-	public function applyTestsFilter()
-	{
+	public function applyTestsFilter() {
 		$this->includePluginClasses(array(
 			"ilTestListTableGUI"));
-
-		$table = new ilTestListTableGUI( $this, 'editSettings' );
+		$table = new ilTestListTableGUI($this, 'subTabTO2');
 		$table->resetOffset();
 		$table->writeFilterToSession();
-
-		$this->editSettings();
+		$this->subTabTO2();
 	}
 
 	/**
-	 *	Apply a filter to the groups list table.
+	 * 	Apply a filter to the groups list table.
 	 *
-	 *	The applyGroupFilter() method is used as a command
-	 *	to apply (re-populate) and save the filters.
+	 * 	The applyGroupFilter() method is used as a command
+	 * 	to apply (re-populate) and save the filters.
 	 */
-	public function applyGroupsFilter()
-	{
+	public function applyGroupsFilter() {
 		$this->includePluginClasses(array(
 			"ilMembershipListTableGUI"));
-
-		$table = new ilMembershipListTableGUI( $this, 'editSettings' );
+		$table = new ilMembershipListTableGUI($this, 'subTabTO2');
 		$table->resetOffset();
 		$table->writeFilterToSession();
-
-		$this->editSettings();
+		$this->subTabTO2();
 	}
 
 	/**
-	 *	Reset the overview filters
+	 * 	Reset the overview filters
 	 *
-	 *	This method is used as a command (form submit handler)
-	 *	to reset the filters set on the overview table.
+	 * 	This method is used as a command (form submit handler)
+	 * 	to reset the filters set on the overview table.
 	 */
-	public function resetOverviewFilter()
-	{
+	public function resetOverviewFilter() {
 		$this->includePluginClasses(array(
 			"ilTestOverviewTableGUI"));
-
-		$table = new ilTestOverviewTableGUI( $this, 'editSettings' );
+		$table = new ilTestOverviewTableGUI($this, 'editSettings');
 		$table->resetOffset();
 		$table->resetFilter();
-
 		$this->showContent();
 	}
 
 	/**
-	 *	Reset the tests list filters
+	 * 	Reset the tests list filters
 	 *
-	 *	This method is used as a command (form submit handler)
-	 *	to reset the filters set on the tests list table.
+	 * 	This method is used as a command (form submit handler)
+	 * 	to reset the filters set on the tests list table.
 	 */
-	public function resetTestsFilter()
-	{
+	public function resetTestsFilter() {
 		$this->includePluginClasses(array(
 			"ilTestListTableGUI"));
+		$table = new ilTestListTableGUI($this, 'subTabTO2');
+		$table->resetOffset();
+		$table->resetFilter();
+		$this->subTabTO2();
+	}
 
-		$table = new ilTestListTableGUI( $this, 'editSettings' );
+	/**
+	 * 	Reset the tests list filters
+	 *
+	 * 	This method is used as a command (form submit handler)
+	 * 	to reset the filters set on the tests list table.
+	 */
+	public function resetExerciseFilterRanking() {
+		require_once ilPlugin::getPluginObject(IL_COMP_SERVICE, 'Repository', 'robj', 'TestOverview')
+						->getDirectory() . '/classes/GUI/class.ilMappedTableGUI.php';
+		require_once ilPlugin::getPluginObject(IL_COMP_SERVICE, 'Repository', 'robj', 'TestOverview')
+						->getDirectory() . '/classes/GUI/class.ilExerciseOverviewTableGUI.php';
+
+		$table = new ilExerciseOverviewTableGUI($this, 'subTabTORanking');
 		$table->resetOffset();
 		$table->resetFilter();
+		$this->subTabEORanking();
+	}
+
+	/**
+	 * 	Apply a filter to the exercise list table.
+	 *
+	 * 	The applyExerciseFilter() method is used as a command
+	 * 	to apply (re-populate) and save the filters.
+	 */
+	public function applyExerciseFilterRanking() {
+		require_once ilPlugin::getPluginObject(IL_COMP_SERVICE, 'Repository', 'robj', 'TestOverview')
+						->getDirectory() . '/classes/GUI/class.ilMappedTableGUI.php';
+		require_once ilPlugin::getPluginObject(IL_COMP_SERVICE, 'Repository', 'robj', 'TestOverview')
+						->getDirectory() . '/classes/GUI/class.ilExerciseOverviewTableGUI.php';
 
-		$this->editSettings();
+		$table = new ilExerciseOverviewTableGUI($this, 'subTabTORanking');
+		$table->resetOffset();
+		$table->writeFilterToSession();
+		$this->subTabEORanking();
 	}
 
 	/**
-	 *	Reset the groups list filters
+	 * 	Apply a filter to the exercise list table.
 	 *
-	 *	This method is used as a command (form submit handler)
-	 *	to reset the filters set on the groups list table.
+	 * 	The applyExerciseFilter() method is used as a command
+	 * 	to apply (re-populate) and save the filters.
 	 */
-	public function resetGroupsFilter()
-	{
-		$this->includePluginClasses(array(
-			"ilMembershipListTableGUI"));
+	public function applyExerciseFilter() {
+		$this->includePluginClasses(
+				array("ilExerciseListTableGUI"));
+		$table = new ilExerciseListTableGUI($this, "subTabEO2");
+		$table->resetOffset();
+		$table->writeFilterToSession();
+		$this->subTabEO2();
+	}
 
-		$table = new ilMembershipListTableGUI( $this, 'editSettings' );
+	/**
+	 * 	Reset the exercise list filters
+	 *
+	 * 	This method is used as a command (form submit handler)
+	 * 	to reset the filters set on the exercise list table.
+	 */
+	public function resetExerciseFilter() {
+		$this->includePluginClasses(
+				array("ilExerciseListTableGUI"));
+		$table = new ilExerciseListTableGUI($this, "subTabEO2");
 		$table->resetOffset();
 		$table->resetFilter();
-
-		$this->editSettings();
+		$this->subTabEO2();
 	}
 
+	/**
+	 * 	Reset the groups list filters
+	 *
+	 * 	This method is used as a command (form submit handler)
+	 * 	to reset the filters set on the groups list table.
+	 */
+	public function resetGroupsFilter() {
+		$this->includePluginClasses(array(
+			"ilMembershipListTableGUI"));
+		$table = new ilMembershipListTableGUI($this, 'subTabTO2');
+		$table->resetOffset();
+		$table->resetFilter();
+		$this->subTabTO2();
+	}
 
 	/**
-	 *	Retrieve the tests list table.
+	 * 	Retrieve the tests list table.
 	 *
-	 *	The getTestList() method should be used to
-	 *	retrieve the GUI object responsible for listing
-	 *	the tests which can be added to the overview.
+	 * 	The getTestList() method should be used to
+	 * 	retrieve the GUI object responsible for listing
+	 * 	the tests which can be added to the overview.
 	 *
-	 *	@return ilTestListTableGUI
+	 * 	@return ilTestListTableGUI
 	 */
-	protected function getTestList()
-	{
-		$this->includePluginClasses( array(
+	protected function getTestList() {
+		$this->includePluginClasses(array(
 			"ilTestListTableGUI",
 			"ilTestMapper"));
-
-		$testList = new ilTestListTableGUI( $this, 'editSettings' );
+		$testList = new ilTestListTableGUI($this, 'subTabTO2');
 		$testList->setMapper(new ilTestMapper)
-				 ->populate();
-
+				->populate();
 		return $testList;
 	}
 
 	/**
-	 *	Retrieve the memberships list table.
+	 * 	Retrieve the exercise list table.
 	 *
-	 *	The getMembershipList() method should be used to
-	 *	retrieve the GUI object responsible for listing
-	 *	the participants groups which can be added to
-	 *	the overview.
+	 * 	The getExerciseList() method should be used to
+	 * 	retrieve the GUI object responsible for listing
+	 * 	the exercises which can be added to the overview.
 	 *
-	 *	@return ilMembershipListTableGUI
+	 * 	@return ilTestListTableGUI
 	 */
-	protected function getMembershipList()
-	{
-		$this->includePluginClasses( array(
+	protected function getExerciseList() {
+		$this->includePluginClasses(array(
+			"ilExerciseListTableGUI",
+			"ilExerciseSettingsMapper"));
+		$Obj = new ilExerciseListTableGUI($this, 'subTabEO2');
+		$Obj->setMapper(new ilExerciseSettingsMapper())
+				->populate();
+		return $Obj;
+	}
+
+	/**
+	 * 	Retrieve the memberships list table.
+	 *
+	 * 	The getMembershipList() method should be used to
+	 * 	retrieve the GUI object responsible for listing
+	 * 	the participants groups which can be added to
+	 * 	the overview.
+	 *
+	 * 	@return ilMembershipListTableGUI
+	 */
+	protected function getMembershipList() {
+		$this->includePluginClasses(array(
 			"ilMembershipListTableGUI",
 			"ilMembershipMapper"));
-
-		$testList = new ilMembershipListTableGUI( $this, 'editSettings' );
+		$testList = new ilMembershipListTableGUI($this, 'subTabTO2');
 		$testList->setMapper(new ilMembershipMapper)
-				 ->populate();
+				->populate();
+		return $testList;
+	}
 
+	protected function getMembershipListEx() {
+		$this->includePluginClasses(array(
+			"ilMembershipListTableGUI",
+			"ilMembershipMapper"));
+		$testList = new ilMembershipListTableGUI($this, 'subTabEO2');
+		$testList->setMapper(new ilMembershipMapper)
+				->populate();
 		return $testList;
 	}
 
 	/**
-	 *	Include a class implemented by this plugin.
+	 * 	Apply a filter to the groups list table.
 	 *
-	 *	The includePluginClasses() method can be used to
-	 *	include classes which are located in the plugin's
-	 *	directory.
+	 * 	The applyGroupFilter() method is used as a command
+	 * 	to apply (re-populate) and save the filters.
+	 */
+	public function applyGroupsFilterEx() {
+		$this->includePluginClasses(array(
+			"ilMembershipListTableGUI"));
+		$table = new ilMembershipListTableGUI($this, 'subTabEO2');
+		$table->resetOffset();
+		$table->writeFilterToSession();
+		$this->subTabEO2();
+	}
+
+	/**
+	 * 	Reset the groups list filters
 	 *
-	 *	@params	array	$classes	List of classes to be included
+	 * 	This method is used as a command (form submit handler)
+	 * 	to reset the filters set on the groups list table.
+	 */
+	public function resetGroupsFilterEx() {
+		$this->includePluginClasses(array(
+			"ilMembershipListTableGUI"));
+		$table = new ilMembershipListTableGUI($this, 'subTabEO2');
+		$table->resetOffset();
+		$table->resetFilter();
+		$this->subTabEO2();
+	}
+
+	public function addMembershipsEx() {
+		/**
+		 * @var $tpl    ilTemplate
+		 * @var $lng    ilLanguage
+		 * @var $ilCtrl ilCtrl
+		 */
+		global $tpl, $lng, $ilCtrl;
+		$this->initSettingsForm();
+		$this->populateSettings();
+		if (isset($_POST['membership_ids'])) {
+			/* Executing the registered test retrieval again with the same filters
+			  allows to determine which tests are really removed. */
+			include_once ilPlugin::getPluginObject(IL_COMP_SERVICE, 'Repository', 'robj', 'TestOverview')
+							->getDirectory() . "/classes/mapper/class.ilMembershipMapper.php";
+			foreach ($_POST['membership_ids'] as $groupId) {
+				$this->object
+						->addGroup($groupId);
+			}
+			ilUtil::sendSuccess($lng->txt('rep_robj_xtov_memberships_updated_success'), true);
+			$ilCtrl->redirect($this, 'subTabEO2');
+		}
+		ilUtil::sendFailure($lng->txt('rep_robj_xtov_min_one_check_membership'), true);
+		$ilCtrl->redirect($this, 'subTabEO2');
+		//$tpl->setContent( $this->renderSettings() );
+	}
+
+	public function removeMembershipsEx() {
+		/**
+		 * @var $tpl    ilTemplate
+		 * @var $lng    ilLanguage
+		 * @var $ilCtrl ilCtrl
+		 */
+		global $tpl, $lng, $ilCtrl;
+		$this->initSettingsForm();
+		$this->populateSettings();
+		if (isset($_POST['membership_ids'])) {
+			/* Executing the registered test retrieval again with the same filters
+			  allows to determine which tests are really removed. */
+			include_once ilPlugin::getPluginObject(IL_COMP_SERVICE, 'Repository', 'robj', 'TestOverview')
+							->getDirectory() . "/classes/mapper/class.ilMembershipMapper.php";
+			foreach ($_POST['membership_ids'] as $containerId) {
+				$this->object->rmGroup($containerId);
+			}
+			ilUtil::sendSuccess($lng->txt('rep_robj_xtov_memberships_updated_success'), true);
+			$ilCtrl->redirect($this, 'subTabEO2');
+		}
+
+		ilUtil::sendFailure($lng->txt('rep_robj_xtov_min_one_check_membership'));
+		//$tpl->setContent( $this->renderSettings() );
+		$ilCtrl->redirect($this, 'subTabEO2');
+	}
+
+	/**
+	 * 	Include a class implemented by this plugin.
 	 *
-	 *	@throws InvalidArgumentException on invalid class name. (File not found)
+	 * 	The includePluginClasses() method can be used to
+	 * 	include classes which are located in the plugin's
+	 * 	directory.
+	 *
+	 * 	@params	array	$classes	List of classes to be included
+	 *
+	 * 	@throws InvalidArgumentException on invalid class name. (File not found)
 	 */
-	private function includePluginClasses( array $classes )
-	{
-		$plugin	= ilPlugin::getPluginObject(IL_COMP_SERVICE, 'Repository', 'robj', 'TestOverview');
+	private function includePluginClasses(array $classes) {
+		$plugin = ilPlugin::getPluginObject(IL_COMP_SERVICE, 'Repository', 'robj', 'TestOverview');
 		$pluginDirectory = $plugin->getDirectory();
-
-		foreach ($classes as $class ) {
+		foreach ($classes as $class) {
 			if (class_exists($class))
 				continue;
-
 			$additionalFolder = "";
 			if (strrpos($class, "Mapper") !== false) {
 				/* Custom mapper classes */
 				$additionalFolder = "mapper/";
-			}
-			elseif (strpos($class, "ilObj") === false
-					&& strrpos($class, "GUI") !== false) {
+			} elseif (strpos($class, "ilObj") === false && strrpos($class, "GUI") !== false) {
 				/* Custom GUI classes (Not a plugin GUI controller) */
 				$additionalFolder = "GUI/";
 			}
-
-			$classFile       = $pluginDirectory . "/classes/{$additionalFolder}class.$class.php";
-
-			if (! file_exists($classFile))
+			$classFile = $pluginDirectory . "/classes/{$additionalFolder}class.$class.php";
+			if (!file_exists($classFile))
 				throw new InvalidArgumentException;
-
 			require_once $classFile;
 		}
 	}
@@ -807,42 +1416,33 @@ private function includePluginClasses( array $classes )
 	 * @param int    $a_sub_id
 	 * @return ilObjectListGUI|ilObjTestOverviewListGUI
 	 */
-	protected function initHeaderAction($a_sub_type = null, $a_sub_id = null)
-	{
+	protected function initHeaderAction($a_sub_type = null, $a_sub_id = null) {
 		/**
 		 * @var $ilUser ilObjUser
 		 */
 		global $ilUser;
-
 		$lg = parent::initHeaderAction();
-		if($lg instanceof ilObjTestOverviewListGUI)
-		{
-			if($ilUser->getId() != ANONYMOUS_USER_ID)
-			{
+		if ($lg instanceof ilObjTestOverviewListGUI) {
+			if ($ilUser->getId() != ANONYMOUS_USER_ID) {
 				// Maybe handle notifications in future ...
 			}
 		}
-
 		return $lg;
 	}
 
 	/**
 	 * @see ilDesktopItemHandling::addToDesk()
 	 */
-	public function addToDeskObject()
-	{
+	public function addToDeskObject() {
 		/**
 		 * @var $ilSetting ilSetting
 		 * @var $lng       ilLanguage
 		 */
 		global $ilSetting, $lng;
-
-		if((int)$ilSetting->get('disable_my_offers'))
-		{
+		if ((int) $ilSetting->get('disable_my_offers')) {
 			$this->showContent();
 			return;
 		}
-
 		include_once './Services/PersonalDesktop/classes/class.ilDesktopItemGUI.php';
 		ilDesktopItemGUI::addToDesktop();
 		ilUtil::sendSuccess($lng->txt('added_to_desktop'));
@@ -852,19 +1452,16 @@ public function addToDeskObject()
 	/**
 	 * @see ilDesktopItemHandling::removeFromDesk()
 	 */
-	public function removeFromDeskObject()
-	{
+	public function removeFromDeskObject() {
 		global $ilSetting, $lng;
-
-		if((int)$ilSetting->get('disable_my_offers'))
-		{
+		if ((int) $ilSetting->get('disable_my_offers')) {
 			$this->showContent();
 			return;
 		}
-
 		include_once './Services/PersonalDesktop/classes/class.ilDesktopItemGUI.php';
 		ilDesktopItemGUI::removeFromDesktop();
 		ilUtil::sendSuccess($lng->txt('removed_from_desktop'));
 		$this->showContent();
 	}
+
 }
diff --git a/classes/class.ilObjTestOverviewListGUI.php b/classes/class.ilObjTestOverviewListGUI.php
index d791816..fe7512e 100755
--- a/classes/class.ilObjTestOverviewListGUI.php
+++ b/classes/class.ilObjTestOverviewListGUI.php
@@ -1,51 +1,48 @@
 <?php
+
 /* Copyright (c) 1998-2012 ILIAS open source, Extended GPL, see docs/LICENSE */
 
 /**
- *	@package	TestOverview repository plugin
- *	@category	GUI
- *	@author		Greg Saive <gsaive@databay.de>
+ * 	@package	TestOverview repository plugin
+ * 	@category	GUI
+ * 	@author		Greg Saive <gsaive@databay.de>
  */
-
 require_once 'Services/Repository/classes/class.ilObjectPluginListGUI.php';
 
-class ilObjTestOverviewListGUI
-	extends ilObjectPluginListGUI
-{
+class ilObjTestOverviewListGUI extends ilObjectPluginListGUI {
+
 	/**
 	 * @return string
 	 */
-	public function getGuiClass()
-	{
+	public function getGuiClass() {
 		return 'ilObjTestOverviewGUI';
 	}
 
 	/**
 	 * @return array
 	 */
-	public function initCommands()
-	{
+	public function initCommands() {
 		return array
-		(
+			(
 			array(
 				'permission' => 'read',
-				'cmd'        => 'showContent',
-				'default'    => true
+				'cmd' => 'UserResults',
+				'default' => true
 			),
 			array(
 				'permission' => 'write',
-				'cmd'        => 'editSettings',
-				'txt'        => $this->txt('edit'),
-				'default'    => false
+				'cmd' => 'editSettings',
+				'txt' => $this->txt('edit'),
+				'default' => false
 			),
 		);
 	}
 
 	/**
- 	 *	Set the plugin type.
+	 * 	Set the plugin type.
 	 */
-	public function initType()
-	{
+	public function initType() {
 		$this->setType('xtov');
 	}
+
 }
diff --git a/classes/class.ilTestOverviewExerciseSelectionExplorer.php b/classes/class.ilTestOverviewExerciseSelectionExplorer.php
new file mode 100644
index 0000000..89db468
--- /dev/null
+++ b/classes/class.ilTestOverviewExerciseSelectionExplorer.php
@@ -0,0 +1,51 @@
+<?php
+/* Copyright (c) 1998-2013 ILIAS open source, Extended GPL, see docs/LICENSE */
+require_once 'Services/Object/classes/class.ilPasteIntoMultipleItemsExplorer.php';
+
+class ilTestOverviewExerciseSelectionExplorer extends ilPasteIntoMultipleItemsExplorer {
+
+	protected $hidden_nodes = array();
+
+	public function __construct($session_key) {
+		parent::__construct(ilPasteIntoMultipleItemsExplorer::SEL_TYPE_CHECK, 'ilias.php?baseClass=ilRepositoryGUI&cmd=goto', $session_key);
+
+		$this->removeFormItemForType('root');
+		$this->removeFormItemForType('crs');
+		$this->removeFormItemForType('grp');
+		$this->removeFormItemForType('cat');
+		$this->removeFormItemForType('fold');
+		$this->addFormItemForType('exc');
+		$this->addFilter('exc');
+	}
+
+	public function isVisible($a_ref_id, $a_type) {
+		/**
+		 * @var $ilAccess ilAccessHandler
+		 */
+		global $ilAccess;
+
+		if (isset($this->hidden_nodes[$a_ref_id]) && $this->hidden_nodes[$a_ref_id]) {
+			return false;
+		}
+
+		$visible = parent::isVisible($a_ref_id, $a_type);
+
+		include_once './Services/Tracking/classes/class.ilLearningProgressAccess.php';
+		if ('exc' == $a_type) {
+			if (!ilLearningProgressAccess::checkAccess($a_ref_id) && !$ilAccess->checkAccess('write', '', $a_ref_id)) {
+				return false;
+			}
+		}
+
+		return $visible;
+	}
+
+	public function setDefaultHiddenObjects(array $objects) {
+		foreach ($objects as $data) {
+			$this->hidden_nodes[$data[0]] = true;
+		}
+	}
+
+}
+
+?>
diff --git a/classes/class.ilTestOverviewExport.php b/classes/class.ilTestOverviewExport.php
new file mode 100644
index 0000000..c305f6d
--- /dev/null
+++ b/classes/class.ilTestOverviewExport.php
@@ -0,0 +1,799 @@
+<?php
+/* Copyright (c) 1998-2013 ILIAS open source, Extended GPL, see docs/LICENSE */
+
+/**
+ * @author Benedict Steuerlein <st111340@stud.uni-stuttgart.de>
+ * 
+ * Class that generates the export file 
+ */
+class ilTestOverviewExport extends ilObjTestOverviewGUI {
+
+	/** @protected string extended/reduced (TestQuestions) */
+	protected $type;
+
+	/** @protected integer ID of current TestOverview  */
+	protected $overviewID;
+
+	/** @var integer, ID of parent object  */
+	protected $parentID;
+
+	/** @var string of resultsfile  */
+	public $filename;
+
+	/** @var array of integer, testIDs  */
+	protected $testIDs;
+
+	/** @var array of integer, exerciseIDs  */
+	protected $exerciseIDs;
+
+	/** @var array of integer, userIds  */
+	private $users;
+
+	/** @var array, association of users and their test results */
+	private $assoc;
+
+	public function __construct($parent, $id, $type, $a_main_object = null) {
+
+		parent::__construct($parent, $a_main_object);
+		$this->type = $type;
+		$this->overviewID = $id;
+		$this->ref_id = $parent->object->getRefId();
+		$this->parentID = $parent->object->getParentId($this->ref_id);
+
+		$this->testIDs = $this->getTestIDs();
+		$this->exerciseIDs = $this->getUniqueExerciseIDs();
+		$this->users = $this->getUniqueTestExeciseUserID();
+		$this->assoc = $this->getAssociation();
+		$date = date("Y-m-d");
+
+		$this->filename = $parent->object->getTitle() . "_Export_" . $date . "_" . $type . ".csv";
+	}
+
+	function buildExportFile() {
+
+		switch ($this->type) {
+			case "reduced":
+				if (empty($this->users)) {
+					ilUtil::sendFailure("No users to export.");
+					break;
+				}
+				return $this->buildReducedExportFile();
+				break;
+			case "extended":
+				if (empty($this->users)) {
+					ilUtil::sendFailure("No users to export.");
+					break;
+				}
+				return $this->buildExtendedExportFile();
+				break;
+		}
+	}
+
+	/**
+	 * 
+	 * @private function, builds reduced Export file (Only TestNames, no Questions)
+	 *  (lastname|firstname|matriculation-number|email|gender|Testname1|Testname2|...)
+	 *
+	 */
+	private function buildReducedExportFile() {
+		global $lng, $ilCtrl;
+
+		$rows = array();
+		$datarow = array();
+
+		//Build the headrow
+		array_push($datarow, $this->txt("name"));
+		array_push($datarow, $this->txt("mat"));
+		array_push($datarow, $this->txt("group"));
+		array_push($datarow, $this->txt("mail"));
+		array_push($datarow, $this->txt("gend"));
+
+		//push all TestNames into the headrow
+		$tCounter = 1;
+		foreach ($this->testIDs as $key => $value) {
+			$testName = "Test $tCounter";
+			array_push($datarow, $testName);
+			$tCounter++;
+		}
+		//push a name of every exercise into headrow
+		$eCounter = 1;
+		foreach ($this->exerciseIDs as $num => $exvalue) {
+			$exName = "Exercise $eCounter";
+			array_push($datarow, $exName);
+			$eCounter++;
+		}
+
+		$headrow = $datarow;
+		array_push($rows, $headrow);
+		$inforow = array();
+		array_push($inforow, "");
+		array_push($inforow, "");
+		array_push($inforow, "");
+		array_push($inforow, "");
+		array_push($inforow, "");
+		//push all TestNames into the headrow
+		foreach ($this->testIDs as $key => $value) {
+			$testID = $value['test_id'];
+			$testName = $this->getTestTitle($testID);
+			array_push($inforow, $testName);
+		}
+		//push a name of every exercise into headrow
+		foreach ($this->exerciseIDs as $num => $exvalue) {
+			$exerciseID = $exvalue['obj_id'];
+
+			$exName = $this->getExerciseName($exerciseID);
+			array_push($inforow, $exName);
+		}
+		array_push($rows, $inforow);
+		//push user specific info into every row (userInfo)
+		foreach ($this->users as $num => $preValue) {
+			$userID = $preValue['user_fi'];
+			$userGroup = $this->participatedGroups($userID);
+			$datarow2 = array();
+			$userInfo = $this->getInfo($userID);
+			array_push($datarow2, $userInfo['lastname'] . ', ' . $userInfo['firstname']);
+			array_push($datarow2, $userInfo['matriculation']);
+			array_push($datarow2, $userGroup);
+			array_push($datarow2, $userInfo['email']);
+			array_push($datarow2, $userInfo['gender']);
+			//push test results into user row
+			foreach ($this->testIDs as $num2 => $preValue2) {
+				$testID = $preValue2['test_id'];
+				$activeID = $this->getActiveID($userID, $testID);
+				$testResult = $this->getTestResultsForActiveId($activeID);
+				array_push($datarow2, $testResult);
+			}
+			//push exerciseResult into user row
+			foreach ($this->exerciseIDs as $num3 => $preValue3) {
+				$exerciseID = $preValue3['obj_id'];
+				$exerciseResult = $this->getExerciseMark($userID, $exerciseID);
+				array_push($datarow2, $exerciseResult);
+			}
+			array_push($rows, $datarow2);
+		}
+
+		$csv = "";
+		$separator = ";";
+
+		foreach ($rows as $evalrow) {
+			$csvrow = $this->processCSVRow($evalrow, TRUE, $separator);
+			$csv .= join($csvrow, $separator) . "\n";
+		}
+		ilUtil::deliverData($csv, ilUtil::getASCIIFilename($this->filename));
+	}
+
+	/**
+	 * 
+	 * @private function, builds extended export file (TestNames and Questions)
+	 *  (lastname|firstname|matriculation-number|email|gender|Testname1|Question1|Question2|..|Testname2|Question1|Question2|..)
+
+	 */
+	function buildExtendedExportFile() {
+		global $lng;
+		$rows = array();
+		$datarow = array();
+		//build headrow        
+		array_push($datarow, $this->txt("name"));
+		array_push($datarow, $this->txt("mat"));
+		array_push($datarow, $this->txt("group"));
+		array_push($datarow, $this->txt("mail"));
+		array_push($datarow, $this->txt("gend"));
+		//push all TestNames into the headrow
+		$tCounter = 1;
+		foreach ($this->testIDs as $key => $value) {
+			$testID = $value['test_id'];
+			$testName = "Test $tCounter";
+			array_push($datarow, $testName);
+
+			$questionIDs = $this->getQuestionID($testID);
+			$qCounter = 1;
+			//push a name for every subtask a test has into the headrow
+			foreach ($questionIDs as $question) {
+				$questionName = "Tst$tCounter- " . $this->txt("qteil") . " $qCounter";
+				array_push($datarow, $questionName);
+				$qCounter++;
+			}
+			$tCounter++;
+		}
+		//push a name of every exercise into headrow
+		$eCounter = 1;
+		foreach ($this->exerciseIDs as $num => $exvalue) {
+			$exerciseID = $exvalue['obj_id'];
+			$exName = "Exercise $eCounter";
+			array_push($datarow, $exName);
+
+
+			$assignmentIDs = $this->getAssignments($exerciseID);
+			$aCounter = 1;
+			//push a name for every assignments a exercise has into the headrow
+			foreach ($assignmentIDs as $assignment) {
+				$assignmentName = "Ex$eCounter- " . $this->txt("assign") . " $aCounter";
+				array_push($datarow, $assignmentName);
+				$aCounter++;
+			}
+			$eCounter++;
+		}
+
+		array_push($rows, $datarow);
+
+		$inforow = array();
+		array_push($inforow, "");
+		array_push($inforow, "");
+		array_push($inforow, "");
+		array_push($inforow, "");
+		array_push($inforow, "");
+
+		//push the test name into a new row
+		foreach ($this->testIDs as $key => $value) {
+			$testID = $value['test_id'];
+			$testName = $this->getTestTitle($testID);
+			array_push($inforow, $testName);
+			$questions = $this->getQuestionID($testID);
+
+			//push a name for every subtask a test has into the headrow
+			foreach ($questions as $key => $questionInfo) {
+				$questionID = $questionInfo['question_fi'];
+				$questionName = $this->getQuestionTitle($questionID);
+				array_push($inforow, $questionName);
+			}
+		}
+		//push a name of every exercise into headrow
+		foreach ($this->exerciseIDs as $num => $exvalue) {
+			$exerciseID = $exvalue['obj_id'];
+			$exName = $this->getExerciseName($exerciseID);
+			array_push($inforow, $exName);
+			$assignments = $this->getAssignments($exerciseID);
+
+			//push a name for every assignments a exercise has into the headrow
+			foreach ($assignments as $key => $assignmentInfo) {
+				$assignmentIDs = $assignmentInfo['id'];
+				$assignmentName = $assignmentInfo['title'];
+				array_push($inforow, $assignmentName);
+				$aCounter++;
+			}
+		}
+
+		array_push($rows, $inforow);
+
+		//push user specific info into every row (userInfo)
+		foreach ($this->users as $num => $preValue) {
+			$userID = $preValue['user_fi'];
+			$userGroup = $this->participatedGroups($userID);
+			$datarow = $headrow;
+			$datarow2 = array();
+			$userInfo = $this->getInfo($userID);
+			array_push($datarow2, $userInfo['lastname'] . ', ' . $userInfo['firstname']);
+			array_push($datarow2, $userInfo['matriculation']);
+			array_push($datarow2, $userGroup);
+			array_push($datarow2, $userInfo['email']);
+			array_push($datarow2, $userInfo['gender']);
+			//push test results into user row
+			foreach ($this->testIDs as $num2 => $preValue2) {
+				$testID = $preValue2['test_id'];
+				$activeID = $this->getActiveID($userID, $testID);
+				$testResult = $this->getTestResultsForActiveId($activeID);
+				array_push($datarow2, $testResult);
+				$questionIDs2 = $this->getQuestionID($testID);
+				//push question results into user row
+				foreach ($questionIDs2 as $key => $value) {
+					$questionID2 = $value['question_fi'];
+					$questionPoints = $this->getMark($activeID, $questionID2);
+					array_push($datarow2, $questionPoints);
+				}
+			}
+
+			//push exerciseResult into user row
+			foreach ($this->exerciseIDs as $num3 => $preValue3) {
+				$exerciseID = $preValue3['obj_id'];
+				$exerciseResult = $this->getExerciseMark($userID, $exerciseID);
+				array_push($datarow2, $exerciseResult);
+				$assignmentIDs = $this->getAssignments($exerciseID);
+				//push assignmentResults into user row
+				foreach ($assignmentIDs as $key => $preValue4) {
+					$assignmentIDs = $preValue4['id'];
+					$assignmentPoints = $this->getAssignmentMark($userID, $assignmentIDs);
+					array_push($datarow2, $assignmentPoints);
+				}
+			}
+			array_push($rows, $datarow2);
+			$datarow2 = array();
+		}
+
+
+
+		$csv = "";
+		$separator = ";";
+		foreach ($rows as $evalrow) {
+			$csvrow = $this->processCSVRow($evalrow, TRUE, $separator);
+			$csv .= join($csvrow, $separator) . "\n";
+		}
+		ilUtil::deliverData($csv, ilUtil::getASCIIFilename($this->filename));
+	}
+
+	function processCSVRow($row, $quoteAll = FALSE, $separator = ";") {
+		$resultarray = array();
+		foreach ($row as $rowindex => $entry) {
+			$surround = FALSE;
+			if ($quoteAll) {
+				$surround = TRUE;
+			}
+			if (strpos($entry, "\"") !== FALSE) {
+				$entry = str_replace("\"", "\"\"", $entry);
+				$surround = TRUE;
+			}
+			if (strpos($entry, $separator) !== FALSE) {
+				$surround = TRUE;
+			}
+			// replace all CR LF with LF (for Excel for Windows compatibility
+			$entry = str_replace(chr(13) . chr(10), chr(10), $entry);
+
+			if ($surround) {
+				$entry = "\"" . $entry . "\"";
+			}
+
+			$resultarray[$rowindex] = $entry;
+		}
+		return $resultarray;
+	}
+
+	/**
+	 * 
+	 * @global type $ilDB
+	 * @return array containing all testIDs associated with the Overview object
+	 */
+	protected function getTestIDs() {
+		global $ilDB;
+		$testIDs = array();
+		$query = "SELECT DISTINCT
+					tst_tests.test_id
+				FROM
+					rep_robj_xtov_t2o
+				JOIN object_reference
+				JOIN tst_tests
+				ON (rep_robj_xtov_t2o.ref_id_test = object_reference.ref_id
+				AND obj_id = obj_fi)
+				WHERE object_reference.deleted IS NULL AND obj_id_overview = %s";
+
+		$result = $ilDB->queryF($query, array('integer'), array($this->overviewID));
+		while ($record = $ilDB->fetchAssoc($result)) {
+			array_push($testIDs, $record);
+		}
+		return $testIDs;
+	}
+
+	/**
+	 * 
+	 * @global type $ilDB
+	 * @param integer $userID
+	 * @return string
+	 */
+	protected function participatedGroups($userID) {
+		global $ilDB;
+		$info = array();
+		$query = "SELECT 
+                    obd.title
+                  FROM
+                    rbac_ua ua
+                  JOIN
+                    rbac_fa fa ON ua.rol_id = fa.rol_id
+                  JOIN 
+                    tree t1 ON t1.child = fa.parent
+                  JOIN
+                    object_reference obr ON t1.child = obr.ref_id
+                  JOIN
+                    object_data obd ON obr.obj_id = obd.obj_id
+                  WHERE
+                 obr.deleted IS NULL AND ua.usr_id = %s AND fa.assign = 'y' AND obd.type in ('grp') AND t1.parent = %s";
+		$result = $ilDB->queryF($query, array('integer', 'integer'), array($userID, $this->parentID));
+		while ($record = $ilDB->fetchAssoc($result)) {
+			array_push($info, $record);
+		}
+
+		foreach ($info as $key => $group) {
+			$groups .= $group['title'] . ", ";
+		}
+		$groups = substr($groups, 0, strlen($groups) - 2);
+
+		return $groups;
+	}
+
+	/**
+	 * 
+	 * @global type $ilDB
+	 * @param type $questionID
+	 * @return testID for a given questionID
+	 */
+	protected function getTest($questionID) {
+		global $ilDB;
+		$query = "  SELECT 
+					DISTINCT test_fi
+					FROM
+					tst_test_question
+					WHERE question_fi = %s";
+
+		$result = $ilDB->queryF($query, array('integer'), array($questionID));
+		$record = $ilDB->fetchAssoc($result);
+		return $record['test_fi'];
+	}
+
+	/**
+	 * 
+	 * @global type $ilDB
+	 * @param type $overviewID
+	 * @return array filled with all existing question-ids for a given XTOV-instance
+	 */
+	private function getQuestionID($testID) {
+		global $ilDB;
+		$qIDs = array();
+
+		$query = "SELECT 
+					question_fi
+				FROM
+					rep_robj_xtov_t2o
+				JOIN object_reference
+				JOIN tst_tests
+				JOIN tst_test_question ON (rep_robj_xtov_t2o.ref_id_test = object_reference.ref_id
+				AND obj_id = obj_fi
+				AND test_id = test_fi)
+				WHERE obj_id_overview = %s AND test_id = %s";
+		$result = $ilDB->queryF($query, array('integer', 'integer'), array($this->overviewID, $testID));
+		while ($record = $ilDB->fetchAssoc($result)) {
+			array_push($qIDs, $record);
+		}
+		return $qIDs;
+	}
+
+	/**
+	 * 
+	 * @global type $ilDB
+	 * @param type $userID
+	 * @param type $testID
+	 * @return string 
+	 */
+	private function getActiveID($userID, $testID) {
+		global $ilDB;
+		$query = "SELECT tst_active.active_id FROM tst_active WHERE user_fi = %s AND test_fi = %s";
+		$result = $ilDB->queryF($query, array('integer', 'integer'), array($userID, $testID));
+
+		if ($result->numRows()) {
+			$row = $ilDB->fetchAssoc($result);
+			return $row["active_id"];
+		} else {
+			return "";
+		}
+	}
+
+	/**
+	 * 
+	 * @global type $ilDB
+	 * @param type $userID
+	 * @return type 
+	 */
+	private function getInfo($userID) {
+		global $ilDB;
+		$query = "SELECT 
+					lastname, 
+					firstname, 
+					matriculation, 
+					email, 
+					gender
+				FROM
+					usr_data
+				WHERE usr_id = %s";
+		$result = $ilDB->queryF($query, array('integer'), array($userID));
+		$record = $ilDB->fetchAssoc($result);
+		return $record;
+	}
+
+	/**
+	 * 
+	 * @global type $ilDB
+	 * @param type $overviewID
+	 * @return integer Reached points in a test for a given activeID
+	 */
+	public function getTestResultsForActiveId($active_id) {
+		global $ilDB;
+
+		$query = "
+		SELECT		reached_points
+		FROM		tst_result_cache
+		WHERE		active_fi = %s
+	";
+
+		$result = $ilDB->queryF($query, array('integer'), array($active_id)
+		);
+
+
+
+		$row = $ilDB->fetchAssoc($result);
+
+		return $row['reached_points'];
+	}
+
+	/**
+	 * 
+	 * @global type $ilDB
+	 * @return array with all answered questions, the reached points for every activeID
+	 *          activeID => (QuestionID->points)
+	 */
+	protected function getAssociation() {
+		global $ilDB;
+		$points = array();
+
+		$query = "SELECT 
+					active_fi, questionId.question_fi, points
+				FROM
+					tst_test_result
+				JOIN
+					(SELECT 
+						question_fi
+					FROM
+						rep_robj_xtov_t2o
+					JOIN object_reference
+					JOIN tst_tests
+					JOIN tst_test_question ON (rep_robj_xtov_t2o.ref_id_test = object_reference.ref_id
+					AND obj_id = obj_fi
+					AND test_id = test_fi)) AS questionId ON (tst_test_result.question_fi = questionId.question_fi)
+					ORDER BY active_fi ASC, questionId.question_fi ASC, tstamp DESC";
+		$result = $ilDB->query($query);
+
+		while ($record = $ilDB->fetchObject($result)) {
+			array_push($points, $record);
+		}
+		return $points;
+	}
+
+	/**
+	 * 
+	 * @global type $ilDB
+	 * @param type $testID
+	 * @return String TestTitle for given testID
+	 */
+	protected function getTestTitle($testID) {
+		global $ilDB;
+
+		$query = "SELECT 
+					od.title
+				FROM
+					rep_robj_xtov_t2o
+				INNER JOIN
+					object_reference ref ON (ref.ref_id = rep_robj_xtov_t2o.ref_id_test
+				AND deleted IS NULL)
+				INNER JOIN
+					object_data od ON (od.obj_id = ref.obj_id)
+				AND od.type = 'tst'
+				INNER JOIN
+					tst_tests test ON (test.obj_fi = od.obj_id)
+				WHERE test_id = %s";
+		$result = $ilDB->queryF($query, array('integer'), array($testID));
+		$record = $ilDB->fetchAssoc($result);
+
+		return $record['title'];
+	}
+
+	/**
+	 * 
+	 * @global type $ilDB
+	 * @param type $questionID
+	 * @return string title of question
+	 */
+	protected function getQuestionTitle($questionID) {
+		global $ilDB;
+
+
+		$query = "SELECT title FROM qpl_questions WHERE question_id= %s";
+
+		$result = $ilDB->queryF($query, array('integer'), array($questionID));
+		$record = $ilDB->fetchObject($result);
+		return $record->title;
+	}
+
+	/**
+	 * 
+	 * @global type $ilDB
+	 * @return array of all users that participated on tests added
+	 */
+	protected function getUniqueTestExeciseUserID() {
+		global $ilDB;
+		$uniqueIDs = array();
+
+		$query = "SELECT usr_id AS user_fi FROM (
+					SELECT DISTINCT(user_fi) 
+					FROM tst_active 
+					JOIN 
+					(SELECT 
+						*
+					FROM
+						rep_robj_xtov_t2o
+					JOIN
+						object_reference
+					JOIN
+						tst_tests ON (rep_robj_xtov_t2o.ref_id_test = object_reference.ref_id
+					AND obj_id = obj_fi)) as TestUsers ON (TestUsers.test_id=tst_active.test_fi)
+					WHERE 
+						obj_id_overview = %s
+					UNION
+					SELECT DISTINCT
+						(exc_mem_ass_status.usr_id) as user_fi
+					FROM
+						rep_robj_xtov_e2o,
+						exc_returned,
+						exc_mem_ass_status
+					JOIN
+						usr_data ON (exc_mem_ass_status.usr_id = usr_data.usr_id)
+					WHERE
+						exc_returned.ass_id = exc_mem_ass_status.ass_id
+					AND user_id = exc_mem_ass_status.usr_id
+					AND obj_id_exercise = obj_id
+					AND obj_id_overview = %s) t1
+					INNER JOIN usr_data ON t1.user_fi= usr_data.usr_id";
+		
+		$result = $ilDB->queryF($query, array('integer', 'integer'), array($this->overviewID, $this->overviewID));
+
+		while ($record = $ilDB->fetchAssoc($result)) {
+			array_push($uniqueIDs, $record);
+		}
+
+		return $uniqueIDs;
+	}
+
+	/**
+	 * 
+	 * @param type $activeID
+	 * @param type $questionID
+	 * @return int Points for a given activeID (TestID-StudentID) and a questionID
+	 */
+	public function getMark($activeID, $questionID) {
+		foreach ($this->assoc as $row => $value) {
+			if ($value->active_fi == $activeID && $value->question_fi == $questionID) {
+
+				if ($value->points != null) {
+					return $value->points;
+				}
+			}
+		}
+		return 0;
+	}
+
+	/**
+	 * 
+	 * @global type $ilDB
+	 * @return array of unique ExerciseIDs added to TO-Object 
+	 */
+	protected function getUniqueExerciseIDs() {
+
+		global $ilDB;
+		$uniqueIDs = array();
+
+		$query = "SELECT DISTINCT
+					obj_id_exercise AS obj_id
+				FROM
+					rep_robj_xtov_e2o e2o
+				JOIN
+					object_reference ref ON e2o.obj_id_exercise = ref.obj_id
+				WHERE
+					e2o.obj_id_overview = %s
+				AND ref.deleted IS NULL";
+		$result = $ilDB->queryF($query, array('integer'), array($this->overviewID));
+
+		while ($record = $ilDB->fetchAssoc($result)) {
+			array_push($uniqueIDs, $record);
+		}
+
+		return $uniqueIDs;
+	}
+
+	/**
+	 * 
+	 * @global type $ilDB
+	 * @param type $exerciseID
+	 * @return type title for a given object id
+	 */
+	public function getExerciseName($exerciseID) {
+		global $ilDB;
+		$query = "SELECT title FROM object_data WHERE obj_id = %s";
+		$result = $ilDB->queryF($query, array('integer'), array($exerciseID));
+		$record = $ilDB->fetchAssoc($result);
+		return $record['title'];
+	}
+
+	/**
+	 * 
+	 * @global type $ilDB
+	 * @return array with all userId that participated on Exercises in to object
+	 */
+	protected function getUniqueExerciseUserID() {
+
+		global $ilDB;
+		$uniqueIDs = array();
+
+		$query = "SELECT DISTINCT
+					(exc_mem_ass_status.usr_id)
+				FROM
+					rep_robj_xtov_e2o,
+					exc_returned,
+					exc_mem_ass_status
+				JOIN
+					usr_data ON (exc_mem_ass_status.usr_id = usr_data.usr_id)
+				WHERE
+					exc_returned.ass_id = exc_mem_ass_status.ass_id
+				AND user_id = exc_mem_ass_status.usr_id
+				AND obj_id_exercise = obj_id
+				AND obj_id_overview = %s ";
+
+		$result = $ilDB->queryF($query, array('integer'), array($this->overviewID));
+
+		while ($record = $ilDB->fetchAssoc($result)) {
+			array_push($uniqueIDs, $record);
+		}
+
+		return $uniqueIDs;
+	}
+
+	/**
+	 * 
+	 * @global type $ilDB
+	 * @param type $exerciseID
+	 * @return array with all assignments for a given excerciseID 
+	 */
+	public function getAssignments($exerciseID) {
+		global $ilDB;
+		$assignmentID = array();
+
+		$query = "SELECT 
+					id, title
+				FROM
+					exc_assignment
+				WHERE
+					exc_id = %s ";
+
+		$result = $ilDB->queryF($query, array('integer'), array($exerciseID));
+
+		while ($record = $ilDB->fetchAssoc($result)) {
+			array_push($assignmentID, $record);
+		}
+
+		return $assignmentID;
+	}
+
+	/**
+	 * 
+	 * @global type $ilDB
+	 * @param type $userID
+	 * @param type $exerciseID
+	 * @return string exercise mark for a given userID and exerciseID 
+	 */
+	protected function getExerciseMark($userID, $exerciseID) {
+		global $ilDB;
+
+		$query = "SELECT mark FROM ut_lp_marks WHERE obj_id = %s AND usr_id = %s ";
+
+		$result = $ilDB->queryF($query, array('integer', 'integer'), array($exerciseID, $userID));
+
+		$record = $ilDB->fetchAssoc($result);
+
+
+		return $record['mark'];
+	}
+
+	/**
+	 * 
+	 * @global type $ilDB
+	 * @param type $userID
+	 * @param type $assignmentID
+	 * @return string assignment mark for a given userID and assignmentID  
+	 */
+	protected function getAssignmentMark($userID, $assignmentID) {
+		global $ilDB;
+
+
+		$query = "SELECT mark FROM exc_mem_ass_status WHERE ass_id = %s AND usr_id = %s";
+
+		$result = $ilDB->queryF($query, array('integer', 'integer'), array($assignmentID, $userID));
+
+		$record = $ilDB->fetchAssoc($result);
+
+		return $record['mark'];
+	}
+
+}
diff --git a/classes/class.ilTestOverviewPlugin.php b/classes/class.ilTestOverviewPlugin.php
index 6272b48..1278452 100755
--- a/classes/class.ilTestOverviewPlugin.php
+++ b/classes/class.ilTestOverviewPlugin.php
@@ -1,53 +1,35 @@
 <?php
+
 /* Copyright (c) 1998-2012 ILIAS open source, Extended GPL, see docs/LICENSE */
 
 /**
- *	@package	TestOverview repository plugin
- *	@category	Core
- *	@author		Greg Saive <gsaive@databay.de>
+ * 	@package	TestOverview repository plugin
+ * 	@category	Core
+ * 	@author		Greg Saive <gsaive@databay.de>
  */
-
 require_once 'Services/Repository/classes/class.ilRepositoryObjectPlugin.php';
 
-class ilTestOverviewPlugin
-	extends ilRepositoryObjectPlugin
-{
+class ilTestOverviewPlugin extends ilRepositoryObjectPlugin {
+
 	/**
 	 * @return string
 	 */
-	public function getPluginName()
-	{
+	public function getPluginName() {
 		return 'TestOverview';
 	}
 
-	static function _getIcon($a_type, $a_size)
-   {
-       return ilPlugin::_getImagePath(IL_COMP_SERVICE, "Repository", "robj",
-           	ilPlugin::lookupNameForId(IL_COMP_SERVICE, "Repository", "robj",$a_type),
-           	"icon_".$a_type.".svg");
-   }
+	static function _getIcon($a_type, $a_size) {
+		return ilPlugin::_getImagePath(IL_COMP_SERVICE, "Repository", "robj", ilPlugin::lookupNameForId(IL_COMP_SERVICE, "Repository", "robj", $a_type), "icon_" . $a_type . ".svg");
+	}
 
-	protected function uninstallCustom()
-	{
+	protected function uninstallCustom() {
 		/**
 		 * @var $ilDB ilDB
 		 */
 		global $ilDB;
-
-		if($ilDB->tableExists('rep_robj_xtov_overview'))
-		{
-			$ilDB->dropTable('rep_robj_xtov_overview');
-		}
-
-		if($ilDB->tableExists('rep_robj_xtov_t2o'))
-		{
-			$ilDB->dropTable('rep_robj_xtov_t2o');
-		}
-
-		if($ilDB->tableExists('rep_robj_xtov_p2o'))
-		{
-			$ilDB->dropTable('rep_robj_xtov_p2o');
-		}
+		$ilDB->query('DROP TABLE IF EXISTS	rep_robj_xtov_overview, rep_robj_xtov_t2o, 
+                                                        rep_robj_xtov_p2o, rep_robj_xtov_torank, rep_robj_xtov_rankdate,
+                                                        rep_robj_xtov_eorank, rep_robj_xtov_e2o, rep_robj_xtov_exview ');
 	}
 
 }
diff --git a/classes/class.ilTestOverviewTestSelectionExplorer.php b/classes/class.ilTestOverviewTestSelectionExplorer.php
old mode 100644
new mode 100755
index 267e3d6..e074a9c
--- a/classes/class.ilTestOverviewTestSelectionExplorer.php
+++ b/classes/class.ilTestOverviewTestSelectionExplorer.php
@@ -1,4 +1,5 @@
 <?php
+
 /* Copyright (c) 1998-2013 ILIAS open source, Extended GPL, see docs/LICENSE */
 
 require_once 'Services/Object/classes/class.ilPasteIntoMultipleItemsExplorer.php';
@@ -6,15 +7,14 @@
 /**
  *
  */
-class ilTestOverviewTestSelectionExplorer extends ilPasteIntoMultipleItemsExplorer
-{
+class ilTestOverviewTestSelectionExplorer extends ilPasteIntoMultipleItemsExplorer {
+
 	protected $hidden_nodes = array();
-	
+
 	/**
 	 * @param string $session_key
 	 */
-	public function __construct($session_key)
-	{
+	public function __construct($session_key) {
 		parent::__construct(ilPasteIntoMultipleItemsExplorer::SEL_TYPE_CHECK, 'ilias.php?baseClass=ilRepositoryGUI&cmd=goto', $session_key);
 		$this->removeFormItemForType('root');
 		$this->removeFormItemForType('crs');
@@ -30,24 +30,20 @@ public function __construct($session_key)
 	 * @param string $a_type
 	 * @return bool
 	 */
-	public function isVisible($a_ref_id, $a_type)
-	{
+	public function isVisible($a_ref_id, $a_type) {
 		/**
 		 * @var $ilAccess ilAccessHandler
 		 */
 		global $ilAccess;
 
-		if(isset($this->hidden_nodes[$a_ref_id]) && $this->hidden_nodes[$a_ref_id])
-		{
+		if (isset($this->hidden_nodes[$a_ref_id]) && $this->hidden_nodes[$a_ref_id]) {
 			return false;
 		}
 
 		$visible = parent::isVisible($a_ref_id, $a_type);
 
-		if('tst' == $a_type)
-		{
-			if(!$ilAccess->checkAccess('tst_statistics', '', $a_ref_id) && !$ilAccess->checkAccess('write', '', $a_ref_id))
-			{
+		if ('tst' == $a_type) {
+			if (!$ilAccess->checkAccess('tst_statistics', '', $a_ref_id) && !$ilAccess->checkAccess('write', '', $a_ref_id)) {
 				return false;
 			}
 		}
@@ -58,11 +54,10 @@ public function isVisible($a_ref_id, $a_type)
 	/**
 	 * @param $objects
 	 */
-	public function setDefaultHiddenObjects(array $objects)
-	{
-		foreach($objects as $data)
-		{
+	public function setDefaultHiddenObjects(array $objects) {
+		foreach ($objects as $data) {
 			$this->hidden_nodes[$data[0]] = true;
 		}
 	}
+
 }
diff --git a/classes/mapper/class.ilBinDiagrammMapper.php b/classes/mapper/class.ilBinDiagrammMapper.php
new file mode 100644
index 0000000..ff32784
--- /dev/null
+++ b/classes/mapper/class.ilBinDiagrammMapper.php
@@ -0,0 +1,398 @@
+<?php
+
+/* Copyright (c) 1998-2012 ILIAS open source, Extended GPL, see docs/LICENSE */
+
+/**
+ * 	@package	TestOverview repository plugin
+ * 	@category	Core
+ * 	@author		Jan Ruthardt <janruthardt@web.de>
+ * The class is responsible for the Bar Charts of Exercises and Tests
+ */
+/* Dependencies : */
+require_once 'Customizing/global/plugins/Services/Repository/RepositoryObject/TestOverview/classes/GUI/class.ilTestOverviewTableGUI.php';
+require_once 'Customizing/global/plugins/Services/Repository/RepositoryObject/TestOverview/classes/mapper/class.ilOverviewMapper.php';
+
+class BinDiagrammMapper extends ilTestOverviewTableGUI {
+
+	public $average = array();
+
+	public function createAverageDia($type) {
+		$this->data();
+		$averageObj = new AverageDiagramm($this->average);
+		return $averageObj->initDia();
+
+	}
+
+	/*
+	 * Gets the data from every student and their Testresults in a String saperated by "|"
+	 *
+	 */
+
+	public function data() {
+
+
+		global $lng, $ilCtrl, $ilUser;
+		/* Initalise the Mapper */
+		$this->setMapper(new ilOverviewMapper)
+				->populate();
+
+		$data = $this->getData();
+
+		foreach ($data as $set) {
+			array_push($this->average, $this->fillRow($set));
+		}
+	}
+
+	/**
+	 * Gets
+	 * @param type $row
+	 * @return type
+	 */
+	public function fillRow($row) {
+		$overview = $this->getParentObject()->object;
+
+		$results = array();
+		foreach ($overview->getUniqueTests() as $obj_id => $refs) {
+			$test = $overview->getTest($obj_id);
+			$activeId = $test->getActiveIdOfUser($row['member_id']);
+			$result = $progress = null;
+			$result = $test->getTestResult($activeId);
+			$result = (float) $result['pass']['percent'] * 100;
+			$results[] = $result;
+		}
+		if (count($results)) {
+			$average = (array_sum($results) / count($results));
+		}
+		return $average;
+	}
+
+	public function getResult() {
+
+		return $result;
+	}
+
+}
+
+/**
+ * Creates a Bar Diagramm that shows the number of students with their points in a range of 10%
+ */
+class AverageDiagramm {
+
+	private $average;
+	public $diaPoints = array();
+	private $buckets = array(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+
+	function __construct($Obj) {
+		$this->average = $Obj;
+		$this->getAverage();
+	}
+
+	function initDia() {
+		global $lng;
+		require_once 'Services/Chart/classes/class.ilChartGrid.php';
+		require_once 'Services/Chart/classes/class.ilChartLegend.php';
+		require_once 'Services/Chart/classes/class.ilChartSpider.php';
+		require_once 'Services/Chart/classes/class.ilChartLegend.php';
+		$chart = ilChart::getInstanceByType(ilChart::TYPE_GRID, $a_id);
+		$chart->setsize(900, 400);
+		$data = $chart->getDataInstance(ilChartGrid::DATA_BARS);
+
+
+
+
+		/* Creation of the Legend */
+		$legend = new ilChartLegend();
+		$legend->setOpacity(50);
+		$chart->setLegend($legend);
+		$chart->setYAxisToInteger(true);
+		/* Width of the colums */
+		$data->setBarOptions(0.5, "center");
+		$tpl = new ilTemplate("tpl.DigramLegend.html", true, true, "Customizing/global/plugins/Services/Repository/RepositoryObject/TestOverview");
+
+		//////LEGEND////////
+		$lng->loadLanguageModule("bibitem");
+		$lng->loadLanguageModule("assessment");
+		$tpl->setVariable("number", $lng->txt("bibitem_number"));
+		$tpl->setVariable("percent", $lng->txt("points"));
+		for ($i = 1; $i <= 10; $i++) {
+			$tpl->setCurrentBlock("buckets");
+			$tpl->setVariable("Numbers", $i);
+			$tpl->setVariable("Percents", "&le; " . $i * 10 . " %");
+			$tpl->parseCurrentBlock();
+		}
+
+		$data->addPoint(1, $this->buckets[0]);
+		$data->addPoint(2, $this->buckets[1]);
+		$data->addPoint(3, $this->buckets[2]);
+		$data->addPoint(4, $this->buckets[3]);
+		$data->addPoint(5, $this->buckets[4]);
+		$data->addPoint(6, $this->buckets[5]);
+		$data->addPoint(7, $this->buckets[6]);
+		$data->addPoint(8, $this->buckets[7]);
+		$data->addPoint(9, $this->buckets[8]);
+		$data->addPoint(10, $this->buckets[9]);
+		$chart->addData($data);
+		$tpl->setVariable("diagram", $chart->getHTML());
+		return $tpl->get();
+	}
+
+	function getAverage() {
+		foreach ($this->average as $student) {
+			$this->fillBuckets($student);
+		}
+	}
+
+	function fillBuckets($average) {
+		if ($average <= 10.00) {
+			$this->buckets[0] ++;
+		} else if ($average > 10.00 && $average <= 20.00) {
+			$this->buckets[1] ++;
+		} else if ($average > 20.00 && $average <= 30.00) {
+			$this->buckets[2] ++;
+		} else if ($average > 30.00 && $average <= 40.00) {
+			$this->buckets[3] ++;
+		} else if ($average > 40.00 && $average <= 50.00) {
+			$this->buckets[4] ++;
+		} else if ($average > 50.00 && $average <= 60.00) {
+			$this->buckets[5] ++;
+		} else if ($average > 60.00 && $average <= 70.00) {
+			$this->buckets[6] ++;
+		} else if ($average > 70.00 && $average <= 80.00) {
+			$this->buckets[7] ++;
+		} else if ($average > 80.00 && $average <= 90.00) {
+			$this->buckets[8] ++;
+		} else if ($average > 90.00 && $average <= 100.00) {
+			$this->buckets[9] ++;
+		} else {
+			//last index checks vor errors
+			$this->buckets[10] ++;
+		}
+	}
+
+}
+
+/**
+ * Creates a Pie Diagramm that shows the number of students with their points in a range of 10%
+ */
+class PieAverageDiagramm extends AverageDiagramm {
+
+	private $average;
+	public $diaPoints = array();
+	private $buckets = array(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+
+	function __construct($Obj) {
+		$this->average = $Obj;
+		$this->getAverage();
+	}
+
+	function initDia() {
+		require_once 'Services/Chart/classes/class.ilChartGrid.php';
+		require_once 'Services/Chart/classes/class.ilChartLegend.php';
+		require_once 'Services/Chart/classes/class.ilChartSpider.php';
+		require_once 'Services/Chart/classes/class.ilChartLegend.php';
+		require_once 'Services/Chart/classes/class.ilChartDataPie.php';
+		$chart = ilChart::getInstanceByType(ilChart::TYPE_PIE, $a_id);
+		$chart->setsize(900, 400);
+		$data = $chart->getDataInstance();
+
+
+
+
+		/* Creation of the Legend */
+		$legend = new ilChartLegend();
+		$legend->setOpacity(50);
+		$chart->setLegend($legend);
+		$legend = $this->legend();
+		/* Width of the colums */
+
+		if ($this->buckets[0] > 0) {
+			$data->addPoint(10, $this->buckets[0]);
+		}
+		if ($this->buckets[1] > 0) {
+			$data->addPoint(20, $this->buckets[1]);
+		}
+		if ($this->buckets[2] > 0) {
+			$data->addPoint(30, $this->buckets[2]);
+		}
+		if ($this->buckets[3] > 0) {
+			$data->addPoint(40, $this->buckets[3]);
+		}
+		if ($this->buckets[4] > 0) {
+			$data->addPoint(50, $this->buckets[4]);
+		}
+		if ($this->buckets[5] > 0) {
+			$data->addPoint(60, $this->buckets[5]);
+		}
+		if ($this->buckets[6] > 0) {
+			$data->addPoint(70, $this->buckets[6]);
+		}
+		if ($this->buckets[7] > 0) {
+			$data->addPoint(80, $this->buckets[7]);
+		}
+		if ($this->buckets[8] > 0) {
+			$data->addPoint(90, $this->buckets[8]);
+		}
+		if ($this->buckets[9] > 0) {
+			$data->addPoint(100, $this->buckets[9]);
+		}
+		$chart->addData($data);
+		return $chart->getHTML();
+	}
+
+	function fillBuckets($average) {
+		if ($average > 0.0 && $average <= 10.00) {
+			$this->buckets[0] ++;
+		} else if ($average > 10.00 && $average <= 20.00) {
+			$this->buckets[1] ++;
+		} else if ($average > 20.00 && $average <= 30.00) {
+			$this->buckets[2] ++;
+		} else if ($average > 30.00 && $average <= 40.00) {
+			$this->buckets[3] ++;
+		} else if ($average > 40.00 && $average <= 50.00) {
+			$this->buckets[4] ++;
+		} else if ($average > 50.00 && $average <= 60.00) {
+			$this->buckets[5] ++;
+		} else if ($average > 60.00 && $average <= 70.00) {
+			$this->buckets[6] ++;
+		} else if ($average > 70.00 && $average <= 80.00) {
+			$this->buckets[7] ++;
+		} else if ($average > 80.00 && $average <= 90.00) {
+			$this->buckets[8] ++;
+		} else if ($average > 90.00 && $average <= 100.00) {
+			$this->buckets[9] ++;
+		} else {
+			//last index checks vor errors
+			$this->buckets[10] ++;
+		}
+	}
+
+	function getAverage() {
+		foreach ($this->average as $student) {
+			$this->fillBuckets($student);
+		}
+	}
+
+}
+
+/**
+ * Creates a bar diagramm for exercises.
+ * The Bucketsize is calculated by a given value from the user
+ */
+class exerciseCharts {
+
+	private $buckets = array();
+	private $bucketSize = array("", "", "", "", "", "", "", "", "", "");
+	private $data = null;
+	private $diagramSize = 0;
+	private $sizeOfBucket = 0;
+	private $overviewId;
+	private $error = false;
+
+	function __construct($diagramSize, $overviewId, $sizeOfBucket) {
+		$this->diagramSize = $diagramSize;
+		$this->overviewId = $overviewId;
+		$this->sizeOfBucket = $sizeOfBucket;
+		$this->bucketsToSmall = false;
+
+		require_once ilPlugin::getPluginObject(IL_COMP_SERVICE, 'Repository', 'robj', 'TestOverview')
+						->getDirectory() . '/classes/mapper/class.ilExerciseMapper.php';
+		$excMapper = new ilExerciseMapper();
+		$this->data = $excMapper->getTotalScores($overviewId);
+		if (empty($this->data)) {
+			$this->data = array();
+		}
+		sort($this->data);
+		if ($this->data[0] == 0) {
+			$this->data = array();
+			$this->bucketsToSmall = true;
+		}
+		if (!(($this->getMaxValue() / $sizeOfBucket) <= 100)) {
+			$this->sizeOfBucket = $this->getMaxValue() / 100;
+			$this->bucketsToSmall = true;
+		}
+		$this->fillArray();
+		if ($this->diagramSize > 0 && !empty($this->data)) {
+			$this->fillBuckets();
+		}
+	}
+
+	function checkData() {
+		return ($this->getMaxValue / $this->sizeOfBucket);
+	}
+
+	function getMaxValue() {
+		return end($this->data);
+	}
+
+	function fillArray() {
+		for ($i = 1; $i <= $this->getMaxValue() / $this->sizeOfBucket; $i++) {
+			array_push($this->buckets, 0);
+		}
+	}
+
+	function fillBuckets() {
+		foreach ($this->data as $value) {
+			$this->buckets[(ceil($value / $this->sizeOfBucket)) - 1] ++;
+		}
+	}
+
+	function getHTML() {
+		global $lng;
+		require_once 'Services/Chart/classes/class.ilChartGrid.php';
+		require_once 'Services/Chart/classes/class.ilChartLegend.php';
+		require_once 'Services/Chart/classes/class.ilChartSpider.php';
+		require_once 'Services/Chart/classes/class.ilChartLegend.php';
+		require_once 'Services/Chart/classes/class.ilChartDataPie.php';
+
+		$chart = ilChart::getInstanceByType(ilChart::TYPE_GRID, 1);
+		$chart->setsize(900, 400);
+		$data = $chart->getDataInstance(ilChartGrid::DATA_BARS);
+		$lng->loadLanguageModule("bibitem");
+		$lng->loadLanguageModule("assessment");
+
+
+		$data->setBarOptions(0.5, "center");
+		/* Creation of the Legend */
+		$tpl = new ilTemplate("tpl.DigramLegend.html", true, true, "Customizing/global/plugins/Services/Repository/RepositoryObject/TestOverview");
+		$tpl->setVariable("number", $lng->txt("bibitem_number"));
+		$tpl->setVariable("percent", $lng->txt("points"));
+		$i = 1;
+		foreach ($this->buckets as $bucket) {
+			$tpl->setCurrentBlock("buckets");
+			$tpl->setVariable("Numbers", $i);
+			$tpl->setVariable("Percents", "&le; " . $this->sizeOfBucket * $i);
+			$tpl->parseCurrentBlock();
+			$i += 1;
+		}
+		if ($i <= 20) {
+			$height = $i * 20;
+			$height .= "px";
+			$tpl->setVariable("Height", $height);
+		} else {
+			$tpl->setVariable("Height", "400px");
+		}
+		$legend = new ilChartLegend();
+		$legend->setOpacity(50);
+		$chart->setLegend($legend);
+		$chart->setYAxisToInteger(true);
+		/* Null Point set to let the diageram start of at (0,0) */
+		$data->addPoint(0, 0);
+		$i = 1;
+		/* Adding the Diagram Points */
+		foreach ($this->buckets as $bucketValue) {
+			if ($bucketValue > 0) {
+				$data->addPoint($i, $bucketValue);
+			}
+			$i = $i + 1;
+		}
+		$chart->addData($data);
+		$tpl->setVariable("diagram", $chart->getHTML());
+		if ($this->bucketsToSmall) {
+			$tpl->setVariable("overSize", $lng->txt("rep_robj_xtov_bucketFail"));
+		}
+		return $tpl->get();
+	}
+
+}
+
+?>
diff --git a/classes/mapper/class.ilDataMapper.php b/classes/mapper/class.ilDataMapper.php
index 6562233..65e58ba 100755
--- a/classes/mapper/class.ilDataMapper.php
+++ b/classes/mapper/class.ilDataMapper.php
@@ -1,31 +1,30 @@
 <?php
+
 /* Copyright (c) 1998-2012 ILIAS open source, Extended GPL, see docs/LICENSE */
 
 /**
- *	@package	TestOverview repository plugin
- *	@category	Core
- *	@author		Greg Saive <gsaive@databay.de>
+ * 	@package	TestOverview repository plugin
+ * 	@category	Core
+ * 	@author		Greg Saive <gsaive@databay.de>
  */
+abstract class ilDataMapper {
 
-abstract class ilDataMapper
-{
 	/**
 	 * @var ilDB
 	 */
 	protected $db;
 
 	/**
-	 *	@var string
+	 * 	@var string
 	 */
 	protected $tableName;
 
 	/**
-	 *	Constructor logic.
+	 * 	Constructor logic.
 	 *
-	 *	Inject database object.
+	 * 	Inject database object.
 	 */
-	public function __construct()
-	{
+	public function __construct() {
 		/**
 		 * @var $ilDB ilDB
 		 */
@@ -35,22 +34,22 @@ public function __construct()
 	}
 
 	/**
-	 *	Retrieve the fields list for the SELECT clause.
+	 * 	Retrieve the fields list for the SELECT clause.
 	 *
-	 *	The getSelectPart() method is called internally
-	 *	to build the SELECT fields list.
+	 * 	The getSelectPart() method is called internally
+	 * 	to build the SELECT fields list.
 	 *
-	 *	@return string
+	 * 	@return string
 	 */
 	abstract protected function getSelectPart();
 
 	/**
-	 *	Retrieve the FROM clause rows.
+	 * 	Retrieve the FROM clause rows.
 	 *
-	 *	The getFromPart() method is called internally
-	 *	to build the FROM rows list, including the JOIN(s).
+	 * 	The getFromPart() method is called internally
+	 * 	to build the FROM rows list, including the JOIN(s).
 	 *
-	 *	@return string
+	 * 	@return string
 	 */
 	abstract protected function getFromPart();
 
@@ -66,13 +65,16 @@ abstract protected function getFromPart();
 	 */
 	abstract protected function getWherePart(array $filters);
 
+	public function dbZurückgeben() {
+		return $this->db;
+	}
+
 	/**
-	 *	Retrieve the relation name
+	 * 	Retrieve the relation name
 	 *
-	 *	@return string
+	 * 	@return string
 	 */
-	public function getTableName()
-	{
+	public function getTableName() {
 		return $this->tableName;
 	}
 
@@ -91,9 +93,8 @@ public function getTableName()
 	 * @param array $conditions
 	 * @return mixed
 	 */
-	public function getValue( $table, $field, array $conditions = array() )
-	{
-		$where = !empty($conditions) ? implode(' AND ', $conditions ) : "TRUE";
+	public function getValue($table, $field, array $conditions = array()) {
+		$where = !empty($conditions) ? implode(' AND ', $conditions) : "TRUE";
 		$query = "
 			SELECT
 				$field
@@ -102,10 +103,10 @@ public function getValue( $table, $field, array $conditions = array() )
 			WHERE
 				$where
 		";
-		$res  = $this->db->query($query);
-		$row  = $this->db->fetchObject($res);
+		$res = $this->db->query($query);
+		$row = $this->db->fetchObject($res);
 
-		return $row->{strtolower($field)} || $row->{strtoupper($field)} ;
+		return $row->{strtolower($field)} || $row->{strtoupper($field)};
 	}
 
 	/**
@@ -126,29 +127,28 @@ public function getValue( $table, $field, array $conditions = array() )
 	 * @throws InvalidArgumentException
 	 * @return array with indexes 'items' and 'cnt'.
 	 */
-	public function getList( array $params = array(), array $filters = array() )
-	{
+	public function getList(array $params = array(), array $filters = array()) {
 		$data = array(
 			'items' => array(),
-			'cnt'   => 0
+			'cnt' => 0
 		);
 
 		$select = $this->getSelectPart();
-		$where  = $this->getWherePart($filters);
-		$from   = $this->getFromPart();
-		$order  = "";
-		$group  = "";
-		$limit  = "";
+		$where = $this->getWherePart($filters);
+		$from = $this->getFromPart();
+		$order = "";
+		$group = "";
+		$limit = "";
 
 		/* Build ORDER BY */
 		if (isset($params['order_field'])) {
-			if (! is_string($params['order_field']))
+			if (!is_string($params['order_field']))
 				throw new InvalidArgumentException("Please provide a valid order field.");
 
-			if (! isset($params['order_direction']))
-				/* Defaulting to ASC(ending) order. */
+			if (!isset($params['order_direction']))
+			/* Defaulting to ASC(ending) order. */
 				$params['order_direction'] = "ASC";
-			elseif (! in_array(strtolower($params['order_direction']),array("asc", "desc")) )
+			elseif (!in_array(strtolower($params['order_direction']), array("asc", "desc")))
 				throw new InvalidArgumentException("Please provide a valid order direction.");
 
 			$order = $params['order_field'] . ' ' . $params['order_direction'];
@@ -156,7 +156,7 @@ public function getList( array $params = array(), array $filters = array() )
 
 		/* Build GROUP BY */
 		if (isset($params['group'])) {
-			if (! is_string($params['group']))
+			if (!is_string($params['group']))
 				throw new InvalidArgumentException("Please provide a valid group field parameter.");
 
 			$group = $params['group'];
@@ -164,12 +164,12 @@ public function getList( array $params = array(), array $filters = array() )
 
 		/* Build LIMIT */
 		if (isset($params['limit'])) {
-			if (! is_numeric($params['limit']))
+			if (!is_numeric($params['limit']))
 				throw new InvalidArgumentException("Please provide a valid numerical limit.");
 
-			if (! isset($params['offset']))
+			if (!isset($params['offset']))
 				$params['offset'] = 0;
-			elseif (! is_numeric($params['offset']))
+			elseif (!is_numeric($params['offset']))
 				throw new InvalidArgumentException("Please provide a valid numerical offset.");
 
 			$this->db->setLimit($params['limit'], $params['offset']);
@@ -184,19 +184,16 @@ public function getList( array $params = array(), array $filters = array() )
 			WHERE
 				$where
 		";
-
-		if (! empty($group))
+		if (!empty($group))
 			$query .= " GROUP BY $group";
-		if (! empty($order))
+		if (!empty($order))
 			$query .= " ORDER BY $order";
 
 		/* Execute query and fetch items. */
 		$result = $this->db->query($query);
 		while ($row = $this->db->fetchObject($result))
 			$data['items'][] = $row;
-
-		if( isset($params['limit']) )
-		{
+		if (isset($params['limit'])) {
 			/* Fill 'cnt' with total count of items */
 			$cntSQL = "SELECT COUNT(*) cnt FROM ($query) subquery";
 			$rowCnt = $this->db->fetchAssoc($this->db->query($cntSQL));
@@ -206,16 +203,15 @@ public function getList( array $params = array(), array $filters = array() )
 	}
 
 	/**
-	 *	Insert data into a relation.
+	 * 	Insert data into a relation.
 	 *
-	 *	This method can be used to execute an INSERT INTO
-	 *	query on the given table name.
+	 * 	This method can be used to execute an INSERT INTO
+	 * 	query on the given table name.
 	 *
-	 *	@params	string	$table	relation name
-	 *	@params	array	$values	fields/values pairs
+	 * 	@params	string	$table	relation name
+	 * 	@params	array	$values	fields/values pairs
 	 */
-	public function insert( $table, array $values )
-	{
+	public function insert($table, array $values) {
 		global $ilDB;
 
 		/* Quote values. */
@@ -229,7 +225,7 @@ public function insert( $table, array $values )
 			else
 				$type = "text";
 
-			$quoted[] = $ilDB->quote( $value, $type );
+			$quoted[] = $ilDB->quote($value, $type);
 		}
 
 		/* Build SQL query. */
@@ -238,9 +234,7 @@ public function insert( $table, array $values )
 				(%s)
 			VALUES
 				(%s)
-			", $table,
-			implode(", ", $fields),
-			implode(", ", $quoted));
+			", $table, implode(", ", $fields), implode(", ", $quoted));
 
 		/* Execute SQL */
 		$ilDB->manipulate($sql);
diff --git a/classes/mapper/class.ilExerciseImport.php b/classes/mapper/class.ilExerciseImport.php
new file mode 100644
index 0000000..ad4e731
--- /dev/null
+++ b/classes/mapper/class.ilExerciseImport.php
@@ -0,0 +1,63 @@
+<?php
+
+/* Copyright (c) 1998-2012 ILIAS open source, Extended GPL, see docs/LICENSE */
+
+/**
+ * 	@package	TestOverview repository plugin
+ * 	@category	Core
+ * 	@author		Jan Ruthardt <janruthardt@web.de>
+ *
+ * This class creates and deletes the given ExerciseIds and OverviewIds in the DB to create a relation between them
+ */
+class ExerciseImport {
+
+	/**
+	 *
+	 * @global type $ilDB
+	 * @param type $overviewId
+	 * @param type $exerciseId
+	 */
+	public function createEntry($overviewId, $exerciseId) {
+		global $ilDB;
+
+		$obj_id = $this->getObjectRef($exerciseId);
+		$query = "INSERT IGNORE INTO rep_robj_xtov_e2o (obj_id_overview,obj_id_exercise)
+                  VALUES (" . $overviewId . "," . $obj_id . ")";
+
+		$ilDB->manipulate($query);
+	}
+
+	/**
+	 *
+	 * @global type $ilDB
+	 * @param type $refId
+	 * @return Int
+	 */
+	public function getObjectRef($refId) {
+		global $ilDB;
+
+		$query = "SELECT obj_id FROM object_reference
+                  WHERE ref_id = '" . $refId . "'";
+
+		$result = $ilDB->query($query);
+		$obj_id = $ilDB->fetchObject($result);
+		return $obj_id->obj_id;
+	}
+
+	/**
+	 *
+	 * @param type $overviewId
+	 * @param type $exerciseId
+	 */
+	public function deleteEntry($exerciseId) {
+		global $ilDB;
+
+		$query = "DELETE FROM rep_robj_xtov_e2o
+                  WHERE obj_id_exercise = '" . $exerciseId . "'";
+
+		$affected_rows = $ilDB->manipulate($query);
+	}
+
+}
+
+?>
diff --git a/classes/mapper/class.ilExerciseMapper.php b/classes/mapper/class.ilExerciseMapper.php
new file mode 100644
index 0000000..e6c99bd
--- /dev/null
+++ b/classes/mapper/class.ilExerciseMapper.php
@@ -0,0 +1,477 @@
+<?php
+
+/* Copyright (c) 1998-2012 ILIAS open source, Extended GPL, see docs/LICENSE */
+
+/**
+ * 	@package	TestOverview repository plugin
+ * 	@category	Core
+ * 
+ * 	@author		Jan Ruthardt <janruthardt@web.de>
+ *  @author		Benedict Steuerlein <st111340@stud.uni-stuttgart.de>
+ *  @author		Martin Dinkel <hmdinkel@web.de>
+ * 
+ *  Maps the selected exercises, the students that participated in them (and the selected groups from the table p2o) 
+ *	into the ExerciseOverview Table
+ * 
+ *  @ilCtrl_Calls ilExerciseMapper: ilObjExerciseGUI
+ * */
+require_once ilPlugin::getPluginObject(IL_COMP_SERVICE, 'Repository', 'robj', 'TestOverview')
+				->getDirectory() . '/classes/mapper/class.ilDataMapper.php';
+
+class ilExerciseMapper extends ilDataMapper {
+
+	public $lng;
+
+	public function setParent($lng) {
+		$this->lng = $lng;
+	}
+
+	/**
+	 * 	@var string
+	 */
+	protected $tableName = "rep_robj_xtov_overview overview";
+
+	/**
+	 * 	@see ilDataMapper::getSelectPart()
+	 */
+	public function getSelectPart() {
+		$fields = array(
+			"participants.obj_id_grpcrs obj_id",);
+
+		return implode(', ', $fields);
+	}
+
+	/**
+	 * 	@see ilDataMapper::getFromPart()
+	 */
+	public function getFromPart() {
+		$joins = array(
+			"JOIN rep_robj_xtov_p2o participants
+				ON (overview.obj_id = participants.obj_id_overview)",);
+
+
+		return $this->tableName . " " . implode(' ', $joins);
+	}
+
+	/**
+	 * 	@see ilDataMapper::getWherePart()
+	 */
+	public function getWherePart(array $filters) {
+		$conditions = array("1 = 1");
+
+		if (!empty($filters['overview_id'])) {
+			$conditions[] = sprintf(
+					"overview.obj_id = " . $this->db->quote($filters['overview_id'], 'integer'));
+		}
+
+		return implode(' AND ', $conditions);
+	}
+
+	/**
+	 * Get all exercise participants and their results
+	 */
+	public function getArrayofObjects($overviewID) {
+		global $ilDB;
+		$DbObject = array();
+
+		$query = "SELECT 
+					ut_lp_marks.usr_id AS user_id,
+					firstname,
+					lastname,
+					obj_id,
+					mark
+				FROM
+					rep_robj_xtov_e2o
+				JOIN
+					ut_lp_marks
+				JOIN
+					usr_data ON (rep_robj_xtov_e2o.obj_id_exercise = ut_lp_marks.obj_id
+				AND ut_lp_marks.usr_id = usr_data.usr_id)
+				WHERE
+					obj_id_overview = %s
+				ORDER BY obj_id DESC";
+
+		$result = $ilDB->queryF($query, array('integer'), array($overviewID));
+		while ($record = $ilDB->fetchObject($result)) {
+			array_push($DbObject, $record);
+		}
+
+		return $DbObject;
+	}
+
+	/**
+	 * Returns the name of an exercise
+	 */
+	public function getExerciseName($exerciseID) {
+		global $ilDB;
+		$query = "SELECT title FROM object_data WHERE obj_id = %s";
+		$result = $ilDB->queryF($query, array('integer'), array($exerciseID));
+		$record = $ilDB->fetchAssoc($result);
+		return $record['title'];
+	}
+
+	/**
+	 * 
+	 * @global type $ilDB
+	 * @param integer $studID
+	 * @return String Name of a stundent for a given studId
+	 */
+	public function getStudName($studID) {
+		global $ilDB;
+		$query = "SELECT usr_id ,firstname ,lastname FROM usr_data
+                WHERE usr_id = '" . $studID . "'";
+		$result = $ilDB->query($query);
+		$record = $ilDB->fetchObject($result);
+
+		return $record->firstname . " " . $record->lastname;
+	}
+
+	/**
+	 * Renders the HTML code into the given template
+	 */
+	public function getHtml($overviewID) {
+
+		global $lng, $ilCtrl;
+		$matrix = $this->buildMatrix($overviewID);
+		$tests = $this->getUniqueExerciseId($overviewID);
+		$tpl = new ilTemplate("tpl.exercise_view.html", true, true, "Customizing/global/plugins/Services/Repository/RepositoryObject/TestOverview");
+		$lng->loadLanguageModule("assessment");
+		$tpl->setCurrentBlock("user_colum");
+		$tpl->setVariable("user", $lng->txt("eval_search_users"));
+		$tpl->parseCurrentBlock();
+		foreach ($exercises as $exercise) {
+
+			$ilCtrl->setParameterByClass('ilobjexercisegui', 'ref_id', $this->getRefId($exercise));
+			//URL to exercise
+			$txt = "<th><a href='" . $ilCtrl->getLinkTargetByClass('ilobjexercisegui', "infoScreen") . "'>" . $this->getExerciseName($exercise) . "</a></th>";
+			$tpl->setCurrentBlock("exercise_colum");
+			$tpl->setVariable("colum", $txt);
+			$tpl->parseCurrentBlock();
+		}
+		$tpl->setCurrentBlock("score_colum");
+		$tpl->setVariable("score", $lng->txt("tst_mark"));
+		$tpl->parseCurrentBlock();
+		foreach ($matrix as $row) {
+			$txt = "<tr>";
+			$subString = "";
+			$totalScore = 0;
+			foreach ($row as $field) {
+				$subString .= "<th>";
+				$subString .= $field;
+				$subString .= "</th>";
+				$totalScore += $field;
+			}
+			$txt .= $subString;
+			$txt .= "<th>";
+			$txt .= $totalScore;
+			$txt .= "</th>";
+			$totalScore = 0;
+			$txt .= "</tr>";
+			$tpl->setCurrentBlock("exercise_row");
+			$tpl->setVariable("data", $txt);
+			$tpl->parseCurrentBlock();
+		}
+		return $tpl->get();
+	}
+
+	/**
+	 *
+	 * @param type $overviewID
+	 * @return array Is an Array of array
+	 * the inner arrays have as the first element the studID, all elements after the studID are marks for the exercise
+	 */
+	public function buildMatrix($overviewID) {
+
+		$DbObject = $this->getArrayofObjects($overviewID);
+		$tests = $this->getUniqueExerciseId($overviewID);
+		$users = $this->getUniqueUserId($overviewID);
+		$outerArray = array();
+		for ($i = 0; $i < count($users); $i++) {
+			$innerArray = array();
+			$user = $this->getStudName($users[$i]);
+			array_push($innerArray, $user);
+			for ($j = 0; $j < count($tests); $j++) {
+				$mark = $this->getMark($users[$i], $tests[$j], $DbObject);
+				if ($mark > 0) {
+					//array_push($innerArray, $mark);
+					array_push($innerArray, $mark);
+				} else {
+					array_push($innerArray, $mark);
+				}
+			}
+			array_push($outerArray, $innerArray);
+		}
+
+		return $outerArray;
+	}
+
+	/**
+	 * 
+	 * @param int $userID
+	 * @param int $testID
+	 * @param type $Db
+	 * @return int Mark of a user for a specific exercise 
+	 */
+	public function getMark($userID, $testID, $Db) {
+		foreach ($Db as $row) {
+			if ($row->user_id == $userID AND $row->obj_id == $testID) {
+				if ($row->mark != null) {
+					return $row->mark;
+				} else {
+					return 0;
+				}
+			}
+		}
+		return 0;
+	}
+
+	/**
+	 *
+	 * @global type $ilDB
+	 * @param type $overviewID
+	 * @return array of Integer Exercise ID's
+	 */
+	public function getUniqueExerciseId($overviewID) {
+		global $ilDB;
+		$UniqueIDs = array();
+		$query = "SELECT 
+                    DISTINCT (exr.obj_id)
+                FROM
+                    rep_robj_xtov_e2o e2o
+                JOIN  
+                    exc_returned exr ON e2o.obj_id_exercise = exr.obj_id
+                JOIN 
+                    exc_mem_ass_status exmem  ON exr.user_id = exmem.usr_id
+                JOIN
+                    usr_data ud ON exmem.usr_id = ud.usr_id
+                JOIN 
+                    object_reference ref ON ref.obj_id = e2o.obj_id_exercise
+                WHERE
+                    exr.ass_id = exmem.ass_id
+                    AND e2o.obj_id_overview = %s
+                    AND ref.deleted IS NULL
+                    ORDER BY exr.obj_id";
+		$result = $ilDB->queryF($query, array('integer'), array($overviewID));
+		while ($record = $ilDB->fetchObject($result)) {
+			array_push($UniqueIDs, $record->obj_id);
+		}
+		return $UniqueIDs;
+	}
+
+	/**
+	 *
+	 * @global type $ilDB
+	 * @param type $overviewID
+	 * @return array of Integer User ID's
+	 */
+	public function getUniqueUserId($overviewID) {
+		global $ilDB;
+		$UniqueIDs = array();
+		$query = "SELECT 
+					  usr_id
+				FROM
+					(SELECT DISTINCT
+					  (exc_mem_ass_status.usr_id), exc_returned.obj_id
+					FROM
+					  rep_robj_xtov_e2o, exc_returned, exc_mem_ass_status
+					JOIN usr_data ON (exc_mem_ass_status.usr_id = usr_data.usr_id)
+					WHERE
+				  exc_returned.ass_id = exc_mem_ass_status.ass_id
+					AND user_id = exc_mem_ass_status.usr_id
+					AND obj_id_exercise = obj_id
+					AND obj_id_overview = %s
+					ORDER BY exc_mem_ass_status.usr_id) users
+				  JOIN
+					object_reference ON (users.obj_id = object_reference.obj_id)
+				  WHERE
+					deleted IS NULL";
+		$result = $ilDB->queryF($query,array('integer'),array($overviewID));
+		while ($record = $ilDB->fetchObject($result)) {
+			array_push($UniqueIDs, $record->usr_id);
+		}
+		return $UniqueIDs;
+	}
+
+	/**
+	 * 
+	 * @param type $overviewID
+	 * @return array containing the sum of points for every student in all exercises
+	 */
+	public function getTotalScores($overviewID) {
+		$data = array();
+		$results = $this->buildMatrix($overviewID);
+		if (!empty($results)) {
+			foreach ($results as $row) {
+				$totalScore = 0;
+				foreach ($row as $colum) {
+					$totalScore += $colum;
+				}
+				array_push($data, $totalScore);
+			}
+			return $data;
+		}
+	}
+	/**
+	 * 
+	 * @global type $ilDB
+	 * @param type $ObjId
+	 * @return int ref_id for a given obj_id 
+	 */
+	public function getRefId($ObjId) {
+		global $ilDB;
+		$query = "SELECT
+					ref_id 
+				FROM 
+					object_reference 
+				WHERE 
+					obj_id = %s";
+		$result = $ilDB->queryF($query, array('integer'), array($ObjId));
+
+		$record = $ilDB->fetchAssoc($result);
+
+		return $record['ref_id'];
+	}
+
+	/**
+	 * This method is used to edit the ranking in the database
+	 * @param type $average
+	 * @param type $studid
+	 * @param type $toId
+	 */
+	public function setData2Rank($average, $studid, $eoId) {
+		$query = "REPLACE INTO
+                                    rep_robj_xtov_eorank(stud_id, rank, eo_id)
+                            Values
+                                    ($studid,$average,$eoId);";
+		$this->db->query($query);
+	}
+
+	/**
+	 * Delete all rankings for a TestOverview object
+	 * @param type $id
+	 */
+	public function resetRanks($id) {
+		$query = "DELETE FROM rep_robj_xtov_eorank WHERE eo_id=$id";
+		$this->db->query($query);
+	}
+
+	/**
+	 * 
+	 * @param type $id
+	 * @return  a list of students which is sorted by rank
+	 */
+	public function getRankedList($id) {
+		$query = "SELECT 
+					stud_id 
+				FROM 
+					rep_robj_xtov_eorank 
+				WHERE 
+					eo_id= %s 
+				ORDER BY rank ASC "
+		;
+
+		$result = $this->db->queryF($query,array('integer'), array($id));
+		return $result;
+	}
+
+	/**
+	 * Gets the rank of a student
+	 * @global type $ilDB
+	 * @param type $id
+	 * @param type $stdID
+	 * @return int
+	 */
+	public function getRankedStudent($id, $stdID) {
+		global $ilDB;
+		$rank = 0;
+		$query = "SELECT stud_id FROM `rep_robj_xtov_eorank` WHERE eo_id=$id ORDER BY rank DESC "
+		;
+
+		$result = $this->db->query($query);
+		$index = 1;
+		while ($student = $ilDB->fetchAssoc($result)) {
+			if ($student[stud_id] === $stdID) {
+				$rank = $index;
+				break;
+			}
+			$index++;
+		}
+		return $rank;
+	}
+	/**
+	 * 
+	 * @global type $ilDB
+	 * @param type $id
+	 * @return int counts the database entries in rep_robj_xtov_eorank
+	 */
+	public function getCount($id) {
+
+		global $ilDB;
+		$count = 0;
+		$query = "SELECT stud_id FROM `rep_robj_xtov_eorank` WHERE eo_id=$id "
+		;
+
+		$result = $this->db->query($query);
+		while ($data = $ilDB->fetchAssoc($result)) {
+			$count++;
+		}
+
+		return $count;
+	}
+	/**
+	 * 
+	 * @global type $ilDB
+	 * 
+	 * writes the current date into the database
+	 */
+	public function createDate($o_id) {
+		global $ilDB;
+		$timestamp = time();
+		$datum = (float) date("YmdHis", $timestamp);
+
+		$query = "REPLACE INTO
+                                    rep_robj_xtov_rankdate (rankdate, otype,o_id)
+                            Values
+                                    ($datum,'eo',$o_id);";
+		$this->db->query($query);
+	}
+	
+	public function getDate($o_id) {
+		global $ilDB;
+		$query = "SELECT rankdate FROM rep_robj_xtov_rankdate WHERE o_id= %s AND otype='eo'";
+
+		$result = $this->db->queryF($query, array('integer'), array($o_id));
+		$rankDate = array();
+
+		while ($date = $ilDB->fetchAssoc($result)) {
+			$rankDate = $date['rankdate'];
+		}
+
+		return $rankDate;
+	}
+
+	/**
+	 * 	Get pairs of Participants groups
+	 *
+	 * 	This method can be used to list groups in a
+	 * 	HTML <select>. The index in the returned array
+	 * 	corresponds to the groups' obj_id and the value
+	 * 	is the groups' title.
+	 *
+	 * 	@param	integer	$overviewId
+	 * 	@return array	Where index = obj_id and value = group title
+	 */
+	public function getGroupPairs($overviewId) {
+		$pairs = array();
+		$rawData = $this->getList(array(), array("overview_id" => $overviewId));
+		foreach ($rawData['items'] as $item) {
+			$object = ilObjectFactory::getInstanceByObjId($item->obj_id, false);
+			$pairs[$item->obj_id] = $object->getTitle();
+		}
+
+		return $pairs;
+	}
+
+}
+
+?>
diff --git a/classes/mapper/class.ilExerciseSettingsMapper.php b/classes/mapper/class.ilExerciseSettingsMapper.php
new file mode 100644
index 0000000..9d31646
--- /dev/null
+++ b/classes/mapper/class.ilExerciseSettingsMapper.php
@@ -0,0 +1,57 @@
+<?php
+
+/* Copyright (c) 1998-2012 ILIAS open source, Extended GPL, see docs/LICENSE */
+/**
+*	@author		Jan Ruthardt <janruthardt@web.de>
+*	@author		Benedict Steuerlein <st111340@stud.uni-stuttgart.de>
+*	@author		Martin Dinkel <hmdinkel@web.de>
+* 
+*	Mapper for displaying all added exercises in the subtab Exercise Administration 
+*/
+class ilExerciseSettingsMapper extends ilDataMapper {
+
+	/**
+	 * @var string
+	 */
+	protected $tableName = 'rep_robj_xtov_e2o';
+	/**
+	 * 
+	 * @return string
+	 */
+	protected function getSelectPart() {
+		$fields = array(
+			'DISTINCT (ref.obj_id)',
+			'od.title',
+			'od.description'
+		);
+
+		return implode(', ', $fields);
+	}
+	/**
+	 * 
+	 * @return string
+	 */
+	protected function getFromPart() {
+		$joins = array(
+			'INNER JOIN object_reference ref ON (rep_robj_xtov_e2o.obj_id_exercise = ref.obj_id AND ref.deleted IS NULL)',
+			"INNER JOIN object_data od ON (ref.obj_id = od.obj_id) AND od.type = 'exc'"
+		);
+
+		return $this->tableName . ' ' . implode(' ', $joins);
+	}
+	/**
+	 * 
+	 * @param array $filters
+	 * @return string
+	 */
+	protected function getWherePart(array $filters) {
+		$conditions = array('rep_robj_xtov_e2o.obj_id_overview = ' . $this->db->quote($filters['overview_id'], 'integer'));
+
+		if (isset($filters['flt_tst_name']) && !empty($filters['flt_tst_name'])) {
+			$conditions[] = $this->db->like('od.title', 'text', '%' . $filters['flt_tst_name'] . '%', false);
+		}
+
+		return implode(' AND ', $conditions);
+	}
+
+}
diff --git a/classes/mapper/class.ilMembershipMapper.php b/classes/mapper/class.ilMembershipMapper.php
index 5ababd8..6d7f9ea 100755
--- a/classes/mapper/class.ilMembershipMapper.php
+++ b/classes/mapper/class.ilMembershipMapper.php
@@ -1,29 +1,27 @@
 <?php
+
 /* Copyright (c) 1998-2012 ILIAS open source, Extended GPL, see docs/LICENSE */
 
 /**
- *	@package	TestOverview repository plugin
- *	@category	Core
- *	@author		Greg Saive <gsaive@databay.de>
+ * 	@package	TestOverview repository plugin
+ * 	@category	Core
+ * 	@author		Greg Saive <gsaive@databay.de>
  */
-
 /* Internal : */
 require_once ilPlugin::getPluginObject(IL_COMP_SERVICE, 'Repository', 'robj', 'TestOverview')
 				->getDirectory() . '/classes/mapper/class.ilDataMapper.php';
 
-class ilMembershipMapper
-	extends ilDataMapper
-{
+class ilMembershipMapper extends ilDataMapper {
+
 	/**
-	 *	@var string
+	 * 	@var string
 	 */
 	protected $tableName = "rbac_ua ua";
 
 	/**
-	 *	@see ilDataMapper::getSelectPart()
+	 * 	@see ilDataMapper::getSelectPart()
 	 */
-	public function getSelectPart()
-	{
+	public function getSelectPart() {
 		$fields = array(
 			"DISTINCT obd.obj_id",
 			"obd.type",
@@ -34,21 +32,17 @@ public function getSelectPart()
 	}
 
 	/**
-	 *	@see ilDataMapper::getFromPart()
+	 * 	@see ilDataMapper::getFromPart()
 	 */
-	public function getFromPart()
-	{
-		if(version_compare(ILIAS_VERSION_NUMERIC, '4.5.0') >= 0)
-		{
+	public function getFromPart() {
+		if (version_compare(ILIAS_VERSION_NUMERIC, '4.5.0') >= 0) {
 			$joins = array(
 				"JOIN rbac_fa fa ON ua.rol_id = fa.rol_id",
 				"JOIN tree t1 ON t1.child = fa.parent",
 				"JOIN object_reference obr ON t1.child = obr.ref_id",
 				"JOIN object_data obd ON obr.obj_id = obd.obj_id"
 			);
-		}
-		else
-		{
+		} else {
 			$joins = array(
 				"JOIN rbac_fa fa ON ua.rol_id = fa.rol_id",
 				"JOIN tree t1 ON t1.child = fa.parent",
@@ -61,24 +55,23 @@ public function getFromPart()
 	}
 
 	/**
-	 *	@see ilDataMapper::getWherePart()
+	 * 	@see ilDataMapper::getWherePart()
 	 */
-	public function getWherePart(array $filters)
-	{
+	public function getWherePart(array $filters) {
 		global $ilUser;
 
 		$conditions = array(
 			"obr.deleted IS NULL",
 			"fa.assign = 'y'",
-			$this->db->in('obd.type', array('crs', 'grp'), false, 'text'),
+			$this->db->in('obd.type', array('grp'), false, 'text'),
 			"ua.usr_id = " . $this->db->quote($ilUser->getId(), 'integer'),);
 
-		if (! empty($filters['flt_grp_name'])) {
+		if (!empty($filters['flt_grp_name'])) {
 			$conditions[] = sprintf(
-				"obd.title LIKE %s",
-				$this->db->quote("%" . $filters['flt_grp_name'] . "%", 'text'));
+					"obd.title LIKE %s", $this->db->quote("%" . $filters['flt_grp_name'] . "%", 'text'));
 		}
 
 		return implode(' AND ', $conditions);
 	}
+
 }
diff --git a/classes/mapper/class.ilOverviewMapper.php b/classes/mapper/class.ilOverviewMapper.php
index 54ae15f..1c2dd19 100755
--- a/classes/mapper/class.ilOverviewMapper.php
+++ b/classes/mapper/class.ilOverviewMapper.php
@@ -1,29 +1,27 @@
 <?php
+
 /* Copyright (c) 1998-2012 ILIAS open source, Extended GPL, see docs/LICENSE */
 
 /**
- *	@package	TestOverview repository plugin
- *	@category	Core
- *	@author		Greg Saive <gsaive@databay.de>
+ * 	@package	TestOverview repository plugin
+ * 	@category	Core
+ * 	@author		Greg Saive <gsaive@databay.de>
  */
-
 /* Internal : */
 require_once ilPlugin::getPluginObject(IL_COMP_SERVICE, 'Repository', 'robj', 'TestOverview')
 				->getDirectory() . '/classes/mapper/class.ilDataMapper.php';
 
-class ilOverviewMapper
-	extends ilDataMapper
-{
+class ilOverviewMapper extends ilDataMapper {
+
 	/**
-	 *	@var string
+	 * 	@var string
 	 */
 	protected $tableName = "rep_robj_xtov_overview overview";
 
 	/**
-	 *	@see ilDataMapper::getSelectPart()
+	 * 	@see ilDataMapper::getSelectPart()
 	 */
-	public function getSelectPart()
-	{
+	public function getSelectPart() {
 		$fields = array(
 			"participants.obj_id_grpcrs obj_id",);
 
@@ -31,10 +29,9 @@ public function getSelectPart()
 	}
 
 	/**
-	 *	@see ilDataMapper::getFromPart()
+	 * 	@see ilDataMapper::getFromPart()
 	 */
-	public function getFromPart()
-	{
+	public function getFromPart() {
 		$joins = array(
 			"JOIN rep_robj_xtov_p2o participants
 				ON (overview.obj_id = participants.obj_id_overview)",);
@@ -43,34 +40,32 @@ public function getFromPart()
 	}
 
 	/**
-	 *	@see ilDataMapper::getWherePart()
+	 * 	@see ilDataMapper::getWherePart()
 	 */
-	public function getWherePart(array $filters)
-	{
+	public function getWherePart(array $filters) {
 		$conditions = array("1 = 1");
 
-		if (! empty($filters['overview_id'])) {
+		if (!empty($filters['overview_id'])) {
 			$conditions[] = sprintf(
-				"overview.obj_id = " . $this->db->quote($filters['overview_id'], 'integer'));
+					"overview.obj_id = " . $this->db->quote($filters['overview_id'], 'integer'));
 		}
 
 		return implode(' AND ', $conditions);
 	}
 
 	/**
-	 *	Get pairs of Participants groups.
+	 * 	Get pairs of Participants groups
 	 *
-	 *	This method can be used to list groups in a
-	 *	HTML <select>. The index in the returned array
-	 *	corresponds to the groups' obj_id and the value
-	 *	is the groups' title.
+	 * 	This method can be used to list groups in a
+	 * 	HTML <select>. The index in the returned array
+	 * 	corresponds to the groups' obj_id and the value
+	 * 	is the groups' title.
 	 *
-	 *	@param	integer	$overviewId
-	 *	@return array	Where index = obj_id and value = group title
+	 * 	@param	integer	$overviewId
+	 * 	@return array	Where index = obj_id and value = group title
 	 */
-	public function getGroupPairs($overviewId)
-	{
-		$pairs   = array();
+	public function getGroupPairs($overviewId) {
+		$pairs = array();
 		$rawData = $this->getList(array(), array("overview_id" => $overviewId));
 		foreach ($rawData['items'] as $item) {
 			$object = ilObjectFactory::getInstanceByObjId($item->obj_id, false);
@@ -81,24 +76,23 @@ public function getGroupPairs($overviewId)
 	}
 
 	/**
+	 * 
 	 * @param array $obj_ids
 	 * @return array
 	 */
-	public function getUniqueTestParticipants(array $obj_ids)
-	{
-		$in_tst_std   = $this->db->in('tst_std.obj_fi', $obj_ids, false, 'integer');
+	public function getUniqueTestParticipants(array $obj_ids) {
+		$in_tst_std = $this->db->in('tst_std.obj_fi', $obj_ids, false, 'integer');
 		$in_tst_fixed = $this->db->in('tst_fixed.obj_fi', $obj_ids, false, 'integer');
-
-		$query   = "
+		$query = "
 			(SELECT act.user_fi
 			FROM tst_tests tst_std
 			INNER JOIN object_data ON object_data.obj_id = tst_std.obj_fi AND object_data.type = 'tst'
 			INNER JOIN tst_active act
 				ON act.test_fi = tst_std.test_id
 			INNER JOIN usr_data ud_std
-				ON ud_std.usr_id = act.user_fi
+			ON ud_std.usr_id = act.user_fi
 			WHERE $in_tst_std)
-			UNION 
+			UNION
 			(SELECT inv.user_fi
 			FROM tst_tests tst_fixed
 			INNER JOIN object_data ON object_data.obj_id = tst_fixed.obj_fi AND object_data.type = 'tst'
@@ -108,16 +102,141 @@ public function getUniqueTestParticipants(array $obj_ids)
 				ON ud_fixed.usr_id = inv.user_fi
 			WHERE $in_tst_fixed)
 			";
-		$res     = $this->db->query($query);
+		$res = $this->db->query($query);
 		$usr_ids = array();
-		while($row = $this->db->fetchAssoc($res))
-		{
-			$usr_ids[] = (int)$row['user_fi'];
+		while ($row = $this->db->fetchAssoc($res)) {
+			$usr_ids[] = (int) $row['user_fi'];
 		}
-
-		$data        = array('items' => array_unique($usr_ids));
+		$data = array('items' => array_unique($usr_ids));
 		$data['cnt'] = 0;
 
 		return $data;
 	}
+
+	function getVirtuellTableName() {
+		return "rep_robj_xtov_overview_virtual";
+	}
+
+	/**
+	 * This method is used to edit the ranking in the database 
+	 * @param type $average
+	 * @param type $studid
+	 * @param type $toId
+	 */
+	public function setData2Rank($average, $studid, $toId) {
+		$query = "REPLACE INTO 
+                                    rep_robj_xtov_torank (stud_id, rank, to_id)
+                            Values
+                                    ($studid,$average,$toId);";
+		$this->db->query($query);
+	}
+
+	/**
+	 * Delete all rankings for a TestOverview Object
+	 * @param type $id
+	 */
+	public function resetRanks($id) {
+		$query = "DELETE FROM `rep_robj_xtov_torank` WHERE to_id=$id";
+		$this->db->query($query);
+	}
+
+	/**
+	 * Gets a list of students which is sorted by ranking
+	 * @param type $id
+	 * @return type
+	 */
+	public function getRankedList($id) {
+		$query = "SELECT stud_id FROM rep_robj_xtov_torank WHERE to_id=$id ORDER BY rank ASC "
+		;
+
+		$result = $this->db->query($query);
+		return $result;
+	}
+
+	/**
+	 * Gets the ranking of a student
+	 * @global type $ilDB
+	 * @param type $id
+	 * @param type $stdID
+	 * @return int
+	 */
+	public function getRankedStudent($id, $stdID) {
+		global $ilDB;
+		$rank = 0;
+		$query = "SELECT stud_id FROM rep_robj_xtov_torank WHERE to_id=$id ORDER BY rank DESC "
+		;
+
+		$result = $this->db->query($query);
+		$index = 1;
+		while ($student = $ilDB->fetchAssoc($result)) {
+			if ($student[stud_id] === $stdID) {
+				$rank = $index;
+				break;
+			}
+			$index++;
+		}
+		return $rank;
+	}
+
+        /**
+         * writes a Date to rep_robj_xtov_rankdate
+         * 
+         * @global type $ilDB
+         * @param type $o_id
+         */
+	public function createDate($o_id) {
+		global $ilDB;
+		$timestamp = time();
+		$datum = (float) date("YmdHis", $timestamp);
+
+		$query = "REPLACE INTO 
+                                    rep_robj_xtov_rankdate (rankdate, otype,o_id)
+                            Values
+                                    ($datum,'to',$o_id);";
+		$this->db->query($query);
+	}
+
+        /**
+         * 
+         * @global type $ilDB
+         * @param type $o_id
+         * @return type
+         */
+	public function getDate($o_id) {
+		global $ilDB;
+		$query = "SELECT rankdate FROM rep_robj_xtov_rankdate WHERE o_id=$o_id AND otype='to'"
+		;
+
+		$result = $this->db->query($query);
+		$rankDate = array();
+
+		while ($date = $ilDB->fetchAssoc($result)) {
+			$rankDate = $date['rankdate'];
+		}
+
+		return $rankDate;
+	}
+
+        /**
+         * Get the count of entries in rep_robj_xtov_torank
+         * 
+         * @global type $ilDB
+         * @param type $id
+         * @return int
+         */
+	public function getCount($id) {
+
+		global $ilDB;
+		$count = 0;
+		$query = "SELECT stud_id FROM rep_robj_xtov_torank WHERE to_id=$id "
+		;
+
+		$result = $this->db->query($query);
+		while ($data = $ilDB->fetchAssoc($result)) {
+			$count++;
+		}
+
+		return $count;
+	}
+
 }
diff --git a/classes/mapper/class.ilOverviewStudent.php b/classes/mapper/class.ilOverviewStudent.php
new file mode 100644
index 0000000..273b11f
--- /dev/null
+++ b/classes/mapper/class.ilOverviewStudent.php
@@ -0,0 +1,284 @@
+<?php
+
+/* Copyright (c) 1998-2012 ILIAS open source, Extended GPL, see docs/LICENSE */
+
+/**
+ * 	@package	TestOverview repository plugin
+ * 	@category	Core
+ * 
+ * 	@author		Jan Ruthardt <janruthardt@web.de>
+ *  @author		Benedict Steuerlein <st111340@stud.uni-stuttgart.de>
+ *  @author		Martin Dinkel <hmdinkel@web.de>
+ *
+ *
+ * DB Mapper for the Student View (User with read-only permissons)
+ */
+class studentMapper {
+    /**
+     * 
+     * @global type $ilDB
+     * @param type $studId
+     * @param type $testRefId
+     * @return type student result of the last run of a test
+     * 
+     */
+    public function getTestData($studId,$testRefId){
+        global $ilDB;
+        $query = "SELECT DISTINCT
+					title,
+					points,
+					ref_id,
+					maxpoints,
+					tst_pass_result.tstamp,
+					tst_tests.ending_time,
+					ending_time_enabled AS timeded
+				FROM
+					object_reference
+				JOIN
+					tst_tests
+				JOIN
+					tst_active
+				JOIN
+					tst_pass_result
+				JOIN
+					object_data ON (object_reference.obj_id = tst_tests.obj_fi
+				AND tst_active.test_fi = tst_tests.test_id
+				AND tst_active.active_id = tst_pass_result.active_fi
+				AND object_reference.obj_id = object_data.obj_id)
+				AND tst_active.user_fi = %s
+				AND ref_id = %s
+				ORDER BY tst_pass_result.tstamp DESC
+				LIMIT 1
+                ";
+        $result = $ilDB->queryF($query,array('integer','integer'), array($studId,$testRefId));
+       return  $ilDB->fetchObject($result);
+        
+    }
+
+   
+    
+    
+    /**
+     * Gives back the Results for the given Student and TestOverview ID 
+     * @global type $ilDB
+     * @param type $studId
+     * @param type $overviewId
+     * @return string
+     */
+    public function getResults($studId, $overviewId) {
+        global $ilDB, $lng;
+        $average;
+        $maxPoints;
+
+        $data = array();
+        
+        $query = "SELECT ref_id_test FROM rep_robj_xtov_t2o WHERE obj_id_overview = %s";
+        $result = $ilDB->queryF($query, array('integer'), array($overviewId));
+        $tpl = new ilTemplate("tpl.stud_view.html", true, true, "Customizing/global/plugins/Services/Repository/RepositoryObject/TestOverview");
+        //Internationalization
+        $lng->loadLanguageModule("assessment");
+        $lng->loadLanguageModule("certificate");
+        $lng->loadLanguageModule("rating");
+        $lng->loadLanguageModule("common");
+        $lng->loadLanguageModule("trac");
+        $tpl->setCurrentBlock("head_row");
+        $tpl->setVariable("test", $lng->txt("rep_robj_xtov_testOverview"));
+        $tpl->setVariable("exercise", $lng->txt("rep_robj_xtov_ex_overview"));
+        $tpl->setVariable("testTitle", $lng->txt("certificate_ph_testtitle"));
+        $tpl->setVariable("score", $lng->txt("toplist_col_score"));
+        $tpl->parseCurrentBlock();
+        $tpl->setVariable("average", $lng->txt('rep_robj_xtov_avg_points'));
+        $tpl->setVariable("averagePercent", $lng->txt("trac_average"));
+        $tpl->setVariable("exerciseTitle", $lng->txt("certificate_ph_exercisetitle"));
+        $tpl->setVariable("mark", $lng->txt("tst_mark"));
+        $tpl->setVariable("studentRanking", $lng->txt("toplist_your_result"));
+        //Baut aus den Einzelnen Zeilen Objekte
+        while ($testObj = $ilDB->fetchObject($result)) {
+            array_push($data, $testObj);
+        }
+
+
+        foreach ($data as $set) {
+            $result = $this-> getTestData($studId,$set->ref_id_test);
+            $timestamp = time();
+            //$datum = (float) date("YmdHis", $timestamp);
+
+            $testTime = (float) $result->ending_time;
+            
+          
+
+            /* Checks if the test has been finished or if no end time is given */
+           if ((($testTime - $timestamp) < 0 || $result->timeded == 0) && $this->isTestDeleted($set->ref_id_test) == null && $result != null  ) {
+                $tpl->setCurrentBlock("test_results");
+                $tpl->setVariable("Name", $result->title);
+                $average += $result->points;
+                $maxPoints += $result->maxpoints;
+                if ($result->points > ($result->maxpoints / 2)) {
+                    $pointsHtml = "<td class='green-result'>" . $result->points . "</td>";
+                } else {
+                    $pointsHtml = "<td class='red-result'>" . $result->points . "</td>";
+                }
+                $tpl->setVariable("Point", $pointsHtml);
+
+                $tpl->parseCurrentBlock();
+            }
+        }
+        ////Exercise Part ////
+        require_once ilPlugin::getPluginObject(IL_COMP_SERVICE, 'Repository', 'robj', 'TestOverview')
+                        ->getDirectory() . '/classes/mapper/class.ilExerciseMapper.php';
+        $excMapper = new ilExerciseMapper();
+        $grades = $this->getExerciseMarks($studId, $overviewId);
+        $totalGrade = 0;
+
+        foreach ($grades as $grade) {
+            if ($this->isExerciseDeleted($grade->obj_id) == null) {
+                $gradeName = $excMapper->getExerciseName($grade->obj_id);
+                $totalGrade += $grade->mark;
+                $tpl->setCurrentBlock("exercise_results");
+                $tpl->setVariable("Exercise", $gradeName);
+                $tpl->setVariable("Mark", $grade->mark);
+                $tpl->parseCurrentBlock();
+            }
+        }
+
+        //// general Part /////
+        if ($this->getNumTests($overviewId) == 0) {
+            $averageNum = 0;
+        } else {
+            $averageNum = round($average / $this->getNumTests($overviewId), 2);
+        }
+        $tpl->setVariable("AveragePoints", $averageNum);
+        if ($maxPoints == 0) {
+            $Prozentnum = 0;
+        } else {
+            $Prozentnum = (float) ($average / $maxPoints) * 100;
+        }
+        $lng->loadLanguageModule("crs");
+        $tpl->setVariable("averageMark", $lng->txt('rep_robj_xtov_average_mark'));
+
+        if (count($grades) > 0) {
+
+            $tpl->setVariable("AverageMark", $totalGrade / count($grades));
+        }
+        $tpl->setVariable("totalMark", $lng->txt('rep_robj_xtov_total_mark'));
+        $tpl->setVariable("TotalMark", $totalGrade);
+
+        $tpl->setVariable("Average", round($Prozentnum, 2));
+        /// ranking part /////
+        $ilOverviewMapper = new ilOverviewMapper();
+        $rank = $ilOverviewMapper->getRankedStudent($overviewId, $studId);
+        $count = $ilOverviewMapper->getCount($overviewId);
+        $date = $ilOverviewMapper->getDate($overviewId);
+        if (!$rank == '0') {
+            $tpl->setVariable("toRanking", $rank . " " . $lng->txt('rep_robj_xtov_out_of') . " " . $count . "<br> ".$lng->txt('rep_robj_xtov_lastupdate').": " . $date);
+        } else {
+            $tpl->setVariable("toRanking", $lng->txt('links_not_available'));
+        }
+        $ilExerciseMapper = new ilExerciseMapper();
+        $rank = $ilExerciseMapper->getRankedStudent($overviewId, $studId);
+        $count = $ilExerciseMapper->getCount($overviewId);
+        $date = $ilExerciseMapper->getDate($overviewId);
+        if (!$rank == '0') {
+            $tpl->setVariable("eoRanking", $rank . " " . $lng->txt('rep_robj_xtov_out_of') . "  " . $count . "<br> ".$lng->txt('rep_robj_xtov_lastupdate').": " . $date);
+        } else {
+            $tpl->setVariable("eoRanking", $lng->txt('links_not_available'));
+        }
+
+        return $tpl->get();
+    }
+    /**
+	 * 
+	 * @global type $ilDB
+	 * @param type $refId
+	 * @return deleted, NULL if object is not deleted, date if object is deleted
+	 */
+    public function isTestDeleted($refId) {
+        global $ilDB;
+        $query = "SELECT deleted FROM object_reference WHERE ref_id = %s";
+        $result = $ilDB->queryF($query, array('integer'), array($refId));
+        $deleteObj = $ilDB->fetchObject($result);
+        return $deleteObj->deleted;
+    }
+	/**
+	 * 
+	 * @global type $ilDB
+	 * @param type $ObjId
+	 * @return deleted, NULL if object is not deleted, date if object is deleted
+	 */
+    public function isExerciseDeleted($ObjId) {
+        global $ilDB;
+        $query = "SELECT deleted FROM object_reference WHERE obj_id = %s";
+        $result = $ilDB->queryF($query, array('integer'), array($objId));
+        $deleteObj = $ilDB->fetchObject($result);
+        return $deleteObj->deleted;
+    }
+
+
+    
+	/**
+	 * 
+	 * @global type $ilDB
+	 * @param type $overviewId
+	 * @return int Number of tests associated with the Overview object
+	 */
+    private function getNumTests($overviewId) {
+        global $ilDB;
+        $count = 0;
+        $data = array();
+        $query = "SELECT 
+					ref_id_test, tst_tests.ending_time
+				FROM
+					rep_robj_xtov_t2o
+				JOIN
+					object_reference
+				JOIN
+					tst_tests ON (ref_id_test = ref_id AND obj_id = obj_fi)
+				WHERE
+					obj_id_overview = %s AND object_reference.deleted IS NULL";
+        $result = $ilDB->queryF($query, array('integer'), array($overviewId));
+        while ($testObj = $ilDB->fetchObject($result)) {
+            array_push($data, $testObj);
+        }
+        $timestamp = time();
+        
+        foreach ($data as $set) {
+            $testTime = (float) $set->ending_time;
+            if (($testTime - $timestamp) < 0) {
+                $count ++;
+            }
+        }
+        return $count;
+    }
+
+    /////////////////////////////////////////// Exercise VIEW ////////////////////////////////////////
+    /**
+     * Gets all exercises and marks for the given student 
+     * @param type $studId
+     */
+    private function getExerciseMarks($studId, $overviewId) {
+        global $ilDB;
+        $grades = array();
+        $query = "SELECT 
+					ut_lp_marks.usr_id AS user_id, obj_id, mark
+				FROM
+					rep_robj_xtov_e2o
+				JOIN
+					ut_lp_marks
+				JOIN
+					usr_data ON (rep_robj_xtov_e2o.obj_id_exercise = ut_lp_marks.obj_id
+				AND 
+					ut_lp_marks.usr_id = usr_data.usr_id)
+				WHERE
+					obj_id_overview = %s
+				AND 
+					ut_lp_marks.usr_id = %s";
+        $result = $ilDB->queryF($query,array('integer','integer'),array($overviewId,$studId));
+        while ($exercise = $ilDB->fetchObject($result)) {
+            array_push($grades, $exercise);
+        }
+        return $grades;
+    }
+
+}
+
+?>
diff --git a/classes/mapper/class.ilTestMapper.php b/classes/mapper/class.ilTestMapper.php
index 0ecd41a..7157b34 100755
--- a/classes/mapper/class.ilTestMapper.php
+++ b/classes/mapper/class.ilTestMapper.php
@@ -1,4 +1,5 @@
 <?php
+
 /* Copyright (c) 1998-2013 ILIAS open source, Extended GPL, see docs/LICENSE */
 
 require_once ilPlugin::getPluginObject(IL_COMP_SERVICE, 'Repository', 'robj', 'TestOverview')->getDirectory() . '/classes/mapper/class.ilDataMapper.php';
@@ -6,8 +7,8 @@
 /**
  * @author Greg Saive <gsaive@databay.de>
  */
-class ilTestMapper extends ilDataMapper
-{
+class ilTestMapper extends ilDataMapper {
+
 	/**
 	 * @var string
 	 */
@@ -16,8 +17,7 @@ class ilTestMapper extends ilDataMapper
 	/**
 	 * @return string
 	 */
-	public function getSelectPart()
-	{
+	public function getSelectPart() {
 		$fields = array(
 			'obj_fi',
 			'test_id',
@@ -32,8 +32,7 @@ public function getSelectPart()
 	/**
 	 * @return string
 	 */
-	public function getFromPart()
-	{
+	public function getFromPart() {
 		$joins = array(
 			'INNER JOIN object_reference ref ON (ref.ref_id = rep_robj_xtov_t2o.ref_id_test AND deleted IS NULL)',
 			"INNER JOIN object_data od ON (od.obj_id = ref.obj_id) AND od.type = 'tst'",
@@ -47,15 +46,14 @@ public function getFromPart()
 	 * @param array $filters
 	 * @return string
 	 */
-	public function getWherePart(array $filters)
-	{
+	public function getWherePart(array $filters) {
 		$conditions = array('rep_robj_xtov_t2o.obj_id_overview = ' . $this->db->quote($filters['overview_id'], 'integer'));
 
-		if(isset($filters['flt_tst_name']) && !empty($filters['flt_tst_name']))
-		{
+		if (isset($filters['flt_tst_name']) && !empty($filters['flt_tst_name'])) {
 			$conditions[] = $this->db->like('od.title', 'text', '%' . $filters['flt_tst_name'] . '%', false);
 		}
 
 		return implode(' AND ', $conditions);
 	}
+
 }
diff --git a/lang/ilias_de.lang b/lang/ilias_de.lang
index a421c54..01091c1 100755
--- a/lang/ilias_de.lang
+++ b/lang/ilias_de.lang
@@ -1,5 +1,6 @@
 <!-- language file start -->
 obj_xtov#:#Testübersicht
+testOverview#:#Test Übersicht
 objs_xtov#:#Testübersicht-Objekte
 obj_xtov_duplicate#:#Testübersicht kopieren
 objs_xtov_duplicate#:#Testübersicht-Objekte kopieren
@@ -19,6 +20,9 @@ content#:#Inhalt
 properties#:#Einstellungen
 edit_properties#:#Einstellungen Bearbeiten
 title#:#Titel
+TestOverview#:#TestOverview
+ExerciseOverview#:#ExerciseOverview
+ex_overview#:#Aufgaben Übersicht
 description#:#Beschreibung
 save#:#Speichern
 cancel#:#Abbrechen
@@ -26,7 +30,7 @@ edit#:#Bearbeiten
 config_test_overview#:#Testübersicht Einstellen
 test_overview_table_title#:#Testübersicht '%s'
 test_list_table_title#:#Zu akkumulierende Tests für die Testübersicht '%s'
-test_list_description#:#Wählen Sie aus, welche Tests in der Inhaltsansicht dieses Objekts akkumuliert werden sollen. Es stehen nur jene Tests zur Verfügung, bei denen Sie das Recht besitzen, die Teststatistiken einzusehen. 
+test_list_description#:#Wählen Sie aus, welche Tests in der Inhaltsansicht dieses Objekts akkumuliert werden sollen. Es stehen nur jene Tests zur Verfügung, bei denen Sie das Recht besitzen, die Teststatistiken einzusehen.
 test_list_hdr_test_title#:#Titel
 test_list_hdr_test_info#:#Pfad zum Test
 add_to_overview#:#Für Übersicht auswählen
@@ -47,11 +51,56 @@ test_overview_description#:#Diese Tabelle zeigt Teilnehmerergebnisse von vorgege
 overview_test_not_passed#:#Nicht teilgenommen
 overview_avg_not_available#:#Nicht verfügbar
 overview_flt_participant_name#:#Teilnehmer
+overview_flt_participant_gender#:#Gender
 overview_flt_group_name#:#Mitgliedschaft
 test_list_flt_tst_name#:#Name
 membership_list_flt_grp_name#:#Name
 overview_result_not_authorized#:#Keine Berechtigung
 membership_count_members#:#Mitglieder
 copy#:#Kopieren
+ranking#:#Ranking
 overview_test_no_permission#:#(Kein Zugriff)
-add_tsts_to_overview#:#Tests hinzufügen
\ No newline at end of file
+add_tsts_to_overview#:#Tests hinzufügen
+pie_chart#:#Kuchendiagramm
+bar_chart#:#Säulendiagramm
+test_overview#:#TestOverview
+diagram#:#Diagramm
+test_administration#:#Testverwaltung
+exercise_overview#:#ExerciseOverview
+exercise_administration#:#Aufgabenverwaltung
+Export#:#Export
+reduced#:#Reduziertes Format
+extended#:#Erweitertes Format
+reduced_exp#:#Ergebnisse von allen Tests und Exercises die mit dem TestOverview Objekt assoziiert sind exportieren
+extended_exp#:#Ergebnisse von allen Tests und Exercises die mit dem TestOverview Objekt assoziiert sind, inkl. derer Teilfragen und Assignments exportieren
+name#:#Name
+mat#:#Matrikelnummer
+group#:#Gruppe
+mail#:#Email Adresse
+gend#:#Geschlecht
+qteil#:#Frage 
+assign#:#Übungseinheit 
+make_diagram#:#Erstelle mein Diagramm
+max_diagram_value#:#Bitte geben Sie hier die Granularität(Schrittgröße) des Diagrammes ein 
+userResults#:#Ihre Leistung
+order_ranking#:#Ordnen nach Ranking
+orderName#:#Ordnen nach Namen
+exercise_list_gui#:#Zu akkumulierende Exercises für die Exerciseübersicht '%s'
+exercise_list_hdr_exercise_info#:#Pfad zur Exercise
+exercise_list_description#:#Wählen Sie aus, welche Exercises in der Inhaltsansicht dieses Objekts akkumuliert werden sollen
+min_one_check_exercise#:#Bitte wählen Sie mindestens eine Exercise.
+exc_add#:#Exercise hinzufügen
+exercises_updated_success#:#Die Einstellungen wurden erfolgreich aktualisiert.
+avg_points#:#Durchschnittliche Punktzahl
+total_mark#:#Gesamt Note/Punkte
+average_mark#:#Durchschnittliche Note
+update_rank#:#Aktualisiere Ranking
+success_update#:#Aktualisierung erfolgreich
+bucketFail#:# Die gewählte Körnung(Granularität) ist zu klein. Die Unterteilung wurde in 100 Segmente festgelegt
+nmbr#:#Nummer
+points#:#Punkte
+out_of#:#in Ihrer Gruppe von
+notAvaiable#:#Nicht Berechenbar
+failureMessage#:#Ein oder mehrere Ergebnisse enthalten Buchstaben oder Sonderzeichen
+lastupdate#:#Letztes Update
+delete_rank#:# Ranking zurücksetzten
\ No newline at end of file
diff --git a/lang/ilias_en.lang b/lang/ilias_en.lang
index 3da3c83..889dc0d 100755
--- a/lang/ilias_en.lang
+++ b/lang/ilias_en.lang
@@ -1,6 +1,7 @@
 <!-- language file start -->
 obj_xtov#:#Test Overview
 objs_xtov#:#Test Overview
+testOverview#:#Test Overview
 obj_xtov_duplicate#:#Copy
 objs_xtov_duplicate#:#Copy Test Overviews
 xtov_add#:#Add Test Overview
@@ -16,17 +17,22 @@ fold_create_xtov#:#Create Test Overview
 root_create_xtov#:#Create Test Overview
 cat_create_xtov#:#Create Test Overview
 content#:#Content
+ranking#:#Ranking
 properties#:#Settings
 edit_properties#:#Edit Settings
+TestOverview#:#TestOverview
+ExerciseOverview#:#ExerciseOverview
+ex_overview#:#Exercise Overview
 title#:#Title
 description#:#Description
 save#:#Save
 cancel#:#Cancel
+pie_chart#:#Pie Chart
 edit#:#Edit
 config_test_overview#:#Configure Test Overview
 test_overview_table_title#:#Test Overview '%s'
 test_list_table_title#:#Tests to accumulate in overview '%s'
-test_list_description#:#Please select the tests you want to add to this overview. 
+test_list_description#:#Please select the tests you want to add to this overview.
 test_list_hdr_test_title#:#Title
 test_list_hdr_test_info#:#Path to Test
 add_to_overview#:#Add to Overview
@@ -47,6 +53,7 @@ test_overview_description#:#This table shows test results of participants, filte
 overview_test_not_passed#:#Not passed
 overview_avg_not_available#:#Not available
 overview_flt_participant_name#:#Participant
+overview_flt_participant_gender#:#Gender
 overview_flt_group_name#:#Membership
 test_list_flt_tst_name#:#Name
 membership_list_flt_grp_name#:#Name
@@ -54,4 +61,46 @@ overview_result_not_authorized#:#Not authorized
 membership_count_members#:#Members
 copy#:#Copy
 overview_test_no_permission#:#(No Permission)
-add_tsts_to_overview#:#Add Tests to Overview
\ No newline at end of file
+add_tsts_to_overview#:#Add Tests to Overview
+bar_chart#:#Bar Chart
+test_overview#:#TestOverview
+diagram#:#Diagram
+test_administration#:#Test Administration
+exercise_overview#:#ExerciseOverview
+exercise_administration#:#Exercise Administration
+Export#:#Export
+reduced#:#Reduced Format
+extended#:#Extended Format
+reduced_exp#:#Export the results for all tests and exercises linked to the TestOverview Object
+extended_exp#:#Export the results for all questions for every test and for all assignments for all exercises linked to the TestOverview Object
+name#:#Name
+mat#:#Matriculation
+group#:#Group
+mail#:#Mail Address
+gend#:#Gender
+qteil#:#Question 
+assign#:#Assignment
+make_diagram#:#Make my Diagramm
+max_diagram_value#:#Please enter the granularity of your diagram
+userResults#:#Your Results
+order_ranking#:#Order by rank
+orderName#:#Order by name
+exercise_list_gui#:#Exercises to accumulate in overview '%s'
+exercise_list_hdr_exercise_info#:#Path to exercise
+exercise_list_description#:#Please select the exercises you want to add to this overview.
+min_one_check_exercise#:#Please select at least one exercise
+exc_add#:#Add Exercise
+exercises_updated_success#:#Updated successfully.
+avg_points#:#Average Points
+total_mark#:#Total Mark
+average_mark#:#Average Mark
+update_rank#:#Update ranking
+success_update#:#Update sucessfull
+bucketFail#:#The chosen granularity is to small. The buckt size is set to 100.
+nmbr#:#Number
+points#:#Points 
+out_of#:#in your Group out of
+notAvaiable#:#Not Calculable
+failureMessage#:#One or more results contain (special) characters 
+lastupdate#:#Last Update
+delete_rank#:#Reset Ranking
\ No newline at end of file
diff --git a/lang/ilias_pt.lang b/lang/ilias_pt.lang
deleted file mode 100644
index 4a7ee3b..0000000
--- a/lang/ilias_pt.lang
+++ /dev/null
@@ -1,57 +0,0 @@
-<!-- language file start -->
-obj_xtov#:#Visão geral de testes
-objs_xtov#:#Visão geral de testes
-obj_xtov_duplicate#:#Copiar
-objs_xtov_duplicate#:#Copiar visões gerais de testes
-xtov_add#:#Adicionar visão geral de testes
-xtov_new#:#Adicionar visão geral de testes
-xtov_visible#:#Visível: visão geral de testes é visível
-xtov_read#:#Ler: Acesso de leitura visão geral de testes
-xtov_write#:#Editar Configurações: Editar visão geral de testes
-xtov_delete#:#Delete: Deletar visão geral de testes
-xtov_edit_permission#:#Alterar permissões: Alterar configurações de permissão
-crs_create_xtov#:#Criar visão geral de testes
-grp_create_xtov#:#Criar visão geral de testes
-fold_create_xtov#:#Criar visão geral de testes
-root_create_xtov#:#Criar visão geral de testes
-cat_create_xtov#:#Criar visão geral de testes
-content#:#Conteúdo
-properties#:#Configurações
-edit_properties#:#Editar Configurações
-title#:#Titulo
-description#:#Descrição
-save#:#Salvar
-cancel#:#Cancelar
-edit#:#Editar
-config_test_overview#:#Configurar visão geral de testes
-test_overview_table_title#:#Visão geral de testes '%s'
-test_list_table_title#:#Testes a serem acumulados na visão geral '%s'
-test_list_description#:#Selecione os testes que você deseja adicionar a esta visão geral. 
-test_list_hdr_test_title#:#Titulo
-test_list_hdr_test_info#:#Caminho para Teste
-add_to_overview#:#Adicionar à visão geral
-remove_from_overview#:#Remover
-add_to_overview_as_filter#:#Adicionar à visão geral como filtro
-item_chosen#:#Escolhido
-membership_list_table_title#:#Grupo / Cursos Filtro
-membership_list_description#:#Selecione determinados grupos ou cursos que os participantes do teste devem ser membros. Se nenhum objeto for selecionado, todos os participantes dos testes selecionados acima são listados.
-membership_list_hdr_membership_title#:#Titulo
-membership_list_hdr_membership_info#:#Informação Adicional
-memberships_updated_success#:#Atualizado com sucesso.
-min_one_check_membership#:#Selecione pelo menos um grupo ou curso.
-tests_updated_success#:#Atualizado com sucesso.
-min_one_check_test#:#Selecione pelo menos um teste.
-test_overview_hdr_user#:#Participante
-test_overview_hdr_avg#:#Média
-test_overview_description#:#Esta tabela mostra os resultados dos testes dos participantes, filtrados por determinadas associações de grupos ou cursos.
-overview_test_not_passed#:#Não aprovado
-overview_avg_not_available#:#Não disponível
-overview_flt_participant_name#:#Participante
-overview_flt_group_name#:#Membro
-test_list_flt_tst_name#:#Nome
-membership_list_flt_grp_name#:#Nome
-overview_result_not_authorized#:#Não autorizado
-membership_count_members#:#Membros
-copy#:#Copiar
-overview_test_no_permission#:#(Sem permissão)
-add_tsts_to_overview#:#Adicionar testes à visão geral
\ No newline at end of file
diff --git a/plugin.php b/plugin.php
index 259fd99..eb26a74 100755
--- a/plugin.php
+++ b/plugin.php
@@ -3,12 +3,12 @@
 $id = 'xtov';
 
 // code version; must be changed for all code changes
-$version = '1.4.0';
+$version = '2.0';
 
 // ilias min and max version; must always reflect the versions that should
 // run with the plugin
 $ilias_min_version = '4.2.0';
-$ilias_max_version = '5.2.999';
+$ilias_max_version = '5.2.2';
 
 // optional, but useful: Add one or more responsible persons and a contact email
 $responsible = 'Björn Heyser / Michael Jansen';
diff --git a/readMe/AdminTestOverviewPermissons.png b/readMe/AdminTestOverviewPermissons.png
new file mode 100644
index 0000000..8ba9820
Binary files /dev/null and b/readMe/AdminTestOverviewPermissons.png differ
diff --git a/readMe/Permissions.png b/readMe/Permissions.png
new file mode 100644
index 0000000..2c097a6
Binary files /dev/null and b/readMe/Permissions.png differ
diff --git a/readMe/TO_table.png b/readMe/TO_table.png
new file mode 100644
index 0000000..5c921b7
Binary files /dev/null and b/readMe/TO_table.png differ
diff --git a/readMe/TestDiagram_mit_pfeil.png b/readMe/TestDiagram_mit_pfeil.png
new file mode 100644
index 0000000..752e865
Binary files /dev/null and b/readMe/TestDiagram_mit_pfeil.png differ
diff --git a/readMe/TestImport.png b/readMe/TestImport.png
new file mode 100644
index 0000000..a3c3553
Binary files /dev/null and b/readMe/TestImport.png differ
diff --git a/readMe/TestImport2.png b/readMe/TestImport2.png
new file mode 100644
index 0000000..08e559d
Binary files /dev/null and b/readMe/TestImport2.png differ
diff --git a/readMe/exerciseDiagram.png b/readMe/exerciseDiagram.png
new file mode 100644
index 0000000..f52d51d
Binary files /dev/null and b/readMe/exerciseDiagram.png differ
diff --git a/readMe/export.png b/readMe/export.png
new file mode 100644
index 0000000..b205a46
Binary files /dev/null and b/readMe/export.png differ
diff --git a/readMe/studView.png b/readMe/studView.png
new file mode 100644
index 0000000..7453f35
Binary files /dev/null and b/readMe/studView.png differ
diff --git a/sql/dbupdate.php b/sql/dbupdate.php
index 0bcb0be..2b8afa2 100755
--- a/sql/dbupdate.php
+++ b/sql/dbupdate.php
@@ -1,5 +1,8 @@
 <#1>
 <?php
+/**
+ * Script to initialize the db 
+ */
 $fields_overview = array(
 	'obj_id' => array(
 		'type'    => 'integer',
@@ -17,7 +20,7 @@
 	'obj_id_overview' => array(
 		'type'    => 'integer',
 		'length'  => 4,
-		'notnull' => true,
+            
 		'default' => 0
 	),
 	'obj_id_test' => array(
@@ -82,7 +85,7 @@
 	{
 		$res = $ilDB->execute($stmt, array($tst_obj_id));
 		$obj_ref = $ilDB->fetchAssoc($res);
-		
+
 		$ilDB->insert('rep_robj_xtov_t2o', array(
 			'obj_id_overview' => array('integer', $tov_obj_id),
 			'ref_id_test' => array('integer', $obj_ref['ref_id'])
@@ -91,4 +94,162 @@
 }
 
 $ilDB->free($stmt);
+
+
+
+?>
+<#5>
+<?php
+/*ExerciseOverview Table with a list of all Objects (ID's)*/
+$fields_ExOverview = array(
+	'obj_id' => array(
+		'type'    => 'integer',
+		'length'  => 4,
+		'notnull' => true,
+		'default' => 0
+	),
+);
+
+/* Exercise to Overview relationship table */
+$fields_exercise = array(
+	'obj_id_overview' => array(
+		'type'    => 'integer',
+		'length'  => 4,
+		'notnull' => true,
+		'default' => 0
+	),
+	'obj_id_exercise' => array(
+		'type'    => 'integer',
+		'length'  => 4,
+		'notnull' => true,
+		'default' => 0
+	),
+);
+if(!$ilDB->tableExists('rep_robj_xtov_e2o'))
+{
+    $ilDB->createTable('rep_robj_xtov_e2o', $fields_exercise);
+    $ilDB->addPrimaryKey('rep_robj_xtov_e2o', array('obj_id_overview', 'obj_id_exercise'));
+}
+else
+{
+    if (!$ilDB->tableColumnExists('rep_robj_xtov_e2o','obj_id_overview') && !$ilDB->tableColumnExists('rep_robj_xtov_e2o','obj_id_exercise'))
+    {
+        $ilDB->dropTable('rep_robj_xtov_e2o');
+        $ilDB->createTable('rep_robj_xtov_e2o', $fields_exercise);
+        $ilDB->addPrimaryKey('rep_robj_xtov_e2o', array('obj_id_overview', 'obj_id_exercise'));
+    }
+}
+/* Participants to ExOverview relationship table,
+   contains groups or courses IDs. */
+$fields_participants = array(
+	'obj_id_exview' => array(
+		'type'    => 'integer',
+		'length'  => 4,
+		'notnull' => true,
+		'default' => 0
+	),
+	'obj_id_grpcrs' => array(
+		'type'    => 'integer',
+		'length'  => 4,
+		'notnull' => true,
+		'default' => 0
+	),
+);
+if(!$ilDB->tableExists('rep_robj_xtov_e2o'))
+{
+    $ilDB->createTable('rep_robj_xtov_p2e', $fields_participants);
+    $ilDB->addPrimaryKey('rep_robj_xtov_p2e', array('obj_id_exview', 'obj_id_grpcrs'));
+}
+ ?>
+<#6>
+
+<?php
+
+/**
+ * Update of varchar length
+ */
+
 ?>
+<#7>
+
+<?php
+$fields_rankto = array(
+        'stud_id' => array(
+		'type'    => 'integer',
+		'length'  => 4,
+		'notnull' => true,
+		'default' => 0    
+	),
+        'rank' => array(
+		'type'    => 'integer',
+		'length'  => 4,
+		'notnull' => true,
+		'default' => 0    
+	),
+        'to_id' => array(
+		'type'    => 'integer',
+		'length'  => 4,
+		'notnull' => true,
+		'default' => 0    
+	),
+);
+
+$ilDB->createTable('rep_robj_xtov_torank', $fields_rankto);
+$ilDB->addPrimaryKey('rep_robj_xtov_torank', array('stud_id','to_id'));
+ ?>
+
+<#8>
+<?php
+$fields_rankeo = array(
+        'stud_id' => array(
+		'type'    => 'integer',
+		'length'  => 4,
+		'notnull' => true,
+		'default' => 0    
+	),
+        'rank' => array(
+		'type'    => 'integer',
+		'length'  => 4,
+		'notnull' => true,
+		'default' => 0    
+	),
+        'eo_id' => array(
+		'type'    => 'integer',
+		'length'  => 4,
+		'notnull' => true,
+		'default' => 0    
+	),
+);
+
+$ilDB->createTable('rep_robj_xtov_eorank', $fields_rankeo);
+$ilDB->addPrimaryKey('rep_robj_xtov_eorank', array('stud_id','eo_id'));
+
+
+ ?>
+<#9>
+<?php
+$fields_rankdate = array(
+        'rankdate' => array(
+			'type' => 'date',			
+			'notnull' => false
+		),
+        'otype' => array(
+		'type'    => 'text',
+		'length'  => 2,
+		'notnull' => true,
+		'default' => "-"    
+	),
+        
+        'o_id' => array(
+		'type'    => 'integer',
+		'length'  => 4,
+		'notnull' => true,
+		'default' => 0    
+	),
+);
+
+$ilDB->createTable('rep_robj_xtov_rankdate', $fields_rankdate);
+$ilDB->addPrimaryKey('rep_robj_xtov_rankdate', array('otype','o_id'));
+
+
+ ?>
\ No newline at end of file
diff --git a/templates/css/testoverview.css b/templates/css/testoverview.css
index 4f3b8d6..627a910 100755
--- a/templates/css/testoverview.css
+++ b/templates/css/testoverview.css
@@ -11,7 +11,7 @@ td.result div.result, td.result a.result
 
 .no-perm-result, .no-result, .orange-result, .green-result, .red-result, .red-result:hover
 {
-	
+
 }
 
 .no-perm-result
@@ -43,3 +43,11 @@ td.result div.result, td.result a.result
 	background: #f00;
 	color: #fff;
 }
+#jo{
+  background-color: black;
+}
+
+  .col-1 {width: 33.33%;
+          background-color: black;}
+  .col-2 {width: 33.33%;}
+  .col-3 {width: 33.33%;}
diff --git a/templates/default/tpl.DigramLegend.html b/templates/default/tpl.DigramLegend.html
new file mode 100644
index 0000000..57eeb05
--- /dev/null
+++ b/templates/default/tpl.DigramLegend.html
@@ -0,0 +1,15 @@
+ <div style="width:66%;float:left">
+ <div style="text-align: center">
+		 <p style="color: red;"> {overSize} </p>
+	</div>
+	{diagram}
+ </div>
+ <div style ='background-color: #EDC240;opacity: 0.8;margin-top: 6px; width:15.5%;float:right; height:{Height};overflow: auto;'>
+ <table>
+ <tr><td>{number}|</td><td>{percent}</td></tr>
+ <!-- BEGIN buckets -->
+ <tr><td>{Numbers}</td><td>{Percents}</td></tr>
+ <!-- END buckets -->	
+ </table>
+ </div>
+
diff --git a/templates/default/tpl.exercise_view.html b/templates/default/tpl.exercise_view.html
new file mode 100644
index 0000000..c162c8d
--- /dev/null
+++ b/templates/default/tpl.exercise_view.html
@@ -0,0 +1,45 @@
+<div id="scoped-content">
+<style type="text/css" scoped>
+  td{
+    text-align: center;
+    -moz-border-radius: 20px;
+    -webkit-border-radius: 20px;
+    -khtml-border-radius: 20px;
+    border-radius: 20px;
+    padding: 6px;
+
+
+  }
+
+  th{
+    padding: 4px;
+  }
+
+  tr {
+    background-color: #FCFCFC;
+  }
+
+  tr:nth-child(2n) {
+    background-color: #F4F4F4;
+  }
+
+</style>
+  <table>
+    <tr>
+<!-- BEGIN user_colum -->    
+      <th> {user} </th>
+<!-- END user_colum -->      
+<!-- BEGIN exercise_colum -->
+        {colum}
+<!-- END exercise_colum -->
+<!-- BEGIN score_colum -->
+      <th> {score} </th>
+<!-- END score_colum -->
+    </tr>
+
+<!-- BEGIN exercise_row -->
+        {data}
+<!-- END exercise_row -->
+
+    </table>
+</div>
diff --git a/templates/default/tpl.simple_object_row.html b/templates/default/tpl.simple_object_row.html
index afa11d5..fe46259 100755
--- a/templates/default/tpl.simple_object_row.html
+++ b/templates/default/tpl.simple_object_row.html
@@ -1,4 +1,4 @@
-<tr class="{CSS_ROW}">
+<tr class="{CSS_ROW}" {colapse}>
 	<td class="std">{VAL_CHECKBOX}</td>
 	<td class="std">{OBJECT_TITLE}</td>
 	<td class="std">{OBJECT_INFO}</td><!-- BEGIN object_img_path -->
diff --git a/templates/default/tpl.stud_view.html b/templates/default/tpl.stud_view.html
new file mode 100644
index 0000000..df340bd
--- /dev/null
+++ b/templates/default/tpl.stud_view.html
@@ -0,0 +1,123 @@
+<div id="scoped-content">
+<style type="text/css" scoped>
+
+      td{
+        text-align: center;
+        -moz-border-radius: 20px;
+        -webkit-border-radius: 20px;
+        -khtml-border-radius: 20px;
+        border-radius: 20px;
+        padding: 6px;
+
+
+      }
+      .green-result
+      {
+      	background: #0c0;
+      	color: #000;
+      }
+
+      .red-result
+       {
+         background: red;
+         color: #000;
+       }
+      .grey{
+
+      }
+      table{
+      margin-left:auto;
+      margin-right:auto;
+
+      }
+      tr {
+        background-color: #FCFCFC;
+      }
+
+      tr:nth-child(2n) {
+        background-color: #F4F4F4;
+      }
+      .innerDiv{
+        width: 45%;
+        height: 20%;
+        float: left;
+
+        border-width: 0.5px;
+      }
+      .innerSmallDiv{
+        width: 35%;
+        height: 20%;
+        float: left;
+        border-width: 0.5px;
+      }
+      .overFlow{
+         overflow: auto;
+      }
+
+
+  </style>
+  <div style="background: rgba(252, 252, 252, .5);display:inline-block;border-radius: 20px; width: 100%">
+  <div style="width:25%;float:right; ">
+  <table>
+      <tr> <td> <b>{exerciseTitle}</b> </td> <td> <b> {mark} </b></td> </tr>
+
+      <!-- BEGIN exercise_results -->
+      <tr>
+          <td class=""> {Exercise} </td>  <td> {Mark} </td> 
+      </tr>
+      <!-- END exercise_results -->
+  </table>
+ </div>
+
+  
+  <div style="width:25%; float: right ;">
+      <table >
+        <!-- BEGIN head_row -->
+        <tr> <td ><b>{testTitle}</b></td> <td><b>{score}</b></td> </tr>
+        <!-- END head_row -->
+
+        <!-- BEGIN test_results -->
+        <tr>
+          <td class=""> {Name} </td> {Point}
+        </tr>
+        <!-- END test_results -->
+      </table>
+  </div>
+
+
+
+
+<div style="width: 40.66%; float: left; margin-left: 4%;  ">
+  <div class="overFlow" style="border-bottom-style: solid; border-width: 0.5px;">
+      <div class="innerSmallDiv" style="width: 20%;"><u><b>{test}</b></u></div>
+    <div class="innerSmallDiv">
+      <div style="height: 33.33%; ">{average}:</div>  
+      <div style="height: 33.33%; ">{averagePercent}:</div>
+      <div style="height: 33.32%; ">Ranking:</div>  
+    </div>
+    <div class="innerSamllDiv " >
+      <div style="height: 33.33%; ">{AveragePoints} </div>
+      <div style="height: 33.33%; ">{Average} % </div>
+      <div style="height: 33.33%; ">{toRanking}</div>
+    </div>
+  </div>
+  <div class="overFlow">  
+    <div class="innerSmallDiv" style="width: 20%;">
+        <u><b>{exercise}</b></u>
+    </div>
+    <div class="innerSmallDiv">
+      <div style="height: 33.33%; ">{averageMark}:</div> 
+      <div style="height: 33.33%; ">{totalMark}:</div> 
+      <div style="height: 33.32%; ">Ranking:</div>  
+    </div>
+    <div class="innerDiv ">
+      <div style="height: 33.32%; ">{AverageMark}</div>
+      <div style="height: 33.32%; ">{TotalMark}</div>
+      <div style="height: 33.32%; ">{eoRanking}</div>
+    </div>
+    </div> 
+</div>
+
+</div>
+
+
diff --git a/templates/default/tpl.test_exerciseview_row.html b/templates/default/tpl.test_exerciseview_row.html
new file mode 100755
index 0000000..cd6e44d
--- /dev/null
+++ b/templates/default/tpl.test_exerciseview_row.html
@@ -0,0 +1,13 @@
+<table>
+<tr> <td>User </td>
+
+<!-- BEGIN tests -->
+<td> {TEST} </td>
+<!-- END tests -->
+ </tr>
+<!-- BEGIN result -->
+<tr>
+<td>{TEXT} </td> <td>{VALUE}</td>
+</tr>
+<!-- END result -->
+<table>
diff --git a/templates/default/tpl.test_overview_rows.html b/templates/default/tpl.test_overview_rows.html
new file mode 100755
index 0000000..a8fdc0f
--- /dev/null
+++ b/templates/default/tpl.test_overview_rows.html
@@ -0,0 +1,14 @@
+
+	{TEST_PARTICIPANT}
+	<!-- BEGIN cell -->
+#
+		<!-- BEGIN result -->
+		{RESULT_VALUE}
+		<!-- END result -->
+		<!-- BEGIN result_nolink -->
+		{RESULT_VALUE_NOLINK}
+		<!-- END result_nolink -->
+
+	<!-- END cell -->
+	{AVERAGE_VALUE}
+|
diff --git a/templates/images/icon_xtov.svg b/templates/images/icon_xtov.svg
old mode 100644
new mode 100755