Skip to content

Commit 0395d8d

Browse files
diegocomisdiegocomis
authored
Merge pull request #845 from Thoth2023/bug/project-search-buttons-and-css-mobile
Ajuster Traduções Planning
2 parents 772d3d2 + 920536a commit 0395d8d

File tree

8 files changed

+67
-25
lines changed

8 files changed

+67
-25
lines changed

‎app/Livewire/Planning/QualityAssessment/QuestionScore.php‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class QuestionScore extends Component
3737
public $questionId;
3838
public $scoreRule;
3939
public $score;
40-
public $scoreRuleOptions = ['Sim', 'Parcial', 'Insuficiente','Não'];
40+
public $scoreRuleOptions = ['yes','partial','insufficient','no'];
4141
public $description;
4242

4343

@@ -54,7 +54,7 @@ class QuestionScore extends Component
5454
*/
5555
protected $rules = [
5656
'questionId' => 'array|required',
57-
'scoreRule' => 'required|string|max:25|regex:/^[a-zA-ZÀ-ÿ\s]+$/u',
57+
'scoreRule' => 'required|string|max:30|regex:/^[a-zA-ZÀ-ÿ\s]+$/u',
5858
'score' => 'required|numeric',
5959
'description' => 'required|string|max:255|regex:/^[a-zA-ZÀ-ÿ0-9\s]+$/u',
6060
];
@@ -70,10 +70,10 @@ protected function messages()
7070
'questionId.required' => __('common.required'),
7171
'questionId.array' => __('common.required'),
7272
'scoreRule.required' => __('common.required'),
73-
'scoreRule.regex' => 'A regra de pontuação só pode conter letras e espaços.',
73+
'scoreRule.regex' => __('project/planning.quality-assessment.question-score.messages.score_rule_only_letters'),
7474
'score.required' => __('common.required'),
7575
'description.required' => __('common.required'),
76-
'description.regex' => 'A descrição só pode conter letras, números e espaços.',
76+
'description.regex' => __('project/planning.quality-assessment.question-score.messages.description_only_letters_numbers'),
7777
];
7878
}
7979

@@ -189,7 +189,7 @@ public function submit()
189189

190190
if ($alreadyExists) {
191191
$this->toast(
192-
message: __('A regra de pontuação com este valor já existe para esta questão.'),
192+
message: __('project/planning.quality-assessment.question-score.messages.unique_score_rule'),
193193
type: 'info'
194194
);
195195
return;
@@ -234,15 +234,18 @@ public function submit()
234234
*/
235235
public function updatedScoreRule($value)
236236
{
237-
if (in_array($value, ['Sim', 'Parcial', 'Não'])) {
237+
if (in_array($value, ['yes', 'partial','insufficient', 'no'])) {
238238
switch ($value) {
239-
case 'Sim':
239+
case 'yes':
240240
$this->score = 100;
241241
break;
242-
case 'Parcial':
242+
case 'partial':
243243
$this->score = 50;
244244
break;
245-
case 'Não':
245+
case 'insufficient':
246+
$this->score = 25;
247+
break;
248+
case 'no':
246249
$this->score = 0;
247250
break;
248251
}

‎lang/en/project/planning.php‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,14 @@
185185
],
186186
'study_type' => [
187187
'title' => 'Study Types',
188-
'types' => 'Types',
188+
'types' => [
189+
'Book' => 'Book',
190+
'Thesis' => 'Thesis',
191+
'Article in Press' => 'Article in Press',
192+
'Article' => 'Article',
193+
'Conference Paper' => 'Conference Paper',
194+
'All types' => 'All types',
195+
],
189196
'add' => 'Add Study Type',
190197
'list' => [
191198
'select' => [
@@ -1298,7 +1305,12 @@
12981305
],
12991306
'score_rule' => [
13001307
'title' => 'Score Rule',
1301-
'placeholder' => 'Enter Score Rule',
1308+
'placeholder' => 'Select or type the Scoring Rule',
1309+
'description' => 'Type/Explain with a description to the scoring rule',
1310+
'yes' => 'Yes',
1311+
'partial' => 'Partial',
1312+
'insufficient' => 'Insufficient',
1313+
'no' => 'No',
13021314
],
13031315
'form' => [
13041316
'select-qa-placeholder' => 'Select a Question Quality',
@@ -1326,6 +1338,11 @@
13261338
'required' => 'The score rule field is required.',
13271339
],
13281340
],
1341+
'messages' => [
1342+
'unique_score_rule' => 'The scoring rule already exists for this question.',
1343+
'score_rule_only_letters' => 'The score rule may contain only letters and spaces.',
1344+
'description_only_letters_numbers' => 'The description may contain only letters, numbers, and spaces.',
1345+
],
13291346
'toasts' => [
13301347
'added' => 'Quality Score added successfully.',
13311348
'updated' => 'Quality Score updated successfully.',

‎lang/pt_BR/project/planning.php‎

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,14 @@
185185
],
186186
'study_type' => [
187187
'title' => 'Tipos de Estudo',
188-
'types' => 'Tipos',
188+
'types' => [
189+
'Book' => 'Livro',
190+
'Thesis' => 'Tese',
191+
'Article in Press' => 'Artigo de Revista',
192+
'Article' => 'Artigo',
193+
'Conference Paper' => 'Artigo de Conferência',
194+
'All types' => 'Todos os tipos',
195+
],
189196
'add' => 'Adicionar Tipo de Estudo',
190197
'list' => [
191198
'select' => [
@@ -1293,7 +1300,13 @@
12931300
],
12941301
'score_rule' => [
12951302
'title' => 'Regra de Pontuação',
1296-
'placeholder' => 'Insira a Regra de Pontuação',
1303+
'placeholder' => 'Selecione ou digite a Regra de Pontuação',
1304+
'description'=>'Digite/Explique com uma descrição a regra de pontuação',
1305+
'yes' => 'Sim',
1306+
'partial' => 'Parcial',
1307+
'insufficient' => 'Insuficiente',
1308+
'no' => 'Não',
1309+
12971310
],
12981311
'extra_score_rule' => [
12991312
'title' => 'Regra de Pontuação Extra',
@@ -1325,6 +1338,12 @@
13251338
'required' => 'O campo de regra de pontuação é obrigatório.',
13261339
]
13271340
],
1341+
'messages' => [
1342+
'unique_score_rule' => 'A regra de pontuação com este valor já existe para esta questão.',
1343+
'score_rule_only_letters' => 'A regra de pontuação só pode conter letras e espaços.',
1344+
'description_only_letters_numbers' => 'A descrição só pode conter letras, números e espaços.',
1345+
],
1346+
13281347
'toasts' => [
13291348
'added' => 'Pontuação de Qualidade adicionada com sucesso.',
13301349
'updated' => 'Pontuação de Qualidade atualizada com sucesso.',

‎resources/views/livewire/planning/overall/studies.blade.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
</option>
2323
@foreach ($studies as $studyType)
2424
<option value="{{ $studyType->id_study_type }}">
25-
{{ $studyType->description }}
25+
{{ __("project/planning.overall.study_type.types.$studyType->description") }}
2626
</option>
2727
@endforeach
2828
</x-select>
@@ -46,7 +46,7 @@
4646
@forelse ($project->studyTypes as $projectStudyType)
4747
<div class="d-flex justify-content-between">
4848
<span data-search>
49-
{{ $projectStudyType->description }}
49+
{{ __("project/planning.overall.study_type.types.$projectStudyType->description") }}
5050
</span>
5151
<div>
5252
<button

‎resources/views/livewire/planning/quality-assessment/question-score.blade.php‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,18 +49,19 @@ class="modal-sm"
4949
id="score-rule"
5050
list="score-rule-options"
5151
class="form-control"
52-
placeholder="{{ __('Selecione ou digite uma regra') }}"
52+
placeholder="{{ __('project/planning.quality-assessment.question-score.score_rule.placeholder') }}"
5353
wire:model.lazy="scoreRule"
5454
onchange="handleScoreRuleChange(this.value)"
5555
label="{{ __('project/planning.quality-assessment.question-score.score_rule.title') }}"
56-
maxlength="20"
56+
maxlength="30"
5757
min="0"
5858
pattern="[A-Za-zÀ-ÿ0-9.,;:?!\()\\[\\]{}\/\ _\-+=#@!%&*]+"
5959
required
6060
/>
6161
<datalist id="score-rule-options">
6262
@foreach ($scoreRuleOptions as $option)
63-
<option value="{{ $option }}"></option>
63+
<option value="{{ __('project/planning.quality-assessment.question-score.score_rule.' . $option) }}">
64+
</option>
6465
@endforeach
6566
</datalist>
6667
@error("scoreRule")
@@ -106,8 +107,8 @@ class="form-range my-1"
106107
class="form-control"
107108
maxlength="255"
108109
rows="2"
109-
placeholder="{{ __("project/planning.research-questions.form.enter_description") }}"
110-
pattern="[a-zA-ZÀ-ÿ0-9\s]+"
110+
placeholder="{{ __("project/planning.quality-assessment.question-score.score_rule.description") }}"
111+
pattern="[A-Za-zÀ-ÿ0-9.,;:?!\()\\[\\]{}\/\ _\-+=#@!%&*]+"
111112
required
112113
></textarea>
113114
@error("description")

‎resources/views/livewire/projects/public/pdf/overview.blade.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<div class="protocol-box">
2424
<strong>{{ __('project/public_protocol.study_types') }}:</strong>
2525
<ul>
26-
@forelse($studyTypes as $s) <li>{{ $s->description }}</li> @empty <li>—</li> @endforelse
26+
@forelse($studyTypes as $s) <li>{{ __("project/planning.overall.study_type.types.$s->description") }}</li> @empty <li>—</li> @endforelse
2727
</ul>
2828
</div>
2929
</div>

‎resources/views/livewire/projects/public/project-overview.blade.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
<strong>{{ __('project/public_protocol.study_types') }}:</strong>
7171
<ul>
7272
@forelse($studyTypes as $s)
73-
<li>{{ $s->description }}</li>
73+
<li>{{ __("project/planning.overall.study_type.types.$s->description") }} </li>
7474
@empty
7575
<li>—</li>
7676
@endforelse

‎resources/views/projects/search-project.blade.php‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,11 @@
6565
{{ Str::limit($project->title, 40) }}
6666
</h6>
6767

68-
<div class="text-muted fst-italic thoth-project-description"
69-
title="{{ $project->description }}" data-toggle="tooltip">
70-
{{ Str::limit($project->description, 105) }}
68+
<div class="small text-muted fst-italic thoth-project-description"
69+
style="font-size: 0.75rem; white-space: normal; word-wrap: break-word; max-width: 300px;"
70+
title="{{ $project->description }}"
71+
data-toggle="tooltip">
72+
{{ Str::limit($project->description, 90) }}
7173
</div>
7274
</div>
7375
</td>

0 commit comments

Comments
 (0)