blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-10-12 15:04:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,696 Commits 238 Branches 7 Tags
8411786fceb41d9dcd27e29b4f6559c3071e6986
Commit Graph
89 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
alex 8411786fce asterisk for labels for required fields 2018-04-11 11:40:22 +02:00
alex 0da929dd4f Konten can be retrieved by Kostenstelle 2018-04-11 10:54:17 +02:00
alex 161d814472 added permissions for Budgetantragsverwaltung 2018-04-11 10:53:03 +02:00
alex 38f084eebe enabled arrow for bootstrap panels 2018-04-10 16:11:56 +02:00
alex 350eae5985 Merge remote-tracking branch 'origin/master' 2018-03-27 13:44:33 +02:00
alex 8493638605 Added Studiengang and Orgform to Subject of Freigabemail 2018-03-27 13:44:09 +02:00
alex 16631d7ad9 quickfix for collapsing menu - add click events only after ajax call execution (asynchronity can be a bitch...) 2018-03-14 11:28:57 +01:00
alex 95663c42aa added ZGV and document info to freigabe mail 2018-03-14 09:45:26 +01:00
alex a2864eb47a added notizen (Anmerkungen) zur Bewerbung 2018-03-01 16:05:23 +01:00
alex 73c4ad225e Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2018-02-28 15:12:48 +01:00
alex 7581ac05dd replaced php requests with ajax requests 2018-02-28 12:56:14 +01:00
alex 959b90ca68 Merge remote-tracking branch 'origin/master' 2018-02-26 17:53:55 +01:00
alex 6f99a0ff0c fixed bug with zgvdatum when datum null and infoonly 2018-02-26 17:53:46 +01:00
alex 5a4659c2b8 Merge remote-tracking branch 'origin/master' 2018-02-26 16:54:52 +01:00
alex 8f6ee06b9d added "zgv uebernehmen" for prefill of zgv with latest edited zgv, optimized sort of zgvs 2018-02-26 16:54:41 +01:00
alex 93a581e301 Merge remote-tracking branch 'origin/master' 2018-02-23 10:06:56 +01:00
alex 53fcda3504 added infomail when interessent freigegeben 2018-02-23 10:06:46 +01:00
alex cca4fee51e mark header red if locked by other person, locking is possible either generally (app null) or only for certain apps. 2018-02-21 13:44:44 +01:00
alex 695e7f60af added lock mechanism for persons, outsourced infocenter code to javascript 2018-02-20 18:05:36 +01:00
alex d9f6bfb76b statusgrund is shown for every status not only for abgewiesener 2018-02-20 18:00:37 +01:00
alex c987773f8f removed line 2018-02-20 17:58:03 +01:00
alex eb4c7cda61 Merge remote-tracking branch 'origin/master' 2018-02-20 17:39:19 +01:00
alex 4b4dcfff59 added lock tbl.person_lock for locking person 2018-02-20 17:39:00 +01:00
alex 6830e5f51d renamed column in nachrichten 2018-02-19 13:02:14 +01:00
alex 182292e418 autoresize of message window, column widths 2018-02-09 17:27:22 +01:00
alex 0920add048 added autoresize 2018-02-09 17:13:52 +01:00
alex 63bd5eb71e Merge remote-tracking branch 'origin/master' 2018-02-09 17:01:29 +01:00
alex fe5e5cc313 added lines with actions for multiple persons in infocenter uebersicht (send message, select all, number of rows), message with no sender sends from logged user, layout tweaks writemessage page 2018-02-09 17:00:16 +01:00
alex 1d0747827a when sent to person, correct fields are shown in message preview, renamed message Date 2018-02-07 16:20:34 +01:00
alex c64ef198b4 separated details page view in multiple views 2018-02-07 10:06:42 +01:00
alex 629d8446f8 bootstrapped write message page, no error on showing first message in messageList 2018-02-07 09:59:02 +01:00
alex 20455d264c added message table, added tinymce editor to header and messageList 2018-02-05 15:00:54 +01:00
alex 590021a8e2 fixed typo 2018-02-02 16:34:14 +01:00
alex ad54f08a97 check if not abgewiesen or bestätigt before abweisen or bestätigen, removed Zustellung column, retrieve only zugestellte kontakte, log entrys starting uppercase 2018-02-01 16:53:19 +01:00
alex 84bf884db7 write log entry when sending message 2018-02-01 16:16:32 +01:00
alex b9e7dc38cc enabled sending messages with person ids as receivers, person data can be retrieved by uid, link in infocenter details to send message 2018-02-01 10:26:37 +01:00
alex 8eedae0df9 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2018-01-30 16:53:15 +01:00
alex c7008c9ccd added Bewerbung Zugang, bewerbung abgeschickt, collapsible menu, Statusgrund entering is compulsory, restyled (button/text positions, colors, zebra widget of tablesorter) 2018-01-30 16:52:43 +01:00
alex 3b07cdca73 added filter widget to tablesorter in Zeitsperren, replaced christianbach with mottie tablesorter 2018-01-25 17:10:16 +01:00
alex 94abad155e replaced scripts and stylesheet links with links to minified versions 2018-01-25 17:04:57 +01:00
alex fe8e5ed507 added mottie tablesorter, removed datatables and datepicker, restyled tablesorter for better bootstrap look, layout changes 2018-01-24 17:29:12 +01:00
alex 8ec02c7aaa Merge remote-tracking branch 'origin/master' 2018-01-24 17:18:13 +01:00
alex 785609584c check for null of prestudentstatus, typing mistake 2018-01-24 17:17:40 +01:00
alex bd5dfe7e4c escaped HTML chars entered in textfields 2018-01-23 09:41:41 +01:00
alex 14a7b0a921 added Statusgrund Bezeichnung for Logging, replaced array constant for backwards compatibility 2018-01-23 09:41:09 +01:00
alex 8bfde2c4eb bigger nation column for infoonly (if long Nation), check for not existent Statusgrund 2018-01-22 17:56:58 +01:00
alex 5a0082ec11 added Studienplan Orgform and alternative Orgform (in "Anmerkung" field), Studienplansprache for display, Statusgrund Bezeichnung for Abgewiesener 2018-01-22 17:43:13 +01:00
alex 5725cc2dfe infocenter details page opening in same window 2018-01-22 17:39:09 +01:00
alex 7235ce5f0a Merge remote-tracking branch 'origin/master' 2018-01-22 17:38:22 +01:00
alex 3a7b12a4ff made table responsive, condensed 2018-01-22 17:38:10 +01:00
alex 8ad1c5a166 improved logging (english, logs Verarbeitunstaetigkeit, shows all logs for a person 2018-01-19 16:53:08 +01:00
alex 3ccd38540d updated CI person logging for Verarbeitungstätigkeit (taetigkeit_kurzbz) 2018-01-19 16:50:36 +01:00
alex c268983785 added verarbeitunstätigkeit "datenwartung", Person zusammenlegen is logged in personlog 2018-01-19 16:46:31 +01:00
alex 9419fe8c3d Added widgets FHC navigation and FHC navheader (as seen in sb admin2 template), bootstrapped filter page, added filter widget to infocenter table 2018-01-18 16:20:59 +01:00
alex bcd2e7b0d8 replaced [] with array() (for old php version), removed comments 2018-01-18 15:55:46 +01:00
alex 4faa1fbc5b added greater than filter 2018-01-18 15:50:33 +01:00
alex 6ae6940201 hidden filter header, simplified SQL statement: Studiensemester ende greater now 2018-01-18 15:37:33 +01:00
alex 8f0b4c3114 infocenter: added confirmation popup when student freigegeben/abgewiesen, non-interessent or prestudenten with interessentenstatus confirmed are view-only (infoonly), added Nation data to Prestudent and akte, bugfixes 2018-01-17 11:45:23 +01:00
alex 2abdabd2e9 added sbadmin template as option in header 2018-01-17 11:18:30 +01:00
alex 55121cc259 log table personid updated bei Personenzusammenlegung 2018-01-10 09:59:12 +01:00
alex fc45e90c9d Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2018-01-10 09:53:51 +01:00
alex 0e6e6ab8ea added bootstrap datepicker, dokumente nachgereicht in separate table, zgv panels collapsible and Interessenten come first, made columns more responsive 2018-01-10 09:53:34 +01:00
alex 2b186d0c45 improved infocenter details, added bootstrap and admin theme (sb admin 2) , added zgv pruefung Status, Studiensemester and Ausbildungssemester, contacts in one table, nachzureichen and nachgereicht am columns 2018-01-08 09:55:13 +01:00
alex a8a5b5e1ad Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	application/views/templates/FHC-Header.php
 2018-01-05 12:46:56 +01:00
alex 00dbedc040 added jqueryui, bootstrap, fontawesome, datatables (new tablesorter) 2018-01-05 12:45:58 +01:00
alex 017c6c24ec added multilanguage support for Projektliste and CSV Export 2017-12-22 15:04:06 +01:00
alex ada1108095 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2017-12-20 14:55:27 +01:00
alex c0f9b31409 Fixed Bug that lines are not continuious in some excel versions, projecttime now added up also if second time entry is starting at same time as last project entry ends, converting to date is done only once at begin of projectline iteration 2017-12-20 14:54:11 +01:00
alex fa3daa7a57 Created infocenter details page showing Person Stammdaten, Dokumente, Prestudent ZGVs, Logs and Notizen. 2017-12-18 14:01:42 +01:00
alex 482a90b305 modified colors (now violet comes before dark red), fixed bug with non-continuous lines in excel versions 2017-12-14 16:32:05 +01:00
alex 9a61e91489 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2017-12-05 10:10:00 +01:00
alex 7344ec63ce "inofficial" grades like "entschuldigt", "unentschuldigt" are now not shown on official documents (Studienerfolgsbestätigung, Zeugnis, Diplomasupplement, Lehrveranstaltungszeugnis, Zertifikat) 2017-12-05 10:07:19 +01:00
alex 3f144dd290 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2017-12-04 10:32:27 +01:00
alex 749aa4525a beautified links (links are only on words) CSV Export, Import... 2017-12-04 10:03:34 +01:00
alex d4d1f26c3f Merge remote-tracking branch 'origin/master' 2017-11-29 16:27:07 +01:00
alex 552e42f51a Added Projektexport to Zeitaufzeichnung, moved CSV Import and CSV Export Form on a more visible spot 2017-11-29 16:26:36 +01:00
alex 289eb39aae Merge remote-tracking branch 'origin/master' 2017-11-24 14:34:00 +01:00
alex 73ae230cf0 Added "Notenspiegel_erweitert" excel export for color highlighting of negative marks and Nachprüfungen. 2017-11-24 14:31:43 +01:00
alex 3d2df79c6d Replacement of call check_infrastruktur by check of right "servicezeitaufzeichnung", input fields, Uebersichtstabelle and CSV export show only fields for Infrastruktur if user has the right, projects are shown after their end + 1 month + 1 day. 2017-11-03 10:32:13 +01:00
alex 898fabd7ee Merge remote-tracking branch 'origin/master' 2017-10-25 17:48:33 +02:00
alex 2273781fe6 project list for zeitaufzeichnung fixed: if project or project phase ends on current day, it is shown. If there is a project phase which has not ended, the corresponding project is shown regardless of whether the project has already ended. 2017-10-25 17:47:23 +02:00
alex ffc778864a Merge remote-tracking branch 'origin/master' 2017-10-18 15:27:06 +02:00
alex 9191f7fef3 added csv export to Zeitaufzeichnung 2017-10-18 15:26:20 +02:00
alex 503487734a Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2017-10-02 14:57:22 +02:00
alex 5dbe7699d6 textfield for "Prestudent ID eingeben" visible in Chrome, fixed formatting (space between buttons) 2017-10-02 14:56:53 +02:00
alex bd5769622f Orgformen for Bewerberstatistik "Aufsplittung Mischformen" are retrieved dynamically (incl. Dual) 2017-09-28 13:10:05 +02:00
alex 0895c171a5 Default Status when creating new Studienordnung set to "in Bearbeitung" in drop down 2017-08-28 10:58:56 +02:00
alex 9e14e39b66 Added Comments in Controllers 
called html_escape function for all textfields before saving (against html injection)
Reformatted
Fixed Studienjahr Dropdown prefill in Studiensemester view
 2017-08-03 13:48:10 +02:00
alex afd1667645 GUI für Studiensemester und Studienjahr hinzugefügt 2017-08-01 14:50:19 +02:00