+
+
+
diff --git a/public/js/tabulator/filters/Dates.js b/public/js/tabulator/filters/Dates.js
index 7c9f268f0..429d63e1a 100644
--- a/public/js/tabulator/filters/Dates.js
+++ b/public/js/tabulator/filters/Dates.js
@@ -7,26 +7,49 @@ Tabulator.extendModule('filter', 'filters', {
"dates": (headerValue, rowValue) => {
if (!headerValue)
return true;
- let v = new Date(rowValue);
- if (Array.isArray(headerValue)) {
- if (headerValue[1]) {
- return v >= headerValue[0] && v <= headerValue[1].setHours(23, 59, 59, 999);
+
+ let rowDate = new Date(rowValue);
+
+ if (Array.isArray(headerValue))
+ {
+ let startDate = new Date(headerValue[0]);
+ if (headerValue[1])
+ {
+ let endDate = new Date(headerValue[1]);
+
+ endDate.setHours(23, 59, 59, 999);
+
+ return rowDate >= startDate && rowDate <= endDate;
}
- return v.toDateString() == headerValue[0].toDateString();
+
+ return rowDate.toDateString() === startDate.toDateString();
}
- return v.toDateString() == headerValue.toDateString();
+ let singleDate = new Date(headerValue);
+ return rowDate.toDateString() === singleDate.toDateString();
}
});
+
function dateFilter(cell, onRendered, success) {
let div = document.createElement('div');
+ let initialValue = null;
+
+ let val = cell.getValue();
+
+ if (Array.isArray(val))
+ {
+ const start = val[0] ? new Date(val[0]) : null;
+ const end = val[1] ? new Date(val[1]) : null;
+ initialValue = [start, end];
+ }
+
Vue.createApp({
components: {
PrimevueCalendar: primevue.calendar
},
data() {
return {
- val: null
+ val: initialValue
}
},
watch: {
@@ -34,10 +57,16 @@ function dateFilter(cell, onRendered, success) {
success(n);
}
},
- template: ``
+ template: `
+ `
}).use(primevue.config.default).mount(div);
return div;
}
-
-export { dateFilter as 'dateFilter' };
+export { dateFilter };
\ No newline at end of file
diff --git a/public/js/tabulator/filters/defaultHeaderFilter.js b/public/js/tabulator/filters/defaultHeaderFilter.js
deleted file mode 100644
index facce437a..000000000
--- a/public/js/tabulator/filters/defaultHeaderFilter.js
+++ /dev/null
@@ -1,87 +0,0 @@
-function parseFilterExpression(expression){
- const includeGroups = [];
- const excludeTerms = [];
- const comparisons = [];
-
- if( typeof expression !== 'string' ) {
- comparisons.push({ operator: '=', number: expression });
- return { includeGroups, excludeTerms, comparisons };
- }
-
- const andParts = expression.split('&&').map(part => part.trim());
-
- andParts.forEach(part => {
- const orTerms = part.split('||').map(p => p.trim());
- const orRegexes = [];
-
- orTerms.forEach(term => {
-
- const comparisonMatch = term.match(/^(<=|>=|<|>|=|!=)\s*(\d+)$/);
-
- if (comparisonMatch)
- {
- const operator = comparisonMatch[1];
- const number = parseFloat(comparisonMatch[2]);
-
- comparisons.push({ operator, number });
- }
- else if (term.startsWith('!'))
- {
- const excludeTerm = term.substring(1).trim().replace(/\*/g, '.*');
- excludeTerms.push(new RegExp(excludeTerm, 'i'));
- }
- else
- {
- const includeTerm = term.replace(/\*/g, '.*');
- orRegexes.push(new RegExp(includeTerm, 'i'));
- }
- });
-
- if (orRegexes.length > 0)
- {
- includeGroups.push(orRegexes);
- }
- });
-
- return { includeGroups, excludeTerms, comparisons };
-}
-
-export function defaultHeaderFilter(headerValue, rowValue)
-{
- const { includeGroups, excludeTerms, comparisons } = parseFilterExpression(headerValue);
-
- const includes = includeGroups.every(group =>
- group.some(regex => regex.test(rowValue))
- );
-
- const excludes = excludeTerms.every(regex => !regex.test(rowValue));
-
- const comparisonCheck = comparisons.every(({ operator, number }) => {
- let value = rowValue;
-
- if (!isNaN(number) && typeof number !== 'boolean')
- {
- value = parseFloat(rowValue);
- if (isNaN(value)) return false;
- }
-
- switch (operator) {
- case '<':
- return value < number;
- case '>':
- return value > number;
- case '<=':
- return value <= number;
- case '>=':
- return value >= number;
- case '=':
- return value === number;
- case '!=':
- return value !== number;
- default:
- return false;
- }
- });
-
- return includes && excludes && comparisonCheck;
-}
diff --git a/public/js/tabulator/filters/extendedHeaderFilter.js b/public/js/tabulator/filters/extendedHeaderFilter.js
new file mode 100644
index 000000000..d8ead88bc
--- /dev/null
+++ b/public/js/tabulator/filters/extendedHeaderFilter.js
@@ -0,0 +1,125 @@
+function parseFilterExpression(expression)
+{
+ const collections = [];
+
+ try {
+ const orParts = expression.split('||').map(part => part.trim());
+
+ orParts.forEach(part => {
+
+ const andParts = part.split('&&').map(p => p.trim());
+
+ const collection = { positives: [], negatives: [] };
+
+ andParts.forEach(term => {
+
+ const comparisonMatch = term.match(/^(<=|>=|<|>|=|!=)\s*(\d+(?:[.,]\d+)?)$/);
+
+ if (comparisonMatch)
+ {
+ const operator = comparisonMatch[1];
+ const numberStr = comparisonMatch[2].replace(',', '.');
+ const number = parseFloat(numberStr);
+ collection.positives.push({ type: 'comparison', operator, number });
+ }
+ else if (term.startsWith('!'))
+ {
+ const excludeTerm = term.substring(1).trim().replace(/\*/g, '.*');
+ collection.negatives.push({ type: 'regex', regex: new RegExp(excludeTerm, 'i') });
+ }
+ else
+ {
+ const includeTerm = term.replace(/\*/g, '.*');
+ collection.positives.push({ type: 'regex', regex: new RegExp(includeTerm, 'i') });
+ }
+ });
+ collections.push(collection);
+ });
+ } catch (e) {}
+ return collections;
+}
+
+export function extendedHeaderFilter(headerValue, rowValue)
+{
+ if (typeof headerValue === 'boolean')
+ {
+ return rowValue === headerValue;
+ }
+
+ const collections = parseFilterExpression(headerValue);
+
+ try {
+
+ return collections.some(collection => {
+
+ let positives = collection.positives.length === 0 || collection.positives.every(condition => {
+
+ if (condition.type === 'comparison')
+ {
+ let value = parseFloat(rowValue);
+ if (isNaN(value)) return false;
+
+ switch (condition.operator) {
+ case '<':
+ return value < condition.number;
+ case '>':
+ return value > condition.number;
+ case '<=':
+ return value <= condition.number;
+ case '>=':
+ return value >= condition.number;
+ case '=':
+ return value === condition.number;
+ case '!=':
+ return value !== condition.number;
+ default:
+ return false;
+ }
+ }
+ else if (condition.type === 'regex')
+ {
+ return condition.regex.test(rowValue);
+ }
+ return false;
+ });
+
+ let negatives = collection.negatives.every(condition => {
+ return !condition.regex.test(rowValue);
+ });
+
+ return positives && negatives;
+ });
+ } catch (e) {
+
+ }
+}
+export function tagHeaderFilter(headerValue, rowValue) {
+
+ let data;
+
+ try {
+ data = typeof rowValue === 'string' ? JSON.parse(rowValue) : rowValue;
+ } catch (error) {
+ return false;
+ }
+
+ let combinedText;
+
+ if (Array.isArray(data))
+ {
+ combinedText = data
+ .map(item => `${item.beschreibung} ${item.notiz}`)
+ .join(' ');
+ }
+ else if (typeof data === 'object' && data !== null)
+ {
+ combinedText = `${data.beschreibung} ${data.notiz}`;
+ }
+ else
+ {
+ combinedText = String(data);
+ }
+
+ return extendedHeaderFilter(headerValue, combinedText)
+}
+
diff --git a/soap/lehrveranstaltung_faktor.json.php b/soap/lehrveranstaltung_faktor.json.php
index 49f13ac47..c182e0f70 100644
--- a/soap/lehrveranstaltung_faktor.json.php
+++ b/soap/lehrveranstaltung_faktor.json.php
@@ -40,7 +40,7 @@ switch($method)
]);
break;
}
- if (exists($faktor['lv_id'], $faktor['von'], $faktor['bis']))
+ if (exists($faktor['lv_id'], $faktor['von'], $faktor['bis'], null, $faktor['lehrform_kurzbz']))
{
echo json_encode([
'status' => 'error',
@@ -49,12 +49,22 @@ switch($method)
break;
}
- $result = $lv_faktor->addFaktor($faktor['lv_id'], $faktor['faktor'], $faktor['von'], $faktor['bis']);
+ $newFaktor = new lehrveranstaltung_faktor();
+ $newFaktor->lehrveranstaltung_id = $faktor['lv_id'];
+ $newFaktor->faktor = $faktor['faktor'];
+ $newFaktor->studiensemester_kurzbz_von = $faktor['von'];
+ $newFaktor->studiensemester_kurzbz_bis = $faktor['bis'];
+ $newFaktor->lehrform_kurzbz = $faktor['lehrform_kurzbz'];
+ $newFaktor->insertvon = get_uid();
+ $result = $newFaktor->save(true);
+
echo json_encode($result);
}
break;
case 'updateFaktor':
+
$faktor = isset($_REQUEST['faktor']) ? $_REQUEST['faktor']: '' ;
+
if ($faktor !== '')
{
if (vonHigherThanBis($faktor['von'], $faktor['bis']))
@@ -65,7 +75,7 @@ switch($method)
]);
break;
}
- if (exists($faktor['lv_id'], $faktor['von'], $faktor['bis'], $faktor['id']))
+ if (exists($faktor['lv_id'], $faktor['von'], $faktor['bis'], $faktor['id'], $faktor['lehrform_kurzbz']))
{
echo json_encode([
'status' => 'error',
@@ -74,7 +84,15 @@ switch($method)
break;
}
- $result = $lv_faktor->updateFaktor($faktor['id'], $faktor['faktor'], $faktor['von'], $faktor['bis']);
+ $updateFaktor = new lehrveranstaltung_faktor();
+ $updateFaktor->lehrveranstaltung_faktor_id = $faktor['id'];
+ $updateFaktor->faktor = $faktor['faktor'];
+ $updateFaktor->studiensemester_kurzbz_von = $faktor['von'];
+ $updateFaktor->studiensemester_kurzbz_bis = $faktor['bis'];
+ $updateFaktor->lehrform_kurzbz = $faktor['lehrform_kurzbz'];
+ $updateFaktor->updatevon = get_uid();
+ $updateFaktor->updateamum = date('Y-m-d H:i:s');
+ $result = $updateFaktor->save();
echo json_encode($result);
}
break;
@@ -99,11 +117,12 @@ function isRightType($lv_id)
return false;
}
-function exists($lv_id, $von, $bis, $id = null)
+function exists($lv_id, $von, $bis, $id = null, $lehrform_kurzbz = null)
{
$lv_faktor = new lehrveranstaltung_faktor();
- $lv_faktor->loadByLV($lv_id, $von, $bis, $id);
- return !empty($lv_faktor->lv_faktoren);
+
+ $lehrform_kurzbz = $lehrform_kurzbz === ' - ' ? null : $lehrform_kurzbz;
+ return $lv_faktor->checkIfExists($lv_id, $von, $bis, $id, $lehrform_kurzbz);
}
function vonHigherThanBis($von, $bis)
diff --git a/system/dbupdate_3.4.php b/system/dbupdate_3.4.php
index f43240797..d007c04f6 100644
--- a/system/dbupdate_3.4.php
+++ b/system/dbupdate_3.4.php
@@ -71,6 +71,7 @@ require_once('dbupdate_3.4/41950_perm_gehaelter.php');
require_once('dbupdate_3.4/53903_valorisierung.php');
require_once('dbupdate_3.4/55968_index_anrechnung.php');
require_once('dbupdate_3.4/25999_locale_update.php');
+require_once('dbupdate_3.4/55289_pep_fine_tuning.php');
// *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
echo 'Pruefe Tabellen und Attribute!
';
@@ -270,7 +271,7 @@ $tabellen=array(
"lehre.tbl_zeitfenster" => array("wochentag","stunde","ort_kurzbz","studiengang_kz","gewicht"),
"lehre.tbl_zeugnis" => array("zeugnis_id","student_uid","zeugnis","erstelltam","gedruckt","titel","bezeichnung","updateamum","updatevon","insertamum","insertvon","ext_id"),
"lehre.tbl_zeugnisnote" => array("lehrveranstaltung_id","student_uid","studiensemester_kurzbz","note","uebernahmedatum","benotungsdatum","bemerkung","updateamum","updatevon","insertamum","insertvon","ext_id","punkte"),
- "lehre.tbl_lehrveranstaltung_faktor" => array("lehrveranstaltung_faktor_id", "lehrveranstaltung_id","faktor","studiensemester_kurzbz_von","studiensemester_kurzbz_bis","insertamum","insertvon","updateamum","updatevon"),
+ "lehre.tbl_lehrveranstaltung_faktor" => array("lehrveranstaltung_faktor_id", "lehrveranstaltung_id","faktor", "lehrform_kurzbz", "studiensemester_kurzbz_von","studiensemester_kurzbz_bis","insertamum","insertvon","updateamum","updatevon"),
"public.ci_apikey" => array("apikey_id","key","level","ignore_limits","date_created"),
"public.tbl_adresse" => array("adresse_id","person_id","name","strasse","plz","ort","gemeinde","nation","typ","heimatadresse","zustelladresse","firma_id","updateamum","updatevon","insertamum","insertvon","ext_id","rechnungsadresse","anmerkung", "co_name"),
"public.tbl_adressentyp" => array("adressentyp_kurzbz", "bezeichnung", "bezeichnung_mehrsprachig", "sort"),
diff --git a/system/dbupdate_3.4/40717_lv_faktor.php b/system/dbupdate_3.4/40717_lv_faktor.php
index c304e292d..0e3b3d9bc 100644
--- a/system/dbupdate_3.4/40717_lv_faktor.php
+++ b/system/dbupdate_3.4/40717_lv_faktor.php
@@ -78,3 +78,16 @@ if ($result = $db->db_query("SELECT * FROM pg_class WHERE relname='idx_tbl_lehrv
}
}
+if(!@$db->db_query("SELECT lehrform_kurzbz FROM lehre.tbl_lehrveranstaltung_faktor LIMIT 1"))
+{
+ $qry = "ALTER TABLE lehre.tbl_lehrveranstaltung_faktor ADD COLUMN lehrform_kurzbz varchar(8);
+ ALTER TABLE lehre.tbl_lehrveranstaltung_faktor ADD CONSTRAINT fk_lehrveranstaltung_faktor_lehrform_kurzbz FOREIGN KEY (lehrform_kurzbz) REFERENCES lehre.tbl_lehrform (lehrform_kurzbz) ON DELETE CASCADE ON UPDATE CASCADE;
+ ALTER TABLE lehre.tbl_lehrveranstaltung_faktor DROP CONSTRAINT fk_lehrveranstaltung_faktor_lehrveranstaltung_id;
+ ALTER TABLE lehre.tbl_lehrveranstaltung_faktor ADD CONSTRAINT fk_lehrveranstaltung_faktor_lehrveranstaltung_id FOREIGN KEY (lehrveranstaltung_id) REFERENCES lehre.tbl_lehrveranstaltung (lehrveranstaltung_id) ON DELETE CASCADE ON UPDATE CASCADE;
+ ";
+
+ if(!$db->db_query($qry))
+ echo 'lehre.tbl_lehrveranstaltung_faktor '.$db->db_last_error().'
';
+ else
+ echo '
Spalte lehrform_kurzbz zu Tabelle lehre.tbl_lehrveranstaltung_faktor hinzugefügt';
+}
\ No newline at end of file
diff --git a/system/dbupdate_3.4/55289_pep_fine_tuning.php b/system/dbupdate_3.4/55289_pep_fine_tuning.php
new file mode 100644
index 000000000..00a236a68
--- /dev/null
+++ b/system/dbupdate_3.4/55289_pep_fine_tuning.php
@@ -0,0 +1,16 @@
+db_query("SELECT 1 FROM system.tbl_berechtigung WHERE berechtigung_kurzbz='addon/reports:begrenzt'"))
+{
+ if($db->db_num_rows($result)==0)
+ {
+ $qry = "INSERT INTO system.tbl_berechtigung(berechtigung_kurzbz, beschreibung) VALUES('addon/reports:begrenzt', 'Reports nur über Direktlink aufrufbar');";
+
+ if(!$db->db_query($qry))
+ echo 'Berechtigung: '.$db->db_last_error().'
';
+ else
+ echo '
Neue Berechtigung addon/reports:begrenzt zu system.tbl_berechtigung hinzugefügt';
+ }
+}
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index d92127cde..acb7a12e6 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -1233,6 +1233,26 @@ $phrases = array(
)
)
),
+ array(
+ 'app' => 'core',
+ 'category' => 'global',
+ 'phrase' => 'create',
+ 'insertvon' => 'system',
+ 'phrases' => array(
+ array(
+ 'sprache' => 'German',
+ 'text' => 'Anlegen',
+ 'description' => '',
+ 'insertvon' => 'system'
+ ),
+ array(
+ 'sprache' => 'English',
+ 'text' => 'Create',
+ 'description' => '',
+ 'insertvon' => 'system'
+ )
+ )
+ ),
array(
'app' => 'core',
'category' => 'global',
@@ -1815,6 +1835,26 @@ $phrases = array(
)
)
),
+ array(
+ 'app' => 'core',
+ 'category' => 'ui',
+ 'phrase' => 'filterdelete',
+ 'insertvon' => 'system',
+ 'phrases' => array(
+ array(
+ 'sprache' => 'German',
+ 'text' => 'Filter löschen',
+ 'description' => '',
+ 'insertvon' => 'system'
+ ),
+ array(
+ 'sprache' => 'English',
+ 'text' => 'Clear filter',
+ 'description' => '',
+ 'insertvon' => 'system'
+ )
+ )
+ ),
array(
'app' => 'core',
'category' => 'anrechnung',
@@ -24891,6 +24931,86 @@ array(
)
)
),
+ array(
+ 'app' => 'core',
+ 'category' => 'notiz',
+ 'phrase' => 'tag_rueckgaengig',
+ 'insertvon' => 'system',
+ 'phrases' => array(
+ array(
+ 'sprache' => 'German',
+ 'text' => 'Rückgängig',
+ 'description' => '',
+ 'insertvon' => 'system'
+ ),
+ array(
+ 'sprache' => 'English',
+ 'text' => 'Undo',
+ 'description' => '',
+ 'insertvon' => 'system'
+ )
+ )
+ ),
+ array(
+ 'app' => 'core',
+ 'category' => 'notiz',
+ 'phrase' => 'tag_erledigt',
+ 'insertvon' => 'system',
+ 'phrases' => array(
+ array(
+ 'sprache' => 'German',
+ 'text' => 'Erledigt',
+ 'description' => '',
+ 'insertvon' => 'system'
+ ),
+ array(
+ 'sprache' => 'English',
+ 'text' => 'Done',
+ 'description' => '',
+ 'insertvon' => 'system'
+ )
+ )
+ ),
+ array(
+ 'app' => 'core',
+ 'category' => 'notiz',
+ 'phrase' => 'tag_verfasser',
+ 'insertvon' => 'system',
+ 'phrases' => array(
+ array(
+ 'sprache' => 'German',
+ 'text' => 'angelegt von {0} am {1}',
+ 'description' => '',
+ 'insertvon' => 'system'
+ ),
+ array(
+ 'sprache' => 'English',
+ 'text' => 'Created by {0} on {1}',
+ 'description' => '',
+ 'insertvon' => 'system'
+ )
+ )
+ ),
+ array(
+ 'app' => 'core',
+ 'category' => 'notiz',
+ 'phrase' => 'tag_bearbeiter',
+ 'insertvon' => 'system',
+ 'phrases' => array(
+ array(
+ 'sprache' => 'German',
+ 'text' => 'bearbeitet von {0} am {1}',
+ 'description' => '',
+ 'insertvon' => 'system'
+ ),
+ array(
+ 'sprache' => 'English',
+ 'text' => 'Edited by {0} on {1}',
+ 'description' => '',
+ 'insertvon' => 'system'
+ )
+ )
+ ),
array(
'app' => 'core',
'category' => 'ui',
diff --git a/vilesci/lehre/lehrveranstaltung.php b/vilesci/lehre/lehrveranstaltung.php
index 2b3346d02..25fe143b6 100644
--- a/vilesci/lehre/lehrveranstaltung.php
+++ b/vilesci/lehre/lehrveranstaltung.php
@@ -1331,9 +1331,6 @@ if ($result_lv!=0)
echo '
löschen
';
-
- if (in_array($row->lehrtyp_kurzbz, array("tpl", "lv")))
- echo '
Faktor';
echo ' | ';
echo '
';
@@ -1341,7 +1338,9 @@ if ($result_lv!=0)
$lv_faktor = new lehrveranstaltung_faktor();
$lv_faktor->getAkt($row->lehrveranstaltung_id);
- echo $lv_faktor->faktor.' | ';
+ if (in_array($row->lehrtyp_kurzbz, array("tpl", "lv")))
+ echo 'Bearbeiten';
+ echo '';
echo "\n";
}
}
diff --git a/vilesci/lehre/lehrveranstaltung_faktor.php b/vilesci/lehre/lehrveranstaltung_faktor.php
index a9ad051d0..dc5387719 100644
--- a/vilesci/lehre/lehrveranstaltung_faktor.php
+++ b/vilesci/lehre/lehrveranstaltung_faktor.php
@@ -6,6 +6,7 @@ require_once('../../include/phrasen.class.php');
require_once('../../include/lehrveranstaltung.class.php');
require_once('../../include/lehrveranstaltung_faktor.class.php');
require_once('../../include/studiensemester.class.php');
+require_once('../../include/lehrform.class.php');
$uid = get_uid();
$rechte = new benutzerberechtigung();
@@ -38,12 +39,14 @@ echo '
var row = $(this).closest('tr');
var id = row.data('id');
var faktor = row.find('.faktor').text();
+ var lehrform = row.find('.lehrform').text();
var von = row.find('.von').text();
var bis = row.find('.bis').text();
$('#action').val('edit');
$('#id').val(id);
$('#faktor').val(faktor);
+ $('#lehrform').val(lehrform);
$('#von').val(von);
$('#bis').val(bis);
});
@@ -63,12 +66,14 @@ echo '
var id = $('#id').val();
var faktor = $('#faktor').val();
+ var lehrform = $('#lehrform').val();
var von = $('#von').val();
var bis = $('#bis').val();
var lv_id = $('#lv_id').val();
var formData = {
faktor: faktor,
+ lehrform_kurzbz: lehrform,
von: von,
bis: bis,
lv_id: lv_id
@@ -132,6 +137,7 @@ echo '
{
var row = $('#faktorTable tbody tr[data-id="' + formData.id + '"]');
row.find('.faktor').text(formData.faktor);
+ row.find('.lehrform').text(formData.lehrform_kurzbz);
row.find('.von').text(formData.von);
row.find('.bis').text(formData.bis);
@@ -189,6 +195,7 @@ echo '
var row = tr
.append(
$('').text(faktor.faktor).addClass('faktor'),
+ $(' | ').text(faktor.lehrform_kurzbz || "").addClass('lehrform'),
$(' | ').text(faktor.von).addClass('von'),
$(' | ').text(faktor.bis).addClass('bis'),
$(' | ').append(editButton).addClass('edit'),
@@ -232,6 +239,9 @@ $faktor->loadByLV($lv->lehrveranstaltung_id);
$studiensemester = new studiensemester();
$studiensemester->getAll('desc');
+$lehrform = new lehrform();
+$lehrform->getAll();
+
echo '
@@ -267,6 +277,17 @@ echo '
echo '
+
+
'. $p->t('global/erfolgreichgespeichert') . '
'. $p->t('global/erfolgreichgelöscht') . '
@@ -275,7 +296,8 @@ echo '
- | '.$p->t('lv/faktor').' |
+ '.$p->t('lvaliste/faktor').' |
+ '.$p->t('lvaliste/lehrform').' |
'.$p->t('global/von').' |
'.$p->t('global/bis').' |
'.$p->t('global/bearbeiten').' |
@@ -291,6 +313,7 @@ if(count($faktor->lv_faktoren) > 0)
{
echo "
| ".$lv_faktor->faktor." |
+ ".$lv_faktor->lehrform_kurzbz." |
".$lv_faktor->studiensemester_kurzbz_von." |
".$lv_faktor->studiensemester_kurzbz_bis." |
|
|