From 591d3b2eb8c0e2f2cb98cc661935e75bc6e9cf25 Mon Sep 17 00:00:00 2001
From: Julian Dehne <julian.dehne@uni-potsdam.de>
Date: Tue, 10 Apr 2018 13:19:29 +0200
Subject: [PATCH] =?UTF-8?q?Warnungsfelder=20eingef=C3=BCgt.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
studentview/assets/js/config.js | 3 ++-
studentview/database/config.php | 4 ++--
studentview/pages/preferences.php | 5 ++++-
studentview/register.php | 1 +
4 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/studentview/assets/js/config.js b/studentview/assets/js/config.js
index b0becceb..af79dfc9 100644
--- a/studentview/assets/js/config.js
+++ b/studentview/assets/js/config.js
@@ -1,2 +1,3 @@
//var compbaseUrl = "https://esb.uni-potsdam.de:8243/services/competenceBase";
-var compbaseUrl = "http://fleckenroller.cs.uni-potsdam.de/app/competence-database-prod";
\ No newline at end of file
+//var compbaseUrl = "http://fleckenroller.cs.uni-potsdam.de/app/competence-database-prod";
+var compbaseUrl = "https://apiup.uni-potsdam.de/endpoints/competenceAPI";
diff --git a/studentview/database/config.php b/studentview/database/config.php
index f5ed444e..b350864e 100644
--- a/studentview/database/config.php
+++ b/studentview/database/config.php
@@ -6,5 +6,5 @@
* Time: 12:38
*/
-$db = mysqli_connect("localhost", "root2", "voyager2", "fltrail");
-//$db = mysqli_connect("localhost", "root", "voyager", "fltrail");
+//$db = mysqli_connect("localhost", "root2", "voyager2", "fltrail");
+$db = mysqli_connect("localhost", "root", "voyager", "fltrail");
diff --git a/studentview/pages/preferences.php b/studentview/pages/preferences.php
index 9ddf8def..30dd2ca3 100644
--- a/studentview/pages/preferences.php
+++ b/studentview/pages/preferences.php
@@ -103,8 +103,11 @@ $projectName = $resultObj->id;
</div>
</fieldset>
<button class="btn btn-primary" id="studentFormSubmit" style="width:90px;margin-left:169px;margin-top:13px;">
- Eintragen
+ eintragen
</button>
+ <div class="alert alert-warning" role="alert">
+ Das Verarbeiten der Lernziele und das Gruppenmatching kann einen Moment dauern!
+ </div>
</div>
</body>
diff --git a/studentview/register.php b/studentview/register.php
index f9383b14..9a7db9eb 100644
--- a/studentview/register.php
+++ b/studentview/register.php
@@ -22,6 +22,7 @@
<div class="form-group"><input class="form-control" name="name" placeholder="Name"></div>
<div class="form-group"><input class="form-control" type="email" name="email" placeholder="Email"></div>
<div class="form-group"><input class="form-control" type="password" name="password" placeholder="Password"></div>
+ <div class="form-group"><label>Bitte kein sensibeles Passwort verwenden!</label></div>
<!--<div class="form-group"><input class="form-control" type="password" name="password"
placeholder="Password wiederholen"></div>-->
<div class="form-group"><button class="btn btn-primary btn-block" type="submit">registrieren</button></div>
--
GitLab