blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-10-12 06:54:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,521 Commits 235 Branches 7 Tags
master
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Moik 5d693398f6 - filter_details: changed save button 2016-12-13 16:25:33 +01:00
Andreas Moik 36203b4436 changed place of save button 2016-12-13 16:23:06 +01:00
Andreas Moik 183962bd3b - statistik: removed r and php 2016-12-13 16:13:30 +01:00
Andreas Moik f942d4c508 - filter_details: removed reset button 2016-12-13 14:25:40 +01:00
Andreas Moik 77cfbb1093 style changes for easyui panel 2016-12-13 14:19:12 +01:00
Andreas Moik 7365f3b350 adjusted easyui icon size 2016-12-12 11:17:17 +01:00
Andreas Moik 19bda38727 removed unused spaces 2016-12-12 11:13:44 +01:00
Andreas Moik 3b3721f3f0 reporting vector graphics: 
- path to letter
 2016-12-12 10:15:44 +01:00
Andreas Moik 2d6ef6abc4 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-12-05 14:05:18 +01:00
Andreas Moik 526e3013e0 cleanups 2016-12-05 14:05:05 +01:00
Andreas Moik 6a1d864a4f - jsoneditor included via composer 
- meta-include for jsoneditor
- new composer.lock version
 2016-12-05 11:24:11 +01:00
Andreas Moik 401aab6baa Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-11-28 09:47:06 +01:00
Andreas Moik d62a0b304c - bugfix: changedir in dokument_export in cleanup method 
- bugfix: dokumentenakt errorhandling
 2016-11-28 09:44:52 +01:00
Andreas Moik c4ed2d05f1 - removed forgotten break 
- restored feature 'delete person'
 2016-11-23 16:26:58 +01:00
Andreas Moik 53dc0f5771 new reporting icons 2016-11-23 13:46:43 +01:00
Andreas Moik 7269672b2d Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-10-06 09:15:42 +02:00
Andreas Moik b4efb5aaa4 new entry in tbl_webservicetyp (reports) 2016-10-06 09:15:18 +02:00
Andreas Moik 33d3697f2f add statistik_kurzbz to errormsg 2016-10-03 10:29:32 +02:00
Andreas Moik 90745fdddc redirecting wawi linkts to the new addon 2016-09-12 15:07:23 +02:00
Andreas Moik 647cd1e8f9 bugfix 2016-09-09 09:36:19 +02:00
Andreas Moik 2c3ebf843a Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-09-07 11:57:55 +02:00
Andreas Moik 92544007eb added textile in composer 2016-09-07 11:29:56 +02:00
Andreas Moik b43601a9cc bugfix 2016-09-05 16:27:26 +02:00
Andreas Moik 4b0fd80bf4 multiple Documents modified 2016-09-05 14:48:21 +02:00
Andreas Moik c26df3e2f1 added restart button 2016-09-05 10:46:45 +02:00
Andreas Moik 0942cbf7c9 Analyzation for studienplan_id detection 2016-08-31 11:49:26 +02:00
Andreas Moik 208a5fb707 Mergt branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-08-25 15:26:22 +02:00
Andreas Moik 6c260c7cd5 bugfix for unoconv systemd service killmode 2016-08-24 15:46:48 +02:00
Andreas Moik c6c4745280 added services for systemd and upstart 2016-08-24 13:47:55 +02:00
Andreas Moik cac1aae235 implemented cascading deletion of persons/employees/students 2016-08-18 11:20:02 +02:00
Andreas Moik 2188a120c2 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-08-11 14:10:15 +02:00
Andreas Moik 70bd1b795d ignore empty documentlists 2016-08-11 14:09:48 +02:00
Andreas Moik 4916ba09d6 removed echo 2016-08-09 11:13:14 +02:00
Andreas Moik 7f6d632935 new features for dokumentenakt 
-now uses versions of templates
	-only takes active templates
	-covering page now uses the oe_kurzbz
 2016-08-09 11:10:01 +02:00
Andreas Moik 55729f5eb6 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-08-09 10:44:09 +02:00
Andreas Moik 22118abc5a template resolution is now handeled recursively 2016-08-09 10:42:47 +02:00
Andreas Moik deba2733d6 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-08-08 11:15:09 +02:00
Andreas Moik 4ad5de915a added page to link documents with templates 2016-08-08 11:14:22 +02:00
Andreas Moik e178f78dba added tbl_vorlagedokument 2016-08-03 15:20:54 +02:00
Andreas Moik c01eecf196 bugfix 2016-08-02 14:49:31 +02:00
Andreas Moik 68b911fef4 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-08-02 11:51:23 +02:00
Andreas Moik feab67a83a Merged documents are now shown on the covering page 2016-08-02 11:50:22 +02:00
Andreas Moik c6f5d49e3b better error handling 2016-08-02 09:25:08 +02:00
Andreas Moik a705862d18 bugfix 2016-08-01 16:36:38 +02:00
Andreas Moik 24e78bbae3 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-08-01 16:33:07 +02:00
Andreas Moik 85d397b451 added support for documents 
if pdf creation failed, show the failed documents and added a button to force creation of the pdf and skip broken files
 2016-08-01 16:31:00 +02:00
