expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2026-05-06 06:13:05 +01:00
Code Issues 18 Projects 3 Activity

move function

Browse Source
This commit is contained in:
Philip Sargent
2020-06-27 12:04:34 +01:00
parent e2713cfe2d
commit ca6f7ed587
13 changed files with 58032 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/migrations/0001_initial.py
+3 -12
View File
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.29 on 2020-06-23 22:48
# Generated by Django 1.11.29 on 2020-06-26 23:53
from __future__ import unicode_literals
from django.conf import settings
@@ -351,13 +351,6 @@ class Migration(migrations.Migration):
'ordering': ('id',),
},
),
migrations.CreateModel(
name='SurvexEquate',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('cave', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='core.Cave')),
],
),
migrations.CreateModel(
name='SurvexFile',
fields=[
@@ -392,7 +385,6 @@ class Migration(migrations.Migration):
('y', models.FloatField(blank=True, null=True)),
('z', models.FloatField(blank=True, null=True)),
('block', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.SurvexBlock')),
('equate', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='core.SurvexEquate')),
],
),
migrations.CreateModel(
@@ -414,9 +406,8 @@ class Migration(migrations.Migration):
('filesize', models.IntegerField(default=0)),
('npaths', models.IntegerField(default=0)),
('manyscansfolders', models.ManyToManyField(to='core.ScansFolder')),
('survexblocks', models.ManyToManyField(to='core.SurvexBlock')),
('survexscans', models.ManyToManyField(to='core.SingleScan')),
('survextitles', models.ManyToManyField(to='core.SurvexTitle')),
('scans', models.ManyToManyField(to='core.SingleScan')),
('survexfiles', models.ManyToManyField(to='core.SurvexFile')),
('tunnelcontains', models.ManyToManyField(to='core.TunnelFile')),
],
options={
core/models_caves.py
+1 -1
View File
@@ -484,7 +484,7 @@ class LogbookEntry(TroggleModel):
class QM(TroggleModel):
#based on qm.csv in trunk/expoweb/1623/204 which has the fields:
# based on qm.csv in trunk/expoweb/1623/204 which has the fields:
#"Number","Grade","Area","Description","Page reference","Nearest station","Completion description","Comment"
found_by = models.ForeignKey(LogbookEntry, related_name='QMs_found',blank=True, null=True,on_delete=models.CASCADE )
ticked_off_by = models.ForeignKey(LogbookEntry, related_name='QMs_ticked_off',blank=True, null=True,on_delete=models.CASCADE)
core/models_survex.py
+1 -22
View File
@@ -7,13 +7,6 @@ from django.conf import settings
from django.urls import reverse
###########################################################
# These will allow browsing and editing of the survex data
###########################################################
# Needs to add:
# Equates
# reloading
class SurvexDirectory(models.Model):
path = models.CharField(max_length=200)
cave = models.ForeignKey('Cave', blank=True, null=True,on_delete=models.CASCADE)
@@ -52,9 +45,6 @@ class SurvexFile(models.Model):
self.save()
#class SurvexEquate(models.Model):
# cave = models.ForeignKey('Cave', blank=True, null=True,on_delete=models.CASCADE)
class SurvexStationLookUpManager(models.Manager):
def lookup(self, name):
blocknames, sep, stationname = name.rpartition(".")
@@ -132,16 +122,7 @@ class SurvexBlock(models.Model):
else:
res.append({'person':personrole.personexpedition.person, 'expeditionyear':personrole.personexpedition.expedition.year, 'roles':str(personrole.role)})
return res
# def MakeSurvexStation(self, name):
# ssl = self.survexstation_set.filter(name=name)
# if ssl:
# assert len(ssl) == 1
# return ssl[0]
# ss = SurvexStation(name=name, block=self)
# #ss.save()
# return ss
def DayIndex(self):
return list(self.expeditionday.survexblock_set.all()).index(self)
@@ -211,11 +192,9 @@ class TunnelFile(models.Model):
bfontcolours = models.BooleanField(default=False)
manyscansfolders = models.ManyToManyField("ScansFolder") # implicitly links to SVX files
scans = models.ManyToManyField("SingleScan") # implicitly links to SVX files
# survexblocks = models.ManyToManyField("SurvexBlock")
tunnelcontains = models.ManyToManyField("TunnelFile") # case when its a frame type
filesize = models.IntegerField(default=0)
npaths = models.IntegerField(default=0)
# survextitles = models.ManyToManyField("SurvexTitle")
survexfiles = models.ManyToManyField("SurvexFile") # direct link to SVX files
class Meta:
flatpages/migrations/0001_initial.py
+1 -1
View File
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.29 on 2020-06-23 22:48
# Generated by Django 1.11.29 on 2020-06-26 23:53
from __future__ import unicode_literals
from django.db import migrations, models
lines-of-python.txt
+8 -8
View File
@@ -33,23 +33,23 @@
97 ./core/forms.py
97 ./core/view_surveys.py
98 ./core/admin.py
98 ./parsers/QMs.py
99 ./parsers/QMs.py
102 ./parsers/people.py
124 ./core/templatetags/wiki_markup.py
135 ./utils.py
147 ./parsers/surveys.py
160 ./core/models_survex.py
141 ./core/models_survex.py
146 ./parsers/surveys.py
164 ./flatpages/views.py
164 ./modelviz.py
167 ./core/models.py
171 ./core/models.py
175 ./core/views_other.py
198 ./parsers/caves.py
216 ./core/views_logbooks.py
256 ./core/views_survex.py
255 ./core/views_survex.py
276 ./profiles/views.py
280 ./databaseReset.py
387 ./core/views_caves.py
444 ./parsers/survex.py
450 ./core/models_caves.py
449 ./core/models_caves.py
515 ./parsers/logbooks.py
5954
556 ./parsers/survex.py
6049
lines-of-templates.txt
+2 -2
View File
@@ -34,9 +34,9 @@
23 ./templates/statistics.html
24 ./README/index.html
24 ./templates/dataformat/logbookentry.html
25 ./templates/manyscansfolders.html
25 ./templates/profiles/select_profile.html
25 ./templates/survexscansfolders.html
27 ./templates/survexscansfolder.html
27 ./templates/scansfolder.html
31 ./templates/caveindex.html
33 ./templates/tunnelfiles.html
35 ./templates/person.html
loadlogbk.log
+31
View File
@@ -0,0 +1,31 @@
2020 0 should be 0
2019 20 should be 20
2018 74 should be 74
2017 60 should be 60
2016 81 should be 81
2015 79 should be 79
2014 65 should be 65
2013 51 should be 51
2012 75 should be 75
2011 68 should be 68
2010 22 should be 22
2009 52 should be 52
2008 49 should be 49
2007 111 should be 111
2006 24 should be 24
2005 55 should be 55
2004 76 should be 76
2003 40 should be 40
2002 31 should be 31
2001 48 should be 48
2000 54 should be 54
1999 79 should be 79
1998 43 should be 43
1997 53 should be 53
1996 94 should be 94
1995 41 should be 41
1994 32 should be 32
1993 41 should be 41
1992 61 should be 61
1991 38 should be 38
1982 0 should be 0
mem-0.log
+13399
View File
File diff suppressed because it is too large Load Diff
mem-1.log
+13399
View File
File diff suppressed because it is too large Load Diff
mem-3.log
+13399
View File
File diff suppressed because it is too large Load Diff
svxblks.log
+10971
View File
File diff suppressed because it is too large Load Diff
svxlinear.log
+6806
View File
File diff suppressed because it is too large Load Diff
troggle-inspectdb.py
+11
View File
@@ -15,3 +15,14 @@
from __future__ import unicode_literals
from django.db import models
class DjangoMigrations(models.Model):
id = models.IntegerField(primary_key=True) # AutoField?
app = models.CharField(max_length=255)
name = models.CharField(max_length=255)
applied = models.DateTimeField()
class Meta:
managed = False
db_table = 'django_migrations'