diff --git a/src/components/Courses.vue b/src/components/Courses.vue
index d9608028d3a545113f6aac4b8cb48973f47cd546..2dd406797c63d99af9acf157251035cbcf8f23c7 100644
--- a/src/components/Courses.vue
+++ b/src/components/Courses.vue
@@ -20,19 +20,22 @@
<label class="form-check-label" for="checkbox_headerline"></label>
</div>
</th>
- <th v-on:click="sortTable('angebotsnummer')"><img id='imgsortangebotsnummer' :src="require('../assets/'+sortImg)">Angebotsnummer</th>
- <th v-on:click="sortTable('angebot')"><img id="imgsortangebot" :src="require('../assets/'+sortImg)">Angebot</th>
- <th v-on:click="sortTable('kursname')"><img id="imgsortkursname" :src="require('../assets/'+sortImg)">Kursname</th>
- <th v-on:click="sortTable('veranstaltungsart')"><img id="imgsortveranstaltungsort" :src="require('../assets/'+sortImg)">Veranstaltungsart</th>
- <th v-on:click="sortTable('kursdatum')"><img id="imgsortkursdatum" :src="require('../assets/'+sortImg)">Kursdatum</th>
- <th v-on:click="sortTable('thema')"><img id="imgsortthema" :src="require('../assets/'+sortImg)">Thema</th>
- <th v-on:click="sortTable('kursort')"><img id="imgsortkursort" :src="require('../assets/'+sortImg)">Kursort</th>
- <th v-on:click="sortTable('begleitendeLehrkraft')"><img id="imgsortbegleitendeLehrkraft" :src="require('../assets/'+sortImg)">begleitende Lehrkraft</th>
- <th v-on:click="sortTable('betreuendeStudenten')"><img id="imgsortbetreuendeStudenten" :src="require('../assets/'+sortImg)">betreuende Studenten</th>
- <th v-on:click="sortTable('anzahlderAnwesenden')"><img id="imgsortanzahlderAnwesenden" :src="require('../assets/'+sortImg)">Anzahl der Anwesenden</th>
- <th v-on:click="sortTable('anzahlderAngemeldeten')"><img id="imgsortanzahlderAngemeldeten" :src="require('../assets/'+sortImg)">Anzahl der Angemeldeten</th>
- <th v-on:click="sortTable('kursleiter')"><img id="imgsortkursleiter" :src="require('../assets/'+sortImg)">Kursleiter</th>
- <th v-on:click="sortTable('notiz')"><img id="imgsortnotiz" :src="require('../assets/'+sortImg)">Notiz</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('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('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>
</tr>
<tr v-for="row in filteredRows" :key="row.id">
<td scope="row">
@@ -41,18 +44,21 @@
<label class="form-check-label" for="checkbox_tablerow"></label>
</div>
</td>
- <td>{{row.angebotsnummer}}</td>
- <td style="padding-right:200px;">{{row.angebot}}</td>
- <td style="padding-right:200px;">{{row.kursname}}</td>
- <td>{{row.veranstaltungsart}}</td>
- <td>{{row.kursdatum}}</td>
- <td>{{row.thema}}</td>
- <td style="padding-right:200px;">{{row.kursort}}</td>
- <td>{{row.begleitendeLehrkraft}}</td>
- <td>{{row.betreuendeStudenten}}</td>
- <td>{{row.anzahlderAnwesenden}}</td>
- <td>{{row.anzahlderAngemeldeten}}</td>
+ <td>{{row.coursenumber}}</td>
+ <td style="padding-right:200px;">{{row.courseoffer}}</td>
+ <td style="padding-right:200px;">{{row.coursename}}</td>
+ <td>{{row.eventtype}}</td>
+ <td>{{row.coursedate}}</td>
+ <td>{{row.topic}}</td>
+ <td style="padding-right:200px;">{{row.courselocation}}</td>
+ <td>{{row.accompanyingteacher}}</td>
+ <td>{{row.supervisingstudents}}</td>
+ <td>{{row.presentstudents}}</td>
+ <td>{{row.registeredstudents}}</td>
+ <td>{{row.anzahlung}}</td>
+ <td>{{row.honorar}}</td>
<td>{{row.kursleiter}}</td>
+ <td>{{row.status}}</td>
<td style="padding-right:300px;">{{row.notiz}}</td>
</tr>
</table>
@@ -66,6 +72,7 @@ export default {
return {
rows: [],
checkedBoxes: [],
+ rowIDs: ['imgsortangebotsnummer','imgsortangebot','imgsortkursname','imgsortveranstaltungsort','imgsortkursdatum','imgsortthema','imgsortkursort','imgsortbegleitendeLehrkraft','imgsortbetreuendeStudenten','imgsortanzahlderAnwesenden','imgsortanzahlderAngemeldeten','imgsortanzahlung','imgsorthonorar','imgsortkursleiter','imgsortnotiz','imgsortstatus'],
filter:'',
currentSort:'angebotsnummer',
currentSortDir:'asc',
@@ -131,6 +138,15 @@ export default {
if (this.currentSortDir === 'asc') {
this.currentSortDir = 'desc';
+ this.rowIDs.forEach(element =>{
+ console.log(this.currentSort);
+ if(this.currentSort === element){
+ document.getElementById(element).src = require('../assets/sort_asc.svg')
+ } else {
+ document.getElementById(element).src = require('../assets/sort_def.svg')
+ }
+ });
+/*
switch (this.currentSort){
case 'angebotsnummer':
document.getElementById("imgsortangebotsnummer").src = require('../assets/sort_asc.svg');
@@ -327,7 +343,7 @@ export default {
document.getElementById("imgsortanzahlderAngemeldeten").src = require('../assets/sort_def.svg');
break;
}
-
+*/
this.rows.sort(function (a, b) {
if (typeof(a[col]) === 'number' && typeof(b[col]) === 'number'){
if (a[col] < b[col]) {
@@ -347,6 +363,14 @@ export default {
} else {
this.currentSortDir = 'asc';
+ this.rowIDs.forEach(element =>{
+ if(this.currentSort === element){
+ document.getElementById(element.toString()).src = require('../assets/sort_desc.svg');
+ } else {
+ document.getElementById(element.toString()).src = require('../assets/sort_def.svg');
+ }
+ });
+/*
switch (this.currentSort){
case 'angebotsnummer':
document.getElementById("imgsortangebotsnummer").src = require('../assets/sort_desc.svg');
@@ -543,7 +567,7 @@ export default {
document.getElementById("imgsortkursleiter").src = require('../assets/sort_def.svg');
break;
}
-
+*/
this.rows.sort(function (a, b) {
if (typeof(a[col]) === 'number' && typeof(b[col]) === 'number'){
if (a[col] > b[col]) {
diff --git a/src/components/CreateEditComponents/CreateCourse.vue b/src/components/CreateEditComponents/CreateCourse.vue
index 2d05987e5ed9223b225d692a202419851c92f0ea..e13f410f1637bdbc060d2520dd2163c5bb5db00f 100644
--- a/src/components/CreateEditComponents/CreateCourse.vue
+++ b/src/components/CreateEditComponents/CreateCourse.vue
@@ -91,6 +91,22 @@
</div>
</div>
</div>
+ <div class="form-row">
+ <div class="col-md-11 mb-3">
+ <h1 class="formTitle" style="margin-top: 10px">Anzahlung</h1>
+ <div class="input_container">
+ <input name="anzahlung" v-model="course.anzahlung" class="form-control inputField" placeholder="Anzahlung" aria-label="anzahlung" required>
+ </div>
+ </div>
+ </div>
+ <div class="form-row">
+ <div class="col-md-11 mb-3">
+ <h1 class="formTitle" style="margin-top: 10px">Honorar</h1>
+ <div class="input_container">
+ <input name="honorar" v-model="course.honorar" class="form-control inputField" placeholder="Honorar" aria-label="honorar" required>
+ </div>
+ </div>
+ </div>
<div class="form-row">
<div class="col-md-11 mb-3">
<h1 class="formTitle" style="margin-top: 10px">Kursleiter</h1>
@@ -107,6 +123,14 @@
</div>
</div>
</div>
+ <div class="form-row">
+ <div class="col-md-11 mb-3">
+ <h1 class="formTitle" style="margin-top: 10px">Aktiv ?</h1>
+ <div class="input_container">
+ <input name="status" v-model="course.status" class="form-control inputField" placeholder="Ist der Kurs aktiv, dann 1, ansonsten 0 eingeben..." aria-label="status" required>
+ </div>
+ </div>
+ </div>
<div class="form-row">
<div class="col-md-11 mb-3">
<button class="btn btn-primary btn-lg btn-block" style="margin-top: 20px; border-radius: 10px" type="button" @click="validateBeforeSubmit">Eintrag hinzufügen</button>
diff --git a/src/components/CreateEditComponents/CreateTeacher.vue b/src/components/CreateEditComponents/CreateTeacher.vue
index b582838decf317f5a601e3acafa91a290fb12461..c41dd3944d27be13a3b1348e1d79dbae9728f157 100644
--- a/src/components/CreateEditComponents/CreateTeacher.vue
+++ b/src/components/CreateEditComponents/CreateTeacher.vue
@@ -5,9 +5,17 @@
<form @submit="validateBeforeSubmit" class="col-md-10" style="margin-bottom: 20px">
<div class="form-row">
<div class="col-md-11 mb-3">
- <h1 class="formTitle" style="margin-top: 30px">Anrede</h1>
+ <h1 class="formTitle" style="margin-top: 30px">Personalnummer</h1>
<div class="input_container">
- <input v-model="teacher.anrede" type="text" class="form-control inputField" placeholder="Anrede" aria-label="anrede" required>
+ <input v-model="teacher.personal_number" type="text" class="form-control inputField" placeholder="Personalnummer" aria-label="personal_number" required>
+ </div>
+ </div>
+ </div>
+ <div class="form-row">
+ <div class="col-md-11 mb-3">
+ <h1 class="formTitle" style="margin-top: 30px">Geschlecht</h1>
+ <div class="input_container">
+ <input v-model="teacher.gender" type="text" class="form-control inputField" placeholder="Anrede" aria-label="gender" required>
</div>
</div>
</div>
@@ -61,57 +69,57 @@
</div>
<div class="form-row">
<div class="col-md-11 mb-3">
- <h1 class="formTitle" style="margin-top: 10px">zusätzliche Adresse</h1>
+ <h1 class="formTitle" style="margin-top: 10px">E-Mail</h1>
<div class="input_container">
- <input name="addaddress" v-model="teacher.school_branch" class="form-control inputField" placeholder="zusätzliche Adresse" aria-label="addaddress" required>
+ <input name="email" v-model="teacher.email" class="form-control inputField" placeholder="E-Mail" aria-label="email" required>
</div>
</div>
</div>
<div class="form-row">
<div class="col-md-11 mb-3">
- <h1 class="formTitle" style="margin-top: 10px">persönlicher Fragebogen</h1>
+ <h1 class="formTitle" style="margin-top: 10px">Telefon</h1>
<div class="input_container">
- <input name="personal_questionnaire" v-model="teacher.personal_questionnaire" class="form-control inputField" placeholder="persönlicher Fragebogen" aria-label="personal_questionnaire" required>
+ <input name="telephone" v-model="teacher.telephone" class="form-control inputField" placeholder="Telefon" aria-label="telephone" required>
</div>
</div>
</div>
<div class="form-row">
<div class="col-md-11 mb-3">
- <h1 class="formTitle" style="margin-top: 10px">SommerUni 17</h1>
+ <h1 class="formTitle" style="margin-top: 10px">Schulart</h1>
<div class="input_container">
- <input name="sommeruni_17" v-model="teacher.summeruni_17" class="form-control inputField" placeholder="SommerUni 17" aria-label="summeruni_17" required>
+ <input name="school_branch" v-model="teacher.school_branch" class="form-control inputField" placeholder="Schulart" aria-label="school_branch" required>
</div>
</div>
</div>
<div class="form-row">
<div class="col-md-11 mb-3">
- <h1 class="formTitle" style="margin-top: 10px">SommerUni 18</h1>
+ <h1 class="formTitle" style="margin-top: 10px">Fächer</h1>
<div class="input_container">
- <input name="sommeruni_18" v-model="teacher.summeruni_18" class="form-control inputField" placeholder="SommerUni 18" aria-label="summeruni_18" required>
+ <input name="subject" v-model="teacher.subject" class="form-control inputField" placeholder="Fächer" aria-label="subject" required>
</div>
</div>
</div>
<div class="form-row">
<div class="col-md-11 mb-3">
- <h1 class="formTitle" style="margin-top: 10px">SommerUni 19</h1>
+ <h1 class="formTitle" style="margin-top: 10px">Schulname</h1>
<div class="input_container">
- <input name="sommeruni_19" v-model="teacher.summeruni_19" class="form-control inputField" placeholder="SommerUni 19" aria-label="summeruni_19" required>
+ <input name="school_name" v-model="teacher.school_name" class="form-control inputField" placeholder="Schulname" aria-label="school_name" required>
</div>
</div>
</div>
<div class="form-row">
<div class="col-md-11 mb-3">
- <h1 class="formTitle" style="margin-top: 10px">SommerUni 20</h1>
+ <h1 class="formTitle" style="margin-top: 10px">Schulnummer</h1>
<div class="input_container">
- <input name="sommeruni_20" v-model="teacher.summeruni_20" class="form-control inputField" placeholder="SommerUni 20" aria-label="summeruni_20" required>
+ <input name="school_number" v-model="teacher.school_number" class="form-control inputField" placeholder="Schulnummer" aria-label="school_number" required>
</div>
</div>
</div>
<div class="form-row">
<div class="col-md-11 mb-3">
- <h1 class="formTitle" style="margin-top: 10px">NatLab 20</h1>
+ <h1 class="formTitle" style="margin-top: 10px">Aktiv ?</h1>
<div class="input_container">
- <input name="natlab_20" v-model="teacher.natlab_20" class="form-control inputField" placeholder="NatLab 20" aria-label="natlab_20" required>
+ <input name="status" v-model="teacher.status" class="form-control inputField" placeholder="Ist der Lehrer aktiv, dann 1, ansonsten 0 eingeben..." aria-label="status" required>
</div>
</div>
</div>
@@ -147,7 +155,7 @@ export default {
validateBeforeSubmit() {
this.$validator.validate().then(isValid => {
if (isValid) {
- console.log("isvalid")
+ console.log("isvalid");
this.$store.dispatch('teacher/insert', this.teacher).then(
data => {
this.$router.push('/teachers');
diff --git a/src/components/CreateEditComponents/EditTeacher.vue b/src/components/CreateEditComponents/EditTeacher.vue
index 3b4122dbc22bd26613a88e760ee8d6bbba2386c4..fc33f26b134e680587b62c85b33fb924fc7d7c1b 100644
--- a/src/components/CreateEditComponents/EditTeacher.vue
+++ b/src/components/CreateEditComponents/EditTeacher.vue
@@ -163,6 +163,7 @@ export default {
this.$store.dispatch('teacher/getByID', this.id).then(
(data) => {
console.log(data);
+ this.teacher.id = this.id;
this.teacher.personal_number = data.personal_number;
this.teacher.gender = data.gender;
this.teacher.grad = data.grad;
diff --git a/src/components/Teachers.vue b/src/components/Teachers.vue
index f90729566d13f75f934d590c9e25cd3171c0042f..c484921db547afe215ee178090d11c84058bf6df 100644
--- a/src/components/Teachers.vue
+++ b/src/components/Teachers.vue
@@ -4,7 +4,7 @@
<div class="entry_box-inner">
<a id="editbutton" class="button" href="./editteacher" style="visibility: hidden">Eintrag bearbeiten</a>
<a id="addbutton" class="button" href="./createteacher">neuen Eintrag hinzufügen</a>
- <a id="deletebutton" class="button" href="./deleteteacher">ausgewählte Einträge löschen</a>
+ <a id="deletebutton" class="button" @click="deleterows">ausgewählte Einträge löschen</a>
<a id="exportbutton" class="button" href="./exporttableteacher">Tabelle exportieren</a>
</div>
<div class="search_box-inner">
@@ -36,10 +36,10 @@
<th v-on:click="sortTable('school_number')"><img id='imgsortschoolnumber' :src="require('../assets/'+sortImg)">Schulnummer</th>
<th v-on:click="sortTable('status')"><img id='imgsortstatus' :src="require('../assets/'+sortImg)">Status</th>
</tr>
- <tr v-for="row in filteredRows" :key="row.personal_number">
+ <tr v-for="row in filteredRows" :key="row.id">
<td scope="row">
<div class="form-check">
- <input type="checkbox" class="form-check-input" name="checkbox_tablerow" id="checkbox_tablerow" v-model="checkedBoxes" :value="row.personal_number">
+ <input type="checkbox" class="form-check-input" name="checkbox_tablerow" id="checkbox_tablerow" v-model="checkedBoxes" :value="row.id">
<label class="form-check-label" for="checkbox_tablerow"></label>
</div>
</td>
@@ -100,7 +100,7 @@ export default {
},
loadData(){
- this.$store.dispatch('course/getAll').then(
+ this.$store.dispatch('teacher/getAll').then(
(data) => {
let x;
for(x = 0; x < data.length; x++){
@@ -114,6 +114,23 @@ export default {
);
},
+ deleterows(){
+ let x = 0;
+ for (x; x < this.checkedBoxes.length; x++){
+ this.$store.dispatch('teacher/delete', this.checkedBoxes[x]).then(
+ data => {
+ this.message = data.message;
+ this.successful = true;
+ },
+ error => {
+ this.message = (error.response && error.response.data) || error.message || error.toString();
+ this.successful = false;
+ }
+ );
+ }
+ this.rows = [];
+ this.loadData();
+ },
"sortTable": function sortTable(col) {
this.currentSort = col;
if (this.currentSortDir === 'asc') {
diff --git a/src/models/course.js b/src/models/course.js
index be185bd911f36e202c9752cc3e797fe2663777e4..9d68debe8204cee409be0aa274f3f9b03e131778 100644
--- a/src/models/course.js
+++ b/src/models/course.js
@@ -1,7 +1,7 @@
export default class Course {
- constructor(id, coursenumber, courseoffer, coursename, eventtype, coursedate, topic, courselocation, accompanyingteacher, supervisingstudents, presentstudents, registeredstudents, instructor, notefield, status) {
- this.id = id,
+ constructor(id, coursenumber, courseoffer, coursename, eventtype, coursedate, topic, courselocation, accompanyingteacher, supervisingstudents, presentstudents, registeredstudents, anzahlung, honorar, instructor, notefield, status) {
+ this.id = id;
this.coursenumber = coursenumber;
this.courseoffer = courseoffer;
this.coursename = coursename;
@@ -13,6 +13,8 @@ export default class Course {
this.supervisingstudents = supervisingstudents;
this.presentstudents = presentstudents;
this.registeredstudents = registeredstudents;
+ this.anzahlung = anzahlung;
+ this.honorar = honorar;
this.instructor = instructor;
this.notefield = notefield;
this.status = status;
diff --git a/src/models/teacher.js b/src/models/teacher.js
index 804023a7cadb98f0d753a0eea6f8487aa5142db1..19f77039d99328330d9919db90247e73c34b2b4d 100644
--- a/src/models/teacher.js
+++ b/src/models/teacher.js
@@ -1,21 +1,21 @@
export default class Teacher {
- constructor(personal_number, gender, grad, firstname, lastname, email, telephone, street, zip, city, subject, school_branch, school_name, school_number, status) {
- this.personal_number = personal_number;
- this.gender = gender;
- this.grad = grad;
- this.firstname = firstname;
- this.lastname = lastname;
- this.email = email;
- this.telephone = telephone;
- this.street = street;
- this.zip = zip;
- this.city = city;
- this.subject = subject;
- this.school_branch = school_branch;
- this.school_name = school_name;
- this.school_number = school_number;
- this.status = status;
+ constructor(personal_number, gender, grad, firstname, lastname, email, telephone, street, zip, city, subject, school_branch, school_name, school_number, status) {
+ this.personal_number = personal_number;
+ this.gender = gender;
+ this.grad = grad;
+ this.firstname = firstname;
+ this.lastname = lastname;
+ this.email = email;
+ this.telephone = telephone;
+ this.street = street;
+ this.zip = zip;
+ this.city = city;
+ this.subject = subject;
+ this.school_branch = school_branch;
+ this.school_name = school_name;
+ this.school_number = school_number;
+ this.status = status;
}
}
\ No newline at end of file
diff --git a/src/services/course.service.js b/src/services/course.service.js
index c13729355fc751b46cd8524a8b78fd72a7d50158..f61e1ca945c58debd2c4a5a228048e873da56de9 100644
--- a/src/services/course.service.js
+++ b/src/services/course.service.js
@@ -8,19 +8,22 @@ class CourseService {
insert(course) {
return axios
.post(API_URL + 'insertCourse', {
- angebotsnummer: course.coursenumber,
- angebot: course.courseoffer,
- kursname: course.coursename,
- veranstaltungsart: course.eventtype,
- kursdatum: course.coursedate,
- thema: course.topic,
- kursort: course.courselocation,
- begleitendeLehrkraft: course.accompanyingteacher,
- betreuendeStudenten: course.supervisingstudents,
- anzahlderAnwesenden:course.presentstudents,
- anzahlderAngemeldeten:course.registeredstudents,
- kursleiter: course.instructor,
- notiz: course.notefield
+ course_number: course.coursenumber,
+ course_offer: course.courseoffer,
+ course_name: course.coursename,
+ event_type: course.eventtype,
+ course_datetime: course.coursedate,
+ course_topic: course.topic,
+ course_location: course.courselocation,
+ accompanyingTeacher: course.accompanyingteacher,
+ supervisingStudents: course.supervisingstudents,
+ presentStudents:course.presentstudents,
+ registeredStudents:course.registeredstudents,
+ anzahlung: course.anzahlung,
+ honorar: course.honorar,
+ instructor: course.instructor,
+ noteField: course.notefield,
+ status: course.status
}
,{headers: authHeader() })
@@ -33,19 +36,22 @@ class CourseService {
return axios
.post(API_URL + 'updateCourse', {
id: course.id,
- angebotsnummer: course.coursenumber,
- angebot: course.courseoffer,
- kursname: course.coursename,
- veranstaltungsart: course.eventtype,
- kursdatum: course.coursedate,
- thema: course.topic,
- kursort: course.courselocation,
- begleitendeLehrkraft: course.accompanyingteacher,
- betreuendeStudenten: course.supervisingstudents,
- anzahlderAnwesenden:course.presentstudents,
- anzahlderAngemeldeten:course.registeredstudents,
- kursleiter: course.instructor,
- notiz: course.notefield,
+ course_number: course.coursenumber,
+ course_offer: course.courseoffer,
+ course_name: course.coursename,
+ event_type: course.eventtype,
+ course_datetime: course.coursedate,
+ course_topic: course.topic,
+ course_location: course.courselocation,
+ accompanyingTeacher: course.accompanyingteacher,
+ supervisingStudents: course.supervisingstudents,
+ presentStudents:course.presentstudents,
+ registeredStudents:course.registeredstudents,
+ anzahlung: course.anzahlung,
+ honorar: course.honorar,
+ instructor: course.instructor,
+ noteField: course.notefield,
+ status: course.status
}
,{headers: authHeader() })
.then(response => {
diff --git a/src/services/teacher.service.js b/src/services/teacher.service.js
index 0c4c25e1262fefd8f5266f18edec7871d18035aa..cfe6a9d2a5f052ccc5be50e276d32f6c7e6bce35 100644
--- a/src/services/teacher.service.js
+++ b/src/services/teacher.service.js
@@ -24,7 +24,6 @@ class TeacherService {
school_number: teacher.school_number,
status: teacher.status,
}
-
,{headers: authHeader() })
.then(response => {
return response.data;
@@ -34,6 +33,7 @@ class TeacherService {
update(teacher) {
return axios
.post(API_URL + 'updateTeacher', {
+ id:teacher.id,
personal_number: teacher.personal_number,
gender: teacher.gender,
grad: teacher.grad,
@@ -79,7 +79,7 @@ class TeacherService {
getByID(idValue) {
return axios
- .get(API_URL + 'getTeachersByID/'+idValue, {
+ .get(API_URL + 'getTeacherByID/'+idValue, {
headers: authHeader()
})
.then(response => {
diff --git a/src/store/index.js b/src/store/index.js
index 292d729402de95dc73df683bb10ca0be64034516..bf3991401ed8cff280d58d4f4008ae8c2fd1ea29 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -4,6 +4,7 @@ import Vuex from 'vuex';
import { auth } from './auth.module';
import { user } from './user.module';
import { course } from './course.module';
+import { teacher } from './teacher.module';
Vue.use(Vuex);
@@ -11,6 +12,7 @@ export default new Vuex.Store({
modules: {
auth,
user,
- course
+ course,
+ teacher
}
});
\ No newline at end of file
diff --git a/src/store/teacher.module.js b/src/store/teacher.module.js
index 50c792e0b41ba64cf605f99cf58753139aac6e15..65d5621669d186bf35a140cebd673403d34e0ec2 100644
--- a/src/store/teacher.module.js
+++ b/src/store/teacher.module.js
@@ -58,6 +58,19 @@ export const teacher = {
return Promise.reject(error);
}
);
+ },
+
+ delete({ commit }, id) {
+ return TeacherService.delete(id).then(
+ response => {
+ commit('insertSuccess', response);
+ return Promise.resolve(response);
+ },
+ error => {
+ commit('insertFailure');
+ return Promise.reject(error);
+ }
+ );
}
},