Skip to content

GitLab

Mesort
Mesort
Commit 138bb6bd authored by ZeMKI's avatar ZeMKI
Browse files
Options

Network sorting changes 

* bugfixed network sortings.
* centralized bounds and center calculation for network sorting.
parent d93eea24
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 536 additions and 596 deletions
.idea/workspace.xml
View file @ 138bb6bd
......@@ -3,13 +3,16 @@
<component name="ChangeListManager">
<list default="true" id="b51d2beb-a115-4b2a-80a2-b27cfb404d6c" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Sorting.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Sorting.php" 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$/resources/js/app.js" beforeDir="false" afterPath="$PROJECT_DIR$/resources/js/app.js" 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/Interview/newtokenmodal.vue" beforeDir="false" afterPath="$PROJECT_DIR$/resources/js/components/Interview/newtokenmodal.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/js/components/Interview/sorting_preview.vue" beforeDir="false" afterPath="$PROJECT_DIR$/resources/js/components/Interview/sorting_preview.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/js/store/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/resources/js/store/index.js" 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/nav.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/layouts/nav.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" />
</list>
<option name="SHOW_DIALOG" value="false" />
......@@ -227,13 +230,13 @@
<property name="settings.editor.selected.configurable" value="preferences.customizations" />
</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/views/admin" />
<recent name="$PROJECT_DIR$/resources/js/components/Interview" />
</key>
<key name="MoveFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/resources/lang/" />
</key>
</component>
<component name="RunManager" selected="PHP Built-in Web Server.Valet mesort">
<configuration name="development" type="js.build_tools.npm" temporary="true" nameIsGenerated="true">
......@@ -308,7 +311,8 @@
<workItem from="1592325750797" duration="694000" />
<workItem from="1592468514684" duration="460000" />
<workItem from="1592470742506" duration="10972000" />
<workItem from="1592579701949" duration="32252000" />
<workItem from="1592579701949" duration="32414000" />
<workItem from="1592898486842" duration="28505000" />
</task>
<servers />
</component>
......@@ -340,38 +344,38 @@
<screen x="0" y="0" width="2048" height="1280" />
</state>
<state x="906" y="571" key="Create Model/0.0.2048.1280@0.0.2048.1280" timestamp="1591112276657" />
<state width="1878" height="334" key="GridCell.Tab.0.bottom" timestamp="1592649870319">
<state width="1878" height="276" key="GridCell.Tab.0.bottom" timestamp="1592990688268">
<screen x="65" y="-1080" width="1920" height="1080" />
</state>
<state width="1878" height="334" key="GridCell.Tab.0.bottom/0.0.2048.1280@0.0.2048.1280" timestamp="1592569759766" />
<state width="2006" height="336" key="GridCell.Tab.0.bottom/0.0.2048.1280@0.0.2048.1280" timestamp="1592905612184" />
<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="405" key="GridCell.Tab.0.bottom/65.-1080.1920.1080/0.0.2048.1280@0.0.2048.1280" timestamp="1591800970432" />
<state width="1878" height="334" key="GridCell.Tab.0.bottom/65.-1080.1920.1080/0.0.2048.1280@65.-1080.1920.1080" timestamp="1592649870319" />
<state width="1878" height="334" key="GridCell.Tab.0.center" timestamp="1592649870317">
<state width="1878" height="276" key="GridCell.Tab.0.bottom/65.-1080.1920.1080/0.0.2048.1280@65.-1080.1920.1080" timestamp="1592990688268" />
<state width="1878" height="276" key="GridCell.Tab.0.center" timestamp="1592990688267">
<screen x="65" y="-1080" width="1920" height="1080" />
</state>
<state width="1878" height="334" key="GridCell.Tab.0.center/0.0.2048.1280@0.0.2048.1280" timestamp="1592569759765" />
<state width="2006" height="336" key="GridCell.Tab.0.center/0.0.2048.1280@0.0.2048.1280" timestamp="1592905612183" />
<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="405" key="GridCell.Tab.0.center/65.-1080.1920.1080/0.0.2048.1280@0.0.2048.1280" timestamp="1591800970431" />
<state width="1878" height="334" key="GridCell.Tab.0.center/65.-1080.1920.1080/0.0.2048.1280@65.-1080.1920.1080" timestamp="1592649870317" />
<state width="1878" height="334" key="GridCell.Tab.0.left" timestamp="1592649870317">
<state width="1878" height="276" key="GridCell.Tab.0.center/65.-1080.1920.1080/0.0.2048.1280@65.-1080.1920.1080" timestamp="1592990688267" />
<state width="1878" height="276" key="GridCell.Tab.0.left" timestamp="1592990688266">
<screen x="65" y="-1080" width="1920" height="1080" />
</state>
<state width="1878" height="334" key="GridCell.Tab.0.left/0.0.2048.1280@0.0.2048.1280" timestamp="1592569759764" />
<state width="2006" height="336" key="GridCell.Tab.0.left/0.0.2048.1280@0.0.2048.1280" timestamp="1592905612180" />
<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="405" key="GridCell.Tab.0.left/65.-1080.1920.1080/0.0.2048.1280@0.0.2048.1280" timestamp="1591800970430" />
<state width="1878" height="334" key="GridCell.Tab.0.left/65.-1080.1920.1080/0.0.2048.1280@65.-1080.1920.1080" timestamp="1592649870317" />
<state width="1878" height="334" key="GridCell.Tab.0.right" timestamp="1592649870318">
<state width="1878" height="276" key="GridCell.Tab.0.left/65.-1080.1920.1080/0.0.2048.1280@65.-1080.1920.1080" timestamp="1592990688266" />
<state width="1878" height="276" key="GridCell.Tab.0.right" timestamp="1592990688267">
<screen x="65" y="-1080" width="1920" height="1080" />
</state>
<state width="1878" height="334" key="GridCell.Tab.0.right/0.0.2048.1280@0.0.2048.1280" timestamp="1592569759766" />
<state width="2006" height="336" key="GridCell.Tab.0.right/0.0.2048.1280@0.0.2048.1280" timestamp="1592905612184" />
<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="405" key="GridCell.Tab.0.right/65.-1080.1920.1080/0.0.2048.1280@0.0.2048.1280" timestamp="1591800970432" />
<state width="1878" height="334" key="GridCell.Tab.0.right/65.-1080.1920.1080/0.0.2048.1280@65.-1080.1920.1080" timestamp="1592649870318" />
<state width="1878" height="276" key="GridCell.Tab.0.right/65.-1080.1920.1080/0.0.2048.1280@65.-1080.1920.1080" timestamp="1592990688267" />
<state x="801" y="371" key="NewPhpClassDialog" timestamp="1591119868791">
<screen x="0" y="0" width="2048" height="1280" />
</state>
......@@ -385,14 +389,19 @@
</state>
<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="1590665405159" />
<state x="754" y="390" width="597" height="524" key="StructurePopup" timestamp="1592851239030">
<screen x="0" y="0" width="2048" height="1280" />
<state x="772" y="-751" width="597" height="443" key="StructurePopup" timestamp="1593009088862">
<screen x="65" y="-1080" width="1920" height="1080" />
</state>
<state x="754" y="390" width="597" height="524" key="StructurePopup/0.0.2048.1280@0.0.2048.1280" timestamp="1592851239030" />
<state x="754" y="390" width="597" height="524" key="StructurePopup/0.0.2048.1280@0.0.2048.1280" timestamp="1592916926945" />
<state x="754" y="390" width="597" height="524" key="StructurePopup/0.23.2048.1257@0.23.2048.1257" timestamp="1592850442037" />
<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="1591800275957" />
<state x="772" y="-751" width="597" height="443" key="StructurePopup/65.-1080.1920.1080/0.0.2048.1280@65.-1080.1920.1080" timestamp="1592823642000" />
<state x="772" y="-751" width="597" height="443" key="StructurePopup/65.-1080.1920.1080/0.0.2048.1280@65.-1080.1920.1080" timestamp="1593009088862" />
<state x="772" y="-751" width="597" height="443" key="StructurePopup/65.-1080.1920.1080/0.23.2048.1257@65.-1080.1920.1080" timestamp="1592990265627" />
<state width="626" height="445" key="SwitcherDM" timestamp="1592986775905">
<screen x="65" y="-1080" width="1920" height="1080" />
</state>
<state width="626" height="445" key="SwitcherDM/65.-1080.1920.1080/0.0.2048.1280@65.-1080.1920.1080" timestamp="1592986775905" />
<state x="349" y="331" key="com.intellij.ide.ui.customization.CustomizableActionsPanel$EditIconDialog" timestamp="1590665402287">
<screen x="0" y="0" width="2048" height="1280" />
</state>
......@@ -403,12 +412,12 @@
<state x="799" y="561" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.2048.1280@0.0.2048.1280" timestamp="1591186286502" />
<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="1038" y="650" width="632" height="534" key="find.popup" timestamp="1592827811428">
<screen x="0" y="0" width="2048" height="1280" />
<state x="1038" y="-534" width="623" height="534" key="find.popup" timestamp="1593008373565">
<screen x="65" y="-1080" width="1920" height="1080" />
</state>
<state x="1038" y="650" width="632" height="534" key="find.popup/0.0.2048.1280@0.0.2048.1280" timestamp="1592827811428" />
<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="1038" y="-534" width="623" height="534" key="find.popup/65.-1080.1920.1080/0.0.2048.1280@65.-1080.1920.1080" timestamp="1592813531714" />
<state x="1038" y="-534" width="623" height="534" key="find.popup/65.-1080.1920.1080/0.0.2048.1280@65.-1080.1920.1080" timestamp="1593008373565" />
<state x="908" y="-645" width="235" height="235" key="jetbrains.javascript.buildTools.run-task-popup" timestamp="1592648699312">
<screen x="65" y="-1080" width="1920" height="1080" />
</state>
......@@ -427,14 +436,14 @@
</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="291" width="670" height="676" key="search.everywhere.popup" timestamp="1592851323751">
<screen x="0" y="0" width="2048" height="1280" />
<state x="711" y="-834" width="670" height="571" key="search.everywhere.popup" timestamp="1593002609107">
<screen x="65" y="-1080" width="1920" height="1080" />
</state>
<state x="689" y="291" width="670" height="676" key="search.everywhere.popup/0.0.2048.1280@0.0.2048.1280" timestamp="1592851323751" />
<state x="689" y="291" width="670" height="676" key="search.everywhere.popup/0.0.2048.1280@0.0.2048.1280" timestamp="1592913075774" />
<state x="689" y="291" width="670" height="676" key="search.everywhere.popup/0.23.2048.1257@0.23.2048.1257" timestamp="1591115561349" />
<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="1591800273623" />
<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="1592823668152" />
<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="1593002609107" />
<state x="711" y="-834" width="670" height="571" key="search.everywhere.popup/65.-1080.1920.1080/0.23.2048.1257@65.-1080.1920.1080" timestamp="1592643605962" />
</component>
</project>
\ No newline at end of file
package-lock.json
View file @ 138bb6bd
......@@ -1221,15 +1221,6 @@
}
}
},
"@gfx/zopfli": {
"version": "1.0.14",
"resolved": "https://registry.npmjs.org/@gfx/zopfli/-/zopfli-1.0.14.tgz",
"integrity": "sha512-3BuC4gWCvNz5fd2VdVSOQegtv1lTGT8DUTuqvE6M16uAjgBod+vhHCXTlKMtZA4s2+z3IDAgQm/k3RkhYNodiA==",
"dev": true,
"requires": {
"base64-js": "^1.3.0"
}
},
"@interactjs/types": {
"version": "1.9.17",
"resolved": "https://registry.npmjs.org/@interactjs/types/-/types-1.9.17.tgz",
......@@ -2821,6 +2812,11 @@
}
}
},
"body-scroll-lock": {
"version": "3.0.3",
"resolved": "https://registry.npmjs.org/body-scroll-lock/-/body-scroll-lock-3.0.3.tgz",
"integrity": "sha512-EUryImgD6Gv87HOjJB/yB2WIGECiZMhmcUK+DrqVRFDDa64xR+FsK0LgvLPnBxZDTxIl+W80/KJ8i6gp2IwOHQ=="
},
"bonjour": {
"version": "3.5.0",
"resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz",
......@@ -2864,128 +2860,12 @@
"fill-range": "^7.0.1"
}
},
"bread-compressor-cli": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/bread-compressor-cli/-/bread-compressor-cli-1.1.0.tgz",
"integrity": "sha512-zgHlbGHgQYUddPlGIyWhUknOp3RbuSfgK5xq6rwRQBi49DPpGS79of//ronkFjoTpHtDrVVIC3kov/jgQOnGFA==",
"dev": true,
"requires": {
"@gfx/zopfli": "1.0.14",
"brotli": "1.3.2",
"chalk": "3.0.0",
"commander": "5.0.0",
"globby": "11.0.0",
"node-zopfli-es": "1.0.4",
"promise-limit": "2.7.0"
},
"dependencies": {
"ansi-styles": {
"version": "4.2.1",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
"integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
"dev": true,
"requires": {
"@types/color-name": "^1.1.1",
"color-convert": "^2.0.1"
}
},
"chalk": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
"integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
"dev": true,
"requires": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
}
},
"color-convert": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
"dev": true,
"requires": {
"color-name": "~1.1.4"
}
},
"color-name": {
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
"dev": true
},
"commander": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/commander/-/commander-5.0.0.tgz",
"integrity": "sha512-JrDGPAKjMGSP1G0DUoaceEJ3DZgAfr/q6X7FVk4+U5KxUSKviYGM2k6zWkfyyBHy5rAtzgYJFa1ro2O9PtoxwQ==",
"dev": true
},
"fast-glob": {
"version": "3.2.4",
"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.4.tgz",
"integrity": "sha512-kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ==",
"dev": true,
"requires": {
"@nodelib/fs.stat": "^2.0.2",
"@nodelib/fs.walk": "^1.2.3",
"glob-parent": "^5.1.0",
"merge2": "^1.3.0",
"micromatch": "^4.0.2",
"picomatch": "^2.2.1"
}
},
"globby": {
"version": "11.0.0",
"resolved": "https://registry.npmjs.org/globby/-/globby-11.0.0.tgz",
"integrity": "sha512-iuehFnR3xu5wBBtm4xi0dMe92Ob87ufyu/dHwpDYfbcpYpIbrO5OnS8M1vWvrBhSGEJ3/Ecj7gnX76P8YxpPEg==",
"dev": true,
"requires": {
"array-union": "^2.1.0",
"dir-glob": "^3.0.1",
"fast-glob": "^3.1.1",
"ignore": "^5.1.4",
"merge2": "^1.3.0",
"slash": "^3.0.0"
}
},
"has-flag": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
"dev": true
},
"picomatch": {
"version": "2.2.2",
"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
"integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
"dev": true
},
"supports-color": {
"version": "7.1.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
"integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
"dev": true,
"requires": {
"has-flag": "^4.0.0"
}
}
}
},
"brorand": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
"integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
"dev": true
},
"brotli": {
"version": "1.3.2",
"resolved": "https://registry.npmjs.org/brotli/-/brotli-1.3.2.tgz",
"integrity": "sha1-UlqcrU/LqWR119OI9q7LE+7VL0Y=",
"dev": true,
"requires": {
"base64-js": "^1.1.2"
}
},
"browserify-aes": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
......@@ -4690,13 +4570,6 @@
"integrity": "sha512-D9f7V0JSRwIxlRI2mjMqufDrRDnx8p+eEOz7aUM9SuvF8gsBzra0/6tbjl1m8eQHrZlYj6PxqE00hZ1SAIKPLw==",
"dev": true
},
"env-paths": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.0.tgz",
"integrity": "sha512-6u0VYSCo/OW6IoD5WCLLy9JUGARbamfSavcNXry/eu8aHVFei6CD3Sw+VGX5alea1i9pgPHW0mbu6Xj0uBh7gA==",
"dev": true,
"optional": true
},
"errno": {
"version": "0.1.7",
"resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz",
......@@ -8645,36 +8518,6 @@
"minipass": "^3.0.0"
}
},
"minizlib": {
"version": "1.3.3",
"resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz",
"integrity": "sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==",
"dev": true,
"optional": true,
"requires": {
"minipass": "^2.9.0"
},
"dependencies": {
"minipass": {
"version": "2.9.0",
"resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz",
"integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==",
"dev": true,
"optional": true,
"requires": {
"safe-buffer": "^5.1.2",
"yallist": "^3.0.0"
}
},
"yallist": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
"integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
"dev": true,
"optional": true
}
}
},
"mississippi": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
......@@ -8811,13 +8654,6 @@
"lower-case": "^1.1.1"
}
},
"node-addon-api": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-2.0.0.tgz",
"integrity": "sha512-ASCL5U13as7HhOExbT6OlWJJUV/lLzL2voOSP1UVehpRD8FbSrSDjfScK/KwAvVTI5AS6r4VwbOMlIqtvRidnA==",
"dev": true,
"optional": true
},
"node-emoji": {
"version": "1.10.0",
"resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-1.10.0.tgz",
......@@ -8994,102 +8830,6 @@
}
}
},
"node-zopfli-es": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/node-zopfli-es/-/node-zopfli-es-1.0.4.tgz",
"integrity": "sha512-3sXKv1nV7IJCGOk2tvrjUtth0YlYvCjpQB+bXazgZLIucA2PLCjCTNwKfXIkBBEfQ8R9pDGz3MLqHT8R6RCl9A==",
"dev": true,
"optional": true,
"requires": {
"commander": "5.0.0",
"node-addon-api": "2.0.0",
"node-gyp": "6.1.0"
},
"dependencies": {
"commander": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/commander/-/commander-5.0.0.tgz",
"integrity": "sha512-JrDGPAKjMGSP1G0DUoaceEJ3DZgAfr/q6X7FVk4+U5KxUSKviYGM2k6zWkfyyBHy5rAtzgYJFa1ro2O9PtoxwQ==",
"dev": true,
"optional": true
},
"fs-minipass": {
"version": "1.2.7",
"resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz",
"integrity": "sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==",
"dev": true,
"optional": true,
"requires": {
"minipass": "^2.6.0"
}
},
"minipass": {
"version": "2.9.0",
"resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz",
"integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==",
"dev": true,
"optional": true,
"requires": {
"safe-buffer": "^5.1.2",
"yallist": "^3.0.0"
}
},
"node-gyp": {
"version": "6.1.0",
"resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-6.1.0.tgz",
"integrity": "sha512-h4A2zDlOujeeaaTx06r4Vy+8MZ1679lU+wbCKDS4ZtvY2A37DESo37oejIw0mtmR3+rvNwts5B6Kpt1KrNYdNw==",
"dev": true,
"optional": true,
"requires": {
"env-paths": "^2.2.0",
"glob": "^7.1.4",
"graceful-fs": "^4.2.2",
"mkdirp": "^0.5.1",
"nopt": "^4.0.1",
"npmlog": "^4.1.2",
"request": "^2.88.0",
"rimraf": "^2.6.3",
"semver": "^5.7.1",
"tar": "^4.4.12",
"which": "^1.3.1"
}
},
"nopt": {
"version": "4.0.3",
"resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz",
"integrity": "sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==",
"dev": true,
"optional": true,
"requires": {
"abbrev": "1",
"osenv": "^0.1.4"
}
},
"tar": {
"version": "4.4.13",
"resolved": "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz",
"integrity": "sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==",
"dev": true,
"optional": true,
"requires": {
"chownr": "^1.1.1",
"fs-minipass": "^1.2.5",
"minipass": "^2.8.6",
"minizlib": "^1.2.1",
"mkdirp": "^0.5.0",
"safe-buffer": "^5.1.2",
"yallist": "^3.0.3"
}
},
"yallist": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
"integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
"dev": true,
"optional": true
}
}
},
"nomnom": {
"version": "1.8.1",
"resolved": "https://registry.npmjs.org/nomnom/-/nomnom-1.8.1.tgz",
......@@ -13651,12 +13391,6 @@
"integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=",
"dev": true
},
"promise-limit": {
"version": "2.7.0",
"resolved": "https://registry.npmjs.org/promise-limit/-/promise-limit-2.7.0.tgz",
"integrity": "sha512-7nJ6v5lnJsXwGprnGXga4wx6d1POjvi5Qmf1ivTRxTjH4Z/9Czja/UCMLVmB9N93GeWOU93XaFaEt6jbuoagNw==",
"dev": true
},
"proxy-addr": {
"version": "2.0.6",
"resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz",
......
resources/js/app.js
View file @ 138bb6bd
......@@ -474,6 +474,10 @@ window.app = new Vue(
}
},
togglePersonModal()
{
this.$store.dispatch('togglePersonModal')
},
toggleModal(id = '')
{
const body = document.querySelector(
......@@ -795,6 +799,7 @@ window.app = new Vue(
,
confirmgohome: function()
{
let self = this;
this.$buefy.dialog.confirm(
{
title: 'Cancel interview',
......@@ -804,6 +809,29 @@ window.app = new Vue(
hasIcon: true,
onConfirm: () =>
{
for (
let i = 1;
i <= self.sortingtotal;
i++
)
{
if (self.sortingType ==
2)
{
clearInterval(
self.$refs['thenewinterview'].$refs['sortingContainer' +
i][0].interval)
localStorage.setItem(
'tokens' +
i,
null
);
localStorage.removeItem(
'tokens' +
i);
}
}
window.location.href = '../';
},
});
......
resources/js/components/Interview/network-sorting.vue
View file @ 138bb6bd
<template>
<section>
<!-- Modal -->
<div class="modal opacity-0 pointer-events-none fixed w-full h-full top-0 left-0 flex items-center justify-center">
<div class="absolute w-full h-full bg-gray-900 opacity-50" @click.prevent="toggleModal()"></div>
<div :class="'modal'+currentsorting +' opacity-0 pointer-events-none fixed w-full h-full top-0 left-0 flex items-center justify-center z-50'" v-if="currentsorting === sorting">
<div class="absolute w-full h-full bg-gray-900 opacity-50" @click.prevent="togglePersonModal()"></div>
<div class="modal-container bg-white w-1/2 md:max-w-md mx-auto rounded shadow-lg z-50 overflow-y-auto">
<div @click.prevent="toggleModal()" class="absolute top-0 right-0 cursor-pointer flex flex-col items-center mt-4 mr-4 text-white text-sm z-50">
<div @click.prevent="togglePersonModal()" class="absolute top-0 right-0 cursor-pointer flex flex-col items-center mt-4 mr-4 text-white text-sm z-50">
<svg class="fill-current text-white" xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 18 18">
<path d="M14.53 4.53l-1.06-1.06L9 7.94 4.53 3.47 3.47 4.53 7.94 9l-4.47 4.47 1.06 1.06L9 10.06l4.47 4.47 1.06-1.06L10.06 9z"></path>
</svg>
......@@ -18,7 +18,7 @@
<!--Title-->
<div class="flex justify-between items-center pb-3">
<p class="text-2xl font-bold">{{trans('Create a Person')}}</p>
<div @click.prevent="toggleModal()" class="cursor-pointer z-50">
<div @click.prevent="togglePersonModal()" class="cursor-pointer z-50">
<svg class="fill-current text-black" xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 18 18">
<path d="M14.53 4.53l-1.06-1.06L9 7.94 4.53 3.47 3.47 4.53 7.94 9l-4.47 4.47 1.06 1.06L9 10.06l4.47 4.47 1.06-1.06L10.06 9z"></path>
</svg>
......@@ -33,14 +33,14 @@
>
<label class="font-bold">{{trans('Person Name')}}</label>
<input type="text" v-model="newtoken.name" class="w-full block bg-gray-200 focus:outline-none focus:shadow-outline border border-gray-300 py-1 px-2 block mt-2 appearance-none leading-normal"/>
<input id="addPerson" type="text" v-model="newtoken.name" class="w-full block bg-gray-200 focus:outline-none focus:shadow-outline border border-gray-300 py-1 px-2 block mt-2 appearance-none leading-normal"/>
</div>
<!--Footer-->
<div class="flex justify-end pt-2">
<button class="px-4 bg-transparent p-3 rounded-lg text-blue-500 hover:bg-gray-100 hover:text-blue-400 mr-2" @click.prevent="savetoken">{{trans('Save and add new')}}</button>
<button class="px-4 bg-transparent p-3 rounded-lg text-blue-500 hover:bg-gray-100 hover:text-blue-400 mr-2" @click.prevent="savetoken('close')">{{trans('Save and Close')}}</button>
<button class="px-4 bg-blue-500 p-3 rounded-lg text-white hover:bg-blue-400" @click.prevent="toggleModal()">{{trans('Close')}}</button>
<button class="px-4 bg-gray-800 p-3 rounded-lg text-white hover:bg-gray-700 hover:text-gray-100 mr-2" @click.prevent="savetoken">{{trans('Save and add new')}}</button>
<button class="px-4 bg-gray-800 p-3 rounded-lg text-white hover:bg-gray-700 hover:text-gray-100 mr-2" @click.prevent="savetoken('close')">{{trans('Save and Close')}}</button>
<button class="px-4 bg-transparent p-3 rounded-lg text-gray-900 hover:text-gray-100" @click.prevent="togglePersonModal()">{{trans('Close')}}</button>
</div>
</div>
......@@ -54,13 +54,14 @@
class="sm:text-xs md:text-xs lg:text-base md:mt-5 absolute remove-from-screenshot font-bold uppercase bg-gray-800 text-white p-4 text-center ">
{{ trans('Persons')}}
</h2>
<div class="sm:text-xs md:text-xs lg:text-base md:mt-8 token-container-created z-20 h-auto flex has-to-move absolute bg-blue-200"
<div class="sm:text-xs md:text-xs lg:text-base md:mt-10 token-container-created z-20 h-auto flex has-to-move absolute"
style="top:20%;right:5%;flex-wrap: wrap;width:16.6666666667%">
<div class="sortingstart inline-block createdtokens" :class="'token'+currentsorting"
v-for="(t,index) in tokens"
:id="t.id"
v-show="t.author === 0 && t.valutation.sorting === currentsorting"
v-if="t.render !== false"
@click="assignclassifier(t.id,index)"
>
<div v-if="t.isDragged" @click="confirmdeletetoken(t)"
......@@ -133,7 +134,7 @@
});
export default {
props: ['availabletokens', 'circles', 'divisions'],
props: ['availabletokens', 'circles', 'divisions','sorting'],
data()
{
return {
......@@ -162,6 +163,7 @@
classifiermode: false,
selectedclassifier: {},
mousePosition: {x: 0, y: 0},
interval: ""
};
},
......@@ -224,7 +226,7 @@
duration: 1000,
});
this.$store.commit(
'setFetchToken',false);
'setFetchToken', false);