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

Commit Graph

  • 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
  • fd79551f00 - Pruefungsprotokoll bugfix: replaced bitwise and with logical and KarpAlex 2021-02-04 20:37:05 +01:00
  • 253ffa7e93 Hinweistext bei Zahlungen hinzugefügt Andreas Österreicher 2021-02-04 17:53:57 +01:00
  • be5ff3f122 Changed CIS menu title and icon for Anrechnung Cris 2021-02-04 17:11:36 +01:00
  • c8ceacc972 Added checks if user is entitled to read DMS document / Anrechnung Cris 2021-02-04 17:05:05 +01:00
  • 071a6a4ee6 Added tooltips (Upload info, Read Infoboxen-info) Cris 2021-02-04 15:42:26 +01:00
  • 4a8fa95a3a Changed: Now infobox color is blue and icons are info-icons Cris 2021-02-04 15:36:12 +01:00
  • 1f88bfae40 - Projektbetreuer Model: added getBetreuerByToken method - phrasesupdate: added new Projektarbeitsbeurtielung phrases KarpAlex 2021-02-04 11:21:40 +01:00
  • cfc3b4f985 Corrected: Added space to be able to disable textarea Cris 2021-02-04 11:04:20 +01:00
  • e6da4b2e2d Minor changes Cris 2021-02-04 10:25:57 +01:00
  • e9664c179a Added Genehmigungs GUI + Begreundungsnotiz for rejected Anrechnungen in STGL VIEWS Cris 2021-02-04 10:24:08 +01:00
  • 52450561fd Added method getApprovedOrRejected() to Anrechnung Model Cris 2021-02-04 10:20:10 +01:00
  • 5abac91058 Anazahl der markierten Personen hinzugefügt ma0048 2021-02-04 09:50:05 +01:00
  • fc8df1b10d Wording korrigiert im CIS Profil Andreas Österreicher 2021-02-04 07:56:18 +01:00
  • d380e6ac49 Added change of status in lectors Detail GUI Cris 2021-02-03 16:22:19 +01:00
  • a3c33ed385 Added change of status when STGL requests for recommendation Cris 2021-02-03 16:21:15 +01:00
  • 5a8c779bcd Corrected URI and permissions Cris 2021-02-03 16:18:06 +01:00
  • 110f05b91c Corrected empfehlung_datum Cris 2021-02-03 15:43:14 +01:00
  • 5e1bbfe718 Minor change to InfoPanels Cris 2021-02-03 15:32:42 +01:00
  • e780a3e505 Added GUI for STGL Detail VIEW + logic (Antrag- and Empfehlungdata) Cris 2021-02-03 15:30:53 +01:00
  • 0affbf4e41 Added param to calling function rejectAnrechnung to work properly Cris 2021-02-03 14:53:40 +01:00
  • 5109828772 Adapted STGL overview: info/begruendungsangabe when approving/rejecting Cris 2021-02-03 12:59:46 +01:00
  • 39016b873f Adapted STGL overview: info/begruendungsangabe when approving/rejecting Cris 2021-02-03 12:41:26 +01:00
  • 1c0c8e9ad4 Hided empfehlung/begruendung panels in lector overview after sending recommendation Cris 2021-02-03 12:36:42 +01:00
  • 9790fc650b Adapted lector overview to slide in/out info when recommending Cris 2021-02-03 11:09:34 +01:00
  • ec16354594 Adapted Controller for lector Details to process Empfehlungen Cris 2021-02-03 11:03:58 +01:00
  • 8b6f0f56af Corrected not collapsing 'Fristen' in Infopanels Cris 2021-02-03 11:02:26 +01:00
  • b13fb0cda8 Added lector Detail GUI to retrieve and process Empfehlungen Cris 2021-02-03 11:01:02 +01:00
  • 5235915d6a Changed method getNotizByAnrechnung() -> added param titel Cris 2021-02-03 10:57:27 +01:00
  • b8046aeccf Added insertvon when saving new Anrechnung Cris 2021-02-03 10:55:46 +01:00
  • 297c96c3e5 Changed method getLastAnrechnungstatus() -> added param status_kurzbz Cris 2021-02-03 10:53:51 +01:00
  • 8fc338ccb4 Added GUI/functionality to add begruendung for 'NICHT EMPFEHLEN' in lectors overview Cris 2021-02-02 13:50:32 +01:00
  • da3720e65d Added lectors detail view CONTROLLER Cris 2021-02-01 10:11:57 +01:00
  • a0658a61c3 Added lectors Detail VIEW to review and recommend Anrechnung Cris 2021-02-01 10:06:05 +01:00
  • a218b36323 Added getUID() by prestudentID - method to Prestudent Model Cris 2021-02-01 10:03:18 +01:00
  • 7ec1653dd4 Merge branch 'master' into feature-9893/Add_Link_to_ICAL feature-9893/Add_Link_to_ICAL Andreas Österreicher 2021-01-29 15:33:28 +01:00
  • fcf15c410e Merge branch 'master' into feature-9612/Casetime_Zeitwarnungen_differenzieren Andreas Österreicher 2021-01-29 15:32:49 +01:00
  • e6ce33a302 Merge branch 'master' into feature-7264/Dauerampel_fuer_fehlende_Timesheets Andreas Österreicher 2021-01-29 15:31:53 +01:00
  • c6f6a626d3 Merge branch 'master' into feature-10320/Personen_zusammenlegen_ALMAMatchID_pruefen Andreas Österreicher 2021-01-29 15:30:58 +01:00
  • 5b3daa76df Merge branch 'master' into feature-10267/Zeiterfassung_Zeitaufzeichnungspflichtig Andreas Österreicher 2021-01-29 15:30:22 +01:00
  • 1ea521e858 Merge branch 'master' into 9503/csvExportProjektÜbersicht Andreas Österreicher 2021-01-29 15:28:41 +01:00
  • 907ecca333 Added coloured status alert in students view Cris 2021-01-29 11:55:27 +01:00
  • 70d02e25f9 Removed doublecheck of last status Cris 2021-01-29 11:54:52 +01:00
  • 8ba7744acb HOTFIX: Removed test-UIDS! Cris 2021-01-29 08:23:25 +01:00
  • f3feb53438 Merge remote-tracking branch 'origin/feature/Anrechnungen_NEU' into feature/Anrechnungen_NEU cris-technikum 2021-01-29 08:04:20 +01:00
  • 02e4004300 Merge branch 'master' into feature/Anrechnungen_NEU cris-technikum 2021-01-29 08:02:04 +01:00
  • ea7d0692b9 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core cris-technikum 2021-01-29 08:01:15 +01:00
  • 106cbe8194 HOTFIX: Removed test-UIDS! Cris 2021-01-28 19:07:19 +01:00
  • aff6e2ed8a Changed: Now "Herkunft der Kenntnisse" are required Cris 2021-01-28 19:07:19 +01:00
  • ce794d0e54 Added important help text for students view regarding applying correclty Cris 2021-01-28 18:55:02 +01:00
  • 14d1762c9f Changed email links to correct CIS URL Cris 2021-01-28 16:52:14 +01:00
  • bd293f3b3a Changed mail text to inform students about approved/rejected Anrechnungen Cris 2021-01-28 16:04:21 +01:00
  • c3f24f3038 - Projektarbeitsbeurtielung: added app Projektarbeitsbeurteilung and phrases for Projektarbeitsformular KarpAlex 2021-01-28 13:03:18 +01:00
  • 8d09ee7299 Modified to update Zeugnisnote, if already exists Cris 2021-01-28 11:22:14 +01:00
  • 6a37c71cfc Added sending Sanchomail to lector asking to recommend Anrechnung Cris 2021-01-28 10:20:17 +01:00
  • 35009097f1 Added sending Sanchomail to student when Anrechnung was approved/rejected Cris 2021-01-27 14:46:02 +01:00
  • 697e5057cf Added sending Sanchomail when Anrechnung is (not) recommended by lector Cris 2021-01-27 10:59:00 +01:00
  • 3fb2c3d387 Added Sanchomail sent when Anrechnung is applied by student Cris 2021-01-26 18:56:15 +01:00
  • 8a75bc9fdd Added method getFullName() to Person_model Cris 2021-01-26 18:54:42 +01:00
  • db10f78505 Added method getLeitung() to Studiengang_model to retrieve STGL by studiengang_kz Cris 2021-01-26 18:49:55 +01:00
  • 82780e9626 Added column "Herkunft (der Kenntnisse)" to STGL and lectors VIEW Cris 2021-01-26 15:39:18 +01:00
  • e06a6768a4 Changed text as required in Students Anrechnung' View Cris 2021-01-26 15:26:16 +01:00
  • 3f3d7aa7d7 Changed lektors status text to 'Empfehlung angefordert' Cris 2021-01-26 13:57:57 +01:00
  • 7d0ff4fcee Added check, when STGL tries to request recommendation for already recommended Antraege Cris 2021-01-26 10:58:26 +01:00
  • 5b77a5d08f Restricted to upload only pdf files Cris 2021-01-25 18:23:59 +01:00
  • aefd0842db Added tooltip for unselectable Anrechnungen Cris 2021-01-25 18:18:13 +01:00
  • 1b00ae78b4 Created Anrechnungen LektorInen: GUI, Controller, Tabledata, Phrases Cris 2021-01-25 15:32:51 +01:00
  • 7dc21fde5a FAS Länge der Betriebsmittel Nummer auf 32 Zeichen erhöht damit Schlüsselnummern gespeichert werden können Andreas Österreicher 2021-01-22 13:57:28 +01:00
  • 0da2c6a74c Changed tabulator requiredPermissions for STGL Anrechnungen Cris 2021-01-21 14:41:46 +01:00
  • 0bf0c2a152 Merge branch 'master' into feature/Anrechnungen_NEU cris-technikum 2021-01-21 14:07:40 +01:00
  • 71b8122a20 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core cris-technikum 2021-01-21 14:06:58 +01:00
  • 2359592032 Merge branch 'master' into feature/Anrechnungen_NEU cris-technikum 2021-01-21 14:06:03 +01:00