summaryrefslogtreecommitdiffstats
path: root/modules-available/locationinfo
diff options
context:
space:
mode:
authorJannik Schönartz2017-03-04 18:18:49 +0100
committerJannik Schönartz2017-03-04 18:18:49 +0100
commit1a19e800b4c6e3b2413bcd1d3d5b85b6f9179d7e (patch)
tree3ae21c33ba0f5224235b3ef8d90c29e7872cbf4a /modules-available/locationinfo
parentfrontend: fixed calendar (diff)
downloadslx-admin-1a19e800b4c6e3b2413bcd1d3d5b85b6f9179d7e.tar.gz
slx-admin-1a19e800b4c6e3b2413bcd1d3d5b85b6f9179d7e.tar.xz
slx-admin-1a19e800b4c6e3b2413bcd1d3d5b85b6f9179d7e.zip
ServerList: Fixed a bug while editing the list would not show the not selected Servers. Dummy updates to a current-dated date.
Diffstat (limited to 'modules-available/locationinfo')
-rw-r--r--modules-available/locationinfo/api.inc.php1
-rw-r--r--modules-available/locationinfo/inc/coursebackend/coursebackend_dummy.inc.php4
-rw-r--r--modules-available/locationinfo/page.inc.php1
3 files changed, 3 insertions, 3 deletions
diff --git a/modules-available/locationinfo/api.inc.php b/modules-available/locationinfo/api.inc.php
index 1b4f9d59..0c4a1b67 100644
--- a/modules-available/locationinfo/api.inc.php
+++ b/modules-available/locationinfo/api.inc.php
@@ -91,7 +91,6 @@ function getCalendar($idList) {
$serverInstance = CourseBackend::getInstance($server['type']);
$serverInstance->setCredentials(json_encode($server['credentials']), $server['serverurl'], $server['serverid']);
$calendarFromBackend = $serverInstance->fetchSchedule($server['idList']);
-
$formattedArray = array();
foreach ($calendarFromBackend as $key => $value) {
$y['id'] = $key;
diff --git a/modules-available/locationinfo/inc/coursebackend/coursebackend_dummy.inc.php b/modules-available/locationinfo/inc/coursebackend/coursebackend_dummy.inc.php
index 09809eb3..23f62455 100644
--- a/modules-available/locationinfo/inc/coursebackend/coursebackend_dummy.inc.php
+++ b/modules-available/locationinfo/inc/coursebackend/coursebackend_dummy.inc.php
@@ -38,8 +38,8 @@ class Coursebackend_Dummy extends CourseBackend {
foreach ($roomId as $id) {
$x['id'] = $id;
$calendar['title'] = "test exam";
- $calendar['start'] = "2017-February-20 10:00:00";
- $calendar['end'] = "2017-February-20 12:00:00";
+ $calendar['start'] = "2017-3-08 13:00:00";
+ $calendar['end'] = "2017-3-08 16:00:00";
$calarray = array();
$calarray[] = $calendar;
$x['calendar'] = $calarray;
diff --git a/modules-available/locationinfo/page.inc.php b/modules-available/locationinfo/page.inc.php
index c2abe93f..537d0887 100644
--- a/modules-available/locationinfo/page.inc.php
+++ b/modules-available/locationinfo/page.inc.php
@@ -349,6 +349,7 @@ class Page_LocationInfo extends Page
$st['active'] = true;
} else {
$st['type'] = $type['type'];
+ $st['display'] = $type['display'];
$st['active'] = false;
}
$serverty[] = $st;