Andreas Moik 8074fa5383 Bewerberakt vorlage geändert 2016-08-01 11:37:25 +02:00
Andreas Moik b820f409aa bugfix 2016-07-28 16:55:09 +02:00
Andreas Moik bf70eedc27 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-07-28 13:30:24 +02:00
Andreas Moik 5743d05478 bugfixes 2016-07-28 13:30:09 +02:00
Andreas Moik 6d0f5d2bec Dokumentenakt 2016-07-27 17:18:38 +02:00
Andreas Moik 81ca197020 bugfix 2016-06-30 16:15:05 +02:00
Andreas Moik a4a907a83f bugfix 2016-06-29 15:04:41 +02:00
Andreas Moik 974b5c0fe8 berits aufgenommene Studenten mit einer anderen Studienplan_id werden nun nicht mehr als aufgenommen angezeigt 2016-06-28 12:15:11 +02:00
Andreas Moik 0c28a6d6c4 bei dem aufnehmen der Bewerber wird nun der gewählte Studienplan und die Orgform bei dem Prestudentstatus eingetragen 2016-06-28 11:43:33 +02:00
Andreas Moik 7758fa3807 fixed timestamp bug in eventkalender 2016-06-20 14:46:55 +02:00
Andreas Moik c57b84d10c implemented the aliquote reduction 2016-06-14 10:11:16 +02:00
Andreas Moik 50feec07ae cleanups 2016-03-21 15:26:51 +01:00
Andreas Moik 9c9a03c63d hint added to prestudentstatus-updatescript 2016-03-18 09:26:47 +01:00
Andreas Moik ea2276b984 fixed typo 2016-03-17 17:23:17 +01:00
Andreas Moik ea66e0944a some comments added to the aliquote reduction 2016-03-17 16:48:08 +01:00
Andreas Moik c2a96098a4 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-03-17 16:20:00 +01:00
Andreas Moik ce4a0a7e3f updatescript for prestudentstatus studienplan_id 2016-03-17 16:05:25 +01:00
Andreas Moik 8f12102ce1 comment update 2016-03-17 10:46:08 +01:00
Andreas Moik aa249a044d bugfix 2016-03-17 10:30:30 +01:00
Andreas Moik 4ca4f347c5 cleanups 2016-03-16 16:17:20 +01:00
Andreas Moik dff4d3d0e6 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-03-16 09:45:22 +01:00
Andreas Moik be9e54b85f typo fix 2016-03-14 12:26:08 +01:00
Andreas Moik 5903f68ef6 cleanup 2016-03-10 17:44:26 +01:00
Andreas Moik deab8fb0d8 fas changed from lehre.tbl_studienordnung_semester to lehre.tbl_studienplan_semester 2016-03-10 16:26:55 +01:00
Andreas Moik 0a38241d6b bugfix 2016-03-10 14:15:31 +01:00
Andreas Moik 312ae30f4a string correction 2016-03-10 11:27:50 +01:00
Andreas Moik 005be3df3c Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-03-10 11:23:14 +01:00
Andreas Moik 48ecbaacfb automatic conversion from studienordnung_semester to studienplan_semester 2016-03-10 11:22:31 +01:00
Andreas Moik 8bfef285b0 postponed save and delete of study plan assignment from study regulations file to study plan file 2016-03-10 10:57:05 +01:00
Andreas Moik 64f10154af semester assignment for study plan 2016-03-10 10:45:59 +01:00
Andreas Moik f8f672052e cleanups in studienplan-class 2016-03-09 14:34:04 +01:00
Andreas Moik c40cfc83bc Excel-export for aliquote reduction 2016-03-08 10:59:50 +01:00
Andreas Moik 5cf53e2a16 refined reduction 2016-03-07 17:11:03 +01:00
Andreas Moik 42fca1820c fixed quoting-bug in interessentenimport.php 2016-03-07 14:36:31 +01:00
Andreas Moik ecf882e748 better automatic selection in the aliquote reduction 2016-03-07 14:04:14 +01:00
Andreas Moik c493de2c85 repaired invocation of aliquote reduction from FAS 2016-03-07 12:26:03 +01:00
Andreas Moik 2a24f20cce first preselection for the aliquote reduction 2016-03-07 12:18:38 +01:00
Andreas Moik 87bc06383d einrückungen 2016-03-04 09:13:38 +01:00
Andreas Moik 506a05de92 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-03-03 17:02:09 +01:00
Andreas Moik 5501cdbecd First draft for aliquote reduction 2016-03-03 17:00:32 +01:00
Andreas Moik 2c2ad752a7 bugfix 2016-03-03 14:40:33 +01:00
Andreas Moik 5acbf1e199 added zgv_code foreign keys 2016-03-03 14:32:40 +01:00
Andreas Moik ec79066211 bugfix for datatypes in bis.tbl_zgvgruppe_zuordnung 2016-03-03 14:29:05 +01:00
Andreas Moik b95b083bb2 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-03-03 13:34:25 +01:00
Andreas Moik 172fca2018 tables bis.tbl_zgvgruppe_zuordung and bis.tbl_zgvgruppe added 2016-03-03 13:33:19 +01:00
Andreas Moik 0a200e1668 cleanups in studienplan-class 2016-03-03 11:49:07 +01:00
Andreas Moik 8cb06f5587 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-03-02 15:06:28 +01:00
Andreas Moik 72aac077f8 Automatic insert of studienplan_id in lehre.tbl_studienplan 2016-03-02 15:05:25 +01:00
Andreas Moik 93fdb93774 adapted the 16-figured sv-nums in mitarbeiterimport 2016-03-01 15:13:32 +01:00
Andreas Moik 11985e8066 new columns APZ and studienplan_id in table lehre.tbl_studienplatz 2016-03-01 14:54:41 +01:00
Andreas Moik ede359bdca automatisiertes eintragen des Gebutsdatums anhand der SVNR auskommentiert 2016-02-29 14:55:07 +01:00
Andreas Moik b001360d69 new meta-includes for angular, angular-tablesort, and ajax fe/be 2016-02-25 09:23:50 +01:00
Andreas Moik d4ff12cd0f bugfixes in Eventkalender 2016-02-23 13:37:34 +01:00
Andreas Moik 0a40c92047 Uhrzeit in treecol eingebaut 2016-02-18 12:52:48 +01:00