Merge branch 'release/0.10.1'

Author: JeltevanBoheemen

CITATION.cff

@@ -41,5 +41,5 @@ abstract: >-
   transcripts, to aid clinical linguists and research into
   language development and language disorders.
 license: BSD-3-Clause
-version: 0.10.0
-date-released: '2025-10-13'
+version: 0.10.1
+date-released: '2025-11-06'

backend/analysis/serializers.py

@@ -69,7 +69,8 @@ def get_num_transcripts(self, obj):
 
     class Meta:
         model = Corpus
-        fields = ('id', 'name', 'method_category', 'num_transcripts', 'username')
+        fields = ('id', 'name', 'method_category',
+                  'num_transcripts', 'username', 'date_added')
 
 
 class CorpusDetailsSerializer(serializers.ModelSerializer):

backend/requirements.txt

@@ -91,7 +91,7 @@ djangorestframework==3.13.1
     # via
     #   -r requirements.in
     #   django-rest-auth
-editdistance==0.6.2
+editdistance==0.6.1
     # via auchann
 et-xmlfile==1.1.0
     # via openpyxl

frontend/src/app/corpus/corpus-detail.component.html

@@ -31,18 +31,22 @@ <h3 class="title is-4"><span class="tag is-primary is-light">{{defaultTam?.categ
             </p-dropdown>
         </div>
     </div>
-    <table class="table is-fullwidth is-hoverable">
-        <thead>
+
+    <p-table [value]="corpus.transcripts" [rowHover]="true" sortField="date" [sortOrder]="-1">
+        <ng-template pTemplate="header">
             <tr>
-                <th>Transcript</th>
-                <th>Status</th>
-                <th>Utterances (#)</th>
-                <th>Created on</th>
+                <th pSortableColumn="name">Transcript<p-sortIcon field="name" /></th>
+                <th pSortableColumn="status_name">Status<p-sortIcon field="status_name" /></th>
+                <th pSortableColumn="utterances.length">
+                    Utterances (#) <p-sortIcon field="utterances.length" />
+                </th>
+                <th pSortableColumn="date_added">Created on<p-sortIcon field="date_added" /></th>
                 <th class="has-text-right">Actions</th>
             </tr>
-        </thead>
-        <tbody>
-            <tr *ngFor="let transcript of corpus.transcripts">
+        </ng-template>
+
+        <ng-template pTemplate="body" let-transcript>
+            <tr>
                 <td class="transcript-name" [routerLink]="['/transcript/', transcript.id]">
                     <a>{{ transcript.name }}</a>
                 </td>
@@ -64,6 +68,8 @@ <h3 class="title is-4"><span class="tag is-primary is-light">{{defaultTam?.categ
                     </div>
                 </td>
             </tr>
-        </tbody>
-    </table>
+        </ng-template>
+
+    </p-table>
+
 </ng-container>

frontend/src/app/corpus/list-corpus.component.html

@@ -1,37 +1,48 @@
-<ng-container *ngIf="(corpora$ | async) as corpora; else loading;">
-    <table class="table is-fullwidth is-hoverable" *ngIf="corpora.length > 0">
-        <thead>
+<ng-container *ngIf="corpora$ | async as corpora; else loading">
+    <p-table [value]="corpora" [rowHover]="true" sortField="date_added" [sortOrder]="-1">
+        <ng-template pTemplate="header">
             <tr>
-                <th>Name</th>
-                <th>transcripts (#)</th>
-                <th *ngIf="(authService.currentUser$ | async).isAdmin">Owner</th>
+                <th pSortableColumn="name">Name <p-sortIcon field="name" /></th>
+                <th pSortableColumn="num_transcripts">
+                    Transcripts (#) <p-sortIcon field="num_transcripts" />
+                </th>
+                <th
+                    pSortableColumn="username"
+                    *ngIf="(authService.currentUser$ | async).isAdmin"
+                >
+                    Owner <p-sortIcon field="username" />
+                </th>
+                <th pSortableColumn="date_added">Created on<p-sortIcon field="date_added" /></th>
                 <th class="has-text-right">Actions</th>
             </tr>
-        </thead>
-        <tbody>
-            <tr *ngFor="let corp of corpora" [routerLink]="['/corpora/', corp.id]">
-                <td>{{ corp.name }}</td>
-                <td>{{ corp.num_transcripts|| "0" }}</td>
-                <td *ngIf="(authService.currentUser$ | async).isAdmin">{{corp.username}}</td>
+        </ng-template>
+        <ng-template pTemplate="body" let-corpus>
+            <tr [routerLink]="['/corpora/', corpus.id]">
+                <td>{{ corpus.name }}</td>
+                <td>{{ corpus.num_transcripts || "0" }}</td>
+                <td *ngIf="(authService.currentUser$ | async).isAdmin">
+                    {{ corpus.username }}
+                </td>
+                <td>{{ corpus.date_added | date: "dd/MM/yyyy" }}</td>
                 <td class="has-text-right">
                     <div class="buttons is-right">
                         <button class="button is-success" pTooltip="add transcripts" (click)="$event.stopPropagation()"
-                            [routerLink]="['/upload']" [queryParams]="{ corpus: corp.id }">
+                            [routerLink]="['/upload']" [queryParams]="{ corpus: corpus.id }">
                             <span class="icon is-small">
                                 <fa-icon [icon]="faPlus"></fa-icon>
                             </span>
                         </button>
                         <button class="button is-danger" pTooltip="delete corpus"
-                            (click)="confirmDeleteCorpus($event, corp)">
+                            (click)="confirmDeleteCorpus($event, corpus)">
                             <span class="icon is-small">
                                 <fa-icon [icon]="faTrash"></fa-icon>
                             </span>
                         </button>
                     </div>
                 </td>
             </tr>
-        </tbody>
-    </table>
+        </ng-template>
+    </p-table>
 
     <h1 *ngIf="corpora.length === 0" class="title is-2">
         No corpora yet!

frontend/src/app/corpus/list-corpus.component.scss

@@ -1,3 +0,0 @@
-tbody tr {
-    cursor: pointer;
-}

frontend/src/app/shared/models/corpus.ts

@@ -6,11 +6,11 @@ export interface ListedCorpus {
     method_category: number;
     num_transcripts: number;
     username?: string;
+    date_added?: Date;
 }
 
 export interface Corpus extends Omit<ListedCorpus, 'num_transcripts'> {
     status: 'created';
-    date_added?: Date;
     date_modified?: Date;
     default_method?: number;
     transcripts?: ListedTranscript[];

frontend/src/app/shared/shared.module.ts

@@ -9,6 +9,7 @@ import { FieldsetModule } from 'primeng/fieldset';
 import { FileUploadModule } from 'primeng/fileupload';
 import { MessageModule } from 'primeng/message';
 import { MessagesModule } from 'primeng/messages';
+import { TableModule } from 'primeng/table';
 import { ToastModule } from 'primeng/toast';
 import { TooltipModule } from 'primeng/tooltip';
 import { PanelModule } from 'primeng/panel';
@@ -29,6 +30,7 @@ const primeNGModules = [
     FileUploadModule,
     MessageModule,
     MessagesModule,
+    TableModule,
     ToastModule,
     TooltipModule,
     PanelModule,

frontend/src/styles.scss

@@ -2,7 +2,7 @@
 @import 'bulma/bulma';
 @import "@creativebulma/bulma-divider";
 @import 'primeicons/primeicons.css';
-@import 'primeng/resources/themes/nova/theme.css';
+@import "primeng/resources/themes/lara-light-blue/theme.css";
 @import 'primeng/resources/primeng.css';
 
 @media print {
@@ -37,4 +37,11 @@
 
 .p-toast-detail {
     word-break: break-all;
-}
+}
+tbody.p-element>tr:hover {
+    cursor: pointer;
+}
+
+.p-datatable {
+    @extend .table
+}

package.json

@@ -1,6 +1,6 @@
 {
     "name": "sasta",
-    "version": "0.10.0",
+    "version": "0.10.1",
     "description": "Annotate and analyze transcripts",
     "author": "UU Digital Humanities Lab",
     "license": "BSD-3-Clause",