diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/models/survex.py | 14 | ||||
| -rw-r--r-- | core/views/surveys.py | 12 |
2 files changed, 13 insertions, 13 deletions
diff --git a/core/models/survex.py b/core/models/survex.py index 6d662e9..b30f231 100644 --- a/core/models/survex.py +++ b/core/models/survex.py @@ -114,7 +114,7 @@ class SurvexBlock(models.Model): survexfile = models.ForeignKey("SurvexFile", blank=True, null=True,on_delete=models.SET_NULL) survexpath = models.CharField(max_length=200) # the path for the survex stations - scansfolder = models.ForeignKey("Wallet", null=True,on_delete=models.SET_NULL) + scanswallet = models.ForeignKey("Wallet", null=True,on_delete=models.SET_NULL) legsall = models.IntegerField(null=True) # summary data for this block legslength = models.FloatField(null=True) @@ -180,24 +180,24 @@ class Wallet(models.Model): ordering = ('walletname',) def get_absolute_url(self): - return urljoin(settings.URL_ROOT, reverse('scanswallet', kwargs={"path":re.sub("#", "%23", self.walletname)})) + return urljoin(settings.URL_ROOT, reverse('singlewallet', kwargs={"path":re.sub("#", "%23", self.walletname)})) def __str__(self): return str(self.walletname) + " (Survey Scans Folder)" class SingleScan(models.Model): - ffile = models.CharField(max_length=200) - name = models.CharField(max_length=200) - scansfolder = models.ForeignKey("Wallet", null=True,on_delete=models.SET_NULL) + ffile = models.CharField(max_length=200) + name = models.CharField(max_length=200) + wallet = models.ForeignKey("Wallet", null=True,on_delete=models.SET_NULL) class Meta: ordering = ('name',) def get_absolute_url(self): - return urljoin(settings.URL_ROOT, reverse('scansingle', kwargs={"path":re.sub("#", "%23", self.scansfolder.walletname), "file":self.name})) + return urljoin(settings.URL_ROOT, reverse('scansingle', kwargs={"path":re.sub("#", "%23", self.wallet.walletname), "file":self.name})) def __str__(self): - return "Survey Scan Image: " + str(self.name) + " in " + str(self.scansfolder) + return "Survey Scan Image: " + str(self.name) + " in " + str(self.wallet) class DrawingFile(models.Model): dwgpath = models.CharField(max_length=200) diff --git a/core/views/surveys.py b/core/views/surveys.py index 952aa77..56168f6 100644 --- a/core/views/surveys.py +++ b/core/views/surveys.py @@ -20,11 +20,11 @@ need to check if inavlid query string is invalid, or produces multiple replies and render a user-friendly error page. ''' -def scanswallet(request, path): +def singlewallet(request, path): #print [ s.walletname for s in Wallet.objects.all() ] try: - scansfolder = Wallet.objects.get(walletname=urlunquote(path)) - return render(request, 'scansfolder.html', { 'scansfolder':scansfolder, 'settings': settings }) + wallet = Wallet.objects.get(walletname=urlunquote(path)) + return render(request, 'wallet.html', { 'wallet':wallet, 'settings': settings }) except: message = f'Scan folder error or not found \'{path}\' .' return render(request, 'errors/generic.html', {'message': message}) @@ -33,8 +33,8 @@ def scansingle(request, path, file): '''sends a single binary file to the user for display - browser decides how using mimetype ''' try: - scansfolder = Wallet.objects.get(walletname=urlunquote(path)) - singlescan = SingleScan.objects.get(scansfolder=scansfolder, name=file) + wallet = Wallet.objects.get(walletname=urlunquote(path)) + singlescan = SingleScan.objects.get(wallet=wallet, name=file) # print(" - scansingle {}:{}:{}:".format(path, file, getmimetype(file))) return HttpResponse(content=open(singlescan.ffile,"rb"), content_type=getmimetype(file)) # any type of image except: @@ -42,7 +42,7 @@ def scansingle(request, path, file): return render(request, 'errors/generic.html', {'message': message}) -def scanswallets(request): +def allwallets(request): manywallets = Wallet.objects.all() return render(request, 'manywallets.html', { 'manywallets':manywallets, 'settings': settings }) |