expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2024-11-27 01:31:57 +00:00
Code Issues 19 Projects 3 Activity
1,456 Commits 7 Branches 0 Tags 34 MiB
0f024b27f0
Commit Graph

299 Commits

Author SHA1 Message Date
Philip Sargent
5feb07e3f6 Creates folders as needed on editing new svx file 2020-07-01 00:20:27 +01:00
Philip Sargent
6b0275d035 CASCADE on delete removed from key foregin keys 2020-06-30 15:26:03 +01:00
Philip Sargent
be2b17ea85 More debugging and warnings 2020-06-30 15:24:42 +01:00
Philip Sargent
39f042240d Fix SurvexDirectory import 2020-06-29 21:16:13 +01:00
Philip Sargent
a60a495c83 Creating forgotten caves & better GetCaveLookup() 2020-06-29 21:15:42 +01:00
Philip Sargent
459ed11b58 avoiding problem in KH QMs import 2020-06-28 15:57:40 +01:00
Philip Sargent
bf1c683fd0 fixing parent blocks & titles 2020-06-28 14:42:26 +01:00
Philip Sargent
122cdd7fc8 replace GetCaveByReference 2020-06-28 01:50:34 +01:00
Philip Sargent
4716eaa4b6 Working. More fault checking. 2020-06-27 17:55:59 +01:00
Philip Sargent
ca6f7ed587 move function 2020-06-27 12:04:34 +01:00
Philip Sargent
bb69cc073a start refactor survex import 2020-06-24 14:10:13 +01:00
Philip Sargent
dc5a53376d exploring recusrive behaviour 2020-06-24 02:33:43 +01:00
Philip Sargent
6bf762b72f bin Makesurvexstation, survextitle, survexEquate 2020-06-24 01:57:20 +01:00
Philip Sargent
d6c4ffca5a tunnelfile.scans name change for compatibility 2020-06-24 00:36:32 +01:00
Philip Sargent
c91aa4be47 Simple renaming too-similar variables 2020-06-24 00:18:01 +01:00
Philip Sargent
9cd70b31ac simple rename survexscansfolder to scansfolder 2020-06-23 23:46:33 +01:00
Philip Sargent
b64c779a58 rename SurvexScansFolders and tidy survex parser 2020-06-23 23:34:08 +01:00
Philip Sargent
2e7cf188af cosmetic and moving a funciton 2020-06-23 22:44:06 +01:00
Philip Sargent
674cea629d clean up import statements: more specific 2020-06-22 00:03:23 +01:00
Philip Sargent
7b260006bf dj.-reg. 2.5.2 all tested. 2020-06-20 23:26:50 +01:00
Philip Sargent
f3232cc5df More security, middleware upgrade, dj-reg.2.5 2020-06-20 23:08:34 +01:00
Philip Sargent
77c80d1a69 remove in-memory phase of data import 2020-06-20 19:55:23 +01:00
Philip Sargent
f608fc186e Fixup after rebase and pre- scripts fixed 2020-06-20 17:19:50 +01:00
Philip Sargent
e697466557 Cleanup secrets management, pre-run checks. 2020-06-20 16:51:07 +01:00
Philip Sargent
b35a0b0d26 Fully working dj 1.11.29 2020-06-19 16:39:05 +01:00
Philip Sargent
4a51de95c4 Django 1.11.19 runs clean on pre-built db. 2020-06-18 22:44:41 +01:00
Philip Sargent
d9c6986a89 static files redone 2020-06-18 21:50:16 +01:00
Philip Sargent
640e1e3b5e cleaner warnings but site_media still not ok 2020-06-18 12:10:42 +01:00
Philip Sargent
ee92182163 n_delete=... soon to be required 2020-06-18 00:20:47 +01:00
Philip Sargent
55dd577275 New url dispatcher OK 1.9.13 2020-06-17 22:55:51 +01:00
Philip Sargent
4941d230e2 TEMPLATES done for dj 1.9.13 2020-06-17 21:27:01 +01:00
Philip Sargent
660479d692 django 1.9.13 initial 2020-06-17 01:00:50 +01:00
Philip Sargent
b153fafa9f django 1.8.19 2020-06-16 22:16:48 +01:00
Philip Sargent
f6bd08029f remove useless nulls on ManyToMany 2020-06-16 19:28:24 +01:00
Philip Sargent
94e5a06a15 clean up survexlegs 2020-06-16 19:27:32 +01:00
Philip Sargent
8fc0ba136f removed jgtfileupload 2020-06-16 16:48:19 +01:00
Philip Sargent
9f5e779b5e remove Survey & virtual survey wallet - never used 2020-06-16 16:17:35 +01:00
Philip Sargent
1b693da5ed break recursive import cycle 2020-06-16 16:07:36 +01:00
Philip Sargent
453af2851b Stop storing all SurvexStations 2020-06-15 03:28:51 +01:00
Philip Sargent
d4deea2019 remove tinyMCE more 2020-06-14 10:05:25 +01:00
Philip Sargent
38fa552c00 Disable TinyMCE 2020-06-13 23:16:19 +01:00
Philip Sargent
38beb34a38 cleaner import statements 2020-06-13 01:26:59 +01:00
Philip Sargent
269b8840ad import fixes & statistics table 2020-06-12 18:10:07 +01:00
Philip Sargent
092c8bb913 stopped storing survex legs 2020-06-12 14:06:03 +01:00
Philip Sargent
538a3b6ca8 fixed circular ref on setup & in-memory db 2020-06-08 00:11:09 +01:00
Philip Sargent
9237a6262e Make import robust against duplicate kataster numbers 2020-06-07 17:49:58 +01:00
Philip Sargent
75bac01f3a Fix bad pages for clashing kataster numbers 2020-06-07 16:13:59 +01:00
Philip Sargent
fda50ed570 attempt to simplify wnt horribly wrong 2020-06-06 22:51:55 +01:00
Philip Sargent
681bfcb4c4 removing redundant functions 2020-06-04 23:53:36 +01:00
Philip Sargent
27816724f8 moved 2 funct, deletion of FileAbstraction pending 2020-06-04 23:38:57 +01:00
Philip Sargent
ac9ac5e397 Remove unused Survey object 2020-06-04 23:16:26 +01:00
Philip Sargent
43c6e2f2e1 dlete todo page, partly fix other url pages 2020-06-04 23:00:58 +01:00
Philip Sargent
b7fea2042f merge exptl & stats, delete millenial & eyecandy 2020-06-04 21:57:04 +01:00
Philip Sargent
c6d68749e0 Comment-out all ScannedImage objects 2020-06-04 19:32:26 +01:00
Philip Sargent
ae89a707ec Unit tests outline implemented 2020-06-03 21:57:05 +01:00
Philip Sargent
973c6f4ef8 update svx template & fix CRLF 2020-06-02 21:38:29 +01:00
Philip Sargent
4dd0a5ddf2 import syntax fix 2020-06-02 21:38:01 +01:00
Philip Sargent
f949bb8dc0 python3 fixes for djsngo admin pages 2020-05-31 22:35:36 +01:00
Philip Sargent
5d89cf9474 Delete SURVEYS.CSV code 2020-05-31 21:03:40 +01:00
Philip Sargent
09aedecc3b Unicode fix for SVX display and edit page 2020-05-31 20:46:12 +01:00
Philip Sargent
3088727fd4 unicode fix for python3 2020-05-31 19:00:44 +01:00
Philip Sargent
b33ad5833e delete duplication 2020-05-30 20:48:17 +01:00
Philip Sargent
01e098339e Imposrt mad more specific 2020-05-30 12:35:15 +01:00
Philip Sargent
0776978c9c Import rejigging to fix circular refs 2020-05-30 01:11:02 +01:00
Philip Sargent
6568cb8900 import fix to allow manage.py to run 2020-05-28 22:42:50 +01:00
Philip Sargent
6a755598b2 Moved classes to models_caves and fixed imports 2020-05-28 04:54:53 +01:00
Philip Sargent
df3917a677 Expunge cavetab 2020-05-28 02:20:50 +01:00
Philip Sargent
d2192ffd21 delete duplication 2020-05-28 02:09:36 +01:00
Philip Sargent
cb4128436c expung imagekit and clean import lists 2020-05-28 01:38:35 +01:00
Philip Sargent
6cc578435c Refactor to avoid loading unused surveystations 2020-05-28 01:16:45 +01:00
Philip Sargent
c9657aeb8c preparing to clean up LoadPos 2020-05-26 16:41:11 +01:00
Expo on server
dfb7cc88cd Allow being unable to open local LOGFILE. 2020-05-26 02:26:51 +01:00
Philip Sargent
8b74ff4bb6 __unicode__ to __str__ 2to3 conversion 2020-05-26 02:21:36 +01:00
Philip Sargent
44d190e91c partial fix to make OK on python3.8 2020-05-25 01:49:02 +01:00
Philip Sargent
0a864c7f87 2to3 sort comparison key change 2020-05-25 01:46:52 +01:00
Philip Sargent
50d753a87b Convert codebase for python3 usage 2020-05-24 20:56:27 +01:00
Philip Sargent
49d5857b36 tabs and spaces format fix 2020-05-24 13:31:38 +01:00
Philip Sargent
d4ac28af18 Remove PHOTOS_ROOT and DPhoto class 2020-05-15 21:32:55 +01:00
Philip Sargent
e4290c4ab0 adding *ref to troggle svx parser 2020-05-13 19:57:07 +01:00
Philip Sargent
39c622d5bf dbReset now loads into memory first (fast err checking), then into db 2020-04-30 23:15:57 +01:00
Expo on server
59633d94f5 Remove mention of obsolete EMAIL_HOST_USER to correspond with change made in pathreport.py 2020-03-09 17:44:29 +00:00
Philip Sargent
53206ad1d7 Removed EMAIL_HOST entirely 2020-03-09 16:52:51 +00:00
Philip Sargent
9aa91bf3e2 remove EMAIL_HOST global name 2020-03-09 16:48:51 +00:00
Philip Sargent
cdef395f89 New troggle report on defined directory paths 2020-02-27 00:58:09 +00:00
Philip Sargent
429c21a8e9 installing on WSL ubuntu on Windows 10 2020-02-22 00:04:41 +00:00
Sam Wenham
e77aa9fb84 Changes needed to stop the survex parser having to go through the data twice 
Taken from the Django 1.10 upgrade branch
 2020-02-21 15:57:07 +00:00
