Commit 5ea4abed authored by ZeMKI's avatar ZeMKI

Layout optimization + bugfix

* now the section 0 is displayed in the export.
* now you can see the sorting name when choosing.
parent 37245491
......@@ -3,6 +3,8 @@
<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/AllInterviewTokenExport.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/AllInterviewTokenExport.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/InterviewTokenExport.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/InterviewTokenExport.php" 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/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" />
......@@ -265,7 +267,7 @@
<workItem from="1590480658730" duration="551000" />
<workItem from="1590484643170" duration="25829000" />
<workItem from="1590656055131" duration="4234000" />
<workItem from="1590665422138" duration="1497000" />
<workItem from="1590665422138" duration="4114000" />
</task>
<servers />
</component>
......@@ -322,10 +324,10 @@
</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="598" height="526" key="StructurePopup" timestamp="1590666782790">
<state x="754" y="390" width="597" height="524" key="StructurePopup" timestamp="1590686482515">
<screen x="0" y="0" width="2048" height="1280" />
</state>
<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/0.0.2048.1280@0.0.2048.1280" timestamp="1590686482515" />
<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="1590666782790" />
<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" />
......@@ -360,10 +362,10 @@
</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="1590667028046">
<state x="689" y="291" width="670" height="676" key="search.everywhere.popup" timestamp="1590689990547">
<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="1590150028065" />
<state x="689" y="291" width="670" height="676" key="search.everywhere.popup/0.0.2048.1280@0.0.2048.1280" timestamp="1590689990547" />
<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="1590667028046" />
<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" />
......
......@@ -135,7 +135,7 @@ class AllInterviewTokenExport implements FromCollection, WithMapping, WithHeadin
if ($token->interview->study->sortings[0]->id === 2)
{
$toPrint['section number'] = $token->valutation->section;
$toPrint['section number'] = strval($token->valutation->section);
$toPrint['section name'] = $token->valutation->sectionName;
}
......
......@@ -82,7 +82,7 @@ class InterviewTokenExport implements FromCollection, WithMapping, WithHeadings
if ($token->interview->study->sortings[0]->id === 2)
{
$tempValuesArray['section number'] = $token->valutation->section;
$tempValuesArray['section number'] = strval($token->valutation->section);
$tempValuesArray['section name'] = $token->valutation->sectionName;
}
......
......@@ -106,7 +106,6 @@
:availabletokens="study.available_tokens"
:divisions="sections"
:ref="'sortingContainer'+index"
v-else-if="sorting[0].id === 2"
>
......
......@@ -43,7 +43,7 @@
<!--Footer-->
<div class="flex justify-end pt-2">
<button class="px-4 bg-blue-500 p-3 rounded-lg text-white hover:bg-blue-400" @click="toggleSortingPreviewModal()">{{trans('Close')}}</button>
<button class="px-4 bg-blue-500 p-3 rounded-lg text-white hover:bg-blue-400 z-50" @click="toggleSortingPreviewModal()">{{trans('Close')}}</button>
</div>
</div>
......
......@@ -126,14 +126,17 @@
<label class="label">
{{ trans('Choose Sorting Scheme') }}
</label>
<div class="bg-gray-900 level" style="padding: 15px">
<span class="icon hover:bg-blue-500 text-2xl pb-2" @click="selectedSorting > 1 ? selectedSorting-- : false">
<div class="bg-gray-900 p-5 text-center">
<div class="w-full block mx-auto text-white">{{sortingname}}</div>
<div class="block w-full mx-auto">
<span class="hover:bg-blue-500 text-2xl p-2 inline" @click="selectedSorting > 1 ? selectedSorting-- : false">
<arrow-left class="text-white items-center"/>
</span>
<img class="w-40 h-40 rounded-full" :src="baseUrl+productionUrl+'/images/sorting'+selectedSorting+'.png'" alt="circle sorting">
<span class="icon hover:bg-blue-500 text-2xl pb-2" @click="selectedSorting < 2 ? selectedSorting++ : false">
<img class=" w-40 h-40 rounded-full inline" :src="baseUrl+productionUrl+'/images/sorting'+selectedSorting+'.png'" alt="circle sorting">
<span class=" hover:bg-blue-500 text-2xl p-2 inline" @click="selectedSorting < 2 ? selectedSorting++ : false">
<arrow-right class="text-white items-center"/>
</span>
</div>
</div>
<div class="w-full">
......@@ -194,7 +197,7 @@
</div>
<div class="card-content">
<div class="content">
<label class="label is-small">Token name</label>
<label class="label is-small">Token name *</label>
<input
class="bg-gray-200 focus:outline-none focus:shadow-outline border border-gray-300 py-2 px-4 block w-full appearance-none leading-normal"
type="text" v-model="t.name"
......@@ -632,7 +635,12 @@
},
};
},
computed: {},
computed: {
'sortingname': function()
{
return this.sorting.id === 1 ? this.trans('Circle Sorting') : this.trans('Network Sorting');
},
},
created()
{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment