-
+
-
Student_uid
+
Student UID
{{ res.uid }}
-
+
-
Person_id
+
Studiengang
- {{ res.person_id }}
+ {{ res.studiengang }}
+
+
+
+
+
Verband
+
+ {{ res.verband }}
@@ -75,6 +82,10 @@ export default {
computed: {
mailtourl: function() {
return 'mailto:' + this.res.email;
- }
+ },
+ studentImage: function () {
+ if (!this.res.foto) return;
+ return 'data:image/jpeg;base64,'.concat(this.res.foto);
+ },
}
};
\ No newline at end of file
diff --git a/public/js/composables/CalendarDate.js b/public/js/composables/CalendarDate.js
index f16fafa37..cbd17f8d8 100644
--- a/public/js/composables/CalendarDate.js
+++ b/public/js/composables/CalendarDate.js
@@ -49,6 +49,12 @@ class CalendarDate {
}
}
}
+ get wYear() {
+ if( this.w === 1 ) {
+ return this.cdLastDayOfWeek.format({ year: 'numeric' });
+ }
+ return this.cdFirstDayOfWeek.format({ year: 'numeric' });
+ }
get wd() {
if (this._wd === null) {
this._wd = ((new Date(this.y, this.m, this.d)).getDay()+7-this.weekStart)%7;
@@ -112,13 +118,24 @@ class CalendarDate {
return (new CalendarDate(this.y+1,0,this.weekStart == 1 ? -3 : 0)).w;
}
set(y,m,d,noClean) {
+
if (y !== undefined && (m === undefined || m === true) && d === undefined) {
- if (Object.prototype.toString.call(y) === '[object Date]')
+ if (this.#isDate(y))
+ {
+ // set year/month/day from date object
return this.set(y.getFullYear(), y.getMonth(), y.getDate(), m);
+ }
if (y.y !== undefined && y.m !== undefined && y.d !== undefined)
+ {
+ // set year/month/day from CalendarDate object
return this.set(y.y, y.m, y.d, m);
+ }
}
- [this._y,this._m,this._d] = [y || 0, m || 0, d || 0];
+ // initialize year/month/day
+ this._y = y ?? 0;
+ this._m = m ?? 0;
+ this._d = d ?? 0;
+
if (!noClean)
this._clean();
}
@@ -131,7 +148,7 @@ class CalendarDate {
return (new Date(this._y, this._m, this._d)).toLocaleString(lang, options);
}
compare(d) {
- if (Object.prototype.toString.call(d) === '[object Date]')
+ if (this.#isDate(d))
return (this.y === d.getFullYear() && this.m === d.getMonth() && this.d === d.getDate());
return (this.y === d.y && this.m === d.m && this.d === d.d);
}
@@ -151,6 +168,10 @@ class CalendarDate {
setLocale(locale) {
this.weekStart = CalendarDate.getWeekStart(locale);
}
+ // private method that checks if the parameter is of type Date
+ #isDate(obj){
+ return Object.prototype.toString.call(obj) === '[object Date]';
+ }
}
/**
* Returns the weekday number (Date.getDay()) on which the week starts depending on the locale.
@@ -163,19 +184,37 @@ class CalendarDate {
* @return integer
*/
CalendarDate.getWeekStart = function(locale) {
+
locale = locale || navigator.language;
const parts = locale.match(/^([a-z]{2,3})(?:-([a-z]{3})(?=$|-))?(?:-([a-z]{4})(?=$|-))?(?:-([a-z]{2}|\d{3})(?=$|-))?/i);
- const regionSat = 'AEAFBHDJDZEGIQIRJOKWLYOMQASDSY'.match(/../g);
- const regionSun = 'AGARASAUBDBRBSBTBWBZCACNCODMDOETGTGUHKHNIDILINJMJPKEKHKRLAMHMMMOMTMXMZNINPPAPEPHPKPRPTPYSASGSVTHTTTWUMUSVEVIWSYEZAZW'.match(/../g);
- const languageSat = ['ar','arq','arz','fa'];
- const languageSun = 'amasbndzengnguhehiidjajvkmknkolomhmlmrmtmyneomorpapssdsmsnsutatethtnurzhzu'.match(/../g);
- return (
- parts[4] ? (
- regionSun.includes(parts[4]) ? 0 :
- regionSat.includes(parts[4]) ? 6 : 1) : (
- languageSun.includes(parts[1]) ? 0 :
- languageSat.includes(parts[1]) ? 6 : 1));
+ const region_code = parts[1];
+ const region_starting_Sat = 'AEAFBHDJDZEGIQIRJOKWLYOMQASDSY'.match(/../g);
+ const region_starting_Sun = 'AGARASAUBDBRBSBTBWBZCACNCODMDOETGTGUHKHNIDILINJMJPKEKHKRLAMHMMMOMTMXMZNINPPAPEPHPKPRPTPYSASGSVTHTTTWUMUSVEVIWSYEZAZW'.match(/../g);
+
+ const language_code = parts[4];
+ const language_starting_Sat = ['ar','arq','arz','fa'];
+ const language_starting_Sun = 'amasbndzengnguhehiidjajvkmknkolomhmlmrmtmyneomorpapssdsmsnsutatethtnurzhzu'.match(/../g);
+
+ if (language_code){
+ if (language_starting_Sun.includes(language_code))
+ return 0;
+ else if (language_starting_Sat.includes(language_code))
+ return 6;
+ else
+ return 1;
+ }
+ else if(region_code)
+ {
+ if (region_starting_Sun.includes(region_code))
+ return 0;
+ else if (region_starting_Sat.includes(region_code))
+ return 6;
+ else
+ return 1;
+ }
+ else
+ return 1;
}
diff --git a/public/js/plugin/Phrasen.js b/public/js/plugin/Phrasen.js
index 0203b8edf..ea5e8e186 100644
--- a/public/js/plugin/Phrasen.js
+++ b/public/js/plugin/Phrasen.js
@@ -3,13 +3,9 @@ import FhcApi from './FhcApi.js';
const categories = Vue.reactive({});
const loadingModules = {};
let user_language = Vue.ref(FHC_JS_DATA_STORAGE_OBJECT.user_language);
-let user_language_locale_identifier = Vue.computed(()=>{
- if(!user_language.value) return undefined;
- switch(user_language.value){
- case 'German': return 'de-AT';
- case 'English': return 'en-GB';
- default: return undefined;
- }
+let user_locale = Vue.computed(()=>{
+ if(!user_language.value) return null;
+ return FHC_JS_DATA_STORAGE_OBJECT.server_languages.find(language => language.sprache == user_language.value).locale;
});
function extractCategory(obj, category) {
@@ -30,7 +26,7 @@ function getValueForLoadedPhrase(category, phrase, params) {
const phrasen = {
user_language,
- user_language_locale_identifier,
+ user_locale,
setLanguage(language, api) {
const catArray = Object.keys(categories)
return api.factory.phrasen.setLanguage(catArray, language).then(res => {
@@ -93,7 +89,7 @@ export default {
loadCategory: cat => phrasen.loadCategory.call(app, cat),
setLanguage: phrasen.setLanguage,
user_language: user_language,
- user_language_locale_identifier: user_language_locale_identifier,
+ user_locale,
t_ref: phrasen.t_ref
};
app.provide('$p', app.config.globalProperties.$p);
diff --git a/public/js/tabulator/filters/defaultHeaderFilter.js b/public/js/tabulator/filters/defaultHeaderFilter.js
new file mode 100644
index 000000000..7e463921b
--- /dev/null
+++ b/public/js/tabulator/filters/defaultHeaderFilter.js
@@ -0,0 +1,82 @@
+function parseFilterExpression(expression){
+ const includeGroups = [];
+ const excludeTerms = [];
+ const 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))
+ {
+ 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/soap/lehrveranstaltung_faktor.json.php b/soap/lehrveranstaltung_faktor.json.php
new file mode 100644
index 000000000..49f13ac47
--- /dev/null
+++ b/soap/lehrveranstaltung_faktor.json.php
@@ -0,0 +1,123 @@
+getBerechtigungen($uid);
+
+if(!$rechte->isBerechtigt('basis/person', null, 'suid'))
+{
+ exit('Sie haben keine Berechtigung für die Seite');
+}
+
+$method = isset($_REQUEST['method']) ? $_REQUEST['method']: '' ;
+$lv_faktor = new lehrveranstaltung_faktor();
+
+switch($method)
+{
+ case 'addFaktor':
+ $faktor = isset($_REQUEST['faktor']) ? $_REQUEST['faktor']: '' ;
+ if ($faktor !== '')
+ {
+ if (!isRightType($faktor['lv_id']))
+ {
+ echo json_encode([
+ 'status' => 'error',
+ 'message' => 'Nur LVs und Templates möglich'
+ ]);
+ break;
+ }
+ if (vonHigherThanBis($faktor['von'], $faktor['bis']))
+ {
+ echo json_encode([
+ 'status' => 'error',
+ 'message' => 'Von nach Bis'
+ ]);
+ break;
+ }
+ if (exists($faktor['lv_id'], $faktor['von'], $faktor['bis']))
+ {
+ echo json_encode([
+ 'status' => 'error',
+ 'message' => 'Für den Zeitraum bereits vorhanden'
+ ]);
+ break;
+ }
+
+ $result = $lv_faktor->addFaktor($faktor['lv_id'], $faktor['faktor'], $faktor['von'], $faktor['bis']);
+ echo json_encode($result);
+ }
+ break;
+ case 'updateFaktor':
+ $faktor = isset($_REQUEST['faktor']) ? $_REQUEST['faktor']: '' ;
+ if ($faktor !== '')
+ {
+ if (vonHigherThanBis($faktor['von'], $faktor['bis']))
+ {
+ echo json_encode([
+ 'status' => 'error',
+ 'message' => 'Von nach Bis'
+ ]);
+ break;
+ }
+ if (exists($faktor['lv_id'], $faktor['von'], $faktor['bis'], $faktor['id']))
+ {
+ echo json_encode([
+ 'status' => 'error',
+ 'message' => 'Für den Zeitraum bereits vorhanden'
+ ]);
+ break;
+ }
+
+ $result = $lv_faktor->updateFaktor($faktor['id'], $faktor['faktor'], $faktor['von'], $faktor['bis']);
+ echo json_encode($result);
+ }
+ break;
+ case 'deleteFaktor':
+ $faktor = isset($_REQUEST['faktor']) ? $_REQUEST['faktor']: '' ;
+ if ($faktor !== '')
+ {
+ $result = $lv_faktor->deleteFaktor($faktor['id']);
+ echo json_encode($result);
+ }
+ break;
+ default:
+ break;
+}
+
+function isRightType($lv_id)
+{
+ $lv = new lehrveranstaltung($lv_id);
+ if (in_array($lv->lehrtyp_kurzbz, array('lv', 'tpl')))
+ return true;
+
+ return false;
+}
+
+function exists($lv_id, $von, $bis, $id = null)
+{
+ $lv_faktor = new lehrveranstaltung_faktor();
+ $lv_faktor->loadByLV($lv_id, $von, $bis, $id);
+ return !empty($lv_faktor->lv_faktoren);
+}
+
+function vonHigherThanBis($von, $bis)
+{
+ $vonStsem = new studiensemester($von);
+ $bisStsem = new studiensemester($bis);
+
+ if (is_null($bis) || $bis === "")
+ return false;
+ if ($vonStsem->start > $bisStsem->start)
+ return true;
+ else
+ return false;
+
+}
+
+?>
diff --git a/system/dbupdate_3.4.php b/system/dbupdate_3.4.php
index 3e05861d1..0af314c46 100644
--- a/system/dbupdate_3.4.php
+++ b/system/dbupdate_3.4.php
@@ -65,6 +65,9 @@ require_once('dbupdate_3.4/40896_kennzeichnung_unruly_person.php');
require_once('dbupdate_3.4/39911_tabulator_in_contentmittitel.php');
require_once('dbupdate_3.4/25999_C4_permission.php');
require_once('dbupdate_3.4/33683_digitale_anwesenheitsliste_und_entschuldigungsmanagement_fuer_studierende_prototyp.php');
+require_once('dbupdate_3.4/40717_lv_faktor.php');
+require_once('dbupdate_3.4/48526_pep_tagging.php');
+
// *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
echo '
Pruefe Tabellen und Attribute!
';
@@ -260,6 +263,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"),
"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"),
@@ -306,9 +310,10 @@ $tabellen=array(
"public.tbl_msg_message" => array("message_id","person_id","subject","body","priority","relationmessage_id","oe_kurzbz","insertamum","insertvon"),
"public.tbl_msg_recipient" => array("message_id","person_id","token","sent","sentinfo","insertamum","insertvon","oe_kurzbz"),
"public.tbl_msg_status" => array("message_id","person_id","status","statusinfo","insertamum","insertvon","updateamum","updatevon"),
- "public.tbl_notiz" => array("notiz_id","titel","text","verfasser_uid","bearbeiter_uid","start","ende","erledigt","insertamum","insertvon","updateamum","updatevon","ext_id"),
+ "public.tbl_notiz" => array("notiz_id","titel","text","verfasser_uid","bearbeiter_uid","start","ende","erledigt","insertamum","insertvon","updateamum","updatevon","ext_id", "typ"),
"public.tbl_notizzuordnung" => array("notizzuordnung_id","notiz_id","projekt_kurzbz","projektphase_id","projekttask_id","uid","person_id","prestudent_id","bestellung_id","lehreinheit_id","ext_id","anrechnung_id"),
"public.tbl_notiz_dokument" => array("notiz_id","dms_id"),
+ "public.tbl_notiz_typ" => array("typ_kurzbz","bezeichnung_mehrsprachig", "beschreibung", "automatisiert", "aktiv", "zuordnung", "tag", "style", "vorrueckung", "prioritaet"),
"public.tbl_ort" => array("ort_kurzbz","bezeichnung","planbezeichnung","max_person","lehre","reservieren","aktiv","lageplan","dislozierung","kosten","ausstattung","updateamum","updatevon","insertamum","insertvon","ext_id","stockwerk","standort_id","telefonklappe","content_id","m2","gebteil","oe_kurzbz","arbeitsplaetze"),
"public.tbl_ortraumtyp" => array("ort_kurzbz","hierarchie","raumtyp_kurzbz"),
"public.tbl_organisationseinheit" => array("oe_kurzbz", "oe_parent_kurzbz", "bezeichnung","organisationseinheittyp_kurzbz", "aktiv","mailverteiler","freigabegrenze","kurzzeichen","lehre","standort","warn_semesterstunden_frei","warn_semesterstunden_fix","standort_id"),
diff --git a/system/dbupdate_3.4/40717_lv_faktor.php b/system/dbupdate_3.4/40717_lv_faktor.php
new file mode 100644
index 000000000..932d6fd40
--- /dev/null
+++ b/system/dbupdate_3.4/40717_lv_faktor.php
@@ -0,0 +1,65 @@
+db_query("SELECT 1 FROM lehre.tbl_lehrveranstaltung_faktor LIMIT 1"))
+{
+ $qry = "
+
+ CREATE TABLE lehre.tbl_lehrveranstaltung_faktor
+ (
+ lehrveranstaltung_faktor_id integer NOT NULL,
+ lehrveranstaltung_id integer NOT NULL,
+ faktor numeric NOT NULL,
+ studiensemester_kurzbz_von varchar(16) NOT NULL,
+ studiensemester_kurzbz_bis varchar(16),
+ insertamum timestamp DEFAULT NOW(),
+ insertvon varchar(32),
+ updateamum timestamp,
+ updatevon varchar(32),
+ CONSTRAINT tbl_lehrveranstaltung_faktor_pk PRIMARY KEY (lehrveranstaltung_faktor_id)
+ );
+
+ CREATE SEQUENCE lehre.lehrveranstaltung_faktor_id_seq
+ START WITH 1
+ INCREMENT BY 1
+ NO MAXVALUE
+ NO MINVALUE
+ CACHE 1;
+
+ ALTER TABLE lehre.tbl_lehrveranstaltung_faktor ALTER COLUMN lehrveranstaltung_faktor_id SET DEFAULT nextval('lehre.lehrveranstaltung_faktor_id_seq');
+ 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 RESTRICT ON UPDATE CASCADE;
+ ALTER TABLE lehre.tbl_lehrveranstaltung_faktor ADD CONSTRAINT fk_lehrveranstaltung_faktor_studiensemester_von FOREIGN KEY (studiensemester_kurzbz_von) REFERENCES public.tbl_studiensemester(studiensemester_kurzbz) ON UPDATE CASCADE ON DELETE RESTRICT;
+ ALTER TABLE lehre.tbl_lehrveranstaltung_faktor ADD CONSTRAINT fk_lehrveranstaltung_faktor_studiensemester_bis FOREIGN KEY (studiensemester_kurzbz_bis) REFERENCES public.tbl_studiensemester(studiensemester_kurzbz) ON UPDATE CASCADE ON DELETE RESTRICT;
+
+ GRANT SELECT ON lehre.tbl_lehrveranstaltung_faktor TO web;
+ GRANT SELECT, UPDATE, INSERT, DELETE ON lehre.tbl_lehrveranstaltung_faktor TO vilesci;
+ GRANT SELECT ON lehre.lehrveranstaltung_faktor_id_seq TO web;
+ GRANT SELECT, UPDATE, INSERT, DELETE ON lehre.lehrveranstaltung_faktor_id_seq TO vilesci;
+ ";
+
+ if (!$db->db_query($qry))
+ echo '
lehre.tbl_lehrveranstaltung_faktor: ' . $db->db_last_error() . '';
+ else
+ echo 'Tabelle: lehre.tbl_lehrveranstaltung_faktor erstellt!';
+
+ //TODO ggf default wert in eine config
+ $qry = "
+ INSERT INTO lehre.tbl_lehrveranstaltung_faktor
+ (lehrveranstaltung_id, faktor, studiensemester_kurzbz_von, insertvon)
+ (
+ SELECT lehrveranstaltung_id,
+ 2,
+ (
+ SELECT public.tbl_studiensemester.studiensemester_kurzbz
+ FROM public.tbl_studiensemester
+ ORDER BY start LIMIT 1
+ ),
+ 'checksystem'
+ FROM lehre.tbl_lehrveranstaltung
+ WHERE lehrtyp_kurzbz IN ('lv', 'tpl')
+ );
+ ";
+ if (!$db->db_query($qry))
+ echo '
lehre.tbl_lehrveranstaltung_faktor: ' . $db->db_last_error() . '';
+ else
+ echo 'Tabelle: lehre.tbl_lehrveranstaltung_faktor befüllt!';
+}
diff --git a/system/dbupdate_3.4/48526_pep_tagging.php b/system/dbupdate_3.4/48526_pep_tagging.php
new file mode 100644
index 000000000..01e9e5e9f
--- /dev/null
+++ b/system/dbupdate_3.4/48526_pep_tagging.php
@@ -0,0 +1,64 @@
+db_query("SELECT 1 FROM system.tbl_app WHERE app='pep'"))
+{
+ if($db->db_num_rows($result) === 0)
+ {
+ $qry = "INSERT INTO system.tbl_app (app) VALUES('pep');";
+
+ if(!$db->db_query($qry))
+ echo '
System Tabelle app: '.$db->db_last_error().'';
+ else
+ echo '
app pep hinzugefuegt
';
+ }
+}
+
+// Creates table public.tbl_notiz_typ if it doesn't exist and grants privileges
+if (!$result = @$db->db_query('SELECT 0 FROM public.tbl_notiz_typ WHERE 0 = 1'))
+{
+ //TODO zuordnung typ definieren
+ $qry = 'CREATE TABLE public.tbl_notiz_typ (
+ typ_kurzbz varchar(32) NOT NULL,
+ bezeichnung_mehrsprachig character varying(256)[] NOT NULL,
+ beschreibung text,
+ automatisiert boolean NOT NULL,
+ aktiv boolean NOT NULL,
+ zuordnung text,
+ tag boolean NOT NULL,
+ style text,
+ vorrueckung boolean NOT NULL,
+ prioritaet smallint
+ );
+
+ ALTER TABLE public.tbl_notiz_typ ADD CONSTRAINT pk_tbl_tbl_notiz_typ PRIMARY KEY (typ_kurzbz)';
+
+ if (!$db->db_query($qry))
+ echo '
public.tbl_notiz_typ: '.$db->db_last_error().'';
+ else
+ echo '
public.tbl_notiz_typ table created';
+
+ $qry = 'GRANT SELECT ON TABLE public.tbl_notiz_typ TO web;';
+ if (!$db->db_query($qry))
+ echo '
public.tbl_notiz_typ: '.$db->db_last_error().'';
+ else
+ echo '
Granted privileges to
web on public.tbl_notiz_typ';
+
+ $qry = 'GRANT SELECT, UPDATE, INSERT, DELETE ON TABLE public.tbl_notiz_typ TO vilesci;';
+ if (!$db->db_query($qry))
+ echo '
public.tbl_notiz_typ: '.$db->db_last_error().'';
+ else
+ echo '
Granted privileges to
vilesci on public.tbl_notiz_typ';
+}
+
+if(!@$db->db_query("SELECT typ FROM public.tbl_notiz LIMIT 1"))
+{
+ $qry = 'ALTER TABLE public.tbl_notiz ADD COLUMN typ varchar(32);
+ ALTER TABLE public.tbl_notiz ADD CONSTRAINT tbl_notiz_typ_fkey FOREIGN KEY (typ) REFERENCES public.tbl_notiz_typ (typ_kurzbz) ON DELETE RESTRICT ON UPDATE CASCADE;';
+
+ if(!$db->db_query($qry))
+ echo '
public.tbl_notiz '.$db->db_last_error().'';
+ else
+ echo '
public.tbl_notiz: Neue Spalte typ hinzugefügt';
+}
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index aed7cd0d3..0c42c8188 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -15105,6 +15105,26 @@ array(
)
)
),
+ array(
+ 'app' => 'core',
+ 'category' => 'ui',
+ 'phrase' => 'felderFehlen',
+ 'insertvon' => 'system',
+ 'phrases' => array(
+ array(
+ 'sprache' => 'German',
+ 'text' => "Bitte füllen Sie alle Formularfelder aus",
+ 'description' => '',
+ 'insertvon' => 'system'
+ ),
+ array(
+ 'sprache' => 'English',
+ 'text' => "Please fill in all form fields",
+ 'description' => '',
+ 'insertvon' => 'system'
+ )
+ )
+ ),
array(
'app' => 'core',
'category' => 'ui',
@@ -37419,6 +37439,46 @@ array(
'insertvon' => 'system'
)
)
+ ),
+ array(
+ 'app' => 'pep',
+ 'category' => 'ui',
+ 'phrase' => 'maprojohneoe',
+ 'insertvon' => 'system',
+ 'phrases' => array(
+ array(
+ 'sprache' => 'German',
+ 'text' => 'Mitarbeiter und Projekt sind der Organisationseinheit nicht zugeordnet.',
+ 'description' => '',
+ 'insertvon' => 'system'
+ ),
+ array(
+ 'sprache' => 'English',
+ 'text' => 'Employee and project are not assigned to the organizational unit.',
+ 'description' => '',
+ 'insertvon' => 'system'
+ )
+ )
+ ),
+ array(
+ 'app' => 'pep',
+ 'category' => 'ui',
+ 'phrase' => 'infoandepl/kfl',
+ 'insertvon' => 'system',
+ 'phrases' => array(
+ array(
+ 'sprache' => 'German',
+ 'text' => 'Info an DepL/KFL',
+ 'description' => '',
+ 'insertvon' => 'system'
+ ),
+ array(
+ 'sprache' => 'English',
+ 'text' => 'Info to DepL/KFL:',
+ 'description' => '',
+ 'insertvon' => 'system'
+ )
+ )
)
);
diff --git a/vilesci/lehre/lehrveranstaltung.php b/vilesci/lehre/lehrveranstaltung.php
index ab7abd9cd..2b3346d02 100644
--- a/vilesci/lehre/lehrveranstaltung.php
+++ b/vilesci/lehre/lehrveranstaltung.php
@@ -32,6 +32,7 @@ require_once('../../include/organisationsform.class.php');
require_once('../../include/addon.class.php');
require_once('../../include/sprache.class.php');
require_once('../../include/lehrmodus.class.php');
+require_once('../../include/lehrveranstaltung_faktor.class.php');
if (!$db = new basis_db())
die('Es konnte keine Verbindung zum Server aufgebaut werden.');
@@ -1108,7 +1109,8 @@ if ($result_lv!=0)
{
echo "
LV-Angebot |
kompatible LV |
-
Aktion | ";
+
Aktion |
+
Faktor | ";
}
echo "";
@@ -1326,7 +1328,20 @@ if ($result_lv!=0)
';
echo '
Kompatible LV | ';
- echo '
löschen | ';
+ echo '
+ löschen
+ ';
+
+ if (in_array($row->lehrtyp_kurzbz, array("tpl", "lv")))
+ echo '
Faktor';
+ echo ' | ';
+ echo '
+
';
+
+ $lv_faktor = new lehrveranstaltung_faktor();
+ $lv_faktor->getAkt($row->lehrveranstaltung_id);
+
+ echo $lv_faktor->faktor.' | ';
echo "\n";
}
}
diff --git a/vilesci/lehre/lehrveranstaltung_details.php b/vilesci/lehre/lehrveranstaltung_details.php
index bad2a7d93..60f2fc3c9 100644
--- a/vilesci/lehre/lehrveranstaltung_details.php
+++ b/vilesci/lehre/lehrveranstaltung_details.php
@@ -30,6 +30,8 @@
require_once('../../include/lehrmodus.class.php');
require_once('../../include/benutzerberechtigung.class.php');
require_once('../../include/studienplan.class.php');
+ require_once('../../include/lehrveranstaltung_faktor.class.php');
+ require_once('../../include/studiensemester.class.php');
if (!$db = new basis_db())
die('Es konnte keine Verbindung zum Server aufgebaut werden.');
@@ -139,6 +141,31 @@
$reloadstr .= " window.location.href='".$_SERVER['PHP_SELF']."?stg_kz=$lv->studiengang_kz&semester=$lv->semester&neu=true';";
}
$reloadstr .= "\n";
+
+ if (in_array($lv->lehrtyp_kurzbz, array('tpl', 'lv')) && $lv->new === true)
+ {
+ $lv_faktor = new lehrveranstaltung_faktor();
+ $studiensemester = new studiensemester();
+ $studiensemester_von = $studiensemester->getLastOrAktSemester();
+ if ($lv->lehrtyp_kurzbz === 'lv' && $_POST['lehrveranstaltung_template_id'] !== '')
+ {
+
+ $lv_faktor->getAkt($_POST['lehrveranstaltung_template_id']);
+ //TODO Faktor in eine Config
+ if (is_null($lv_faktor->faktor))
+ $lv_faktor->addFaktor($lv->lehrveranstaltung_id, 2, $studiensemester_von);
+ else
+ $lv_faktor->addFaktor($lv->lehrveranstaltung_id, $lv_faktor->faktor, $studiensemester_von);
+ }
+ else
+ {
+ $lv_faktor->loadByLV($lv->lehrveranstaltung_id);
+ if (empty($lv_faktor->lv_faktoren))
+ {
+ $lv_faktor->addFaktor($lv->lehrveranstaltung_id, 2, $studiensemester_von);
+ }
+ }
+ }
}
}
diff --git a/vilesci/lehre/lehrveranstaltung_faktor.php b/vilesci/lehre/lehrveranstaltung_faktor.php
new file mode 100644
index 000000000..a9ad051d0
--- /dev/null
+++ b/vilesci/lehre/lehrveranstaltung_faktor.php
@@ -0,0 +1,309 @@
+getBerechtigungen($uid);
+
+$sprache = getSprache();
+$p = new phrasen($sprache);
+
+if(!$rechte->isBerechtigt('lehre/lehrveranstaltung', null, 'suid'))
+ die('Sie haben keine Berechtigung für diese Seite');
+
+echo '
+
+
+
+
+
+
+
+
+
+
+
+';
+?>
+
+load($lehrveranstaltung_id);
+
+$faktor = new lehrveranstaltung_faktor();
+$faktor->loadByLV($lv->lehrveranstaltung_id);
+
+$studiensemester = new studiensemester();
+$studiensemester->getAll('desc');
+
+
+echo '
+
+
+
Faktor - '. $lv->bezeichnung . ' - ' . $lv->lehrveranstaltung_id . '
';
+
+echo '
+
+
+
+
+
+ | '.$p->t('lv/faktor').' |
+ '.$p->t('global/von').' |
+ '.$p->t('global/bis').' |
+ '.$p->t('global/bearbeiten').' |
+ '.$p->t('global/loeschen').' |
+
+
+
+';
+
+if(count($faktor->lv_faktoren) > 0)
+{
+ foreach($faktor->lv_faktoren as $lv_faktor)
+ {
+ echo "
+ | ".$lv_faktor->faktor." |
+ ".$lv_faktor->studiensemester_kurzbz_von." |
+ ".$lv_faktor->studiensemester_kurzbz_bis." |
+ |
+ |
+
"
+ ;
+ }
+}
+
+ '
+
+';
+
+?>
+
+