From 352e612220eff8f4bf57b51afcb637e505095f45 Mon Sep 17 00:00:00 2001 From: oetrb <oetrb@github.com> Date: Thu, 8 Oct 2020 00:09:06 +0200 Subject: [PATCH] . --- src/components/Courses.vue | 2 +- .../CreateEditComponents/CreateTeacher.vue | 13 +++ .../CreateEditComponents/DeleteTeacher.vue | 13 +++ .../CreateEditComponents/EditTeacher.vue | 13 +++ src/components/Teachers.vue | 81 ++----------------- src/models/course.js | 30 ++++--- src/models/teacher.js | 30 +++---- src/router.js | 20 +++++ 8 files changed, 98 insertions(+), 104 deletions(-) create mode 100644 src/components/CreateEditComponents/CreateTeacher.vue create mode 100644 src/components/CreateEditComponents/DeleteTeacher.vue create mode 100644 src/components/CreateEditComponents/EditTeacher.vue diff --git a/src/components/Courses.vue b/src/components/Courses.vue index 35b4dff..2b756c3 100644 --- a/src/components/Courses.vue +++ b/src/components/Courses.vue @@ -5,7 +5,7 @@ <a id="editbutton" class="button" href="./editcourse" style="visibility: hidden">Eintrag bearbeiten</a> <a id="addbutton" class="button" href="./createcourse">neuen Eintrag hinzufügen</a> <a id="deletebutton" class="button" href="./deletecourse">ausgewählte Einträge löschen</a> - <a id="exportbutton" class="button" href="./exporttable">Tabelle exportieren</a> + <a id="exportbutton" class="button" href="./exporttablecourse">Tabelle exportieren</a> </div> <div class="search_box-inner"> <i><img src="../assets/search.svg"></i> diff --git a/src/components/CreateEditComponents/CreateTeacher.vue b/src/components/CreateEditComponents/CreateTeacher.vue new file mode 100644 index 0000000..59d9f4a --- /dev/null +++ b/src/components/CreateEditComponents/CreateTeacher.vue @@ -0,0 +1,13 @@ +<template> +<div></div> +</template> + +<script> +export default { + name: "CreateTeacher" +} +</script> + +<style scoped> + +</style> \ No newline at end of file diff --git a/src/components/CreateEditComponents/DeleteTeacher.vue b/src/components/CreateEditComponents/DeleteTeacher.vue new file mode 100644 index 0000000..d5e1e81 --- /dev/null +++ b/src/components/CreateEditComponents/DeleteTeacher.vue @@ -0,0 +1,13 @@ +<template> + <div></div> +</template> + +<script> +export default { + name: "DeleteTeacher" +} +</script> + +<style scoped> + +</style> \ No newline at end of file diff --git a/src/components/CreateEditComponents/EditTeacher.vue b/src/components/CreateEditComponents/EditTeacher.vue new file mode 100644 index 0000000..bd66b23 --- /dev/null +++ b/src/components/CreateEditComponents/EditTeacher.vue @@ -0,0 +1,13 @@ +<template> + <div></div> +</template> + +<script> +export default { + name: "EditTeacher" +} +</script> + +<style scoped> + +</style> \ No newline at end of file diff --git a/src/components/Teachers.vue b/src/components/Teachers.vue index 7d26dd6..b820ce7 100644 --- a/src/components/Teachers.vue +++ b/src/components/Teachers.vue @@ -2,10 +2,10 @@ <div class="content col-md-12"> <div id="search_box" class="search_box col-md-4"> <div class="entry_box-inner"> - <a id="editbutton" class="button" href="./editcourse" style="visibility: hidden">Eintrag bearbeiten</a> - <a id="addbutton" class="button" href="./createcourse">neuen Eintrag hinzufügen</a> - <a id="deletebutton" class="button" href="./deletecourse">ausgewählte Einträge löschen</a> - <a id="exportbutton" class="button" href="./exporttable">Tabelle exportieren</a> + <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="exportbutton" class="button" href="./exporttableteacher">Tabelle exportieren</a> </div> <div class="search_box-inner"> <i><img src="../assets/search.svg"></i> @@ -20,7 +20,6 @@ <label class="form-check-label" for="checkbox_headerline"></label> </div> </th> - <th v-on:click="sortTable('teachers_id')"><img id='imgsortteachersid' :src="require('../assets/'+sortImg)">Lehrer-ID</th> <th v-on:click="sortTable('anrede')"><img id='imgsortanrede' :src="require('../assets/'+sortImg)">Anrede</th> <th v-on:click="sortTable('grad')"><img id='imgsortgrad' :src="require('../assets/'+sortImg)">Grad</th> <th v-on:click="sortTable('firstname')"><img id='imgsortfirstname' :src="require('../assets/'+sortImg)">Vorname</th> @@ -36,14 +35,13 @@ <th v-on:click="sortTable('summeruni_20')"><img id='imgsortsummeruni_20' :src="require('../assets/'+sortImg)">SommerUni 20</th> <th v-on:click="sortTable('natlab_20')"><img id='imgsortnatlab_20' :src="require('../assets/'+sortImg)">NatLab 20</th> </tr> - <tr v-for="row in filteredRows" :key="row.id"> + <tr v-for="row in filteredRows" :key="row.lastname"> <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.id"> + <input type="checkbox" class="form-check-input" name="checkbox_tablerow" id="checkbox_tablerow" v-model="checkedBoxes" :value="row.lastname"> <label class="form-check-label" for="checkbox_tablerow"></label> </div> </td> - <td>{{row.id}}</td> <td>{{row.anrede}}</td> <td>{{row.grad}}</td> <td>{{row.firstname}}</td> @@ -71,7 +69,7 @@ export default { rows: [], checkedBoxes: [], filter:'', - currentSort:'id', + currentSort:'lastname', currentSortDir:'asc', sortImg: 'sort_def.svg', } @@ -120,26 +118,8 @@ export default { this.currentSortDir = 'desc'; switch (this.currentSort){ - case 'teachers_id': - document.getElementById("imgsortteachersid").src = require('../assets/sort_asc.svg'); - document.getElementById("imgsortanrede").src = require('../assets/sort_def.svg'); - document.getElementById("imgsortgrad").src = require('../assets/sort_def.svg'); - document.getElementById("imgsortfirstname").src = require('../assets/sort_def.svg'); - document.getElementById("imgsortlastname").src = require('../assets/sort_def.svg'); - document.getElementById("imgsortstreet").src = require('../assets/sort_def.svg'); - document.getElementById("imgsortzip").src = require('../assets/sort_def.svg'); - document.getElementById("imgsortcity").src = require('../assets/sort_def.svg'); - document.getElementById("imgsortaddaddress").src = require('../assets/sort_def.svg'); - document.getElementById("imgsortpersonal_questionaire").src = require('../assets/sort_def.svg'); - document.getElementById("imgsortsummeruni_17").src = require('../assets/sort_def.svg'); - document.getElementById("imgsortsummeruni_18").src = require('../assets/sort_def.svg'); - document.getElementById("imgsortsummeruni_19").src = require('../assets/sort_def.svg'); - document.getElementById("imgsortsummeruni_20").src = require('../assets/sort_def.svg'); - document.getElementById("imgsortnatlab_20").src = require('../assets/sort_def.svg'); - break; case 'anrede': document.getElementById("imgsortanrede").src = require('../assets/sort_asc.svg'); - document.getElementById("imgsortteachersid").src = require('../assets/sort_def.svg'); document.getElementById("imgsortgrad").src = require('../assets/sort_def.svg'); document.getElementById("imgsortfirstname").src = require('../assets/sort_def.svg'); document.getElementById("imgsortlastname").src = require('../assets/sort_def.svg'); @@ -156,7 +136,6 @@ export default { break; case 'grad': document.getElementById("imgsortgrad").src = require('../assets/sort_asc.svg'); - document.getElementById("imgsortteachersid").src = require('../assets/sort_def.svg'); document.getElementById("imgsortanrede").src = require('../assets/sort_def.svg'); document.getElementById("imgsortfirstname").src = require('../assets/sort_def.svg'); document.getElementById("imgsortlastname").src = require('../assets/sort_def.svg'); @@ -173,7 +152,6 @@ export default { break; case 'firstname': document.getElementById("imgsortfirstname").src = require('../assets/sort_asc.svg'); - document.getElementById("imgsortteachersid").src = require('../assets/sort_def.svg'); document.getElementById("imgsortanrede").src = require('../assets/sort_def.svg'); document.getElementById("imgsortgrad").src = require('../assets/sort_def.svg'); document.getElementById("imgsortlastname").src = require('../assets/sort_def.svg'); @@ -190,7 +168,6 @@ export default { break; case 'lastname': document.getElementById("imgsortlastname").src = require('../assets/sort_asc.svg'); - document.getElementById("imgsortteachersid").src = require('../assets/sort_def.svg'); document.getElementById("imgsortanrede").src = require('../assets/sort_def.svg'); document.getElementById("imgsortgrad").src = require('../assets/sort_def.svg'); document.getElementById("imgsortfirstname").src = require('../assets/sort_def.svg'); @@ -207,7 +184,6 @@ export default { break; case 'street': document.getElementById("imgsortstreet").src = require('../assets/sort_asc.svg'); - document.getElementById("imgsortteachersid").src = require('../assets/sort_def.svg'); document.getElementById("imgsortanrede").src = require('../assets/sort_def.svg'); document.getElementById("imgsortgrad").src = require('../assets/sort_def.svg'); document.getElementById("imgsortfirstname").src = require('../assets/sort_def.svg'); @@ -224,7 +200,6 @@ export default { break; case 'zip': document.getElementById("imgsortzip").src = require('../assets/sort_asc.svg'); - document.getElementById("imgsortteachersid").src = require('../assets/sort_def.svg'); document.getElementById("imgsortanrede").src = require('../assets/sort_def.svg'); document.getElementById("imgsortgrad").src = require('../assets/sort_def.svg'); document.getElementById("imgsortfirstname").src = require('../assets/sort_def.svg'); @@ -241,7 +216,6 @@ export default { break; case 'city': document.getElementById("imgsortcity").src = require('../assets/sort_asc.svg'); - document.getElementById("imgsortteachersid").src = require('../assets/sort_def.svg'); document.getElementById("imgsortanrede").src = require('../assets/sort_def.svg'); document.getElementById("imgsortgrad").src = require('../assets/sort_def.svg'); document.getElementById("imgsortfirstname").src = require('../assets/sort_def.svg'); @@ -258,7 +232,6 @@ export default { break; case 'addaddress': document.getElementById("imgsortaddaddress").src = require('../assets/sort_asc.svg'); - document.getElementById("imgsortteachersid").src = require('../assets/sort_def.svg'); document.getElementById("imgsortanrede").src = require('../assets/sort_def.svg'); document.getElementById("imgsortgrad").src = require('../assets/sort_def.svg'); document.getElementById("imgsortfirstname").src = require('../assets/sort_def.svg'); @@ -275,7 +248,6 @@ export default { break; case 'personal_questionnaire': document.getElementById("imgsortpersonal_questionaire").src = require('../assets/sort_asc.svg'); - document.getElementById("imgsortteachersid").src = require('../assets/sort_def.svg'); document.getElementById("imgsortanrede").src = require('../assets/sort_def.svg'); document.getElementById("imgsortgrad").src = require('../assets/sort_def.svg'); document.getElementById("imgsortfirstname").src = require('../assets/sort_def.svg'); @@ -292,7 +264,6 @@ export default { break; case 'summeruni_17': document.getElementById("imgsortsummeruni_17").src = require('../assets/sort_asc.svg'); - document.getElementById("imgsortteachersid").src = require('../assets/sort_def.svg'); document.getElementById("imgsortanrede").src = require('../assets/sort_def.svg'); document.getElementById("imgsortgrad").src = require('../assets/sort_def.svg'); document.getElementById("imgsortfirstname").src = require('../assets/sort_def.svg'); @@ -309,7 +280,6 @@ export default { break; case 'summeruni_18': document.getElementById("imgsortsummeruni_18").src = require('../assets/sort_asc.svg'); - document.getElementById("imgsortteachersid").src = require('../assets/sort_def.svg'); document.getElementById("imgsortanrede").src = require('../assets/sort_def.svg'); document.getElementById("imgsortgrad").src = require('../assets/sort_def.svg'); document.getElementById("imgsortfirstname").src = require('../assets/sort_def.svg'); @@ -326,7 +296,6 @@ export default { break; case 'summeruni_19': document.getElementById("imgsortsummeruni_19").src = require('../assets/sort_asc.svg'); - document.getElementById("imgsortteachersid").src = require('../assets/sort_def.svg'); document.getElementById("imgsortanrede").src = require('../assets/sort_def.svg'); document.getElementById("imgsortgrad").src = require('../assets/sort_def.svg'); document.getElementById("imgsortfirstname").src = require('../assets/sort_def.svg'); @@ -343,7 +312,6 @@ export default { break; case 'summeruni_20': document.getElementById("imgsortsummeruni_20").src = require('../assets/sort_asc.svg'); - document.getElementById("imgsortteachersid").src = require('../assets/sort_def.svg'); document.getElementById("imgsortanrede").src = require('../assets/sort_def.svg'); document.getElementById("imgsortgrad").src = require('../assets/sort_def.svg'); document.getElementById("imgsortfirstname").src = require('../assets/sort_def.svg'); @@ -360,7 +328,6 @@ export default { break; case 'natlab_20': document.getElementById("imgsortnatlab_20").src = require('../assets/sort_asc.svg'); - document.getElementById("imgsortteachersid").src = require('../assets/sort_def.svg'); document.getElementById("imgsortanrede").src = require('../assets/sort_def.svg'); document.getElementById("imgsortgrad").src = require('../assets/sort_def.svg'); document.getElementById("imgsortfirstname").src = require('../assets/sort_def.svg'); @@ -397,26 +364,8 @@ export default { this.currentSortDir = 'asc'; switch (this.currentSort){ - case 'teachers_id': - document.getElementById("imgsortteachersid").src = require('../assets/sort_desc.svg'); - document.getElementById("imgsortanrede").src = require('../assets/sort_def.svg'); - document.getElementById("imgsortgrad").src = require('../assets/sort_def.svg'); - document.getElementById("imgsortfirstname").src = require('../assets/sort_def.svg'); - document.getElementById("imgsortlastname").src = require('../assets/sort_def.svg'); - document.getElementById("imgsortstreet").src = require('../assets/sort_def.svg'); - document.getElementById("imgsortzip").src = require('../assets/sort_def.svg'); - document.getElementById("imgsortcity").src = require('../assets/sort_def.svg'); - document.getElementById("imgsortaddaddress").src = require('../assets/sort_def.svg'); - document.getElementById("imgsortpersonal_questionaire").src = require('../assets/sort_def.svg'); - document.getElementById("imgsortsummeruni_17").src = require('../assets/sort_def.svg'); - document.getElementById("imgsortsummeruni_18").src = require('../assets/sort_def.svg'); - document.getElementById("imgsortsummeruni_19").src = require('../assets/sort_def.svg'); - document.getElementById("imgsortsummeruni_20").src = require('../assets/sort_def.svg'); - document.getElementById("imgsortnatlab_20").src = require('../assets/sort_def.svg'); - break; case 'anrede': document.getElementById("imgsortanrede").src = require('../assets/sort_desc.svg'); - document.getElementById("imgsortteachersid").src = require('../assets/sort_def.svg'); document.getElementById("imgsortgrad").src = require('../assets/sort_def.svg'); document.getElementById("imgsortfirstname").src = require('../assets/sort_def.svg'); document.getElementById("imgsortlastname").src = require('../assets/sort_def.svg'); @@ -433,7 +382,6 @@ export default { break; case 'grad': document.getElementById("imgsortgrad").src = require('../assets/sort_desc.svg'); - document.getElementById("imgsortteachersid").src = require('../assets/sort_def.svg'); document.getElementById("imgsortanrede").src = require('../assets/sort_def.svg'); document.getElementById("imgsortfirstname").src = require('../assets/sort_def.svg'); document.getElementById("imgsortlastname").src = require('../assets/sort_def.svg'); @@ -450,7 +398,6 @@ export default { break; case 'firstname': document.getElementById("imgsortfirstname").src = require('../assets/sort_desc.svg'); - document.getElementById("imgsortteachersid").src = require('../assets/sort_def.svg'); document.getElementById("imgsortanrede").src = require('../assets/sort_def.svg'); document.getElementById("imgsortgrad").src = require('../assets/sort_def.svg'); document.getElementById("imgsortlastname").src = require('../assets/sort_def.svg'); @@ -467,7 +414,6 @@ export default { break; case 'lastname': document.getElementById("imgsortlastname").src = require('../assets/sort_desc.svg'); - document.getElementById("imgsortteachersid").src = require('../assets/sort_def.svg'); document.getElementById("imgsortanrede").src = require('../assets/sort_def.svg'); document.getElementById("imgsortgrad").src = require('../assets/sort_def.svg'); document.getElementById("imgsortfirstname").src = require('../assets/sort_def.svg'); @@ -484,7 +430,6 @@ export default { break; case 'street': document.getElementById("imgsortstreet").src = require('../assets/sort_desc.svg'); - document.getElementById("imgsortteachersid").src = require('../assets/sort_def.svg'); document.getElementById("imgsortanrede").src = require('../assets/sort_def.svg'); document.getElementById("imgsortgrad").src = require('../assets/sort_def.svg'); document.getElementById("imgsortfirstname").src = require('../assets/sort_def.svg'); @@ -501,7 +446,6 @@ export default { break; case 'zip': document.getElementById("imgsortzip").src = require('../assets/sort_desc.svg'); - document.getElementById("imgsortteachersid").src = require('../assets/sort_def.svg'); document.getElementById("imgsortanrede").src = require('../assets/sort_def.svg'); document.getElementById("imgsortgrad").src = require('../assets/sort_def.svg'); document.getElementById("imgsortfirstname").src = require('../assets/sort_def.svg'); @@ -518,7 +462,6 @@ export default { break; case 'city': document.getElementById("imgsortcity").src = require('../assets/sort_desc.svg'); - document.getElementById("imgsortteachersid").src = require('../assets/sort_def.svg'); document.getElementById("imgsortanrede").src = require('../assets/sort_def.svg'); document.getElementById("imgsortgrad").src = require('../assets/sort_def.svg'); document.getElementById("imgsortfirstname").src = require('../assets/sort_def.svg'); @@ -535,7 +478,6 @@ export default { break; case 'addaddress': document.getElementById("imgsortaddaddress").src = require('../assets/sort_desc.svg'); - document.getElementById("imgsortteachersid").src = require('../assets/sort_def.svg'); document.getElementById("imgsortanrede").src = require('../assets/sort_def.svg'); document.getElementById("imgsortgrad").src = require('../assets/sort_def.svg'); document.getElementById("imgsortfirstname").src = require('../assets/sort_def.svg'); @@ -552,7 +494,6 @@ export default { break; case 'personal_questionnaire': document.getElementById("imgsortpersonal_questionaire").src = require('../assets/sort_desc.svg'); - document.getElementById("imgsortteachersid").src = require('../assets/sort_def.svg'); document.getElementById("imgsortanrede").src = require('../assets/sort_def.svg'); document.getElementById("imgsortgrad").src = require('../assets/sort_def.svg'); document.getElementById("imgsortfirstname").src = require('../assets/sort_def.svg'); @@ -569,7 +510,6 @@ export default { break; case 'summeruni_17': document.getElementById("imgsortsummeruni_17").src = require('../assets/sort_desc.svg'); - document.getElementById("imgsortteachersid").src = require('../assets/sort_def.svg'); document.getElementById("imgsortanrede").src = require('../assets/sort_def.svg'); document.getElementById("imgsortgrad").src = require('../assets/sort_def.svg'); document.getElementById("imgsortfirstname").src = require('../assets/sort_def.svg'); @@ -586,7 +526,6 @@ export default { break; case 'summeruni_18': document.getElementById("imgsortsummeruni_18").src = require('../assets/sort_desc.svg'); - document.getElementById("imgsortteachersid").src = require('../assets/sort_def.svg'); document.getElementById("imgsortanrede").src = require('../assets/sort_def.svg'); document.getElementById("imgsortgrad").src = require('../assets/sort_def.svg'); document.getElementById("imgsortfirstname").src = require('../assets/sort_def.svg'); @@ -603,7 +542,6 @@ export default { break; case 'summeruni_19': document.getElementById("imgsortsummeruni_19").src = require('../assets/sort_desc.svg'); - document.getElementById("imgsortteachersid").src = require('../assets/sort_def.svg'); document.getElementById("imgsortanrede").src = require('../assets/sort_def.svg'); document.getElementById("imgsortgrad").src = require('../assets/sort_def.svg'); document.getElementById("imgsortfirstname").src = require('../assets/sort_def.svg'); @@ -620,7 +558,6 @@ export default { break; case 'summeruni_20': document.getElementById("imgsortsummeruni_20").src = require('../assets/sort_desc.svg'); - document.getElementById("imgsortteachersid").src = require('../assets/sort_def.svg'); document.getElementById("imgsortanrede").src = require('../assets/sort_def.svg'); document.getElementById("imgsortgrad").src = require('../assets/sort_def.svg'); document.getElementById("imgsortfirstname").src = require('../assets/sort_def.svg'); @@ -637,7 +574,6 @@ export default { break; case 'natlab_20': document.getElementById("imgsortnatlab_20").src = require('../assets/sort_desc.svg'); - document.getElementById("imgsortteachersid").src = require('../assets/sort_def.svg'); document.getElementById("imgsortanrede").src = require('../assets/sort_def.svg'); document.getElementById("imgsortgrad").src = require('../assets/sort_def.svg'); document.getElementById("imgsortfirstname").src = require('../assets/sort_def.svg'); @@ -694,7 +630,6 @@ export default { }, filteredRows() { return this.rows.filter(row => { - const teachers_id = row.id.toString().toLowerCase(); const anrede = row.anrede.toLowerCase(); const grad = row.grad.toLowerCase(); const firstname = row.firstname.toLowerCase(); @@ -711,7 +646,7 @@ export default { const natlab_20 = row.natlab_20.toLowerCase(); const searchTerm = this.filter.toLowerCase(); - return teachers_id.includes(searchTerm) || anrede.includes(searchTerm) || grad.includes(searchTerm) || firstname.includes(searchTerm) || lastname.includes(searchTerm) || street.includes(searchTerm) || zip.includes(searchTerm) || city.includes(searchTerm) || addaddress.includes(searchTerm) || personal_questionnaire.includes(searchTerm) || summeruni_17.includes(searchTerm) || summeruni_18.includes(searchTerm) || summeruni_19.includes(searchTerm) || summeruni_20.includes(searchTerm) || natlab_20.includes(searchTerm); + return anrede.includes(searchTerm) || grad.includes(searchTerm) || firstname.includes(searchTerm) || lastname.includes(searchTerm) || street.includes(searchTerm) || zip.includes(searchTerm) || city.includes(searchTerm) || addaddress.includes(searchTerm) || personal_questionnaire.includes(searchTerm) || summeruni_17.includes(searchTerm) || summeruni_18.includes(searchTerm) || summeruni_19.includes(searchTerm) || summeruni_20.includes(searchTerm) || natlab_20.includes(searchTerm); }); } } diff --git a/src/models/course.js b/src/models/course.js index 18a4d4e..5d1080c 100644 --- a/src/models/course.js +++ b/src/models/course.js @@ -1,20 +1,18 @@ export default class Course { - constructor(teachers_id, anrede, grad, firstname, lastname, street, zip, city, addaddress, personal_questionnaire, summeruni_17, summeruni_18, summeruni_19, summeruni_20, natlab_20) { - this.teachers_id = teachers_id; - this.anrede = anrede; - this.grad = grad; - this.firstname = firstname; - this.lastname = lastname; - this.street = street; - this.zip = zip; - this.city = city; - this.addaddress = addaddress; - this.personal_questionnaire = personal_questionnaire; - this.summeruni_17 = summeruni_17; - this.summeruni_18 = summeruni_18; - this.summeruni_19 = summeruni_19; - this.summeruni_20 = summeruni_20; - this.natlab_20 = natlab_20; + constructor(coursenumber, courseoffer, coursename, eventtype, coursedate, topic, courselocation, accompanyingteacher, supervisingstudents, presentstudents, registeredstudents, instructor, notefield) { + this.coursenumber = coursenumber; + this.courseoffer = courseoffer; + this.coursename = coursename; + this.eventtype = eventtype; + this.coursedate = coursedate; + this.topic = topic; + this.courselocation = courselocation; + this.accompanyingteacher = accompanyingteacher; + this.supervisingstudents = supervisingstudents; + this.presentstudents = presentstudents; + this.registeredstudents = registeredstudents; + this.instructor = instructor; + this.notefield = notefield; } } diff --git a/src/models/teacher.js b/src/models/teacher.js index 92ba6e1..d012450 100644 --- a/src/models/teacher.js +++ b/src/models/teacher.js @@ -1,19 +1,21 @@ export default class Teacher { - constructor(coursenumber, courseoffer, coursename, eventtype, coursedate, topic, courselocation, accompanyingteacher, supervisingstudents, presentstudents, registeredstudents, instructor, notefield) { - this.coursenumber = coursenumber; - this.courseoffer = courseoffer; - this.coursename = coursename; - this.eventtype = eventtype; - this.coursedate = coursedate; - this.topic = topic; - this.courselocation = courselocation; - this.accompanyingteacher = accompanyingteacher; - this.supervisingstudents = supervisingstudents; - this.presentstudents = presentstudents; - this.registeredstudents = registeredstudents; - this.instructor = instructor; - this.notefield = notefield; + constructor(teachers_id, anrede, grad, firstname, lastname, street, zip, city, addaddress, personal_questionnaire, summeruni_17, summeruni_18, summeruni_19, summeruni_20, natlab_20) { + this.teachers_id = teachers_id; + this.anrede = anrede; + this.grad = grad; + this.firstname = firstname; + this.lastname = lastname; + this.street = street; + this.zip = zip; + this.city = city; + this.addaddress = addaddress; + this.personal_questionnaire = personal_questionnaire; + this.summeruni_17 = summeruni_17; + this.summeruni_18 = summeruni_18; + this.summeruni_19 = summeruni_19; + this.summeruni_20 = summeruni_20; + this.natlab_20 = natlab_20; } } \ No newline at end of file diff --git a/src/router.js b/src/router.js index cf3a8dd..3e1c359 100644 --- a/src/router.js +++ b/src/router.js @@ -12,6 +12,9 @@ import Teachers from "./components/Teachers"; import CreateCourse from "@/components/CreateEditComponents/CreateCourse"; import EditCourse from "@/components/CreateEditComponents/EditCourse"; import DeleteCourse from "@/components/CreateEditComponents/DeleteCourse"; +import CreateTeacher from "@/components/CreateEditComponents/CreateTeacher"; +import EditTeacher from "@/components/CreateEditComponents/EditTeacher"; +import DeleteTeacher from "@/components/CreateEditComponents/DeleteTeacher"; Vue.use(Router) @@ -36,6 +39,23 @@ const router = new Router({ component: DeleteCourse }, + // Button from Teachers + { + path: '/createteacher', + name: 'neuen Eintrag hinzufügen', + component: CreateTeacher + }, + { + path: '/editteacher', + name: 'Eintrag bearbeiten', + component: EditTeacher + }, + { + path: '/deleteteacher', + name: 'Eintrag löschen', + component: DeleteTeacher + }, + // LOGIN / REGISTER { path: '/login', -- GitLab