diff --git a/src/components/Courses.vue b/src/components/Courses.vue
index 2dd406797c63d99af9acf157251035cbcf8f23c7..bf5adba9a58df28f76fdbaf15ac8a8f6f9eddfcd 100644
--- a/src/components/Courses.vue
+++ b/src/components/Courses.vue
@@ -20,22 +20,22 @@
             <label class="form-check-label" for="checkbox_headerline"></label>
           </div>
         </th>
-        <th v-on:click="sortTable('imgsortangebotsnummer')"><img id='imgsortangebotsnummer' :src="require('../assets/'+sortImg)">Angebotsnummer</th>
-        <th v-on:click="sortTable('imgsortangebot')"><img id="imgsortangebot" :src="require('../assets/'+sortImg)">Angebot</th>
-        <th v-on:click="sortTable('imgsortkursname')"><img id="imgsortkursname" :src="require('../assets/'+sortImg)">Kursname</th>
-        <th v-on:click="sortTable('imgsortveranstaltungsort')"><img id="imgsortveranstaltungsort" :src="require('../assets/'+sortImg)">Veranstaltungsart</th>
-        <th v-on:click="sortTable('imgsortkursdatum')"><img id="imgsortkursdatum" :src="require('../assets/'+sortImg)">Kursdatum</th>
-        <th v-on:click="sortTable('imgsortthema')"><img id="imgsortthema" :src="require('../assets/'+sortImg)">Thema</th>
-        <th v-on:click="sortTable('imgsortkursort')"><img id="imgsortkursort" :src="require('../assets/'+sortImg)">Kursort</th>
-        <th v-on:click="sortTable('imgsortbegleitendeLehrkraft')"><img id="imgsortbegleitendeLehrkraft" :src="require('../assets/'+sortImg)">begleitende Lehrkraft</th>
-        <th v-on:click="sortTable('imgsortbetreuendeStudenten')"><img id="imgsortbetreuendeStudenten" :src="require('../assets/'+sortImg)">betreuende Studenten</th>
-        <th v-on:click="sortTable('imgsortanzahlderAnwesenden')"><img id="imgsortanzahlderAnwesenden" :src="require('../assets/'+sortImg)">Anzahl der Anwesenden</th>
-        <th v-on:click="sortTable('imgsortanzahlderAngemeldeten')"><img id="imgsortanzahlderAngemeldeten" :src="require('../assets/'+sortImg)">Anzahl der Angemeldeten</th>
+        <th v-on:click="sortTable('imgsortcoursenumber')"><img id='imgsortcoursenumber' :src="require('../assets/'+sortImg)">Angebotsnummer</th>
+        <th v-on:click="sortTable('imgsortcourseoffer')"><img id="imgsortcourseoffer" :src="require('../assets/'+sortImg)">Angebot</th>
+        <th v-on:click="sortTable('imgsortcoursename')"><img id="imgsortcoursename" :src="require('../assets/'+sortImg)">Kursname</th>
+        <th v-on:click="sortTable('imgsorteventtype')"><img id="imgsorteventtype" :src="require('../assets/'+sortImg)">Veranstaltungsart</th>
+        <th v-on:click="sortTable('imgsortcoursedate')"><img id="imgsortcoursedate" :src="require('../assets/'+sortImg)">Kursdatum</th>
+        <th v-on:click="sortTable('imgsorttopic')"><img id="imgsorttopic" :src="require('../assets/'+sortImg)">Thema</th>
+        <th v-on:click="sortTable('imgsortcourselocation')"><img id="imgsortcourselocation" :src="require('../assets/'+sortImg)">Kursort</th>
+        <th v-on:click="sortTable('imgsortaccompanyingteacher')"><img id="imgsortaccompanyingteacher" :src="require('../assets/'+sortImg)">begleitende Lehrkraft</th>
+        <th v-on:click="sortTable('imgsortsupervisingstudents')"><img id="imgsortsupervisingstudents" :src="require('../assets/'+sortImg)">betreuende Studenten</th>
+        <th v-on:click="sortTable('imgsortpresentstudents')"><img id="imgsortpresentstudents" :src="require('../assets/'+sortImg)">Anzahl der Anwesenden</th>
+        <th v-on:click="sortTable('imgsortregisteredstudents')"><img id="imgsortregisteredstudents" :src="require('../assets/'+sortImg)">Anzahl der Angemeldeten</th>
         <th v-on:click="sortTable('imgsortanzahlung')"><img id="imgsortanzahlung" :src="require('../assets/'+sortImg)">Anzahlung</th>
         <th v-on:click="sortTable('imgsorthonorar')"><img id="imgsorthonorar" :src="require('../assets/'+sortImg)">Honorar</th>
