From e2bef474923f047ea38339594739dd8cb6367d18 Mon Sep 17 00:00:00 2001
From: Philip Sargent <philip.sargent@gmail.com>
Date: Fri, 17 Mar 2023 20:02:08 +0000
Subject: [PATCH] QM re-jigging

---
 1623/204/{qm.csv => qm-204.csv} | 0
 1623/234/{qm.csv => qm-234.csv} | 0
 handbook/troggle/datamodel.html | 9 ++++-----
 3 files changed, 4 insertions(+), 5 deletions(-)
 rename 1623/204/{qm.csv => qm-204.csv} (100%)
 rename 1623/234/{qm.csv => qm-234.csv} (100%)

diff --git a/1623/204/qm.csv b/1623/204/qm-204.csv
similarity index 100%
rename from 1623/204/qm.csv
rename to 1623/204/qm-204.csv
diff --git a/1623/234/qm.csv b/1623/234/qm-234.csv
similarity index 100%
rename from 1623/234/qm.csv
rename to 1623/234/qm-234.csv
diff --git a/handbook/troggle/datamodel.html b/handbook/troggle/datamodel.html
index 4c73c97d2..2733d9d82 100644
--- a/handbook/troggle/datamodel.html
+++ b/handbook/troggle/datamodel.html
@@ -194,17 +194,16 @@ from django.db import models
     id = models.IntegerField(<span style="color: magenta">primary_key</span> =True)  <span style="color: green"># AutoField?</span> 
     new_since_parsing = models.BooleanField()
     non_public = models.BooleanField()
-    <span style="color:blue">found_by</span> = models.<span style="color:blue">ForeignKey</span> (CoreLogbookentry, blank=True, null=True)
-    <span style="color:blue">ticked_off_by</span> = models.<span style="color:blue">ForeignKey</span> (CoreLogbookentry, blank=True, null=True)
     number = models.IntegerField()
     grade = models.CharField(max_length=1)
     location_description = models.TextField()
-    nearest_station_description = models.CharField(max_length=400, blank=True)
     nearest_station_name = models.CharField(max_length=200, blank=True)
-    <span style="color:blue">nearest_station</span> = models.<span style="color:blue">ForeignKey</span> ('CoreSurvexstation', blank=True, null=True)
     area = models.CharField(max_length=100, blank=True)
     completion_description = models.TextField(blank=True)
-    comment = models.TextField(blank=True)
+    resolution_station_name = models.CharField(max_length=200, blank=True, null=True)
+    area = models.CharField(max_length=100, blank=True, null=True)
+    page_ref = models.TextField(blank=True, null=True)
+    comment = models.TextField(blank=True, null=True)
 
 
 <span style="color: lime">class</span> <span style="color:blue"><b>Survexblock</b></span>(models.Model):