expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2025-12-16 05:37:14 +00:00
Code Issues 18 Projects 3 Activity

get the survexfile path when editing a naked wallet

Browse Source
This commit is contained in:
Philip Sargent
2022-08-24 19:08:08 +03:00
parent 7e9fd0f353
commit 17bbbd6eab
3 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/views/uploads.py
View File

@@ -28,7 +28,7 @@ from troggle.parsers.scans import contentsjson
from troggle.core.models.troggle import DataIssue
from troggle.core.models.troggle import Expedition, Person, PersonExpedition
from troggle.core.models.caves import LogbookEntry, QM, Cave, PersonTrip
from troggle.core.models.survex import DrawingFile, Wallet
from troggle.core.models.survex import DrawingFile, Wallet, SurvexBlock
from troggle.core.views.scans import oldwallet, walletindex
from troggle.core.views.caves import getCave
@@ -251,6 +251,12 @@ def scanupload(request, path=None):
else: # no JSON file exists
print(f'--- No JSON exists, so creating blank copy')
waldata = WALLET_BLANK_JSON.copy()
if not waldata["survex file"]:
w = Wallet.objects.get(walletname=wallet)
b = SurvexBlock.objects.filter(scanswallet=w)
waldata["survex file"] = []
for bsf in b:
waldata["survex file"].append(bsf.survexfile.path)
return waldata
def save_json(jsondict):