-        <th v-on:click="sortTable('imgsortkursleiter')"><img id="imgsortkursleiter" :src="require('../assets/'+sortImg)">Kursleiter</th>
+        <th v-on:click="sortTable('imgsortinstructor')"><img id="imgsortinstructor" :src="require('../assets/'+sortImg)">Kursleiter</th>
         <th v-on:click="sortTable('imgsortstatus')"><img id="imgsortstatus" :src="require('../assets/'+sortImg)">Aktiv</th>
-        <th v-on:click="sortTable('imgsortnotiz')"><img id="imgsortnotiz" :src="require('../assets/'+sortImg)">Notiz</th>
+        <th v-on:click="sortTable('imgsortnotefield')"><img id="imgsortnotefield" :src="require('../assets/'+sortImg)">Notiz</th>
       </tr>
       <tr v-for="row in filteredRows" :key="row.id">
         <td scope="row">
@@ -57,9 +57,9 @@
         <td>{{row.registeredstudents}}</td>
         <td>{{row.anzahlung}}</td>
         <td>{{row.honorar}}</td>
-        <td>{{row.kursleiter}}</td>
+        <td>{{row.instructor}}</td>
         <td>{{row.status}}</td>
-        <td style="padding-right:300px;">{{row.notiz}}</td>
+        <td style="padding-right:300px;">{{row.notefield}}</td>
       </tr>
     </table>
   </div>
@@ -72,9 +72,9 @@ export default {
     return {
       rows: [],
       checkedBoxes: [],
-      rowIDs: ['imgsortangebotsnummer','imgsortangebot','imgsortkursname','imgsortveranstaltungsort','imgsortkursdatum','imgsortthema','imgsortkursort','imgsortbegleitendeLehrkraft','imgsortbetreuendeStudenten','imgsortanzahlderAnwesenden','imgsortanzahlderAngemeldeten','imgsortanzahlung','imgsorthonorar','imgsortkursleiter','imgsortnotiz','imgsortstatus'],
+      rowIDs: ['imgsortcoursenumber','imgsortcourseoffer','imgsortcoursename','imgsorteventtype','imgsortcoursedate','imgsorttopic','imgsortcourselocation','imgsortaccompanyingteacher','imgsortsupervisingstudents','imgsortpresentstudents','imgsortregisteredstudents','imgsortanzahlung','imgsorthonorar','imgsortinstructor','imgsortnotefield','imgsortstatus'],
       filter:'',
-      currentSort:'angebotsnummer',
+      currentSort:'imgsortcoursenumber',
       currentSortDir:'asc',
       sortImg: 'sort_def.svg',
     }
@@ -101,6 +101,8 @@ export default {
             }
         );
       }
