← Back to branch summary

~azzar1/unity/add-show-desktop-key

« back to all changes in this revision

Viewing changes to ivle/webapp/tutorial/templates/exercise_edit.html

Clean up and improve docstrings for TestFramework, and clean up exercise editor UI.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ivle/webapp/tutorial/templates/exercise_edit.html
66
66
                      <label for="var_type_${variable.varid}">Type:</label>
67
67
                      <select name="Variable Type" id="var_type_${variable.varid}">
68
68
                        <py:for each="var_type in var_types">
69
 
                          <option py:if="var_type == variable.var_type" selected="selected" value="${var_type}">${var_type}</option>
70
 
                          <option py:if="var_type != variable.var_type" value="${var_type}">${var_type}</option>
 
69
                          <option py:if="var_type == variable.var_type" selected="selected" value="${var_type}">${var_types[var_type]}</option>
 
70
                          <option py:if="var_type != variable.var_type" value="${var_type}">${var_types[var_type]}</option>
71
71
                        </py:for>
72
72
                      </select>
73
73
                      <label for="var_name_${variable.varid}">Var Name:</label>
84
84
                    <label for="new_var_type_${test_suite.suiteid}">Type:</label>
85
85
                    <select name="Variable Type" id="new_var_type_${test_suite.suiteid}">
86
86
                      <py:for each="var_type in var_types">
87
 
                        <option  value="${var_type}">${var_type}</option>
 
87
                        <option  value="${var_type}">${var_types[var_type]}</option>
88
88
                      </py:for>
89
89
                    </select>
90
90
                    <label for="new_var_name_${test_suite.suiteid}">Var Name:</label>
108
108
                      </h5>
109
109
                      <div py:with="iw_prefix='test_case_%d_%d' % (test_case.testid, test_suite.suiteid)"
110
110
                           class="test_case" id="${iw_prefix}">
111
 
                        <iw:text name="pass" desc="Pass Message">${test_case.passmsg}</iw:text>
112
 
                        <iw:text name="fail" desc="Fail Message">${test_case.failmsg}</iw:text>
113
 
                        <iw:text name="default" desc="Default Mode">${test_case.test_default}</iw:text>
 
111
                        <iw:text name="pass" desc="Pass message">${test_case.passmsg}</iw:text>
 
112
                        <iw:text name="fail" desc="Fail message">${test_case.failmsg}</iw:text>
114
113
                        <input type="button" onclick="edit_test_case('${test_case.testid}','${test_suite.suiteid}')" value="Save Case" />
115
114
 
116
115
                        <h5>Test Case Parts</h5>
117
116
                        <ul class="test_case_parts" id="test_case_parts_${test_case.testid}_${test_suite.suiteid}">
118
117
                          <li py:for="test_part in test_case.parts"
119
118
                              py:with="iw_prefix='test_part_%d' % test_part.partid">
120
 
                            <label for="test_part_${test_part.partid}_part_type">Part Type:</label>
 
119
                            <label for="test_part_${test_part.partid}_part_type">Test</label>
121
120
                            <select name="Part Type" id="test_part_${test_part.partid}_part_type">
122
121
                              <py:for each="part_type in part_types">
123
 
                                <option py:if="part_type==test_part.part_type" selected="selected" value="${part_type}">${part_type}</option>
124
 
                                <option py:if="part_type!=test_part.part_type" value="${part_type}">${part_type}</option>
 
122
                                <option py:if="part_type==test_part.part_type" selected="selected" value="${part_type}">${part_types[part_type]}</option>
 
123
                                <option py:if="part_type!=test_part.part_type" value="${part_type}">${part_types[part_type]}</option>
125
124
                              </py:for>
126
125
                            </select>
127
 
                            <label for="test_part_${test_part.partid}_test_type">Test Type</label>
 
126
                            <label for="test_part_${test_part.partid}_test_type">using the following</label>
128
127
                            <select name="Test Type" id="test_part_${test_part.partid}_test_type">
