blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-16 06:22:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,622 Commits 212 Branches 6 Tags
6855e6ff2e57ca53c2b8d612d0c238590783c97b
Commit Graph

2167 Commits

Author SHA1 Message Date
ma0048 98cf234f6f Merge remote-tracking branch 'origin/master' into feature-18940/infocenter_loeschen_von_dokumenten 2022-09-12 09:52:19 +02:00
Cris 3a595dda58 Merge branch 'master' into feature-18224/Anrechnungen_ECTS-Grenze 
# Conflicts:
#	application/controllers/lehre/anrechnung/RequestAnrechnung.php
 2022-09-08 14:15:49 +02:00
Cris 617dcc0646 Changed application dates for testing reason 2022-09-08 14:09:37 +02:00
Cris d13cc789ad Fix Anrechnung Student View: Änderung des Download-Dokumentnamens zurückgenommen 
Der Download-Dokumentname ist in der Studierendenansicht nun wieder gleich wie der originale Dokuementname beim Hochladen.
 2022-09-08 12:53:44 +02:00
Cris 7ea9b6a741 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2022-09-07 09:06:03 +02:00
Andreas Österreicher 393eaea91d Removed Dashboard Testfiles 2022-09-07 09:00:00 +02:00
Cris 522e341d3d Dashboard Test V1 2022-09-06 15:29:42 +02:00
Cris c88061463f Hotfix Anrechnung Student View: Änderung des Download-Dokumentnamens zurückgenommen 
Der Download-Dokumentname ist in der Studierendenansicht nun wieder gleich wie der originale Dokuementname beim Hochladen.
 2022-09-06 14:21:54 +02:00
Andreas Österreicher 7f64f5c29f Merge branch 'feature-19173/mobilityonline_grant_agreement_ins_fas_uebernehmen' 2022-09-06 12:38:21 +02:00
ma0068 52fe5a78e1 Merge branch 'master' into feature-18940/infocenter_loeschen_von_dokumenten 2022-09-06 09:17:39 +02:00
Andreas Österreicher 259dbe9bdc Fixed Error on File Download from Student View 2022-09-05 18:46:13 +02:00
Andreas Österreicher d109747cfc Merge branch 'master' into feature-19173/mobilityonline_grant_agreement_ins_fas_uebernehmen 2022-09-01 15:34:12 +02:00
ma0048 03535b7589 text aenderung und holen alle studienbeitraege 2022-08-30 14:08:00 +02:00
Andreas Österreicher 68d6e3c549 Merge branch 'master' into feature-18224/Anrechnungen_ECTS-Grenze 2022-08-29 16:23:20 +02:00
ma0048 a13c010cd5 textaenderungen und getzutrittskarte by uid 2022-08-25 10:43:26 +02:00
ma0048 566f2f6399 prueft beim loeschen des dok noch auf person_id 2022-08-25 09:54:33 +02:00
Harald Bamberger 083c360338 remove duplicate body tags 2022-08-11 16:05:15 +02:00
ma0048 979f8d96bc ermoeglicht das sperren der zutrittskarten 2022-08-11 14:29:56 +02:00
Cris 6f1ca8e374 Removed unnecessary HTML body tags and added FHC_Footer 
Body tags are set in FHC_Header and FHC_Footer.
 2022-08-11 14:00:20 +02:00
Cris 4f435fbc20 Removed date limitation for testing 2022-08-10 16:26:36 +02:00
Cris bfa9c2c8a7 Merge remote-tracking branch 'origin/feature-18224/Anrechnungen_ECTS-Grenze' into feature-18224/Anrechnungen_ECTS-Grenze 2022-08-10 16:01:42 +02:00
Cris 1d728336a2 Hided colums 'ECTS Schule bisher'/'ECTS Beruf bisher' 
Hide by default colums 'ECTS Schule bisher'/'ECTS Beruf bisher',
as dynamic ECTS column is providing those informations.
 2022-08-10 15:59:11 +02:00
Cris debfbf7827 Created AnrechnungJob sendMailRemindRecommendation 
...to remind lecturers to provide their recommendation if not done until
one week after request.
 2022-08-10 15:58:13 +02:00
Cris e56237038d Optimized 'Ablehnen'-/'Nicht empfehlen'-panels for better usability 
- Copy-icons are now right aligned and bigger
- Less in-between-text, instead short explanation text into textarea placeholder
 2022-08-09 16:40:43 +02:00
