HoshinoKoji/psychojs
1
0
Fork 0
mirror of https://github.com/psychopy/psychojs.git synced 2025-05-10 18:50:54 +00:00
Code Actions Packages Releases Activity

Merge pull request #494 from apitiot/2022.1.3

Browse Source 
BF issue with projectId field when saving to database
This commit is contained in:
Alain Pitiot 2022-05-10 09:30:57 +02:00 committed by GitHub
commit d28834c4cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "psychojs", "name": "psychojs",
"version": "2022.1.1", "version": "2022.1.3",
"private": true, "private": true,
"description": "Helps run in-browser neuroscience, psychology, and psychophysics experiments", "description": "Helps run in-browser neuroscience, psychology, and psychophysics experiments",
"license": "MIT", "license": "MIT",

9
src/core/PsychoJS.js
View File

@ -18,7 +18,6 @@ import { GUI } from "./GUI.js";
import { Logger } from "./Logger.js"; import { Logger } from "./Logger.js";
import { ServerManager } from "./ServerManager.js"; import { ServerManager } from "./ServerManager.js";
import { Window } from "./Window.js"; import { Window } from "./Window.js";
// import {Shelf} from "../data/Shelf";
/** /**
* <p>PsychoJS manages the lifecycle of an experiment. It initialises the PsychoJS library and its various components (e.g. the {@link ServerManager}, the {@link EventManager}), and is used by the experiment to schedule the various tasks.</p> * <p>PsychoJS manages the lifecycle of an experiment. It initialises the PsychoJS library and its various components (e.g. the {@link ServerManager}, the {@link EventManager}), and is used by the experiment to schedule the various tasks.</p>
@ -109,11 +108,6 @@ export class PsychoJS
return this._browser; return this._browser;
} }
// get shelf()
// {
// return this._shelf;
// }
/** /**
* @constructor * @constructor
* @public * @public
@ -158,9 +152,6 @@ export class PsychoJS
// Window: // Window:
this._window = undefined; this._window = undefined;
// // Shelf:
// this._shelf = new Shelf(this);
// redirection URLs: // redirection URLs:
this._cancellationUrl = undefined; this._cancellationUrl = undefined;
this._completionUrl = undefined; this._completionUrl = undefined;

4
src/data/ExperimentHandler.js
View File

@ -338,14 +338,14 @@ export class ExperimentHandler extends PsychObject
else if (this._psychoJS.config.experiment.saveFormat === ExperimentHandler.SaveFormat.DATABASE) else if (this._psychoJS.config.experiment.saveFormat === ExperimentHandler.SaveFormat.DATABASE)
{ {
const gitlabConfig = this._psychoJS.config.gitlab; const gitlabConfig = this._psychoJS.config.gitlab;
const projectId = (typeof gitlabConfig !== "undefined" && typeof gitlabConfig.projectId !== "undefined") ? gitlabConfig.projectId : undefined; const __projectId = (typeof gitlabConfig !== "undefined" && typeof gitlabConfig.projectId !== "undefined") ? gitlabConfig.projectId : undefined;
let documents = []; let documents = [];
for (let r = 0; r < data.length; r++) for (let r = 0; r < data.length; r++)
{ {
let doc = { let doc = {
projectId, __projectId,
__experimentName: this._experimentName, __experimentName: this._experimentName,
__participant: this._participant, __participant: this._participant,
__session: this._session, __session: this._session,

1
src/data/index.js
View File

@ -2,4 +2,3 @@ export * from "./ExperimentHandler.js";
export * from "./TrialHandler.js"; export * from "./TrialHandler.js";
export * from "./QuestHandler.js"; export * from "./QuestHandler.js";
export * from "./MultiStairHandler.js"; export * from "./MultiStairHandler.js";
//export * from "./Shelf.js";