Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
ZeMKI
Mesort
Commits
ac7aae85
Commit
ac7aae85
authored
May 10, 2021
by
ZeMKI
Browse files
Translation improvement and bugfix
parent
1637d84f
Changes
4
Hide whitespace changes
Inline
Side-by-side
app/Exports/InterviewQsortExport.php
View file @
ac7aae85
...
...
@@ -91,6 +91,8 @@ class InterviewQsortExport implements FromCollection, WithMapping, WithHeadings
{
return
$item
->
detail
==
"extremeQuestion"
;
})
->
first
();
$tempValuesArray
[
'Reason for Placement'
]
=
""
;
if
(
$hasExtremeQuestion
!==
""
&&
$interview
->
answers
)
{
foreach
(
$interview
->
answers
as
$answer
)
...
...
@@ -99,9 +101,8 @@ class InterviewQsortExport implements FromCollection, WithMapping, WithHeadings
if
(
$tokenToCheck
->
id
===
$token_answer
->
token_id
)
$tempValuesArray
[
'Reason for Placement'
]
=
$token_answer
->
text
;
}
}
else
{
$tempValuesArray
[
'Reason for Placement'
]
=
""
;
}
return
$tempValuesArray
;
}
...
...
resources/js/app.js
View file @
ac7aae85
...
...
@@ -115,13 +115,14 @@ Vue.mixin({
},
deleteCookie
:
function
(
name
)
{
document
.
cookie
=
name
+
'
=;expires=Thu, 01 Jan 1970 00:00:01 GMT;
'
;
},
confirmdelete
:
function
(
id
,
name
)
{
let
self
=
this
;
this
.
$buefy
.
dialog
.
confirm
({
title
:
this
.
trans
(
'
Confirm Delete
'
),
message
:
this
.
trans
(
`
Are you sure to delete the study
`
)
+
title
:
self
.
trans
(
'
Confirm Delete
'
),
message
:
self
.
trans
(
'
Are you sure to delete the study
'
)
+
name
+
this
.
trans
(
'
and all the deleted data?
'
),
self
.
trans
(
'
and all the deleted data?
'
),
cancelText
:
'
Cancel
'
,
confirmText
:
this
.
trans
(
'
Delete
'
),
confirmText
:
self
.
trans
(
'
Delete
'
),
type
:
'
is-danger
'
,
onConfirm
:
()
=>
this
.
deletestudy
(
id
),
...
...
@@ -406,7 +407,7 @@ window.app = new Vue({
});
},
setinterviewdname
:
function
(
studyid
)
{
this
.
$buefy
.
dialog
.
prompt
({
message
:
this
.
trans
(
`What's the interviewe
d
name?`
),
message
:
this
.
trans
(
`What's the interviewe
e
name?`
),
confirmText
:
this
.
trans
(
'
Start Interview
'
),
inputAttrs
:
{
placeholder
:
''
,
...
...
resources/views/interview/view.blade.php
View file @
ac7aae85
...
...
@@ -47,9 +47,9 @@ $columnValues = $baseArray;
</b-tabs>
</div>
<h1
class=
"text-2xl font-bold"
>
{{__('Created Tokens')}}
</h1>
@forelse($createdtokens->unique('id') as $token)
<h1
class=
"text-2xl font-bold"
>
{{__('Created Tokens')}}
</h1>
<div
class=
"block ml-2"
>
<img
src=
"{{$token->image_path}}"
alt=
"token created"
class=
"block w-10"
/>
{{$token->name}} - {{__('Created in Sorting')}}
...
...
@@ -74,7 +74,7 @@ $columnValues = $baseArray;
@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-100 text-center 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"
>
...
...
resources/views/study/home_invited_studies.blade.php
View file @
ac7aae85
...
...
@@ -47,7 +47,7 @@
@
click.prevent=
"setinterviewdname({{$study->id}})"
>
<div
class=
"min-w-full text-center bg-green-600 hover:text-gray-300 hover:bg-green-900 text-2xl font-extrabold"
>
{{ __('
n
ew
i
nterview') }}
{{ __('
N
ew
I
nterview') }}
</div>
</a>
...
...
@@ -56,7 +56,7 @@
@
click=
"toggleModal({{$study->id}})"
>
<div
class=
"min-w-full text-center bg-green-500 hover:text-gray-300 hover:bg-green-800 modal-open text-2xl font-extrabold"
>
{{ __('
n
ew
p
ublic
u
rl') }}
{{ __('
N
ew
P
ublic
U
rl') }}
</div>
</a>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment