Skip to content

Commit c33298b

Browse files
NeoRazorXNeoRazorX
committed
Simplify report board generation flow
1 parent 267b709 commit c33298b

2 files changed

Lines changed: 39 additions & 33 deletions

File tree

‎Controller/ListReport.php‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -95,20 +95,12 @@ protected function createViewsReportBoard(string $viewName = 'ListReportBoard'):
9595
->addOrderBy(['featured', 'creationdate'], 'creation-date', 2)
9696
->addSearchFields(['name', 'tag']);
9797

98-
// botones
99-
$this->addButton($viewName, [
100-
'action' => 'generate-boards',
101-
'confirm' => true,
102-
'icon' => 'fa-solid fa-wand-magic-sparkles',
103-
'label' => 'generate',
104-
]);
105-
10698
// boton del asistente
10799
$this->addButton($viewName, [
108100
'action' => $this->url() . '?action=custom-board-assistant',
109101
'confirm' => false,
110102
'icon' => 'fa-solid fa-hat-wizard',
111-
'label' => 'generate-time-boards',
103+
'label' => 'wizard',
112104
'type' => 'link'
113105
]);
114106
}

‎View/CustomBoardAssistant.html.twig‎

Lines changed: 38 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,17 @@ Se podría refactorizar o hacer el componente más reutilizable si se pasan como
1717
<div class="col-md-8 col-lg-6">
1818
<div class="card shadow">
1919
<div class="card-header bg-primary text-white">
20-
<h4 class="mb-0"><i class="fa-solid fa-wand-magic-sparkles"></i> {{ trans('report-date-wizard') }}</h4>
20+
<h4 class="mb-0">
21+
<i class="fa-solid fa-hat-wizard me-1"></i>
22+
{{ trans('wizard') }} {{ trans('reports-board')|lower }}
23+
</h4>
2124
</div>
2225

2326
{% if fsc.twigData.selectedTable %}
2427
{# STEP 2 #}
2528
<div class="card-body">
26-
<h5 class="card-title">{{ trans('step-2-title') }}</h5>
27-
<p class="card-text text-muted">{{ trans('step-2-desc', {'%table%': fsc.twigData.selectedTable}) }}</p>
29+
<h5 class="card-title">{{ trans('column') }}</h5>
30+
<p class="card-text text-muted">Selecciona la columna de fecha de la tabla {{ fsc.twigData.selectedTable }}.</p>
2831

2932
<form action="{{ fsc.url() }}" method="post">
3033
<input type="hidden" name="action" value="process-custom-board">
@@ -39,37 +42,48 @@ Se podría refactorizar o hacer el componente más reutilizable si se pasan como
3942
<i class="fa-solid fa-arrow-left"></i> {{ trans('back') }}
4043
</a>
4144
<button class="btn btn-primary" type="submit">
42-
{{ trans('finish') }} <i class="fa-solid fa-check"></i>
45+
{{ trans('create') }} <i class="fa-solid fa-check"></i>
4346
</button>
4447
</div>
4548
</form>
4649
</div>
47-
<div class="card-footer text-muted">
48-
{{ trans('step-x-of-y', {'%step%': 2, '%total%': 2}) }}
49-
</div>
50-
5150
{% else %}
5251
{# STEP 1 #}
5352
<div class="card-body">
54-
<h5 class="card-title">{{ trans('step-1-title') }}</h5>
55-
<p class="card-text text-muted">{{ trans('step-1-desc') }}</p>
53+
<div class="border rounded p-3 mb-4">
54+
<h5 class="card-title">{{ trans('generate') }} {{ trans('default')|lower }}</h5>
55+
<p class="card-text text-muted">Genera las pizarras predeterminadas del plugin.</p>
5656

57-
<form action="{{ fsc.url() }}" method="get" id="reportForm">
58-
<input type="hidden" name="action" value="custom-board-assistant">
57+
<form action="{{ fsc.url() }}" method="post">
58+
{{ formToken() }}
59+
<input type="hidden" name="action" value="generate-boards">
5960

60-
<div class="mb-3">
61-
{{ forms.simpleSelect('selectTabla', 'selectedTable', fsc.twigData.selectedTable, fsc.twigData.tables, trans('table'), 'fa-solid fa-table') }}
62-
</div>
61+
<div class="d-grid gap-2 d-md-flex justify-content-md-end">
62+
<button class="btn btn-primary" type="submit">
63+
<i class="fa-solid fa-wand-magic-sparkles me-1"></i>{{ trans('generate') }}
64+
</button>
65+
</div>
66+
</form>
67+
</div>
6368

64-
<div class="d-grid gap-2 d-md-flex justify-content-md-end">
65-
<button class="btn btn-primary" type="submit">
66-
{{ trans('next') }} <i class="fa-solid fa-arrow-right"></i>
67-
</button>
68-
</div>
69-
</form>
70-
</div>
71-
<div class="card-footer text-muted">
72-
{{ trans('step-x-of-y', {'%step%': 1, '%total%': 2}) }}
69+
<div class="border rounded p-3">
70+
<h5 class="card-title">{{ trans('create') }} {{ trans('reports-board')|lower }} {{ trans('date')|lower }}</h5>
71+
<p class="card-text text-muted">Elige una tabla y un campo de fecha para crear una pizarra personalizada.</p>
72+
73+
<form action="{{ fsc.url() }}" method="get" id="reportForm">
74+
<input type="hidden" name="action" value="custom-board-assistant">
75+
76+
<div class="mb-3">
77+
{{ forms.simpleSelect('selectTabla', 'selectedTable', fsc.twigData.selectedTable, fsc.twigData.tables, trans('table'), 'fa-solid fa-table') }}
78+
</div>
79+
80+
<div class="d-grid gap-2 d-md-flex justify-content-md-end">
81+
<button class="btn btn-outline-primary" type="submit">
82+
{{ trans('next') }} <i class="fa-solid fa-arrow-right"></i>
83+
</button>
84+
</div>
85+
</form>
86+
</div>
7387
</div>
7488
{% endif %}
7589
</div>

0 commit comments

Comments
 (0)