From a0efe2f9481cbb094bb6046e39f7ca910178b1a5 Mon Sep 17 00:00:00 2001 From: Petkomat Date: Thu, 20 Jun 2024 22:05:45 +0200 Subject: [PATCH 1/2] =?UTF-8?q?slug=20vsebuje=20zaporedno=20=C5=A1tevilko?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/problems/models.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/web/problems/models.py b/web/problems/models.py index fc0d9371..99ef3d24 100644 --- a/web/problems/models.py +++ b/web/problems/models.py @@ -63,7 +63,7 @@ def user_solutions(self, user): @property def slug(self): - return slugify(self.title).replace("-", "_") + return f'{self._order + 1:0>2}_{slugify(self.title).replace("-", "_")}' def attempt_file(self, user): authentication_token = Token.objects.get(user=user) @@ -73,9 +73,8 @@ def attempt_file(self, user): for part in self.parts.all() ] url = settings.SUBMISSION_URL + reverse("attempts-submit") - problem_slug = slugify(self.title).replace("-", "_") extension = self.EXTENSIONS[self.language] - filename = f"{problem_slug}.{extension}" + filename = f"{self.slug}.{extension}" contents = render_to_string( f"{self.language}/attempt.{extension}", { @@ -89,9 +88,8 @@ def attempt_file(self, user): def solution_file(self): parts = [(part, part.solution) for part in self.parts.all()] - problem_slug = slugify(self.title).replace("-", "_") extension = self.EXTENSIONS[self.language] - filename = f"{problem_slug}_solution.{extension}" + filename = f"{self.slug}_solution.{extension}" contents = render_to_string( f"{self.language}/solution.{extension}", { @@ -147,8 +145,7 @@ def edit_file(self, user): """ authentication_token = Token.objects.get(user=user) url = settings.SUBMISSION_URL + reverse("problems-submit") - problem_slug = slugify(self.title).replace("-", "_") - filename = f"{problem_slug}_edit.{self.EXTENSIONS[self.language]}" + filename = f"{self.slug}_edit.{self.EXTENSIONS[self.language]}" contents = render_to_string( f"{self.language}/edit.{self.EXTENSIONS[self.language]}", { From e710a4de993ac16feaaa3df5eeaf76f932d77248 Mon Sep 17 00:00:00 2001 From: Petkomat Date: Thu, 20 Jun 2024 22:25:08 +0200 Subject: [PATCH 2/2] popravljen bug v results --- web/courses/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/courses/models.py b/web/courses/models.py index 83c8a3ab..9a0f0bd6 100644 --- a/web/courses/models.py +++ b/web/courses/models.py @@ -303,7 +303,7 @@ def results_archive(self, user): user_attempts.append(attempt_dict[user.id].get(part.id)) users.append((user, user_attempts)) - spreadsheet_filename = "{0}.csv".format(self.title) + spreadsheet_filename = f"{slugify(self.title)}.csv" spreadsheet_contents = render_to_string( "results.csv", {"problem_set": self, "users": users} )