Commit Graph

8915 Commits

Author SHA1 Message Date
Cris b776b52f0c Updated ampel_details css and js paths 2018-06-25 15:10:04 +02:00
Cris df04e43ad0 Added Sancho Mail cronjob (CI)
. jobs/AmpelMail.php: 
  -- generates ampel mails for new and for overdue mails
  -- this script is run by the cronjob

. sancho_helper.php: 
  -- generates and sends Sancho Mails with Sancho Design and Layout using Sancho-mail-templates

. Ampel_model.php: functions to retrieve correct ampeln

. Sancho pictures: 
  -- sancho_header_neue_nachrichten_in_ampelsystem: is set by default
  -- sancho_header_TEMPLATE.xcf: template to quickly reproduce new sancho header images (change the text and export as jpg)
2018-06-20 14:48:28 +02:00
Cris 3b4fcc801d Merge remote-tracking branch 'origin/master' 2018-06-20 09:25:36 +02:00
Paolo 9a33e44491 - Replaced "index.ci.php" with $this->config->item('index_page')
- Replaced base_url that contains "index.ci.php" with site_url
- Replaced APP_ROOT with base_url or site_url where needed
- InfoCenter controller added comments and improved the code
2018-06-19 16:34:23 +02:00
Cris f86a895765 Merge remote-tracking branch 'origin/master' 2018-06-18 09:05:47 +02:00
Andreas Österreicher 53098c011c Filter für Funktionen im FAS hinzugefügt 2018-06-15 15:08:05 +02:00
Andreas Österreicher cf0dedd15e Fehler behoben wodurch Abschlusspruefungen nicht korrekt angezeigt
wurden
2018-06-15 11:23:34 +02:00
Paolo 264ec9be9e InfoCenter: fixed relative URLs and HTTP GET parameters 2018-06-15 11:04:24 +02:00
Paolo bf4829f324 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2018-06-15 10:01:39 +02:00
Paolo 0f798faab5 - Removed navigation left menu entry for page system/infocenter/InfoCenter/showDetails from navigation config
- Changed URI of path from system/infocenter/InfoCenter/infocenterFreigegeben to system/infocenter/InfoCenter/freigegeben in navigation config
- Moved the logic from Navigation controller to NavigationLib
- Added private method _loadNavigationLib to Navigation controller to load the NavigationLib with parameters
- Navigation controller now extends FHC_Controller
- Added NavigationLib to collect all the logic used by the NavigationWidget components
- Remove the handle of the fhc_controller_id from the NavigationWidget.js
- NavigationWidget.js now uses better tools that came from the AjaxLib
- Adapted InfoCenter controller to work with the new tools from NavigationWidget
- infocenterPersonDataset.js->refreshSideMenu now uses the parameter navigation_page in the ajax call
- Renamed InfoCenter controller method from infocenterFreigegeben to freigegeben
- Now methods index, freigegeben and showDetails generates their own left menu
- showDetails generate a left menu based on the origin page (index or freigegeben)
- freigegeben uses its own filters now
- Added view infocenterFreigegebenData.php
2018-06-14 18:36:21 +02:00
Andreas Österreicher 5b4d882bdb - PHP Notice behoben bei Studiengängen ohne Leerzeichen
- PHP Notice behoben bei Prüfern ohne geschlecht
2018-06-14 18:22:34 +02:00
Paolo 8837083f10 - Added helper session_helper to add utility functions to manage the php session
- Adapted the library FiltersLib to use the session_helper
2018-06-14 16:59:14 +02:00
Cris 2d123bb3df Merge remote-tracking branch 'origin/master' 2018-06-14 09:31:42 +02:00
Andreas Österreicher fbcefcbd51 Schnittstelle zum Datenverbund für Abfrage und Vergabe von Matrikelnummern
inkl. Testclient für manuelle Abfrage der Daten
2018-06-13 18:40:07 +02:00
Paolo 2cbda912e3 - FiltersLib bugfix: now method generateDatasetQuery always build a query with no filters (no where clause) if the filters array is empty
- Added comments to Filters_model methods
- Removed method deleteCustomFilter from Filters_model
- Method getFilterList changed to load all the filters, removed default_filter = false from the where clause
2018-06-13 16:50:39 +02:00
Paolo 34296a436e Changed the menu entry for the left menu from "Züruck" to "Home" for the page system/infocenter/InfoCenter/infocenterFreigegeben 2018-06-13 16:45:36 +02:00
Paolo fda0db329e Database update uses a different file for filters
- Added system/filtersupdate.php to collect all the filters and to perform an insert or an update in the database
- Removed filters from system/dbupdate_3.3.php
- Updated system/checksystem.php to call system/filtersupdate.php
2018-06-13 16:41:08 +02:00
Cris 11f54d1e5f Merge remote-tracking branch 'origin/master' 2018-06-13 09:24:14 +02:00
Manfred Kindl a3401922bf Merge remote-tracking branch 'origin/master' 2018-06-12 18:05:08 +02:00
Manfred Kindl e0bf5a084f Bakkurkunde und Diplomurkunde archivierbar 2018-06-12 18:04:37 +02:00
Cris dd8452958b Changed Sancho Mail Layout & Design
. added new and adapted header- and footer images from corporate graphic designer
. adapted chronjob script to display new layout for different devices and eMail clients
2018-06-12 14:58:09 +02:00
Gerald Raab 61dcf61e9e exclude Abgewiesene ohne Status bestätigt beim INteressenten, damit noch nicht
abgeschickte Bewerbungen wieder in Liste sind
2018-06-12 11:47:48 +02:00
Andreas Österreicher eaa454b063 Prüfungsverwaltung aktualisiert
- Einrückungen korrigiert
- Anpassungen an aktuelle JQuery/JQueryUI Version
- Anpassungen an neuen Tablesorter
- GUI Fehler bei der Anzeige von Prüfungen behoben
- Fehler behoben beim Bewerten von Lehrveranstaltungen mit Hochkomma im
Namen
- Index mit Links zu den einzelnen Modulen erstellt
2018-06-11 18:35:55 +02:00
Paolo db7d508d12 Cleaned code in getPhrasesByCategoryAndPhrasesAndLanguage 2018-06-11 13:47:03 +02:00
Paolo 3bc9062515 Fixed query in method getPhrasesByCategoryAndPhrasesAndLanguage of model Phrase_model 2018-06-11 13:44:18 +02:00
Paolo 936cca98e6 Removed backup files 2018-06-08 15:28:29 +02:00
Paolo 8b312dcaf2 Merge branch 'master' into FilterWidget 2018-06-08 15:25:27 +02:00
Paolo 7d836a0147 - Added FiltersLib to contain all the shared logic of a FilterWidget
- Adapted Filters controller and FilterWidget to use this new lib
- Better memory usage in FilterWidget
- PhrasesLib now checks if categories is an empty array, it it is then avoid to call the method to load phrases (avoids an ugly error)
- Renamed the class FHC_PhraseLib to FHC_PhrasesLib (like the filename)
2018-06-08 15:17:38 +02:00
Paolo d6578277c2 FilterWidget: extended the functionality of the default_filter flag
If only the "app" and "dataset_name" parameters are given, at the first loading of the FilterWidget:
1. Try to load the custom filter (person_id = logged user person_id) with the given "app" and "dataset_name" that is set as default filter (default_filter = true)
2. Try to load the global filter (person_id = null) with the given "app" and "dataset_name" that is set as default filter (default_filter = true)
3. Do not load anything to avoid to retrive too many data from DB
2018-06-08 15:17:28 +02:00
Andreas Österreicher 3c863a448a Problem behoben wodurch Projektbetreuer nicht angelegt werden konnten
wenn kein Vorname eingetragen ist
2018-06-08 09:51:05 +02:00
Paolo 99095920ed Fixed FHC-Header parameters includes in InfoCenter views 2018-06-07 10:11:26 +02:00
Andreas Österreicher c00f6d2675 Fixed Pruefungsanmeldung 2018-06-07 07:58:30 +02:00
Paolo dbd25d98bd FilterWidget: fixes and improvements 2018-06-06 17:50:28 +02:00
alex 5f2b02c441 - persondatasetjs works with ajaxlib
- added js object to persondatasetjs
- no locking when details accessed from freigegeben
- tablesorter filter remains when getting back from details page
2018-06-06 15:54:39 +02:00
Cris 96be91f78e Merge branch 'phrases' 2018-06-06 15:14:33 +02:00
Cris 7facb7ab78 Improved PhrasesLib and Phrase_model
. optimized code in PhrasesLib.php
. secured method in Phrase_model with bindings
2018-06-06 15:12:42 +02:00
Paolo 894dc51e13 Enhancements 2018-06-06 14:53:24 +02:00
Paolo 20b824b816 Changes to the FilterWidget IV 2018-06-06 13:45:33 +02:00
Paolo d63a092287 Changes to the FilterWidget III 2018-06-06 11:46:26 +02:00
Cris efebfddd58 Added fallback to default language for phrases
. added fallback to default language in PhrasesLib.php
. fixed small issues concerning right translation in PhrasesLib.php
. all other files: adding translation for Infocenter overview + details page (client- and serverside)
2018-06-06 10:00:17 +02:00
Manfred Kindl b9a1ad6b6c Mehrfach-Export von Archivdokumenten
- Nach Rechtsklick auf Studierenden gibt es die Auswahl "Archivdokument exportieren"
- Derzeit nur für Bescheid
- Mehrfachmarkierung von Studierenden möglich
2018-06-05 17:37:05 +02:00
Manfred Kindl 2b8782afe8 Funktion getAkten mit neuen Parametern $returnInhalt und $order
- Wenn $returnInhalt true ist, wird auch der Inhalt der Akte geladen. Default false
- $order: Sortierreihenfolge der Spalten im SQL
2018-06-05 17:31:07 +02:00
Manfred Kindl 9a6a420cb1 Bescheid Tabelle statt Spalten im oberen Teil 2018-06-05 17:28:56 +02:00
Paolo 20bffadbc4 Changes to the FilterWidget II 2018-06-04 17:23:40 +02:00
Manfred Kindl 850aa2820e Merge remote-tracking branch 'origin/master' 2018-06-04 15:19:21 +02:00
Manfred Kindl 9ae236a8e1 FAS Bescheid Englisch entfernt
Bescheid gibt es nur Zweisprachig
2018-06-04 15:17:15 +02:00
Manfred Kindl 855be4abe5 Zeitaufzeichnung Anpassung Link ins Moodle 2018-06-04 15:15:43 +02:00
Paolo 0a71bce547 Changes to the FilterWidget 2018-05-29 18:05:22 +02:00
alex dc580c9526 controllerid is also passed when freigegeben or abgesagt (important to keep filter!) 2018-05-29 17:44:58 +02:00
Paolo 7c5995c318 Code and comments improved 2018-05-29 15:57:10 +02:00