diff --git a/application/controllers/Vilesci.php b/application/controllers/Vilesci.php index fed0f077b..abfad4dd1 100644 --- a/application/controllers/Vilesci.php +++ b/application/controllers/Vilesci.php @@ -1,9 +1,16 @@ -load->library('WidgetLib'); + } + /** * Index Page for this controller. * @@ -22,8 +29,6 @@ class Vilesci extends FHC_Controller */ public function index() { - $this->load->view('templates/header'); - $this->load->view('vilesci_frameset'); - $this->load->view('templates/footer'); + $this->load->view('home'); } } diff --git a/application/controllers/system/infocenter/InfoCenter.php b/application/controllers/system/infocenter/InfoCenter.php index 1d0b25b3f..4f4cefd79 100644 --- a/application/controllers/system/infocenter/InfoCenter.php +++ b/application/controllers/system/infocenter/InfoCenter.php @@ -70,6 +70,10 @@ class InfoCenter extends VileSci_Controller $this->_setAuthUID(); // sets property uid + $this->load->library('PermissionLib'); + if(!$this->permissionlib->isBerechtigt('basis/person')) + show_error('You have no Permission! You need Infocenter Role'); + $this->_setNavigationMenuArray(); // sets property navigationMenuArray $this->navigationHeaderArray = array( diff --git a/application/views/home.php b/application/views/home.php new file mode 100644 index 000000000..5e7deddb0 --- /dev/null +++ b/application/views/home.php @@ -0,0 +1,158 @@ +load->view('templates/FHC-Header', + array( + 'title' => 'FH-Complete', + 'jquery' => true, + 'bootstrap' => true, + 'fontawesome' => true, + 'sbadmintemplate' => true + ) +); +?> + +
+ 'FH-Complete', 'headertextlink' => base_url('index.ci.php/')); + $navigationMenuArray = array( + 'Dashboard' => array('link' => '#', 'description' => 'Dashboard', 'icon' => 'dashboard'), + 'Lehre' => array('link' => '#', 'icon' => 'graduation-cap', 'description' => 'Lehre', 'expand' => true, + 'children'=> array( + 'CIS' => array('link' => CIS_ROOT, 'icon' => '', 'description' => 'CIS', 'expand' => true), + 'Infocenter' => array('link' => base_url('index.ci.php/system/infocenter/InfoCenter'), 'icon' => 'info', 'description' => 'Infocenter', 'expand' => true), + ) + ), + 'Administration' => array('link' => '#', 'icon' => 'gear', 'description' => 'Administration', 'expand' => false, + 'children'=> array( + 'Vilesci' => array('link' => base_url('vilesci/'), 'icon' => '', 'description' => 'Vilesci', 'expand' => true), + 'Extensions' => array('link' => base_url('index.ci.php/system/extensions/Manager'), 'icon' => 'cubes', 'description' => 'Extensions Manager', 'expand' => true), + 'Datenschutz' => array('link' => base_url('index.ci.php/extensions/FHC-Core-DSMS/export'), 'description' => 'Datenschutz', 'icon' => 'legal','expand' => true) + ) + ), + ); + + echo $this->widgetlib->widget( + 'NavigationWidget', + array( + 'navigationHeader' => $navigationHeaderArray, + 'navigationMenu' => $navigationMenuArray + ) + ); + + ?> +
+
+
+
+

FH-Complete

