blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-06 21:39:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,618 Commits 230 Branches 6 Tags
8a417e5cb8fb0c5b37cfb136dd6deea6d53befd7
Commit Graph

112 Commits

Author SHA1 Message Date
ma0048 8fa40a843b Merge branch 'feature-11001/zgv_ueberpruefung' into feature-13277/anpassung_infocenter 
# Conflicts:
#	application/controllers/system/infocenter/InfoCenter.php
#	application/views/system/infocenter/dokpruefung.php
#	application/views/system/infocenter/infocenterData.php
#	application/views/system/infocenter/infocenterFreigegebenData.php
#	application/views/system/infocenter/infocenterReihungstestAbsolviertData.php
 2021-06-16 09:26:03 +02:00
Andreas Österreicher 170b2485d3 Merge branch 'feature-10965/beurteilungsformular_pdf_export' into feature-10963/Beurteilungsformular_datenbankanpassungen 2021-04-06 18:06:30 +02:00
ma0048 42d2f45561 bei den anmerkungen studiengang hinzugefuegt 2021-04-06 13:51:27 +02:00
KarpAlex 9677a5a4fd - BenutzerModel: added comment for getFromPersonId method 
- UPDATE permission for web for tbl_projektbetreuer added
- added phrase for Zweitbegutachter - link
 2021-03-01 09:33:14 +01:00
Cris 00799f2f64 Adapted: Ordered Notizen to retrieve last inserted first 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-02-08 17:35:34 +01:00
Cris 5235915d6a Changed method getNotizByAnrechnung() -> added param titel 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-02-03 10:57:27 +01:00
Cris 8fc338ccb4 Added GUI/functionality to add begruendung for 'NICHT EMPFEHLEN' in lectors overview 
. Begruendung is added as Notiz
. GUI to attach begruendung will slide down the moment 'Nicht Empfehlen'
is clicked
. added phrases

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-02-02 14:06:49 +01:00
Cris 8a75bc9fdd Added method getFullName() to Person_model 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-01-26 18:54:42 +01:00
Cris f185c92db7 Created Anrechnungen Students GUI, Controller, DB-tables, library, phrases 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-01-19 13:03:26 +01:00
Andreas Österreicher 119d5d99df Fixed Query to get User for Messages by PersonID and OrganisationUnit 2020-11-23 16:18:43 +01:00
Paolo 443caa91f2 Messaging sysntem: the internal email account is used only if the user 
account is older then 24 hours
 2020-11-09 10:45:25 +01:00
alex a7d577baa5 person/Kontakt_model: added getZustellKontakt method for getting latest Zustellkontakt 2020-10-22 00:38:52 +02:00
alex 676b3b3039 - added sanitizeProblemChars to common helper for sanitizing chars 
- improved alias handling in benutzermodel
- added kurzbz handling to employeemodel
 2020-08-12 21:33:08 +02:00
Andreas Österreicher bc305dc86c Merge branch 'master' into feature-6656/Worker_queue 2020-08-10 18:11:31 +02:00
Cris 93ecc89ebe Added method getPhones_byPerson to Kontakt model. 
Gets all latest phones of person where zustellung is true. Ordered by
telefon > mobil > firmenhandy > else.

Signed-off-by: Cris <hainberg@technikum-wien.at>
 2020-08-06 10:32:45 +02:00
Cris 188319a1fc Adapted method getZustellAdresse of Adresse Model 
Added param select.

Signed-off-by: Cris <hainberg@technikum-wien.at>
 2020-08-05 18:38:27 +02:00
Cris 2b0ff28c41 Added getAll_byPersonID in Kontakt Model 
Get all latest contact data of person, where Zustellung is true.

Signed-off-by: Cris <hainberg@technikum-wien.at>
 2020-08-05 18:20:11 +02:00
alex 88e25524b3 person/Benutzerfunktion_model.php getBenutzerFunktionByUid method: added organisationseinheit_bezeichnung to Benutzerfunktionen, added sorting order (datumbis, datumvon) 2020-07-22 00:48:45 +02:00
alex 5b264bb6a9 codex/Bisverwendung_model: 
- added getVerwendungen method
person/Benutzer_model
- added comment
person/Benutzerfunktion_model
- added getBenutzerFunktionByUid method
ressource/Mitarbeiter_model
- added getVorgesetzte method
- extended getPersonal method
 2020-06-22 11:20:27 +02:00
alex 7ce489e847 - added iso3166_1_a3 field to bis.tbl_nation 
- person/kontakt_model: renamed getFirmenTelefon to getFirmentelefon, separated vorwahl from telefonklappe
 2020-06-10 10:11:19 +02:00
Alexei 704d39095b - ressource/Mitarbeiter_model.php - improved getPersonal method 
- person/Kontakt_model.php - added getFormaKontakttyp and get FirmenTelefon methods
 2020-05-12 19:34:17 +02:00
Alexei e8648e52ec person/Benutzer_model.php: generated alias string is sanitized (special characters, spaces,...) 2020-05-04 20:21:57 +02:00
Alexei 554fb2586a person/Benutzer_model: 
- added methods for generating alias and checking if alias exists
ressource/Mitarbeiter_model:
- added method getPersonal
 2020-04-30 21:42:30 +02:00
Andreas Österreicher 331c90b64b Merge branch 'feature-6079/Infocenter_Freigabe_nach_RT_Anmeldung' 2020-03-02 16:03:28 +01:00
Paolo 34b6581849 - Renamed BenutzerfunktionModel->getByPersonId to getActiveFunctionsByPersonId 
- BenutzerfunktionModel->getActiveFunctionsByPersonId changed query to get only active functions
- Removed commented code
 2020-02-26 17:22:59 +01:00
