Merge columns: Prazo and Faltam

f3rn4nd0-c354r · Oct 24, 2023 · bb8026d · bb8026d
1 parent 56d40ad
commit bb8026d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 11 deletions.
diff --git a/docs/index.html b/docs/index.html
@@ -86,10 +86,19 @@ <h1 class="page-title">Concursos Literários em Português ✒</h1>
 
             <div id="separator"> </div>
 
-            <b-table id="main-table" :items="filteredUsuarios" :fields="tableFields"
-                sort-icon-left :sort-by="currentSortColumn" label-sort-asc="Ordenar 🡅" label-sort-desc="Ordenar 🡇"
-                label-sort-clear="desordenar" no-sort-reset :sort-compare="sortingChanged"
-                foot-clone striped borderless hover head-variant="light">
+            <b-table
+                    id="main-table"
+                    :items="filteredUsuarios"
+                    :fields="tableFields"
+                    sort-icon-left :sort-by="currentSortColumn"
+                    label-sort-asc="Ordenar 🡅" label-sort-desc="Ordenar 🡇" label-sort-clear="desordenar"
+                    no-sort-reset
+                    :sort-compare="sortingChanged"
+                    foot-clone
+                    striped
+                    borderless
+                    hover
+                    head-variant="light">
                 <template #cell(titulo)="data">
                     <span v-html="data.item.titulo"></span>
                 </template>
@@ -100,10 +109,7 @@ <h1 class="page-title">Concursos Literários em Português ✒</h1>
                     <b-link v-if="data.item.regulamento" :href="data.item.regulamento" target="_blank">abrir</b-link>
                 </template>
                 <template #cell(prazo)="data">
-                    {{data.item.prazo}}
-                </template>
-                <template #cell(tempoRestante)="data">
-                    {{data.item.tempoRestante}} dias
+                    {{data.item.tempoRestante}} dia(s)<br>({{data.item.prazo}})
                 </template>
             </b-table>
         </template>
@@ -131,8 +137,7 @@ <h1 class="page-title">Concursos Literários em Português ✒</h1>
                         { key: 'dimensao', label: 'Dimensão' },
                         { key: 'premio', label: 'Prémio', sortable: true, thClass: 'sortable-column' },
                         { key: 'entrega', label: 'Entrega' },
-                        { key: 'prazo', label: 'Prazo', sortable: true, thClass: 'sortable-column', tdClass: 'no-splitting' },
-                        { key: 'tempoRestante', label: 'Faltam', sortable: true, thClass: 'sortable-column no-splitting', tdClass: 'no-splitting' },
+                        { key: 'prazo', label: 'Falta(m)', sortable: true, thClass: 'sortable-column', tdClass: 'no-splitting center' },
                         { key: 'obs', label: 'Obs.' },
                         { key: 'website', label: 'Website' },
                         { key: 'regulamento', label: 'Regulamento' },

diff --git a/docs/styles.css b/docs/styles.css
@@ -70,12 +70,14 @@ body {
     padding-bottom: 10px;
 }
 
-/* for the title */
 td.no-splitting {
     white-space: nowrap;
     overflow: hidden;
 }
 
+td.center {
+    text-align: center;
+}
 
 .locked-column {
     /* Make text bold */