Commit 1417de50 authored by ZeMKI's avatar ZeMKI

Network sorting update

* now every section has a label inside.
* option to have labels on hover (commented).
* values are saved correctly.
* now when creating a new study you can preview the sorting.
parent b3446ebc
......@@ -2,36 +2,18 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="b51d2beb-a115-4b2a-80a2-b27cfb404d6c" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/resources/js/components/Interview/circle-sorting.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resources/js/components/Interview/interviewlist.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resources/js/components/Interview/network-sorting.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resources/js/components/Interview/newinterview.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resources/js/components/Interview/newtokenmodal.vue" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resources/js/components/Interview/q-sort.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/mesort.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/mesort.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/php.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/php.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/sonarlint/issuestore/index.pb" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/sonarlint/issuestore/index.pb" afterDir="false" />
<change afterPath="$PROJECT_DIR$/resources/js/components/Interview/sorting_preview.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/InterviewController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/InterviewController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/composer.json" beforeDir="false" afterPath="$PROJECT_DIR$/composer.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/composer.lock" beforeDir="false" afterPath="$PROJECT_DIR$/composer.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/package-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/package-lock.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Sorting.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Sorting.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/js/manifest.js" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/js/app.js" beforeDir="false" afterPath="$PROJECT_DIR$/resources/js/app.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/js/components/interviewlist.vue" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/js/components/newinterview.vue" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/js/components/newtokenmodal.vue" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/js/components/sorting.vue" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/js/store/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/resources/js/store/index.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/sass/app.scss" beforeDir="false" afterPath="$PROJECT_DIR$/resources/sass/app.scss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/auth/passwords/resetPassword.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/auth/passwords/resetPassword.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/email/setpassword.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/email/setpassword.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/home.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/home.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/layouts/headerinterview.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/layouts/headerinterview.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/layouts/interview.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/layouts/interview.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/layouts/navinterview.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/layouts/navinterview.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/webpack.mix.js" beforeDir="false" afterPath="$PROJECT_DIR$/webpack.mix.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/yarn.lock" beforeDir="false" afterPath="$PROJECT_DIR$/yarn.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/js/components/Interview/network-sorting.vue" beforeDir="false" afterPath="$PROJECT_DIR$/resources/js/components/Interview/network-sorting.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/js/components/Interview/newinterview.vue" beforeDir="false" afterPath="$PROJECT_DIR$/resources/js/components/Interview/newinterview.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/js/components/newstudy.vue" beforeDir="false" afterPath="$PROJECT_DIR$/resources/js/components/newstudy.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/lang/en.json" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/lang/en/_json.php" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/resources/sass/_interview.scss" beforeDir="false" afterPath="$PROJECT_DIR$/resources/sass/_interview.scss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/interview/view.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/interview/view.blade.php" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
......@@ -47,6 +29,11 @@
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="JsbtTreeLayoutManager">
<layout place="tools.popupnpm">
<scroll-view-position x="0" y="0" />
</layout>
</component>
<component name="PhpWorkspaceProjectConfiguration">
<include_path>
<path value="$PROJECT_DIR$/vendor/barryvdh/laravel-translation-manager" />
......@@ -218,13 +205,33 @@
<property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/resources/js/components/Interview" />
<property name="node.js.detected.package.eslint" value="true" />
<property name="node.js.path.for.package.eslint" value="project" />
<property name="node.js.selected.package.eslint" value="(autodetect)" />
<property name="nodejs_package_manager_path" value="yarn" />
<property name="settings.editor.selected.configurable" value="reference.settings.ide.settings.web.browsers" />
<property name="run.code.analysis.last.selected.profile" value="pProject Default" />
<property name="settings.editor.selected.configurable" value="configurable.group.language" />
</component>
<component name="RecentsManager">
<key name="MoveFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/resources/lang/" />
</key>
<key name="CopyFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/resources/js/components/Interview" />
</key>
</component>
<component name="RunManager" selected="PHP Built-in Web Server.Valet mesort">
<configuration name="watch-poll" type="js.build_tools.npm" temporary="true" nameIsGenerated="true">
<package-json value="$PROJECT_DIR$/package.json" />
<command value="run" />
<scripts>
<script value="watch-poll" />
</scripts>
<node-interpreter value="project" />
<envs />
<method v="2" />
</configuration>
<configuration name="watch" type="js.build_tools.npm" temporary="true" nameIsGenerated="true">
<package-json value="$PROJECT_DIR$/package.json" />
<command value="run" />
......@@ -238,6 +245,7 @@
<recent_temporary>
<list>
<item itemvalue="npm.watch" />
<item itemvalue="npm.watch-poll" />
</list>
</recent_temporary>
</component>
......@@ -255,7 +263,13 @@
<workItem from="1589794755459" duration="6436000" />
<workItem from="1589803223504" duration="24000" />
<workItem from="1589803261511" duration="2415000" />
<workItem from="1589815034521" duration="16256000" />
<workItem from="1589815034521" duration="21711000" />
<workItem from="1589970319090" duration="7676000" />
<workItem from="1590133824905" duration="13209000" />
<workItem from="1590395860432" duration="74000" />
<workItem from="1590396032148" duration="11625000" />
<workItem from="1590480658730" duration="551000" />
<workItem from="1590484643170" duration="23958000" />
</task>
<servers />
</component>
......@@ -263,45 +277,90 @@
<option name="version" value="2" />
</component>
<component name="WindowStateProjectService">
<state x="767" y="491" key="ANALYSIS_DLG_com.intellij.analysis.BaseAnalysisAction$1" timestamp="1590053715461">
<screen x="0" y="0" width="2048" height="1280" />
</state>
<state x="767" y="491" key="ANALYSIS_DLG_com.intellij.analysis.BaseAnalysisAction$1/128.-1080.1920.1080/0.0.2048.1280@0.0.2048.1280" timestamp="1590053715461" />
<state x="770" y="559" key="ComposerInitDialogKey" timestamp="1589809796036">
<screen x="0" y="0" width="2048" height="1280" />
</state>
<state x="770" y="559" key="ComposerInitDialogKey/0.0.2048.1280@0.0.2048.1280" timestamp="1589809796036" />
<state width="2006" height="371" key="GridCell.Tab.0.bottom" timestamp="1589909371637">
<state width="2006" height="398" key="GridCell.Tab.0.bottom" timestamp="1590569820144">
<screen x="0" y="0" width="2048" height="1280" />
</state>
<state width="2006" height="491" key="GridCell.Tab.0.bottom/0.0.2048.1280@0.0.2048.1280" timestamp="1590419278940" />
<state width="2006" height="406" key="GridCell.Tab.0.bottom/128.-1057.1920.1057/0.23.2048.1257@0.23.2048.1257" timestamp="1590060860387" />
<state width="2006" height="406" key="GridCell.Tab.0.bottom/128.-1080.1920.1080/0.0.2048.1280@0.0.2048.1280" timestamp="1590058941151" />
<state width="2006" height="398" key="GridCell.Tab.0.bottom/65.-1080.1920.1080/0.0.2048.1280@0.0.2048.1280" timestamp="1590569820144" />
<state width="1878" height="406" key="GridCell.Tab.0.bottom/65.-1080.1920.1080/0.0.2048.1280@65.-1080.1920.1080" timestamp="1590168747932" />
<state width="2006" height="398" key="GridCell.Tab.0.center" timestamp="1590569820142">
<screen x="0" y="0" width="2048" height="1280" />
</state>
<state width="2006" height="491" key="GridCell.Tab.0.center/0.0.2048.1280@0.0.2048.1280" timestamp="1590419278939" />
<state width="2006" height="406" key="GridCell.Tab.0.center/128.-1057.1920.1057/0.23.2048.1257@0.23.2048.1257" timestamp="1590060860386" />
<state width="2006" height="406" key="GridCell.Tab.0.center/128.-1080.1920.1080/0.0.2048.1280@0.0.2048.1280" timestamp="1590058941150" />
<state width="2006" height="398" key="GridCell.Tab.0.center/65.-1080.1920.1080/0.0.2048.1280@0.0.2048.1280" timestamp="1590569820142" />
<state width="1878" height="406" key="GridCell.Tab.0.center/65.-1080.1920.1080/0.0.2048.1280@65.-1080.1920.1080" timestamp="1590168747929" />
<state width="2006" height="398" key="GridCell.Tab.0.left" timestamp="1590569820141">
<screen x="0" y="0" width="2048" height="1280" />
</state>
<state width="2006" height="371" key="GridCell.Tab.0.bottom/0.0.2048.1280@0.0.2048.1280" timestamp="1589909371637" />
<state width="2006" height="371" key="GridCell.Tab.0.bottom/128.-1080.1920.1080/0.0.2048.1280@0.0.2048.1280" timestamp="1589802945120" />
<state width="2006" height="371" key="GridCell.Tab.0.center" timestamp="1589909371636">
<state width="2006" height="491" key="GridCell.Tab.0.left/0.0.2048.1280@0.0.2048.1280" timestamp="1590419278938" />
<state width="2006" height="406" key="GridCell.Tab.0.left/128.-1057.1920.1057/0.23.2048.1257@0.23.2048.1257" timestamp="1590060860385" />
<state width="2006" height="406" key="GridCell.Tab.0.left/128.-1080.1920.1080/0.0.2048.1280@0.0.2048.1280" timestamp="1590058941149" />
<state width="2006" height="398" key="GridCell.Tab.0.left/65.-1080.1920.1080/0.0.2048.1280@0.0.2048.1280" timestamp="1590569820141" />
<state width="1878" height="406" key="GridCell.Tab.0.left/65.-1080.1920.1080/0.0.2048.1280@65.-1080.1920.1080" timestamp="1590168747922" />
<state width="2006" height="398" key="GridCell.Tab.0.right" timestamp="1590569820143">
<screen x="0" y="0" width="2048" height="1280" />
</state>
<state width="2006" height="371" key="GridCell.Tab.0.center/0.0.2048.1280@0.0.2048.1280" timestamp="1589909371636" />
<state width="2006" height="371" key="GridCell.Tab.0.center/128.-1080.1920.1080/0.0.2048.1280@0.0.2048.1280" timestamp="1589802945119" />
<state width="2006" height="371" key="GridCell.Tab.0.left" timestamp="1589909371635">
<state width="2006" height="491" key="GridCell.Tab.0.right/0.0.2048.1280@0.0.2048.1280" timestamp="1590419278939" />
<state width="2006" height="406" key="GridCell.Tab.0.right/128.-1057.1920.1057/0.23.2048.1257@0.23.2048.1257" timestamp="1590060860386" />
<state width="2006" height="406" key="GridCell.Tab.0.right/128.-1080.1920.1080/0.0.2048.1280@0.0.2048.1280" timestamp="1590058941150" />
<state width="2006" height="398" key="GridCell.Tab.0.right/65.-1080.1920.1080/0.0.2048.1280@0.0.2048.1280" timestamp="1590569820143" />
<state width="1878" height="406" key="GridCell.Tab.0.right/65.-1080.1920.1080/0.0.2048.1280@65.-1080.1920.1080" timestamp="1590168747931" />
<state x="0" y="23" width="2048" height="1257" key="SettingsEditor" timestamp="1590572867401">
<screen x="0" y="0" width="2048" height="1280" />
</state>
<state width="2006" height="371" key="GridCell.Tab.0.left/0.0.2048.1280@0.0.2048.1280" timestamp="1589909371635" />
<state width="2006" height="371" key="GridCell.Tab.0.left/128.-1080.1920.1080/0.0.2048.1280@0.0.2048.1280" timestamp="1589802945118" />
<state width="2006" height="371" key="GridCell.Tab.0.right" timestamp="1589909371637">
<state x="0" y="23" width="2048" height="1257" key="SettingsEditor/128.-1080.1920.1080/0.0.2048.1280@0.0.2048.1280" timestamp="1590056101932" />
<state x="0" y="23" key="SettingsEditor/65.-1080.1920.1080/0.0.2048.1280@0.0.2048.1280" timestamp="1590572867401" />
<state x="754" y="390" width="597" height="524" key="StructurePopup" timestamp="1590585143194">
<screen x="0" y="0" width="2048" height="1280" />
</state>
<state width="2006" height="371" key="GridCell.Tab.0.right/0.0.2048.1280@0.0.2048.1280" timestamp="1589909371637" />
<state width="2006" height="371" key="GridCell.Tab.0.right/128.-1080.1920.1080/0.0.2048.1280@0.0.2048.1280" timestamp="1589802945120" />
<state x="563" y="279" key="SettingsEditor" timestamp="1589801732356">
<state x="754" y="390" width="597" height="524" key="StructurePopup/0.0.2048.1280@0.0.2048.1280" timestamp="1590585143194" />
<state x="754" y="390" width="597" height="524" key="StructurePopup/128.-1080.1920.1080/0.0.2048.1280@0.0.2048.1280" timestamp="1590054141097" />
<state x="754" y="390" width="598" height="526" key="StructurePopup/65.-1080.1920.1080/0.0.2048.1280@0.0.2048.1280" timestamp="1590574274986" />
<state x="772" y="-751" width="560" height="443" key="StructurePopup/65.-1080.1920.1080/0.0.2048.1280@65.-1080.1920.1080" timestamp="1590168084313" />
<state x="799" y="561" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1590581191374">
<screen x="0" y="0" width="2048" height="1280" />
</state>
<state x="563" y="279" key="SettingsEditor/128.-1080.1920.1080/0.0.2048.1280@0.0.2048.1280" timestamp="1589801732356" />
<state x="754" y="390" width="540" height="524" key="StructurePopup" timestamp="1589800679484">
<state x="799" y="561" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.2048.1280@0.0.2048.1280" timestamp="1590581191374" />
<state x="799" y="561" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/128.-1080.1920.1080/0.0.2048.1280@0.0.2048.1280" timestamp="1590054170589" />
<state x="799" y="561" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/65.-1080.1920.1080/0.0.2048.1280@0.0.2048.1280" timestamp="1590404098131" />
<state x="708" y="373" width="632" height="534" key="find.popup" timestamp="1590406250473">
<screen x="0" y="0" width="2048" height="1280" />
</state>
<state x="754" y="390" width="540" height="524" key="StructurePopup/0.0.2048.1280@0.0.2048.1280" timestamp="1589800679484" />
<state x="689" y="305" key="run.anything.popup" timestamp="1589882069680">
<screen x="0" y="23" width="2048" height="1257" />
<state x="708" y="373" width="632" height="534" key="find.popup/0.0.2048.1280@0.0.2048.1280" timestamp="1589968436681" />
<state x="708" y="373" width="632" height="534" key="find.popup/65.-1080.1920.1080/0.0.2048.1280@0.0.2048.1280" timestamp="1590406250473" />
<state x="899" y="515" width="250" height="278" key="jetbrains.javascript.buildTools.run-task-popup" timestamp="1590568927491">
<screen x="0" y="0" width="2048" height="1280" />
</state>
<state x="899" y="515" width="250" height="278" key="jetbrains.javascript.buildTools.run-task-popup/0.0.2048.1280@0.0.2048.1280" timestamp="1589969203120" />
<state x="899" y="515" width="250" height="278" key="jetbrains.javascript.buildTools.run-task-popup/65.-1080.1920.1080/0.0.2048.1280@0.0.2048.1280" timestamp="1590568927491" />
<state x="689" y="287" key="run.anything.popup" timestamp="1590057476445">
<screen x="0" y="0" width="2048" height="1280" />
</state>
<state x="689" y="305" key="run.anything.popup/128.-1057.1920.1057/0.23.2048.1257@0.23.2048.1257" timestamp="1589882069680" />
<state x="689" y="291" width="670" height="676" key="search.everywhere.popup" timestamp="1589810445002">
<state x="689" y="287" key="run.anything.popup/128.-1080.1920.1080/0.0.2048.1280@0.0.2048.1280" timestamp="1590057476445" />
<state x="824" y="505" width="498" height="379" key="scopes" timestamp="1590055889310">
<screen x="0" y="0" width="2048" height="1280" />
</state>
<state x="824" y="505" key="scopes/128.-1057.1920.1057/0.0.2048.1280@0.0.2048.1280" timestamp="1590055889310" />
<state x="824" y="505" width="498" height="379" key="scopes/128.-1080.1920.1080/0.0.2048.1280@0.0.2048.1280" timestamp="1590055356254" />
<state x="689" y="292" width="715" height="677" key="search.everywhere.popup" timestamp="1590574030439">
<screen x="0" y="0" width="2048" height="1280" />
</state>
<state x="689" y="291" width="670" height="676" key="search.everywhere.popup/0.0.2048.1280@0.0.2048.1280" timestamp="1589810445002" />
<state x="689" y="291" width="670" height="676" key="search.everywhere.popup/0.0.2048.1280@0.0.2048.1280" timestamp="1590150028065" />
<state x="689" y="291" width="670" height="676" key="search.everywhere.popup/128.-1080.1920.1080/0.0.2048.1280@0.0.2048.1280" timestamp="1590054146808" />
<state x="689" y="292" width="715" height="677" key="search.everywhere.popup/65.-1080.1920.1080/0.0.2048.1280@0.0.2048.1280" timestamp="1590574030439" />
<state x="711" y="-834" width="670" height="571" key="search.everywhere.popup/65.-1080.1920.1080/0.0.2048.1280@65.-1080.1920.1080" timestamp="1590165045513" />
</component>
</project>
\ No newline at end of file
......@@ -13,14 +13,27 @@ class Sorting extends Model
*/
public static function store($request, $study)
{
if (!$request->has('details')) {
if (!$request->has('details'))
{
$study->sortings()->detach();
// insert in details something according to the sorting
$circles = 'circles|' . $request->input('sorting.numberofcircles');
$description = '||description|' . $request->input('sorting.description');
$classifiers = $request->input('sorting.classifier') && $request->input('sorting.classifier')['name'] != 'none' ? '||classifier|' . $request->input('sorting.classifier')['name'] : '';
$study->sortings()->attach($request->get('sorting')['id'], ['details' => $circles . $description . $classifiers]);
} else {
if ($request->input('sorting.id') == 2)
{
$sections = '||divisions|' . $request->input('sorting.sectionNumber');
$sectionNames = '||names|' . join("|",$request->input('sorting.sections'));
$sectionCenter = '||center|' . $request->input('sorting.centerLabel')."||";
} else
{
$sections = "";
$sectionNames = "";
$sectionCenter = "";
}
$study->sortings()->attach($request->get('sorting')['id'], ['details' => $circles . $description . $classifiers . $sections . $sectionNames . $sectionCenter]);
} else
{
$study->sortings()->attach($request->get('sortingid'), ['details' => $request->get('details')]);
}
}
......
/******/ (function(modules) { // webpackBootstrap
/******/ // install a JSONP callback for chunk loading
/******/ function webpackJsonpCallback(data) {
/******/ var chunkIds = data[0];
/******/ var moreModules = data[1];
/******/ var executeModules = data[2];
/******/
/******/ // add "moreModules" to the modules object,
/******/ // then flag all "chunkIds" as loaded and fire callback
/******/ var moduleId, chunkId, i = 0, resolves = [];
/******/ for(;i < chunkIds.length; i++) {
/******/ chunkId = chunkIds[i];
/******/ if(Object.prototype.hasOwnProperty.call(installedChunks, chunkId) && installedChunks[chunkId]) {
/******/ resolves.push(installedChunks[chunkId][0]);
/******/ }
/******/ installedChunks[chunkId] = 0;
/******/ }
/******/ for(moduleId in moreModules) {
/******/ if(Object.prototype.hasOwnProperty.call(moreModules, moduleId)) {
/******/ modules[moduleId] = moreModules[moduleId];
/******/ }
/******/ }
/******/ if(parentJsonpFunction) parentJsonpFunction(data);
/******/
/******/ while(resolves.length) {
/******/ resolves.shift()();
/******/ }
/******/
/******/ // add entry modules from loaded chunk to deferred list
/******/ deferredModules.push.apply(deferredModules, executeModules || []);
/******/
/******/ // run deferred modules when all chunks ready
/******/ return checkDeferredModules();
/******/ };
/******/ function checkDeferredModules() {
/******/ var result;
/******/ for(var i = 0; i < deferredModules.length; i++) {
/******/ var deferredModule = deferredModules[i];
/******/ var fulfilled = true;
/******/ for(var j = 1; j < deferredModule.length; j++) {
/******/ var depId = deferredModule[j];
/******/ if(installedChunks[depId] !== 0) fulfilled = false;
/******/ }
/******/ if(fulfilled) {
/******/ deferredModules.splice(i--, 1);
/******/ result = __webpack_require__(__webpack_require__.s = deferredModule[0]);
/******/ }
/******/ }
/******/
/******/ return result;
/******/ }
/******/
/******/ // The module cache
/******/ var installedModules = {};
/******/
/******/ // object to store loaded and loading chunks
/******/ // undefined = chunk not loaded, null = chunk preloaded/prefetched
/******/ // Promise = chunk loading, 0 = chunk loaded
/******/ var installedChunks = {
/******/ "/js/manifest": 0
/******/ };
/******/
/******/ var deferredModules = [];
/******/
/******/ // The require function
/******/ function __webpack_require__(moduleId) {
/******/
/******/ // Check if module is in cache
/******/ if(installedModules[moduleId]) {
/******/ return installedModules[moduleId].exports;
/******/ }
/******/ // Create a new module (and put it into the cache)
/******/ var module = installedModules[moduleId] = {
/******/ i: moduleId,
/******/ l: false,
/******/ exports: {}
/******/ };
/******/
/******/ // Execute the module function
/******/ modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
/******/
/******/ // Flag the module as loaded
/******/ module.l = true;
/******/
/******/ // Return the exports of the module
/******/ return module.exports;
/******/ }
/******/
/******/
/******/ // expose the modules object (__webpack_modules__)
/******/ __webpack_require__.m = modules;
/******/
/******/ // expose the module cache
/******/ __webpack_require__.c = installedModules;
/******/
/******/ // define getter function for harmony exports
/******/ __webpack_require__.d = function(exports, name, getter) {
/******/ if(!__webpack_require__.o(exports, name)) {
/******/ Object.defineProperty(exports, name, { enumerable: true, get: getter });
/******/ }
/******/ };
/******/
/******/ // define __esModule on exports
/******/ __webpack_require__.r = function(exports) {
/******/ if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
/******/ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
/******/ }
/******/ Object.defineProperty(exports, '__esModule', { value: true });
/******/ };
/******/
/******/ // create a fake namespace object
/******/ // mode & 1: value is a module id, require it
/******/ // mode & 2: merge all properties of value into the ns
/******/ // mode & 4: return value when already ns object
/******/ // mode & 8|1: behave like require
/******/ __webpack_require__.t = function(value, mode) {
/******/ if(mode & 1) value = __webpack_require__(value);
/******/ if(mode & 8) return value;
/******/ if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
/******/ var ns = Object.create(null);
/******/ __webpack_require__.r(ns);
/******/ Object.defineProperty(ns, 'default', { enumerable: true, value: value });
/******/ if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
/******/ return ns;
/******/ };
/******/
/******/ // getDefaultExport function for compatibility with non-harmony modules
/******/ __webpack_require__.n = function(module) {
/******/ var getter = module && module.__esModule ?
/******/ function getDefault() { return module['default']; } :
/******/ function getModuleExports() { return module; };
/******/ __webpack_require__.d(getter, 'a', getter);
/******/ return getter;
/******/ };
/******/
/******/ // Object.prototype.hasOwnProperty.call
/******/ __webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
/******/
/******/ // __webpack_public_path__
/******/ __webpack_require__.p = "/";
/******/
/******/ var jsonpArray = window["webpackJsonp"] = window["webpackJsonp"] || [];
/******/ var oldJsonpFunction = jsonpArray.push.bind(jsonpArray);
/******/ jsonpArray.push = webpackJsonpCallback;
/******/ jsonpArray = jsonpArray.slice();
/******/ for(var i = 0; i < jsonpArray.length; i++) webpackJsonpCallback(jsonpArray[i]);
/******/ var parentJsonpFunction = oldJsonpFunction;
/******/
/******/
/******/ // run deferred modules from other chunks
/******/ checkDeferredModules();
/******/ })
/************************************************************************/
/******/ ([]);
\ No newline at end of file
......@@ -51,6 +51,7 @@ Vue.component('new-token', require('./components/Interview/newtokenmodal.vue').d
Vue.component('interview-list', require('./components/Interview/interviewlist.vue').default);
Vue.component('q-sort', require('./components/Interview/q-sort.vue').default);
Vue.component('network-sorting', require('./components/Interview/network-sorting.vue').default);
Vue.component('sorting-preview', require('./components/Interview/sorting_preview.vue').default);
Vue.component('userpart', require('./components/userpart.vue').default);
Vue.component('url-list', require('./components/publicurllist').default);
......
This diff is collapsed.
This diff is collapsed.
{
"E-Mail Address": "E-Mail Address",
"New Study": "New Studyyyy",
"Language": "Language",
"Create Study": "funzia?",
"To create a new study, you should provide some general information, choose a sorting scheme you wish to use and can add additional questions for your interviewees. To navigate between these options please use the three tabs provided below.": "To create a new study, you should provide some general information, choose a sorting scheme you wish to use and can add additional questions for your interviewees. To navigate between these options please use the three tabs provided below.",
"Please give your study a name, assign one or more responsible researchers and add a short description. All information is mandatory to successful save the study.": "sì",
"Choose Sorting Scheme": "Choose sorting scheme",
"Create new study": "Crea uno studio nuovo."
}
\ No newline at end of file
<?php
return array (
'E-Mail Address' => 'E-Mail Address',
'New Study' => 'New Study',
'Language' => 'Language',
'Create Study' => 'DaI!',
'To create a new study, you should provide some general information, choose a sorting scheme you wish to use and can add additional questions for your interviewees' =>
array (
' To navigate between these options please use the three tabs provided below' =>
array (
'' => 'To create a new study, you should provide some general information, choose a sorting scheme you wish to use and can add additional questions for your interviewees. To navigate between these options please use the three tabs provided below.',
),
),
);
/** Interview - view part */
.chosen-answer{
margin:10px 10px 10px 0;
}
.tag:not(body).is-primary {
background-color: $primary !important;
}
.chosen-answer-type{
margin:5px 5px 5px 0;
background-color:rgba(255, 255, 255, 0.2);
font-size:12px;
padding:3px;
text-transform: capitalize;
}
.available-answer{
margin:5px 5px 5px 0;
}
.question{
color: $red !important;
padding: 5px;
background-color:rgba(255, 255, 255, 0.2);
text-transform: uppercase;
}
/** Interview - create part */
.buttons-interview{
margin: 0 0 5px 0;
}
#style-1::-webkit-scrollbar {
top: 0;
}
......@@ -3,15 +3,14 @@
@section('content')
<div class="contrastbackground p-10">
<div class="container mx-auto mx-auto mx-auto mx-auto">
<div class="w-2/3 mx-auto">
<h1 class="font-bold text-4xl">{{$study->name}}</h1>
<p class="text-base">
<strong class="">{{__('Interview done by')}}:</strong> {{$author}}<br>
<strong class="">{{__('Interviewed')}}: </strong>{{$interview->interviewed}} <br>
<strong class="">{{__('From')}}: </strong>{{date('d.m.Y H:i:s', strtotime($interview->start))}}
- <strong class="">{{__('To')}}: </strong>{{date('d.m.Y H:i:s', strtotime($interview->end))}}
<p class="font-bold inline">{{__('Interview done by')}}:</p> {{$author}}<br>
<p class="font-bold inline">{{__('Interviewed')}}: </p>{{$interview->interviewed}} <br>
<p class="font-bold inline">{{__('From')}}: </p>{{date('d.m.Y H:i:s', strtotime($interview->start))}}
- <p class="font-bold inline">{{__('To')}}: </p>{{date('d.m.Y H:i:s', strtotime($interview->end))}}
</p>
<hr>
......@@ -19,7 +18,7 @@
<h5 class="text-sm font-bold">
{{$study->description}}
</h5>
<h1 class="title ">{{__('Sorting(s)')}}</h1>
<h1 class="font-bold text-4xl uppercase ">{{__('Sorting(s)')}}</h1>
<?php $i = 1 ?>
<div class="block mt-2">
......@@ -37,6 +36,7 @@
</div>
@forelse($createdtokens->unique('id') as $token)
<h1 class="text-2xl font-bold">{{__('Created Tokens')}}</h1>
<div class="block ml-2">
......@@ -50,24 +50,28 @@
@endforelse
<div class="w-1/6 p-2 bg-blue-100 text-center uppercase text-black my-4">{{__('Available answer')}}</div>
<div class="w-1/6 p-2 bg-blue-500 text-center uppercase text-white">{{__('Chosen answer')}}</div>
<div class="my-2">
<h1 class="title ">{{__('Pre-Sort Phase')}}</h1>
<h1 class="font-bold text-4xl uppercase">{{__('Pre-Sort Phase')}}</h1>
@foreach($questions as $q)
@if($q->detail == "presort")
<h3 class="text-2xl bg-yellow-100 mb-2 mt-2 text-center">{{$q->question}}</h3>
<h3 class="text-2xl bg-blue-100 mb-2 mt-2 p-2 text-center">{{$q->question}}</h3>
<?php
$emptyopen = true;
?>
@foreach($q->answers as $a)
@if($a->answer['answer'] != "" && $a->answer['type'] != "scale")
<div
class="text-white p-1 text-lg rounded bg-blue-600 w-auto inline-block">{{$a->answer['answer']}}</div>
class="text-white p-2 text-xl bg-blue-500 w-auto inline-block my-2">{{$a->answer['answer']}}</div>
<div
class="text-sm chosen-answer-type w-auto inline-block">{{$a->answer['type']}} {{__('answer')}}</div>
class="text-sm w-auto inline-block">{{$a->answer['type']}} {{__('answer')}}</div>
<br>
@elseif($a->answer['type'] == "open")
......@@ -75,14 +79,14 @@
$emptyopen = false;
?>
<div
class="text-white p-1 text-lg rounded bg-blue-600 w-auto inline-block">{{$a->pivot->result}}</div>
class="bg-blue-500 text-white p-2 text-xl bg-blue-500 w-auto inline-block my-2">{{$a->pivot->result}}</div>
<div
class="bg-white text-black text-sm w-auto inline-block"> {{__('Open answer')}}</div>
<br>
@elseif($a->answer['type'] == "scale")
<div
class="text-white p-1 text-lg rounded bg-blue-600 w-auto inline-block">{{$a->pivot->result}}</div>
class="text-white p-2 text-xl bg-blue-500 w-auto inline-block my-2">{{$a->pivot->result}}</div>
<div class="bg-white text-black text-sm"> {{__('Scale answer')}}</div>
<br>
@endif
......@@ -94,27 +98,27 @@
@if($available['type']== "multi" || $available['type']== "onechoice")
<div
class="bg-white text-black p-1 text-sm rounded available-answer w-auto inline-block">{{$available['answer']}}</div>
class="bg-blue-100 text-black p-2 text-sm w-auto inline-block">{{$available['answer']}}</div>
@elseif($available['type']== "scale")
<br>
<br>
<strong
class="bg-white text-black p-1 text-sm rounded available-answer w-auto inline-block">{{__('Minimum value')}} {{$available['answer']->min}}</strong>
<p
class="bg-blue-100 text-black p-2 text-sm w-auto inline-block">{{__('Minimum value')}} {{$available['answer']->min}}</p>
<br>
<strong
class="bg-white text-black p-1 text-sm rounded available-answer w-auto inline-block">{{__('Max value')}} {{$available['answer']->max}}</strong>
<p
class="bg-blue-100 text-black p-2 text-sm w-auto inline-block">{{__('Max value')}} {{$available['answer']->max}}</p>
@else
<br>
@if($emptyopen)
<strong