Harald Bamberger e63d34132c merged current master 2022-08-08 13:29:44 +02:00
Cris fc94ea4b49 Fixed: Maximale Dokument Uploadgröße 2022-08-03 16:43:34 +02:00
Cris bb8a2a97a5 Fixed: Unclickable URLs after approving Anrechnung are clickable now 2022-08-02 15:25:06 +02:00
Cris 952d5e51b2 Refactoring der Dynamischen Max-ECTS-Berechnungsspalte, Berechnungen stimmen nun auch nach einem Genehmigungs-Update 2022-07-27 16:03:24 +02:00
KarpAlex 0055243a64 DmsLib: replaced _writeFile function with _copyFile to copy all file in one go (php copy method) instead of reading blocks and writing them 2022-07-27 01:52:08 +02:00
Cris 94644b4403 Adapted: Hochschulqualifikation werden bei Berechnung der max ECTS Überschreitung ausgenommen 
Anrechnung aufgrund von Hochschulqualifikationen sind ungeschränkt möglich.
 2022-07-26 18:22:51 +02:00
Cris 7b9fd39bbc Added: Hochschul-Qualifikation + ECTS Anzeige in Student View 
Checkbox zur Angabe von Hochschulqualifikation
Anzeige, wenn ECTS Grenzen überschritten werden.
 2022-07-26 18:18:08 +02:00
Cris 6a43928322 Added: Display (Qualifikations-)Begruendung in STGL Anrechnungen Detail View 2022-07-26 18:14:23 +02:00
Cris 86d7f8a35e Code refactoring of Dynamic ECTS Summen 
. now build with tabulators column formatter.
. rows are reinitialized instead of using the updateData.
. format of cell background-color has moved out from row formatter to cell formatter
 2022-07-20 11:25:35 +02:00
Cris 4ba1f2cef5 Changed: Dynamic ECTS Summen (LV ECTS Sum by Prestudent + former ECTS) now build with tabulators mutator and rowFormatter 2022-07-18 17:38:20 +02:00
Cris 1544653fa3 Added Begründungstext 'Max ECTS überschritten' als Ablehnungsgrund 2022-07-18 17:33:50 +02:00
Cris 3b1d0f3aaa Merged DB Model Int/Float conversion 
+ query type cast adaptation
 2022-07-18 17:33:20 +02:00
Andreas Österreicher b2eb035613 Merge branch 'feature-20265/infocenter_check_duplicate_user' 2022-07-08 11:24:10 +02:00
ma0048 1434deeca1 zeigt die nation gruppe an 2022-07-07 11:29:38 +02:00
ma0048 377cb8ab7f ermoeglicht das loeschen der dokumente ueber das infocenter 2022-07-07 11:25:54 +02:00
Cris b2715bb408 Fixed: Added missing Summe ECTS Schulisch to AntragData. 2022-07-07 10:27:50 +02:00
Cris ade55c9d1f Added ECTS Summen to Anrechnung Detail View 2022-07-07 10:26:56 +02:00
Cris b40db6abbd Added ECTS Summen columns to Anrechnung Übersichtstable 2022-07-07 10:26:13 +02:00
Cris 4d05f54b54 Added ECTS Summen top AnrechnungData in the AnrechnungLib 2022-07-07 10:25:19 +02:00
Cris 9d7589ddc4 Added DB methods to get ECTS Summen by schulische/berufliche Qualifikation 2022-07-07 10:18:40 +02:00
Cris 44a3231d55 Merge branch 'master' into feature-18224/Anrechnungen_ECTS-Grenze 
# Conflicts:
#	application/models/education/Lehrveranstaltung_model.php
 2022-07-06 12:00:09 +02:00
ma0048 acffebf515 check doppelte benutzer auch mit unterschiedlicher groß und kleinschreibung 2022-07-06 10:56:24 +02:00
Andreas Österreicher 1641a879af PHP Version Compatibility fixed 2022-07-01 09:04:52 +02:00
KarpAlex 1c3acc6366 issue overview: added column "Zugehörigkeit"(Belonging) to show study programs of concerning person and wether it is an employee 2022-06-29 17:59:57 +02:00
KarpAlex 500bbec2c1 added "hasSequence" = false to crm/Dokumentprestudent_model to avoid "lastval not found" error 2022-06-28 19:07:09 +02:00
Cris 5f5031e8d1 Added ECTS Summe to Anrechnung Detail View. 2022-06-22 10:54:17 +02:00