Update table ordering and data

data/films/log.json

@@ -1,4 +1,12 @@
 [
+ {
+   "Date Added": "2023-02-17",
+   "Title": "Home",
+   "Release Year": "2018",
+   "Letterboxd URI": "https://letterboxd.com/film/home-2018-6/",
+   "Rewatch": true,
+   "Date Watched": "2023-02-28"
+ },
  {
    "Date Added": "2023-02-28",
    "Title": "O, Persecuted",
@@ -18,8 +26,8 @@
  {
    "Date Added": "2023-02-17",
    "Title": "Home",
-   "Release Year": "",
+   "Release Year": "2018",
-   "Letterboxd URI": "",
+   "Letterboxd URI": "https://letterboxd.com/film/home-2018-6/",
    "Rewatch": false,
    "Date Watched": "2023-02-17"
  },

layouts/partials/books/table-body.html

@@ -1,15 +1,130 @@
 {{ if ( eq ( .Scratch.Get "listMode" ) "current" ) }}
-  {{ .Scratch.Set "filterCol" "Date Started" }}
+  {{ range ( sort $.Site.Data.books.current "Date Started" "desc" ) }}
-  {{ .Scratch.Set "filterDir" "asc" }}
+    <tr>
-{{ else if ( eq ( .Scratch.Get "listMode" ) "log" ) }}
+      <td>{{ if index . "Date Added" }}{{ time.Format "Jan 2, 2006" ( index . "Date Added" ) }}{{ else }}n/a{{end }}</td>
-  {{ .Scratch.Set "filterCol" "Date Finished" }}
+      <td>
-  {{ .Scratch.Set "filterDir" "desc" }}
+        <p>
-{{ else if ( eq ( .Scratch.Get "listMode" ) "wishlist" ) }}
+        {{- with ( where ( where $.Site.Pages "Section" "books" ) "Title" .Title ) -}}
-  {{ .Scratch.Set "filterCol" "Title" }}
+          {{ range . }}
-  {{ .Scratch.Set "filterDir" "asc" }}
+          <a href="{{ .RelPermalink }}">
           {{ end }}
-
+        {{- end -}}
-{{ range ( sort ( sort ( index $.Site.Data.books ( .Scratch.Get "listMode" ) ) "Title" "asc" ) ( .Scratch.Get "filterCol" ) ( .Scratch.Get "filterDir" ) ) }}
+        <cite class="book">{{ .Title }}</cite>{{ if .Edition }} <span class="book--edition">({{ .Edition }})</span>{{ end }}
+        {{- with ( where ( where $.Site.Pages "Section" "books" ) "Title" .Title ) -}}
+        </a>
+        {{- end -}}
+        </p>
+      </td>
+      <td>
+        <p class="author">{{ .Author }}</p>
+        {{- if ( index . "Additional Authors" ) -}}
+          <p class="author--additional">Additional: {{ index . "Additional Authors" }}</p>
+        {{- end -}}
+      </td>
+      <td>
+        <p class="year">{{- index . "Year Published" -}}
+        {{- if ( and ( ne ( index . "Original Publication Year" ) "" ) ( ne ( index . "Original Publication Year" ) ( index . "Year Published" ) ) ) -}}
+          &nbsp;<span class="year--original">(orig.&nbsp;{{ index . "Original Publication Year" }})</span>
+        {{- end -}}
+      </td>
+      <td>
+        {{- if index . "Date Started" -}}
+          {{- time.Format "Jan 2, 2006" ( index . "Date Started" ) -}}
+        {{- end -}}&ndash;
+      </td>
+    </tr>    
+  {{ end }}
+{{ else if ( eq ( .Scratch.Get "listMode" ) "log" ) }}
+  <tr>
+    <td colspan=5><h3>Diary</h3></td>
+  </tr>
+  {{ range ( sort ( where $.Site.Data.books.log "Date Finished" "!=" "" ) "Date Finished" "desc" ) }}
+    <tr>
+      <td>{{ if index . "Date Added" }}{{ time.Format "Jan 2, 2006" ( index . "Date Added" ) }}{{ else }}n/a{{end }}</td>
+      <td>
+        <p>
+        {{- with ( where ( where $.Site.Pages "Section" "books" ) "Title" .Title ) -}}
+          {{ range . }}
+          <a href="{{ .RelPermalink }}">
+          {{ end }}
+        {{- end -}}
+        <cite class="book">{{ .Title }}</cite>{{ if .Edition }} <span class="book--edition">({{ .Edition }})</span>{{ end }}
+        {{- with ( where ( where $.Site.Pages "Section" "books" ) "Title" .Title ) -}}
+        </a>
+        {{- end -}}
+        </p>
+      </td>
+      <td>
+        <p class="author">{{ .Author }}</p>
+        {{- if ( index . "Additional Authors" ) -}}
+          <p class="author--additional">Additional: {{ index . "Additional Authors" }}</p>
+        {{- end -}}
+      </td>
+      <td>
+        <p class="year">{{- index . "Year Published" -}}
+        {{- if ( and ( ne ( index . "Original Publication Year" ) "" ) ( ne ( index . "Original Publication Year" ) ( index . "Year Published" ) ) ) -}}
+          &nbsp;<span class="year--original">(orig.&nbsp;{{ index . "Original Publication Year" }})</span>
+        {{- end -}}
+      </td>
+      <td>
+        {{- if index . "Date Started" -}}
+          {{- time.Format "Jan 2, 2006" ( index . "Date Started" ) -}}
+        {{- else -}}
+          Unknown
+        {{- end -}}&ndash;{{- if index . "Date Finished" -}}
+          {{- time.Format "Jan 2, 2006" ( index . "Date Finished" ) -}}
+        {{- else -}}
+          Unknown
+        {{- end -}}
+      </td>
+    </tr>    
+  {{ end }}
+  <tr>
+    <td colspan=5><h3>Assorted</h3></td>
+  </tr>
+  {{ range ( sort ( where $.Site.Data.books.log "Date Finished" "" ) "Title" "asc" ) }}
+    <tr>
+      <td>{{ if index . "Date Added" }}{{ time.Format "Jan 2, 2006" ( index . "Date Added" ) }}{{ else }}n/a{{end }}</td>
+      <td>
+        <p>
+        {{- with ( where ( where $.Site.Pages "Section" "books" ) "Title" .Title ) -}}
+          {{ range . }}
+          <a href="{{ .RelPermalink }}">
+          {{ end }}
+        {{- end -}}
+        <cite class="book">{{ .Title }}</cite>{{ if .Edition }} <span class="book--edition">({{ .Edition }})</span>{{ end }}
+        {{- with ( where ( where $.Site.Pages "Section" "books" ) "Title" .Title ) -}}
+        </a>
+        {{- end -}}
+        </p>
+      </td>
+      <td>
+        <p class="author">{{ .Author }}</p>
+        {{- if ( index . "Additional Authors" ) -}}
+          <p class="author--additional">Additional: {{ index . "Additional Authors" }}</p>
+        {{- end -}}
+      </td>
+      <td>
+        <p class="year">{{- index . "Year Published" -}}
+        {{- if ( and ( ne ( index . "Original Publication Year" ) "" ) ( ne ( index . "Original Publication Year" ) ( index . "Year Published" ) ) ) -}}
+          &nbsp;<span class="year--original">(orig.&nbsp;{{ index . "Original Publication Year" }})</span>
+        {{- end -}}
+      </td>
+      <td>
+        {{- if index . "Date Started" -}}
+          {{- time.Format "Jan 2, 2006" ( index . "Date Started" ) -}}
+        {{- else -}}
+          Unknown
+        {{- end -}}&ndash;{{- if index . "Date Finished" -}}
+          {{- time.Format "Jan 2, 2006" ( index . "Date Finished" ) -}}
+        {{- else -}}
+          Unknown
+        {{- end -}}
+      </td>
+    </tr> 
+  {{ end }}
+{{ else if ( eq ( .Scratch.Get "listMode" ) "wishlist" ) }}
+  {{ range ( sort $.Site.Data.books.wishlist "Title" "asc" ) }}
     <tr>
       <td>{{ if index . "Date Added" }}{{ time.Format "Jan 2, 2006" ( index . "Date Added" ) }}{{ else }}n/a{{end }}</td>
       <td>
@@ -37,16 +152,7 @@
           <span class="year--original">(orig.&nbsp;{{ index . "Orginal Publication Year" }})</span>
         {{- end -}}
       </td>
-  <td>
+      <td>n/a</td>
-    {{- if index . "Date Started" -}}
-      {{- time.Format "Jan 2, 2006" ( index . "Date Started" ) -}}
-    {{- else -}}
-      Unknown
-    {{- end -}}&ndash;{{- if index . "Date Finished" -}}
-      {{- time.Format "Jan 2, 2006" ( index . "Date Finished" ) -}}
-    {{- else -}}
-      Unknown
-    {{- end -}}
-  </td>
     </tr> 
   {{ end }}
+{{ end }}