mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-07-16 22:42:16 +00:00
use injected studiensemester instead of api call for studiensemester
This commit is contained in:
@@ -19,7 +19,6 @@ class Tag_Controller extends FHCAPI_Controller
|
||||
'doneTag' => self::BERECHTIGUNG_KURZBZ,
|
||||
'deleteTag' => self::BERECHTIGUNG_KURZBZ,
|
||||
'getAllTags' => self::BERECHTIGUNG_KURZBZ,
|
||||
'getSemDates' => self::BERECHTIGUNG_KURZBZ,
|
||||
'getAllStartAndEndAutomatedTags' => self::BERECHTIGUNG_KURZBZ,
|
||||
'rebuildTagsForTypeId' => self::BERECHTIGUNG_KURZBZ,
|
||||
];
|
||||
@@ -352,18 +351,6 @@ class Tag_Controller extends FHCAPI_Controller
|
||||
$this->terminateWithSuccess($result);
|
||||
}
|
||||
|
||||
public function getSemDates()
|
||||
{
|
||||
$studiensemester_kurzbz = $this->input->get('semester');
|
||||
$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
|
||||
$result = $this->StudiensemesterModel->loadWhere(array('studiensemester_kurzbz' => $studiensemester_kurzbz));
|
||||
if (isError($result))
|
||||
return error('Error occurred during retrieving studiensemester');
|
||||
$data = getData($result);
|
||||
$this->terminateWithSuccess(current($data));
|
||||
|
||||
}
|
||||
|
||||
public function getAllStartAndEndAutomatedTags()
|
||||
{
|
||||
$this->NotizModel->addSelect('notiz_id as id');
|
||||
|
||||
@@ -61,14 +61,6 @@ export default {
|
||||
};
|
||||
},
|
||||
|
||||
getSemDates(studiensemester_kurzbz){
|
||||
return {
|
||||
method: 'get',
|
||||
url: 'api/frontend/v1/stv/Tags/getSemDates',
|
||||
params: studiensemester_kurzbz
|
||||
};
|
||||
},
|
||||
|
||||
getAllStartAndEndAutomatedTags(){
|
||||
return {
|
||||
method: 'get',
|
||||
|
||||
@@ -53,6 +53,10 @@ export default {
|
||||
from: 'currentSemester',
|
||||
required: true
|
||||
},
|
||||
lists: {
|
||||
from: 'lists',
|
||||
required: true
|
||||
},
|
||||
},
|
||||
computed: {
|
||||
appRoot() {
|
||||
@@ -81,6 +85,9 @@ export default {
|
||||
return [this.headerData[0].prestudent_id];
|
||||
}
|
||||
},
|
||||
semesterDates(){
|
||||
return this.lists.studiensemester?.find(item => item.studiensemester_kurzbz === this.currentSemester) || {};
|
||||
}
|
||||
},
|
||||
created(){
|
||||
if (this.typeHeader === 'student') {
|
||||
@@ -89,7 +96,6 @@ export default {
|
||||
}
|
||||
|
||||
if(this.tagsEnabled) {
|
||||
this.getSemesterDates(this.currentSemester);
|
||||
this.loadTagsAndRender(this.headerData[0].prestudent_id);
|
||||
}
|
||||
|
||||
@@ -119,14 +125,6 @@ export default {
|
||||
},
|
||||
deep: true,
|
||||
},
|
||||
currentSemester: {
|
||||
handler(newVal) {
|
||||
if (newVal) {
|
||||
this.getSemesterDates(newVal);
|
||||
}
|
||||
},
|
||||
deep: true,
|
||||
}
|
||||
},
|
||||
data(){
|
||||
return{
|
||||
@@ -137,7 +135,6 @@ export default {
|
||||
tagEndpoint: ApiTag,
|
||||
tagData: null,
|
||||
rebuildData: null,
|
||||
semDates: {}
|
||||
};
|
||||
},
|
||||
methods: {
|
||||
@@ -234,8 +231,8 @@ export default {
|
||||
this.tagData,
|
||||
this.$refs.tagComponent,
|
||||
'prestudent_id',
|
||||
this.semDates.start,
|
||||
this.semDates.ende
|
||||
this.semesterDates.start,
|
||||
this.semesterDates.ende
|
||||
);
|
||||
|
||||
this.$refs.tagWrapper.innerHTML = '';
|
||||
@@ -277,17 +274,6 @@ export default {
|
||||
})
|
||||
.catch(this.$fhcAlert.handleSystemError);
|
||||
},
|
||||
getSemesterDates(semester){
|
||||
const params = {
|
||||
studiensemester_kurzbz: semester
|
||||
};
|
||||
return this.$api
|
||||
.call(ApiTag.getSemDates({semester}))
|
||||
.then(result => {
|
||||
this.semDates = result.data;
|
||||
})
|
||||
.catch(this.$fhcAlert.handleSystemError);
|
||||
}
|
||||
},
|
||||
template: `
|
||||
<div class="core-header d-flex justify-content-start align-items-center w-100 overflow-auto pb-2 gap-3" style="max-height:9rem; min-width: 37.5rem;">
|
||||
|
||||
@@ -238,7 +238,6 @@ export default {
|
||||
oldScrollUrl: '',
|
||||
oldScrollLeft: 0,
|
||||
oldScrollTop: 0,
|
||||
semDates: {}, //TODO(Manu) check injections
|
||||
intervalMap: {}
|
||||
}
|
||||
},
|
||||
@@ -293,12 +292,13 @@ export default {
|
||||
.replace(/\//g, '_');
|
||||
return "StudentList_" + today + ".csv";
|
||||
},
|
||||
semesterDates(){
|
||||
return this.lists.studiensemester?.find(item => item.studiensemester_kurzbz === this.currentSemester) || {};
|
||||
}
|
||||
},
|
||||
created: function() {
|
||||
|
||||
if(this.tagsEnabled) {
|
||||
this.getSemesterDates(this.currentSemester);
|
||||
|
||||
this.loadIntervals(); //preload
|
||||
|
||||
const coltags = {
|
||||
@@ -333,9 +333,9 @@ export default {
|
||||
|
||||
return tagFormatter(
|
||||
enrichedTags,
|
||||
this.$refs.tagComponent,
|
||||
this.semDates.start,
|
||||
this.semDates.ende
|
||||
this.$refs?.tagComponent,
|
||||
this.semesterDates?.start,
|
||||
this.semesterDates?.ende
|
||||
);
|
||||
},
|
||||
width: 150,
|
||||
@@ -349,14 +349,6 @@ export default {
|
||||
this.translateTabulator();
|
||||
}
|
||||
},
|
||||
currentSemester: {
|
||||
handler(newVal) {
|
||||
if (newVal) {
|
||||
this.getSemesterDates(newVal);
|
||||
}
|
||||
},
|
||||
deep: true,
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
loadIntervals() {
|
||||
@@ -371,17 +363,6 @@ export default {
|
||||
})
|
||||
.catch(this.$fhcAlert.handleSystemError);
|
||||
},
|
||||
getSemesterDates(semester){ //TODO(check for injections)
|
||||
const params = {
|
||||
studiensemester_kurzbz: semester
|
||||
};
|
||||
return this.$api
|
||||
.call(ApiTag.getSemDates({semester}))
|
||||
.then(result => {
|
||||
this.semDates = result.data;
|
||||
})
|
||||
.catch(this.$fhcAlert.handleSystemError);
|
||||
},
|
||||
translateTabulator() {
|
||||
this.$p
|
||||
.loadCategory(['global', 'person', 'lehre', 'ui', 'profilUpdate', 'admission', 'stv'])
|
||||
@@ -667,7 +648,7 @@ export default {
|
||||
// TODO(chris): filter component column chooser has no accessibilty features
|
||||
template: `
|
||||
<div class="stv-list h-100 pt-3">
|
||||
test manu: currentSEM: {{semDates.start}} - {{semDates.ende}}
|
||||
test manu: currentSEM: {{semesterDates.start}} - {{semesterDates.ende}}<hr>
|
||||
<div
|
||||
class="tabulator-container d-flex flex-column h-100"
|
||||
:class="{'has-filter': filter.length}"
|
||||
|
||||
Reference in New Issue
Block a user