dc991d7876
Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci
2016-05-24 17:19:33 +02:00
70fba4d267
- Added property hasSequence to class DB_Model.
...
This property is used to indicate if the represented table has a primary
key that uses a sequence (true, otherwise false. Default is true).
- Method insert of DB_Model now checks the property hasSequence.
If it is true it uses the method insert_id() to return the primary key
of the row just inserted.
For any other values the method returns the primary key inserted coping
it directly from the parameters.
- Set the property hasSequence to false in the constructor of model Prestudentstatus
2016-05-24 16:56:14 +02:00
932243ccef
Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci
2016-05-24 15:33:23 +02:00
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
1026447281
Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci
2016-05-24 13:28:19 +02:00
eb845241d1
fixed error in save method
2016-05-24 13:26:07 +02:00
4f8826dc3f
Merge origin/ci into ci
...
Conflicts:
application/controllers/api/v1/crm/Prestudentstatus.php
2016-05-24 12:32:32 +02:00
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
58e9eb37a2
Merge pull request #3 from nscbrandb/ci
...
Ci
2016-05-24 11:48:09 +02:00
71f3b91516
removed debugging code
2016-05-24 10:05:43 +02:00
facb7750d7
added method to get all data
2016-05-24 09:27:27 +02:00
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
42d0ef79fd
undoing ci_hack.php
2016-05-23 11:44:03 +02:00
419ca7ac46
Merge branch 'ci' of https://github.com/nscbrandb/FHC-Core into ci
...
Conflicts:
ci_hack.php
2016-05-23 11:35:23 +02:00
489848c629
Merge origin/ci into ci
2016-05-23 10:32:50 +02:00
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
3bf093fd2c
Fix
2016-05-23 09:44:01 +02:00
cf272c0e40
added method to parse post data
2016-05-20 17:34:22 +02:00
dfea2bab26
Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci
2016-05-20 16:11:56 +02:00
606bd3d342
Added method PrestudentByPersonID to Prestudent controller
2016-05-20 14:07:31 +02:00
3e6ac6987e
Merge origin/ci into ci
2016-05-20 13:04:41 +02:00
6b1968ae5b
Codesniffer compliant: if, for and while
2016-05-20 13:04:25 +02:00
e441886748
Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci
2016-05-20 12:21:45 +02:00
f3a49e09e7
Demo
2016-05-20 12:21:04 +02:00
cd10d96c91
- Added permissions and linked them to user admin in dump.sql
...
- Modified validate methods to public for classes benutzer, student and mitarbeiter
2016-05-20 12:09:18 +02:00
da8f7251e0
Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci
2016-05-20 11:22:23 +02:00
e5554ad1ba
Merge origin/ci into ci
2016-05-20 11:05:12 +02:00
ffac4458ef
Added permissions for user amdin in the DB
2016-05-20 11:04:51 +02:00
ffac73c447
GitIgnore
2016-05-20 11:03:45 +02:00
3c6638fac6
Added permissions for user amdin in the DB
2016-05-20 11:01:52 +02:00
d4994c95e9
New Build Folder
2016-05-20 10:38:28 +02:00
bf1a16427c
PHPCI
2016-05-20 10:33:19 +02:00
815d34ebb6
PHPCI
2016-05-20 10:25:10 +02:00
9a4c03fd45
Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci
2016-05-20 09:56:27 +02:00
42e911b4fe
CodeSniffer
2016-05-20 07:44:08 +02:00
39cbed0ca8
Added directory education and its relative controllers
2016-05-19 19:04:45 +02:00
32acc8a414
Fixed controllers parameters names and number
2016-05-19 15:51:15 +02:00
674e832392
disContinuous disIntegration
2016-05-18 16:09:47 +02:00
9cf11673ae
Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci
2016-05-18 15:41:33 +02:00
e88da56dd7
Added method PreinteressentByPersonID to Preinteressent controller
2016-05-18 15:26:37 +02:00
a95d1f634b
Fixed permission for lehre.vw_studienplan
2016-05-18 12:03:07 +02:00
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
0f3e299cf4
Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci
2016-05-18 10:24:50 +02:00
e34bda9649
Composer Merge-Plugin für AddOn-spezifische composer.json's
2016-05-17 15:47:33 +02:00
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
f76b83ef64
- Fixed include of ci_db_extra.php in ci_hack.php
...
- Added delete for table public.tbl_preinteressent in dump.sql
2016-05-12 16:55:21 +02:00
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
b523a68fdc
Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci
2016-05-12 10:21:07 +02:00
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
ae80f2f1e9
Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci
2016-05-12 09:07:04 +02:00
Stefan Puraner