Merge branch 'master' of ssh://212.235.189.51:22122/codeq-problems

Conflicts:
	robot/problems/introduction/forward/en.py
	robot/problems/introduction/forward/sl.py

3 files changed, 12 insertions, 8 deletions

diff --git a/python/problems/lists_and_for/counting/common.py b/python/problems/lists_and_for/counting/common.py
index 2d59182..73d0071 100644
--- a/python/problems/lists_and_for/counting/common.py
+++ b/python/problems/lists_and_for/counting/common.py
@@ -6,7 +6,6 @@ from python.util import has_token_sequence, string_almost_equal, \
 from server.hints import Hint
 
 id = 203
-group = 'lists_and_for'
 number = 3
 visible = True
 
diff --git a/python/problems/lists_and_for/counting/en.py b/python/problems/lists_and_for/counting/en.py
index 19568e3..223a611 100644
--- a/python/problems/lists_and_for/counting/en.py
+++ b/python/problems/lists_and_for/counting/en.py
@@ -1,6 +1,5 @@
 # coding=utf-8
 
-id = 203
 name = 'Counting'
 slug = 'Counting'
 
diff --git a/python/problems/lists_and_for/counting/sl.py b/python/problems/lists_and_for/counting/sl.py
index 67dc323..926d2c6 100644
--- a/python/problems/lists_and_for/counting/sl.py
+++ b/python/problems/lists_and_for/counting/sl.py
@@ -3,7 +3,6 @@ import server
 mod = server.problems.load_language('python', 'sl')
 
 
-id = 203
 name = 'Štej'
 slug = 'Štej'
 
@@ -80,11 +79,18 @@ hint = {
     'print_out_for': ['''\
 <p>Pazi, da izpišeš rezultat izven zanke!</p>'''],
 
-    'final_hint:': ['''\
- <p>Nalogo lahko rešiš bistveno hitreje, če poznaš metodo <code>count</code></p>
+    'final_hint': ['''\
+<p>Program je pravilen! <br>
+Nalogo lahko rešiš hitreje, če poznaš metodo <code>count</code></p>
  <pre>
- xs = [42, 5, 4, -7, 2, 12, -3, -4, 11, 42, 2]
- print('Število 42 se v seznamu pojavi', xs.count(42), 'krat.')
-</pre>''']
+xs = [42, 5, 4, -7, 2, 12, -3, -4, 11, 42, 2]
+print('Število 42 se v seznamu pojavi', xs.count(42), 'krat.')
+</pre>'''],
+
+    'problematic_test_case': ['''\
+<p>Program ne dela pravilno!<br>
+Poskusi xs = [%=testin%] <br>
+pravilen rezultat: [%=testout%]</p>
+'''],
 
 }