Review GBLXAPI activityID

Mocahteam · Mar 27, 2022 · 357aba6 · 357aba6
1 parent d1ac062
commit 357aba6
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 19 deletions.
diff --git a/Assets/GBLXAPI/GBL_Interface.cs b/Assets/GBLXAPI/GBL_Interface.cs
@@ -42,7 +42,7 @@ Here is where you will put functions to be called whenever you want to send a GB
 	public static void SendStatement(string verb, string activityType, Dictionary<string, string> activityExtensions = null)
     {
         ActivityBuilder.IOptional activityBuilder = GBLXAPI.Activity
-            .WithID("https://www.lip6.fr/mocah/ELS")
+            .WithID("https://www.lip6.fr/mocah/ELS/" + activityType)
             .WithType(activityType);
         if (activityExtensions != null)
         {
@@ -68,7 +68,7 @@ public static void SendStatementWithResult(string verb, string activityType, Dic
         float duration = 0)
     {
         ActivityBuilder.IOptional activityBuilder = GBLXAPI.Activity
-            .WithID("https://www.lip6.fr/mocah/ELS")
+            .WithID("https://www.lip6.fr/mocah/ELS/" + activityType)
             .WithType(activityType);
         if (activityExtensions != null)
         {

diff --git a/Assets/Scenes/E-LearningScape.unity b/Assets/Scenes/E-LearningScape.unity
@@ -6396,8 +6396,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 106.50002, y: -94.600586}
-  m_SizeDelta: {x: 213.00005, y: 189.20117}
+  m_AnchoredPosition: {x: 106.53, y: -94.54999}
+  m_SizeDelta: {x: 213.06, y: 189.09998}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &36757011
 MonoBehaviour:
@@ -77383,7 +77383,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: Mode FPS classique
+  m_text: Mode "FPS" classique
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 388fb88c7332f6a4086c9d1069ce3d53, type: 2}
   m_sharedMaterial: {fileID: 3898167904873870984, guid: 388fb88c7332f6a4086c9d1069ce3d53,
@@ -210530,8 +210530,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 593.3201, y: -94.600586}
-  m_SizeDelta: {x: 213.00005, y: 189.20117}
+  m_AnchoredPosition: {x: 593.47, y: -94.54999}
+  m_SizeDelta: {x: 213.06, y: 189.09998}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1237026450
 MonoBehaviour:
@@ -216710,8 +216710,8 @@ Light:
   m_BounceIntensity: 1.3
   m_ColorTemperature: 6570
   m_UseColorTemperature: 0
-  m_BoundingSphereOverride: {x: 0.00000001048925, y: 0.000000013224329, z: 1.3678663e+22,
-    w: 1.3371067e+22}
+  m_BoundingSphereOverride: {x: -3.0316488e-13, y: -6.617525e-24, z: 6.344131e-17,
+    w: NaN}
   m_UseBoundingSphereOverride: 0
   m_ShadowRadius: 0
   m_ShadowAngle: 0
@@ -271450,8 +271450,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 349.91006, y: -94.600586}
-  m_SizeDelta: {x: 213.00005, y: 189.20117}
+  m_AnchoredPosition: {x: 350, y: -94.54999}
+  m_SizeDelta: {x: 213.06, y: 189.09998}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1700948983
 MonoBehaviour:

diff --git a/Assets/StreamingAssets/Access/LRSConfig.txt b/Assets/StreamingAssets/Access/LRSConfig.txt
@@ -1,7 +1,7 @@
 [
   {
     "lrsURL": "https://lrsels.lip6.fr/data/xAPI",
-    "lrsUser": "3d265c625aa010aae2eec8ac30c40f1fd29d7c74",
-    "lrsPassword": "007b97bd815024ec1197b5a9c3a72b75ee83da19"
+    "lrsUser": "00cb27562338a9969d0587c0272d3ac72223fc4d",
+    "lrsPassword": "7ef2bf266333f97d505487fadbd62580a8a9eac6"
   }
 ]
diff --git a/Assets/StreamingAssets/Info/InternalData.txt b/Assets/StreamingAssets/Info/InternalData.txt
@@ -2,7 +2,7 @@
     "trace": true,
     "helpSystem": true,
     "randomHelpSystemActivation": false,
-    "traceToLRS": false,
+    "traceToLRS": true,
     "traceMovementFrequency": 2,
 	"virtualDreamFragment": true,
     "virtualPuzzle": true,

diff --git a/Assets/StreamingAssets/Info/LRSConfig.txt b/Assets/StreamingAssets/Info/LRSConfig.txt
@@ -1,7 +1,7 @@
 [
   {
     "lrsURL": "https://lrsels.lip6.fr/data/xAPI",
-    "lrsUser": "3d265c625aa010aae2eec8ac30c40f1fd29d7c74",
-    "lrsPassword": "007b97bd815024ec1197b5a9c3a72b75ee83da19"
+    "lrsUser": "00cb27562338a9969d0587c0272d3ac72223fc4d",
+    "lrsPassword": "7ef2bf266333f97d505487fadbd62580a8a9eac6"
   }
 ]
diff --git a/Assets/StreamingAssets/Peda/LRSConfig.txt b/Assets/StreamingAssets/Peda/LRSConfig.txt
@@ -1,7 +1,7 @@
 [
   {
     "lrsURL": "https://lrsels.lip6.fr/data/xAPI",
-    "lrsUser": "3d265c625aa010aae2eec8ac30c40f1fd29d7c74",
-    "lrsPassword": "007b97bd815024ec1197b5a9c3a72b75ee83da19"
+    "lrsUser": "00cb27562338a9969d0587c0272d3ac72223fc4d",
+    "lrsPassword": "7ef2bf266333f97d505487fadbd62580a8a9eac6"
   }
 ]
diff --git a/Assets/Systems/SendStatements.cs b/Assets/Systems/SendStatements.cs
@@ -36,7 +36,7 @@ public void initPlayerName(string sessionID)
         //Generate player name unique to each playing session (computer name + date + hour)
         GBL_Interface.playerName = sessionID;
         //Generate a UUID from the player name
-        GBL_Interface.userUUID = GBLUtils.GenerateActorUUID(sessionID);
+        GBL_Interface.userUUID = sessionID;
     }
 
 	// Use this to update member variables when system resume.