subleg padding and sorting

peachjam/js/components/LegislationTable/index.vue

@@ -311,12 +311,10 @@ export default {
 
       const sortAsc = this.sort[0] !== '-';
       const sortKey = sortAsc ? this.sort : this.sort.substring(1);
-      data.sort((a, b) => {
-        const fa = a[sortKey] ? a[sortKey].toLowerCase() : '';
-        const fb = b[sortKey] ? b[sortKey].toLowerCase() : '';
-        // year is the exception that we want to sort desc by default
-        return fa.localeCompare(fb) * (sortAsc ? 1 : -1) * (sortKey === 'year' ? -1 : 1);
-      });
+      this.sortRows(data, sortKey, sortAsc);
+      for (const item of data) {
+        this.sortRows(item.children, sortKey, sortAsc);
+      }
       this.filteredData = data;
 
       this.rows = [];
@@ -344,6 +342,14 @@ export default {
         }
         this.rows.push(record);
       });
+    },
+    sortRows (rows, sortKey, sortAsc) {
+      rows.sort((a, b) => {
+        const fa = a[sortKey] ? a[sortKey].toLowerCase() : '';
+        const fb = b[sortKey] ? b[sortKey].toLowerCase() : '';
+        // year is the exception that we want to sort desc by default
+        return fa.localeCompare(fb) * (sortAsc ? 1 : -1) * (sortKey === 'year' ? -1 : 1);
+      });
     }
   }
 };

peachjam/static/stylesheets/components/_tables.scss

@@ -35,9 +35,8 @@
   }
 
   .doc-table-children {
-    .doc-table-row {
-      // extra initial padding for child rows
-      grid-template-columns: 30px repeat(12, 1fr);
+    .cell-title {
+      padding-left: 20px;
     }
   }
 
@@ -55,8 +54,21 @@
     .cell-date {
       grid-column: span 2;
     }
+  }
+
+  @include media-breakpoint-down(md) {
+    .doc-table-children {
+      .cell-title {
+        padding-left: 0px;
+      }
+
+      .doc-table-row {
+        // extra initial padding for child rows
+        grid-template-columns: 30px repeat(12, 1fr);
+      }
+    }
 
-    @include media-breakpoint-down(md) {
+    &.doc-table-title-subtitle-date {
       .doc-table-head {
         .cell-subtitle,
         .cell-date {

peachjam_api/serializers.py

@@ -74,9 +74,15 @@ class Meta:
 
 
 class ChildLegislationSerializer(serializers.ModelSerializer):
+    year = serializers.SerializerMethodField("get_year")
+
     class Meta:
         model = Legislation
-        fields = ("title", "citation", "work_frbr_uri", "repealed", "date")
+        fields = ("title", "citation", "work_frbr_uri", "repealed", "year")
+
+    def get_year(self, instance):
+        """Use the FRBR work uri, rather than the document year."""
+        return instance.frbr_uri_date.split("-")[0]
 
 
 class LegislationSerializer(serializers.ModelSerializer):
@@ -91,7 +97,6 @@ class Meta:
             "title",
             "children",
             "citation",
-            "date",
             "work_frbr_uri",
             "repealed",
             "year",