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

Commit Graph

  • 1113b833bd Zeitsperre Fixed CSS Andreas Oesterreicher 2021-03-22 15:41:17 +01:00
  • 9bf8d58ab2 impiment different text OliiverHacker 2021-03-22 14:46:56 +01:00
  • 711bac0f6c Merge branch 'master' of https://github.com/FH-Complete/FHC-Core into 9503/csvExportProjektÜbersicht OliiverHacker 2021-03-22 14:44:52 +01:00
  • 00656efaef Changed filename on download to 'Anrechnungsantrag_OrgForm_LVID_VornameNachname' Cris 2021-03-22 12:12:04 +01:00
  • 050eef120c Adapted download function in DMSLib to accept params filename and disposition . Filename: uses given string as filename. Otherwise upload filename is used. . Disposition: inline (open in new tab), attached (download dialog box) Cris 2021-03-22 12:08:57 +01:00
  • fbb7b45b69 - added zweitbegutachterFehltWarnung phrase KarpAlex 2021-03-22 04:55:46 +01:00
  • 2c9ca77500 Fixed code indentation, standart output, includes path, removed unused variables and added a check to mail send where missing Paolo 2021-03-18 19:14:56 +01:00
  • 4c0c6aa6cd bugfix reload projekt OliiverHacker 2021-03-18 12:04:28 +01:00
  • 983ff1b16e Merge remote-tracking branch 'origin/feature/Anrechnungen_NEU' into feature/Anrechnungen_NEU cris-technikum 2021-03-18 11:43:42 +01:00
  • 41e8b4094e Merge branch 'feature-11970/AnrechnungJob_MailToSTGL' into feature/Anrechnungen_NEU cris-technikum 2021-03-18 10:58:57 +01:00
  • 9b396eea4e Added columns Organisationsform and Ausbildungssemester to STGL Overview table Cris 2021-03-18 10:57:49 +01:00
  • d345cbb43b Added 'Zurücknehmen'-button for recommendation in STGL Detail View Cris 2021-03-18 10:55:58 +01:00
  • 7340564d1e Added job to send mail to STGL with yesterdays new Anrechnungen Cris 2021-03-16 17:42:46 +01:00
  • 95c5a9c475 added UNIQUE constraing to zugangstoken column of lehre.tbl_projektbetreuer KarpAlex 2021-03-15 23:48:00 +01:00
  • ee7d51d2b3 Pruefung_model.php: method for retrieving Prüfung by person and studiensemester KarpAlex 2021-03-15 23:27:28 +01:00
  • 2ef2a906c3 - Projektarbeitsbenotung (abgabe_lektor_details.php): benoten button only shown when semester > SS2021 - updated phrases for text showing if older semester KarpAlex 2021-03-12 09:46:27 +01:00
  • 73525c94ab uid of student instead of logged in user is passed to sancho infomail KarpAlex 2021-03-11 12:42:18 +01:00
  • 3db9b9abee added projektbeurteilung pdfexport ma0048 2021-03-09 14:13:55 +01:00
  • e33eb2e9a9 Zeitraumabfragen für Projektphasen korrigiert Andreas Österreicher 2021-03-09 13:23:56 +01:00
  • fb7835de57 added new zeitwuensche permission ma0048 2021-03-08 12:53:59 +01:00
  • 5f187b5293 Merge branch 'master' into feature-10450/DVUH_requestMatrikelnummer KarpAlex 2021-03-07 21:44:56 +01:00
  • 5da754c9db Anmerkung bei Lehreinheitmitarbeiter verschoben Andreas Österreicher 2021-03-04 07:59:38 +01:00
  • 5b546d25a8 - abgabe_student_details.php: added reply to and other header/footer to sancho Endupload mails - sancho.inc.php: enabled reply-to and passing of footer image KarpAlex 2021-03-04 00:04:47 +01:00
  • 6bb9c77ca1 abgabe_student_details.php: Mail to Erst- and Zweitbegutachter is a sancho mail KarpAlex 2021-03-03 10:43:37 +01:00
  • edf657fdb9 abgabe_student_details.php: Mail with link (and possibly token for second assessor) to project assessment is sent with final upload to first and second assessor. KarpAlex 2021-03-03 00:00:51 +01:00
  • 9ba6f3b538 Fixed HTML code appearing within mail message body Cris 2021-03-02 15:44:46 +01:00
  • 9cbcec7231 Fallback-Lösung für LV-Regel wenn im aktuellen Semester kein Status vorhanden ist Nikolaus Krondraf 2021-03-02 15:26:44 +01:00
  • 9677a5a4fd - BenutzerModel: added comment for getFromPersonId method - UPDATE permission for web for tbl_projektbetreuer added - added phrase for Zweitbegutachter - link KarpAlex 2021-03-01 09:33:14 +01:00
  • 8bd148f7e5 Hinweistext für Zahlungen angepasst Andreas Österreicher 2021-02-26 15:01:23 +01:00
  • 95c2e4bf9c fix true false OliiverHacker 2021-02-26 00:25:59 +01:00
  • 54286a7e6c Merge branch 'master' into 9503/csvExportProjektÜbersicht Andreas Österreicher 2021-02-25 15:49:52 +01:00
  • d9cbea680e Fixed Loading of AZG Relevant Checkbox in FAS Fixed missing Column Warning in DB Update Andreas Österreicher 2021-02-25 15:25:41 +01:00
  • 8086501d04 Merge branch 'master' into feature-10267/Zeiterfassung_Zeitaufzeichnungspflichtig Andreas Österreicher 2021-02-25 14:43:06 +01:00
  • 6f27fccc09 - Corrected Permissions for Anrechnungen - Removed Useless Sequence Andreas Österreicher 2021-02-23 17:55:41 +01:00
  • 616cfaaf41 Merge branch 'master' into feature/Anrechnungen_NEU cris-technikum 2021-02-23 14:21:47 +01:00
  • 83b1286e08 Added column Antragsdatum to STGL/Lector Overview Cris 2021-02-23 14:21:21 +01:00
  • 6446e424a9 Fixed: Now all buttons have a type (button / reset) Cris 2021-02-23 11:27:03 +01:00
  • 581a4c33a4 Merge branch 'feature-11690/SAPByD_User_Update_Request_Limit' Andreas Österreicher 2021-02-23 08:48:30 +01:00
  • cb4f22141d Merge branch 'feature-11142/Reihungstest_aufgenommene_bei_Neupriorisierung' Andreas Österreicher 2021-02-23 08:36:53 +01:00
  • 4ebd5a85bb Avoided click event bubbling for nested buttons Cris 2021-02-22 16:12:15 +01:00
  • cf5ee6afa3 Merge branch 'master' into feature/Anrechnungen_NEU cris-technikum 2021-02-22 16:05:50 +01:00
  • 4d041023a8 Problem beim Speichern der Lektorenzuordnung behoben wenn Semesterstunden leer sind Andreas Österreicher 2021-02-22 08:49:52 +01:00
  • f208fbcd4b Merge branch 'feature-11869/testtool_sprache_und_sprachwahl' Andreas Österreicher 2021-02-19 17:15:00 +01:00
  • d69083eba2 Fixed Typo in Demo Page Andreas Österreicher 2021-02-19 17:13:53 +01:00
  • b44853d536 Merge branch 'master' into feature-11869/testtool_sprache_und_sprachwahl Andreas Österreicher 2021-02-19 17:13:25 +01:00
  • ad9de97a8c Merge branch 'feature-10816/log_download_bescheid' Andreas Österreicher 2021-02-19 16:23:07 +01:00
  • 9a3addd79d Removed comments on 'if (! defined('BASEPATH')) exit('No direct script access allowed');' Cris 2021-02-18 14:59:11 +01:00
  • 2723e130f0 Fixed repeating grant privileges on tbl anrechnungstatus to web user Cris 2021-02-18 14:53:03 +01:00
  • 4b3cf019c3 Fixed flickering popup massage preventing approving AFTER withdrawing a rejection Cris 2021-02-18 13:56:15 +01:00
  • 6d3407c309 Reset deleted filter button in STGL overview (show recommended) Cris 2021-02-18 09:42:16 +01:00
  • ce2deb32e1 Deleted testuser Cris 2021-02-18 09:32:46 +01:00
  • eb95421ff9 ReihungstestJob.php: formatted sql KarpAlex 2021-02-18 04:26:54 +01:00
  • 20413b1b03 abgabetool: replaced link in CIS to redirect to new Beurteilungsformular KarpAlex 2021-02-18 01:53:57 +01:00
  • b5c9567c01 Merge remote-tracking branch 'origin/feature/Anrechnungen_NEU' into feature/Anrechnungen_NEU cris-technikum 2021-02-17 19:09:09 +01:00
  • abcf41f7a3 Added feature to withdraw approvals/rejections for STGL Cris 2021-02-17 18:54:53 +01:00
  • d9d71c42ce Added feature to withdraw approvals/rejections for STGL Cris 2021-02-17 18:54:53 +01:00
  • 577d0f1eb5 Fixed Filename Andreas Österreicher 2021-02-17 15:21:38 +01:00
  • 935b370166 added filter for bachelor and master ma0048 2021-02-17 15:07:09 +01:00
  • 0993b94507 Anrechnungen Tooltip korrigiert bei STGL Filter Andreas Österreicher 2021-02-17 11:44:35 +01:00
  • a02d581d0a Merge branch 'feature/Anrechnungen_NEU' Andreas Österreicher 2021-02-17 08:49:24 +01:00
  • 94d335600c - Added new protected method getOldestJob to JQW_Controller - Added new public method getOldestJob to JobsQueueLib Paolo 2021-02-16 21:21:11 +01:00
  • 734db4a2a8 Granted Web User for tbl_anrechnung_status; Added Sequence Anrechnung Status Cris 2021-02-16 18:22:00 +01:00
  • 241fb34b23 Added filter button to STGL Overview (filter: show all progressed by STGL) Cris 2021-02-16 18:04:27 +01:00
  • 1ca22970a9 Adapted: Show only applications that were requested for recommendation Cris 2021-02-16 17:37:14 +01:00
  • 86a065d0d6 Fixed: Now checking user by prestudent_id to entitle to read DMS document Cris 2021-02-16 16:31:42 +01:00
  • fec8fbb6d4 Anrechnungen - Mail Empfänger korrigiert bei Personen mit mehreren Accounts Andreas Österreicher 2021-02-16 09:46:50 +01:00
  • 3366f091dd Anrechnungen - Fixed Details Page for People with multiple Accounts Andreas Österreicher 2021-02-15 21:12:14 +01:00
  • 4d81f91840 Problem behoben wodurch falsche Anrechnungen geladen wurden Andreas Österreicher 2021-02-15 16:44:34 +01:00
  • 6522def7a2 Merge branch 'feature/Anrechnungen_NEU' Andreas Österreicher 2021-02-15 11:44:07 +01:00
  • acec92fa2b Adapted mail message for students (different text for approved/rejected) Cris 2021-02-15 11:26:59 +01:00
  • bf1686e253 display Holidays in Datepicker OliiverHacker 2021-02-15 11:11:54 +01:00
  • 38220ab772 Logeintrag beim Downloaden eines Bescheides ma0048 2021-02-15 08:11:37 +01:00
  • da4e913a38 ReihungstestJob.php: - studiensemester is passed as parameter - info mail is sent to lower priority when higher priority is cancelled (abgewiesen) - info mail is sent to master studiengänge as well if higher prio is cancelled/aufgenommen and there are other bachelor prestudenten in same semester KarpAlex 2021-02-13 00:37:33 +01:00
  • 2973c9e856 Merge branch 'feature/Anrechnungen_NEU' Andreas Österreicher 2021-02-12 16:14:59 +01:00
  • bff6307a62 Anrechnungen - Neuer Job zum Setzen der Anrechnungsnote hinzugefügt - Direktes setzen der Zeugnisnote bei Anrechnung entfernt Andreas Österreicher 2021-02-12 15:52:26 +01:00
  • d44c526ba4 Minor changes Cris 2021-02-11 16:37:44 +01:00
  • 6dea79180c Adapted tables' boolean headerfilter to be used with strings Cris 2021-02-11 16:06:20 +01:00
  • ea45ce9934 Sprache und Sprachwahl fixed, wenn kein Studienplan verfügbar ist. Ablauf_ID wird nun mitgeschickt ma0048 2021-02-11 11:57:45 +01:00
  • c23a3bdac9 Fixed button breaking line in smaller devices; now all buttons inline Cris 2021-02-11 11:52:57 +01:00
  • eaf902c528 Adapted tooltips for Students VIEW, minor change of phrase text Cris 2021-02-11 11:36:38 +01:00
  • 41f8a0e3b3 Merge remote-tracking branch 'origin/feature/Anrechnungen_NEU' into feature/Anrechnungen_NEU cris-technikum 2021-02-10 18:31:26 +01:00
  • c0843e9506 Translated STGL and Lectors VIEW to English Cris 2021-02-10 17:26:25 +01:00
  • 3cbb1b5c95 Translated STGL and Lectors VIEW to English Cris 2021-02-10 17:26:25 +01:00
  • c82ebaf678 Translated Students VIEW to English Cris 2021-02-09 16:31:32 +01:00
  • 81151025da Fixed non-existing phrases Cris 2021-02-09 14:54:32 +01:00
  • d1537df896 Fixed: Now Nachweisdokument- and Detail-Links clickable after table update Cris 2021-02-09 14:36:29 +01:00
  • 3eecd74b1f Merge branch 'master' into feature/Anrechnungen_NEU cris-technikum 2021-02-09 10:54:28 +01:00
  • 6e689ce657 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core cris-technikum 2021-02-09 10:53:41 +01:00
  • 8a3096edf1 Merge branch 'feature-11841/studiengang_dropdown' Andreas Österreicher 2021-02-09 08:06:51 +01:00
  • a39256d21d Merge branch 'feature-11575/anzahl_der_markierten_personen' Andreas Österreicher 2021-02-09 08:03:41 +01:00
  • 544def7f5a - Organisationseinheit Dropdown in zeitaufzeichnung is limited by funktionen, only dizipl. Zuordnung, standardkostenstelle Zuordnung and funktionale Zuordnungen are shown KarpAlex 2021-02-09 04:41:14 +01:00
  • c69188dffe Corrected typos in name that caused button not being disabled Cris 2021-02-08 18:25:27 +01:00
  • 17ae1b144c Corrected: Now correct text for confirmed positive recommendation Cris 2021-02-08 18:13:50 +01:00
  • 2a59d2464b Uncommented tooltips for genehmigung/empfehlung Cris 2021-02-08 18:07:40 +01:00
  • 77774e8cec Corrected STGL permission check to check against UID Cris 2021-02-08 18:01:06 +01:00
  • 00799f2f64 Adapted: Ordered Notizen to retrieve last inserted first Cris 2021-02-08 17:35:34 +01:00
  • 25400d8b5f Removed updateamum/updatevon when updating Anrechnungmodel Cris 2021-02-08 17:25:34 +01:00
  • 494cf1f688 Changed style & flow of approve/reject/recommend/dont recommend Cris 2021-02-08 17:19:58 +01:00
  • 8c666ceef2 Studiengang Dropdown angepasst ma0048 2021-02-08 17:09:34 +01:00
  • d84da96669 display Feiertage and Wochenenden OliiverHacker 2021-02-08 09:57:08 +01:00