blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-06 21:39:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,123 Commits 230 Branches 6 Tags
d53f14eeea259004d2ccef8aef7f5caecfececce
Commit Graph

12123 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paminger f3c2630a66 SeedBugFix 2016-06-28 12:53:53 +02:00
Paminger e21b2f6233 Seeds 2016-06-28 12:34:12 +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
paolo 5e4090e0ce _validate method of Person controller now checks correctly the parameters, in accordance with the table structure 2016-06-27 14:58:46 +02:00
paolo bee12ac317 Fix: method getAuthUID of the helper fhcauth_herpel.php, sometimes it 
misses the uid
 2016-06-27 12:17:16 +02:00
kindlm 534a162809 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-06-27 11:33:25 +02:00
kindlm 4c21acc5f2 Firma DeleteOrganisationseinheit; Nur Eigene löschen 2016-06-27 11:33:17 +02:00
kindlm 5071605ce2 Prüfungsprotokoll Master-Lehrgänge 2016-06-27 11:31:12 +02:00
kindlm c773cd3ddc Korrektur Query DeleteFirmaOrganisationseinheit 2016-06-27 11:30:29 +02:00
kindlm 4d77c603d0 Letzte Rolle nur durch admin löschbar 2016-06-27 11:29:10 +02:00
oesi fbf33e708e Fixed Typo 2016-06-27 09:31:01 +02:00
oesi 673e7a2a2f Berechnung korrigiert damit alle Bewerber einberechnet werden und nicht nur die noch nicht aufgenommenen 2016-06-24 17:15:13 +02:00
oesi ad335ad240 RTPunkte1, RTPunkte2 und Private EMail hinzugefügt. 
Funktion aus Klasse entfernt
 2016-06-24 17:04:56 +02:00
paolo c2c4620af9 Merge origin/ci into ci 2016-06-24 13:22:43 +02:00
paolo 9a4f5480c4 - Added permission basis/phrase to dump.sql 
- The function getAuthUID() present in the helper fhcauth_helper.php
now tries to work always with CI session to get the uid
- REST_controller doesn't need anymore to handle the uid
- FHC_Controller and FHC_Model load fhcauth_helper in their constructor,
so any class that extends them now could call the function getAuthUID()
anywhere in the code
- The controllers don't need anymore to pass the uid to the models or to the
libraries
- Library FHC_DB_ACL load fhcauth_helper in its constructor and uses getAuthID()
 2016-06-24 13:22:27 +02:00
Paminger 74186cc5c6 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 
Conflicts:
	application/core/DB_Model.php
 2016-06-24 13:09:44 +02:00
Paminger 925d210bff Permission Problem workaround 2016-06-24 13:08:18 +02:00
paolo 58a6da42ae The method loadWhole has been removed from model DB_Model. 
The same functionality has given by calling the load method without parameters
 2016-06-24 10:39:52 +02:00
paolo 3fdf54c1d1 - Added method sendMessageVorlage to MessageLib 
- Fixed method loadVorlagetext in VorlageLib
- Changed query in method getMessagesByPerson of Message_model
 2016-06-23 15:42:43 +02:00
paolo 38c98531ed Fix: DBTools $seed_path property is now set in the constructor, APPPATH is not always replaced 
Fix: Set the right value of seq_vorlagestudiengang_vorlagestudiengang_id before the insert
 2016-06-23 12:29:58 +02:00
oesi 942dfb8633 Noteneinträge werden nicht mehr zur Übernahme markiert wenn die Zeungisnote neuer ist als die LVGesamtnote, die Note die selbe aber die Punkte unterschiedlich sind, da sonst die Punkte der komm. Pruefung überschrieben werden falls die Note die selbe bleibt 2016-06-23 11:09:42 +02:00
paolo 8df43d4b6f Merge origin/ci into ci 2016-06-23 10:34:54 +02:00
paolo 226d1652ef Merge 2016-06-23 10:34:42 +02:00
Paminger 4f14e7fa92 Messages Inbox Outbox 2016-06-23 10:28:26 +02:00
Gerry Raab ab4c8ac373 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-06-22 17:20:18 +02:00
Gerry Raab c8e4b463b5 new phrase inhalt 2016-06-22 17:19:43 +02:00
paolo d757c413e5 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-06-22 15:00:23 +02:00
paolo f35ede3974 - Added Phrase controller 
- Phrase controller has the method getPhrases() to get sentences translated into several languages
- Added method getPhrases to PhrasesLib
- Modified the PhrasesLib constructor to pass the uid to the models
- Added method getPhrases to Phrase_model
 2016-06-22 14:59:49 +02:00
Gerry Raab 437959221e sprache widget added 2016-06-22 13:09:16 +02:00
Gerry Raab 642f700cae phrases textile prev 2016-06-22 10:42:32 +02:00
paolo 95801a2e70 - Fix: Message_model queries does not get body from tbl_msg_message 
- Added method getMessagesByUID to Message controller
 2016-06-22 10:34:28 +02:00
paolo d425653d86 Modified _validate method of Message controller, now it returns a standard 
error or success message
 2016-06-22 09:35:36 +02:00
Paminger f2fdc62b44 BugFix 2016-06-22 08:18:53 +02:00
Paminger 49ebc3945b Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-06-22 08:11:59 +02:00
Paminger 70e83b6e18 Messages 2016-06-22 08:11:04 +02:00
root 25e0ba9407 basic phrases editing 2016-06-22 01:24:59 +02:00
oesi d25dc7c707 Merge branch 'master' of github.com:FH-Complete/FHC-Core 2016-06-21 17:23:08 +02:00
oesi 0701a4dd2e Neues Menu Addon für Studienplan-Basierte Ansicht 2016-06-21 17:22:40 +02:00
root e2744500a6 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 
Conflicts:
	application/core/FHC_Controller.php
 2016-06-21 16:31:06 +02:00
root ca83b2f59d phrases system 2016-06-21 16:25:55 +02:00
paolo 971e4ed6de Fixed controller message parameters validation 2016-06-21 15:21:51 +02:00
Gerald Raab b14a1f30ba Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2016-06-21 15:10:15 +02:00
Gerald Raab 3c93439955 ital phrases 2016-06-21 15:09:49 +02:00
paolo 5a5472257a - Modified MessageLib constructor to allow to give the parameter UID from a Controller 
- Controller Message now works with MessageLib
- Added getMessagesByPersonID method to controller Message
- Added permissions basis/message and fs/system to dump.sql
 2016-06-21 15:07:51 +02:00
oesi fab06f9ddb Neue Funktionen für Zugriff auf Studienplaene hinzguefügt 2016-06-21 14:30:11 +02:00
Paminger 6e62fbdcd4 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 
Conflicts:
	application/views/templates/footer.php
	application/views/templates/header.php
 2016-06-21 11:28:46 +02:00
Paminger dbe19fafb5 Messages 2016-06-21 11:27:36 +02:00
paolo 6dc145d618 Merge origin/ci into ci 2016-06-21 11:11:14 +02:00
paolo 5a5a22e0d5 - Removed body tag from footer.php and header.php 
- Added permission fs/dms to dump.sql and fhcomplete.php
- Added FilesystemLib to read and write from/in filesystem
- Added FS_Model to manage filesystem with the same permission system of DB_Model
- Added more models to handle the Dms
- Modified Dms controller to use the new models
 2016-06-21 11:10:55 +02:00