1 files changed, 20 insertions, 9 deletions

diff --git a/www/photo.causal.agency/trips.html b/www/photo.causal.agency/trips.html
index b0cf1de2..e81be6ef 100644
--- a/www/photo.causal.agency/trips.html
+++ b/www/photo.causal.agency/trips.html
@@ -47,13 +47,6 @@ input[type="number"] { width: 5ch; }
 </form>
 
 <datalist id="films">
-	<option>Ferrania P30 80</option>
-	<option>Flic Film Elektra 100</option>
-	<option>Ilford FP4 Plus 125</option>
-	<option>Fomapan Creative 200</option>
-	<option>Harman Phoenix 200</option>
-	<option>Shanghai Color 400</option>
-	<option>Reflx Lab 800T</option>
 </datalist>
 </section>
 
@@ -158,6 +151,9 @@ function setBodies() {
 			select.appendChild(option);
 		}
 	}
+	if (trips.length) {
+		selects.forEach(select => select.value = trips[trips.length-1].body);
+	}
 }
 setBodies();
 
@@ -220,7 +216,7 @@ function setTrips() {
 		rollLi.appendChild(document.createTextNode(` (${rollTrips[0].body})`));
 		let body = bodies.find(body => body.name == rollTrips[0].body);
 		let rollUl = document.createElement("ul");
-		for (let trip of rollTrips) {
+		for (let [index, trip] of rollTrips.entries()) {
 			let li = document.createElement("li");
 			let b = document.createElement("b");
 			b.appendChild(document.createTextNode(trip.date));
@@ -228,7 +224,10 @@ function setTrips() {
 			li.appendChild(document.createTextNode(
 				`: ${trip.firstExposure}–${trip.lastExposure}`
 			));
-			if (body.mount != body.name) {
+			if (
+				(!body || body.mount != body.name) &&
+				(!index || trip.lens != rollTrips[index-1].lens)
+			) {
 				li.appendChild(document.createElement("br"));
 				li.appendChild(document.createTextNode(trip.lens));
 			}
@@ -359,4 +358,16 @@ function addTrip() {
 	setTripBody();
 }
 
+function setFilms() {
+	let datalist = document.getElementById("films");
+	datalist.innerHTML = "";
+	let films = new Set(trips.reverse().map(trip => trip.film));
+	for (let film of films.values().take(20)) {
+		let option = document.createElement("option");
+		option.innerText = film;
+		datalist.appendChild(option);
+	}
+}
+setFilms();
+
 </script>