Skip to content

Korjattu syöte E laskennan ulkopuolelle #87

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TileHalo merged 1 commit into from
Sep 21, 2025
Merged

Korjattu syöte E laskennan ulkopuolelle #87

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion web/tupa/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,8 @@ def mukanaOlevatVartiot(self):
laskennassa = False
elif self.vartioHylatty(v):
laskennassa = False

elif self.vartioTekematta(v):
laskennassa = False
if laskennassa:
mukana.append(v)
return mukana
Expand All @@ -184,6 +185,17 @@ def vartioHylatty(self, vartio):
return True
return False

def vartioTekematta(self, vartio):
"""
Käy läpi kaikki vartion tulossyötteet ja palauttaa True, jos joku niistä on hylätty.
"""
for osatehtava in OsaTehtava.objects.filter(tehtava=self):
for syotemaarite in SyoteMaarite.objects.filter(osa_tehtava=osatehtava):
syote = Syote.objects.filter(maarite=syotemaarite, vartio=vartio)
if syote and syote[0].arvo == "e":
return True
return False

def save(self, *args, **kwargs): # Tulokset uusiksi tallennuksen yhteydessä
self.sarja.tuloksetUusiksi()
super(Tehtava, self).save(*args, **kwargs)
Expand Down