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

changes the LVUebersicht and the endpoint

Browse Source
This commit is contained in:
SimonGschnell
2024-07-09 15:28:28 +02:00
parent 8a44a9e1af
commit 56080f6681
28 changed files with 58 additions and 789 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/template/cis/index.html
View File
addons/template/cis/init.js.php
-44
View File
@@ -1,44 +0,0 @@
<?php
/* Copyright (C) 2015 fhcomplete.org
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
*
* Authors: Andreas Oesterreicher <[email protected]>
*/
/**
* Initialisierung des Addons
*/
?>
if(typeof addon =='undefined')
var addon=Array();
addon.push(
{
init: function(page, params)
{
// Diese Funktion wird nach dem Laden der Seite im CIS aufgerufen
/*
switch(page)
{
case 'cis/private/tools/zeitaufzeichnung.php':
break;
default:
break;
}
*/
}
});
addons/template/cis/vorlage_profil_array.php
-55
View File
@@ -1,55 +0,0 @@
<?php
/* Copyright (C) 2014 fhcomplete.org
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
*
* Authors: Andreas Österreicher <[email protected]>
*/
/**
* Diese Datei fügt zusätzliche Links im CIS Profil ein
* Dazu muss die Datei umbenannt werden in profil_array.php
*
* Dazu wird ein Array aufgebaut welches die Links enthaelt.
*
* $menu = array('MeinLink'=>array('name'=>'Name des Links','link'=>'../path/to/file.php','target'='content'));
*/
// Unterschiedliche Links für Studierende und Mitarbeiter
if($type=='student')
{
if(!$ansicht)
$menu['Notenliste']=array('name'=>$p->t('profil/leistungsbeurteilung'), 'link'=>'../lehre/notenliste.php', 'target'=>'content');
$menu['LVPlan']=array('name'=>$p->t('profil/lvplanVon').' '.$user->nachname, 'link'=>'../lvplan/stpl_week.php?pers_uid='.$user->uid.'&type=student', 'target'=>'content');
}
else
{
if(!$ansicht)
{
$menu['Zeitwunsch']=array('name'=>$p->t('profil/zeitwuensche'), 'link'=>'zeitwunsch.php?uid='.$user->uid, 'target'=>'content');
$menu['Lehrveranstaltungen']=array('name'=>$p->t('lvaliste/lehrveranstaltungen'), 'link'=>'lva_liste.php?uid='.$user->uid, 'target'=>'content');
}
if(check_lektor(get_uid()))
{
$menu['Zeitsperren']=array('name'=>$p->t('profil/zeitsperrenVon').' '.$user->nachname, 'link'=>'zeitsperre_days.php?days=30&lektor='.$user->uid, 'target'=>'content');
}
if($uid!=get_uid())
{
$menu['LVPlan']=array('name'=>$p->t('profil/lvplanVon').' '.$user->nachname, 'link'=>'../lvplan/stpl_week.php?pers_uid='.$user->uid.'&type=lektor', 'target'=>'content');
}
}
?>
addons/template/content/index.html
View File
addons/template/content/init.js.php
-90
View File
@@ -1,90 +0,0 @@
<?php
/* Copyright (C) 2013 fhcomplete.org
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
*
* Authors: Andreas Oesterreicher <[email protected]>
*/
/**
* Initialisierung des Addons
*/
?>
addon.push(
{
init: function()
{
// Diese Funktion wird nach dem Laden des FAS aufgerufen
/*
// Hinzufuegen eines zusaetzlichen Tabs bei Mitarbeitern mit einem Label darin
var tabitem = document.createElement("tab");
tabitem.setAttribute("id","addon-template-tab");
tabitem.setAttribute("label","Template");
var mitarbeitertabs = document.getElementById("mitarbeiter-tabs");
mitarbeitertabs.appendChild(tabitem);
var tabpanelitem = document.createElement("vbox");
tabpanelitem.setAttribute("id","addon-template-tabpannel-vbox");
var label = document.createElement("label");
label.setAttribute("value","Template");
tabpanelitem.appendChild(label);
var mitarbeitertabpanels=document.getElementById("mitarbeiter-tabpanels-main");
mitarbeitertabpanels.appendChild(tabpanelitem);
// zusaetzliche Funktion beim klicken des Suchen Button bei Mitarbeitern hinzufuegen
searchbutton = document.getElementById("mitarbeiter-toolbar-button-search");
searchbutton.addEventListener("command",AddonTemplateMitarbeiterSearch, true);
// Menuepunkt hinzufuegen
statistikmenue = document.getElementById("menu-statistic-popup");
var menuentry = document.createElement("menuitem");
menuentry.setAttribute("id","addons-template-mymenuentry");
menuentry.setAttribute("label","Addon Template Menu Entry");
menuentry.addEventListener("command",AddonTemplateMenuEntry, true);
statistikmenue.appendChild(menuentry);
*/
},
selectMitarbeiter: function(person_id, mitarbeiter_uid)
{
},
selectStudent: function(person_id, prestudent_id, student_uid)
{
},
selectVerband: function(item)
{
},
selectInstitut: function(institut)
{
},
selectLektor: function(lektor)
{
}
});
function AddonTemplateMitarbeiterSearch()
{
alert("AddonTemplateSearchButtonClicked");
}
function AddonTemplateMenuEntry()
{
alert("AddonTemplateMenuEntry clicked");
}
addons/template/dbcheck.php
-101
View File
@@ -1,101 +0,0 @@
<?php
/* Copyright (C) 2013 FH Technikum-Wien
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
*
*/
/**
* FH-Complete Addon Template Datenbank Check
*
* Prueft und aktualisiert die Datenbank
*/
require_once('../../config/system.config.inc.php');
require_once('../../include/basis_db.class.php');
require_once('../../include/functions.inc.php');
require_once('../../include/benutzerberechtigung.class.php');
// Datenbank Verbindung
$db = new basis_db();
echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
"http://www.w3.org/TR/html4/strict.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="stylesheet" href="../../skin/fhcomplete.css" type="text/css">
<link rel="stylesheet" href="../../skin/vilesci.css" type="text/css">
<title>Addon Datenbank Check</title>
</head>
<body>
<h1>Addon Datenbank Check</h1>';
$uid = get_uid();
$rechte = new benutzerberechtigung();
$rechte->getBerechtigungen($uid);
if(!$rechte->isBerechtigt('basis/addon', null, 'suid'))
{
exit('Sie haben keine Berechtigung für die Verwaltung von Addons');
}
echo '<h2>Aktualisierung der Datenbank</h2>';
// Code fuer die Datenbankanpassungen
/*
if(!$result = @$db->db_query("SELECT 1 FROM addon.tbl_template_items"))
{
$qry = 'CREATE TABLE addon.tbl_template_items
(
template_items_kurzbz varchar(32),
bezeichnung varchar(256)
);';
if(!$db->db_query($qry))
echo '<strong>addon.tbl_template_items: '.$db->db_last_error().'</strong><br>';
else
echo ' addon.tbl_template_items: Tabelle addon.template_items hinzugefuegt!<br>';
}
*/
echo '<br>Aktualisierung abgeschlossen<br><br>';
echo '<h2>Gegenprüfung</h2>';
// Liste der verwendeten Tabellen / Spalten des Addons
$tabellen=array(
"addon.tbl_template_items" => array("template_items_kurzbz","bezeichnung"),
);
$tabs=array_keys($tabellen);
$i=0;
foreach ($tabellen AS $attribute)
{
$sql_attr='';
foreach($attribute AS $attr)
$sql_attr.=$attr.',';
$sql_attr=substr($sql_attr, 0, -1);
if (!@$db->db_query('SELECT '.$sql_attr.' FROM '.$tabs[$i].' LIMIT 1;'))
echo '<BR><strong>'.$tabs[$i].': '.$db->db_last_error().' </strong><BR>';
else
echo $tabs[$i].': OK - ';
flush();
$i++;
}
?>
addons/template/index.html
View File
addons/template/install.php
-66
View File
@@ -1,66 +0,0 @@
<?php
/* Copyright (C) 2013 FH Technikum-Wien
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
*
*/
/**
* FH-Complete Addon Template Installation
*
* Installationsscript zur Erstinitialisierung des Addons
*/
require_once('version.php');
require_once('../../version.php');
require_once('../../config/system.config.inc.php');
require_once('../../include/functions.inc.php');
require_once('../../include/benutzerberechtigung.class.php');
echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
"http://www.w3.org/TR/html4/strict.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="stylesheet" href="../../skin/fhcomplete.css" type="text/css">
<link rel="stylesheet" href="../../skin/vilesci.css" type="text/css">
<title>Addon Installation</title>
</head>
<body>
<h1>Addon Installation</h1>';
$uid = get_uid();
$rechte = new benutzerberechtigung();
$rechte->getBerechtigungen($uid);
if(!$rechte->isBerechtigt('basis/addon', null, 'suid'))
{
exit('Sie haben keine Berechtigung für die Verwaltung von Addons');
}
if($fhcomplete_version>=$fhcomplete_target_version)
{
echo 'Installiere Addon <span class="marked">'.$addon_name.'</span> Version <span class="marked">'.$addon_version.'</span><br><br>';
/**
* Fuegen Sie hier Ihre Installationsroutine hinzu
*/
echo '<a href="dbcheck.php">&gt;&gt; weiter zur Aktualisierung der Datenbank</a>';
}
else
{
echo 'Dieses Addon funktioniert erst mit FHComplete Version '.$fhcomplete_target_version;
echo 'Installation abgebrochen';
}
?>
addons/template/locale/README.txt
-6
View File
@@ -1,6 +0,0 @@
In diesem Ordner können Locale-Dateien abgelegt werden.
Diese überschreiben globale Locales die unter /locale/ abgelegt sind.
In den Dateien müssen nicht alle Phrasen vorhanden sein. Es genügt, wenn nur die Phrasen vorhanden sind die überschrieben werden sollen. Alle anderen Phrasen werden aus dem Standard-Ordner übernommen.
Die Datei mit der Phrase muss jedoch den selben Namen haben wie die Ursprungsdatei in der die Phrase enthalten ist.
addons/template/locale/index.html
View File
addons/template/soap/index.html
View File
addons/template/system/index.html
View File
addons/template/system/vorlage_zip/README.txt
-2
View File
@@ -1,2 +0,0 @@
In diesem Ordner können modifizierte ODT Vorlagen für die Dokumentenerstellung abgelegt werden.
Vorlagen die in diesem Ordner abgelegt werden, werden bevorzugt gegenüber jenen die unter /system/vorlage_zip abgelegt sind.
addons/template/version.php
-29
View File
@@ -1,29 +0,0 @@
<?php
/* Copyright (C) 2013 FH Technikum-Wien
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
*
*/
// Name des Addons
$addon_name = 'Template';
// Versionsnummer des Addons
$addon_version = '0.01';
// FH-Complete Min-Version
$fhcomplete_target_version = '2.2';
?>
addons/template/vilesci/index.php
-44
View File
@@ -1,44 +0,0 @@
<?php
/* Copyright (C) 2013 FH Technikum-Wien
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
*
*/
require_once('../../../config/vilesci.config.inc.php');
require_once('../../../include/functions.inc.php');
require_once('../../../include/benutzerberechtigung.class.php');
echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
"http://www.w3.org/TR/html4/strict.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="stylesheet" href="../../../skin/fhcomplete.css" type="text/css">
<link rel="stylesheet" href="../../../skin/vilesci.css" type="text/css">
<title>Template</title>
</head>
<body>
<h1>Template</h1>';
$uid = get_uid();
$rechte = new benutzerberechtigung();
$rechte->getBerechtigungen($uid);
if(!$rechte->isBerechtigt('basis/addon'))
{
die('Sie haben keine Berechtigung fuer diese Seite');
}
echo 'Template Addon Vilesci Integration';
?>
addons/template/vilesci/init.js.php
-44
View File
@@ -1,44 +0,0 @@
<?php
/* Copyright (C) 2015 fhcomplete.org
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
*
* Authors: Andreas Oesterreicher <[email protected]>
*/
/**
* Initialisierung des Addons
*/
?>
if(typeof addon =='undefined')
var addon=Array();
addon.push(
{
init: function(page, params)
{
// Diese Funktion wird nach dem Laden der Seite im Vilesci aufgerufen
/*
switch(page)
{
case 'vilesci/lehre/lehrveranstaltung.php':
break;
default:
break;
}
*/
}
});
addons/template/vilesci/menu.inc.php
-44
View File
@@ -1,44 +0,0 @@
<?php
/* Copyright (C) 2017 fhcomplete.org
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
*
* Authors: Andreas Oesterreicher <[email protected]>,
*/
/**
* Hier koennen neue Menuepunkte im Vilesci definiert werden
*/
// Hauptmenuepunkt hinzufuegen
$menu_addon = array
(
'Template'=>array
(
'name'=>'Template', 'opener'=>'true', 'hide'=>'true', 'permissions'=>array('basis/addon'), 'image'=>'../../skin/images/vilesci_addons.png',
'link'=>'left.php?categorie=Template', 'target'=>'nav',
'TemplateEntry1'=>array('name'=>'Template Entry1', 'link'=>'../addons/template/vilesci/index.php', 'target'=>'main'),
'TemplateEntry2'=>array('name'=>'Template Entry2', 'link'=>'../addons/template/vilesci/index.php', 'target'=>'main')
)
);
$menu = array_merge($menu,$menu_addon);
// Submenuepunkt hinzufuegen unter dem Hauptmenue Punkt "Admin"
$menu_addon = array
(
'TemplateSubmenu'=>array('name'=>'Template', 'link'=>'../addons/template/vilesci/index.php', 'target'=>'main','permissions'=>array('basis/addon')),
);
$menu['Admin'] = array_merge($menu['Admin'],$menu_addon);
?>
addons/template/vilesci/vorlage_generateuid.inc.php
-69
View File
@@ -1,69 +0,0 @@
<?php
/* Copyright (C) 2014 fhcomplete.org
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
*
* Authors: Andreas Oesterreicher <[email protected]> and
*/
/**
* Benutzerdefinierte Funktion zur Generierung der UIDs
* Zur Aktivierung muss die Datei in generateuid.inc.php umbenannt werden
*/
/**
* Generiert die UID für Studierende
*
* @param $stgkzl Studiengangskuerzel
* @param $jahr Studienjahr (zB 2014)
* @param $stgtyp Studiengangstyp einstellige Ziffer
* @param $matrikelnummer Personenkennzeichen des Studierenden
*/
function generateUID($stgkzl, $jahr, $stgtyp, $matrikelnummer)
{
return $matrikelnummer;
}
/**
* Gerneriert die Mitarbeiter UID
* Format v.nachname max 20 Zeichen
* Im Fall von Doppelnamen wird vor dem Bindestrich abgeschnitten
*
* @param $vorname Vorname
* @param $nachname Nachname
* @param $lektor Boolean true wenn Lektor sonst false
*/
function generateMitarbeiterUID($vorname, $nachname, $lektor, $fixangestellt=true)
{
$bn = new benutzer();
$uid='';
// Wenn ein Bindestrich vorhanden ist (Doppelname), dort abschneiden
if(mb_strpos($nachname,'-')!==false)
$nachname = mb_substr($nachname, 0, mb_strpos($nachname,'-'));
// Nachname wird so lange verkuerzt bis eine eindeutige UID entsteht die noch nicht vergeben ist
for($nn=18;$nn!=0;$nn--)
{
$uid = mb_substr($vorname,0,1);
$uid .= mb_substr($nachname,0,$nn);
$uid = mb_str_replace(' ','',$uid);
$uid = mb_str_replace('-','',$uid);
$uid = mb_strtolower($uid);
if(!$bn->uid_exists($uid))
return $uid;
}
return false;
}
addons/template/vilesci/vorlage_passwort.inc.php
-39
View File
@@ -1,39 +0,0 @@
<?php
/* Copyright (C) 2014 fhcomplete.org
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
*
* Authors: Andreas Oesterreicher <[email protected]>
*/
/*
* Diese Datei überschreibt die Default-Funktionen zur Passwort Änderung
* Zur Aktivierung muss die Datei in passwort.inc.php umbenannt werden
*
* Ansonsten wird die Default Funktionalität unter /include/tw/passwort.inc.php verwendet
*/
/**
* Aendert das Passwort
* @param $passwort_alt Altes (aktuelles) Passwort
* @param $passwort_neu neues Passwort
* @param $uid - UID/Benutzername des Users
* @return true wenn erfolgreich - Fehlermeldung im Fehlerfall
*/
function change_password($passwort_alt, $passwort_neu, $uid)
{
return 'Passwort Änderung fehlgeschlagen.';
}
?>
addons/template/vilesci/vorlage_serviceterminal.inc.php
-72
View File
@@ -1,72 +0,0 @@
<?php
/* Copyright (C) 2014 fhcomplete.org
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
*
* Authors: Andreas Oesterreicher <[email protected]>
*/
// Raumtyp der per Default am Infoterminal angezeigt wird
$ServiceTerminalDefaultRaumtyp='EDV';
// Liste der Raumtypen die am Infoterminal angezeigt werden
$ServiceTerminalRaumtypen=array(
array("type"=>"EDV","beschreibung"=>"&nbsp;Freie&nbsp;<br>&nbsp;PC R&auml;ume&nbsp;","img"=>""),
array("type"=>"HS","beschreibung"=>"&nbsp;Freie&nbsp;<br>&nbsp;H&ouml;rs&auml;le&nbsp;","img"=>""),
array("type"=>"SEM","beschreibung"=>"&nbsp;Freie&nbsp;<br>&nbsp;Seminarr&auml;ume&nbsp;","img"=>""),
array("type"=>"Lab","beschreibung"=>"&nbsp;Freie&nbsp;<br>&nbsp;Laborr&auml;ume&nbsp;","img"=>""),
);
/**
* Prueft ob die Karte verlaengert werden darf
* @param $uid
* @return Array mit boolean und Errormsg
*/
function ServiceTerminalCheckVerlaengerung($uid)
{
if(!check_lektor($uid))
{
$konto = new konto();
if($aktSemester= $konto->getLastStudienbeitrag($uid))
{
return array(true,'Studienbeitrag für Semester '.$aktSemester.' bezahlt');
}
else
{
return array(false,'Verlängerung der Karte ist derzeit nicht möglich da der Studienbeitrag noch nicht bezahlt wurde');
}
}
else
return array(false,'Für Mitarbeiter ist eine Kartenverlängerung nicht möglich');
}
/**
* Liefert den Text der auf die Karte gedruckt werden soll oder einer Errormsg
* @param $uid UID des Users
* @return array mit Datum/Drucktext und errorMessage
*/
function ServiceTerminalGetDrucktext($uid)
{
// hole Semester des letzten eingezahlten Studienbeitrages
$konto = new konto();
if(!$aktSemester= $konto->getLastStudienbeitrag($uid))
{
return array('datum'=>'', 'errorMessage'=>'Fehler beim Auslesen des Studienganges. Bitte wenden Sie sich an den Service Desk.');
}
return array('datum'=>'Gueltig fuer/valid for '.$aktSemester, 'errorMessage'=>'');
}
?>
addons/template/xml/index.html
View File
application/controllers/api/frontend/v1/LvMenu.php
+26 -12
View File
@@ -271,11 +271,12 @@ class LvMenu extends FHCAPI_Controller
$params $params
); );
// Menu sortieren // Menu sortieren
// ########################################################################################## // ##########################################################################################
foreach ($menu as $key => $row){ foreach ($menu as $key => $row){
$pos[$key] = $row['position']; $pos[$key] = $row['position'];
$menu[$key]['icon'] = base_url(str_replace("../../..","",$row['icon']));
} }
array_multisort($pos, SORT_ASC, SORT_NUMERIC, $menu); array_multisort($pos, SORT_ASC, SORT_NUMERIC, $menu);
@@ -574,19 +575,32 @@ class LvMenu extends FHCAPI_Controller
// get the data of the database result and map the array of objects to their object property // get the data of the database result and map the array of objects to their object property
$studentMails = $this->getDataOrTerminateWithError($studentMails, 'No student mails found'); $studentMails = $this->getDataOrTerminateWithError($studentMails, 'No student mails found');
$studentMails = array_map(
function($mail_obj){
return $mail_obj->mail;
},$studentMails);
$mailto = implode(',',$studentMails);
//todo logic for nomail is missing // emails used to create the mailto link
if($nomail!='') $mailtoMails = array();
$link_onclick='alert(\''.$p->t('lehre/keinMailverteiler',array($nomail)).'\');'; $noMails = array();
else $noMailLink = FALSE;
$link_onclick='';
foreach($studentMails as $mail){
if($mail->mail == 'nomail'){
$noMails[]=$mail->gruppe_kurzbz;
$noMailLink= TRUE;
}else{
$mailtoMails[]=$mail->mail;
}
}
if($noMailLink){
$link_onclick='alert(\''.$p->t('lehre/keinMailverteiler',array(implode(" ",$noMails))).'\');';
}else{
$link_onclick='';
}
$mailto .= implode(',',$mailtoMails);
$menu[]=array $menu[]=array
( (
'id'=>'core_menu_mailanstudierende', 'id'=>'core_menu_mailanstudierende',
application/models/education/Lehreinheit_model.php
+13 -6
View File
@@ -125,15 +125,22 @@ class Lehreinheit_model extends DB_Model
// logic used from cis_menu_lv.inc.php line 335 // logic used from cis_menu_lv.inc.php line 335
return $this->execReadOnlyQuery(" return $this->execReadOnlyQuery("
SELECT SELECT
CASE gruppe_kurzbz,
WHEN gruppe_kurzbz !='' THEN LOWER(gruppe_kurzbz || '@' || ?) CASE
ELSE LOWER(stg_typ || stg_kurzbz || semester || TRIM(verband) || TRIM(gruppe) || '@' || ?) WHEN nomail = TRUE THEN 'nomail'
END AS mail WHEN gruppe_kurzbz !='' THEN LOWER(gruppe_kurzbz || '@' || ?)
ELSE LOWER(stg_typ || stg_kurzbz || semester || TRIM(verband) || TRIM(gruppe) || '@' || ?)
END AS mail
FROM FROM
( (
SELECT SELECT
distinct vw_lehreinheit.studiensemester_kurzbz, vw_lehreinheit.stg_kurzbz, vw_lehreinheit.stg_typ, vw_lehreinheit.semester, distinct vw_lehreinheit.studiensemester_kurzbz, vw_lehreinheit.stg_kurzbz, vw_lehreinheit.stg_typ, vw_lehreinheit.semester,
COALESCE(vw_lehreinheit.verband,'') as verband, COALESCE(vw_lehreinheit.gruppe,'') as gruppe, vw_lehreinheit.gruppe_kurzbz, tbl_gruppe.mailgrp COALESCE(vw_lehreinheit.verband,'') as verband, COALESCE(vw_lehreinheit.gruppe,'') as gruppe, vw_lehreinheit.gruppe_kurzbz, tbl_gruppe.mailgrp,
CASE
WHEN mailgrp = TRUE OR mailgrp IS NULL THEN FALSE
ELSE TRUE
END as nomail
FROM campus.vw_lehreinheit FROM campus.vw_lehreinheit
LEFT JOIN public.tbl_gruppe USING(gruppe_kurzbz) LEFT JOIN public.tbl_gruppe USING(gruppe_kurzbz)
WHERE WHERE
@@ -143,7 +150,7 @@ class Lehreinheit_model extends DB_Model
vw_lehreinheit.studiensemester_kurzbz = vw_lehreinheit.studiensemester_kurzbz =
(select distinct studiensemester_kurzbz from campus.vw_lehreinheit where lehreinheit_id=?) (select distinct studiensemester_kurzbz from campus.vw_lehreinheit where lehreinheit_id=?)
AND (vw_lehreinheit.gruppe_kurzbz IS NULL OR AND (vw_lehreinheit.gruppe_kurzbz IS NULL OR
(vw_lehreinheit.gruppe_kurzbz IS NOT NULL AND tbl_gruppe.mailgrp = TRUE AND (SELECT COUNT(*) FROM public.tbl_benutzergruppe where gruppe_kurzbz = vw_lehreinheit.gruppe_kurzbz AND studiensemester_kurzbz = vw_lehreinheit.studiensemester_kurzbz) > 0)) (vw_lehreinheit.gruppe_kurzbz IS NOT NULL AND (SELECT COUNT(*) FROM public.tbl_benutzergruppe where gruppe_kurzbz = vw_lehreinheit.gruppe_kurzbz AND studiensemester_kurzbz = vw_lehreinheit.studiensemester_kurzbz) > 0))
) AS subquery ) AS subquery
application/views/CisHtml/Dashboard.php
+1 -2
View File
@@ -14,8 +14,7 @@ $this->load->view('templates/CISHTML-Header', $includesArray);
<div id="content"> <div id="content">
<h2>Dashboard</h2> <h2>Dashboard</h2>
<hr> <hr>
<fhc-dashboard active_addons="<?php echo ACTIVE_ADDONS ?>" <fhc-dashboard dashboard="CIS"/>
mail_studierende="<?php echo !defined('CIS_LEHRVERANSTALTUNG_MAILSTUDIERENDE_ANZEIGEN') || CIS_LEHRVERANSTALTUNG_MAILSTUDIERENDE_ANZEIGEN ?>" dashboard="CIS"/>
</div> </div>
<?php $this->load->view('templates/CISHTML-Footer', $includesArray); ?> <?php $this->load->view('templates/CISHTML-Footer', $includesArray); ?>
public/js/api/addons.js
+1 -10
View File
@@ -1,14 +1,5 @@
export default { export default {
getAddonLink(addon, lehrveranstaltung_id, studiensemester_kurzbz) { getLvMenu(lvid, studiensemester_kurzbz) {
return this.$fhcApi.get(
FHC_JS_DATA_STORAGE_OBJECT.app_root +
`/addons/${addon}/cis/testapi.php`,
{ lehrveranstaltung_id: lehrveranstaltung_id,
studiensemester_kurzbz: studiensemester_kurzbz }
);
},
getLvMenu(lvid, studiensemester_kurzbz) {
return this.$fhcApi.get( return this.$fhcApi.get(
FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.app_root +
FHC_JS_DATA_STORAGE_OBJECT.ci_router + FHC_JS_DATA_STORAGE_OBJECT.ci_router +
public/js/components/Cis/Mylv/LvUebersicht.js
+11 -46
View File
@@ -10,72 +10,37 @@ export default {
}, },
data(){ data(){
return { return {
// reactive data
items:["lehrveranstaltungsInformationen","Notenlisten","Moodle","Gesamtnote","E-mail","Pinboard","Alle Termine der LV","Anrechnung","Evaluierung","Neue Einmeldung"],
lehreinheit:null,
stg:null,
lv:null,
emailAnStudierende:null,
result: false, result: false,
menu: [],
} }
}, },
inject:["active_addons","mail_studierende"],
mixins:[BsModal], mixins:[BsModal],
components:{ components:{
BsModal, BsModal,
}, },
methods:{ methods:{
showModal: function(){ showModal: function(){
this.$fhcApi.factory.addons.getLvMenu(this.event.lehrveranstaltung_id, this.event.studiensemester_kurzbz).then(res =>{ //this.$fhcApi.factory.addons.getLvMenu(this.event.lehrveranstaltung_id, this.event.studiensemester_kurzbz).then(res =>{
console.log("this is the addon endpoint res",res); this.$fhcApi.factory.addons.getLvMenu(750, "WS2005").then(res =>{
}); this.menu = res.data;
this.$fhcApi.factory.lehre.getStudentenMail(this.event.lehreinheit_id).then(res =>
{
// prepare the mailto link with all the emails from the students of the lv
this.emailAnStudierende = "mailto:"+res.data.join(",");
});
this.$fhcApi.factory.addons.getAddonLink("lvinfo",this.event.lehrveranstaltung_id, this.event.studiensemester_kurzbz).then(res =>{
console.log(res,"this is the result from the api call");
}); });
}, },
}, },
mounted(){ mounted(){
// make axios call to the active addons
/* $addon_obj->loadAddons();
foreach($addon_obj->result as $addon)
{
if(file_exists('../../../addons/'.$addon->kurzbz.'/cis/init.js.php')) */
this.modal = this.$refs.modalContainer; this.modal = this.$refs.modalContainer;
}, },
template:/*html*/` template:/*html*/`
<bs-modal @showBsModal="showModal" ref="modalContainer" dialogClass="modal-lg"> <bs-modal @showBsModal="showModal" ref="modalContainer" dialogClass="modal-lg">
<template #title> <template #title>
<span v-if="lv ">{{lv + (stg?' / ' + stg:'')}}</span>
<p>{{JSON.stringify(emailAnStudierende,null,2)}}</p> <span v-else>Lehrveranstaltungs Übersicht</span>
<p>{{JSON.stringify(event,null,2)}}</p>
<!--<span v-if="lv ">
{{lv + (stg?' / ' + stg:'')}}
</span>
<span v-else>
Lehrveranstaltungs Übersicht
</span>-->
</template> </template>
<template #default> <template #default>
<div :style="{'display':'grid', 'row-gap':'10px', 'column-gap':'10px', 'grid-template-columns':'repeat(3,minmax(100px,1fr))', 'grid-template-rows':'repeat('+Math.ceil(items.length / 3)+',minmax(100px,1fr))'} "> <div :style="{'display':'grid', 'row-gap':'10px', 'column-gap':'10px', 'grid-template-columns':'repeat(3,minmax(100px,1fr))', 'grid-template-rows':'repeat('+Math.ceil(menu.length / 3)+',minmax(100px,1fr))'} ">
<div class="d-flex flex-column align-items-center justify-content-center" v-for="item in items" :key="item"> <div v-for="(menuItem, index) in menu" :key="index">
<a v-if="item=='E-mail'" :href="emailAnStudierende"> <a :onclick="menuItem.link_onclick" class="d-flex flex-column align-items-center justify-content-center" :href="menuItem.link_onclick?'#':menuItem.link" :title="menuItem.name">
<span>{{item}}</span> <span>{{menuItem.name}}</span>
<i class="fa fa-file"></i> <img :src="menuItem.icon" :alt="menuItem.name" ></img>
</a>
<a v-else href="#">
<span>{{item}}</span>
<i class="fa fa-file"></i>
</a> </a>
</div> </div>
</div> </div>
public/js/components/Cis/Profil/MitarbeiterProfil.js
+6
View File
@@ -239,6 +239,12 @@ export default {
//? sorts the profil Updates: pending -> accepted -> rejected //? sorts the profil Updates: pending -> accepted -> rejected
this.data.profilUpdates?.sort(this.sortProfilUpdates); this.data.profilUpdates?.sort(this.sortProfilUpdates);
}, },
mounted(){
// this is a test api call to test whether the addon lvevaluierung the menu point adds if the logged in user is the lector of the lehrveranstaltung
this.$fhcApi.factory.addons.getLvMenu(750, "WS2005").then(res =>{
console.log("this is the addon endpoint res",res);
});
},
template: /*html*/ ` template: /*html*/ `
<div class="container-fluid text-break fhc-form" > <div class="container-fluid text-break fhc-form" >
public/js/components/Dashboard/Dashboard.js
-8
View File
@@ -9,15 +9,7 @@ export default {
}, },
props: [ props: [
"dashboard", "dashboard",
"active_addons",
"mail_studierende",
], ],
provide(){
return{
active_addons: this.active_addons,
mail_studierende: this.mail_studierende,
}
},
data: () => ({ data: () => ({
sections: [], sections: [],
widgets: null widgets: null