Commit Graph

468 Commits

Author SHA1 Message Date
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 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
Paminger a987eba1ac Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-06-17 00:13:35 +02:00
Paminger 4c58b95728 Libs and Vorlagen 2016-06-17 00:12:46 +02:00
paolo c5ee56f23d Moved _validate method from the model Person_model to the controller Person 2016-06-16 12:18:29 +02:00
Paminger 7766595c5d Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci 2016-06-16 11:41:23 +02:00
Paminger 9ed42794a7 Recover fhcdb_helper 2016-06-16 11:40:49 +02:00
paolo 6536ff155c - Moved the _validate method from the controller Person to the model Person_model
- Fixed method _validate
2016-06-15 14:09:01 +02:00
paolo dfa5b0386d - Added method getOnlyKontakt to controller Kontakt 2016-06-14 15:23:08 +02:00
paolo a8b7be6ad5 - Added controller CheckUserAuth to authenticate the end user
- FHC_Auth now extends directly authentication
2016-06-14 15:19:34 +02:00
Paminger eb712f4242 Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci
Conflicts:
	application/core/FHC_Model.php
2016-06-10 15:41:09 +02:00
Paminger 850777476e Message 2016-06-09 10:00:23 +02:00
paolo d237915e80 - Added file read/write from/to file system functionality in Dms 2016-06-08 17:52:14 +02:00
paolo 3955d4b395 - Moved old libraries to CI
- Extended Controllers functionalities
- Added controls to ueberbuchung.php, zeitwuensche.php and funktion_det.php
pages to avoid warnings and notices, especially when no data are in DB
- Removed fhcdb_helper.php because it's no more needed
2016-06-07 17:55:31 +02:00
paolo dabcf8188b - Modified FHC_Model contructor to get UID from vilesci authentication
- Copied functionalities from old libraries to controllers
- Ported old libraries to CI
- Modified codeception
2016-06-03 16:19:06 +02:00
paolo 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
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
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 6b1968ae5b Codesniffer compliant: if, for and while 2016-05-20 13:04:25 +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 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 b0c1e50e47 added workaround for parsing data 2016-05-11 11:56:18 +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
Paminger e624540c16 Message 2016-05-10 14:12:33 +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 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
Paminger 1a36ce3dff Models 2016-05-04 07:17:07 +02:00
Paminger 6836c3608d Models 2016-05-04 07:05:23 +02:00
Paminger fc6e2de1c9 ACL-System 2016-05-02 16:07:25 +02:00
Paminger 5bd5ac4aad sparch model 2016-05-02 00:37:42 +02:00
Paminger b52ffa8974 OE 2016-05-01 23:34:49 +02:00
Paminger 8cb8782586 ACL-Fix 2016-05-01 11:53:15 +02:00
paolo 51774021b4 Codeception 2016-04-27 11:46:29 +02:00
paolo 4cc83999ed - Moved class APIv1_Controller from FHC_Controller.php to APIv1_Controller.php
- Moved class DB_Model from FHC_Model.php to DB_Model.php
- load method of class person (person.class.php) now is calling getPerson
  method of the class Person_model
- getAllForBewerbung method of class studiengang (studiengang.class.php) now is calling getAllForBewerbung
  method of the class Studiengang_model
- getStudienplaene method of class studienplan (studienplan.class.php) now is calling getStudienplaene
  method of the class Studienplan_model
2016-04-25 18:25:03 +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
paolo f154e6dd5d Check permissions FIX 2016-04-22 16:43:01 +02:00
paolo 18df562208 Check permissions 2016-04-22 16:31:46 +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 aec2e7b5ac HTTP digest authentication
The digest http authentication does not allow to use a password storing
systems, that do not successively allow to retrieve it, even if hashed
2016-04-14 15:24:53 +02:00
Stefan Puraner a6031bbe2e merging message model 2016-04-11 10:05:19 +02:00