blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-01 12:19:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

unr beim kopieren setzen

Browse Source 
gruppen anzeige direktinskription rausgefillert
datatree aufklappen bug gefixed
kurzbz bei den icons statt eigene spalte
This commit is contained in:
ma0048
2025-07-11 07:33:10 +02:00
parent 7bd0b39f77
commit 5bda4db592
3 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/api/frontend/v1/lv/Lehreinheit.php
+1
View File
@@ -215,6 +215,7 @@ class Lehreinheit extends FHCAPI_Controller
$lehreinheit_id_new = getData($insert_result);
$this->_ci->LehreinheitModel->update(array('lehreinheit_id' => $lehreinheit_id_new), array('unr' => $lehreinheit_id_new));
if (in_array($art, array('gruppen', 'alle')))
{
$gruppen_result = $this->_ci->LehreinheitgruppeModel->loadWhere(array('lehreinheit_id' => $lehreinheit_id));
application/models/education/Lehreinheitgruppe_model.php
+7 -1
View File
@@ -470,6 +470,12 @@ class Lehreinheitgruppe_model extends DB_Model
END AS verplant");
$this->addJoin('tbl_studiengang', 'studiengang_kz', 'LEFT');
$this->addJoin('public.tbl_gruppe', 'gruppe_kurzbz', 'LEFT');
return $this->loadWhere(array('lehreinheit_id' => $lehreinheit_id));
$this->db->where('lehreinheit_id', $lehreinheit_id);
$this->db->group_start()
->where('tbl_gruppe.direktinskription !=', true)
->or_where('tbl_gruppe.direktinskription IS NULL')
->group_end();
return $this->load();
}
}
public/js/components/LVVerwaltung/Setup/Table.js
+15 -13
View File
@@ -168,7 +168,7 @@ export default {
headerFilterFunc: extendedHeaderFilter,
},
layout: 'fitDataStretch',
persistenceID: 'lehrveranstaltungen_2025_07_07_v1',
persistenceID: 'lehrveranstaltungen_2025_07_11_v1',
selectableRowsRangeMode: 'click',
selectableRows: true,
rowContextMenu: (component, e) => {
@@ -225,11 +225,19 @@ export default {
formatter: (cell, formatterParams) => {
const rowData = cell.getRow().getData();
const iconKey = (rowData.lehrtyp_kurzbz || '').toLowerCase();
const lvkurzbz = (cell.getValue()).toUpperCase();
const parentspan = document.createElement('span');
const span = document.createElement('span');
span.classList.add('lv_table_icon', `icon-${iconKey}`);
span.title = iconKey || 'LV-Teil';
return span;
parentspan.appendChild(span);
parentspan.appendChild(document.createTextNode(` ${lvkurzbz}`));
return parentspan
},
cellClick: (e, cell) => {
@@ -300,16 +308,6 @@ export default {
},
width: 150,
},
{
title: this.$p.t('lehre', 'kurzbz'),
field: "lv_kurzbz_anzeige",
headerFilterFuncParams: {field: 'lv_kurzbz_anzeige'},
formatter: (cell, formatterParams) => {
let rowData = cell.getRow().getData();
return rowData?.lv_kurzbz?.toUpperCase();
},
headerFilter: true
},
{
title: this.$p.t('lehre', 'lehrveranstaltung_id'),
field: "lehrveranstaltung_id",
@@ -667,7 +665,11 @@ export default {
if (level === this.currentTreeLevel - 1 )
{
row._row.modules.dataTree.open = true;
lastMatchingRow = row;
if (row._row.data._children?.length > 0)
{
lastMatchingRow = row;
}
}
});