+      this.rows = [];
+      this.loadData();
     },
 
     checkAllBoxes(){
@@ -123,7 +125,7 @@ export default {
         (data) => {
           let x;
           for(x = 0; x < data.length; x++){
-              this.rows.push({id: data[x].id, angebotsnummer: data[x].courseNumber, angebot: data[x].courseOffer, kursname: data[x].name, veranstaltungsart: data[x].eventType, kursdatum: data[x].courseDate, thema: data[x].topic, kursort: data[x].location, begleitendeLehrkraft: data[x].accompanyingTeacher, betreuendeStudenten: data[x].supervisingStudents, anzahlderAnwesenden: data[x].presentStudents, anzahlderAngemeldeten: data[x].registeredStudents, kursleiter: data[x].instructor, notiz: data[x].noteField});
+              this.rows.push({id: data[x].id, coursenumber: data[x].course_number, courseoffer: data[x].course_offer, coursename: data[x].course_name, eventtype: data[x].event_type, coursedate: data[x].course_datetime, topic: data[x].course_topic, courselocation: data[x].course_location, accompanyingteacher: data[x].accompanyingTeacher, supervisingstudents: data[x].supervisingStudents, presentstudents: data[x].presentStudents, registeredstudents: data[x].registeredStudents, instructor: data[x].instructor, notefield: data[x].noteField, anzahlung: data[x].anzahlung, honorar: data[x].honorar, status: data[x].status});
           }
         },
         error => {
@@ -146,204 +148,8 @@ export default {
             document.getElementById(element).src = require('../assets/sort_def.svg')
           }
         });
-/*
-        switch (this.currentSort){
-          case 'angebotsnummer':
-            document.getElementById("imgsortangebotsnummer").src = require('../assets/sort_asc.svg');
-            document.getElementById("imgsortangebot").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursname").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortveranstaltungsort").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursdatum").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortthema").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursort").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortbegleitendeLehrkraft").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortbetreuendeStudenten").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortanzahlderAnwesenden").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortanzahlderAngemeldeten").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursleiter").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortnotiz").src = require('../assets/sort_def.svg');
-            break;
-          case 'angebot':
-            document.getElementById("imgsortangebot").src = require('../assets/sort_asc.svg');
-            document.getElementById("imgsortangebotsnummer").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursname").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortveranstaltungsort").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursdatum").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortthema").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursort").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortbegleitendeLehrkraft").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortbetreuendeStudenten").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortanzahlderAnwesenden").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortanzahlderAngemeldeten").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursleiter").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortnotiz").src = require('../assets/sort_def.svg');
-            break;
-          case 'kursname':
-            document.getElementById("imgsortkursname").src = require('../assets/sort_asc.svg');
-            document.getElementById("imgsortangebotsnummer").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortangebot").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortveranstaltungsort").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursdatum").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortthema").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursort").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortbegleitendeLehrkraft").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortbetreuendeStudenten").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortanzahlderAnwesenden").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortanzahlderAngemeldeten").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursleiter").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortnotiz").src = require('../assets/sort_def.svg');
-            break;
-          case 'veranstaltungsort':
-            document.getElementById("imgsortveranstaltungsort").src = require('../assets/sort_asc.svg');
-            document.getElementById("imgsortangebotsnummer").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortangebot").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursname").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursdatum").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortthema").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursort").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortbegleitendeLehrkraft").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortbetreuendeStudenten").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortanzahlderAnwesenden").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortanzahlderAngemeldeten").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursleiter").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortnotiz").src = require('../assets/sort_def.svg');
-            break;
-          case 'kursdatum':
-            document.getElementById("imgsortkursdatum").src = require('../assets/sort_asc.svg');
-            document.getElementById("imgsortangebotsnummer").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortangebot").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursname").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortveranstaltungsort").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortthema").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursort").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortbegleitendeLehrkraft").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortbetreuendeStudenten").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortanzahlderAnwesenden").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortanzahlderAngemeldeten").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursleiter").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortnotiz").src = require('../assets/sort_def.svg');
-            break;
-          case 'thema':
-            document.getElementById("imgsortthema").src = require('../assets/sort_asc.svg');
-            document.getElementById("imgsortangebotsnummer").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortangebot").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursname").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortveranstaltungsort").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursdatum").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortbegleitendeLehrkraft").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortbetreuendeStudenten").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortanzahlderAnwesenden").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortanzahlderAngemeldeten").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursleiter").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortnotiz").src = require('../assets/sort_def.svg');
-            break;
-          case 'kursort':
-            document.getElementById("imgsortkursort").src = require('../assets/sort_asc.svg');
-            document.getElementById("imgsortangebotsnummer").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortangebot").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursname").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortveranstaltungsort").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursdatum").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortthema").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortbegleitendeLehrkraft").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortbetreuendeStudenten").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortanzahlderAnwesenden").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortanzahlderAngemeldeten").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursleiter").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortnotiz").src = require('../assets/sort_def.svg');
-            break;
-          case 'begleitendeLehrkraft':
-            document.getElementById("imgsortbegleitendeLehrkraft").src = require('../assets/sort_asc.svg');
-            document.getElementById("imgsortangebotsnummer").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortangebot").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursname").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortveranstaltungsort").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursdatum").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortthema").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursort").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortbetreuendeStudenten").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortanzahlderAnwesenden").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortanzahlderAngemeldeten").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursleiter").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortnotiz").src = require('../assets/sort_def.svg');
-            break;
-          case 'betreuendeStudenten':
-            document.getElementById("imgsortbetreuendeStudenten").src = require('../assets/sort_asc.svg');
-            document.getElementById("imgsortangebotsnummer").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortangebot").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursname").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortveranstaltungsort").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursdatum").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortthema").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursort").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortbegleitendeLehrkraft").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortanzahlderAnwesenden").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortanzahlderAngemeldeten").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursleiter").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortnotiz").src = require('../assets/sort_def.svg');
-            break;
-          case 'anzahlderAnwesenden':
-            document.getElementById("imgsortanzahlderAnwesenden").src = require('../assets/sort_asc.svg');
-            document.getElementById("imgsortangebotsnummer").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortangebot").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursname").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortveranstaltungsort").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursdatum").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortthema").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursort").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortbegleitendeLehrkraft").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortbetreuendeStudenten").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortanzahlderAngemeldeten").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursleiter").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortnotiz").src = require('../assets/sort_def.svg');
-            break;
-          case 'anzahlderAngemeldeten':
-            document.getElementById("imgsortanzahlderAngemeldeten").src = require('../assets/sort_asc.svg');
-            document.getElementById("imgsortangebotsnummer").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortangebot").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursname").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortveranstaltungsort").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursdatum").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortthema").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursort").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortbegleitendeLehrkraft").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortbetreuendeStudenten").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortanzahlderAnwesenden").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursleiter").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortnotiz").src = require('../assets/sort_def.svg');
-            break;
-          case 'kursleiter':
-            document.getElementById("imgsortkursleiter").src = require('../assets/sort_asc.svg');
-            document.getElementById("imgsortangebotsnummer").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortangebot").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursname").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortveranstaltungsort").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursdatum").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortthema").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursort").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortbegleitendeLehrkraft").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortbetreuendeStudenten").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortanzahlderAnwesenden").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortanzahlderAngemeldeten").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortnotiz").src = require('../assets/sort_def.svg');
-            break;
-          case 'notiz':
-            document.getElementById("imgsortnotiz").src = require('../assets/sort_asc.svg');
-            document.getElementById("imgsortangebotsnummer").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortangebot").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursname").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortveranstaltungsort").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursdatum").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortthema").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursort").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortbegleitendeLehrkraft").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortbetreuendeStudenten").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortanzahlderAnwesenden").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursleiter").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortanzahlderAngemeldeten").src = require('../assets/sort_def.svg');
-            break;
-        }
-*/
+
+        col = col.toString().replace("imgsort","");
         this.rows.sort(function (a, b) {
           if (typeof(a[col]) === 'number' && typeof(b[col]) === 'number'){
             if (a[col] < b[col]) {
@@ -370,204 +176,8 @@ export default {
             document.getElementById(element.toString()).src = require('../assets/sort_def.svg');
           }
         });
-/*
-        switch (this.currentSort){
-          case 'angebotsnummer':
-            document.getElementById("imgsortangebotsnummer").src = require('../assets/sort_desc.svg');
-            document.getElementById("imgsortangebot").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursname").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortveranstaltungsort").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursdatum").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortthema").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursort").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortbegleitendeLehrkraft").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortbetreuendeStudenten").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortanzahlderAnwesenden").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortanzahlderAngemeldeten").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursleiter").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortnotiz").src = require('../assets/sort_def.svg');
-            break;
-          case 'angebot':
-            document.getElementById("imgsortangebot").src = require('../assets/sort_desc.svg');
-            document.getElementById("imgsortangebotsnummer").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursname").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortveranstaltungsort").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursdatum").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortthema").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursort").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortbegleitendeLehrkraft").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortbetreuendeStudenten").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortanzahlderAnwesenden").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortanzahlderAngemeldeten").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursleiter").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortnotiz").src = require('../assets/sort_def.svg');
-            break;
-          case 'kursname':
-            document.getElementById("imgsortkursname").src = require('../assets/sort_desc.svg');
-            document.getElementById("imgsortangebotsnummer").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortangebot").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortveranstaltungsort").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursdatum").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortthema").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursort").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortbegleitendeLehrkraft").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortbetreuendeStudenten").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortanzahlderAnwesenden").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortanzahlderAngemeldeten").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursleiter").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortnotiz").src = require('../assets/sort_def.svg');
-            break;
-          case 'veranstaltungsort':
-            document.getElementById("imgsortveranstaltungsort").src = require('../assets/sort_desc.svg');
-            document.getElementById("imgsortangebotsnummer").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortangebot").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursname").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursdatum").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortthema").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursort").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortbegleitendeLehrkraft").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortbetreuendeStudenten").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortanzahlderAnwesenden").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortanzahlderAngemeldeten").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursleiter").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortnotiz").src = require('../assets/sort_def.svg');
-            break;
-          case 'kursdatum':
-            document.getElementById("imgsortkursdatum").src = require('../assets/sort_desc.svg');
-            document.getElementById("imgsortangebotsnummer").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortangebot").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursname").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortthema").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortveranstaltungsort").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursort").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortbegleitendeLehrkraft").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortbetreuendeStudenten").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortanzahlderAnwesenden").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortanzahlderAngemeldeten").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursleiter").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortnotiz").src = require('../assets/sort_def.svg');
-            break;
-          case 'thema':
-            document.getElementById("imgsortthema").src = require('../assets/sort_desc.svg');
-            document.getElementById("imgsortangebotsnummer").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortangebot").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursname").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortveranstaltungsort").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursdatum").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortbegleitendeLehrkraft").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortbetreuendeStudenten").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortanzahlderAnwesenden").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortanzahlderAngemeldeten").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursleiter").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortnotiz").src = require('../assets/sort_def.svg');
-            break;
-          case 'kursort':
-            document.getElementById("imgsortkursort").src = require('../assets/sort_desc.svg');
-            document.getElementById("imgsortangebotsnummer").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortangebot").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursname").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortveranstaltungsort").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursdatum").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortthema").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortbegleitendeLehrkraft").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortbetreuendeStudenten").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortanzahlderAnwesenden").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortanzahlderAngemeldeten").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursleiter").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortnotiz").src = require('../assets/sort_def.svg');
-            break;
-          case 'begleitendeLehrkraft':
-            document.getElementById("imgsortbegleitendeLehrkraft").src = require('../assets/sort_desc.svg');
-            document.getElementById("imgsortangebotsnummer").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortangebot").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursname").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortveranstaltungsort").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursdatum").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortthema").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursort").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortbetreuendeStudenten").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortanzahlderAnwesenden").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortanzahlderAngemeldeten").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursleiter").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortnotiz").src = require('../assets/sort_def.svg');
-            break;
-          case 'betreuendeStudenten':
-            document.getElementById("imgsortbetreuendeStudenten").src = require('../assets/sort_desc.svg');
-            document.getElementById("imgsortangebotsnummer").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortangebot").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursname").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortveranstaltungsort").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursdatum").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortthema").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursort").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortbegleitendeLehrkraft").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortanzahlderAnwesenden").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortanzahlderAngemeldeten").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursleiter").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortnotiz").src = require('../assets/sort_def.svg');
-            break;
-          case 'anzahlderAnwesenden':
-            document.getElementById("imgsortanzahlderAnwesenden").src = require('../assets/sort_desc.svg');
-            document.getElementById("imgsortangebotsnummer").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortangebot").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursname").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortveranstaltungsort").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursdatum").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortthema").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursort").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortbegleitendeLehrkraft").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortbetreuendeStudenten").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortanzahlderAngemeldeten").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursleiter").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortnotiz").src = require('../assets/sort_def.svg');
-            break;
-          case 'kursleiter':
-            document.getElementById("imgsortkursleiter").src = require('../assets/sort_desc.svg');
-            document.getElementById("imgsortangebotsnummer").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortangebot").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursname").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortveranstaltungsort").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursdatum").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortthema").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursort").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortbegleitendeLehrkraft").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortbetreuendeStudenten").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortanzahlderAnwesenden").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortanzahlderAngemeldeten").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortnotiz").src = require('../assets/sort_def.svg');
-            break;
-          case 'anzahlderAngemeldeten':
-            document.getElementById("imgsortanzahlderAngemeldeten").src = require('../assets/sort_desc.svg');
-            document.getElementById("imgsortangebotsnummer").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortangebot").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursname").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortveranstaltungsort").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursdatum").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortthema").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursort").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortbegleitendeLehrkraft").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortbetreuendeStudenten").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortanzahlderAnwesenden").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursleiter").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortnotiz").src = require('../assets/sort_def.svg');
-            break;
-          case 'notiz':
-            document.getElementById("imgsortnotiz").src = require('../assets/sort_desc.svg');
-            document.getElementById("imgsortangebotsnummer").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortangebot").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursname").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortveranstaltungsort").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursdatum").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortthema").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursort").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortbegleitendeLehrkraft").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortbetreuendeStudenten").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortanzahlderAnwesenden").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortanzahlderAngemeldeten").src = require('../assets/sort_def.svg');
-            document.getElementById("imgsortkursleiter").src = require('../assets/sort_def.svg');
-            break;
-        }
-*/
+
+        col = col.toString().replace("imgsort","");
         this.rows.sort(function (a, b) {
           if (typeof(a[col]) === 'number' && typeof(b[col]) === 'number'){
             if (a[col] > b[col]) {
@@ -587,6 +197,7 @@ export default {
       }
     }
   },
+
   watch: {
     checkedBoxes(){
       if (this.checkedBoxes.length > 1 || this.checkedBoxes.length < 1){
@@ -607,22 +218,25 @@ export default {
     },
     filteredRows() {
       return this.rows.filter(row => {
-        const angebotsnummer = row.angebotsnummer.toLowerCase();
-        const angebot = row.angebot.toLowerCase();
-        const kursname = row.kursname.toLowerCase();
-        const veranstaltungsart = row.veranstaltungsart.toLowerCase();
-        const kursdatum = row.kursdatum.toLowerCase();
-        const thema = row.thema.toLowerCase();
-        const kursort = row.kursort.toLowerCase();
-        const begleitendeLehrkraft = row.begleitendeLehrkraft.toLowerCase();
-        const betreuendeStudenten = row.betreuendeStudenten.toLowerCase();
-        const anzahlderAnwesenden = row.anzahlderAnwesenden.toString();
-        const anzahlderAngemeldeten = row.anzahlderAngemeldeten.toString();
-        const kursleiter = row.kursleiter.toLowerCase();
-        const notiz = row.notiz.toLowerCase();
+        const angebotsnummer = row.coursenumber.toLowerCase();
+        const angebot = row.courseoffer.toLowerCase();
+        const kursname = row.coursename.toLowerCase();
+        const veranstaltungsart = row.eventtype.toLowerCase();
+        const kursdatum = row.coursedate.toLowerCase();
+        const thema = row.topic.toLowerCase();
+        const kursort = row.courselocation.toLowerCase();
+        const begleitendeLehrkraft = row.accompanyingteacher.toLowerCase();
+        const betreuendeStudenten = row.supervisingstudents.toLowerCase();
+        const anzahlderAnwesenden = row.presentstudents.toString();
+        const anzahlderAngemeldeten = row.registeredstudents.toString();
+        const kursleiter = row.instructor.toLowerCase();
+        const anzahlung = row.anzahlung.toLowerCase();
+        const honorar = row.honorar.toLowerCase();
+        const status = row.status.toString().toLowerCase();
+        const notiz = row.notefield.toLowerCase();
         const searchTerm = this.filter.toLowerCase();
 
-        return angebotsnummer.includes(searchTerm) || angebot.includes(searchTerm) || kursname.includes(searchTerm) || veranstaltungsart.includes(searchTerm) || kursdatum.includes(searchTerm) || thema.includes(searchTerm) || kursort.includes(searchTerm) || begleitendeLehrkraft.includes(searchTerm) || betreuendeStudenten.includes(searchTerm) || betreuendeStudenten.includes(searchTerm) || anzahlderAnwesenden.includes(searchTerm) || anzahlderAngemeldeten.includes(searchTerm) || kursleiter.includes(searchTerm) || notiz.includes(searchTerm);
+        return angebotsnummer.includes(searchTerm) || angebot.includes(searchTerm) || kursname.includes(searchTerm) || veranstaltungsart.includes(searchTerm) || kursdatum.includes(searchTerm) || thema.includes(searchTerm) || kursort.includes(searchTerm) || begleitendeLehrkraft.includes(searchTerm) || betreuendeStudenten.includes(searchTerm) || betreuendeStudenten.includes(searchTerm) || anzahlderAnwesenden.includes(searchTerm) || anzahlderAngemeldeten.includes(searchTerm) || kursleiter.includes(searchTerm) || notiz.includes(searchTerm) || anzahlung.includes(searchTerm) || honorar.includes(searchTerm) || status.includes(searchTerm);
       });
     },
   }
diff --git a/src/components/CreateEditComponents/EditCourse.vue b/src/components/CreateEditComponents/EditCourse.vue
index a92b96cc983368964c537b96489a937e49ee275a..e2d5ec3e8ec3971fce9acd5f2324e9fd25b30cf8 100644
--- a/src/components/CreateEditComponents/EditCourse.vue
+++ b/src/components/CreateEditComponents/EditCourse.vue
@@ -146,17 +146,20 @@ export default {
     getData(){
       this.$store.dispatch('course/getByID', this.id).then(
           (data) => {
-            this.course.coursenumber = data.courseNumber;
-            this.course.courseoffer = data.courseOffer;
-            this.course.coursename = data.name;
-            this.course.eventtype = data.eventType;
-            this.course.coursedate = data.courseDate;
-            this.course.topic = data.topic;
-            this.course.courselocation = data.location;
+            this.course.id = this.id;
+            this.course.coursenumber = data.course_number;
+            this.course.courseoffer = data.course_offer;
+            this.course.coursename = data.course_name;
+            this.course.eventtype = data.event_type;
+            this.course.coursedate = data.course_datetime;
+            this.course.topic = data.course_topic;
+            this.course.courselocation = data.course_location;
             this.course.accompanyingteacher = data.accompanyingTeacher;
             this.course.supervisingstudents = data.supervisingStudents;
             this.course.presentstudents = data.presentStudents;
             this.course.registeredstudents = data.registeredStudents;
+            this.course.anzahlung = data.anzahlung;
+            this.course.honorar = data.honorar;
             this.course.instructor = data.instructor;
             this.course.notefield = data.noteField;