Sam Wenham
97426a0ddb Backed out changeset: 4552f42bdf54 2019-06-26 20:57:24 +01:00
Sam Wenham
8a1be45aac Remove this stupid hard coded name match 2019-06-26 20:56:08 +01:00
expo on server
02d3cc84d5 Add SURVEX_TOPNAME (top-level survex file) as a setting item in settings.py so it's not hardcoded. 2019-06-26 03:32:18 +01:00
Sam Wenham
b42249890e Updating caves and entrances is no longer nuclear! 
Big overhaul of people processing, fullname added to the model
lastname is now names -1 unless you only have one (yes you Wookey)
this allows for Jon Arne Toft and Wookey to live it the same DB
names can now have html chars in them, this should be real unicode but that can
only happen when we go to Python 3!
 2019-04-19 22:52:54 +01:00
Sam Wenham
ae284a1f30 Add ordering to the data issues model 2019-04-18 19:01:29 +01:00
Sam Wenham
23df89cf31 Fix CSRF issues in svx form 
Set date formats
Add DataIssue model and add errors to it to allow us to give people a list of
stuff to fix
 2019-04-14 22:45:31 +01:00
Sam Wenham
a588221524 Ooops shouldn't of commited the DateTime change, yet... 2019-03-31 16:43:21 +01:00
Sam Wenham
9df91b221b Support html and wiki logbook entrys 
Move nearest_station to nearest_station_name and make nearest_station a foreign
key to SurvexStation
Lots of tidying
 2019-03-31 15:39:53 +01:00
Sam Wenham
64a4842dcb Remove the redundant render_with_context() as django now does this just with the 
render() shortcut
Move from mimetype to content_type, missed in last commit
 2019-03-30 17:02:07 +00:00
Sam Wenham
a4532a29da Update new management command for DB reset 
Switch to content_type from mimetype
Make DB reset not nuke so much
Tidy logbook parser
 2019-03-30 13:58:38 +00:00
Sam Wenham
9fa93fdd15 Fix person chronology to get the date from te logbook entry 2019-03-09 18:43:58 +00:00
Sam Wenham
b4296f1736 Fix people list 
Cope with Jimmy McFoo as a name!
Don't set the top expo value in the code whin it is piss easy to calculate
Fix typo from last commit
 2019-03-09 18:21:10 +00:00
Sam Wenham
1bac650aee There is no point having two functions do basicaly the same thing so make the 
load all logbooks call load logbook(expo)
Remove the return message from load logbook as it isn't used
 2019-03-09 11:18:44 +00:00
Sam Wenham
42d10cf43d Revert (I hate hg!!!) 2019-02-26 20:43:18 +00:00