+
+
+
+
+
+
+
+
+ +
+
+
26
+
neue Messages
+
+
+
+ +
+ View Details + +
+
+ +
+
+
+
+
+
+
+ +
+
+
12
+
neue Interessenten
+
+
+
+ +
+ View Details + +
+
+ +
+
+
+
+
+
+
+ +
+
+
124
+
inaktive Interessenten
+
+
+
+ +
+ View Details + +
+
+ +
+
+
+
+
+
+
+ +
+
+
13
+
Support Tickets!
+
+
+
+ +
+ View Details + +
+
+ +
+
+
+ + + + load->view('system/infocenter/infocenterData.php'); + ?> + +
+
+
+ + +load->view('templates/FHC-Footer'); ?> diff --git a/application/views/vilesci_frameset.php b/application/views/vilesci_frameset.php deleted file mode 100644 index cd193d90e..000000000 --- a/application/views/vilesci_frameset.php +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - <body bgcolor="#FFFFFF"> - This application works only with a frames-enabled browser.<br /> - <a href="<?php echo base_url('vilesci/main.php')?>">Use without frames</a> - </body> - - diff --git a/application/widgets/FilterWidget.php b/application/widgets/FilterWidget.php index ab6d9ba6b..bfd59e894 100644 --- a/application/widgets/FilterWidget.php +++ b/application/widgets/FilterWidget.php @@ -1051,7 +1051,7 @@ class FilterWidget extends Widget && ($activeFiltersOption[$field] == self::OPT_DAYS || $activeFiltersOption[$field] == self::OPT_MONTHS)) { - $condition = ' > (NOW() - \''.$activeFilterValue.' '.$activeFiltersOption[$field].'\'::interval)'; + $condition = ' < (NOW() - \''.$activeFilterValue.' '.$activeFiltersOption[$field].'\'::interval)'; } else { @@ -1065,7 +1065,7 @@ class FilterWidget extends Widget && ($activeFiltersOption[$field] == self::OPT_DAYS || $activeFiltersOption[$field] == self::OPT_MONTHS)) { - $condition = ' < (NOW() - \''.$activeFilterValue.' '.$activeFiltersOption[$field].'\'::interval)'; + $condition = ' > (NOW() - \''.$activeFilterValue.' '.$activeFiltersOption[$field].'\'::interval)'; } else { diff --git a/cis/public/incoming/incoming.php b/cis/public/incoming/incoming.php index fa7748433..9625d9455 100644 --- a/cis/public/incoming/incoming.php +++ b/cis/public/incoming/incoming.php @@ -2123,8 +2123,6 @@ else if($method == 'files') } echo ''; } - else - echo 'foo'; } else if($method == 'ende') { diff --git a/content/fas.xul.php b/content/fas.xul.php index fd1eb09e9..c20256059 100644 --- a/content/fas.xul.php +++ b/content/fas.xul.php @@ -147,6 +147,8 @@ foreach($addon_obj->result as $addon) + + @@ -673,6 +675,18 @@ foreach($addon_obj->result as $addon) + + vorlage_kurzbz.'.pdf'; exec("unoconv -e IsSkipEmptyPages=false --stdout -f pdf $tempname_zip > $tempPdfName"); } - $file = $tempfolder.'/'.$tempPdfName; + $file = $tempfolder.'/'.$tempPdfName; } else { if(PDF_CREATE_FUNCTION=='FOP') { $fop = new fop(); - $file = $fop->generatePdf($xml_doc->saveXML(), $xsl_content, $filename, "F"); + $file = $fop->generatePdf($xml_doc->saveXML(), $xsl_content, $filename, "F"); } else { @@ -769,7 +769,7 @@ else echo('Failed to generate PDF'); } $tmp = sys_get_temp_dir(); - $file = $tmp."/FHC".$filename.".pdf"; + $file = $tmp."/FHC".$filename.".pdf"; } } diff --git a/content/student/studentabschlusspruefung.js.php b/content/student/studentabschlusspruefung.js.php index 17500d53a..481b1603f 100644 --- a/content/student/studentabschlusspruefung.js.php +++ b/content/student/studentabschlusspruefung.js.php @@ -890,6 +890,83 @@ function StudentAbschlusspruefungPrintPruefungszeugnis(event) window.open('/content/pdfExport.php?xml=abschlusspruefung.rdf.php&xsl='+xsl+'&abschlusspruefung_id='+abschlusspruefung_id+'&output='+output,'PruefungsZeugnis', 'height=200,width=350,left=0,top=0,hotkeys=0,resizable=yes,status=no,scrollbars=yes,toolbar=no,location=no,menubar=no,dependent=yes'); } +// **** +// * Druckt den Bescheid fuer eine Abschlusspruefung fuer mehrere Studenten auf einmal aus. +// * wenn mehrere Abschlusspruefungen angelegt sind, dann wird fuer jede Abschlusspruefung +// * ein Bescheid gedruckt. +// * Den Typ (Bakk/Dipl) der Urkunde bestimmt der zuletzt markierte Student. +// **** +function StudentAbschlusspruefungPrintBescheidMultiple(event, sprache) +{ + netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect"); + var tree = document.getElementById('student-abschlusspruefung-tree'); + + //Typ der ersten Abschlusspruefung des zuletzt markierten Studenten (der von dem die Daten geladen wurden) holen + try + { + var pruefungstyp_kurzbz = getTreeCellText(tree,"student-abschlusspruefung-treecol-pruefungstyp_kurzbz", 0); + } + catch(e) + { + alert('Der zuletzt markierte Student hat keine Abschlusspruefungen'); + return false; + } + + if(pruefungstyp_kurzbz=='') + { + alert('Der zuletzt markierte Student hat keine Abschlusspruefungen'); + return false; + } + + if(pruefungstyp_kurzbz=='Bachelor' && sprache=='deutsch') + xsl='Bescheid'; + else if(pruefungstyp_kurzbz=='Bachelor' && sprache=='englisch') + xsl='BescheidEng'; + else if(pruefungstyp_kurzbz=='Diplom' && sprache=='deutsch') + xsl='Bescheid'; + else if(pruefungstyp_kurzbz=='Diplom' && sprache=='englisch') + xsl='BescheidEng'; + + var tree = document.getElementById('student-tree'); + + if (tree.currentIndex==-1) + return; + + //Uids aller markierten Studenten holen + var start = new Object(); + var end = new Object(); + var numRanges = tree.view.selection.getRangeCount(); + var paramList= ''; + var anzahl=0; + var uids=''; + var stg_kz=0; + for (var t = 0; t < numRanges; t++) + { + tree.view.selection.getRangeAt(t,start,end); + for (var v = start.value; v <= end.value; v++) + { + uid = ';'+getTreeCellText(tree,"student-treecol-uid", v); + uids = uids + uid; + stg_kz=getTreeCellText(tree,"student-treecol-studiengang_kz", v); + anzahl++; + } + } + + if (event.shiftKey) + { + var output='odt'; + } + else if (event.ctrlKey) + { + var output='doc'; + } + else + { + var output='pdf'; + } + + window.open('/content/pdfExport.php?xml=abschlusspruefung.rdf.php&xsl_stg_kz='+stg_kz+'&xsl='+xsl+'&uid='+uids+'&output='+output,'Pruefungsprotokoll', 'height=200,width=350,left=0,top=0,hotkeys=0,resizable=yes,status=no,scrollbars=yes,toolbar=no,location=no,menubar=no,dependent=yes'); +} // **** // * Druckt die Urkunde fuer eine Abschlusspruefung fuer mehrere Studenten auf einmal aus. // * wenn mehrere Abschlusspruefungen angelegt sind, dann wird fuer jede Abschlusspruefung diff --git a/content/student/studentoverlay.js.php b/content/student/studentoverlay.js.php index ea7985dc1..db4d42c90 100644 --- a/content/student/studentoverlay.js.php +++ b/content/student/studentoverlay.js.php @@ -3043,6 +3043,60 @@ function StudentZeugnisArchivieren(lang) StudentAkteTreeDatasource.Refresh(false); } +// * Startet das Script zum Archivieren des Bescheids und +// * Refresht dann den Tree +// **** +function StudentBescheidArchivieren(lang) +{ + lang = lang || 'ger'; + + netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect"); + var tree = document.getElementById('student-tree'); + + if (tree.currentIndex==-1) + { + alert('Student muss ausgewaehlt sein'); + return; + } + + var tree=document.getElementById('student-tree'); + var numRanges = tree.view.selection.getRangeCount(); + var start = new Object(); + var end = new Object(); + var anzfault=0; + var uid=''; + var errormsg = ''; + var stsem = getStudiensemester(); + + //Bescheid fuer alle markierten Studenten archivieren + for (var t=0; t';