mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-07-25 08:34:29 +00:00
use "getStudiensemester" from dedicated Lists Controller
This commit is contained in:
@@ -19,7 +19,6 @@ class Prestudent extends FHCAPI_Controller
|
|||||||
'getAufmerksamdurch' => self::PERM_LOGGED,
|
'getAufmerksamdurch' => self::PERM_LOGGED,
|
||||||
'getBerufstaetigkeit' => self::PERM_LOGGED,
|
'getBerufstaetigkeit' => self::PERM_LOGGED,
|
||||||
'getTypenStg' => self::PERM_LOGGED,
|
'getTypenStg' => self::PERM_LOGGED,
|
||||||
'getStudiensemester' => self::PERM_LOGGED,
|
|
||||||
'getStudienplaene' => self::PERM_LOGGED
|
'getStudienplaene' => self::PERM_LOGGED
|
||||||
]);
|
]);
|
||||||
|
|
||||||
@@ -265,20 +264,6 @@ class Prestudent extends FHCAPI_Controller
|
|||||||
return $this->terminateWithSuccess(getData($result) ?: []);
|
return $this->terminateWithSuccess(getData($result) ?: []);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getStudiensemester()
|
|
||||||
{
|
|
||||||
$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
|
|
||||||
|
|
||||||
$this->StudiensemesterModel->addOrder('start', 'DESC');
|
|
||||||
$this->StudiensemesterModel->addLimit(20);
|
|
||||||
|
|
||||||
$result = $this->StudiensemesterModel->load();
|
|
||||||
if (isError($result)) {
|
|
||||||
$this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL);
|
|
||||||
}
|
|
||||||
return $this->terminateWithSuccess(getData($result) ?: []);
|
|
||||||
}
|
|
||||||
|
|
||||||
public function getStudienplaene($prestudent_ids)
|
public function getStudienplaene($prestudent_ids)
|
||||||
{
|
{
|
||||||
$prestudent_ids = urldecode($prestudent_ids);
|
$prestudent_ids = urldecode($prestudent_ids);
|
||||||
|
|||||||
@@ -164,6 +164,7 @@ export default {
|
|||||||
.get('api/frontend/v1/stv/lists/getStudiensemester')
|
.get('api/frontend/v1/stv/lists/getStudiensemester')
|
||||||
.then(result => {
|
.then(result => {
|
||||||
this.lists.studiensemester = result.data;
|
this.lists.studiensemester = result.data;
|
||||||
|
this.lists.studiensemester_desc = result.data.toReversed();
|
||||||
})
|
})
|
||||||
.catch(this.$fhcAlert.handleSystemError);
|
.catch(this.$fhcAlert.handleSystemError);
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -42,6 +42,9 @@ export default{
|
|||||||
from: 'hasPermissionRtAufsicht',
|
from: 'hasPermissionRtAufsicht',
|
||||||
default: false
|
default: false
|
||||||
},
|
},
|
||||||
|
lists: {
|
||||||
|
from: 'lists'
|
||||||
|
},
|
||||||
$reloadList: {
|
$reloadList: {
|
||||||
from: '$reloadList',
|
from: '$reloadList',
|
||||||
required: true
|
required: true
|
||||||
@@ -259,7 +262,6 @@ export default{
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
statusData: {},
|
statusData: {},
|
||||||
listStudiensemester: [],
|
|
||||||
maxSem: Array.from({ length: 11 }, (_, index) => index),
|
maxSem: Array.from({ length: 11 }, (_, index) => index),
|
||||||
listStudienplaene: [],
|
listStudienplaene: [],
|
||||||
aufnahmestufen: {1: 1, 2: 2, 3: 3},
|
aufnahmestufen: {1: 1, 2: 2, 3: 3},
|
||||||
@@ -847,13 +849,6 @@ export default{
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
created(){
|
created(){
|
||||||
this.$fhcApi
|
|
||||||
.get('api/frontend/v1/stv/prestudent/getStudiensemester')
|
|
||||||
.then(result => result.data)
|
|
||||||
.then(result => {
|
|
||||||
this.listStudiensemester = result;
|
|
||||||
})
|
|
||||||
.catch(this.$fhcAlert.handleSystemError);
|
|
||||||
this.$fhcApi
|
this.$fhcApi
|
||||||
.get('api/frontend/v1/stv/prestudent/getStudienplaene/' + encodeURIComponent(this.paramIds))
|
.get('api/frontend/v1/stv/prestudent/getStudienplaene/' + encodeURIComponent(this.paramIds))
|
||||||
.then(result => result.data)
|
.then(result => result.data)
|
||||||
@@ -925,7 +920,7 @@ export default{
|
|||||||
v-model="statusData['studiensemester_kurzbz']"
|
v-model="statusData['studiensemester_kurzbz']"
|
||||||
:disabled="statusData.datum < dataMeldestichtag"
|
:disabled="statusData.datum < dataMeldestichtag"
|
||||||
>
|
>
|
||||||
<option v-for="sem in listStudiensemester" :key="sem.studiensemester_kurzbz" :value="sem.studiensemester_kurzbz" :selected="sem.studiensemester_kurzbz === defaultSemester">{{sem.studiensemester_kurzbz}}</option>
|
<option v-for="sem in lists.studiensemester_desc" :key="sem.studiensemester_kurzbz" :value="sem.studiensemester_kurzbz" :selected="sem.studiensemester_kurzbz === defaultSemester">{{sem.studiensemester_kurzbz}}</option>
|
||||||
</form-input>
|
</form-input>
|
||||||
</div>
|
</div>
|
||||||
<!-- TODO(manu) if(defined('VORRUECKUNG_STATUS_MAX_SEMESTER') && VORRUECKUNG_STATUS_MAX_SEMESTER==false) 100 Semester-->
|
<!-- TODO(manu) if(defined('VORRUECKUNG_STATUS_MAX_SEMESTER') && VORRUECKUNG_STATUS_MAX_SEMESTER==false) 100 Semester-->
|
||||||
|
|||||||
Reference in New Issue
Block a user