cf3ce680d6
config-eintraege hinzugefuegt; bugfixes pruefungsverwaltung und
...
studienplanansicht im cis; anpassungen zeugnis
2016-06-08 13:32:06 +02:00
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
ee39e5a3f7
Maximalen Datumsbereich auf 400 Tage vergroessert da es sonst zu Problemen kommt wenn das aktuelle und das nächste StSem nach Google exportiert wird
2016-06-07 14:06:25 +02:00
0dc605df3c
- Modified FHC_Model, now it is saving uid in CI session
...
- Added codeception tests
- Added statistik to dump.sql
- Moved old libraries to CI
2016-06-06 16:36:23 +02:00
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
73b69d8657
Reverted wrong commit
2016-06-01 17:45:39 +02:00
9f109127a5
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# cis/private/profile/studienplan.php
# locale/de-AT/pruefung.php
# locale/en-US/pruefung.php
# locale/it-IT/pruefung.php
# vilesci/lehre/lv_merge.php
2016-06-01 17:09:10 +02:00
8c8753b667
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
...
# Conflicts:
# include/studienplan.class.php
2016-06-01 16:52:57 +02:00
b0b3fe845a
Aliqoute Reduktion verwendet die MasterZGV bei Masterstudiengängen zur Reihung
2016-06-01 13:55:42 +02:00
5b0a843500
ital. phrases
2016-05-30 17:32:50 +02:00
f1098055fe
Merge branch 'master' of github.com:FH-Complete/FHC-Core
2016-05-30 16:00:58 +02:00
ba9d398b55
Engliche Fehlermeldung bei Fehlerhaftem Login
2016-05-30 16:00:26 +02:00
01143cd51d
it phrase
2016-05-26 22:17:29 +02:00
58738112e9
typo
2016-05-26 05:19:33 +02:00
18036f7a40
Studienjahr im rdf
2016-05-26 05:16:31 +02:00
7733f8df79
matr_nr added
2016-05-26 05:00:38 +02:00
5fd6070ea3
list changes
2016-05-26 04:47:05 +02:00
d7dc25dbc5
liste erweitert
2016-05-26 04:33:31 +02:00
de5eefc6fb
expand list
2016-05-26 04:14:49 +02:00
e390c49b2b
added mat_nr
2016-05-26 03:38:01 +02:00
04955a3ff1
Weiche f. milano
2016-05-26 03:10:53 +02:00
41bf684767
Matrikelnummer from Person added for use in generated list
2016-05-26 01:38:20 +02:00
9d0b2c1f0c
studienjahr_kurzbz added
2016-05-25 18:56:54 +02:00
54f8dfead7
studienjahr im rdf
2016-05-25 18:38:37 +02:00
efe7355a4d
Merge origin/ci into ci
2016-05-25 18:36:35 +02:00
00211ee647
- Added codeception test cases
...
- Moved old libraries to CI
2016-05-25 18:36:18 +02:00
dc991d7876
Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci
2016-05-24 17:19:33 +02:00
d47e506976
Ital. LV Bezeichnung
2016-05-24 17:05:48 +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
b07beff444
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2016-05-23 15:05:59 +02:00
fec722a481
fixed missing else clause
2016-05-23 15:03:44 +02:00
d899ccad08
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2016-05-23 12:25:14 +02:00
4bff558c1f
Versehentlich eingecheckt
2016-05-23 12:22:22 +02:00
abae24b0aa
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2016-05-23 12:07:34 +02:00
fc932b464d
SQL in function getStudienplaeneFromSem adaptiert
2016-05-23 11:49:57 +02:00
029395372b
Add Param $studiensemester_kurzbz in function getAllForBewerbung
2016-05-23 11:49:21 +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
Stefan Puraner