3 files changed, 183 insertions, 0 deletions
diff --git a/python/problems/while_and_if/checking_account/common.py b/python/problems/while_and_if/checking_account/common.py
new file mode 100644
index 0000000..610bbfc
--- /dev/null
+++ b/python/problems/while_and_if/checking_account/common.py
@@ -0,0 +1,84 @@
+# coding=utf-8
+
+from python.util import has_token_sequence, string_almost_equal, \
+    string_contains_number, get_tokens, get_numbers, get_exception_desc
+from server.hints import Hint, HintSequence
+
+id = 200
+group = 'while_and_if'
+number = 5
+visible = True
+
+solution = '''\
+stanje = 0
+while stanje > -100:
+    stanje += int(input('Sprememba '))
+    print('Stanje', stanje)
+print('Bankrot')
+'''
+
+hint_type = {
+    'while_clause': Hint('while_clause'),
+    'while_condition': Hint('while_condition'),
+}
+
+def test(python, code):
+    # List of inputs: (expression to eval, stdin).
+    test_in = [
+        (None, '23\n15\n-30\n10\n100\n-200\n-50\n'),
+        (None, '10\n-100\n1000\n-10000\n'),
+        (None, '1\n2\n'),
+        (None, '-1000\n'),
+        (None, '0\n'),
+    ]
+
+    test_out = [
+        (-132, True),
+        (-9090, True),
+        (3, False),
+        (-1000, True),
+        (0, False),
+    ]
+
+    # List of outputs: (expression result, stdout, stderr, exception).
+    answers = python(code=code, inputs=test_in, timeout=1.0)
+    outputs = [ans[1] for ans in answers]
+
+    n_correct = 0
+    tin = None
+    for i, (output, correct) in enumerate(zip(outputs, test_out)):
+        if string_almost_equal(output, correct[0]) and \
+           ('Bankrot' in output) == correct[1]:
+            n_correct += 1
+        else:
+            tin = test_in[i][1]
+            tout = correct
+
+    passed = n_correct == len(test_in)
+    hints = [{'id': 'test_results', 'args': {'passed': n_correct, 'total': len(test_in)}}]
+    if tin:
+        hints.append({'id': 'problematic_test_case', 'args': {'testin': str(tin),
+                                                              'sum': str(tout[0]),
+                                                              'bancrupt': str(tout[1])}})
+    return passed, hints
+
+def hint(python, code):
+    tokens = get_tokens(code)
+
+    # run one test first to see if there are any exceptions
+    test_in = [(None, '23\n15\n-30\n8\n10\n100\n-200\n-50\n')]
+    answer = python(code=code, inputs=test_in, timeout=1.0)
+    exc = get_exception_desc(answer[0][3])
+    if exc:
+        return exc
+
+    # student does not have while or for: instruct him on loops
+    if not has_token_sequence(tokens, ['while']) and \
+       not has_token_sequence(tokens, ['for']):
+        return [{'id' : 'while_clause'}]
+
+    # student's answer is not correct
+    if not string_almost_equal(answer[0][1], -132):
+        return [{'id' : 'while_condition'}]
+
+    return None
diff --git a/python/problems/while_and_if/checking_account/en.py b/python/problems/while_and_if/checking_account/en.py
new file mode 100644
index 0000000..f583fd8
--- /dev/null
+++ b/python/problems/while_and_if/checking_account/en.py
@@ -0,0 +1,16 @@
+# coding=utf-8
+
+id = 199
+name = '(translation missing)'
+slug = '(translation missing)'
+
+description = '''\
+<p>(translation missing)</p>'''
+
+hint = {
+    'plan': '''\
+<p>(translation missing)</p>''',
+
+    'no_input_call': '''\
+<p>(translation missing)</p>''',
+}
diff --git a/python/problems/while_and_if/checking_account/sl.py b/python/problems/while_and_if/checking_account/sl.py
new file mode 100644
index 0000000..2825431
--- /dev/null
+++ b/python/problems/while_and_if/checking_account/sl.py
@@ -0,0 +1,83 @@
+# coding=utf-8
+import server
+mod = server.problems.load_language('python', 'sl')
+
+id = 200
+name = 'Tekoči račun'
+slug = 'Tekoči račun'
+
+
+description = '''\
+<p>Državna agencija za varstvo potrošnikov je razpisala projekt za izdelavo programa, s katerimi bodo
+lahko potrošniki nadzorovali svoje tekoče račune. V program uporabniki vtipkavajo prejemke in
+izdatke (kot pozitivne in negativne zneske) na svojem tekočem računu. Program jim sproti izpisuje
+stanje in se ustavi, ko je uporabnik v minusu za 100 evrov ali več.</p>
+<pre>
+Sprememba 23
+Stanje 23
+Sprememba 15
+Stanje 38
+Sprememba 30
+Stanje 8
+Sprememba 10
+Stanje 18
+Sprememba 100
+Stanje 118
+Sprememba 200
+Stanje 82
+Sprememba 50
+Stanje 132
+Bankrot
+</pre>
+'''
+
+main_plan = ['''\
+<p><b>Plan</b></p> je enak kot pri prejšnjih nalogah, le vsebina je drugačna:
+<pre>
+1.Ponavljaj dokler ni bankrot
+    2.Preberi ceno
+    3.Posodobi vsoto
+4. Izpiši bankrot
+</pre>
+''']
+
+while_condition = ['''\
+<p>Koliko korakov naj naredi zanka?</p>''',
+                   '''\
+<p>Dokler velja, da je stanje višje od 100</p>'''
+                   '''\
+<pre>
+while stanje > -100:
+    ...
+</pre>'''
+]
+
+plan = [main_plan,
+        while_condition]
+
+while_clause = ['''\
+<p>Uporabi zanko <while</p>''',
+         '''\
+<pre>
+while Pogoj:
+    stavek 1
+    stavek 2
+    ...
+stavek n # stavek izven while.
+</pre>''',
+         '''\
+<p>Stavki znotraj while (zamaknjeni) se izvajajo toliko časa, dokler velja <code>Pogoj</code>.
+Ko pogoj ne velja več, Python preskoči vrstice, ki so del while-a in nadaljuje s stavki, ki sledijo – v
+našem primeru s stavkom n.</p>'''
+        ]
+
+hint = {
+    'while_clause': while_clause,
+
+    'while_condition': while_condition,
+
+    'problematic_test_case': ['''\
+<p>Zaporedje cen, kjer program ne dela prav: [%=testin%]<br>
+Bankrot: [%=bancrupt%], Končno stanje: [%=sum%]''']
+
+}