blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-03 05:09:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,963 Commits 225 Branches 6 Tags
dc991d7876c85f54eded70c78c43cdfd121afa6c
Commit Graph

73 Commits

Author SHA1 Message Date
Stefan Puraner 932243ccef Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-05-24 15:33:23 +02:00
paolo e76e1af15c - Remove parameters "new" after checked it in method postPrestudentstatus of controller Prestudentstatus 
- Method insert of DB_Model doesn't use anymore insert_id() from CI because it forces to have a sequence
  and doesn't return the primary key when it's composed by more columns
 2016-05-24 15:04:35 +02:00
Stefan Puraner 1026447281 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-05-24 13:28:19 +02:00
Stefan Puraner eb845241d1 fixed error in save method 2016-05-24 13:26:07 +02:00
paolo 4f8826dc3f Merge origin/ci into ci 
Conflicts:
	application/controllers/api/v1/crm/Prestudentstatus.php
 2016-05-24 12:32:32 +02:00
paolo bb3f8ef617 - Added method getStudienplan to the controller Studienplan 
- Introduced parameter new in method postPrestudentstatus of the controller Prestudentstatus
 2016-05-24 12:28:49 +02:00
Stefan Puraner 71f3b91516 removed debugging code 2016-05-24 10:05:43 +02:00
Stefan Puraner facb7750d7 added method to get all data 2016-05-24 09:27:27 +02:00
paolo c6efbac308 - Added permission "basis/dms_version" for table campus.tbl_dms_version 
- Added dms functionalities to relative controller and model
 2016-05-23 15:34:59 +02:00
paolo 489848c629 Merge origin/ci into ci 2016-05-23 10:32:50 +02:00
paolo a34f82fd3c - Added permission "basis/studienplan_semester" for table lehre.tbl_studienplan_semester 
- Added method getStudienplaeneFromSem in controller Studienplan
- Added method getNextStudiensemester in controller Studiensemester
 2016-05-23 10:32:21 +02:00
Stefan Puraner cf272c0e40 added method to parse post data 2016-05-20 17:34:22 +02:00
Stefan Puraner dfea2bab26 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-05-20 16:11:56 +02:00
paolo 606bd3d342 Added method PrestudentByPersonID to Prestudent controller 2016-05-20 14:07:31 +02:00
paolo 6b1968ae5b Codesniffer compliant: if, for and while 2016-05-20 13:04:25 +02:00
Stefan Puraner 9a4c03fd45 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-05-20 09:56:27 +02:00
paolo 39cbed0ca8 Added directory education and its relative controllers 2016-05-19 19:04:45 +02:00
paolo 32acc8a414 Fixed controllers parameters names and number 2016-05-19 15:51:15 +02:00
Stefan Puraner 9cf11673ae Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-05-18 15:41:33 +02:00
paolo e88da56dd7 Added method PreinteressentByPersonID to Preinteressent controller 2016-05-18 15:26:37 +02:00
paolo 5d7d79b086 - Renamed every controller that has conflicts with class name 
- Added routes to renamed controllers
 - Fixed controllers parameters in get method
 2016-05-18 11:24:10 +02:00
Stefan Puraner 0f3e299cf4 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-05-18 10:24:50 +02:00
paolo de9e92e3b0 - Added permissions for every DB tables that has a model 
- Added all controllers for every model
- All controller has a load and a insert/update method
 2016-05-13 19:00:40 +02:00
paolo d48f586af2 - Added new permission to access to tbl_preinteressent table using basis/preinteressent 
- Added controller Preinteressent with method to read/write from/in the DB
 2016-05-12 13:54:31 +02:00
Stefan Puraner b523a68fdc Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-05-12 10:21:07 +02:00
paolo 63db2326ed - Added new permission to access to tbl_studiengang table using basis/studiengang 
- Added method getStudiengang to class Studiengang2 to get a studiengang from pk
- Added method addDistinct to class DB_Model to add the distinct clause to a query
 2016-05-12 10:05:29 +02:00
Stefan Puraner ae80f2f1e9 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-05-12 09:07:04 +02:00
paolo 0132356094 - Added new permission to access to tbl_addresse table using basis/adresse 
- Added adresse controller and model
 2016-05-11 15:12:35 +02:00
Stefan Puraner bf4da6f43b Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-05-11 11:58:09 +02:00
Stefan Puraner b0c1e50e47 added workaround for parsing data 2016-05-11 11:56:18 +02:00
paolo 4413a64860 - Added new permission to access to tbl_bundesland table using basis/nation 
- Added bundesland controller and model
 2016-05-11 10:40:08 +02:00
Stefan Puraner 64a822881a Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-05-11 08:00:48 +02:00
paolo 9168479912 - Moved class Studiengang to Studiengang2 to prevent class name conflicts 
- Added a route rule to let to call Studiengang2 controller with the urn /api/v1/organisation/studiengang/
 - Moved Kontank controller to /api/v1/person
 - Kontakt controller has two method getKontakt and postKontakt
 2016-05-10 15:30:00 +02:00
Paminger 4b9d5d273b Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 
Conflicts:
	application/config/fhcomplete.php
	application/core/FHC_Model.php
 2016-05-10 14:36:01 +02:00
Stefan Puraner 4d406ea389 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-05-10 14:12:54 +02:00
Stefan Puraner 440cac91d6 person model: added method that return list of db columns 2016-05-10 13:46:01 +02:00
paolo 44ebe15c9c - Method getCheckBewerbung implemented with new standard 
- Added new permission in fhcomplete.php config file
 2016-05-10 13:05:02 +02:00
paolo 6d093dc4ed - DB_Model added new functionalities 
- Codeception changed
 - Studiengang_model fixed message error
 - Removed File and File_model, they will be replaced by Dms and Dms_model
 - Added new permissions in fhcomplete config file
 2016-05-09 18:19:58 +02:00
paolo 28e1707b4e Change paths 2016-05-04 16:20:26 +02:00
paolo 85f3ea1dab Moving 2016-05-04 15:43:40 +02:00
paolo 030fe2ba74 Merge origin/ci into ci 
Conflicts:
	application/core/FHC_Model.php
	application/models/Nation_model.php
	application/models/lehre/Studiengang_model.php
	application/models/lehre/Studienplan_model.php
 2016-05-04 15:34:00 +02:00
paolo 53eab958dd New structure for CI controllers and models 2016-05-04 15:19:11 +02:00
Stefan Puraner d06a7acdc3 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-05-02 13:00:58 +02:00
paolo a3a9c42e99 - Renamed classes, methods and properties names in german 
- All the controllers exends APIv1_Controller rather than REST_Controller
 - Codeceptions modified to be compliant to changes
 2016-04-25 15:57:52 +02:00
Paminger ecff3747d0 Dontknow 2016-04-25 14:25:09 +02:00
paolo f6f533a23b API Calls codeception 
Fixed translations
 2016-04-22 14:44:40 +02:00
paolo 346b8c82e1 JSON output improved 2016-04-22 11:08:38 +02:00
paolo 75e3590a09 This is not the best code in the world, it's only a beta version 2016-04-21 17:17:30 +02:00
paolo 78e4c2900b Merge origin/ci into ci 
Conflicts:
	application/config/rest.php
	application/libraries/FHC_Auth.php
	tests/codeception/api/LoginCept.php
 2016-04-20 17:57:55 +02:00
paolo 0ffe7fbcc6 Merge origin/ci into ci 
Conflicts:
	application/config/rest.php
	application/libraries/FHC_Auth.php
	tests/codeception/api/LoginCept.php
 2016-04-18 09:03:15 +02:00