129
128
                              <py:for each="test_type in test_types">
130
 
                                <option py:if="test_type==test_part.test_type" selected="selected" value="${test_type}">${test_type}</option>
131
 
                                <option py:if="test_type!=test_part.test_type" value="${test_type}">${test_type}</option>
 
129
                                <option py:if="test_type==test_part.test_type" selected="selected" value="${test_type}">${test_types[test_type]}</option>
 
130
                                <option py:if="test_type!=test_part.test_type" value="${test_type}">${test_types[test_type]}</option>
132
131
                              </py:for>
133
132
                            </select>
 
133
                            function:
134
134
                            <iw:delete action="delete_testpart('${test_part.partid}','${test_case.testid}','${test_suite.suiteid}')" />
135
 
                            <iw:textarea name="data" desc="Test" rows="2" cols="80">${test_part.data}</iw:textarea>
136
 
                            <iw:text name="file" desc="Filename">${test_part.filename}</iw:text>
 
135
                            <textarea id="test_part_${test_part.partid}_data" cols="80" rows="2">${test_part.data}</textarea>
 
136
                            <br />
137
137
                            <input type="button" value="Save Part" onclick="edit_test_part('${test_part.partid}', '${test_case.testid}', ${test_suite.suiteid})" />
138
138
                          </li>
139
139
                          <li py:with="iw_prefix='test_part_new'">
140
140
                            <a onclick="tog('new_test_part_${test_case.testid}')">New test case part</a>
141
141
                            <div class="add_new_part" id="new_test_part_${test_case.testid}">
142
 
                              <label for="test_part_new_part_type_${test_case.testid}">Part Type:</label>
 
142
                              <label for="test_part_new_part_type_${test_case.testid}">Test</label>
143
143
                              <select name="Part Type" id="test_part_new_part_type_${test_case.testid}">
144
144
                                <py:for each="part_type in part_types">
145
 
                                  <option value="${part_type}">${part_type}</option>
 
145
                                  <option value="${part_type}">${part_types[part_type]}</option>
146
146
                                </py:for>
147
147
                              </select>
148
 
                              <label for="test_part_new_test_type_${test_case.testid}">Test Type:</label>
 
148
                              <label for="test_part_new_test_type_${test_case.testid}">using the following</label>
149
149
                              <select name="Test Type" id="test_part_new_test_type_${test_case.testid}">
150
150
                                <py:for each="test_type in test_types">
151
 
                                  <option value="${test_type}">${test_type}</option>
 
151
                                  <option value="${test_type}">${test_types[test_type]}</option>
152
152
                                </py:for>
153
153
                              </select>
154
 
                              <iw:textarea name="data" desc="Test" rows="2" cols="80" />
155
 
                              <iw:text name="file" desc="Filename" />
 
154
                              function:
 
155
                              <br />
 
156
                              <textarea id="test_part_new_data_${test_case.testid}" cols="80" rows="2"></textarea>
 
157
                              <br />
156
158
                              <input type="button" value="Create Part" onclick="add_test_part('${test_case.testid}', '${test_suite.suiteid}')" id="new_test_part_save_${test_case.testid}" />
157
159
                            </div>
158
160
                          </li>
164
166
                    <h5><a onclick="tog('new_test_case_${test_suite.suiteid}')">New test case</a></h5>
165
167
                    <div py:with="iw_prefix='new_test_case_%d' % (test_suite.suiteid)"
166
168
                         class="test_case" id="${iw_prefix}">
167
 
                        <iw:text name="pass" desc="Pass Message" />
168
 
                        <iw:text name="fail" desc="Fail Message" />
169
 
                        <iw:text name="default" desc="Default Mode" />
 
169
                        <iw:text name="pass" desc="Pass message" />
 
170
                        <iw:text name="fail" desc="Fail message" />
170
171
                        <input type="button" value="Create Case" onclick="add_test_case('${test_suite.suiteid}')" />
171
172
                    </div>
172
173
                  </li>