Paolo 11f3fad1f7 Changed logic to send notice email to a message recipient 2020-02-14 19:17:09 +01:00
alex b41ef00b3d crm/Prestudent_model: hasBewerber can optionally check bewerber only for a Studiengangtyp. In InfoCenter, only Bachelors are checked after Freigabe (for setting Bewerber and Reihungstestbooleans) 2020-02-11 16:42:04 +01:00
alex 7fdaaace50 If Prestudent is freigegeben for RT and has already a Bewerber with reihungstestangetreten = true, a new Bewerber for the prestudent is created, reihungstestangetreten and teilgenommen are set to true 2020-02-07 17:46:29 +01:00
Andreas Österreicher 16f6bdbf70 Merge branch 'feature-5128/FHC-IDAM_account_activation' 2020-02-03 14:53:24 +01:00
Paolo 4e6fc7c607 - Create new function getError in helper hlp_return_object_helper that should just returns retval 
- Replace all show_error(getData( with show_error(getError(
- Replace all error($...->retval) with error(getError($...))
- Replace all ->outputJsonError(getData( with ->outputJsonError(getError(
- Replace all show_error($...->retval with show_error(getError($...
- Replace all outputJsonError($...->retval with outputJsonError(getError$...
- Replace all return error($...->retval) with return $...
 2019-12-18 18:35:19 +01:00
Cris 586c626ff0 Fixed: Corrected incorrect SQL query in Benutzerfunktion_model 
Incorrect bracket was causing error message. This is fixed now.
 2019-11-25 09:35:42 +01:00
Paolo ceb3f212c9 - Added support for language in session in function getUserLanguage from helper hlp_language_helper 
- If the language is loaded from database then it is checked that the language is enabled
 2019-11-22 12:05:07 +01:00
Paolo 3e5e65bfc4 Merge branch 'feature-4026/TabulatorWidget' into feature-3994/Digitaler_Lehrauftrag 2019-11-04 16:58:19 +01:00
Cris edd7f56481 Corrected query: load uids only from *active* benutzer 2019-09-12 13:57:02 +02:00
alex 5255e6166d crm/Prestudent_model, education/Lehrveransaltung_mode, person/Person_model: models are loaded in constructor to avoid multiple load 2019-09-06 15:49:47 +02:00
Cris a81098f884 Added method getSTGLByUID(uid) to Benutzerfunktion_model 
The method getSTGLByUID(uid) gets information of all STG of which a given
user is in charge of as a study course manager.
 2019-08-01 15:38:33 +02:00
Paolo 3b4012798f Fixed some comments typo 2019-04-30 13:13:34 +02:00
Manfred Kindl 0439c19cb1 Infocenter Notices "Anmerkung zur Bewerbung" 
When there is an extra content after "Anmerkung zur Bewerbung" e.g. "Anmerkung zur Bewerbung (BWI)" the notice is also displayed on top
 2019-04-16 16:44:55 +02:00
alex 68dd0f3cb8 - added method getLesForLv to education/Lehreinheit_model 
- added methods direktUserAdd, direktuserDelete (for direkt User Zuordnung to le) to education/Lehreinheitgruppe_model
- added method getLvsByStudent to education/Lehrveranstaltung_model
- Added hasSequence = false to Benutzergruppe_model
- fixed typo in lehrveranstaltungDBML
 2019-03-06 19:03:02 +01:00
alex 89849d30fb - added hasSequence in models to avoid sequenceerrors 
- added getByDate, generateMatrikelnummer methods
 2019-01-11 18:39:48 +01:00
alex 835fe48442 - freigabemessage to bewerber only sent once each freigabe per semester (bachelor only) 
- moved RTfreigabe button to right and made bigger
- new Vorlagen for Messages
- Message also sent for Studiengangfreigabe
 2018-12-10 11:45:12 +01:00
alex a28df53718 Infocenter changes 
- new button for Freigabe zum Reihungstest, sending message to bewerber when freigabe
- button Freigabe for Studiengang with Statusgrund
- Ausbildungssemester can be saved
- Using Vorlagen for Freigabe Mail to assistance and message to bewerber
- Added Nation of address at details page
- Scroll to top button on details page
- moved messageList js to own file
 2018-11-30 16:48:28 +01:00
Andreas Österreicher 6a26609aef Datenverbund 
- Added new Page to Manage missing bPK
- Improved Error Handling on DVB Class
 2018-11-20 17:36:24 +01:00
alex f907cd7292 - Benutzerfunktionen can be retrieved recursively by oe (oe and all oes below) 2018-09-28 17:03:26 +02:00
alex 0916a27ecb - replaced spaces by hyphens in lv group names 
- updated comment for getBenutzerFunktionen
 2018-09-13 09:55:06 +02:00
alex 1a675a9939 renamed and improved method for getting benutzerfunktionen 2018-08-27 18:25:12 +02:00
alex 5e00044b56 added function for retrieving Benutzerfunktionen by oe and Funktion 2018-08-24 17:57:07 +02:00
Paolo 46e85a2317 Merge branch 'master' into permissions 2018-06-28 14:52:09 +02:00
Paolo 25e66bf9dd - Added function isEmptyString to fhc_helper 
- Added function isEmptyArray to fhc_helper
- Adapted the code in application/* to use as much as possible this two new functions
- Removed the php function empty almost everywhere
 2018-06-27 15:06:04 +02:00
Paolo 9d5c9b443e Merge branch 'master' into permissions 2018-04-18 17:35:33 +02:00