From 45474b5c8cefa916aeb64e1c15a79f647a86d58c Mon Sep 17 00:00:00 2001
From: Martin <martin@leo.fri1.uni-lj.si>
Date: Thu, 8 Oct 2015 12:02:43 +0200
Subject: Added final hints.

---
 .../problems/lists_and_for/contains_string/common.py | 10 +++++++---
 python/problems/lists_and_for/contains_string/sl.py  | 20 +++++++++++++++++---
 2 files changed, 24 insertions(+), 6 deletions(-)

(limited to 'python/problems/lists_and_for/contains_string')

diff --git a/python/problems/lists_and_for/contains_string/common.py b/python/problems/lists_and_for/contains_string/common.py
index 29bc9f2..1f19d7f 100644
--- a/python/problems/lists_and_for/contains_string/common.py
+++ b/python/problems/lists_and_for/contains_string/common.py
@@ -25,7 +25,8 @@ hint_type = {
     'for_loop': Hint('for_loop'),
     'if_clause': Hint('if_clause'),
     'printing': Hint('printing'),
-    'print_out_for': Hint('print_out_for')
+    'print_out_for': Hint('print_out_for'),
+    'final_hint': Hint('final_hint')
 }
 
 def test(python, code):
@@ -36,12 +37,12 @@ def test(python, code):
                [],
                ['Waldo']]
     test_out = [
+        False,
         True,
         True,
         True,
         False,
-        True,
-        False
+        True
     ]
 
     n_correct = 0
@@ -69,6 +70,9 @@ def test(python, code):
     hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_xs)}}]
     if tin:
         hints.append({'id': 'problematic_test_case', 'args': {'testin': str(tin), 'testout': str(tout)}})
+    if passed:
+        hints.append({'id': 'final_hint'})
+
     return passed, hints
 
 def hint(python, code):
diff --git a/python/problems/lists_and_for/contains_string/sl.py b/python/problems/lists_and_for/contains_string/sl.py
index d177463..49f0ed0 100644
--- a/python/problems/lists_and_for/contains_string/sl.py
+++ b/python/problems/lists_and_for/contains_string/sl.py
@@ -20,7 +20,7 @@ xs = ['foo', 'bar', 'baz', 'Waldo', 'foobar']
 for_loop = ['''\
 <p>Pregledati bo treba vse elemente v seznamu <code>xs</code>''',
             '''\
-<p>Najlažje bo s <b>for</b> zanko.
+<p>Najlažje bo s <code>for</code> zanko.
 ''',
              '''\
 <p>Poskusii naslednji dve vrstici:</p>
@@ -43,7 +43,7 @@ if x == 'Waldo':
 
 
 plan = ['''\
-<p><b>Plan</b> je enak kot pri prvi nalogi:
+<p>Plan je enak kot pri prvi nalogi:
 <pre>
 Za vsak element v seznamu
     Poglej, ali je element enak 'Waldo'?
@@ -66,6 +66,20 @@ hint = {
 <p>Izpiši rezultat!</p>'''],
 
     'print_out_for': ['''\
-<p>Pazi, da izpišeš rezultat izven zanke!</p>''']
+<p>Pazi, da izpišeš rezultat izven zanke!</p>'''],
+
+    'problematic_test_case': ['''\
+<p>Program ne dela pravilno!<br>
+Poskusi xs = [%=testin%] <br>
+pravilen rezultat: [%=testout%]</p>
+'''],
+
+    'final_hint': ['''\
+<p>Program deluje pravilno! <br>
+Nalogo lahko rešiš hitreje z operatorjem <code>in</code></p>
+<pre>
+xs = ['foo', 'bar', 'baz', 'Waldo', 'foobar']
+print('Waldo' in xs)
+</pre>'''],
 
 }
-- 
cgit v1.2.1


From ce3b6703c153ba5c827996bfa8fd9bfa85fe2adb Mon Sep 17 00:00:00 2001
From: Timotej Lazar <timotej.lazar@araneo.org>
Date: Thu, 8 Oct 2015 16:02:17 +0200
Subject: Remove unneeded id field from {en,sl}.py files

---
 python/problems/lists_and_for/contains_string/en.py | 1 -
 python/problems/lists_and_for/contains_string/sl.py | 1 -
 2 files changed, 2 deletions(-)

(limited to 'python/problems/lists_and_for/contains_string')

diff --git a/python/problems/lists_and_for/contains_string/en.py b/python/problems/lists_and_for/contains_string/en.py
index fa17867..b57be95 100644
--- a/python/problems/lists_and_for/contains_string/en.py
+++ b/python/problems/lists_and_for/contains_string/en.py
@@ -1,6 +1,5 @@
 # coding=utf-8
 
-id = 194
 name = 'Contains string'
 slug = 'Contains string'
 
diff --git a/python/problems/lists_and_for/contains_string/sl.py b/python/problems/lists_and_for/contains_string/sl.py
index 49f0ed0..7061c59 100644
--- a/python/problems/lists_and_for/contains_string/sl.py
+++ b/python/problems/lists_and_for/contains_string/sl.py
@@ -3,7 +3,6 @@ import server
 mod = server.problems.load_language('python', 'sl')
 
 
-id = 194
 name = 'Vsebuje niz'
 slug = 'Vsebuje niz'
 
-- 
cgit v1.2.1


From 6e281624b9a0ae29f1f1862f9d581b219ba3b95a Mon Sep 17 00:00:00 2001
From: Timotej Lazar <timotej.lazar@fri.uni-lj.si>
Date: Mon, 12 Oct 2015 11:46:08 +0200
Subject: Remove group attribute from problem common.py files

---
 python/problems/lists_and_for/contains_string/common.py | 1 -
 1 file changed, 1 deletion(-)

(limited to 'python/problems/lists_and_for/contains_string')

diff --git a/python/problems/lists_and_for/contains_string/common.py b/python/problems/lists_and_for/contains_string/common.py
index 1f19d7f..62fef4e 100644
--- a/python/problems/lists_and_for/contains_string/common.py
+++ b/python/problems/lists_and_for/contains_string/common.py
@@ -6,7 +6,6 @@ from python.util import has_token_sequence, string_almost_equal, \
 from server.hints import Hint
 
 id = 194
-group = 'lists_and_for'
 number = 2
 visible = True
 
-- 
cgit v1.2.1